From da23a624dc68621c28e71fa01b1dc301b8d2080d Mon Sep 17 00:00:00 2001 From: openfsguruh Date: Mon, 10 Feb 2014 20:51:25 +0100 Subject: [PATCH 01/85] merged changes from Issue020_ThrottleWarning based on current next branch, includes all changes from old ThrottleWarning branch. Solves issue 020: Throttle warning if P1-P3 is selected as Thr source. Adds Turnigy TransmitterFix option code savings: 120 bytes without Transmitter fix 4 bytes but 1 more data if Transmitter Fix is activated. Added make option TURNIGY_TRANSMITTER_FIX for this purpose TURNIGY_TRANSMITTER_FIX = NO is default set to YES for new Turnigy9x transmitter which transmits even no pulses are generated. --- radio/src/Makefile | 16 ++++ radio/src/opentx.cpp | 195 ++++++++++++++++++++++++++++++++++--------- radio/src/opentx.h | 16 +++- 3 files changed, 188 insertions(+), 39 deletions(-) diff --git a/radio/src/Makefile b/radio/src/Makefile index 12fb145b1..053b0371d 100644 --- a/radio/src/Makefile +++ b/radio/src/Makefile @@ -67,6 +67,14 @@ EXT = STD # Values = YES, NO, CHOICE FAI = NO +# the latests deliveries for Turnigy 9x transmitters (since 2 years now, 2014) do not stop sending if no pulses are generated. +# This fact totally breaks the nice throttle and switch warning concept, because even we prevent sending pulses the +# transmitter modul ignores this, and continous to send the last value or 0 at beginning. And 0 means in the middle of throttle -> 50%. +# To cope with this situation, we need a new concept how to handle throttle and switch warnings. +# if you have a 0 value (50% ) for throttle, while throttle warning is active, you should activate this switch +# Values = YES, NO +TURNIGY_TRANSMITTER_FIX = NO + # Enable heli menu # Values = YES, NO HELI = NO @@ -671,6 +679,10 @@ ifeq ($(PCB), TARANIS) CPPSRC += protocols/hubsan.cpp CPPSRC += targets/taranis/a7105_driver.cpp endif + + ifeq ($(TURNIGY_TRANSMITTER_FIX), YES) + $(error TURNIGY_TRANSMITTER_FIX is not yet implemented for Taranis. If this is actually needed, getSwitch() needs to be modified) + endif endif CC = $(TRGT)gcc @@ -743,6 +755,10 @@ ifeq ($(NAVIGATION), ROTENC) CPPDEFS += -DROTARY_ENCODER_NAVIGATION endif +ifeq ($(TURNIGY_TRANSMITTER_FIX), YES) + CPPDEFS += -DINPUT_WARNINGS_GENERATE_SIM_DATA +endif + ifeq ($(AUTOSWITCH), YES) CPPDEFS += -DAUTOSWITCH endif diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index f1ac3e785..a73224d1e 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -51,6 +51,9 @@ int24_t act [MAX_MIXERS] = {0}; SwOn swOn [MAX_MIXERS]; // TODO better name later... uint8_t mixWarning; +#ifdef INPUT_WARNINGS_GENERATE_SIM_DATA + uint8_t checkWarningState; +#endif #if defined(CPUARM) #define MENUS_STACK_SIZE 2000 @@ -1246,9 +1249,11 @@ getvalue_t getValue(uint8_t i) else if (i==MIXSRC_SG) return (switchState(SW_SG0) ? -1024 : (switchState(SW_SG1) ? 0 : 1024)); else if (i==MIXSRC_SH) return (switchState(SW_SH0) ? -1024 : 1024); #else - else if (i==MIXSRC_3POS) return (switchState(SW_ID0) ? -1024 : (switchState(SW_ID1) ? 0 : 1024)); + else if (i==MIXSRC_3POS) return (getSwitch(SW_ID0-SW_BASE+1) ? -1024 : (getSwitch(SW_ID1-SW_BASE+1) ? 0 : 1024)); + // don't use switchState directly to give getSwitch possibility to hack values if needed for switch warning #if defined(EXTRA_3POS) - else if (i==MIXSRC_3POS2) return (switchState(SW_ID3) ? -1024 : (switchState(SW_ID4) ? 0 : 1024)); + else if (i==MIXSRC_3POS2) return (getSwitch(SW_ID3-SW_BASE+1) ? -1024 : (getSwitch(SW_ID4-SW_BASE+1) ? 0 : 1024)); + // don't use switchState directly to give getSwitch possibility to hack values if needed for switch warning #endif #endif @@ -1380,6 +1385,10 @@ void getSwitchesPosition() int16_t csLastValue[NUM_CSW]; #define CS_LAST_VALUE_INIT -32768 +// param swtch may be (negativ sign ignored) +// 0 --> no source +// 1 .. 9 (or max switches) --> returns switch value including 3pos +// others internal switches etc. bool getSwitch(int8_t swtch) { bool result; @@ -1394,6 +1403,19 @@ bool getSwitch(int8_t swtch) } else if (cs_idx <= SWSRC_LAST_SWITCH) { result = SWITCH_POSITION(cs_idx-SWSRC_FIRST_SWITCH); +#ifdef INPUT_WARNINGS_GENERATE_SIM_DATA + if (checkWarningState1; i--) { + bool prev; + // mask= (1<<(i-2)); + prev=(switches_states & mask); + // don't use getSwitch here to always get the proper value, even getSwitch manipulates + // bool next = getSwitch(i); + bool next = switchState((EnumKeys)(SW_BASE+i-1)); + if (prev!=next) { + if (((i3)) || next==true) + result = next ? i : -i; + if ((i<=3) && (result==0)) result=1; + switches_states ^= mask; + } + mask>>=1; + } //endfor + +/* for (uint8_t i=NUM_PSWITCH; i>0; i--) { bool prev; swstate_t mask = 0; @@ -1628,7 +1674,9 @@ int8_t getMovedSwitch() mask = (1<<(i-2)); prev = (switches_states & mask); } - bool next = getSwitch(i); + // don't use getSwitch here to always get the proper value, because getSwitch manipulates + // bool next = getSwitch(i); + bool next = switchState((EnumKeys)(SW_BASE+i-1)); if (prev != next) { if (i!=NUM_PSWITCH || next==true) result = next ? i : -i; @@ -1638,7 +1686,7 @@ int8_t getMovedSwitch() switches_states = (switches_states & 0xFC) | (i-1); } } - } + } //endfor */ #endif if ((tmr10ms_t)(get_tmr10ms() - s_move_last_time) > 10) @@ -2228,14 +2276,35 @@ void doSplash() #define doSplash() #endif + +// #define INPUT_WARNINGS_GENERATE_SIM_DATA +// the latests deliveries from 9x transmitters (since 2 years now, 2014) do not stop sending if no pulses are generated. +// This fact totally breaks the nice throttle and switch warning concept, because even we prevent sending pulses the +// transmitter modul ignores this, and continous to send the last value or 0 at beginning. And 0 means in the middle of throttle -> 50%. +// To cope with this situation, we need a new concept how to handle throttle and switch warnings. +// My solution is, not to stop pulses at all. In warning situation the input of the appropriate channels are ignored and +// replaced with a value which wouldn't generate the warning, e.g. for throttle -100% +// Because this new concept is also compatible with the better (older) transmitter we can enable it by default and let the user choose if +// he want's the old handling or new one. + +#if defined(PCBTARANIS) && defined(INPUT_WARNINGS_GENERATE_SIM_DATA) +// #error "INPUT_WARNINGS_GENERATE_SIM_DATA is not yet implemented for Taranis build." +// according current transmitters, this shouldn't be necessary as well +// but if wanted the switch simulation part needs to be simulated the same way as for stock +#endif + void checkAll() { #if !defined(PCBSKY9X) checkLowEEPROM(); #endif +#ifdef INPUT_WARNINGS_GENERATE_SIM_DATA + checkWarningState=e_InWarnBegin; +#else checkTHR(); checkSwitches(); +#endif #if defined(PCBTARANIS) if (modelHasNotes() && g_model.displayText) { @@ -2249,6 +2318,16 @@ void checkAll() clearKeyEvents(); } +#ifdef INPUT_WARNINGS_GENERATE_SIM_DATA +void checkInMix() +{ + if (checkWarningState>=e_InWarnFinished) return; // no more checks + + if (checkWarningStateNUM_POTS)) ? + THR_STICK : g_model.thrTraceSrc+NUM_STICKS-1; + // throttle channel is either the stick according stick mode (already handled in evalInputs) + // or P1 to P3; + // in case an output channel is choosen as throttle source (thrTraceSrc>NUM_POTS) we assume the throttle stick is the input + // no other information avaialbe at the moment, and good enough to my option (otherwise too much exceptions...) + - uint8_t thrchn = (2-(stickMode&1)); //stickMode=0123 -> thr=2121 - -#ifdef SIMU - int16_t lowLim = THRCHK_DEADBAND - 1024 ; +#ifdef INPUT_WARNINGS_GENERATE_SIM_DATA + int16_t v = calibratedStick[thrchn]; + if ((v<=(THRCHK_DEADBAND-1024)) || g_model.disableThrottleWarning) { + checkWarningState=e_InWarnStartSwitchWarn; + // checkWarningState=e_InWarnFinished; + } else { + calibratedStick[thrchn]=-1024; +#if !defined(PCBTARANIS) + rawAnas[thrchn]=anas[thrchn]=calibratedStick[thrchn]; +#endif + if (checkWarningState disable warning + checkWarningState=e_InWarnStartSwitchWarn; + // checkWarningState=e_InWarnFinished; + } + } #else - getADC(); // if thr is down - do not display warning at all - CalibData * calib = &g_eeGeneral.calib[thrchn]; - int16_t lowLim = calib->mid; - lowLim = (g_model.throttleReversed ? - lowLim - calib->spanPos : lowLim - calib->spanNeg); - lowLim += THRCHK_DEADBAND; -#endif - int16_t v = thrAnaIn(thrchn); - - if (v<=lowLim) return; - - // first - display warning - MESSAGE(STR_THROTTLEWARN, STR_THROTTLENOTIDLE, STR_PRESSANYKEYTOSKIP, AU_THROTTLE_ALERT); - - while (1) - { + if (g_model.disableThrottleWarning) return; + evalInputs(e_perout_mode_notrainer); // let do evalInputs do the job + int16_t v = calibratedStick[thrchn]; + if (v<=(THRCHK_DEADBAND-1024)) return; // prevent warning if throttle input OK + // first - display warning; also deletes inputs if any have been before + MESSAGE(STR_THROTTLEWARN, STR_THROTTLENOTIDLE, STR_PRESSANYKEYTOSKIP, AU_THROTTLE_ALERT); + + while (1) { SIMU_SLEEP(1); - getADC(); - int16_t v = thrAnaIn(thrchn); - - if (pwrCheck()==e_power_off || keyDown() || v<=lowLim) + evalInputs(e_perout_mode_notrainer); // let do evalInputs do the job + v = calibratedStick[thrchn]; + if (pwrCheck()==e_power_off || keyDown() || v<=(THRCHK_DEADBAND-1024)) break; - + checkBacklight(); - wdt_reset(); - } + }//endwhile +#endif } void checkAlarm() // added by Gohst @@ -2306,21 +2399,28 @@ void checkAlarm() // added by Gohst void checkSwitches() { +#ifdef INPUT_WARNINGS_GENERATE_SIM_DATA + static swstate_t last_bad_switches = 0xff; +#else swstate_t last_bad_switches = 0xff; +#endif swstate_t states = g_model.switchWarningStates; + #if defined(PCBTARANIS) uint8_t bad_pots = 0, last_bad_pots = 0xff; #endif +#ifndef INPUT_WARNINGS_GENERATE_SIM_DATA while (1) { #if defined(TELEMETRY_MOD_14051) || defined(PCBTARANIS) getADC(); #endif +#endif //INPUT_WARNINGS_GENERATE_SIM_DATA getMovedSwitch(); - uint8_t warn = false; + bool warn = false; #if defined(PCBTARANIS) for (uint8_t i=0; i Date: Tue, 11 Feb 2014 17:40:05 +0100 Subject: [PATCH 02/85] bugfix: Throttle warning shown wrong in companion Actually Throttle warning was not ticked by default in companion, and if ticked, it was disabled, and when not ticked it was enabled. Now it fits to the real firmware settings. --- companion/src/modeledit/setup.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp index 8042ccfe3..be7ccd8d7 100644 --- a/companion/src/modeledit/setup.cpp +++ b/companion/src/modeledit/setup.cpp @@ -476,7 +476,7 @@ void Setup::on_extendedLimits_toggled(bool checked) void Setup::on_throttleWarning_toggled(bool checked) { - model.disableThrottleWarning = checked; + model.disableThrottleWarning = !checked; emit modified(); } @@ -550,7 +550,7 @@ void Setup::update() ui->throttleReverse->setChecked(model.throttleReversed); populateTTraceCB(ui->throttleSource, model.thrTraceSrc); - ui->throttleWarning->setChecked(model.disableThrottleWarning); + ui->throttleWarning->setChecked(!model.disableThrottleWarning); //trim inc, thro trim, thro expo, instatrim ui->trimIncrement->setCurrentIndex(model.trimInc+2); From c90959009164d9ec627fa87c538be5c7faf36ebe Mon Sep 17 00:00:00 2001 From: openfsguruh Date: Wed, 12 Feb 2014 21:13:59 +0100 Subject: [PATCH 03/85] updated from branch "next" Merge branch 'next' --- companion/src/apppreferencesdialog.cpp | 28 +- companion/src/apppreferencesdialog.ui | 96 +- companion/src/companion.qrc | 172 ++ companion/src/customizesplashdialog.cpp | 15 +- companion/src/customizesplashdialog.h | 7 + .../src/firmwares/opentx/opentxeeprom.cpp | 35 +- companion/src/helpers.cpp | 5 +- .../images/originals/classical icons/add.png | Bin 6773 -> 0 bytes .../classical icons/apppreferences.png | Bin 17379 -> 0 bytes .../originals/classical icons/clear.png | Bin 12443 -> 0 bytes .../images/originals/classical icons/copy.png | Bin 3485 -> 0 bytes .../images/originals/classical icons/new.png | Bin 2216 -> 0 bytes .../originals/classical icons/paste.png | Bin 5218 -> 0 bytes .../images/originals/icons Classical/add.png | Bin 0 -> 5539 bytes .../icons Classical/apppreferences.png | Bin 0 -> 11170 bytes .../arrow-left.png | Bin .../arrow-right.png | Bin .../changelog.png | Bin .../originals/icons Classical/clear.png | Bin 0 -> 9656 bytes .../compare.png | Bin .../configure.png | Bin .../icons Classical/contributors.png | Bin 0 -> 12829 bytes .../images/originals/icons Classical/copy.png | Bin 0 -> 1338 bytes .../icons Classical/currentmodel.png | Bin 0 -> 10941 bytes .../images/originals/icons Classical/cut.png | Bin 0 -> 1323 bytes .../duplicate.png | Bin .../edit.png | Bin .../images/originals/icons Classical/exit.png | Bin 0 -> 10601 bytes .../fuses.png | Bin .../fwpreferences.png | Bin .../originals/icons Classical/information.png | Bin 0 -> 5244 bytes .../originals/icons Classical/library.png | Bin 0 -> 16242 bytes .../list.png | Bin .../logs.png | Bin .../originals/icons Classical/movedown.png | Bin 0 -> 10774 bytes .../originals/icons Classical/moveup.png | Bin 0 -> 10463 bytes .../images/originals/icons Classical/new.png | Bin 0 -> 852 bytes .../open.png | Bin .../paintbrush.png | Bin .../originals/icons Classical/paste.png | Bin 0 -> 1645 bytes .../images/originals/icons Classical/play.png | Bin 0 -> 534 bytes .../originals/icons Classical/print.png | Bin 0 -> 7282 bytes .../profiles.png | Bin .../read_eeprom.png | Bin .../read_eeprom_file.png | Bin .../read_flash.png | Bin .../recentdocument.png | Bin .../save.png | Bin .../saveas.png | Bin .../simulate.png | Bin .../stop.png | Bin .../switch_dir.png | Bin .../update.png | Bin .../originals/icons Classical/wizard.png | Bin 0 -> 13364 bytes .../write_eeprom.png | Bin .../write_eeprom_file.png | Bin .../write_flash.png | Bin .../add64.png | Bin .../apppreferences.png | Bin .../arrow-left64.png | Bin .../arrow-right64.png | Bin .../changelog64.png | Bin .../clear64.png | Bin .../compare64.png | Bin .../configure64.png | Bin .../contributors64.png | Bin .../copy64.png | Bin .../currentmodel64.png | Bin .../cut64.png | Bin .../duplicate64.png | Bin .../edit64.png | Bin .../exit64.png | Bin .../fuses64.png | Bin .../fwpreferences.png | Bin .../information64.png | Bin .../library64.png | Bin .../list64.png | Bin .../logs64.png | Bin .../movedown64.png | Bin .../moveup64.png | Bin .../new64.png | Bin .../open64.png | Bin .../paintbrush.png | Bin .../paste64.png | Bin .../print64.png | Bin .../profiles64.png | Bin .../read_eeprom.png | Bin .../read_eeprom_2.png | Bin .../read_eeprom_file.png | Bin .../read_eeprom_file_2.png | Bin .../read_flash.png | Bin .../read_flash_2.png | Bin .../recentdocument64.png | Bin .../save64.png | Bin .../saveas64.png | Bin .../simulate64.png | Bin .../txactionico.svg | 0 .../update64.png | Bin .../wizard64.png | Bin .../write_eeprom.png | Bin .../write_eeprom_2.png | Bin .../write_eeprom_file.png | Bin .../write_eeprom_file_2.png | Bin .../write_flash.png | Bin .../write_flash_2.png | Bin .../src/images/originals/icons New/add.png | Bin 0 -> 589 bytes .../originals/icons New/apppreferences.png | Bin 0 -> 12546 bytes .../images/originals/icons New/arrow-left.png | Bin 0 -> 14365 bytes .../originals/icons New/arrow-right.png | Bin 0 -> 14387 bytes .../images/originals/icons New/changelog.png | Bin 0 -> 19817 bytes .../src/images/originals/icons New/clear.png | Bin 0 -> 1716 bytes .../images/originals/icons New/compare.png | Bin 0 -> 2163 bytes .../images/originals/icons New/configure.png | Bin 0 -> 13703 bytes .../contributors.png | Bin .../src/images/originals/icons New/copy.png | Bin 0 -> 1521 bytes .../currentmodel.png | Bin .../{classical icons => icons New}/cut.png | Bin .../images/originals/icons New/duplicate.png | Bin 0 -> 6684 bytes .../src/images/originals/icons New/edit.png | Bin 0 -> 1981 bytes .../{classical icons => icons New}/exit.png | Bin .../src/images/originals/icons New/fuses.png | Bin 0 -> 6599 bytes .../originals/icons New/fwpreferences.png | Bin 0 -> 82297 bytes .../information.png | Bin .../library.png | Bin .../src/images/originals/icons New/list.png | Bin 0 -> 20365 bytes .../src/images/originals/icons New/logs.png | Bin 0 -> 3302 bytes .../movedown.png | Bin .../{classical icons => icons New}/moveup.png | Bin .../src/images/originals/icons New/new.png | Bin 0 -> 2570 bytes .../src/images/originals/icons New/open.png | Bin 0 -> 20144 bytes .../images/originals/icons New/paintbrush.png | Bin 0 -> 9629 bytes .../src/images/originals/icons New/paste.png | Bin 0 -> 1594 bytes .../{classical icons => icons New}/play.png | Bin .../{classical icons => icons New}/print.png | Bin .../images/originals/icons New/profiles.png | Bin 0 -> 2312 bytes .../originals/icons New/read_eeprom.png | Bin 0 -> 18174 bytes .../originals/icons New/read_eeprom_file.png | Bin 0 -> 27588 bytes .../images/originals/icons New/read_flash.png | Bin 0 -> 25584 bytes .../originals/icons New/recentdocument.png | Bin 0 -> 18544 bytes .../src/images/originals/icons New/save.png | Bin 0 -> 4499 bytes .../src/images/originals/icons New/saveas.png | Bin 0 -> 10250 bytes .../images/originals/icons New/simulate.png | Bin 0 -> 10065 bytes .../src/images/originals/icons New/stop.png | Bin 0 -> 312 bytes .../images/originals/icons New/switch_dir.png | Bin 0 -> 6210 bytes .../src/images/originals/icons New/update.png | Bin 0 -> 12332 bytes .../{classical icons => icons New}/wizard.png | Bin .../originals/icons New/write_eeprom.png | Bin 0 -> 17348 bytes .../originals/icons New/write_eeprom_file.png | Bin 0 -> 26192 bytes .../originals/icons New/write_flash.png | Bin 0 -> 21730 bytes companion/src/mainwindow.cpp | 8 +- companion/src/mainwindow.h | 6 +- companion/src/themes/classic/16/add.png | Bin 463 -> 876 bytes .../src/themes/classic/16/apppreferences.png | Bin 876 -> 1122 bytes companion/src/themes/classic/16/clear.png | Bin 733 -> 1157 bytes .../src/themes/classic/16/contributors.png | Bin 999 -> 661 bytes companion/src/themes/classic/16/copy.png | Bin 309 -> 877 bytes .../src/themes/classic/16/currentmodel.png | Bin 668 -> 961 bytes companion/src/themes/classic/16/cut.png | Bin 511 -> 947 bytes companion/src/themes/classic/16/exit.png | Bin 1145 -> 1285 bytes .../src/themes/classic/16/information.png | Bin 736 -> 1129 bytes companion/src/themes/classic/16/library.png | Bin 912 -> 930 bytes companion/src/themes/classic/16/movedown.png | Bin 500 -> 998 bytes companion/src/themes/classic/16/moveup.png | Bin 492 -> 891 bytes companion/src/themes/classic/16/new.png | Bin 240 -> 739 bytes companion/src/themes/classic/16/paste.png | Bin 469 -> 1075 bytes companion/src/themes/classic/16/play.png | Bin 612 -> 371 bytes companion/src/themes/classic/16/print.png | Bin 442 -> 1001 bytes companion/src/themes/classic/16/stop.png | Bin 460 -> 312 bytes companion/src/themes/classic/16/wizard.png | Bin 730 -> 1155 bytes companion/src/themes/classic/24/add.png | Bin 1302 -> 1402 bytes .../src/themes/classic/24/apppreferences.png | Bin 1625 -> 1625 bytes companion/src/themes/classic/24/clear.png | Bin 1681 -> 1633 bytes .../src/themes/classic/24/contributors.png | Bin 1582 -> 1294 bytes companion/src/themes/classic/24/copy.png | Bin 997 -> 1167 bytes .../src/themes/classic/24/currentmodel.png | Bin 1173 -> 1423 bytes companion/src/themes/classic/24/cut.png | Bin 1589 -> 1623 bytes companion/src/themes/classic/24/exit.png | Bin 2023 -> 1578 bytes .../src/themes/classic/24/information.png | Bin 1806 -> 1600 bytes companion/src/themes/classic/24/library.png | Bin 1351 -> 1430 bytes companion/src/themes/classic/24/movedown.png | Bin 631 -> 1266 bytes companion/src/themes/classic/24/moveup.png | Bin 708 -> 1469 bytes companion/src/themes/classic/24/new.png | Bin 537 -> 684 bytes companion/src/themes/classic/24/paste.png | Bin 1234 -> 998 bytes companion/src/themes/classic/24/play.png | Bin 1243 -> 399 bytes companion/src/themes/classic/24/print.png | Bin 1313 -> 1524 bytes companion/src/themes/classic/24/stop.png | Bin 1161 -> 317 bytes companion/src/themes/classic/24/wizard.png | Bin 1323 -> 1676 bytes companion/src/themes/classic/32/add.png | Bin 988 -> 1255 bytes .../src/themes/classic/32/apppreferences.png | Bin 2262 -> 2246 bytes companion/src/themes/classic/32/clear.png | Bin 1855 -> 2200 bytes .../src/themes/classic/32/contributors.png | Bin 2155 -> 1814 bytes companion/src/themes/classic/32/copy.png | Bin 694 -> 1703 bytes .../src/themes/classic/32/currentmodel.png | Bin 1778 -> 1756 bytes companion/src/themes/classic/32/cut.png | Bin 1418 -> 1573 bytes companion/src/themes/classic/32/exit.png | Bin 2978 -> 2117 bytes .../src/themes/classic/32/information.png | Bin 1838 -> 2179 bytes companion/src/themes/classic/32/library.png | Bin 2548 -> 2198 bytes companion/src/themes/classic/32/movedown.png | Bin 788 -> 1750 bytes companion/src/themes/classic/32/moveup.png | Bin 797 -> 1643 bytes companion/src/themes/classic/32/new.png | Bin 485 -> 1173 bytes companion/src/themes/classic/32/paste.png | Bin 910 -> 1926 bytes companion/src/themes/classic/32/play.png | Bin 1540 -> 442 bytes companion/src/themes/classic/32/print.png | Bin 1860 -> 1566 bytes companion/src/themes/classic/32/stop.png | Bin 968 -> 319 bytes companion/src/themes/classic/32/wizard.png | Bin 1923 -> 2195 bytes companion/src/themes/classic/48/add.png | Bin 1443 -> 1817 bytes .../src/themes/classic/48/apppreferences.png | Bin 4270 -> 3879 bytes companion/src/themes/classic/48/clear.png | Bin 2812 -> 3768 bytes .../src/themes/classic/48/contributors.png | Bin 2257 -> 3178 bytes companion/src/themes/classic/48/copy.png | Bin 898 -> 2635 bytes .../src/themes/classic/48/currentmodel.png | Bin 3234 -> 2974 bytes companion/src/themes/classic/48/cut.png | Bin 2413 -> 3437 bytes companion/src/themes/classic/48/exit.png | Bin 5145 -> 3448 bytes .../src/themes/classic/48/information.png | Bin 3159 -> 3832 bytes companion/src/themes/classic/48/library.png | Bin 1961 -> 4055 bytes companion/src/themes/classic/48/movedown.png | Bin 1181 -> 2941 bytes companion/src/themes/classic/48/moveup.png | Bin 1504 -> 2843 bytes companion/src/themes/classic/48/new.png | Bin 611 -> 1812 bytes companion/src/themes/classic/48/paste.png | Bin 1369 -> 3365 bytes companion/src/themes/classic/48/play.png | Bin 2409 -> 492 bytes companion/src/themes/classic/48/print.png | Bin 3006 -> 2514 bytes companion/src/themes/classic/48/stop.png | Bin 1619 -> 342 bytes companion/src/themes/classic/48/wizard.png | Bin 3438 -> 3694 bytes companion/src/themes/new/16/add.png | Bin 0 -> 667 bytes .../src/themes/new/16/apppreferences.png | Bin 0 -> 776 bytes companion/src/themes/new/16/arrow-left.png | Bin 0 -> 405 bytes companion/src/themes/new/16/arrow-right.png | Bin 0 -> 401 bytes companion/src/themes/new/16/changelog.png | Bin 0 -> 975 bytes companion/src/themes/new/16/clear.png | Bin 0 -> 867 bytes companion/src/themes/new/16/compare.png | Bin 0 -> 1140 bytes companion/src/themes/new/16/configure.png | Bin 0 -> 1149 bytes companion/src/themes/new/16/contributors.png | Bin 0 -> 999 bytes companion/src/themes/new/16/copy.png | Bin 0 -> 530 bytes companion/src/themes/new/16/currentmodel.png | Bin 0 -> 668 bytes companion/src/themes/new/16/cut.png | Bin 0 -> 511 bytes companion/src/themes/new/16/duplicate.png | Bin 0 -> 792 bytes companion/src/themes/new/16/edit.png | Bin 0 -> 536 bytes companion/src/themes/new/16/exit.png | Bin 0 -> 1145 bytes companion/src/themes/new/16/fuses.png | Bin 0 -> 3443 bytes companion/src/themes/new/16/fwpreferences.png | Bin 0 -> 783 bytes companion/src/themes/new/16/information.png | Bin 0 -> 736 bytes companion/src/themes/new/16/library.png | Bin 0 -> 912 bytes companion/src/themes/new/16/list.png | Bin 0 -> 1071 bytes companion/src/themes/new/16/logs.png | Bin 0 -> 924 bytes companion/src/themes/new/16/movedown.png | Bin 0 -> 500 bytes companion/src/themes/new/16/moveup.png | Bin 0 -> 492 bytes companion/src/themes/new/16/new.png | Bin 0 -> 600 bytes companion/src/themes/new/16/open.png | Bin 0 -> 789 bytes companion/src/themes/new/16/paintbrush.png | Bin 0 -> 660 bytes companion/src/themes/new/16/paste.png | Bin 0 -> 568 bytes companion/src/themes/new/16/play.png | Bin 0 -> 612 bytes companion/src/themes/new/16/print.png | Bin 0 -> 442 bytes companion/src/themes/new/16/profiles.png | Bin 0 -> 665 bytes companion/src/themes/new/16/read_eeprom.png | Bin 0 -> 911 bytes .../src/themes/new/16/read_eeprom_file.png | Bin 0 -> 1242 bytes companion/src/themes/new/16/read_flash.png | Bin 0 -> 1148 bytes .../src/themes/new/16/recentdocument.png | Bin 0 -> 1106 bytes companion/src/themes/new/16/save.png | Bin 0 -> 3258 bytes companion/src/themes/new/16/saveas.png | Bin 0 -> 774 bytes companion/src/themes/new/16/simulate.png | Bin 0 -> 1100 bytes companion/src/themes/new/16/stop.png | Bin 0 -> 460 bytes companion/src/themes/new/16/update.png | Bin 0 -> 1003 bytes companion/src/themes/new/16/wizard.png | Bin 0 -> 730 bytes companion/src/themes/new/16/write_eeprom.png | Bin 0 -> 904 bytes .../src/themes/new/16/write_eeprom_file.png | Bin 0 -> 1223 bytes companion/src/themes/new/16/write_flash.png | Bin 0 -> 1127 bytes companion/src/themes/new/24/add.png | Bin 0 -> 854 bytes .../src/themes/new/24/apppreferences.png | Bin 0 -> 1517 bytes companion/src/themes/new/24/arrow-left.png | Bin 0 -> 489 bytes companion/src/themes/new/24/arrow-right.png | Bin 0 -> 479 bytes companion/src/themes/new/24/changelog.png | Bin 0 -> 1581 bytes companion/src/themes/new/24/clear.png | Bin 0 -> 1225 bytes companion/src/themes/new/24/compare.png | Bin 0 -> 1477 bytes companion/src/themes/new/24/configure.png | Bin 0 -> 1798 bytes companion/src/themes/new/24/contributors.png | Bin 0 -> 1582 bytes companion/src/themes/new/24/copy.png | Bin 0 -> 645 bytes companion/src/themes/new/24/currentmodel.png | Bin 0 -> 1173 bytes companion/src/themes/new/24/cut.png | Bin 0 -> 1589 bytes companion/src/themes/new/24/duplicate.png | Bin 0 -> 1227 bytes companion/src/themes/new/24/edit.png | Bin 0 -> 898 bytes companion/src/themes/new/24/exit.png | Bin 0 -> 2023 bytes companion/src/themes/new/24/fuses.png | Bin 0 -> 4791 bytes companion/src/themes/new/24/fwpreferences.png | Bin 0 -> 1535 bytes companion/src/themes/new/24/information.png | Bin 0 -> 1806 bytes companion/src/themes/new/24/library.png | Bin 0 -> 1351 bytes companion/src/themes/new/24/list.png | Bin 0 -> 1792 bytes companion/src/themes/new/24/logs.png | Bin 0 -> 1411 bytes companion/src/themes/new/24/movedown.png | Bin 0 -> 631 bytes companion/src/themes/new/24/moveup.png | Bin 0 -> 708 bytes companion/src/themes/new/24/new.png | Bin 0 -> 955 bytes companion/src/themes/new/24/open.png | Bin 0 -> 1270 bytes companion/src/themes/new/24/paintbrush.png | Bin 0 -> 1188 bytes companion/src/themes/new/24/paste.png | Bin 0 -> 778 bytes companion/src/themes/new/24/play.png | Bin 0 -> 1243 bytes companion/src/themes/new/24/print.png | Bin 0 -> 1313 bytes companion/src/themes/new/24/profiles.png | Bin 0 -> 661 bytes companion/src/themes/new/24/read_eeprom.png | Bin 0 -> 1395 bytes .../src/themes/new/24/read_eeprom_file.png | Bin 0 -> 1886 bytes companion/src/themes/new/24/read_flash.png | Bin 0 -> 1772 bytes .../src/themes/new/24/recentdocument.png | Bin 0 -> 1439 bytes companion/src/themes/new/24/save.png | Bin 0 -> 4069 bytes companion/src/themes/new/24/saveas.png | Bin 0 -> 1268 bytes companion/src/themes/new/24/simulate.png | Bin 0 -> 1402 bytes companion/src/themes/new/24/stop.png | Bin 0 -> 1161 bytes companion/src/themes/new/24/update.png | Bin 0 -> 1307 bytes companion/src/themes/new/24/wizard.png | Bin 0 -> 1323 bytes companion/src/themes/new/24/write_eeprom.png | Bin 0 -> 1378 bytes .../src/themes/new/24/write_eeprom_file.png | Bin 0 -> 1873 bytes companion/src/themes/new/24/write_flash.png | Bin 0 -> 1741 bytes companion/src/themes/new/32/add.png | Bin 0 -> 933 bytes .../src/themes/new/32/apppreferences.png | Bin 0 -> 3394 bytes companion/src/themes/new/32/arrow-left.png | Bin 0 -> 567 bytes companion/src/themes/new/32/arrow-right.png | Bin 0 -> 571 bytes companion/src/themes/new/32/changelog.png | Bin 0 -> 2209 bytes companion/src/themes/new/32/clear.png | Bin 0 -> 1736 bytes companion/src/themes/new/32/compare.png | Bin 0 -> 2136 bytes companion/src/themes/new/32/configure.png | Bin 0 -> 2498 bytes companion/src/themes/new/32/contributors.png | Bin 0 -> 2155 bytes companion/src/themes/new/32/copy.png | Bin 0 -> 976 bytes companion/src/themes/new/32/currentmodel.png | Bin 0 -> 1778 bytes companion/src/themes/new/32/cut.png | Bin 0 -> 1418 bytes companion/src/themes/new/32/duplicate.png | Bin 0 -> 1358 bytes companion/src/themes/new/32/edit.png | Bin 0 -> 1135 bytes companion/src/themes/new/32/exit.png | Bin 0 -> 2978 bytes companion/src/themes/new/32/fuses.png | Bin 0 -> 5149 bytes companion/src/themes/new/32/fwpreferences.png | Bin 0 -> 2095 bytes companion/src/themes/new/32/information.png | Bin 0 -> 1838 bytes companion/src/themes/new/32/library.png | Bin 0 -> 2548 bytes companion/src/themes/new/32/list.png | Bin 0 -> 2547 bytes companion/src/themes/new/32/logs.png | Bin 0 -> 1363 bytes companion/src/themes/new/32/movedown.png | Bin 0 -> 788 bytes companion/src/themes/new/32/moveup.png | Bin 0 -> 797 bytes companion/src/themes/new/32/new.png | Bin 0 -> 1491 bytes companion/src/themes/new/32/open.png | Bin 0 -> 2000 bytes companion/src/themes/new/32/paintbrush.png | Bin 0 -> 1504 bytes companion/src/themes/new/32/paste.png | Bin 0 -> 1054 bytes companion/src/themes/new/32/play.png | Bin 0 -> 1540 bytes companion/src/themes/new/32/print.png | Bin 0 -> 1860 bytes companion/src/themes/new/32/profiles.png | Bin 0 -> 985 bytes companion/src/themes/new/32/read_eeprom.png | Bin 0 -> 2057 bytes .../src/themes/new/32/read_eeprom_file.png | Bin 0 -> 2859 bytes companion/src/themes/new/32/read_flash.png | Bin 0 -> 2640 bytes .../src/themes/new/32/recentdocument.png | Bin 0 -> 2374 bytes companion/src/themes/new/32/save.png | Bin 0 -> 3767 bytes companion/src/themes/new/32/saveas.png | Bin 0 -> 1682 bytes companion/src/themes/new/32/simulate.png | Bin 0 -> 1925 bytes companion/src/themes/new/32/stop.png | Bin 0 -> 968 bytes companion/src/themes/new/32/update.png | Bin 0 -> 1745 bytes companion/src/themes/new/32/wizard.png | Bin 0 -> 1923 bytes companion/src/themes/new/32/write_eeprom.png | Bin 0 -> 2044 bytes .../src/themes/new/32/write_eeprom_file.png | Bin 0 -> 2833 bytes companion/src/themes/new/32/write_flash.png | Bin 0 -> 2518 bytes companion/src/themes/new/48/add.png | Bin 0 -> 589 bytes .../src/themes/new/48/apppreferences.png | Bin 0 -> 4839 bytes companion/src/themes/new/48/arrow-left.png | Bin 0 -> 822 bytes companion/src/themes/new/48/arrow-right.png | Bin 0 -> 817 bytes companion/src/themes/new/48/changelog.png | Bin 0 -> 3882 bytes companion/src/themes/new/48/clear.png | Bin 0 -> 1716 bytes companion/src/themes/new/48/compare.png | Bin 0 -> 3190 bytes companion/src/themes/new/48/configure.png | Bin 0 -> 4366 bytes companion/src/themes/new/48/contributors.png | Bin 0 -> 2257 bytes companion/src/themes/new/48/copy.png | Bin 0 -> 1521 bytes companion/src/themes/new/48/currentmodel.png | Bin 0 -> 3234 bytes companion/src/themes/new/48/cut.png | Bin 0 -> 2413 bytes companion/src/themes/new/48/duplicate.png | Bin 0 -> 2191 bytes companion/src/themes/new/48/edit.png | Bin 0 -> 1981 bytes companion/src/themes/new/48/exit.png | Bin 0 -> 5145 bytes companion/src/themes/new/48/fuses.png | Bin 0 -> 6599 bytes companion/src/themes/new/48/fwpreferences.png | Bin 0 -> 3705 bytes companion/src/themes/new/48/information.png | Bin 0 -> 3159 bytes companion/src/themes/new/48/library.png | Bin 0 -> 1961 bytes companion/src/themes/new/48/list.png | Bin 0 -> 4904 bytes companion/src/themes/new/48/logs.png | Bin 0 -> 2522 bytes companion/src/themes/new/48/movedown.png | Bin 0 -> 1181 bytes companion/src/themes/new/48/moveup.png | Bin 0 -> 1504 bytes companion/src/themes/new/48/new.png | Bin 0 -> 2570 bytes companion/src/themes/new/48/open.png | Bin 0 -> 3362 bytes companion/src/themes/new/48/paintbrush.png | Bin 0 -> 2704 bytes companion/src/themes/new/48/paste.png | Bin 0 -> 1594 bytes companion/src/themes/new/48/play.png | Bin 0 -> 2409 bytes companion/src/themes/new/48/print.png | Bin 0 -> 3006 bytes companion/src/themes/new/48/profiles.png | Bin 0 -> 1567 bytes companion/src/themes/new/48/read_eeprom.png | Bin 0 -> 3779 bytes .../src/themes/new/48/read_eeprom_file.png | Bin 0 -> 5448 bytes companion/src/themes/new/48/read_flash.png | Bin 0 -> 5048 bytes .../src/themes/new/48/recentdocument.png | Bin 0 -> 4249 bytes companion/src/themes/new/48/save.png | Bin 0 -> 4499 bytes companion/src/themes/new/48/saveas.png | Bin 0 -> 2936 bytes companion/src/themes/new/48/simulate.png | Bin 0 -> 3285 bytes companion/src/themes/new/48/stop.png | Bin 0 -> 1619 bytes companion/src/themes/new/48/update.png | Bin 0 -> 2915 bytes companion/src/themes/new/48/wizard.png | Bin 0 -> 3438 bytes companion/src/themes/new/48/write_eeprom.png | Bin 0 -> 3691 bytes .../src/themes/new/48/write_eeprom_file.png | Bin 0 -> 5345 bytes companion/src/themes/new/48/write_flash.png | Bin 0 -> 4735 bytes companion/src/translations/companion_pl.ts | 1986 ++++++++++------- radio/src/eeprom_conversions.cpp | 6 +- radio/src/translations/pl.h.txt | 6 +- 398 files changed, 1450 insertions(+), 920 deletions(-) delete mode 100644 companion/src/images/originals/classical icons/add.png delete mode 100644 companion/src/images/originals/classical icons/apppreferences.png delete mode 100644 companion/src/images/originals/classical icons/clear.png delete mode 100644 companion/src/images/originals/classical icons/copy.png delete mode 100644 companion/src/images/originals/classical icons/new.png delete mode 100644 companion/src/images/originals/classical icons/paste.png create mode 100644 companion/src/images/originals/icons Classical/add.png create mode 100644 companion/src/images/originals/icons Classical/apppreferences.png rename companion/src/images/originals/{classical icons => icons Classical}/arrow-left.png (100%) rename companion/src/images/originals/{classical icons => icons Classical}/arrow-right.png (100%) rename companion/src/images/originals/{classical icons => icons Classical}/changelog.png (100%) create mode 100644 companion/src/images/originals/icons Classical/clear.png rename companion/src/images/originals/{classical icons => icons Classical}/compare.png (100%) rename companion/src/images/originals/{classical icons => icons Classical}/configure.png (100%) create mode 100644 companion/src/images/originals/icons Classical/contributors.png create mode 100644 companion/src/images/originals/icons Classical/copy.png create mode 100644 companion/src/images/originals/icons Classical/currentmodel.png create mode 100644 companion/src/images/originals/icons Classical/cut.png rename companion/src/images/originals/{classical icons => icons Classical}/duplicate.png (100%) rename companion/src/images/originals/{classical icons => icons Classical}/edit.png (100%) create mode 100644 companion/src/images/originals/icons Classical/exit.png rename companion/src/images/originals/{classical icons => icons Classical}/fuses.png (100%) rename companion/src/images/originals/{classical icons => icons Classical}/fwpreferences.png (100%) create mode 100644 companion/src/images/originals/icons Classical/information.png create mode 100644 companion/src/images/originals/icons Classical/library.png rename companion/src/images/originals/{classical icons => icons Classical}/list.png (100%) rename companion/src/images/originals/{classical icons => icons Classical}/logs.png (100%) create mode 100644 companion/src/images/originals/icons Classical/movedown.png create mode 100644 companion/src/images/originals/icons Classical/moveup.png create mode 100644 companion/src/images/originals/icons Classical/new.png rename companion/src/images/originals/{classical icons => icons Classical}/open.png (100%) rename companion/src/images/originals/{classical icons => icons Classical}/paintbrush.png (100%) create mode 100644 companion/src/images/originals/icons Classical/paste.png create mode 100644 companion/src/images/originals/icons Classical/play.png create mode 100644 companion/src/images/originals/icons Classical/print.png rename companion/src/images/originals/{classical icons => icons Classical}/profiles.png (100%) rename companion/src/images/originals/{classical icons => icons Classical}/read_eeprom.png (100%) rename companion/src/images/originals/{classical icons => icons Classical}/read_eeprom_file.png (100%) rename companion/src/images/originals/{classical icons => icons Classical}/read_flash.png (100%) rename companion/src/images/originals/{classical icons => icons Classical}/recentdocument.png (100%) rename companion/src/images/originals/{classical icons => icons Classical}/save.png (100%) rename companion/src/images/originals/{classical icons => icons Classical}/saveas.png (100%) rename companion/src/images/originals/{classical icons => icons Classical}/simulate.png (100%) rename companion/src/images/originals/{classical icons => icons Classical}/stop.png (100%) rename companion/src/images/originals/{classical icons => icons Classical}/switch_dir.png (100%) rename companion/src/images/originals/{classical icons => icons Classical}/update.png (100%) create mode 100644 companion/src/images/originals/icons Classical/wizard.png rename companion/src/images/originals/{classical icons => icons Classical}/write_eeprom.png (100%) rename companion/src/images/originals/{classical icons => icons Classical}/write_eeprom_file.png (100%) rename companion/src/images/originals/{classical icons => icons Classical}/write_flash.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/add64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/apppreferences.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/arrow-left64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/arrow-right64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/changelog64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/clear64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/compare64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/configure64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/contributors64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/copy64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/currentmodel64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/cut64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/duplicate64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/edit64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/exit64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/fuses64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/fwpreferences.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/information64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/library64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/list64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/logs64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/movedown64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/moveup64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/new64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/open64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/paintbrush.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/paste64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/print64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/profiles64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/read_eeprom.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/read_eeprom_2.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/read_eeprom_file.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/read_eeprom_file_2.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/read_flash.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/read_flash_2.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/recentdocument64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/save64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/saveas64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/simulate64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/txactionico.svg (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/update64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/wizard64.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/write_eeprom.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/write_eeprom_2.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/write_eeprom_file.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/write_eeprom_file_2.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/write_flash.png (100%) rename companion/src/images/originals/{monochrome icons => icons Monochrome}/write_flash_2.png (100%) create mode 100644 companion/src/images/originals/icons New/add.png create mode 100644 companion/src/images/originals/icons New/apppreferences.png create mode 100644 companion/src/images/originals/icons New/arrow-left.png create mode 100644 companion/src/images/originals/icons New/arrow-right.png create mode 100644 companion/src/images/originals/icons New/changelog.png create mode 100644 companion/src/images/originals/icons New/clear.png create mode 100644 companion/src/images/originals/icons New/compare.png create mode 100644 companion/src/images/originals/icons New/configure.png rename companion/src/images/originals/{classical icons => icons New}/contributors.png (100%) create mode 100644 companion/src/images/originals/icons New/copy.png rename companion/src/images/originals/{classical icons => icons New}/currentmodel.png (100%) rename companion/src/images/originals/{classical icons => icons New}/cut.png (100%) create mode 100644 companion/src/images/originals/icons New/duplicate.png create mode 100644 companion/src/images/originals/icons New/edit.png rename companion/src/images/originals/{classical icons => icons New}/exit.png (100%) create mode 100644 companion/src/images/originals/icons New/fuses.png create mode 100644 companion/src/images/originals/icons New/fwpreferences.png rename companion/src/images/originals/{classical icons => icons New}/information.png (100%) rename companion/src/images/originals/{classical icons => icons New}/library.png (100%) create mode 100644 companion/src/images/originals/icons New/list.png create mode 100644 companion/src/images/originals/icons New/logs.png rename companion/src/images/originals/{classical icons => icons New}/movedown.png (100%) rename companion/src/images/originals/{classical icons => icons New}/moveup.png (100%) create mode 100644 companion/src/images/originals/icons New/new.png create mode 100644 companion/src/images/originals/icons New/open.png create mode 100644 companion/src/images/originals/icons New/paintbrush.png create mode 100644 companion/src/images/originals/icons New/paste.png rename companion/src/images/originals/{classical icons => icons New}/play.png (100%) rename companion/src/images/originals/{classical icons => icons New}/print.png (100%) create mode 100644 companion/src/images/originals/icons New/profiles.png create mode 100644 companion/src/images/originals/icons New/read_eeprom.png create mode 100644 companion/src/images/originals/icons New/read_eeprom_file.png create mode 100644 companion/src/images/originals/icons New/read_flash.png create mode 100644 companion/src/images/originals/icons New/recentdocument.png create mode 100644 companion/src/images/originals/icons New/save.png create mode 100644 companion/src/images/originals/icons New/saveas.png create mode 100644 companion/src/images/originals/icons New/simulate.png create mode 100644 companion/src/images/originals/icons New/stop.png create mode 100644 companion/src/images/originals/icons New/switch_dir.png create mode 100644 companion/src/images/originals/icons New/update.png rename companion/src/images/originals/{classical icons => icons New}/wizard.png (100%) create mode 100644 companion/src/images/originals/icons New/write_eeprom.png create mode 100644 companion/src/images/originals/icons New/write_eeprom_file.png create mode 100644 companion/src/images/originals/icons New/write_flash.png create mode 100644 companion/src/themes/new/16/add.png create mode 100644 companion/src/themes/new/16/apppreferences.png create mode 100644 companion/src/themes/new/16/arrow-left.png create mode 100644 companion/src/themes/new/16/arrow-right.png create mode 100644 companion/src/themes/new/16/changelog.png create mode 100644 companion/src/themes/new/16/clear.png create mode 100644 companion/src/themes/new/16/compare.png create mode 100644 companion/src/themes/new/16/configure.png create mode 100644 companion/src/themes/new/16/contributors.png create mode 100644 companion/src/themes/new/16/copy.png create mode 100644 companion/src/themes/new/16/currentmodel.png create mode 100644 companion/src/themes/new/16/cut.png create mode 100644 companion/src/themes/new/16/duplicate.png create mode 100644 companion/src/themes/new/16/edit.png create mode 100644 companion/src/themes/new/16/exit.png create mode 100644 companion/src/themes/new/16/fuses.png create mode 100644 companion/src/themes/new/16/fwpreferences.png create mode 100644 companion/src/themes/new/16/information.png create mode 100644 companion/src/themes/new/16/library.png create mode 100644 companion/src/themes/new/16/list.png create mode 100644 companion/src/themes/new/16/logs.png create mode 100644 companion/src/themes/new/16/movedown.png create mode 100644 companion/src/themes/new/16/moveup.png create mode 100644 companion/src/themes/new/16/new.png create mode 100644 companion/src/themes/new/16/open.png create mode 100644 companion/src/themes/new/16/paintbrush.png create mode 100644 companion/src/themes/new/16/paste.png create mode 100644 companion/src/themes/new/16/play.png create mode 100644 companion/src/themes/new/16/print.png create mode 100644 companion/src/themes/new/16/profiles.png create mode 100644 companion/src/themes/new/16/read_eeprom.png create mode 100644 companion/src/themes/new/16/read_eeprom_file.png create mode 100644 companion/src/themes/new/16/read_flash.png create mode 100644 companion/src/themes/new/16/recentdocument.png create mode 100644 companion/src/themes/new/16/save.png create mode 100644 companion/src/themes/new/16/saveas.png create mode 100644 companion/src/themes/new/16/simulate.png create mode 100644 companion/src/themes/new/16/stop.png create mode 100644 companion/src/themes/new/16/update.png create mode 100644 companion/src/themes/new/16/wizard.png create mode 100644 companion/src/themes/new/16/write_eeprom.png create mode 100644 companion/src/themes/new/16/write_eeprom_file.png create mode 100644 companion/src/themes/new/16/write_flash.png create mode 100644 companion/src/themes/new/24/add.png create mode 100644 companion/src/themes/new/24/apppreferences.png create mode 100644 companion/src/themes/new/24/arrow-left.png create mode 100644 companion/src/themes/new/24/arrow-right.png create mode 100644 companion/src/themes/new/24/changelog.png create mode 100644 companion/src/themes/new/24/clear.png create mode 100644 companion/src/themes/new/24/compare.png create mode 100644 companion/src/themes/new/24/configure.png create mode 100644 companion/src/themes/new/24/contributors.png create mode 100644 companion/src/themes/new/24/copy.png create mode 100644 companion/src/themes/new/24/currentmodel.png create mode 100644 companion/src/themes/new/24/cut.png create mode 100644 companion/src/themes/new/24/duplicate.png create mode 100644 companion/src/themes/new/24/edit.png create mode 100644 companion/src/themes/new/24/exit.png create mode 100644 companion/src/themes/new/24/fuses.png create mode 100644 companion/src/themes/new/24/fwpreferences.png create mode 100644 companion/src/themes/new/24/information.png create mode 100644 companion/src/themes/new/24/library.png create mode 100644 companion/src/themes/new/24/list.png create mode 100644 companion/src/themes/new/24/logs.png create mode 100644 companion/src/themes/new/24/movedown.png create mode 100644 companion/src/themes/new/24/moveup.png create mode 100644 companion/src/themes/new/24/new.png create mode 100644 companion/src/themes/new/24/open.png create mode 100644 companion/src/themes/new/24/paintbrush.png create mode 100644 companion/src/themes/new/24/paste.png create mode 100644 companion/src/themes/new/24/play.png create mode 100644 companion/src/themes/new/24/print.png create mode 100644 companion/src/themes/new/24/profiles.png create mode 100644 companion/src/themes/new/24/read_eeprom.png create mode 100644 companion/src/themes/new/24/read_eeprom_file.png create mode 100644 companion/src/themes/new/24/read_flash.png create mode 100644 companion/src/themes/new/24/recentdocument.png create mode 100644 companion/src/themes/new/24/save.png create mode 100644 companion/src/themes/new/24/saveas.png create mode 100644 companion/src/themes/new/24/simulate.png create mode 100644 companion/src/themes/new/24/stop.png create mode 100644 companion/src/themes/new/24/update.png create mode 100644 companion/src/themes/new/24/wizard.png create mode 100644 companion/src/themes/new/24/write_eeprom.png create mode 100644 companion/src/themes/new/24/write_eeprom_file.png create mode 100644 companion/src/themes/new/24/write_flash.png create mode 100644 companion/src/themes/new/32/add.png create mode 100644 companion/src/themes/new/32/apppreferences.png create mode 100644 companion/src/themes/new/32/arrow-left.png create mode 100644 companion/src/themes/new/32/arrow-right.png create mode 100644 companion/src/themes/new/32/changelog.png create mode 100644 companion/src/themes/new/32/clear.png create mode 100644 companion/src/themes/new/32/compare.png create mode 100644 companion/src/themes/new/32/configure.png create mode 100644 companion/src/themes/new/32/contributors.png create mode 100644 companion/src/themes/new/32/copy.png create mode 100644 companion/src/themes/new/32/currentmodel.png create mode 100644 companion/src/themes/new/32/cut.png create mode 100644 companion/src/themes/new/32/duplicate.png create mode 100644 companion/src/themes/new/32/edit.png create mode 100644 companion/src/themes/new/32/exit.png create mode 100644 companion/src/themes/new/32/fuses.png create mode 100644 companion/src/themes/new/32/fwpreferences.png create mode 100644 companion/src/themes/new/32/information.png create mode 100644 companion/src/themes/new/32/library.png create mode 100644 companion/src/themes/new/32/list.png create mode 100644 companion/src/themes/new/32/logs.png create mode 100644 companion/src/themes/new/32/movedown.png create mode 100644 companion/src/themes/new/32/moveup.png create mode 100644 companion/src/themes/new/32/new.png create mode 100644 companion/src/themes/new/32/open.png create mode 100644 companion/src/themes/new/32/paintbrush.png create mode 100644 companion/src/themes/new/32/paste.png create mode 100644 companion/src/themes/new/32/play.png create mode 100644 companion/src/themes/new/32/print.png create mode 100644 companion/src/themes/new/32/profiles.png create mode 100644 companion/src/themes/new/32/read_eeprom.png create mode 100644 companion/src/themes/new/32/read_eeprom_file.png create mode 100644 companion/src/themes/new/32/read_flash.png create mode 100644 companion/src/themes/new/32/recentdocument.png create mode 100644 companion/src/themes/new/32/save.png create mode 100644 companion/src/themes/new/32/saveas.png create mode 100644 companion/src/themes/new/32/simulate.png create mode 100644 companion/src/themes/new/32/stop.png create mode 100644 companion/src/themes/new/32/update.png create mode 100644 companion/src/themes/new/32/wizard.png create mode 100644 companion/src/themes/new/32/write_eeprom.png create mode 100644 companion/src/themes/new/32/write_eeprom_file.png create mode 100644 companion/src/themes/new/32/write_flash.png create mode 100644 companion/src/themes/new/48/add.png create mode 100644 companion/src/themes/new/48/apppreferences.png create mode 100644 companion/src/themes/new/48/arrow-left.png create mode 100644 companion/src/themes/new/48/arrow-right.png create mode 100644 companion/src/themes/new/48/changelog.png create mode 100644 companion/src/themes/new/48/clear.png create mode 100644 companion/src/themes/new/48/compare.png create mode 100644 companion/src/themes/new/48/configure.png create mode 100644 companion/src/themes/new/48/contributors.png create mode 100644 companion/src/themes/new/48/copy.png create mode 100644 companion/src/themes/new/48/currentmodel.png create mode 100644 companion/src/themes/new/48/cut.png create mode 100644 companion/src/themes/new/48/duplicate.png create mode 100644 companion/src/themes/new/48/edit.png create mode 100644 companion/src/themes/new/48/exit.png create mode 100644 companion/src/themes/new/48/fuses.png create mode 100644 companion/src/themes/new/48/fwpreferences.png create mode 100644 companion/src/themes/new/48/information.png create mode 100644 companion/src/themes/new/48/library.png create mode 100644 companion/src/themes/new/48/list.png create mode 100644 companion/src/themes/new/48/logs.png create mode 100644 companion/src/themes/new/48/movedown.png create mode 100644 companion/src/themes/new/48/moveup.png create mode 100644 companion/src/themes/new/48/new.png create mode 100644 companion/src/themes/new/48/open.png create mode 100644 companion/src/themes/new/48/paintbrush.png create mode 100644 companion/src/themes/new/48/paste.png create mode 100644 companion/src/themes/new/48/play.png create mode 100644 companion/src/themes/new/48/print.png create mode 100644 companion/src/themes/new/48/profiles.png create mode 100644 companion/src/themes/new/48/read_eeprom.png create mode 100644 companion/src/themes/new/48/read_eeprom_file.png create mode 100644 companion/src/themes/new/48/read_flash.png create mode 100644 companion/src/themes/new/48/recentdocument.png create mode 100644 companion/src/themes/new/48/save.png create mode 100644 companion/src/themes/new/48/saveas.png create mode 100644 companion/src/themes/new/48/simulate.png create mode 100644 companion/src/themes/new/48/stop.png create mode 100644 companion/src/themes/new/48/update.png create mode 100644 companion/src/themes/new/48/wizard.png create mode 100644 companion/src/themes/new/48/write_eeprom.png create mode 100644 companion/src/themes/new/48/write_eeprom_file.png create mode 100644 companion/src/themes/new/48/write_flash.png diff --git a/companion/src/apppreferencesdialog.cpp b/companion/src/apppreferencesdialog.cpp index 24a3a15e1..cfcb0b3de 100644 --- a/companion/src/apppreferencesdialog.cpp +++ b/companion/src/apppreferencesdialog.cpp @@ -2,6 +2,7 @@ #include "ui_apppreferencesdialog.h" #include "mainwindow.h" #include "helpers.h" +#include "flashinterface.h" #ifdef JOYSTICKS #include "joystick.h" #include "joystickdialog.h" @@ -339,16 +340,26 @@ void appPreferencesDialog::on_removeProfileButton_clicked() bool appPreferencesDialog::displayImage( QString fileName ) { + QSettings settings; + QImage image(fileName); if (image.isNull()) - { - QMessageBox::critical(this, tr("Error"), tr("Cannot load %1.").arg(fileName)); return false; - } - int width=ui->imageLabel->width(); - ui->imageLabel->setPixmap(QPixmap::fromImage(image.scaled(width, 64))); - if (width==212) { +// This code below just figures out if the width of the latest firmware is 128 or 212. It works , but... + QString filePath1 = settings.value("lastFlashDir", "").toString() + "/" + settings.value("firmware", "").toString() + ".bin"; + QString filePath2 = settings.value("lastFlashDir", "").toString() + "/" + settings.value("firmware", "").toString() + ".hex"; + QFile file(filePath1); + if (!file.exists()) + filePath1 = filePath2; + int width = SPLASH_WIDTH; + FlashInterface flash(filePath1); + if (flash.hasSplash()) + width = flash.getSplashWidth(); // Returns SPLASHX9D_HEIGHT if filePath1 does not exist! +// There must be a cleaner way of finding out the width of the firmware splash! + + ui->imageLabel->setPixmap(QPixmap::fromImage(image.scaled(width, SPLASH_HEIGHT))); + if (width==SPLASHX9D_WIDTH) { image=image.convertToFormat(QImage::Format_RGB32); QRgb col; int gray, height = image.height(); @@ -364,6 +375,11 @@ bool appPreferencesDialog::displayImage( QString fileName ) else { ui->imageLabel->setPixmap(QPixmap::fromImage(image.convertToFormat(QImage::Format_Mono))); } + if (width == SPLASH_WIDTH) + ui->imageLabel->setFixedSize(SPLASH_WIDTH, SPLASH_HEIGHT); + else + ui->imageLabel->setFixedSize(SPLASHX9D_WIDTH, SPLASHX9D_HEIGHT); + return true; } diff --git a/companion/src/apppreferencesdialog.ui b/companion/src/apppreferencesdialog.ui index 33cfe311a..9a7680a42 100644 --- a/companion/src/apppreferencesdialog.ui +++ b/companion/src/apppreferencesdialog.ui @@ -805,47 +805,6 @@ This is used by the templated to determine which channel goes to what number out - - - - Select Image - - - - - - - - 0 - 0 - - - - - 128 - 64 - - - - - 128 - 64 - - - - QFrame::Panel - - - QFrame::Raised - - - - - - true - - - @@ -873,13 +832,6 @@ This is used by the templated to determine which channel goes to what number out - - - - Clear Image - - - @@ -947,6 +899,54 @@ This is used by the templated to determine which channel goes to what number out + + + + + 0 + 0 + + + + + 128 + 64 + + + + + 212 + 64 + + + + QFrame::Panel + + + QFrame::Raised + + + + + + true + + + + + + + Select Image + + + + + + + Clear Image + + + diff --git a/companion/src/companion.qrc b/companion/src/companion.qrc index cdc68d4e0..832e5ef2f 100644 --- a/companion/src/companion.qrc +++ b/companion/src/companion.qrc @@ -981,5 +981,177 @@ themes/monowhite/48/contributors.png themes/monowhite/48/stop.png themes/monowhite/48/write_eeprom.png + themes/new/16/paintbrush.png + themes/new/16/open.png + themes/new/16/edit.png + themes/new/16/information.png + themes/new/16/configure.png + themes/new/16/list.png + themes/new/16/wizard.png + themes/new/16/logs.png + themes/new/16/new.png + themes/new/16/save.png + themes/new/16/recentdocument.png + themes/new/16/simulate.png + themes/new/16/changelog.png + themes/new/16/copy.png + themes/new/16/write_flash.png + themes/new/16/read_eeprom_file.png + themes/new/16/clear.png + themes/new/16/play.png + themes/new/16/fuses.png + themes/new/16/arrow-right.png + themes/new/16/exit.png + themes/new/16/moveup.png + themes/new/16/read_eeprom.png + themes/new/16/cut.png + themes/new/16/arrow-left.png + themes/new/16/write_eeprom_file.png + themes/new/16/library.png + themes/new/16/profiles.png + themes/new/16/paste.png + themes/new/16/print.png + themes/new/16/compare.png + themes/new/16/saveas.png + themes/new/16/apppreferences.png + themes/new/16/fwpreferences.png + themes/new/16/movedown.png + themes/new/16/currentmodel.png + themes/new/16/read_flash.png + themes/new/16/duplicate.png + themes/new/16/add.png + themes/new/16/update.png + themes/new/16/contributors.png + themes/new/16/stop.png + themes/new/16/write_eeprom.png + themes/new/24/paintbrush.png + themes/new/24/open.png + themes/new/24/edit.png + themes/new/24/information.png + themes/new/24/configure.png + themes/new/24/list.png + themes/new/24/wizard.png + themes/new/24/logs.png + themes/new/24/new.png + themes/new/24/save.png + themes/new/24/recentdocument.png + themes/new/24/simulate.png + themes/new/24/changelog.png + themes/new/24/copy.png + themes/new/24/write_flash.png + themes/new/24/read_eeprom_file.png + themes/new/24/clear.png + themes/new/24/play.png + themes/new/24/fuses.png + themes/new/24/arrow-right.png + themes/new/24/exit.png + themes/new/24/moveup.png + themes/new/24/read_eeprom.png + themes/new/24/cut.png + themes/new/24/arrow-left.png + themes/new/24/write_eeprom_file.png + themes/new/24/library.png + themes/new/24/profiles.png + themes/new/24/paste.png + themes/new/24/print.png + themes/new/24/compare.png + themes/new/24/saveas.png + themes/new/24/apppreferences.png + themes/new/24/fwpreferences.png + themes/new/24/movedown.png + themes/new/24/currentmodel.png + themes/new/24/read_flash.png + themes/new/24/duplicate.png + themes/new/24/add.png + themes/new/24/update.png + themes/new/24/contributors.png + themes/new/24/stop.png + themes/new/24/write_eeprom.png + themes/new/32/paintbrush.png + themes/new/32/open.png + themes/new/32/edit.png + themes/new/32/information.png + themes/new/32/configure.png + themes/new/32/list.png + themes/new/32/wizard.png + themes/new/32/logs.png + themes/new/32/new.png + themes/new/32/save.png + themes/new/32/recentdocument.png + themes/new/32/simulate.png + themes/new/32/changelog.png + themes/new/32/copy.png + themes/new/32/write_flash.png + themes/new/32/read_eeprom_file.png + themes/new/32/clear.png + themes/new/32/play.png + themes/new/32/fuses.png + themes/new/32/arrow-right.png + themes/new/32/exit.png + themes/new/32/moveup.png + themes/new/32/read_eeprom.png + themes/new/32/cut.png + themes/new/32/arrow-left.png + themes/new/32/write_eeprom_file.png + themes/new/32/library.png + themes/new/32/profiles.png + themes/new/32/paste.png + themes/new/32/print.png + themes/new/32/compare.png + themes/new/32/saveas.png + themes/new/32/apppreferences.png + themes/new/32/fwpreferences.png + themes/new/32/movedown.png + themes/new/32/currentmodel.png + themes/new/32/read_flash.png + themes/new/32/duplicate.png + themes/new/32/add.png + themes/new/32/update.png + themes/new/32/contributors.png + themes/new/32/stop.png + themes/new/32/write_eeprom.png + themes/new/48/paintbrush.png + themes/new/48/open.png + themes/new/48/edit.png + themes/new/48/information.png + themes/new/48/configure.png + themes/new/48/list.png + themes/new/48/wizard.png + themes/new/48/logs.png + themes/new/48/new.png + themes/new/48/save.png + themes/new/48/recentdocument.png + themes/new/48/simulate.png + themes/new/48/changelog.png + themes/new/48/copy.png + themes/new/48/write_flash.png + themes/new/48/read_eeprom_file.png + themes/new/48/clear.png + themes/new/48/play.png + themes/new/48/fuses.png + themes/new/48/arrow-right.png + themes/new/48/exit.png + themes/new/48/moveup.png + themes/new/48/read_eeprom.png + themes/new/48/cut.png + themes/new/48/arrow-left.png + themes/new/48/write_eeprom_file.png + themes/new/48/library.png + themes/new/48/profiles.png + themes/new/48/paste.png + themes/new/48/print.png + themes/new/48/compare.png + themes/new/48/saveas.png + themes/new/48/apppreferences.png + themes/new/48/fwpreferences.png + themes/new/48/movedown.png + themes/new/48/currentmodel.png + themes/new/48/read_flash.png + themes/new/48/duplicate.png + themes/new/48/add.png + themes/new/48/update.png + themes/new/48/contributors.png + themes/new/48/stop.png + themes/new/48/write_eeprom.png diff --git a/companion/src/customizesplashdialog.cpp b/companion/src/customizesplashdialog.cpp index 3b8240f6c..5e072e851 100644 --- a/companion/src/customizesplashdialog.cpp +++ b/companion/src/customizesplashdialog.cpp @@ -15,6 +15,7 @@ Side::Side(){ saveButton = 0; saveToFileName = new QString(""); source = new Source(UNDEFINED); + format = new LCDFormat(LCDTARANIS); } void Side::copyImage( Side side ) @@ -36,14 +37,17 @@ bool Side::displayImage( QString fileName, Source pictSource ) return false; else image = flash.getSplash(); + *format = flash.getSplashWidth()==WIDTH_TARANIS ? LCDTARANIS : LCD9X; } else { image.load(fileName); + if (pictSource== PICT) + *format = image.width()>WIDTH_9X ? LCDTARANIS : LCD9X; } if (image.isNull()) { return false; } - if (imageLabel->width()==424) { + if (*format==LCDTARANIS) { image=image.convertToFormat(QImage::Format_RGB32); QRgb col; int gray; @@ -58,9 +62,14 @@ bool Side::displayImage( QString fileName, Source pictSource ) } imageLabel->setPixmap(QPixmap::fromImage(image.scaled(imageLabel->width()/2, imageLabel->height()/2))); } - else { + else imageLabel->setPixmap(QPixmap::fromImage(image.scaled(imageLabel->width()/2, imageLabel->height()/2).convertToFormat(QImage::Format_Mono))); - } + + if (*format == LCD9X) + imageLabel->setFixedSize(WIDTH_9X*2, HEIGHT_9X*2); + else + imageLabel->setFixedSize(WIDTH_TARANIS*2, HEIGHT_TARANIS*2); + switch (pictSource){ case FW: fileNameEdit->setText(QObject::tr("FW: %1").arg(fileName)); diff --git a/companion/src/customizesplashdialog.h b/companion/src/customizesplashdialog.h index b4db9a60e..21155dede 100644 --- a/companion/src/customizesplashdialog.h +++ b/companion/src/customizesplashdialog.h @@ -10,7 +10,13 @@ namespace Ui class customizeSplashDialog; } +const int WIDTH_TARANIS = 212; +const int HEIGHT_TARANIS = 64; +const int WIDTH_9X = 128; +const int HEIGHT_9X = 64; + enum Source {FW, PICT, PROFILE, UNDEFINED}; +enum LCDFormat {LCD9X, LCDTARANIS}; class Side { @@ -31,6 +37,7 @@ public: private: Source *source; + LCDFormat *format; }; class customizeSplashDialog : public QDialog diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp index e4056d696..320378fc5 100644 --- a/companion/src/firmwares/opentx/opentxeeprom.cpp +++ b/companion/src/firmwares/opentx/opentxeeprom.cpp @@ -1165,7 +1165,10 @@ class LogicalSwitchField: public TransformedField { functionsConversionTable(board, version), sourcesConversionTable(SourcesConversionTable::getInstance(board, version, variant, (version >= 214 || (!IS_ARM(board) && version >= 213)) ? 0 : FLAG_NOSWITCHES)), switchesConversionTable(SwitchesConversionTable::getInstance(board, version)), - andswitchesConversionTable(AndSwitchesConversionTable::getInstance(board, version)) + andswitchesConversionTable(AndSwitchesConversionTable::getInstance(board, version)), + v1(0), + v2(0), + v3(0) { if (IS_ARM(board) && version >= 216) { internalField.Append(new SignedField<8>(v1)); @@ -1202,7 +1205,11 @@ class LogicalSwitchField: public TransformedField { virtual void beforeExport() { - if (csw.func == LS_FN_STAY) { + if (csw.func == LS_FN_TIMER) { + v1 = csw.val1; + v2 = csw.val2; + } + else if (csw.func == LS_FN_STAY) { switchesConversionTable->exportValue(csw.val1, v1); v2 = csw.val2; v3 = csw.val3; @@ -1215,18 +1222,19 @@ class LogicalSwitchField: public TransformedField { sourcesConversionTable->exportValue(csw.val1, v1); sourcesConversionTable->exportValue(csw.val2, v2); } - else { - if ((csw.func >= LS_FN_VPOS && csw.func <= LS_FN_ANEG) || (csw.func >= LS_FN_EQUAL && csw.func!=LS_FN_TIMER)) - sourcesConversionTable->exportValue(csw.val1, v1); - else - v1 = csw.val1; + else if (csw.func != LS_FN_OFF) { + sourcesConversionTable->exportValue(csw.val1, v1); v2 = csw.val2; } } virtual void afterImport() { - if (csw.func == LS_FN_STAY) { + if (csw.func == LS_FN_TIMER) { + csw.val1 = v1; + csw.val2 = v2; + } + else if (csw.func == LS_FN_STAY) { switchesConversionTable->importValue(v1, csw.val1); csw.val2 = v2; csw.val3 = v3; @@ -1236,14 +1244,11 @@ class LogicalSwitchField: public TransformedField { switchesConversionTable->importValue(v2, csw.val2); } else if (csw.func >= LS_FN_EQUAL && csw.func <= LS_FN_ELESS) { - sourcesConversionTable->importValue(v1, csw.val1); - sourcesConversionTable->importValue(v2, csw.val2); + sourcesConversionTable->importValue((uint8_t)v1, csw.val1); + sourcesConversionTable->importValue((uint8_t)v2, csw.val2); } - else { - if ((csw.func >= LS_FN_VPOS && csw.func <= LS_FN_ANEG) || (csw.func >= LS_FN_EQUAL && csw.func!=LS_FN_TIMER)) - sourcesConversionTable->importValue(v1, csw.val1); - else - csw.val1 = v1; + else if (csw.func != LS_FN_OFF) { + sourcesConversionTable->importValue((uint8_t)v1, csw.val1); csw.val2 = v2; } } diff --git a/companion/src/helpers.cpp b/companion/src/helpers.cpp index d12d900cf..e3d98d9fa 100644 --- a/companion/src/helpers.cpp +++ b/companion/src/helpers.cpp @@ -924,10 +924,13 @@ QString getTheme() Theme="monowhite"; break; case 3: + Theme="monochrome"; + break; + case 4: Theme="monoblue"; break; default: - Theme="monochrome"; + Theme="new"; break; } return Theme; diff --git a/companion/src/images/originals/classical icons/add.png b/companion/src/images/originals/classical icons/add.png deleted file mode 100644 index 9a1ec67d003488bb0114bb921125641a5c3090f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6773 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 vq9J$(yKdh2;kCE!C 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 diff --git a/companion/src/images/originals/classical icons/copy.png b/companion/src/images/originals/classical icons/copy.png deleted file mode 100644 index c3bd1a2ccd0944e7499ae952d9356e43094b2424..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3485 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 diff --git a/companion/src/images/originals/classical icons/new.png b/companion/src/images/originals/classical icons/new.png deleted file mode 100644 index f15f28a4a4b0904b2d1c518048f15ee24e94e569..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2216 zcmdT`ZB!Fy7QXY5WC8?|phhC-NK8zr*dWwx>#j^_KnS4VqD9(sNMdD?E~hGZplX*% zQZPYLX#j;v9i^=uKvB!@=pmhr^=vL|K)<$I4g-UJRr3#73P7?m~oIRfIkN)V7 zckY>Y=Dznn_j&Hzv1hGZAqtWQ0e~niRkxb6v~Ll7?%KWF*vA>+rqp#M0KwtDg+SB6 z+1w`n2W_Sn;KZICu51T)Pp(g0oe8i_$vImACcT^;1=y+q7&8DocK|^4>YMq!DFDRW zG@Ul5{JP2Q^(JCx=-S#^;|vB=q$jMmlsEE;f`SuSMR6L5rlX@H*zJ0-mnVk|MeH?g z#I1YZT*&vjC;u&xzgHoMnZGXxP}?vLyLWi5w!Ls@zr%4`pt49B$F)M|UyrT|3knL_ zGSIxN3|IH?doCOn8nZAOP+8Q7No-iZKK#PAiLoKCBGT=78G|sdH1U*=!C^c+hbs1aI=LvB6YK(I=rJyWBWA{5l9 zK)wLPRiaatR$i8!ew(0+E!tWF(82^{kcomAgtEi4*-kw!m&^08#_1<&3Aqq<*qOGr zS3W*__AH9MoZ4J}b2I8M4Zn8pD~Cf)>kJ%@r5mrj^BSuo1#3P@87M~x<}yyT=;#k> z=z|1R^m%{(BD3AFTqC)pSR*L4&+%6u`!eedB`W4C(UOvqzP~sYc1w}3TRE+8%p^e1 z@qy=8;UvTe2c^j8ZPVM;J500srHw>ko;1LK1h(?*nfN7ZG6}7rQ!dvXVNg)D_O`9S z4kVot4mEN!V>FDMDr3$dr6EmA`9|@aIs+ANXP)LUI^)KT8?Roz9G6T{)PV+{OKwWb zt|^!?NxE-!3#t+;Jgh=qWi++x;E2|a=R~o3OdKT^JF$!mZ(m#DmvmE!u)ZlG1vmV^P{pnuDXsX`di1`|4 zw#9j8;1E-#*z(=N?c3-21WL~*nBNg8{Fu9a0l$lW-O`d!zesm)^7o_Rjermok$(DT z-|~~p5(0k*r99(@srgm9W>3^k{T z&96WIa`FP-MDL1guX_+|^X~rVpQh^2EVn@KXx@dOw#w=!?tfGG#nJ6))Mka4WFf!R WAuSwmy~X`iKw9!j-TO%f%YOlYnDrU} diff --git a/companion/src/images/originals/classical icons/paste.png b/companion/src/images/originals/classical icons/paste.png deleted file mode 100644 index bdec2e65eb531e53834e68c45b04b41addf49055..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5218 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 IJ16CT05(L~fdBvi diff --git a/companion/src/images/originals/icons Classical/add.png b/companion/src/images/originals/icons Classical/add.png new file mode 100644 index 0000000000000000000000000000000000000000..24cc027da8949678a6a58c8d3c106cc95ba45ca1 GIT binary patch literal 5539 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 literal 0 HcmV?d00001 diff --git a/companion/src/images/originals/icons Classical/apppreferences.png b/companion/src/images/originals/icons Classical/apppreferences.png new file mode 100644 index 0000000000000000000000000000000000000000..1f6613e4061cb2e049cff729bdc56cbc24e74f2e GIT binary patch literal 11170 zcmV;TD_zuyP)A{#KF@QWYhB6ro^!t6^V`k_(`h9Kd7≧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
P^cj$B1pqIM5%~1(ZFYQzhsHnv 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 literal 0 HcmV?d00001 diff --git a/companion/src/images/originals/icons Classical/copy.png b/companion/src/images/originals/icons Classical/copy.png new file mode 100644 index 0000000000000000000000000000000000000000..2aeb28288f58ddffdd1d75115f170c5bf2773814 GIT binary patch literal 1338 zcmV-A1;zS_P)3P|jKV4ArrNQZsr&q&3Fam_48Lh`MiYI|sB6GiaYuZZ? zasnKC=d9Ws*vOa?K!llv;~9}LDH=;*C6q)snnH7j#=aB8{{oN_lX)cZ$XJrkAB0_u z!sQ7f5=*1>!|zQrby)$h>)1Bcke)jH%(>@ZE)hRgo<&7f4Jw)5udTzKv5Ch3thOcm zx#)*$6jZ zxjE=2CQwjNfFaFqeBMc>`320FTpYmRPeJsB@I$Z8%>Zil0#HL{*yW1HLMx&9BQ>hew>g`42C!b-4K{%G& zPNKpdi`TSeSQ5jt zz}D6l-wA<00HP?u@AqSEZ4IXsmC*dI=c&nj!3&r@K%3kE+d(!rH~Ds?RumQ0==)XR zsU3kw0Ovao0D#OTfFv_dBoZhqui^lIxB!co0iZTo)dw&I|ClF}JUvZG$*D>XptrLF zi9N;m7cj8^d~x*v0Ho^4m=ue}P^PGYdPu;S8Mtc&=A4=P=T~F|kkV6X0*FSV+&mNt zp}4dH*9HaLW{2dU0UTt+1SmUX21q@ea}t@;xj-PrWmUM?EueooW3GLWY2c%FnE?J> zJ*6hCuC8*3w@NB-xmUnF8@PU+0q)ELXD;m%K&qWYi;j}haZKLWGrnrG9>`fBl6@D%o`^aXzvlAyk=W}Pc`B^ahku5Y4`j}CIOJCBx$u% zLNX5qgK)WA+>l;M=(ES;f!poI@e{8lpM9a6Ogos0nT|fmct-%0O2q-B6)w#;8B$U@ z_bIi*;ou_U#l=Mq_2TiDT=X8flj*JiEiEl>>0qJM(w7a5mzS5}^Z8)2+4y~FX^BG+ z0F4U^3(c|s(4vx3lM#*SPTzP`J2hanT6y)<3jNMtFeLKw^6s-|9N8B@Q&W>$nrBK+ zA`_~b#ukg2H$b09M@J)VZEfEC{CpGp+d-zXy_)|gKy!05p8`rp5L7=^KR-Xu>(*#A zk-EA%=fkvJOdl{E&Bk~~0Hsptb~>HBVoFMHK9sb+zTTOWlOvfHXH#`n0F8}}Zi~f& wfq{WYZEdYHH#b*S)7=30e@0BgL78sX-$OZ87=>`i1ONa407*qoM6N<$g6NH5LI3~& literal 0 HcmV?d00001 diff --git a/companion/src/images/originals/icons Classical/currentmodel.png b/companion/src/images/originals/icons Classical/currentmodel.png new file mode 100644 index 0000000000000000000000000000000000000000..35a37b7667d5afecc91e54a0a6300d5aa41da84b GIT binary patch literal 10941 zcmZvBWmFtZ(C*;w!3n{GySvK*0XA50vbej;;tN?Y>Yr3ne`l;&f7|nM|IG7Ze007{qD9eLiIP^b4M|~;3Nt%zpFw~E#O7g(d zf6pP=eCSIJhKuqC_ZP1Gzoa;7FZo}kmy3+`3y1zMac}Wt0|3jsioA@r&&qM2ZIaQV z=eqZ)pOt?V9I`;Ax z*PPpTJFPo+^RdKB(6X0;Hu@0!yjD&rSMYv41R~wU20d>)+B0Nix||)iHgAtjj8_2NjshH?Y1@xCzl&;Va-DaatVW6qD+)V$5sX?6GM?*n$`M~f5X zi|bo7nYE|L__kC+&^}%M>j`;~0fT_PVX12)k?5tF4UT3ZR!A12D=ieH~l%OF0bylHftZg>W&=OJ^Dy{^8 z{SAO%o8Io5PE$}8y_pv{u-1-j;_WJCe6rC~GVHY_tIjSR6j0}*4wuB3Eeu`?zNYNO z1#Y7Xo@4ZdOQfb~icnht9T|6{)04yFBfN;O)upyS4m+s7W*FW|PZy%~_5SmIrUsVa zM1gCOk=EqP(*l&GqxiG(N68`iPnshR3;fk4i&rkvIO6yodkB4G-`+}IiBz|44`osv-mE{XB+u9s`qoGVf;Z_c( zW5NzAlnhoS##+@y^d(}}Bbp{On*9oxs6HDr=VfG>QVw)(24x%`G^$WmL`{GNz$}H+ zQZ1OfjR$yq=^V$7$PN&|_tpH_FNXn541W9#Kuw=u!4^YBJ1?VKCVI{o4(PQNmE)%l zEoJwrDr>KX7xpl2;_4QMMo}O~5dyVc=a@j)mMll%|M6%!R|e;?1c?O3Q5U`IFi~q&JvH+g@lWEh_YGj-#!?wLh5b! zcDq8{ssH3s3U6!m%b`Kt+OdJ#ue-rb%lykCrR+F#t+xNdT7)K{Hpb}Kf_?_Y9C^na zFa9e;5lMhm9wMh2b+zT=tg-5vH}^jOcB)wS(YXRaF^^qPt`WHVARA?XLq!4X zb!2Yb*K0gVR7+9^CCGXB{p!Wmm?ydhBLMx_w$btepQ{M{9A1n*9j~}S8EwX9`8YjO zhycY$1pcn}-VJsnjhdQSMA7g9zNu2JcG;8om3)P8Udlbk6Pxl{`>kA|y^f&rW2hVw zP_Wc@c0%7#njgZ7$opI2S$VC2XJ-|mZf1?p?quK2@wbuvX72F6<$gIhDlRc#AU1WL zF?2geLDY@^K{~@ltau|9lQot?E z;&h14{FpxO2wncZW$;;7JBgM==nK5)dSvE$(uQHS#MVHLMrC^%9wLVTwL4f`9@g+U z%*_vD|2p^VrZFDeIwXQ$dGoWM{y6zZLd%Zsq;FWMt!wc9QsG`L&FfOMj~wb}cy2q_ za#jc*E)iV(1%Z+GNHgUKa+x-9<+swodT6@_^t+GKOfg-j2!FFQf+>K%O2L=I$u|1W z=x@bP>k*P7ILo9?ub1k2-l*7>7xn5oP|`5l6#~36-WX=w#zK z=3m|kjqe$7@})RL;QFSem2ZfW9OC-Y*d1+S5hyo!?!9?<=6Myr$K|5$>GFPkdy2X- zxOGm}JV7~)c3`YFPF}6-h&F&sH*HfYZ@A$e=*(mss1Bcap;*JQ5^ea%V&i4U_=qG${BcI_be(hZ0Xjjm^kH59> zD?5w01tekZlg(bfgsk^uup3bxG zvy>u#?T79aJ5=A@_seAXM0fRydP@9CtDDm*D7@b(G6#9vpY++#4vHU7$<2?ZuJu7` zdSiKO80i2pRqpiK_a@BA&p0s14*9Mqz9qva_EiH4N5Fu}Sky;guxNmP|q{+ZoofVxDpzlM~q;>XiBwXk^xn5S^ zHx0ZZHBd)-W8N^ZS>q2k^&rIzxHGnjBr9^o(XBDd7g=8WcYbJ)N>`x=QUJ(+ikZ^R zuW|k|9W`>G(P*2+rymcf)JTxHYA*Hs_<^sc@sVO^9V@aKHSOTJ&vbM-=*WGHbZ9`d z89_2KBt`jyJPo%njWA6Toh4B+AcMi;NQWQN4q`=%OHLUBgH#YRLB73upQvbII77;q zmMSm?z;^W=3Nkti)p*NmR7DWWhx*r|z71DAd2Sm0#%EW(U1Hrk-pQpr{DM)MaP7YX z^b&a*!J9LZ__GocdFS&n5S&1z4mQuTwoQr+Vl?atqWIi?e)T-}p|q6NC@oZOJkAMj zk4bWCc|s4YR|E((Y+KsMUtYy)d}r!C=L+VEul{^1h`%?{I~IKB9DIMhD|NFkW#d@$ z{8|pH_lr^NVL1)eugxyjtxBQRSPuyLW3@AmGu^3M9KncbhN>nqorb7%vbSmvqLmI> z{^RbMb2dv-upnI&k20=UMLK6wp9zrm<{!kna^MXTBz&g@ozC?O*U#0nLU+@GnFf5$YxwUKCol?cH@MD8xJiv3p;KDw8Ts&+#=87T<-jTcSoT9Dr*E7^aipzRn<1~(6QM)UPb4j`0P#2Pjs3G zB#CL~m9>q+V>UZ5@2VnxDq=*0LZ&#aO`b2Dd(W&*gU_0`!0;v+c@aRtM|ufa1|Ogh zCoS9B?wf)1zNAG#JH=BH*LVk)vbD5tXMSqSvX_R~x7ttLZkYG0&V%BN6VMWQj$9|u z=tS0=PD?F1Nm+l8cCaJwU9~kH@LW>Qr*h%j%j~LvmElR_`ud+i5L?dpbWi`^zdZgt za2Xr-wB?W05W+oa2R@~_y_P0{Mo0jCTjYYS0LP3?)y>=BqvAJD`%^)W?!*2cHEga+ z*2xT&2yYtb63s_~KtS!8&rj?TX)?^$z4 z5a`u~pw$qVti9pWSxnVKD}8$NDYoGS+XruTP<=&7ZYublDoa@e{sjn*3^jt@>6{*v z0_ETZXOEZ>L@mo8R{?)>7Y9iyc;kIS{t2RewC<-5WIsb|{8g*Og^tWS{fqNAMG;3A z=oD)hxLqYwH`+JUq*H!wO68_bBdh#yL5XVkN{=M|96ip~H;MYFS5 zT3USM^mMfF>Z$HlJv<0(8uwJ2W3eHbbO=I&#eq zsxT~P6AF{0lHCMq|Eh23&5N0CzAn0cQ>aCx{Ff#YU~iB7hq*3mi;#yNNOJ8fRz@_e zIr5)vxqSoriak8KDuEZ-5>lzJ*uZ1qwTESC;8fXYa@f4v_wwFjkx$-O&HK@Z?9%G}Hr+|S zW~;TWjzj=O(X_M*5((ToxDDv)8I_oQ_94|02aj5t*^qdA%fVcVhZ{a`d^$rTK<`|e zTc7F|?5z1Q{l0FDGsCK}Eyxy!sMz-Ehd$%KX8XxUec38>T0NCf6xjTW(PTj)#c2j~ zMQe`_-U}+;m{0>-GrplJqaMwG-(Rm_4m0nl#h&z4t9okN)7W^K+_`ZOr~!oIvAxyy zn=l}}`y@nAu4%QGG!1xqOg62T$0S{j=N+mo;|{QVP5&O{!MSFYjVrP9V!uc&DPaL1t={N6j$zgWIDQjV<|H` z5ad6$A{XoX5xzP3jsf}MCa5xMt#%j@YSquVteaYHg+hoSjj@ywpMED^WBTr+gK#lt zg5h#6wTD$LM=YaWxxCrD1}m&I9jpp~|0)J@mj(~#xwIbq(!-G_4Z0roW6gVBUtQdZ z$+;^Yp7O9$G&E+(iJbhzje{}Cu;dhxvqVB>vnmhfIJWj$p)TH7`~wA)Ll@Y^Dtq+6 zGzInCJh?;7sw#1DyLqIwhHM)YUOR*$LNX@U!S3@!GvWj~^nR9I!&+}jIx(PMGB<%b zhhY}uHr@u&)-ZrpMDkHX{`eL4t@N_E~UZ1+j(iQFo#@=Yvfv zQV;M(5SD4`O@r>1;=(~%8H-}n*_N!bYiOyI5YTszjk&zxN}Lc7Y#pZ`&Ogd1;&dRM<@TiPFj2=T-yuN$ z+zVm#&78zzD&vmK34^psuKs?g+Q}9xnK8N9zKGQ6{E8F;MjXtIA5G?uB% z6N{-eCgqC}uO_rX>7#B~qDxB>DeV(j_FBQM3@RSEucU}MR0wA$h+ zaIPx#9j^O*t9voo<(Z!o>TLKGgu}!2Pzm;}#rjDcN({8V9+Mb(fpBgsGo-p7DOrz)q%~9ITOH^1L>itv-2x_)yJj|m9$}8W zwz0%As62J*R?flIyr0(i-2-dcZ&o%MvV+Tgcb`9^J$IXPy#V4BrXrdUw|HB~VQTuh zP)&PmtvdX!NZmfpocs$pkSYm~AZUk)E@++@^ITq20-Y4m8Gq6?x;!9^$*fh>l)`KJ z8~oGYF+-|`=p+oA+y`m&9Xz)>R!HTrkSWqo@rL-c3)I#ur1!>dDZtc!eY2gs!tEmw zzs^1)@X0LQnEl+!7UkW%BpcUS-4_KVv`+9|r|?ETVM^8A1Jf^o%^{&lJgNlgRj z;A;MIwF!17BdYAr_V$NX-TyQ^I-Qo9R6l$!h1U4TT_~0mXpiw1V91o}kXJeKq`CX} z)&%h$I`R*-)YShD(BVdbX~h>ZGt%bNm<2FLY_X}tsijvr8+&K;h|%u46B|IjSOSf4 z^(wIWS5Oq6;-^yg>nIFB`g;i>z?S-*)YRYKraxKSJzz5?L9?y1-iV#fL6m!!`6mEO!bP{E8?7(|TZWa9RsujYKG{{kOwJCSvE_$8Gr}s2sHseIvNhPRt_tG3uJTXH?W1i= zo%#)Bzc^a6*P8E@lGc+JJEH;j-}^(p#CE{4OX#*|Nt}${nf>(}^0gf>3A9z4fPvCB zvDxJL(adJ8g9P5cjqSuA3zR~nQC`&!t+D^{bJpOxdYt}3z1s0)8BcPNG)5qzt1EbG z?Sv`y%9zZQ4dv1h`jHENZwV|SGi70&E6Xa&s`Yii1=AUK=hO4m?xci9eE81MG*t1M@L>wN+JtvHpI~F65QoXuOH!jn zbqrcNy+21{7a?H?fLSG9IJn~cu^rETH(%g|8Xyvbx)CHCXuQLp9S32-Lc6|roWUdJL>o#!zW;~ni3bwv;&lCBMpv{58Kk;7AW7R@a^ypIrtE0lA*-gLtt^KoI zeEk>Ea-Qjy_@}i4)1yK{{Y|oD@1E>54r!-M=AMCR93&id^X+r;>)SK>V|5(QGov2- zuS|A$oUfa5il48fp8eSge@KpM^B})PaPBQIv&lrm?xz^fThM=+MpVC9bsD}r9&X7i z9$GCA;=(82jw|kALCn*co|`a4P4H?ZD9q;}S>*q2;XssymVo;Th(_lMxP?PRNvGr- ze17$2qcuS~gweyH7E8z=bu;VLha6;RC@U(0A=1j^A=)p5t@0TC*Ggm&BXiaXR|JL0 zJi1e4V$+mbZ%5E9~LH#$mkVZ}<^Xyp{)oGY#pl z$*e=q`(AD|@&kTttK_v$$(8`g1J^}hf3^Jv3Z^xSikoXg4s<)%q*FesoUk1Y1)A)L zLcXMXQzBFmK=a$JM?wOI$SM<~f};y(5v+a7ZZ{t3S`_aSwCi%X3)aH7ItTH*N`lso z#Mb?d7pJFfLPaQ#F3&R7Bkz6K2n4u?KB9TjA0QzBbYH!D{_U!l%1BMfXZZgzHS-@* z$0=sMC2#3@|6tA0>ohd}9XrtspCt)b_uJoIZ)DMHvkV5aN1&W2Fv6lidbiW@uIbO6bp+K5%UfmKxqUCW0 zK1w6sjqqtui4{dtAnnUZ1l6f7vi zuIA|u%)YTWFt6N(oggoD6v#BrYn<;)pF8`fa%~PB%VS&dwZeJ{u0q};J>b5mM_C(G zyf8oi_VY*|(X-n_bXniSN>A~MQ0L$|aatNP@tA(D!QjLm-RvlP_~AW4Pq*IVy2pBC zXiKzrVs4|l!1QX>OJ03^p#6ygVSWq9$dcs0$B`7}dcx&Hg$vQgQnuV*b9MyQQZt$$r9+tZyhX#BC-rW!!cpX(ucX|I{wYJgWeB-U&-e9!US=v?mCKtf`%$LNwoj#xa!~Zz zW3|Q8&@(7sPowRw{T1Pz8aY-f2KyufPa~MKR{&D`-8s4mtUVGC=yF|l+0uh28FW-W z!ExyNHmt)B*Lbm|rrXg^AEo9)C1Fb^VXnUntz?0mGoLf%-r<4Iu3rz_YB(7w8NZ>H z#e8?FKuNzgK-_LcYN`r@D4oZL&q+WfKWA$#JGaXikSW<*;rx*~_qnSDx(qMr;C(;V zCF;acZ8a#GY@i3?v~0L*@85#QxG?CRNVpZ{l@Pd9i+dRR=uACc93RLWHEjFa|10p0 z9;Y`u83wYgdaJ`6n?To-{@3 z^QT`wK;U2HeZgYlCx$Tvtd}WJGco*nY4qc6UElZkS5-H-&SKWoQ>-{Go33adG-%M_ z<`_`=F*d&EDa4C!e#tByb6Vf*`!ACi+NMCQ!yQbsU>;^`})c5=4(nv4z_lb4Ob-fAdl^gh&(aQu5jM`LY?q$OIz02oa)92Z~8uM#y8W^c^VIGTKL&|N_0<>kF&x;_st(b4|Yf%%|dx| zBciz0jGAX+pMUT2wdtPfv3*a?Oxs^Vv{xmch-0ejO3T#St-c%-d8<{YO;M5pf-}PA zbHR4+K58-z^ z$x;e7F1ws##`8nnG`TomEj6#S{(G=Td_g=B&&ciTNS=D(`_NgOzA%n830fvmVf@oz zD&qdNwpfTOT%Rp-yxl?2P^D}x!8RKgGO?3uc=r+Rv460alE!>_RdB=~HzZp5Icn0; zMzn7|{#AJe!nh3WAuq=YhiS02-K6VJ9J(=rnGj8+2Sk8Q*09*Cs9omS@r0AV*h3)c z`gQKqhCy;82a`0EjY06o`HTC;?av5w2pY0>@qgs_&af7q=4R}BVM!x_@SvWuR>EWDOKqc%ddg5j z1R1qY)u%96)~lhY3~q@$f{lVYaIN}E?8}z<<@Bubk4`u~QP9=I0tlAELK2%EAlX|D zr6cHfrDDw-PjNqSnRJ}|EYMk(-7P8FIK8q`?`H(tL?AJDjh1)Cda^{=AaI*KIL zSB`(C)~H~cOFvSjzy2j_z>o$$1daOkmd}PCcFffra$?X5ej5D9QZUsCg0E88Cj4fm zBb49X>u~CnO{+C}qros2aYY|EYpm0}9;jbk4Ni z&0GwAvX;Eq$IJ8G&SmEeH@3#W!Evhu-*Xyva-+(B6fNSx*eCfomHT>+k|Lk_2S1m2 zS~O@$$$7I!6`GhUwkqt>bX9QZc1)1Q`Oq22cck2g9F`P*q=@o+@dtNMAkMc&*laBQ zNF5ovCpZN(_m5D}}VMEYH` zX?F2OSx8RYF1_I;SL@hOcozH(H0j{YU}5^M1Bsror^fl&M6x9@%$*x{n>{bsiO*A2 zc2ImElqEnc=Zj8*wff_h2Nf|2qFTkd%@bfroJwTtX+E}cJ6YaYmy&uY&$`9cm|vCg zj#!r6Fe81`s*!Qn)hM`l;AS2!FJE)0s}ov%nC-aw?rwHrX2GE__ejdGfrH}IuI5#2 zTrs*tIbkRYeHJ3iA77-awIQ+JlvptqqN8Nvw`b76_eeK7DBMFnw4T3-)GSxcxeyzm zj;>ycn&3kHDl;eEsQnrKoeYkLc-wZbKm{hF2!5m=uV#wCb{WwmX<)XRLnr+VohohC z$<9}It#pWAURI+0YRjkL-?RMcN{gO{_Q4l^wpKyD|8|4#`3igwX5Qwj{wY%*&R3EP zgBGI6Y?_NvEE2?HqG!cQ`Ct2NO#hv)t2slJVs3JNnJbl-kdOD&hh~uQ+V-A9y@p!h zEJf(%&F3qk&?JLOv+V=XA?Fesn^L3OA9bC=ElhePUtgl_U)9ogw?CdzEI+{A+Kt%L zK?&zxl-;C79`70PlgCB8`Quk(n&TfMDvPn|eezaUpY`#y*gt0Sa(iNBpR|YQsPtv+ z_K-A$p6Mq(uEXFWi=J~&K|v3ts3(-bWPwzo&&Zt%`}Pw>BNLs;(T1WxkJSfEtT~Zd zgKPPBJv=82rc}fihbYZMP-KGdcf^8Bu(ZaS!az+6IESF^NhhAIapy4v!$*X56$ zbW*fAvqE`F(*>OZLMt7Jj(nww5qu245WC@)4!M1%7&W(BhIfgw=qV94l}0;qM}}+b zGngerlSDJq!qoIw(?7Pqtjq4%%Wft*I!2fWRzxUfge)&%jPR%O^WNu!KeO8t;9sP{ z*K<;L12JUhPK zvB)%Zj{}L~8_R11&#%85pD66p(eS!Z#WerntuY3Dy!4CY)cCOMY~;OLmeM3E|8h`c z!Xg0c>S*Vajka9$e18|vvzK`P?^98-GYu$sztwTCL!h@UyVJ+hp|G%CfoflBjoy;q zA#*M$-2+9v5;cOsdWQOJ1vV-|Ye^yh!RN(m(xWP80}=Y}E_MlcSl`5EUvo8#*+hfF zm`PPXzn=0Z=6{QM!dCq5*C3Bb0m~c(k}g8_85Wbqo&P2y`}o+4oj!r>HtY{?+s z!(IOMCF?L}sMea28MqYn@Vb)kPNM~whQ&%fc}Ok^TWq0D0F^6Oim z2)R+sMrhLj+8!s9&fW(<6ZP6m58;jcR4CCK;&Ee)In)z$39JC$-wW^r+nR8+r&RMq zD$r#!71_ls~UKrFs#cBt2jcAB`cw?EE|7wn$sZM%(Li$$k;DQhnw`gv< zbAs4ttuYawyDbPx+uvo-{vHHZq080*RWG&V)w5StrL8Qw*|qwq0Sppu2us;R$NP8b zM-i0}cSpz9d;4N@haKkcm&lWt3yrjMmHdC6ntcA84ldmyj_o?N+ssGWe7w8hPI^uo z1(_O9`>wWK{u(EHy~-SDEw9!s%(Qz>TtfDZwaacfRh}P~W`HkS)mf86B>VG<;_fE8 zVqr2Z4UC^$ZToZ53Ttq2oyv%&#yYV;c-1jd^zayrJLrLVwnKmaXJ*@oHLtQF|J?N_yPux!bEw8T((Y9-RN#YVU13=yG>8VGNg_WXp~_K*it#k1;NK3Weh< z(1|9|Jqs$cz)HYl=GYn9V;z4dT|TlTn@D;+&XoR`eDA1R|5ZTIui|5sDP^8vsGe{` z2g^X9|BgTAOAh6p7c>$6xR$;@v&Y8OeLhyu)o_0AfvGU0KWhCHCv~u!2F75q9Gc4R zHtqQ*;p@@+a^V&;vXi@-$`_jz8}_?#ZB3~O@^`xgA=Xt3KfJ z^yn)*7+=7?%Qw|?JL~;?d-HS&J1tWk5RUprMhIBN*eJ3zGsDyfwT_>zPnCA`YzPGl>sBxDLbi&QY+6Z zl+J;NdcF5=BB^A|cfRL1;m^D>3#g0?$0z1&5e!U8tI8gDHu8@jVe~o>UNfhnOJ&*&V6iIy`AKdQ8Kv>_S zU4eGL2}he?Z3MKi3eLe)3awh0gO;^rXJ?rQWvKB+HIJL(1!bM8c( zPOUw(2*yX(>8M5eEnTG*tSol>*TqG=BCf;{SehkX}9`ScFWS96hHd zz8ocR`f2NXK-?_NJuEpaUJ3y4S>fa5uA3Hkd3iB-xa)X%n|Yh(1-P4exdA|y1BL3~ zCV%ArNjf@P*joAiev&)O@_!^{`cVi7-e>l_NCGMf@8oM_%|ibNeLvpn literal 0 HcmV?d00001 diff --git a/companion/src/images/originals/icons Classical/cut.png b/companion/src/images/originals/icons Classical/cut.png new file mode 100644 index 0000000000000000000000000000000000000000..54638e9386dc8af40dcc9a3ee2f57c62e248e406 GIT binary patch literal 1323 zcmV+`1=RY9P)J0(1!|L=@Q+aTEb7Mu4u}WZlMQB24&|#EVDBq0{%sj+Z+)GGQx0 zAcdU1Fi0-lfEhqCt9ecIzWZ_$Xk-SF1YV<2^ak#QNA=LXgUd}Io1OMRbT7RYGCd%P zKS-r48v%?ldBMA#h)c%T#wHG+5V`$A{>3XcMvM|%P6Cssr>70f(>b}AV>T2D(&VEn zK_HANo+{rrN9){swakg0Ktz^QgDWfxHbzJY6ZK>&doEN10r&$qzrYSODpcQMh*H%o zSOat&76=4-MOF34plx)*)N}VCzH?EPkgku=6VK(8gNL*Np3E)-)CS$Jnai-RudhD8 z(qOgQ?SS}sjv4h}*IqNacG`39XxPWcN1v;!unrFm!4QYC z_Acj^H}`jQVc5OsUVtxVnxKZ?sWw9Q@B`QxpVZH#=NgKbEq?xOmsA>SUtb@%(9v@T zVsaH$PQ-_o)Qm6`=@qvgI2;Z@q}CZRo`stQer>5G8e5my4CXEh^CT4CHjaC}9?{K0 z$O&($1U%8bR;v{dcYhm%^O9V6PFgxKporEb{=Djv}7NhUQZ#8TNvL0_NhN zpdjG!cwn(uKwDk``_Co}Ev8e>XOzzgOoQTEd*;Gmnz9rW3I&M8V#v(QgrcG%P^;C@ z+1bfp?EcBQ$=j!OF1OE1fUdXLDR2(JYL~2dh{}J0;wgy^K9?&YTb2(8W8+7JA12t6 za%7Hg8ovjl(FiTAE%3|0ARIXHz6G;l!311sgoTBKM%*UnGOR4mGqn@!JL9_3Gp~Z> z{(6Z9p5FXo8}~etjeBORPg}}0?N~!YJv1~lfTgz=G8Dzb^Xb54Jd))oo;F?OoGLPS zee{DaT5J+A3>zitarZCFC+`J^U;fkNL<>x4^vOPTl^zTR1GKld!`H@^F|L6LX7M&{ zIA}acIyz>{0a00^F4~fx%15b|k+|p_1^WSy+Zxk*z z((l+8X-U2;oygOcJEspZj3vh3pSpKnaW$YpY_$lC`IPbC@H0!Ad}tF|z0RZAYfnh` z3=gmm{_}^(`7iFdNp1l4dp_;=2p%dvUFBG+@kd(qwpj}i9kWBpkvIuC`Kgv6`dk_f h&$IvkH~dc%_#Nkm8M#Em0nY#c002ovPDHLkV1hsWYZL$g literal 0 HcmV?d00001 diff --git a/companion/src/images/originals/classical icons/duplicate.png b/companion/src/images/originals/icons Classical/duplicate.png similarity index 100% rename from companion/src/images/originals/classical icons/duplicate.png rename to companion/src/images/originals/icons Classical/duplicate.png diff --git a/companion/src/images/originals/classical icons/edit.png b/companion/src/images/originals/icons Classical/edit.png similarity index 100% rename from companion/src/images/originals/classical icons/edit.png rename to companion/src/images/originals/icons Classical/edit.png diff --git a/companion/src/images/originals/icons Classical/exit.png b/companion/src/images/originals/icons Classical/exit.png new file mode 100644 index 0000000000000000000000000000000000000000..5319a948051b1c66ca424d6969a1ae113bf98731 GIT binary patch literal 10601 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 literal 0 HcmV?d00001 diff --git a/companion/src/images/originals/classical icons/list.png b/companion/src/images/originals/icons Classical/list.png similarity index 100% rename from companion/src/images/originals/classical icons/list.png rename to companion/src/images/originals/icons Classical/list.png diff --git a/companion/src/images/originals/classical icons/logs.png b/companion/src/images/originals/icons Classical/logs.png similarity index 100% rename from companion/src/images/originals/classical icons/logs.png rename to companion/src/images/originals/icons Classical/logs.png diff --git a/companion/src/images/originals/icons Classical/movedown.png b/companion/src/images/originals/icons Classical/movedown.png new file mode 100644 index 0000000000000000000000000000000000000000..2632877c1402cafaf4ce9b2fbe8118b65f8e4f2a GIT binary patch literal 10774 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�S#Z%9aJ0LKt%aU^)%pD<3U#_8B|~R z_15wGzO+#ezjA^+oict>{FvJJW(NRYCY=IV0zuJPcKubofBp5(bgjPeL#k;Ah=>W~ z=K)=p0d`Mx-L~vYdwCP+w}GqxR2x>nj(&>!<33Oh0Fk0cPP*&^M`_w+JuaMY<+zlVSY5pDeebz2^uTV19|BFk2?kjci zr9Gsj0_HowTobU;X#5mD#(ZEh1VYK5SBi6*>T$p=5#=+8+e}QBhQD^(4_bS+32nIm;^ie3!ZH&h9ch-R)jzyIZzWTTM%}M93O{)QTjK5JHIoQi+$vLd1ZUlB|s; zMG+cJ8YEIfwL*6(B7((MsYR%5Y22(t6l;aT_Oi1(o$F=io0*;O=9=#$@7uiDaW}Z> zAnzp4ulX@Q&YAbT&pFR|-W)&Q=Ndj1qkJF61Q1JspQeUQ2nM5#{kL7e_`%&G?%T_oaf4`uH$|N;0QJrIImT9Xgs>zNRC3)4g9+e1JmYi}D4) z7Y2e+a@L&1HeMqdmzhDx0ir5k)>zFiyFkVUOo1{`lZW2`c09^gN{|*%^|qPps#P{d zUw*xC@W~N4(+;H@G!Paj;1*0ldy#4TmsA^@JeBaj)B_>g?z*pB_7teEh!Wj1#|koqjz_NV7h_XxJ!A zfLIPp&VWKM9U1=nRL|-cwHr5Y@XCFB{6Z}#7$qaY&m*(=%mnA@4HEZBj&HQcO*!4i` z#(|BXjaw*y76c+Iy^_F_soA#2g8)`5UXAe+FFWl5MM2OjCV{E}M%>f&Sq9hbYXp+} zp4gw>v;Ac!J&|JO4b@a&o?tqJ^Y$^<{#&&?&lfZ6Qy19 z1el+yIKZu*hnhBQTHk*6qXYi7#VegEI|(jZHiM-k)FA#|OC25t0FIB5qD-6$ax@_` z1{fDe5TbkR!%SyllMmlHY>XZ{33HmC@8@_?C#(B10p?!{*u0<#O_6A1<2P?<|MK7f zOf=FOIrIh~`ky4|1E;${^*wp@cviNsXyRbb?wJ5 zAAD+yzq5C>qN}<$Cia4V`3gYy%_9M79R1}YF!3H>mf2E@qnPH@vBRVBo%at}=T1?r zM;1VeTjr?FcZ*ljz}m5~h)Nj%H1oYT&ZK|2~ySTH@mOaLNy{8KiSO0Mwx zz5fbbx$gOv&wk;HN=suaOu)8*LKbLk1;WjATX*NF2Bx}i5~btAg2Ib4yTPw>d9@t^DpjR5&rb&Kc}eh!|`hM#5v%KK93#> z&K?3pJ%2n7T$rE)Qkc3YJ@oi7ug`B*dEcIe?eoh!fT$l}t>R#CP5;`C`yRW$Y2DhZ z>>N8X7A*pnEdjzIz_e%A0r1c@Advyip9hLXx=YZ-FMs^VNc>0lzEC~=w|4=QIaybp z*Yz!Iw@)Sjb17v>;A_5l;HHkdzB>?@xewT7HoNa=2bOjLjUm9Yg#-|cCo_5AYz&wx z(gW$Lhv|v&v$03-88VLl_9Psq2ns&In6F8*>;(RAUv%?LkB`Na#)v<>X5A_UY5??^ zGQ5y9H2^`M*yYm{4~`8K3}Ea$P%KmMH4kP!pG)rD@$14Lo;?YxO8tGN>8s(}BTK-7 zOUv2nd4s=i?Z-O5_1GQZPxjvc8yY_#?2H0^ODNzZ*rW$HQMG_f0XQ26%2iH2rUTZL zQOy78r6UuAx4#59w7r8Qcl4Jz$1X=Ez@-=+Gb@^KVCA~2dw=rER=pv71uqF!05k-E z?lzz^0tEe@*SEExKMaTM4=Soh>2#F^+jhLWf$d(L09p$$bz=1G*bna6Q+aD7#x;A= zg0An9)qR-&V5NX_DQ#};>e&3yjnSLGvRQBRX-C#GM!8f?>dxxX6I2Sok$6MpEZ2glaDe1>PkNl?du?3y?ju6*8;IeYU z1)m;dth-jPyaUvJ<&>aPVrb0Gx8~c3C4R`m`S#d#9DJDo1Zx(T7@LCVXF?!x*hC3n zi0|*$|CCQAfM{Ls5*!L*a1JG)N&zqPZQgnx^2j@Y2$kTY>7k#>fLc2NU~#n4BnWL@ zSpq&NA`%wBDhqtg1mF|F`Je`0CV&`Jdk$VvE&~Pq|EcCnNJvOXNJvOXNJvQF-_5G1 UCKEzA#sB~S07*qoM6N<$f&kr?^Z)<= literal 0 HcmV?d00001 diff --git a/companion/src/images/originals/icons Classical/moveup.png b/companion/src/images/originals/icons Classical/moveup.png new file mode 100644 index 0000000000000000000000000000000000000000..447f087ccf99d69135ac9ca8c5f19f01a4785ab6 GIT binary patch literal 10463 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

*h0T$%Y7FFOGj|5K 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 e{Jor>rG5iZY$c(Rl?rzN00003Gx zefpoBhy8x@pP6$JN-2UQgm?vbp2urQDfM^OC?_DeL%RWJmr}mQV`N#@2O9RfK(_`t z{}ccw{I~7(;$U4wL~hQBiYr&HP+e1vKmedn2xTZiDQ44YUa1!^ytGbiJMka6M}vG@ zLrgqP2loG9i`^_G_)0Q7JWOR}B`e8wT^_)0sjwm&qAGGfr|N;V0|+ezNTCh%UA#yx zm%}d>QA&}|=UH4_q);eO)MK@^wUhx^fcS#;fB^tDLmDAYR7=GY}hKA6kOPAcP zuC561)~X!<6GT-k!gJLz@}5tjD3MBG2|?Jgh=y$Das?8ijz6FOD-BH>0V2R=mW1#7 zc%Dafb+w*QOZ4j1tA~UTD5c(75x}xR0JbfV+O`xp2&58N!i*b_Ou6iP^*huzHW7R; z!Gvcr8OqDc&1OD!?ARu~e-17|ECJBj*{Kd4I;3nN2w4!eEgZ+jLQu5L8XEw|vWPgA zt^#0Lco4wc+#EGEH3lFWjdJA3kD9q>HlpG95}EZ=m1y-ptN)rjt$|Ez*CB`q|1$rgVVB? zrhTuowc{78+xt2VFSK*}&LsW){Unn~lv3vU`0?ZDx~wzj&Yk1v(W4wbe3;(eUJ{9f z1T3Ky+yU+X&gS^%luv8N&-msq-zN6;H<^5HH8r836d;2i zMi$(072p5qZ>Vh8NaE}}Opji}iIlOmc?X+Yw)07OC1VMf&t~%6oz60$?T8IbC+FC= zE6VyM05f|%YwGIi0L*nNl`;TID-fW$T5#c=V<;@j=Em6&k5ZJ9d&7MsWd+;Xe@so= z%X~bXX3}54&3G)#YcF^p0JU^FLZOfeE#2xLjsYt8K48JdxS&uRBOHrUx22Yncy@gS z>8!_S|DTwyyiCjXgSZP}yn>`ylz7@9$3iWtfa7VPmemyj0M^GtgvulQziMM4o~aCT z;opPo+4&R7qYk+;M*}DWVQT;uOChBkB`_)#q+A6+Sfwh=^&|RlY=-e!kMI5ZkKD@C z;6z-a5gX5w6g>yi0i}>q@=$770agVN2uuwG7@cUt@bD?; zK3j0A)Rg|7%OH8oYxFCwW^r%olu$Hy-NXMuhl?5?;8OW$_d zPbP%{KnOr#TKwMNV7j}zJEh->%p}lW?Q_jx?V5KpZV_N`@cndOUtjvnnKP!vrO=Of r0*SSrV$g&__6vQz4|I&^4Jxf00000NkvXXu0mjfT=)$w literal 0 HcmV?d00001 diff --git a/companion/src/images/originals/icons Classical/play.png b/companion/src/images/originals/icons Classical/play.png new file mode 100644 index 0000000000000000000000000000000000000000..8501a8b58649150bf75ce22871727e5111027c85 GIT binary patch literal 534 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+7m&H)T;i5Q?0wbq~1C!8%1{M`4GmJ^7 zti46;ui^pqozGQF4R$74)!sH>23mmt^<`Gq<{rOL`Y$T~_^yu@yBODeEm@P@zf}6b z^IsO%n%yt+Caf+0-CV|yz4w;<7UqcctiPKJ7_#TS;lIWBW`6HC_J<7Dsy;?#uy1(J z-@yhX-q~KtWBC2=!L`M2**09;{MXUCVXJ+`ml?Ym-~48t-}{h3Mw|Pgf}`2$4`Mpdp2%nIJR*UL){JeA2~eiAQ_-qi!iYR64u-aK(z)S z?b~Ovfao9m$4`a-Ivmfio`LZO3)g}41q?DQoCg9oFdQ@RU`UqHY53SIz}Pdtg)`xg zMhL^>^oKtgVt6{)9%MzBFidw|%(z2Nj_<$>GpUBhw=)=yZF$JB=lNnriOX)x1vS#V zKna-!!(0=F~6@vd$@?2>^$4&Mp7| literal 0 HcmV?d00001 diff --git a/companion/src/images/originals/icons Classical/print.png b/companion/src/images/originals/icons Classical/print.png new file mode 100644 index 0000000000000000000000000000000000000000..578980db72c6f169a4a33fbf80b3974fbf2ee2fd GIT binary patch literal 7282 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 literal 0 HcmV?d00001 diff --git a/companion/src/images/originals/classical icons/write_eeprom.png b/companion/src/images/originals/icons Classical/write_eeprom.png similarity index 100% rename from companion/src/images/originals/classical icons/write_eeprom.png rename to companion/src/images/originals/icons Classical/write_eeprom.png diff --git a/companion/src/images/originals/classical icons/write_eeprom_file.png b/companion/src/images/originals/icons Classical/write_eeprom_file.png similarity index 100% rename from companion/src/images/originals/classical icons/write_eeprom_file.png rename to companion/src/images/originals/icons Classical/write_eeprom_file.png diff --git a/companion/src/images/originals/classical icons/write_flash.png b/companion/src/images/originals/icons Classical/write_flash.png similarity index 100% rename from companion/src/images/originals/classical icons/write_flash.png rename to companion/src/images/originals/icons Classical/write_flash.png diff --git a/companion/src/images/originals/monochrome icons/add64.png b/companion/src/images/originals/icons Monochrome/add64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/add64.png rename to companion/src/images/originals/icons Monochrome/add64.png diff --git a/companion/src/images/originals/monochrome icons/apppreferences.png b/companion/src/images/originals/icons Monochrome/apppreferences.png similarity index 100% rename from companion/src/images/originals/monochrome icons/apppreferences.png rename to companion/src/images/originals/icons Monochrome/apppreferences.png diff --git a/companion/src/images/originals/monochrome icons/arrow-left64.png b/companion/src/images/originals/icons Monochrome/arrow-left64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/arrow-left64.png rename to companion/src/images/originals/icons Monochrome/arrow-left64.png diff --git a/companion/src/images/originals/monochrome icons/arrow-right64.png b/companion/src/images/originals/icons Monochrome/arrow-right64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/arrow-right64.png rename to companion/src/images/originals/icons Monochrome/arrow-right64.png diff --git a/companion/src/images/originals/monochrome icons/changelog64.png b/companion/src/images/originals/icons Monochrome/changelog64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/changelog64.png rename to companion/src/images/originals/icons Monochrome/changelog64.png diff --git a/companion/src/images/originals/monochrome icons/clear64.png b/companion/src/images/originals/icons Monochrome/clear64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/clear64.png rename to companion/src/images/originals/icons Monochrome/clear64.png diff --git a/companion/src/images/originals/monochrome icons/compare64.png b/companion/src/images/originals/icons Monochrome/compare64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/compare64.png rename to companion/src/images/originals/icons Monochrome/compare64.png diff --git a/companion/src/images/originals/monochrome icons/configure64.png b/companion/src/images/originals/icons Monochrome/configure64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/configure64.png rename to companion/src/images/originals/icons Monochrome/configure64.png diff --git a/companion/src/images/originals/monochrome icons/contributors64.png b/companion/src/images/originals/icons Monochrome/contributors64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/contributors64.png rename to companion/src/images/originals/icons Monochrome/contributors64.png diff --git a/companion/src/images/originals/monochrome icons/copy64.png b/companion/src/images/originals/icons Monochrome/copy64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/copy64.png rename to companion/src/images/originals/icons Monochrome/copy64.png diff --git a/companion/src/images/originals/monochrome icons/currentmodel64.png b/companion/src/images/originals/icons Monochrome/currentmodel64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/currentmodel64.png rename to companion/src/images/originals/icons Monochrome/currentmodel64.png diff --git a/companion/src/images/originals/monochrome icons/cut64.png b/companion/src/images/originals/icons Monochrome/cut64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/cut64.png rename to companion/src/images/originals/icons Monochrome/cut64.png diff --git a/companion/src/images/originals/monochrome icons/duplicate64.png b/companion/src/images/originals/icons Monochrome/duplicate64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/duplicate64.png rename to companion/src/images/originals/icons Monochrome/duplicate64.png diff --git a/companion/src/images/originals/monochrome icons/edit64.png b/companion/src/images/originals/icons Monochrome/edit64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/edit64.png rename to companion/src/images/originals/icons Monochrome/edit64.png diff --git a/companion/src/images/originals/monochrome icons/exit64.png b/companion/src/images/originals/icons Monochrome/exit64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/exit64.png rename to companion/src/images/originals/icons Monochrome/exit64.png diff --git a/companion/src/images/originals/monochrome icons/fuses64.png b/companion/src/images/originals/icons Monochrome/fuses64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/fuses64.png rename to companion/src/images/originals/icons Monochrome/fuses64.png diff --git a/companion/src/images/originals/monochrome icons/fwpreferences.png b/companion/src/images/originals/icons Monochrome/fwpreferences.png similarity index 100% rename from companion/src/images/originals/monochrome icons/fwpreferences.png rename to companion/src/images/originals/icons Monochrome/fwpreferences.png diff --git a/companion/src/images/originals/monochrome icons/information64.png b/companion/src/images/originals/icons Monochrome/information64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/information64.png rename to companion/src/images/originals/icons Monochrome/information64.png diff --git a/companion/src/images/originals/monochrome icons/library64.png b/companion/src/images/originals/icons Monochrome/library64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/library64.png rename to companion/src/images/originals/icons Monochrome/library64.png diff --git a/companion/src/images/originals/monochrome icons/list64.png b/companion/src/images/originals/icons Monochrome/list64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/list64.png rename to companion/src/images/originals/icons Monochrome/list64.png diff --git a/companion/src/images/originals/monochrome icons/logs64.png b/companion/src/images/originals/icons Monochrome/logs64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/logs64.png rename to companion/src/images/originals/icons Monochrome/logs64.png diff --git a/companion/src/images/originals/monochrome icons/movedown64.png b/companion/src/images/originals/icons Monochrome/movedown64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/movedown64.png rename to companion/src/images/originals/icons Monochrome/movedown64.png diff --git a/companion/src/images/originals/monochrome icons/moveup64.png b/companion/src/images/originals/icons Monochrome/moveup64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/moveup64.png rename to companion/src/images/originals/icons Monochrome/moveup64.png diff --git a/companion/src/images/originals/monochrome icons/new64.png b/companion/src/images/originals/icons Monochrome/new64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/new64.png rename to companion/src/images/originals/icons Monochrome/new64.png diff --git a/companion/src/images/originals/monochrome icons/open64.png b/companion/src/images/originals/icons Monochrome/open64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/open64.png rename to companion/src/images/originals/icons Monochrome/open64.png diff --git a/companion/src/images/originals/monochrome icons/paintbrush.png b/companion/src/images/originals/icons Monochrome/paintbrush.png similarity index 100% rename from companion/src/images/originals/monochrome icons/paintbrush.png rename to companion/src/images/originals/icons Monochrome/paintbrush.png diff --git a/companion/src/images/originals/monochrome icons/paste64.png b/companion/src/images/originals/icons Monochrome/paste64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/paste64.png rename to companion/src/images/originals/icons Monochrome/paste64.png diff --git a/companion/src/images/originals/monochrome icons/print64.png b/companion/src/images/originals/icons Monochrome/print64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/print64.png rename to companion/src/images/originals/icons Monochrome/print64.png diff --git a/companion/src/images/originals/monochrome icons/profiles64.png b/companion/src/images/originals/icons Monochrome/profiles64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/profiles64.png rename to companion/src/images/originals/icons Monochrome/profiles64.png diff --git a/companion/src/images/originals/monochrome icons/read_eeprom.png b/companion/src/images/originals/icons Monochrome/read_eeprom.png similarity index 100% rename from companion/src/images/originals/monochrome icons/read_eeprom.png rename to companion/src/images/originals/icons Monochrome/read_eeprom.png diff --git a/companion/src/images/originals/monochrome icons/read_eeprom_2.png b/companion/src/images/originals/icons Monochrome/read_eeprom_2.png similarity index 100% rename from companion/src/images/originals/monochrome icons/read_eeprom_2.png rename to companion/src/images/originals/icons Monochrome/read_eeprom_2.png diff --git a/companion/src/images/originals/monochrome icons/read_eeprom_file.png b/companion/src/images/originals/icons Monochrome/read_eeprom_file.png similarity index 100% rename from companion/src/images/originals/monochrome icons/read_eeprom_file.png rename to companion/src/images/originals/icons Monochrome/read_eeprom_file.png diff --git a/companion/src/images/originals/monochrome icons/read_eeprom_file_2.png b/companion/src/images/originals/icons Monochrome/read_eeprom_file_2.png similarity index 100% rename from companion/src/images/originals/monochrome icons/read_eeprom_file_2.png rename to companion/src/images/originals/icons Monochrome/read_eeprom_file_2.png diff --git a/companion/src/images/originals/monochrome icons/read_flash.png b/companion/src/images/originals/icons Monochrome/read_flash.png similarity index 100% rename from companion/src/images/originals/monochrome icons/read_flash.png rename to companion/src/images/originals/icons Monochrome/read_flash.png diff --git a/companion/src/images/originals/monochrome icons/read_flash_2.png b/companion/src/images/originals/icons Monochrome/read_flash_2.png similarity index 100% rename from companion/src/images/originals/monochrome icons/read_flash_2.png rename to companion/src/images/originals/icons Monochrome/read_flash_2.png diff --git a/companion/src/images/originals/monochrome icons/recentdocument64.png b/companion/src/images/originals/icons Monochrome/recentdocument64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/recentdocument64.png rename to companion/src/images/originals/icons Monochrome/recentdocument64.png diff --git a/companion/src/images/originals/monochrome icons/save64.png b/companion/src/images/originals/icons Monochrome/save64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/save64.png rename to companion/src/images/originals/icons Monochrome/save64.png diff --git a/companion/src/images/originals/monochrome icons/saveas64.png b/companion/src/images/originals/icons Monochrome/saveas64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/saveas64.png rename to companion/src/images/originals/icons Monochrome/saveas64.png diff --git a/companion/src/images/originals/monochrome icons/simulate64.png b/companion/src/images/originals/icons Monochrome/simulate64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/simulate64.png rename to companion/src/images/originals/icons Monochrome/simulate64.png diff --git a/companion/src/images/originals/monochrome icons/txactionico.svg b/companion/src/images/originals/icons Monochrome/txactionico.svg similarity index 100% rename from companion/src/images/originals/monochrome icons/txactionico.svg rename to companion/src/images/originals/icons Monochrome/txactionico.svg diff --git a/companion/src/images/originals/monochrome icons/update64.png b/companion/src/images/originals/icons Monochrome/update64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/update64.png rename to companion/src/images/originals/icons Monochrome/update64.png diff --git a/companion/src/images/originals/monochrome icons/wizard64.png b/companion/src/images/originals/icons Monochrome/wizard64.png similarity index 100% rename from companion/src/images/originals/monochrome icons/wizard64.png rename to companion/src/images/originals/icons Monochrome/wizard64.png diff --git a/companion/src/images/originals/monochrome icons/write_eeprom.png b/companion/src/images/originals/icons Monochrome/write_eeprom.png similarity index 100% rename from companion/src/images/originals/monochrome icons/write_eeprom.png rename to companion/src/images/originals/icons Monochrome/write_eeprom.png diff --git a/companion/src/images/originals/monochrome icons/write_eeprom_2.png b/companion/src/images/originals/icons Monochrome/write_eeprom_2.png similarity index 100% rename from companion/src/images/originals/monochrome icons/write_eeprom_2.png rename to companion/src/images/originals/icons Monochrome/write_eeprom_2.png diff --git a/companion/src/images/originals/monochrome icons/write_eeprom_file.png b/companion/src/images/originals/icons Monochrome/write_eeprom_file.png similarity index 100% rename from companion/src/images/originals/monochrome icons/write_eeprom_file.png rename to companion/src/images/originals/icons Monochrome/write_eeprom_file.png diff --git a/companion/src/images/originals/monochrome icons/write_eeprom_file_2.png b/companion/src/images/originals/icons Monochrome/write_eeprom_file_2.png similarity index 100% rename from companion/src/images/originals/monochrome icons/write_eeprom_file_2.png rename to companion/src/images/originals/icons Monochrome/write_eeprom_file_2.png diff --git a/companion/src/images/originals/monochrome icons/write_flash.png b/companion/src/images/originals/icons Monochrome/write_flash.png similarity index 100% rename from companion/src/images/originals/monochrome icons/write_flash.png rename to companion/src/images/originals/icons Monochrome/write_flash.png diff --git a/companion/src/images/originals/monochrome icons/write_flash_2.png b/companion/src/images/originals/icons Monochrome/write_flash_2.png similarity index 100% rename from companion/src/images/originals/monochrome icons/write_flash_2.png rename to companion/src/images/originals/icons Monochrome/write_flash_2.png diff --git a/companion/src/images/originals/icons New/add.png b/companion/src/images/originals/icons New/add.png new file mode 100644 index 0000000000000000000000000000000000000000..dbb1e9449a154b599f99a44a0361a9a9d5a81190 GIT binary patch literal 589 zcmV-T0d~8?l-`8)=&fJi-9vK_4@FOk=R)z~mna265HW2HZIfo#-Izk76|&ou>}UptNg&&u zmp8LJvngSW0cOboazPKkn7`R;eBC}k0wY7Q*Jz|5ip zfS&6JPr|nkt}Ds`U#up6ItiHw01=}ywCV?duO+H`S8Gz;F bQ-A>gj7vUFY6VE800000NkvXXu0mjffzJi! literal 0 HcmV?d00001 diff --git a/companion/src/images/originals/icons New/apppreferences.png b/companion/src/images/originals/icons New/apppreferences.png new file mode 100644 index 0000000000000000000000000000000000000000..597a9f68dbc560ad9e3a726dc9567c885858961c GIT binary patch literal 12546 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 O07;36}a literal 0 HcmV?d00001 diff --git a/companion/src/images/originals/icons New/arrow-left.png b/companion/src/images/originals/icons New/arrow-left.png new file mode 100644 index 0000000000000000000000000000000000000000..759e589505ca108d54c3de72e817c03b091b3c26 GIT binary patch literal 14365 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 KMNUMnLSTZ=_%X=< literal 0 HcmV?d00001 diff --git a/companion/src/images/originals/icons New/compare.png b/companion/src/images/originals/icons New/compare.png new file mode 100644 index 0000000000000000000000000000000000000000..5b7e41c4fa098cd6674e866763476e938830a2e7 GIT binary patch literal 2163 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 literal 0 HcmV?d00001 diff --git a/companion/src/images/originals/classical icons/contributors.png b/companion/src/images/originals/icons New/contributors.png similarity index 100% rename from companion/src/images/originals/classical icons/contributors.png rename to companion/src/images/originals/icons New/contributors.png diff --git a/companion/src/images/originals/icons New/copy.png b/companion/src/images/originals/icons New/copy.png new file mode 100644 index 0000000000000000000000000000000000000000..49e9835c0a7f5f543c249d563e0caaa086ea2db9 GIT binary patch literal 1521 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 YmUT|+$ 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�YSTtBKuRICGW8=DL{aHg} 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 z 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 literal 0 HcmV?d00001 diff --git a/companion/src/images/originals/icons New/logs.png b/companion/src/images/originals/icons New/logs.png new file mode 100644 index 0000000000000000000000000000000000000000..8dc7ce194f28bc91fe8a9dea10efb42b92d38e93 GIT binary patch literal 3302 zcmVou@P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyx1 z5g!$qi~GX>0013nR9JLFZ*6U5Zgc_CX>@2HM@dakWG-a~000a< zNkl5d+2tq*jB0 zkZAZrAW}sGD8Wdm1R?=y?QTnJwS*R`RZvT7t-N%tg%p8q3;Sa4&OQEd=eE~r z!ml3{+Qq<*UA7@WbD$)efgD=8M-DXfK{y$<(fg05Wrxf6F?}; zsW7It=?TzMsQ{Lr0dTHO7<2+Z2c824oZ~s*9^kA9{dEBk0egYBf&IXGpgV+9+X5^D z9t56uo~ho~Ux7P;Pc#++uI{l%m@+O37-5PST-`J7!KUw6Eb2#-L;>#re(CAk@3;?` zq|x7GM_{VHe&GmL^*-+hc4<79aL90)>Y-YtQ9!ws7T@m|RLiZ(H?5Q4z}(GNL1%p# z=mkEe(e_HEb_?v+9fDT})qyD!$*RE0Y^F5dF_d9J*ceGV2 zFw-$vH@k>*JaB^$i29*t0@n1(O~9I7ArrXYQ7{v5JTTayUw?2w0}Z!Zyobp=UX)Tdt7ntUXMfg6UQv91(rBkNL%=7 z0w|tB*R?OGNpP##K8^POale|+^;wd(GW=U{?M|S_$9Gr?^t81xyl^4n#v9?W$Kc?> zBZBu6e(XL#lW2n}ZeLiV{gB7u^J1o?tqcQ-Yc}v{;95U2jgG>$ZE)+Y(A^C)W`Jd} z88|z%4-ktA&?G_5h%n$u1_hzRW5fOIx?fvW0!oD{@KfMaU;%K`qD64bF+L4zuG(T? zv&R%^5Fi1_OhV4I!5gmgQ#IPZ*LD7?&-MMT^HVhXdyj7DD+GTMf}6H%fkTI2`*yhF z4gekj`dw|?og6|40wh=r$~g&k26**eeAIRRywCNgUFYX$^mmS)^pCdBZEdh%0W4pR z1zZNa3s~uDvLF-zk}d}2*g<^Kb^bMKX<-@4z*hsJh7GRsuYk`g8`rRV`tx%T1t9k9 z3H0*c=IHF?q)-G93PUf5FU6ljZSa6IcmN*+ZdbJZF||}|J(2UEPn*@i>(2Qc;8sO{ zDM0M}e|#DuI^QFHnNy!^{u=YJ1HfLg&PS}~~LB={dkr+=>neoL)3(BT~C0UJ3w zZ+|oJU!VR)fE!((zeBCiw8(Mz>iun?mL-&`{N>A`9)NAy1oP&BWpOp|J|_oI0;T~A z9Y^sVPY9`xH`i^nN9gdW1$2lv*KJHpFcIqsqQS$9Nx&aM-2X&?sjz@YBRp57F8unj za%H6V`;{zq%iV&IoM?l$fsX?ZYqY(a+Tx2!06{MYR%v|i*WI7J&fay`0ksscPEMf$ z{0O*0LiBVJK?Thj3;~~Yy!?Bq<>3b%A-za#@y40JHv)uzI8Ot7*-`!X0WUeYP6XeAn?|u2Vgq)R;F?42qKkegdDq zW3lj%B*}#*PdP`NQO1*s>xWavC!VPE@?Qad;2e>WSTU%HqlB;+aoOSz1U0_@{v(N_ zIdi1Kj}3_ygObi57G#~lK2HQ7_3~eOsaD9TEu$?~VgF`W)Q>;{ zEyEb=^LuB1^^$fgkN`#586+b?S_nacD$py$xD`FgdifI7A4q_-ia|-|3}RO2$V^Yr z{bAPWB?^?EE_McmQT=fiLYhJ7VF(dU1H@bmQVFhQ zt+#Fd%t29v9-9dW;{)VjRvN*^On^KTgN)!ZBtTNdpt|5>D{PENazcPG#h^H5qY-{a zVXjmlDq*GQ^&4bFfTVT?6*bpC;RujcG04pRyb>S*7}Z}S0>oSlGOE8|1W39VWM+TP z2@q#7$f*7T5+F}IgAB6J05KJV%B}1$`gOX7Fjn2v- z!S8&g+tMLNTG}CPEhO#yt=BD3#tvn6l(TE6LffBNWx(=m=|f zo5H+U-edYW-ZQST(k8&0>o(eL7k|c=0Hf<3<=BfqY2`uq6AiL)i#leh?+!MCkH<`S z$1$o&NVOQGVy_W?JWgO(eb35o3tGQuy0Hi+E^ z2vYY(`1vA1Y{eimTMfenXudLeNsFAh4*GTM?xaEtLx9o^uv`}38W=<@{d{Tk)z@Bcn|0jGNWT|gP;4@k2KpJ@wta>= z3_S4!TCmNCP1Go$WA2ArMmx{03QWx3Ob~$GF^#r`XY~h0bVGf6ZE@+9rM9R4h<(`Z zyPXl?u`)tpeat;s-Xkd0>_0Zuj;UBZ57OSX$kGn!2mZFxrf+Y_s#Z;?)f{2qbfXIm k3=9km3=9km3??f650@~07*qoM6N<$f)}V4J^%m! literal 0 HcmV?d00001 diff --git a/companion/src/images/originals/classical icons/movedown.png b/companion/src/images/originals/icons New/movedown.png similarity index 100% rename from companion/src/images/originals/classical icons/movedown.png rename to companion/src/images/originals/icons New/movedown.png diff --git a/companion/src/images/originals/classical icons/moveup.png b/companion/src/images/originals/icons New/moveup.png similarity index 100% rename from companion/src/images/originals/classical icons/moveup.png rename to companion/src/images/originals/icons New/moveup.png diff --git a/companion/src/images/originals/icons New/new.png b/companion/src/images/originals/icons New/new.png new file mode 100644 index 0000000000000000000000000000000000000000..53dd74e30c212aacbe159a93b49a9ecfbc92e410 GIT binary patch literal 2570 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 literal 0 HcmV?d00001 diff --git a/companion/src/images/originals/icons New/paintbrush.png b/companion/src/images/originals/icons New/paintbrush.png new file mode 100644 index 0000000000000000000000000000000000000000..814fdb47e719af3a7bca602dd6903b995d4d5b5f GIT binary patch literal 9629 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 Tq17eL00000NkvXXu0mjfSUGd+ literal 0 HcmV?d00001 diff --git a/companion/src/images/originals/icons New/paste.png b/companion/src/images/originals/icons New/paste.png new file mode 100644 index 0000000000000000000000000000000000000000..2198b77c0694ac7b3d25a0e42054597b632c9089 GIT binary patch literal 1594 zcmV-A2F3Y_P)MHqhfE}y2Y24ho8 z)z}mgtW+tD*jCzNkxDhDp&AoI6G8ldMyZhIMv7qi1pPI{OC(?`^A4ixilNaBz4Si_Oh$B$G*{q5vojU|?Wh$q7C=dXynZ4DH`v z0HEd))S+Q;aIoaKiHV8mocO|reXr9~!g=%a=@st9M~5lo269};4cXt3l1-7=@xt*p z0$BhFCN}r)bg$CXltd|X^(iiWi!w(TxA_^j%pZ?^#}+ae073xfF1{^^G9BJCAOiZ4 z#96~^UYmZ$^_WIB2KNDtB0!8eWGOH+GgHwBf)IE05rV-1ut5aflT9Ww zk^nIJ)&FDRX}C&*MDG(@pei1Ro9b!;Nyz0F;p3C%5@r~U*aD@GOH}z-(=LE3bCAs~ zLPLEVbmlNB8&M6pyyI%qXBuj%sns;YiS>a>l!a>1lXuWF{%wGP-h=3?n z-t=dyjfEg=_Or46C=>-KDs*~oH`J|u1lCdISKrnM3kzwg1X>^n$5uo~+f1Nbzij~q zfW#|Go2jc0!?HUch4$7py7J6v)9EyoEh^8iI!_s%N^$@d^nvrUTVciByW!rp7EAg0 zR2nkrjK2EBq>cw=JOC&aq0hH}ZGy(u$Kd|;>jdRf85Po*tRdSUWl;B5uI#9^1bm+~1}s%Nqp-3MG2kWj|HkDLXFUCc!d;MA{e(A?ey4{ls9RbHiWJVUph zs8h(BGHBcb&N>t8s)M08a;3WkK*$3m8USSZcKGN>CtRCP8KUUCbdRae z&i0!6U!jk+h(_$y7wF=q3_5m&mJbv%pa%e-79vQXwx$M}n;KmL(NY|_{H7Fqzz1c} zvDqU;NMzACF}bcm^R2f)o~^7bwwnv)pbYUr8ALG;kV-@$=9J*GmMKLU1W88bqY+;V zq3%TSNNOGn0E)st{oJ=iAaZT(q8~^IFy)H^|#T*k7zyeqt zB;%!Q)%&`41dcN3TzSixQS<@5n2IV2X|@H*rHqq$_8elywtWCGdLM9<1IJID4@IF@ z2727(w74HoA}Qopfd$T0q`w|YA)y=yNEul)bL_}MSU`x)MCcAm8N&I6lQQl+K%y@t z%(n~94a&*Ma1 zLP05GJ|)lI_V!Yei6f+tWdX64`SPppLs96Z{vM&IGi7-L!18>cfWxLtcjq>@Q+q@i zEVA+_twuv9GR2sj2-(svWt_@66?eVlGGtXQkvU@f>9504==r{<+$_moqxqxzoq)sghrCil&SpW+bc>kL}-=e2+P7n63yS5wvJD=P#E$+ICmjiw& zBZf~DH}#7-^I1mFRoO4smrIb?Oie0AQK6SPS=riP@6G9AyvXmu7^P`sC4N3#%kXjl`o9 zO`8_clvHu3oaM%N)tp zt(o%hn{a)4Z+1Cvsbpq)=H?UP(?n7XsiQ0uEuj6J)IS+UCbH-IXq*_9d`J$e>tDj> zRCtue<1g_oDy1JFfuE+Hq;N#M!1_dbFC{r7Njx6J zPt^sMwukZ})-H5^?aeFtN>QgESU%_6C|1n!t7%igL2Qj?9gm(oehbr_*G%)f34YNl z!F_J5$qMUk5RnDkQhm&I7jRK)_{&->@gQA2OiMC-anq*)Kv5}0pwWnTW&BE@-|on8 zV_8*Hp4@v=R3kKcG>aqh0K_}k;|Gg$ty|LN_OgClXF36%_am5E>W}^SMBT|wy+;3}QEu{*qt-U+e zqq(xe4raMH_3n)WJPvD>XNhnDK-7$Cs!&P=CP%$WjG#^T0}Yrf8R z<{}sySn6lr+sGwHJC2JpCrm6hLRm(Y+(OF=THp#fmOfPs5MD;5JLg-Zf8!p;NIL7vacd%je8)~p$z z)kG<7_PO(4YSt|H)}fTudIV!w^Q?nds7uw5yoi)+ii5FY&@7{nXRL{NF+zlo>y(91GR`L9BMberZ z78IQ&Q9R3+RY*y0l_DEk(!kQ%B3g}}M_3LDP69qw zW$0S0%)%mVhVcD1>0k!c%%f~Gkoz(mu}EvU@d`$Sp7ySH5)z zAjM*x&;87j&Sh#+FkO48_feBk(eNB!;D44P2D_BRVI72Yd2N<6$@#*OuM#Ml880DEu$SLC>;t<$2($S-e@ zu?>g`W6L3ekk9Jkp?Zo5hR*^!EQ+5*ue zwG|?9Zl9S*8{G<0vpYn!mqWegzo$F7sT}!qLQJpV+g=ZxChz@8UpO^S?eotPzOX0_(?6_ZF7umk`M0s`#eUTnhNoWHv=3|%-f0~o zoX(onhaD4G-KAK$e7HFnOaG_U17fcIj{Yiv0sitWcSl3iMZJi(3|fCs8%xwC@xun* zbF&U6VZAgGuT^E9FEMtg%iIH!;4po~{VTC>BTq*4HIiahU;%9q^$}1@7;B%{zw9OQrPa4 z()#w}i=_b%2Yd9M$5oPI`$qzf2IWX93v^g=DeDYifBZ+^Q@`8@O8Xr8T2)$e_0GpJ z?pF+jylHQG3oX`@Bqd!Dk_+dTS5T|Nxf4hhyyU_t|I<#~qsIjFM=ACK0C*LfHu^%*Hv>6n=I&!;eGMBbj5w7{>eHCWu$MUMobSx z>qJtHh%Yf=8)-$F?P2l+?T~?9qcEv-wyGNpqy>dpXx7qGxju2t4ZVA(1Xg^NX~E$% z!6Id2)J5r>;78smw`1V+-g*Gf%U%fx9?0j#l|8xt|)D}7u zY#Dcb=IO<+Hqn!<^3dE*BBdXVy~tLi)1`Tm$4)$PLhq_5Wb}mB>kj-n^n7SRF>bW1 zdR-q^ZlIV9v6-BWVy-?qW0234C13hA7;)KUZY6D9^e!jSo*ktxvT%~_!}j`R8qRBU zE*g;2WJ#oLK3l!8YX~YXLBn`r)thEa95glg=2>?zl0QTg;ei;_OS>j`UfaALCc?}9 zlZ;xB0p7Aq2XoG%xq%#PBeD~Wf`<(EJ_?=0(I$w z2>^f^pdc-w;k|U!;nTP?uep9N0DIaMYA;{=bZx7lSzesXx>!e_O1CUeiLh+5o$86` z?q!x43EFcfK5oPp+(+Sd$qu*FiANvl0pWGi1!L#dzSo`Gn>M&KxIP%$&N+4BmwG*K zJ5`{p!{!aWzR~lV^=mn4>soJn^t*XEIbDMZFEl$W|9>7`^bE~np-$&$PhDY;sZLL@ zY`3kZ)BA+8Q%b+e^zu=CTQ)xh0{Zmb8tDncpgH~1YQLJUYwSPgm#Wfs_mS%{`XRQ% zXg}&jZpoGb-ZqP0&x(-!Yn(dHOuWHAZ6@A0IXbWzjLdI&HXPqxYWQeQu*AHBcAgo8 z)aOd*qM(4+`xK&--|Obmh=iQp$H^8QeUHcY7G+FRnf@bmy3OZv%jash*6h`J%@FU; zn9+8-cczAOEY^?YhC7)aFdB_ubuJa9OkPi$SY)Ce1;aGJ`DgMjD!O|oVUh@h{vnA| z-Tj-*=qJPPE|2{V**^o#s${Yp0PX#(pqGf4igw3Mj`3m zTR9H&Mdt4drd(fUaZ>pW)CTR|3SD%XkM(TfHCp9&Oz-X=s=D>FQN623z|)r7*r zn8kT$+f}6LY=JbjDrWWxJsaTzX6Wre3#4DG*cem!S|O$gn56C)0b;8QsNG7F7lq&U zjOscL?kt=rpzydkB zw*I*9M-ablgny?cdP+^&+5=jloA4EawNCse6ZqW2owpbwt|9(qA=xdQ0 zm9|mwo>wq^>YbF%7iY@D2WC;4T&yJTyM8dq^xt_-1xylwzbduZ`T5RWU)B-;?28a_ z1Ie~5>CjI&aUld?fCJNFXR3ENkP+dFGh)2#GGh1u2Ih3WG>W>y8^jCLXk_V}(nkhI zJNTe5;K#&jyparx%XgkUmeLB71jtfXiT?sJvi__m1Ro+Gscf7j%5&qSD8Ii6QC;TCWWu6d)^gI3lceJlI)> z5rjyGXGe#Mi7<)aI@bcf+D#aDssWNj2A-8j<`wJRv>J0g!(3&I&*^M3ki8(Ty_TWGySV+*RU&mXinXL=fGvqWM7 z!iXN0E+R@wi8Hb7qMKlnI@Mnt`V04fc%hHTgkHU;fgDg-O2N0)W#rZPOC-}v! z9vZHu(@*`uTZaH~GWb#)++AM}&#hlfZ0c!O-w~y0e(Qw>Y6;FT$D$OggEwi>a3}8N zLnR16V7evwkEo@XyeN0O@*AFS&yHD9B80bpQKM3byN0ACwvIt2P3q(~H=Ti-n`#vi zb0jO&C_g`Z2}bm%MwoWMyPL)Zbb1Z$ZV*cFC(4?rOLQ@Tk%?)*;XN2%5^1m`yBHM( z7VzHyL-0(|330D57GC&jknE8*maRK4tAAGa--tJl;2P^Fbcx6#OebN+Baq{TqfPe# zIaHt%m{cruTKsVc%S;OSCi-aJ`}(D9nDov8XDrku04C0WuOHPF+pP%#%aMS%U!wZu z6meBEYp%2F%e(J&(7IEPz8R4#cGq z22o0ah2P-)#!!*x#ydpaF-Cqzz1;=KIW`h$G}Tx3J)8rvoDK;I6CvKRRL?mQf= zH_0yE#lo0+C_krYixEs@mffQh=0bXmf%vA-l}h{H_kQuQDto!$E}Arz>%2xO6t?<1 z25L@p=35RC1)Aa=ptgY4cY^-()gqM1Y)z>{W z|GNmL9}l>H+rQ(*`z>YJTI7_|#d!++=?v^@VaF=^)46vt&9Gc_BeaqzMI9|8xgm3v zDd5{%_{QBZFZa(`>Q@kASa(b^ouE~nB*%|Zoex}b9jNtR&zLW_pNy7d?xwv4`Nns~ znGOZkZw(@1D3oQdL%tyG`kD_Cl+Uqry!D%S@eAB>dJ8!Dd8v{Rw29gNg6;InZoWF_ zmP**WkE_Y|xHa$TJWmJtj_=fu>hvWe@4m9lWQ*Y`=-+F(hM8HRsDLi+K@wNm-)kC< zh2rjrNV??jz6s?pe#ZHTV;DN>*K58%|p=mnlPFb&$!?Zgegvb3qz{{_Bq12+QEwheWS4kqCAUg zo}rTK5ylrSdmItZ+g0J01@rcU1fg4WrZxR4jaS(7u6iv^3&pN*X#PZy4ZEfI(dO#I;r+=dKU7Ug-2ITUT)d-CLKOZoeu^w=Iw~u zI@42Zg02KYtb;($U(YM;+k`i>H!d#Qh!bA9rN3H~lqEWdcY}kVtJlxg`s2u?R(0c$ zZ&=3|kx!Pc#Ezsb^Q*8A=eNi2M znO^aFaX{#13CY8cKE3k)>KpKT)q6XBYi}wG{VAAr;?Hy=R^FUxT#t^M8q@VhHG;f! zNm09;=U%_H=aZv>)5prL2fL?*ug`n)?Ve{{4>fO8gx!xeIQcj^nFxPr>kwUPJPXQN zW2DdEi!9+Qe_Smn3^o-QEV$!HB2v4ym8ZjfA4JH0!cjkxw1*KDs=sI`BEBbMU9|s} z!ZjtiEwr~-zJM5KNaw%^mhGJ>y#Ef`Pe^Txx{R`qZ1y*az56LB{92Qv9A*@>=W&_m ze_Q5RNtGOQ*&Ma*apaim{Z!X8KeUFk^?C#K)dfY+DM%*M^{ahMri+WiQl}y<%%r=M z5GM`?(oD*lyEFaVl~IfQXjL~@?U(D@3BKBf{3$~bwv9Ku|C0CgfPm!B%nXI_eqDoT zeBXurw#}~>;cIj$WyT}5sGp{Lmc@zI`WxA_TqLc3emlsTe!xiQB1mXh$tyC|vKhg? z_#S&jJ~w|?MJ%!wMmYM4@FSaWe7`#`nnJyX-+g&$DDYuB$PM6pv;dF9JM$Hvqw!Dt z_eGFDd7mK4ex0YbO_{``r0-(h{b&NxBtqT|>;|I%nWDGxh+VQjDVS9>kt!+*PxR4D z%7j3ZStmfixG8J%`tI8a{vq`3Q5W?+xgv1x{U+5*0XuU?=VQS7^PvL$!{*|R#RWC2 zJ3)%INqcXJEw+g3C;A9mP-a*kT2GI?AE7ZSc@Dp#BgS~sM6H2ANv9CK=bN^lA$?ME z=f&EQft5^006-SCGs=d%^4H#-e{75;VT33twum+XmZ4n#Fj2UIqV1{`H@}>%y*OP_ zt>Trwl>WOFIuYb$LwPL|e@cYG(X~u9q&%9g95nPMmxx-LWUWL4teLQe0YID66P`e# zshu;cqQ{V8O;F7KRIVkz_3hz|BNu`!0l;aT1JiR3n#D1UaP?9*J_icI9@pr@y$y&4 zXg!?v{+ajTzLsG&5S{3^jCkh`nRz7zR(%!CF7zJ=d<6*Ewe49N3d)cfBY*tM@co`A zt-)fvT0~WN)f{|I(jX)NX^W3B9x(m$QMTfdxKhD^%IA^Us--|OvBqG|4L_sjr39e>Db#v1bD$CJl^<%i$U&jg4%Szk~o@<4UNcZdjRcIKhUv4~99m zOp-c*fE^i`JvXWTyqY2>uV74Ka)DkBH3oWLA~=R)4rhJ7?W^#_Pj0s)ch&(ELJJYZ z&Fx3ZB&y`txKF`Jq17jKbA}dH4n!fb@_ckh1pf%!mGh>&Lwk4S2@F@6DiQfUp>Psg zH9w#!b{G5uf8AF#i7S1i`$0KmA!@aPc9+*LhI)I*E&;HQ^fAx&f*B6I5YhB^eNvhmvo({rVdQqa9o)y zsf)W)UUhpZjBAcHe960r)Co(C$@aKvpd^!=JiOJ7FYLKSF*i5wH@+6WsZ^7+|&QMVuNVP!M`L!6q4^uqUa5E zL<^&CLLvO(i8B6{T+wky`T==y9A|Z+cT4JLZmAVT4W8K5&iJbxS~o+Tn=IC<&;07^ zN5wz`rXVnuly;S7Io;dMC>li!WW-`|!H{H(@V?upX&*_P=)8rP+pH;Z#gMs7x-Wm~ ze;7O~Ze{nWQ_eN$+aTW}0)%U_yYP`dVNJgo*Y#f?Vu|_S3j7@#YSg0CvOHiN#)h%h zxIHH9v#*ft=`24(;^s zUw8)0d=NbiO8${se*;*;3?W_3dQ6N6Q$Ldwm z3iK7fP~CxbtIs}^DM6Xt8lgKF>?48_+|DKi*WET2#nIcqDxOX%EP2|Uiu7dXvloB_ zC>f_P>J)`QMumJx#|{D52NDDRt|vf~cKHZGUC|KhZMxyvok0mlmF2;1N^p9IgGKSV z)bFhWkJJ=MWVKI6YPs?J0H>TTBraMbE*V2LjT9BQR2t!y@b@}e`nNa7IMD@~P4WA* zAj~DA0{MH~C)C#yb`7qs*@UjgT)&Ktz?{X!!xfLCh4u9YtJ71Kk~Ol(%@EtF!Mz1= zA1&>>n4%C`lJJx1FQFHHG{|ckJ`M48xoKM zh41)nM{g5X@q|$2Lkqze;RNBP(aCs+D<)34v{;Db)Dhjc0r@|;c~6HjAwlp`$^q;a za5Z$cA2KA*3y4u^2%DiknB-Qz8G0=D*4*`Vb9YC>jktNQMRJCf8$OAt@cC`9Wu3&l zyY-$2o@N2H+;X4oPrSjwHOQ^jfM@jtOZik!kf6KRObGOe5OU=@mbo-&qI(0|Dofj&Pd%ox;T6^*I zB}Hz<>4j$$$zE_xfG^Q|Xa~C(cihKQ!~vT(vWfNj4_Z(;xeM~9d``2Uh~-0 z@Q4mqrEsa3>Me=27}_(+-D=B|Hp3v}+M+Gb#7omC5!U)IEui83IVm_Kl2XG!h^{S}v$bgB)oO4%;ep3)kNsUfeU|M<|1{!{{RzU`>lt&^i< z%XqFccOsO0Duf>Fgq-5baL($%F^7z2x{AJ(rraCsP&L*V^LB|;Jgn}*cvE-pxce7jD*vspJCtHM zb<1|UI~If*(zY;pnMPk_&!6aNehtXTpVee7A9OZ#xa>aqqtsVB3DEUJ!=+;Ubq?u54%_sF{jy+xY|Heu_ zSdOP5Njuo0B#&uOqtVrC0F?p?+N--VmUH?9fPKN6NpE6=hxA7N{v}X=(8LU5h$|?N z4{?)X%gV}f3}TV0avpnT6@n){#{4{A+^Vmu&llbDB=kUDI&5V`BsK{jj=nxB(4X-+>Nyo*J%prVS0{!$zznybYk>E0!0qK^ z7%p`QdBC+@*S1x*huGG=kqDL)5hMDnt@2%`vC&E^!~@?kwt(e2^s`;nd*hbH+BX)j znN`2pPlj6Y;N$rY4QCCSfCd87h9}FjpwX9*10@rT zYKG3vIC4~oXiWV5v-uPDuYKd<;y8GCWC&#R`x~_?r;a^IC@4y%tnK#+T*#f!m25Jn z9b4|3x^C^-kHegHrX!TB*J&J^vxik&(}Qr!N9F%S+eZkWnq||!;W&z~@1xq(fcfmE z$c!?{*M!(V{-yd}6tVV@^EzyW$fw=zcJkYocEKM3|erFSvn7)>b1FycLgwO|uLVi1ox zwqn}2R~VQ&RXmfZQwvfc{IwWDgGGB$m~T|0UaoN#kf&JE`};R=)>b$7+E?U9lRf+v zvP3LZ0+Fy&uGE}6G9`wTYv}0fZ}&!EK2h;KaRuI7brshwK1 zlyKWBSvZAo`c%{vjqE7W$R>`FO%jY4%ZXz?tRAoE(ZYJms{j?JPVFYv9|Z7yCulYc z?bFk@Jp+al@bmVRpuVx1+*4zR`l%5o6W!;V^G5@+{KcWhENZeL{4oohyt0{=aq;nL z3V5N^`C64pFaa60Nyiq>xk60ku5~JCoM?_px*|QpgxlQQJi31#>qsJG+P3LiMuw?{ zMMOjdiqU!?5|y%;WYRwZ^R$~!v4{H}o>6Uolx0mSuP(A3TU3>r7eCp3#{Mm;<_OFP zv?eVWn1j8TEnoeK61}21f4S{i&*693B17u#40zltTTCFsInpPg%KN#~;}YEy6U)@Yx*Xaq9+%e4fW!ta>aFp#!T)E+W==%+8(RY%B2eB&J= z1=U1A5~W7|UUlP4BH=$Vvf&n;!=Ty&}6HhUyYCXYji+T-wd~fg#}90 zbt!H?{A{HwXI&MNYrRg596RqVZ>@rEtPFlSZ?Yhnn3*NRMYOu0*O#F7#>S5vpJq<{ zj_nqMOsG1EoC6#aQW#Y^yK2QVOZ(O0G>q9;>}`(#bC=D9VI+xs=2zlYEgP(|M2WcF z9DBEqoyHYzxh*KnCBwBfQ~KCsb&K4R8;=s`h&2YAam+l|`fMBk)+ z&eT2U537;!5{UlvRVs`2-L}|^d5hHqC8tidX_KCZ-|b0LN=nMj%j2ongy#F35_U%+^tJTMW^tZ-iwX5#70^6Hj=E4&=QO&W&7vBf-r#sj@?G&r%%pHY6H+?Wl z6bEX-7s;bcUm8H+2tDFTwR3oPqLA_n4HZ7>Qiw@$KRyNxU8nY%Q-@ZWUKI{x%rbov zPv(tdzJRrQDW}yjq1syr-hCj6L~o*F3m^Esn_v!(Pm+3-mXc%^%sY20i2u%$*(XA7 zLM-%}e8o|xsj@MaFtt!p$#V)u?ui~6AG}I*1JXcx3en=^w*U{y*o96S`SnZ45bV{ zePrvuM~nl}=BZ~tpJX~Y?zihrr(lc2dC#-nW)v=p6p!z+EkZuY&;GVJcYMMp!7Bl5XJddnWu z8!~CGIIB|ezHk@!L;)irnQ)Uya$TjAsFZgM;63v0aX;+xXp2s9~aR z2~C$QI=M(=3r!n$8tSWvcR5Lky z4y6!cZTfT;@_HNQe|r0Zlzae^u%N1Pj2g=A{5`nz&ISB)zm&H9UfHQ%U}&~dTfpsx z-0tv@AZ&9ac_+4tu!1b#O#LAhl26VLbC3brvCfgkd`u~2vS;=UYjy@9OJ}JIK1cH> zj9hU~KBYqL!oGj{5EQ|UN{=i-jCZ%=NM400m=jvCXTG3kf^_FHYovhwaQvTtdQD@aoJAJT1@Bs9rdT#*H`FT=*uA ze3BzZVt@WMk&LajS$P|!ADJ^$hW-RF$9fK=s^U33Jp55zees+2D?!)U>r-LS)!s-R z4k9~JLA7DqV8euHteXm|M0bBba^A~TnGJ6iFP2mp6iPaX_A{2hvE4%9@N>H~RyGu|r zI*&=`;^a)2$~<&)%NB4;n4Nw5@a#TWg8y@Dw_EGmLiRzbx8w#C31(i!q#aXdZJ6H> z$F20nuue1VF}L>?sh65s0k4q15Dp6N5CT7yQmQib=ht-U1`67_Ag!7;1g1kw<4Axa zML%k4g4D{ro*%AzMngZFn}_Y}>_B3)V)#`S+G+;x5-5&VTJcK=<}EF~H$u?7?>3|U zT!ubOf^v+~hov+bPAIHAEV1`7Kj)w6ixx2s0xyFLzR)Zk^Hyoa!n4vU?#-&>ZCA^3 z&U&l!%M;bA|J7W{<7rTi{ESAnpogv9Fw=xvGTj>`B_&5wQwiT(Z6M8y8GzXCr@K!i z2Npm_SJ&z@oR*4R0BMV)j+Wcf@9%wjIX-)P0~;+}`(2*?Y-f94H26>4wo^=8ep`4} zT5V_deTJ`I`l8+o!u!k@`k@(Pg&ZJ7l zPC1uoN5UTw>MxO|ocv9(L=kkyoi*nAdj{7UdsvW1UZ#@($z}luK&_*vN4ocf;$ome ze7sN>rcx$VHnaJ+Tpc`7G=G?SuS*sg6}iyh#h!wX|D&pk)9qQ%Y9e3#w;F6YiXH3i3HT(=ovHlLK^cWZVfOm+EYHLg6FNi{6lw<_ zI`0>s@f@M33t?H=A?v2hY{7eP0s9Z28PaqzZ&ja_^GKlu{+W%XMLUhC%6~p8UF%-D zY3NngQJG`A6G$q+H}AsdZJW*l#N5We1a`5<7A_>KhJ%W2Dqt{J1M3Kc`mN+%4NkCx znDB(U;Obhw$WjTIn}{uYKv#)Cj+#z)Q^&xFc8muC^nK1|nXh)fturSVa19qSx@L~! zEVfB68PMJ0FWh1gead?kS$|$#|Ff{b?}tli?$a^QYKIN)vOv__oUQ5nN>N0=`OAGD zuWTaM!otU*66xpL<}R#uBynnq5GcZ$cnL2*1ld%aUO}V!`;mGoxEjqE z4$1{dVnsLXUq1xv13tqskKOw)>RN~*KC;Br>FtbcQ4$6XFD}#TfhM3@xccAd{*1rl z(G0n;cR2M~M(*0kEKBYvbJSbV;u_L~5 z9*JB5Z)V@!=cE;eUX+NLUR~?-8YpWga&x?dV9WR1X;PHxdOl4rdPNnO5%B2A#jOGJ zsPRJ*8jQ4QSu$vMPvWwgn6~CtXdsxlR8z$9{2TOEuT4M)PhMDGh1f}peAV%*V_7Vy z(m=a`PT^ydUWpNvnY(-VW`SvBWYo{iNU~0#ch*~}G>fAS7u^4*Ku^y!t6ZPRk@T7k zG=#4rH$Y6x*uND#vR+5|Q`TpH&l#I{NsL(k**lmZ*dFp==uaMAXG0WMTn|V3b44Dz ztQ;L32QJ&YFNM=#t&QnAxr2H$Z$pj=ZG(xiZ@*O zX_eG(ThU$&;3Yn$rG4j^wT6|8k54L_4!i@u*l-+hHG`E%FzB-N7d=@~GFb!lx|&uo zvYTXD82(90-#t^?Yr(cMFPFUy8aT8fBa83(R3?Wf_jD8VouPe#DgV&tnCQ5KRmx^%P1UO|tQQ0B^wx2%u8q@65mzWVEB{7YBczAx$N*dl4P-H`7M21FtcjTwQId>%9^;!gC=|rsr>Y@oO2LdlFd2jU^MYaieS=0 z<$a4iAGNk--?TnwZ;xE2nnxg$1V0%jM6r#f*~-6Bk$DEzQzZqVtEezU|WX(Q{6(py_2Nu4+laFmmibI64m8?#db z!&(oyxVnT!uGd$)UN^cv=)D^2rcK-O^2SYhkjPf7A5I;5+}{nogzFpMxSq7$iV7Yx zRB5G@mzRh9JJ|E|BUVrF_Q@TBGnG%d?-cMF=ez?$iTLYTOJ?lUmGS-y$woHK2EUWm zsK6yF3yTb+nkX34!L?x5>vC8Bs@KYJ|3A8@geMADZ7WBMu+g~sN0a!XmW~)Y4LIU* z-ru5UGx*s(e1MUA(Y!Rt{vE_lK+Iko+e57YGKnAf77CYLdbi93G)QHv4JU;IvuDaw z)oXC!B(S^atFU5r|55f@{Hb5I@V&5ZrsJQjtj$1m`c-6UHG+RWCyjH6KNk+K1B<~i zC?(MJ(&srip1zl(3eZ^hf#p;z+G8-4kVV_|3d&WkrrA~6RUX4}IDw2YFe%dXdkUS) znB`2so)p!?Lzcw6m8DVKWEy9tzGG|7_4RDf!z4`fInS=?L4>~((>n^fwf6^qqTcHi zVLV5mr^!y+x<&u*fydww9$WyQ#>yb zn~{mDZH(&keOc@IVAh{{(GX+DnrXdhYXkPmgh0iH#o{y_=C@;2QMaas;_PpKIJ)2e zV|@Ll1WRz+j*n_ReR<6ImTl(X@ns~P&E@6EXX)6H>0@~hD*kP%ZaC|;iM>%GOkiY$ z1*|)FDQm~TPH@AH9qDXqqp-HShDXWy8J1 z`fVRLM%X+KUospvk@M0CjtQevFesaGQDiEI*6Z0tx!qrECAYcm==phgG?`b8rO zj~#)ndb_(B9il@NUTY&&>}@%8<*vsE7R<9tX$SDx{L40SiEA;z=)}Z!c8OMHaw!we zS6dG#tJ0!%qgw92jIum43!jWIKJtzCP5~_Y`Se13e({B1ViJ;qR`=9OSnh_hlefqt zZada{Ssf$85<6F%6?ZiDpxF+7_2jNg*tpB)6UrPJ8G%e)39u6oT|aguDfg-2*RNrR zmes+hC*jxUu4kI-0vgZbwJ=a<%7oZg&WDlg*OE%niOVWYr>cO`RmWF&;E|aU54w=I zZEl*v+14g%IqjsL+x3B_+RaDu;1XfgUyIf}fyWoAEU~ee^Xjl{A@8$%Lp{BRkqIR5 z&V&|AOis$ScHjn8=jDO+B-Vp0+0BVau-lE_Oe2+du5StKz6KvcuKd_BHALn2Ta)>1 z0d(m8(n^6@LBNCS!|31xshLKhKd!2eL7OKE%wX|ZJ$bR!=ir(Kab3#yO~km*ZU*dk ztSD~4i)mqPuQK0y_!LTCpVY^XDz%-><6lx3;i2@|G%%^{q&;Ob>6`YdCuZx7j^Sxt z^VH7ykl4ie&`X@YQ%A(3aS+w^wz~a~8kd_SY{y@9D`^M@5>qJvT4!_q7Dc4a%jL! zV=QcJbfyxw@gxh9ae)G;D-y|qg{~Gq3_>G4A&_qL%lSp5flIsfxOw^be0!+%dQLyX zM~&{a6oHz)VfKKdug~LjgcQ|c&0fRK!}B=vC|ktM7Kd2Z*fo?rpVEhjf+EI_bV6H>tOgJTuA1lNy3Qj@DvHgL(PayHk}8KLjg8Uc>^&-)W*KMUw$J>G(%iQTvP z&wB+hrYc5!S*QRym>HNX>b4I@}{LLr@?CCtYG~C zWG*!L?OXP{3D;b|hw`fPni|5B95;B5=2gk_3($1Zr_gB zt?U@i_z_oVQ^6%C|FXLkDct>m0hzBCPI{(shMwbfZu5=bT0M8V2z6h+;q>{5?5xrk zFLc$_ja!LbqQmYxql>=9!Y1$-(E+K7sh*VzRlMBR>!fhwdjD1kIj~jP4xX2@vmW8B zWns_xy*nd}0&crlN+U|}i_#e(g@%haL^ErPV$KRjU&2?Du*I$*vH9w;vt7QfFCBig z3|^G|#CfT+Y?v(X1v@CUE%T7df5QD$`Nx2lGhDH_sYt^%FZIe<_#vjk%e(gIwXylE zm2TRzec83{{z=yiGc*t{_$U}a+i4RFFWpdAG= zOr@2_gU7`NFEKbyhC?#E0he-3phDS9!Lm}1ZZTBaWi$d4_GSBXtxb_46l-dqd(ql+ z*xVHQ@9#cW`-#VGQvc4PBpDgmj~_ocL`23qSJhYCy~A&xmxEO8u9;ib1BK>#r1Jbg zaDtq@qEIuxb8nS*|8A)3+olsvzkQmgj2eGc6UU(Nf<5nRQxh*zFP*~5-5r1DX}CPRD+=+i*`5M8{73@QCNo1U9a~k{xK~>-&qBj}L}a(8Sv? zH!cVxrl2r)^xSQTV9UiZys~B5d1H6{d#hJC@99o%<#7FK)y&p5lgmma(TXWP9=i}+ zx_+oeKzfLUw^zp0;5Ls|v>zHVAXDmjf}ndss?s2e8G9*wyV3yHe((m~h&`*H%3@m* z5fKuib-YBY`fqKo1RSybXo9;o&X>x3>ck^WmFYGu%f?zu0s9r}2Ipa#>#8$XR&A>% zQsUGl(7wLDYNHxBnmQRA8XDN_i(0+9YCQ66t6p^+$;cpqGntQ-vj=Zwrg#UhdO40B zJDsxKJUu<t0NDH&}5oO&zSC_LfD zFIR%+;nengGb~aJf@8{}-yZfQwiajC2(arE5WAo@Oc=wg*c&^~R%*Pj& zorke6d4=F?PFVt(^C{V)b0z2yg50d_tOKQelN(G0hf0(chn&Cr?(V0)fq{ENLxVxP z_Y^$PcWp8~<2Wf`2J?FQpLH$g=I4)hJ(iE19%|2=OpJrgwWyno#Ng`g(o!bkQ{(!G zUk95{Zq%^~AS!#K?4x)xQ)vJ$p%#F6OL|>nqhd?e#gy1HSb`Xu zBTql2*U;E_B@#)_g0M zJN$0bgwuWQ&X-Co9uRL^QS>A$RCmXkIbp? zPkrax=yvj0i4_~TJ?ExRZwEIK^fs;aoi<`zmXiYqjjd1$09ZckPn z;dz;5p*y3u%;w&cKv7gF=lILU@$={6hY(!k7(mSn%r7 zq2ghF*#<}uPWOH?A(OCY`XEB5We>umk2a$lE|soe^i&to()OCaf^9zYeV*#F)=M)H zNVJ$fXegI)sCa3+?S!}Zz@BPo!$(6k`HS`+!X%?r4gD?|Kh>P3YgZe{!u^2NI6zywFC&Yc2OtHwbj3J^-$1J-rPd_Wg-(DT)+!{yWK z=O1NIMH=Mc`lI%3{?}w}!72l`5lDIX`;pN9${AcS@qfB=f#X1lgzfIin$BUkq|0D1 zuS{Yd0_shHL_!o}KxS21hgx$%#Idg<4hR4mqTaQgE<22pzsSKK02*6hMNc%yN+Hu~ z_59)a!h+7huj-9#^BE2(w{k`y=w0~tPl{?)T9={J&H}LN3TAmA4qSZT6%fcsz`|vT zDI~aH(w5~~f$s9B zsCRly=6pZXSH8$7WTiZ752Mfr6ePhYSN3J7#r&; zQA%GJ9>!2grrXVagea;ik{|(OfN=0dPC^o5{CDAg)&YT9dm5S>aPWswlc^-0vl<|d z0{9Cp&EZxC_b%K$vImquU(Kj)8!&zcNn)f~=m85pySslDS0e}kxiT;^QqY9A)Ys$L zWy*#p8Yq?%XFAf7jlvDB6s^ish~hI{LW{t*$ucjwFh||Rg85e;Rgr5bHo!7BmptUN zR3EKv!Kb|&-;OR+fad%)QfBFTS;YZk3cu*fV5)Y39z`(R5|V72iG-H6y_=InXy)ZJ zEf)2S_51nDA75wf&tZ!BT2<>IJVufy1mvL8ug-?I>lc(?(v0^Ls}Fxd%DexhFmA52 zx>?)WVhH9Wz)eU*-@~ewddC)}2G&EX4#tv?2*EVr(hZAGsU+V18vyF?pH*6zF#~1- zF@+Ttx}Ie-Jpj;WsAs^0#V<<^K;pG8g}dQA>j*P%)>urbjU_pwQMt}ao`r51r2G!v zGZbQz*|_RR8xCSXZgnA;g=A_8<=}i!=HkTaD}w$4)Q+LVvZ}X?p4a7;GP%_0aEDTF z+;g+00FE~|lLAVTuTvxo0H(xS+{$D&nbk<$LAY2rL17TvY1W9b_-pJ$S5{?+{1&m` zaoW@Py;C6^dMAfwrG3(=icW{Ay&w9`{L(nMULhT>8z2<$tlfDCwm9K^1t!%$+H*H0d9s0c6 zw%{&B|4Bf1X0@M_aaSZ31+KfFNUR$hLN`hBO@b1x9dS-?^6{=Jq+VO)10z0;$TaXFb*u9A(xf&bC)R4mUk`;Njwx_z*M5i zmKr0E5eNq-?LUA1p5|7L08u2mjx}RGGVg57!gXWe7dZY#$x)G;Q0Dl+B(2Asiao-8 zH>Y)p3CIUBsaD2ZP)qLF6C*c`q#Gqi+7vjJVP9f4v<3D;LTz;O?R-y28ndojQvIZv zo-+@Bz2X3vCFSAAHr?z{>p(Vp=)v!OM!n*9+VP(R`;R}te=~x}#L_bI*0+Oy!dDx( zi6D*$AQ{wwiyDD+YsysI01(aRXShp6hv8>iuAyQ$e|-s%cV$qLoA-Fy3G$XSkHhYF zF(`m$x{zNUA3MltHsy?sq5AKz7^AZpwMSc7S-~5{82}m@n(tl5DGC#xV+wt*eFOab z{a5zg1?#F0?X?4n;2?tJ{nDUyG96s$Bxr7FSv9JeFM>AHb>s8^53WtG@6OGu;8RGF zV@u^f5~w^=ifxltIrLbdZ*qoCL5*BSECFE+5d2f4`h|Y`=*_xYffPQxkEOPHU)%=c zU3x58DMG2KB>7OXTLM2!DHrx^m}XJ6T9kx3Yy0-&Oh3F4no`tXCs#B;Z!PHc`R6Ba zH@u?U9oBTQk;bE{Cih##-AhL2LO+ZuWRjb+KHhM9K>+eh1+DG=Tz-dRd~Ms?kJjWv zZve&j+!&xi3E2!tIW`uu#3wg$xdCEED5Pfj*z@2z08>e6B&e2UfddK;L>7f)1UP)x z)Jz3UH+@9X&|KBhEI|R3S5!bWH7)GzM?WYR_35B0;OV=N$M*C{lxbC7Z}Fd~DN51Y z$)>5*VtQIQI|EBgODB(xe*CVFQ)HqTzfaJtJ(#uK8Jh?=QJuboO_)zy{(TB}#H10F z1QJuMq8(O_h+976N=&>Kw>eN0Lh* z=*k~IcGsB?ZNM$xz0nLV*MIyNaFUy51y5) zp+OI@APs&PoU5o~_SI&WmNS=NX((TYgG|yDLrip&SsXPrHDiBOYr89(%d`OiU`>LO zfQx^B#?Q`bU!N`~%1R&#)WMd-GU5b3+{RfRZ%-MU9ppMsZ|hm@kbd(hYo1okR{Vhz z96h+WO6>o5+;ZG5DL=kY`bmI1Qy42geh1!>(gcoyx19+AY4kN`(PcEL5Seb#B+hCi zfkXgqNgz~_zPO^|hgPMvudiONke5o}7Ji<%l$6w2FD838OHF(41%e7V96ouf1h%LG zg5fKM0~ZNTN0kRUiI34(TZvRH?+aXba~+Fp1kwRV?{&_>f-+mH{|p z&mhytd<9LjrYaWLWa<`t5^r|MQX?OtUq+na#x|U93V6J^hfCh$Pfz|WElMZL)Wi}^ zkb>>)?W@TGDgVGgBMh1k<38^sc*8e1gmuDf2VVYUa9N$f-SD@7$r30@$rVG1J14Gh z97r-8q`{opUC*jpGylIO6%M*N1pRJ)zzvwQ*_y!AiP2H#c@HM@QGCg(i(MUX$tWP0 zot3rw>WceGu>SSc{LN*q96Y=?AFf+E;fq4LzE?2kWMrHJsLk7Wb3S;@*pH2mOH^rz zl1G@<*46ba9XIFEeMzy%r~wa8?^+_MGHW`$c9IsURuu$Ss33_{lgBeA!G!;zfaQPx3y>TRUrR?s=^4DmzS)-Q0@s|ImJb!U=A^^b2zKy_qm{3LBFeY*m8`gU$;1YM?`38EbP27 zDRpS4?RXcGx5Hh^N(2s;c5axm?iJ!ouZXj7wX%}C4iNiYKdO-2PeM$t=g_j8Z}ade zneL&S5ev%gy4#AaUp~I@S2>kuY6EN_h$90?X#SR7grM6>>TOzaaIar`6E-&+L<$-&EGz{1fyozwr>deXrYQwQ zRg^T1%B!oZL)WigFCm0*x7&3PLfxI6HiS`Fdi?P}W3RpTn(~7m{J`X#mlDi=CbAjYeZVLkQ9Q{+>xG1wzl13?fJIp>|+Paxr(Z863&MNxQ`Wkl1o zf~u;vqN-W7Qh_*$!Eu}(A;eJ>r3(Ool#-jKsT@0Y%orXXR)ZkWUV7;z6h%=IhM}LP zX}~#8Fvc+GI}g z6A;GPr$7CfXl`x}UAS;T+uq)`g%E>;5Q}rpb{WAs;hb+3i$$l|Y$kcN(&9KS_Ikac zyvb!qDPtjo$2so-fZNY@0ANB0wz#+m)6>(x)H5nsuQtzW8tszemlvl!_PFM48v%C z{cGRAoJW@L2g3J#M^Tg>W6YzJ2CJ*fOf$?wpZWAd$Z?$7_3PJ%Y}>Xwoes{j%&pc2 z-g)Pp<Ve8yNWU;HrNuEfooH{r;UBX|6w z-_Zf^eh9;GSH`VrS&}60Nq|#S<=bz(@!D_C&(HKs(+n765o0XOn^C|r*7ZCe{pn+$ z9|*&6BuNr8%QBv2nL{aUsfxO_wzduj4jg30m_j(`1w~N?7-LlcC?bS7W6aO8tSf|Y z`YauU(5=I4Uxl+503R~?ZWr%YAuP*+nYXWh5dc6@6e~#*fe>Os2;N^H-OxMFKKq|I zqkcJ#QzZ<;R8>_^2+;w6K-cxPt*tFMdE&SdMZ82Q9TY-TbzL{o-F?a7oOkniJw*ud zyD8i6>Hzp4TgPp$i-~S0Z}dMkOjW%DWl(Hzff2=97Ja<-76dAN~<+H@5!R zak`%YKz^&$+5~{M5F$hfG0wRJjGUE~HCSKYI6gNwXSdsJ002))xut2^R!(%Kv$L~; za}N0d@va7fj|pz4aT7vtu9N?nro_pUr+$wycHz|N-}?O8%EIOO`T5xMyq=;cLAhL} zolZx<9`0@w3WfLm?$E)*>eSTqpHCh>dKv%*0HBC5R!q}G004u7gL@C~V^Ad!?2<$X z#u)dt1AF+G;yv_`d)UJs_OORN>|qak*ux(7u!lYDVGn!Q!yfjqhdu0J4|fgz4+H5`Q0lolkv_x%{&S}d4% z-+kwvv-jEiM5`*xU}KPBz`?;`%gIWr1J|JcKWHex&wgRkG2nvkB&+KR2Z#CQ{|`J| zW;O`;C6&3Xx)L0m4?Xb5p>S~jUV-Zo9Gp8l9Ne)99GqY}92|)w%y>{54$e+qPEzcX z*UD+9cY2Ag=KkYv-@qMG^U=C=>VO(1<|JzAwpg;;=56NPv@LQ!f1!uiWl)$84m-D&*>wQGr_^4S8{H1Wf zKR*>o>Fg-i?bF6ZqZ7k(pR|@8s1RJu!mJH9C|=qtcX((B1-dis(5$PkZ*FTFJ!2z@ zhh$T=ys~2E-~eTeiOE}xkS+>7@V0kwsPjBGDxG86xlEUc#JOBDPbf&~yN1B%wtf<6 zPuuX;EV$H;>BSy+V?|2r@9(n@O`qJNg}@Cv|E$B>xYIQ%GV305H%v`U ztywUu+S|`^+~*6};bR|4v?P^hVn{~!&NYwQ8i;<=@i6~m$Qj(!+$=YD(`Vd@-LZeO zQ}z;CEEwCCLoz1&|^E(|qz3u1oK#_CbjYqGW8JXqfXOCRKa?ul;z?q4{@9b*wrD zT#lXJ#=%Yb9303zJtu?u0#P|nSSr=(spsw$ZsW0YV=VIJLE>r8xGTZ;PiI;rWk5?n z+yD2vJ{nf(e4)hN{NQx+ucK z`s)ks1?B5pU}f&huoe!*{n=bXp3f$5(=j)4h}XqYkACpmyi<-fhcx5IMq}DB&fM$l zgPNL}AUuSPJ6mot#*$;HA0$Rm4+kZm_|*xd@S!_YVJ3n(1j8KAolX8heXa~en?}9y zsj1{rrZgiLrXKU_Nu*y$a9Br#F& zu)U*W@`1PWCmTbyQgw_fo<)P}l(p`wvq#*@I7=KGw<^Z8R#QeJJ~ z@~kh7HUId*g;0qy4gTJE@o;F_LV0)=j+YL7e!SahV>JaWRCmQ3?(kQWjJmH07PYYV zee+;|PZAs3WvUjsrN2x7E; zJSNM|iVutLOX$!L>X>QeU_QO9`#zfgmKbAzBX#8Vvo0<^9vcoaWo~5^p;ZySKt_!O z-T7riHRZZ*W$k_b`oQH7Fj;?e>jP)F*&LK+WMe=0?iGZX?K#4UyWS{dtl{r6r^I*J zN79v8B$GfBX5#9ae0%F|Wo^A&Z;k8f>e^DR|5n_6Qd_9nWo{^a1#i+5J{kLw&5j!Y?+@cil7xW-WHV+&1X3Kq*C_jj3a7-PyothAU(gxAR}`lVzIGOFj_L zP36c@CdEP-a8}GLrISTci8OyOe_m}ANGQcv((-Vq7I6G7 z@bg{XUFMqfb%JhBGN@<&fdLhlQXH+fudi<+2*K-NE)S|6v%IVu(NAq>XXlkG^JDS< zJ@jZ-g3)njO$g?p9=o=!+zx@j!_;!HYhnqsU>=krY&F7pqhgm!J-ZZj-~f0PuH4S! zn^akHW^D4~s1aWJzaAT3+Pz*b9>;CQR8&7vTnfHyt|o8Oq}QYH#Yr5HM&`1T8TAVY z37$CIHSclfjt>4Q6oN9C?pr!Ia5k>$dd%@-ALv~NG|y|Q5erm1_03r9=Kaa>P|p!u ztTrHtD^hcExo>HASolb=4!`<5k*BHv4!-9^z9s zo+*j1>{z0*V%>}8+# z7TP8+Pu7gd6jLn^265!e1$jEA;eu;BicT6rs*OwN%SBw9AztLJ|9v8rMom! zmZDX5%&|H*p^W?;i9a&J%|{k|ADM*wiD~su#mZOBQ64@%nX)-kpekC`>yi|CATn!q ziR37A3?-J@J~v{JEXCt{RbxUGV06W{F$-i>?(ra_`^@({%QABXi`D-+p6Asy|uE@iZdfSP4|efyiJI|S%L5=}4n0Kj6 z8+`CnT^El4lDPCTK;!}n&ZR}jx%Vx!devcXoqV|0-B2)R^3CMq%GulaN%ymtvY8Zv z1Fzgj^<(s0OV1Yvc)O_tM86HT&PXOM((tCtG1m6Dz-z}B?CzJ7Zlh3G;g~Vrvkh5sBj%nR`uQenh5b@PczgXF%J;HnyZ? zJJiN24}tDjo0%uon)KDLWSjIo+k+H$vuPbEcGayYb}U6(cvIIG1__9d+D>38!ofj@ z`X>JVcvA@L@x5&(P#0}eL&CY0?93C@Q_2fz(EJ3?JaUlZq-l#&+zqJ5HfscNTylc( zbnHH}4-+#4tJgiPAy6})X+>UojpIIV;<{{f-dzR1K6hi9pJjZIKEewdj3*yhA_x;; z8Qzws3O8AjR?KSQ9QZ2SIw|WOMufmbNF2K3g;o?bOI^NHJjXe%!!HyJsS~6o^_u|o z%;o)yBi%d+4n$pjvPgI=F@BQbUEr(H0iq_2C^pruG?_`aZFF=LV*#|yERn(=0Jc8t zSgPvGp^zh>RXFtgMG4!}C6_oAZuUfkoOxtXp#hbeF$R<{4CK(FnI8AGmA5+fTd}b= zU4msGD9ZTwcz&Z5JJ_V5H%Y@_%3LtxD%Cg;lg(!)*6TUpmEX!t)-8t1&Qy&mP7+fr zH-r>(wY>Q4ndSON+0BLv%}_aElf*9s-+2q>s7Hs9zAHI!6{|viwTBlN%79|oO}s4>h;2-l8Nvj{JN$6^3gW+%6;m&tu0@pw|?gmM2+MOo;$gntoW{Z z;E#s{r&z?Kn>xP>rNWAO0TB0s-u}TsMn=Z}s2Df|jj2>T(B=2JfKtxkh)6eS;R>@1csN59T zQ3HF|N8i6d?OH%wyj@yfXN4AV@5vZllL_A>;a+y#_~)}I<1mDci&{`4BaqlYLFvP_ zeJ1gPwebEdsx6FLa0EN3OI;I{;pfkPo;mX%jhEi_HtOq1jqNNa!r-S!Ko7~6HO3AzE#m#W z=)SzZvYoJTJv{Ee$Q+$RLnbxw!@bslDV#%xHgO>YK3MWMIGBodun;~LA4SFs?I;md zE{Rtr2(tkMd*eTdy$NuT0L|7zHn>!_@sl4NSMqhtJ7s~#8_vs?Y4aQHTM=(B{PS*a zZ`%ysMo>rMQd;@@=V+8Eb8vBm9uNtATee>qaxQqRQtcka))v#(T&uv4^1b_0GIzB3 zD6E@W+tf7l@Zh8LfYx8b`ugYe6i*7@_wQ)|@Nc&$)NE}p?lA%xild7(Ke;4|W-8}q zv?>PwPU1{x#Zr3jC0yjGJiRN1E2mmym&2g7K>(>r(^SO{!XcPS;X9=222JOG!AHt6 z$Y;8M7eY#6?}Pa-V{Z<@<-Q7AH z8wY`~25>Js)}=qCIhOTgHZ|0on3#A8U_r5LMC#2#xZQYR%h;=*Si4p-G_h1$A0Sgx zJBV8MqMDfBoL=YW=gGcs52bv|^cVN`&WpNu!@El1y}D4M^0Y7@{9UsYe4X3G^(eQ*@9LY1xCKdnHB3;i6ya z2H+MAJq>kGoPWS~k?OQA?WCrqdB0reC2&MgKJ-#rICwz+{rlIZ3gE@8tSkVOpFf`d zZpJMkl!Mi@wdtXn1E>PHdFt0Tj_Q+zgTI48@iB)c z{fhm4a+{u&RWa59Ko5T9FL7|8y>M0TXYqK%Ra2d*qe0(kzr~OMC$UG~r&AdCLXjVh zR@~sazyJ|C6Z6EjrAuclH7xIX_MqA3lrbZA5*A`R9xXIx6jOSg*!ghO8k{IFJJw4= zMXE3^>)#CYIPOdb+F}&%u=y&K6idMa-GeNr4NDnm!u&XJElaKEXX?xI#U-G0cv7g;SFh`gg&CM{4A38-F`YCT}Vq)g}4oG8M z){_9UKQRhxY~*q1xEvC+`$lCjbv-#o{Qcn6qy0WuJ5;3|QLltBM>#SlC#UV8_fDd+ z)~($Tc*qkkOEM|usdEV_R*!6Ia#gZA!a}f%C|WEbaWpeig;b-FNiAC31pc0jF6K}! z7aZXxm#DvOtm7A3xJBc@=j&0%m*aQ77mhFcjx=FZSQ6C$NDZMfadu9kLc4$@TsjTd zaGOCW78!F++5pG`@c!hH;&m}p9Pl?a;YD{~^~__RN!ILnkM17buZJC48pYw+n1Ahh zD>wh9M?;V>NIi2ISVPkwa2SZ(@SUKUQyRh+Dy2k;fmME%cX zfOyPg)pS1`a5m6he=o^0e05lq;Ib3X=W?+r2E@Vt z$5lxqj^p;^I~3I%t99}MLbB+7>E8|IB8!(M7XfJa&ZBTJC5>e;-zO$3O=|#&*Yhn6 zUvBaC1-VeEP-lwH!W$D8L9pz-!Gyg9QYLsHOfRaKw9eZ>q@V>t`)|-W zOJj4=vekcI7{4vZBv9<}1zz(3@8#A^J5crOx_7Sj`C*J$vajwLO+|{GU`|~_!@$)Q z=i}eAilWQWc}GXb#n=spW{#m>+-L8bDR3eWi1fcF5Pfd`?Qg9+L(O)+B)DQ0rtAjdL#iC!^78Na>udVMuOVnOClH-m{R9 z5Ee=(g8vP|U(dU19Y0)7l=(0NOm)oiS{qDtow!6PY`9oaA`ZCJLIPECTm(BY{hB&A z%!qXo4EU;G<>|s5H+)%_#TD4|zkk;B zQN`rTePk?jBX;=z$JitEX-*fLy*_+5kNyn{*(`54;yCWRrcO`o&jj8VJ6KwlNUyTe zeZKE9ru?W`4A2ERSQx-J!NWj0o~lL^v}4iN*S}ph7-Z@+IyZ1MZ$0^dt5J|3u3qd_ zqNc5lOqw8FboF%i)7?8F&8VE_`=@8vSpB0ZYB6#Kx+H__5Z=4gRb(b?;@D!iitki4 ztg=aqxxFA=(Gln9PamZ7*idRv1SfdM*8HPnIb|acP=gf|6e=q#YaBO(fv1UWOa;mq zz7+m7vTaeR8KsDGc57?v!=QVcVKECr5w{Xhc5nX~cA^77-RQ@#4R_xiV%r)iWTQXD z(!iX1O_?O;AX~sc)Bo}BtUY&bVu&s#RHMZdlTNPBg#SIl7*&t6;p|oo?`~C<5?MS$ zzbQT)YCuqJs*RwjAZh5NGr3eIJxC)Z#?lno#ym!ynaIfv`csgi1Sue>0!a-*A5Uu_ z(&PTIp(#$<96VfwKNv~jlO9@+TKg`RyaFle6AV+KQp`6IQwd7_ElrA;G#Jj#J%c($ zH%e1SvpOG@Uxflm4^tsWsye$9b~{2gbo|ip4STckhd+y+9Z*VU^cGnkE|cHse)LTR z+5)0AU0u+FRz+#^{r!VPbyJskCd1Nm5>|F44In!K9fKR6kF(r^?uIL8IMoPY3@UFL zkcV%7HkkUd51@-zHf9^GZT18cL4IJTZzJo6E|3mc@XOX@ZaHOHEcMTjX?qpVp~q8E zT_8v&bBMRay;JM0sYzvIVhp_-Y&{L_myH$AV$SDRP zE)Hhlhwn2| zXj|-rI{r&_+`7NqIY5?N&>=GoWuD;o-lhXegtFY|FTElQ_!Ts!q`g0jdT%03v6Hn- zfcDz^Ii_H_VG!03qq;tlux<57!;oEr6L`?-$JF)}XYOZ0==82m@|!k{BmRLR{O25{ zIt%eJA`mLfE9P7@kbi5uT$4dAPHNMKLR=1^If?|vY@TgxFT*t4T*g1akc7dZ9L1z! zAO=k#WKZs}( zO={5t({>8u73bwVcBE zVe`LdzqQ|r5~VXON(tiZT((50RUEcIbOd=}vZ)nw3@*m8T)-FcbREDx$8%(kcq!5* zT9A>MzKJ!lvx{8+o5)-*nL!=R6_&z3D)T)KvN&KH<6;oTV?w_ID$a+jplmV{d`PSw zGq6VKULH_$sHLryH3S8*3rN3jP<}{SG&v2I4TR?ae{|EOCtVXkBdsz9L%fs#xuB1H@fpOmd$2RL*W5LBK7)o zY9EhEg(NS}%zk*6q`u9MQ>9hGV561f|FvDEOe2w?vNxT^15Z#!2etf7ikeqnVpfX9 zstk(&+8$n6<`$Kizi%IRBN~x-kwWnsXdeH>!!c>DZ@&?a@$vvVnIymlcfGoBrRN+P zr*-9Fl3vQmXL2F8e#Hl{Oi)S>Q!oV+cNC$eD@}oH@%x^1gQ71pU;?{Xbcqi3-9t_7 zd~9&r1J%T|X+0mpj>~rNFu#9c0`B+&dD|I|t69=cmfezY)HDsJLN59&xWVzH^L=*|y>h7r7Fjr|h156?3ly$`)HK~pp*lpL5Z1-W*y1uVZ^iNyV|H}nfA#MGQ z?@K>PtIv;yr^r$tW9ZBq3S}q)Z6@Fpwbf{p#EX|BZ1AGkVT&K^N}IbWrF;{Ah^1{=^wADeZrvQCR4Z`R(L&KY7UXw-^nO8d8FTx#@XPY=l6fB~IKhP+ zr62!HIdZ;=To7}tLGMe$r-4>WPVy~Zc;a|&GD{>`h0jX(T$rN7V9_uOPAI@9q|3%^ zz%zzewoQgUJ1M5j{C_V<8$O%mu*$)mWSu~KJmTGs3lUHS8e~ciJ<%sEl2cyFEopX7ZKrHWtJ+HZs=&JU*64~k_3!zxY&xBWTc#Nk#=U93 zj2T9qRr}yy56Z0;`#aR#(Oz@}7rU9Zs5o+_7=#KYGqNu{pjZOpDdL8j?Vm6mJEuyz z1a*d^l)(~Y!Gf`xGF{`h?Ag13*4MatySYOrD8t>}0KqL}I9g_~qK-@*;9w2D98prH z*t5{u87X`?e2=SwLd6Unk#mpXAr7PYq?9?rER@5NDP!`>Txhu#l7SMQkMs)(goUAL zji@|W`!-=1&^`KUe)bFH;8;&pyNqo0yKCC_)a6-scV2O^SJ3< zo>Vr5A0*;c8WZKSh)5`Ps2+`Yn{JUZCblM(gvf4kmZ*y!( z3QaSXw{wV4<7Q~eoW6DH4B~%}p)g@3nhMChu^gGbCbC6yB_d>R##!?X6CjJbHkI%) z@^O>BWR(-W7A9CjWR=8d=3*droCSF>b>e8rT<%~}%=%>do0H)rhrY6eHT0^W_!;68 zp?6W+U+jfVU{zdbloI5eOHip&7&M2Pnx5>PML7crUUFh4xEoFpPrNXNsz1fHSwa6) z>Z|Nb`Lzo7WwI;cM z=4g}k6a`eoBl~%5jK}an+-4yKIr@-Y~HJHLcF) z7|EJaBsej|s$RkjNzH+DA66rz0&8yFs~`4yy0LZe8^VS>FRPR_PBV zzM0Z7EJ9lTq6=S7`yMJSp!t(*V8G~TRrJu~gJ9JX7y!TQuSQP`|s+Y=nIbE&?$jKtV zXtczFtzl*) z(xh)##9yf1mAvcv^}*rqAL9YRRDQXrZFFhS(=@psrzpHy9#Pi#x3o%tLI4+?N~rDfXNQyHv{x((xbw^Bd3{)2?OjmW=E7 z5FThWkqFl!W-rbmTyEUOOtgkQ|Ao_Ts5W!7W()P}c{n6&ot$AUwlRA{!j#8jqv%YB z9xg?Yg`^U0z*>EfJMzvMSJI0un2xo+E3Pn}KW$J3@+0&I(a7(!r0J&L9GPp3Oni()j2292jl#{_XfKF)nwD~U9cFo7^Z zQdYe@CP5sg5c>HZa#oji8Drf^s`Ae*1P8mj_frCUfON%L!4C7Z1#y)D4KAlKbv=sj zpcoDh+h7t-=QkM*o(o0M1q~aPpOVUET+9f=mzSTS2xC@l8h9iHOViG#Z%JCXTj3jd z5oMoLw@?Ti*S9AmY7nYEnEWlD&Ou#_+z}d?;ITK~akIx(ID-*AM|gx`u*j6cTPs_xDo(A&FHTd0E-zm^F{3M8 z?aGkMBmiUNYKg}&Dw6olf?WT-vOyDqsDJA61!G9*k~yCViiSx42@86{Nd{fw^F&Hk z7@A8?+|OPX9`W-{$}ou@9KvYDs}y{jE`YYii~5Tme1n_3FNLbn|0M|T=32OxY>SV% z>(Vxsv~3-N5Zpv&=tDspLrXKm)Ne03m(@R(c_>?`!7ff)*@qFzgIq~|G_v&h}Sh9HHd^lZD2tUX4FxyA9xjT}~%*_02BAKYm z7&(v#*_R&-l(v(NM*SXB&uE_6aQI!@FlCyW)Da8Ciu#_T_%Fg&BU3InLs|cZ(mJr_ zGZT}kKgwQ-04L&EnQG0zGG5J^Cm)3&xMJ-@LTU&N&MCmupM?}YW3hT+EIM;Dbh)wy?OAK z+kjTXV1t0TJE4NZ%usyI%{IjfnN`28!4c2nXWB8FyY4y!ZiKw4?0a`ZPSGtj` z^Nwp}qnE2RE;6EcdY}u-^V|kdBljnuy^skte8X^+4H%8U!;N9`d*mM1f4+08%Sw%L zpyd#hk#%!TO}C`)Q#6$d1pX^XxNNY7gr;@wX5o8_AHGk)PyZE?%6Jq)w5u12T%|#m zY4dCN?RiaOs~Buw5ti)?;~1n(r5Liy?}R&Pv6xNFpOH5M%P}xBMSw$Dl?|8$R2xju zi`X+FxMk7{WwS~JayO_(nWZCI{?OC4p~j_KX$&2uH(u)cyzu^8$J**EY?uA*$R!&= zCx}Arlp@h@n|K&jb;-avehIly`WYt_`>vCdWn!kZN3nsWo`|_zZkl1(Y_t!b`CBKm z*Q3B%OP*X{-+p94GkST$>*U1R>pQppOtWpcRhKaqo(Wq(NZ8}N;*+Kg8}92vc>DJ4 zjZf#bQ-B?dDQMQ7*N(kBhW5RYfuOR{`;!|!+wawf3R zU z3#%YhO25Rk&Qm}n3On#d-nFw|V{Gm01R7^RS91|l?`wQTNWw{*SFW};K}A6KchsqC zNF6t=iaA(>s-J$8W$xF-@{~U`BZJiFlANvIm7ES?imlC}ijjC-Pi@6(nHmX{Lt9g< zHn8`&pP|1b;px!?=Uq97CN*s{ed^})F>PE&G82yh9or5)zE?@(6L_bX$szTuO~b(a zl8_thG;?S#&l%slU#tri<%F6IC8G;^qJ{Lg>|hOMx=;0Ig?Wgx!w62t~ zy#7uzC(w0~fw`|sUPW+%Z=|t_mX?}Xa^@~3tJwP6RikIWbz-V}1WofNtUFI8`!{KA z|KU!}i)|DZrNqS#C)w7X0XszgfG7SBA3lHuT*3g|oZB5qtW)CscP*)g%2i+bpE{Q} zej6g^IQ@x$o&))T2Im^z5WX6o%IZ)*(VviG;cpjt{?Gaqyr^m6t;}`7Ax+|tFbg+| zVYYVk0ZDKQPX~4sR)k87PNr11I{OxfR0h4zSuHog$64hL4{YjRT8fJ8nAV^382IH{n zS~@u|BX^Ul3-Ku}4*dX8WKBo6T8j1nEekvR-j+>k%BE-hDC)pdS}C>*aw(GgB5kyu zFR*JoNeXo>b%z}i>%5{V(oi(Qw5fD|fF#To&)^&p0?M}^DL?uEq;5p{hfMptnP5g? ziWwj>080AG3R!)9JrC6&jbaW28-JPVu#l-=;6cQq>Chf>?Mn+Euun<)MLUX6mLD}hoddYE| z!sxIN0XZ!rC#O}^xW%i>0KHVu5|D&C=d4}XEeTX?eUu`S@r%?Z-T3?XajG#!BtvL% z>N&3sS0C@m6`^HIW7wr%uP=7-bI$_F3+$7Q;fLhaE71MY(?MJBE&iA)%0sEu@yXCq zB6$RyQ&Y?H8E9#n1$0U4Pp?y>&%!jeIT$>9C*PTZxj0!ja3NZsYFKBtJpdN&_tYG4 z(rjel{_1zEk+)6s!wVS@zQr+!XnA7_^{N{M&poeizZ0JxuTL~peGdgH@eYi1x^GLP zc~#mvAU7@GgpVVqxTRX-W(r*_wIrNb-Wv&|4=awH7gMJSSO6MXVYD9<;)XOld=R&} z-^sgnP!%tKCNk*d?mf(oAYk^)1h+nMvUb~xR7oe(WfG`FTF6PJ4%`m&XKV@r->3U` zd}_`H$*X#pPFd&oYVjf^4LJ!D(F$RvFfz1G_MN?p-wv15+InOIsX0NfWzLxF72y|` z;v^gWPg1mRIAncVszn8-omRLtBg>)byKe}x5|>hbSrjv{sr9BnkLw7TUCRP7KXRE} z*n%ifzj%?uUT={rf_re`J+-lMlSjgs#}3bK0KZ#-LtmxdH$FZ-yX@|jt#&EG524@S zO69v6LqaaaX>w{?TYI^qy)OB>f=s(Nu^60V2&5EG7*W4Wm3x~G3OLqO$f(*V<=T}N zq3?`@(M^cH-{v0Vih#)BuZZSyig5LpJQ551`b?lwW)FGce>Tb+u}}wn(QIO^g^myG z?p6v3S1G5p4tAb)Ul9n}2@S}NF6_${n>&LO6fs@CsHsykGdCI!X|6@KyzV~YpIqj^*ezt(L_e>IVcxWoRG@4m5$H=>TXu=17c7hL7P58CZ>=t31 z#Y|bNr6PmJ7FjdKy_@hq&0lC?&4JX>dZ?S#?SI-1+D@u{LHu={of9fAyDC?In>%y3 ztf%lIkiRe5aDS#QG5R6X{2P$7e+}lYDdlLMq@)mR+}RCI0&Oht26)=Wv-P&0a))%v zhxaipjbkCvf)p*3LjWZfhESn264O|M%D)IwFG-cw2>qm%4R|8xhBz}Mxvem8c{3Ds zGV}JX6#mX#Kqj*TvXkGb0DS|Xl~J-cNQOhH!T=~IPkGsw-;AHuZAOnGDa3gfGIUp_ z7T4T9%6oy^&rQMHeP0qkE2I`P?gbGUbl$%Q4t4#*1-TUBp=PRYsVCR@WG$b;cJHp( zr1BK!$y5kp^$mw0BKC?Lrl%t(j1w;V7(F#a=n!qB_k#1!OtZ_7F?|<_^gHUTs{^zE z6l~*fx{_LWXAV{C|Cc1KcB#x#Kx$kh=g&Qu&*=mzHqT^WL3Ue*D8Wa-v_O;2fUfsm zImeKeE49qP^@}cyMWy6fV01gK2G@ykb!^>e?ixG55?nOx6!QPb{RMuIK1 z{<50Zr_U$9`&q=qx8e42(ZC%kW6(lQ{lcqp=rF{mN;33>Bp^hqA@9_A8u768qXYSR z3>yLtH!f_&tib=|O)>VkY|=sMz-Iy%PG&7xPAoL3&l+*lU@TV4xoYQ8k&)f{>272g zx@VD>`?Ba$cw zGs+PxEG_~%E`Xs=r;iBBIQqYMZVVGG8YtAS^_oP(kUn6!q=6NstRRb^_qkNFUe#Xa z8Il^a%&6suxYB6D^o)%NtU?WaapyJO4}`khR_8CzZU_792&Ho4EBh$=o#d01)w7g1 zx@$TI1LYcVL*@WwmriEtdOLezs6~8W>l@QJOwpqd3Az3*0nT)emZ5b^Eeeyg_EzJb z%PeglpFmv~b>)ohA{pSV^s)YD@Tw(Fr|(sEn80M@XE2^jMvYrb@~(+*||98F@=J1Bs*sHpAWZu zWGrz+bheZEBD<%@@1FxGD@`|MDaeAS%yC6z`!x-G=kZer-1U9ulZxFg36&;=1Cc*$vHHe& zeT)7R;e~3x)!1`p4AZ-Ji2nN9vHRJur{cTg%U$!c=bx?v2Q6*wWhL@tbxt9nF`G|r zNcwhD$;Rc3CY?qJ_104hpx_jOoP)|QcSo$uoZX%o9)}hb2AZlDGT~5|l;s-Z=VMADMAbaScX`5~&rqsS_;HNU7mUDk|1&i)O}8!irwAuGkj zoT3lbEj-=f>t3U~JA;1~5d$bDDE-SZs5z%NJvN#H{?V@ zS8088VL=PgbGG9L*R{2c0%I3yg!sc8Kmutb{5`Z!9Ld(&uz4yZ<-61h-pD;zn7T$t zjeQDC>$4$Tlvx1e@GcU-M01HKMmTt1Em1a4lOa8*%q7LPG22HInj<{IZT5WnKH=jP zV*;g!93%rsu-U@x5z;d@?nk(&Xyvlopa!d{RjlO8pk?LIP*j}!Yp{OmuPT`}nr24CJui=0Ln*fM05*(Y@WUkg;(7GY1$)Zo5Tw zQws->)92?kXSrG0-R|mYY9eg}Eg=+1CHU5h3j%&4do~|tv|#(B)jNNDiWGG#`K|F% zGW`$E{WKKHOjw+`Ex9RXZ6d~}CSY%EJXiQdbN7*|X;fiqKZd{Yg^hF0o#rRUy=Wys zMsHzqf_1O2u!OYlaQY!~j?E z6;*=wJ2{H*L(`usA^z`V&I0=%+Zn@tVt#E3!}EJc&eKEu^Nr@7?|F5K1DwF$-lX>{ zyVBId0ZOM}+xR=%P@le@sZ|cJlEyc(FchJOuJa~e;s`w}Rl)|!3q_peO3WNK2nwvJ z-)_n&!IXc7)AhbN;xkwxF~9+95^WBR6B+peIMb>?(B5w!; zNo~2QpzlCOPCgaGox>{i0??5ZiK02nbOvVROjX>G$gF%!dX ze?Z4Ho;{0tmuGfMw&@sT;{K&E!nF+02+rs1c`~G>u7^$dP53FOKA~nQ6v~Aub1i7A zB>hI(dhim=c-<@r5OCDS);g5R3)J{;m?2)uEtvhJs|0j^gY;gV-%(9Jp>C2C`C5i>Q>n z{T@$6wh|uCs}@d%Pxb#*-kWw6JM%zE3|3uNJx-gtJ1=ed9Nt1W=@eI84Os13Lp+13Z%T&yNAI$s^ z|Ju4Nz}o$Urfuj>6sr(Rue=FkV8X<_Msrp^DGRBXG``0;?);e;VVD%ysS1^__JA(8 z{u37+3F3_a9C5Sfck*~+Wy>}-9f7U6@&MeNu&N*8_c+1R{9KZIUi2xLd!-KFefk_< zg`rqChA@O%E~>EDWG5y>RgcGJY3j|m$F7pW#tU_}Ch8w#F7E7kYXSTmi)=;Fw{f*` zW%wf;KOI8H<^o4G-cDHpOmwm9p%Ek*?EcWzK;zb zqs01Lf-`l^zA*i{*^WHu-#=tP1{zMFJXrTV|KEuLn2QXWsdBi7j^2P$~UOvuy^( zUF$APLC3(r!qhYvKx?O`%z#bR(sYUfz?8rdt5E+|ENpn(7RlI)}?ItKfanccr@vKC)y-GnD-NzdiKWN1h8Zt(u?iwYeK+H z(bEj&Gd@rd70Wcp;>Gb5tTU%^KTFk=lt}flTX0h(my$wVJ`YaPMRSy%n&A@^#fCG} zEi24M3h?Fhr-&JMhALX}|Lw?tgSz04($AZegi3Q}GlW&K>f&VS3o-6ZV`arj_v=kI z&T;_$^{-!vs#~@(ssXoeb?ZJE6fDp;Q}M&f!J&)$4`{=ATF|;_u3*h!*1k!0Hk)yN zpuAjvwuSY%vQW1D)~3rJtplwDw=JP9#)T9vPJADYYHoH;(W~D-64B=# zY^P*maGl{Gcx_>JXE;6$Ij(*|3QT%7dg)lp(Ir`*Oks!L6} z_Rs5;-DzRX)lL+F@h|Vm(JkysWz{qPOxH!J=HORPvJ?|X}W28b8TtGv`hqP&)LI2HfJlP#0uclL|Thlx<;(r)gO{DOFpf^e+1*$*|tg3 zN(xd;XhpKCdR2$&cZm8t!#{5k9)+Wo*@Wx=UXpy@tgIOhs69$1j0s`aLa;EV7iDTB z8vWge3`*0%S97gL>*%_u4{fh0MfGen6ZJlNF$dXM*_qbfGYEW#mzdobn0|lj^QuVK zdjfME$3@QM=0yKVDc5)HrRx9j+vm#jCf1=y-7$EdzIgX6&N>7li%(piOq`fd%48ua zCu&j^{6=CYs3ber@$*)}Z6+z4;iVOsO){VPs^i9y&vNXL(}5kqoU;M#Fo9sw9xHBs{ed3$Mh2S}x7-X_)K+dB>hdS9JQ3JNg{|!?eHzjOU7H1AiUMKr}I+ z!frF%)7Ox$C11~yquOB#3Hgz~e|Zdo%2Y#1n?cC%e@nrR8HR#VcLf1Jk zj0=o+RG+_(EiX2!2td`~gu?h)%Mx@UA_LgsZLXO1XK^ie1;bJG9mSQG#hT;qvgCBU zQPg;;_k{oj{WETpCrcM4A(HYQVY<|Es2X{>{D}H;@wWwOwSl|9*Sqt8vA|-u*<7!{ z@@oWPU2;T`ha!|7z**IxF*$+L#JXit z_jF7#Q)@o$u9!%v!4)F-#|_FF7KgP5<-5k0rW|}RwFsR_xt(B9KQWi&P_zHcqR#7e z{`$iIdP8qKY~QQ^Fg|-5osA`$n8Iu6KFx`$uf7x8-v;m?_F5^`B^S|g#WTR5+e6UC z>osoD3d5|O>HAh|eKV$o1$pSfXYvED_(l&$f%HC%V99*@P=&J(XylaIM1892XfRu( z*52a~rc-a$zP4R0u1Q+38c2dix3Qz^tarof&{{<#;5aRB6TV9l(d&a#-NO_xqfHUV zapNOI=Pce%=g(Mj@sZMSbZVDjV-Vko1BI85Pr*B*aB$qlurzYNgTV1C0r8yxt}1f; zS0@Q-rEV#h6&gLhr5>n6AcF|vag25TQgm0_v^-3OrcirQQbI4719-?{rHjPsmy3ZR zpL!ge9J?|WJO8*JSR#Kw z#qHP?pL*Y|n&W@xf4Wo)f3bbcx9+}Zh(>*Qi*obu5ttZ`_4d(Cdi+2?Qs40jr9kx$ zEQb9;$5?+*4aXFexF;|aQbSMIF;->nK}oF{NX_%*5$u#Q_j{eeo_hwZ@=XxQHj>50O-O9UYHP18mHOJma8u!rSMxdlek`Fp>^{S3#o{`$PQ|+UwWVj)U7p1P; z+M#^q4}2;Mln;c^pN<#gNY8xIixJR%-u2LC0{JTcz3rgQR~(J!P_ z7_mdOCY2m4>mvgSI8_uPV`@4RXop>x@Xd{py6aLJBqW+Mj1APih>{T^_=;ie<1I!BWu~G8U|7B z6NyQGU$*jr3j|$bjhB->ALS4s_6X9>`{jCntnSms#Lrem!duT?qZw~gMJ^Hx>HU6* z&)k9aKE105kC9gsi*~C_If6wghO6Km8a0zXIe7uAT_JBFvv+I}meg;w&3pxEIv*CN zsfZ7Ggzbg98gaxKtNEtQB0DJ_w^VD#*C%X`ZAo)O{fmd910_f@|7Mj`CXK47@Wxfl z_Odh=8*mgeDkW31MqIV3_XXCn{>s?|sM!*_umZLoY~NQ&gm6FI-WE-; zI^3kJtK;zA-0G5>(wM)?__*(qjxJ>BBpFzIVz zt)XO!qL$$}iq(15G=AQeHLgAvmwFy z2pczvi7*za^(E<-au9odt2th>29ahtA#OY7?fh_)l45@>g@eRk))c#zfr{{%>1uz; zbiKC4xNVqw>b}p9?#(OAkjcsZwwm7c5MYy>%K2WL%Rfr%;ytXxOF%C3pMc0RQ66n>U}~yMVV=tD5chiJ}63tILLE}Ey9`r;RfL=1O7 zJ!##*oUJ(Z6WDxA`}VDany(wu3_-3|>K%#L2KDnjILwb6Ca2`0p=yaWB}2@W15HtW z-Gl2Ef+u4*PDGuPV`IZ2mINl$D4WcVabKGyq`V0-O{t49T7uf?yV}ALVHH_Dckpn? zf7J^kU4&Qt6~l9JYD5xQqTIhSf~K}MmHy4mQ3QX&r))w;(SMRyN>Y)Z$O4LFd<&N9 zB{1QdkBymCbX;t1X&Ls(Jqo`18N>nUIKviny(9^F^orx;-!_bK6*b7=taK!kd!Ad0M1 z|4Y1dYBU2HZ@>#k3Z;(zNmxi>;16j zhPlm*?5)M<^x7H;DRw3P2bVI(T#FgP4L?H8tTftgwX%ErWQ z6nwH-zg}_@u&tvUidQ9E@Qd_7caSU2zzz{WZd%%f57@)d0l)lvvw93y@}1xeR{YhU zlw0W9^X~?R>>}WM-|!_+vWyc98HLcJ%<6rCT#q#o2zV*_Z%2DBtb4p}Ufte^%fnYU z@58r|k)FT$VfH^6%Uz$Rk*E*>9xQrtqm;mUYH=BPhbF#>D%ACXo!foi8Fzd=cP3p9 zU;MSw6xO!p*{5HkJOe*JNjOxFT!jLHRSn1|iw<1kNzz&^E_4+?+uBAJLj9dCF8xug zY(~c@FbVA@b7&ISyP`Thl5sr4Jol@lT8nIwPe_I#OQp$Yznn|-7)fh%NAcfbf<*pm zk`k#&he5Xu@u%G}k!l@FfVp-1Gm6qj{rOYveAO4J_GhxMs&}?J3kI&hF{o=9Y;h8r z>KU!qePk1k0+a&c;^RDs(SF#SHR1{YgmiZ2U%u+~=s*66xn*&=h53Ag`MtSr8LLjU z&V)oRgH=Hi6n`xuxF4h1J-l|ErKVHQ5)&_gVN%U$o}dB$2A`laHnoM&RO}D}?G7~- z!dTW2BPGIX3m6-(ubpuqawTtrhk&1ELCUO{;y1~$xe8{s_7`8YzgMc>A^&ho$4OgP zPX@p2#M)oH3sSfh>2`V*4r%Eh5zO+zW_hi$w%>)lV&t=?EmQqk>Zc;QR_YWA%EQk}58JoGU9=&J6hu^Q>b8zh!{`l_do z;kLa-GvNN8D?osFO<>zVI#Q#m$7Iv6_f_bZjVS$B3F&dV66rBbj@^P@x;jD!*DrnGQ-z_ zk;_IKy>W?wyQIzST`)aOo}?+3>2%UZxp$JVdPD8{*CW_HU*gP+I`oNc+4>GY(Z&*D zKz&_ALa1#cnyBynmpjA2cH-t#eM@&gIS z49QanED{s&WnF=1R9ntRmcRBNhCaL>zaNlA0&2-XzHG8mQ&CnOGal&xo@0;T@lG0`Zeq z$pTFcvRnnJZE@ZyWI1TZmKH5)W`|On&rW*1pY8tfjV#E&NiJ@~U<}IF!(I4>tlkNS z30)N~kylD^L{rC=NFV8NZ9le$>^{|{)C1V6|^A)ga z9N1d-owfj{>)4K`Y{g}6_<8QZ1Q<~*_)^xg;eOXw{<{3%Bzwl3i=jW-M27O)dPk`f zPaBWS=u0`Tu8HT^z#wUs=lh&sjmKVGAquWyX0|MpSniR6n3w7w6qx98E#REcVGoh? z`O)-Inj`htYFdkG@Pa;;gJtPl!n#5gpTj)2oD-hIvT}t&;KMi9h|Js1xXM-)Rrsz@GU8Lp(eLDe~|Uoc9)G4p?ZL2X4)puZk?yA^+kyt1?&4>+uTUmSYeHB$qa zp@nRp$->|N*z4MW?qN`Z*B<^8qm5MlEPiN1?}e9^2x~s>{?ybt%)Yww7!p5`JmM`| zApl3_>0aRAQkJD0x{{$?VLOwNSsCT`O|n=S^(+o@csv0WZ)6Dn8LC>?(B@cXoHWlu z$n)3!^sTj&?iIKnV(hhS9QU>C85qw4JhgfG$MY^2Sjd5psJ04?vDGEfxab#}cNG%} z?vsx0RT_k(U+jo>IBCb#I5ip!J~?PXD0VJqAhQ2$%Ku1FlA-rLbjc5Wy4@R~AX=Wb zGsMDSs(r_)1)`P4%JiBDxcuLm8Ih{A{yHuYU3U>l$mEJnS+Hn#PF?Edqqm@&&Fe4v zf_GbM&ag|f@zKpvgVTF^%Fgk_&8yh#s@cnhI945^n%9*6Arxwyt#dA}ANB2hscxxe z=WVs#6-?=+B=Lv8F^gtvH2Qvc!lU;Hky36W-_KGi_21_ zsb3@;rm4RhamZ+DZUz$51_eegwrbrHC&1F^Bs1>$&+!Ur-Sg-=4aFR3T$dJ};&E>p zvgs^BonGZSJ!qmSC@nv(;}P$tOyW< z^ACE8q-IGF({h2cN4O}Kyo;mQcBQ_}+^v5|6tp~k-mn5F0#O4>+zL5t6&lJJBO@A9 z%hzJ&G=&iZH>f})JMb)d%{xPQJ9>!;v34Sq!!n|Ni95ec58N`||NiRzcXlpp@+=zw z<}OiM+P^jS$qK;A)3jdW z1nbc;jE}ARjth2ed*y)ob7UqzYTDH+(+s3L>^eyCleP+(XR~LD{^7F+55PE)Px0QOgKz|1srAzVG`IH(dQB>nk7n@fHBi_NPy)G$3~l*Ad{yR z6ok_@ot_xP`DY@N!>ti8<^1gS_jsRxj?)z}JxVw3j%YR;xYF(3s*XgwenRje_E!S$ zg&{MLQI)DpjWW&*X9vA07n$wZt;sxx#2dtPeO($O0X*L&UhkdyWik&13go)=u*p;l zqT|x4Xdw@qnu*w{m3FXFKj}zHKfR;m83DyLF>7NJ;gs`9b^MJ|(I2|0A}r>GqZm3P z+@EY5S?51E=0jRj}hgxXRa!UjHGu42f2c|iG(#53uq9>ij9H&sMZHcOL zsz=au%Hv>3cpk5C0+=Ao8^Svscsqx=kEgmGvV-RXkUGkl`m&YvrUGPCFj4mWzJ6v- z$f$wTvc$er*QyPgolo5s(FaBDAe%#SUHNQ6G zZ9kM$$G#%5PgH3UVo9vhQsc_}=`8foh0pblseH?ol?4P~#~zD@d=rU11_d%4(<-Vm z8pV7q%g*q#Ii1n_DqVlr2-r9~W4iJEN10f1KM(G|3ATnXo-wb)^Pt{lTi=mc-OuMP zd%wVm7}<^krN}tQQ0-taU3$NgK^%Jg>1B8%4g1Ls4LWjdO~^5Rb9#K1Zho?T@yb}j z2TbK=`6(b?BvH^aF_VhcBwf#F5j(|$DKTUXMe$9Afihx<+&eg%cgx%r(wb17%sDv; z(C0p!7QW0wbLG?LtoSIQUxpTdb-}CT9Q!#N-lY}C)Jr$*K${(*l$ti`z%uK++5z1; z)6Db}<{zlFoDc49%cC2wH$NI;EM3@Neg_92U^h~R#lHdH(3lf-3dT0jLa=^;3Uk#B zUUQDDMtwXveFo)P`cVPezuiuD?eW_N%;n~mUM0fTH*4Ws&h6DjtN9m$x|4$*&y-m+_r_8>8G$! zWr1L;V}(_3jIYvkvMVd!fSTkVEWPg|8eE>)(W31x+pkAyZHg)WwVks%N)%;OQOk24 zJWJ)}~? z5F4*wW8)n^m@A959{Qy1h}0OgRC`;3xC~!5JmeJ9+DULK*Z7H*0Eo}F$R~rZZL{}c zp}i1-uw4VKD(c2wilkS;y5A*I144Kz#VyB4FdUgkiL==#Q9t}8jVvOqoX-PMRB~c3 zhGIL$>$D}Q^p-g3`a9?$v9B(lzgT zGamRc{7B<=L;8kBbCGF-L}w?Ole(ZcyVb?$MeZc*%YseuUKCuHH!xiu$U&_yd)>O zb4TTLIkYqJKDa}tbK{IdOUTH4J@*9KsZc7dSq0tt0H)lP1Px8~IgK}Zu^E=xv1!c5UDqiI>df@5PS6@Zru?f&Lh2Y< z4orTwA4KY|Ab|*P)Fu!)>LLc%HX8~##m6p7{L~J>5dy0wgum+#I|!+E$?11h_A%wL z4jCXT?s9VMz`Sx_;X?%$(py8Yp2(#jYCCUivA_#KXSnRuF4kgMQf_kMjIb*ln9h4a9Ro?y7L6JhwDlQtVi;DqB(u*l) zxy;pk^pl=Td{E~uv6z@x!cN}k=%}}W`DDMPWDVt;L6hqso---f#qsfbtMf#Yv+n+f zZe_jX|AIfZq!xg*hNZp`v+tk<>-@WJ6N{D1I>rCzH5K2|@er*vC(Ti{f?U6OHju z`f;oxny~A=6?xoa$gI%5>61p6arflBl__G=_JSpSjo=VO zGPo8vNgbk5Xt7}|B&`*WnFh?;`FS#c%#e*|(z}kA!R8c#+#q1%71Bs)2mEg%cZgIZ zhbPduWc2NSuE`~d=FGW_lqtnac1ZkG&r*<|p+`on#!TN1 z8@je?ApA>&HsgEj)6Hr_E2 ziU3vk>*|mnAqKN}XgJ4`_`D*4pB*Kdx~8vfvOTxw-TAU{GVNod86+qVNqb|v#~k0d z2}p%13i&rBf0vt}yw)r!l~altt$3lRX;CJq>@fF{vvBqwo*KU?Z1xAS_Xgp(_E|Ko zu7-u_8My_Y`WR7qamHSbh7{YhDA1x=U5%)$>;)vT6u6r@@j%wfS(rBd?)`f~>J&=c z#J}Nwe&m&;08({io%_DAm29R+c9P&3Mxd{vVV!bVpN;%@Z~l7-(C+OPxHTwoN0x`^ z7k{L|io(d$Q1%c2u}2V-!ap+z9R~ho9ZVykZkT*`$T*oqrvovwZU1<9oG`}DHd0pp#Xiu z*n}GwGpK6~Yj7>n*Mfb3qDJEw2McL4M&v*rkGmm(mn~sP0muW;$0O(&WUTbQtC4mEDZofZ1Vb8b2`78F5C?`Oy_Fq?v(??RX>vUgyVj+=VDLf8s83% zVmt$fmMD1(w$PR2Q>m2O{%D<_#ljiWjYB$&0;^{h0ex$@BsJw8(dA@t9ze(2-QmbD zUQHUE&$!fLC(0}?8DZU19EpKYu@BKGC;roXT;cr{+!>fUco02|OjJ{~(;-w6GriP&G@LJbx z8EwZb4X1yRA@Mku>N0CNeOdVnDbVpB=FWe4`*Eyh0+ed++;4ua?hEHre{x7Br7q*u zGy@O(+$ZtxPf4%ftX8Mv(Rc2aRH`KrSa?7GHjWco#W z`Ft@pVYZOo;2R<86acFST)JaBg8G_f_2e7w)hGQ493&X!w%T%6p(TJGq(rrRa9r+M zkUsR^+y?&+>Dhv{E9;rv3I{jp?UqS@qJ2qsJw2;lB-xUp2`W!+ZtkJxo9y9}DsvpB zmjl25Fwgn?n9*U_lh|GU>hGD#yP#F2@#WVJW0qY*x1m3Si5-5o_k*`YM3M-7`)j(F zS$Jjo6)^H_`MrcsYbM5|wWGCGo1;;$*kFU$&_*022>U4BvxP@t9(~#gZ|L5{gB{VIJsM46gwYT9TF?iaA>%Vh zSumhC9A;DjG|H_m5CES9jA}sp^{wqVH(sqiHCK{;trzdHJBb0d#%C|=AX>+mhWNv{ z-A=Yw)mR2v7?UlJ>w=^f$;_s>j>?pz#CqV@O{R%ET@tB7)X~c?78Xa%OfMPwDUllv zJU;KbJ3BccQR2q~Dzaq3B1!K!;GNSB_x-v7PJ6SLgvymg7_VGNL&SO(IZiA3z}IX?d-*!2F*I{!A;gtQ89OlQ*6zHro?no#Jf zqIU&I+@|5sCet}ph$Gd`R>FjYYBd|%dXYWq3(s_P18N>^JuVQY8J63*Oo@nwK;R$_ zm@dr~5+&nYw6wlkBl;}Exte(S_73U4>}}Z$sI{4k#AdNlbFl%;(NaT%`ak<-R)BaJ!n|9-(7OgnzXVBkv< z3^A$oH9|{xi+k)&u4@GQs7Q3HeWpFPS@MU`du)N|+yRZfoJ{PiJB{08whyK%tLz~8^&;F;}the*PpYBCQ!u z2Jho)Ixc3qPqwG~&zxciug=d@ED(=C+I?D66CY^ydd!VrU~}_o`3Dk!x>H~9@^bm` z-o&bGjft$uGc2s{#53tr0wDV*7gU0<7=C|#nyjlk8oerJHuAA(b}+*-;O^ig!%jM- zn7=ZGFtOg2nG98_IN72z@@2Z9&D%;rfUu|D7-z*({S)PTZNZK8x7#8^mopU6>vU+w zRyEv8&Vk05UzcVlxgo3d8RX-Fh3174Ken#qpM(0)P@t3n(`xefb5QA*+ovp8Xt2nK z6GUxogWP?w5yRkWORZ>9TjE8nR_WX0wco#i{$M+Va_#U6h&Q(fB2lNNr%9?~59#ok zrH+x*G_wAwU*w69U>!ygyJUXMVCq5f_{{ocy!?gmG1ayNlLoOW4U6h|f+59}Yq==F zray&RV-Iz`aD~yXX6B!`pZI5nH$AWhv!5H%Z8fw%q_Sm84vf%;(qt~M7C05L2i>f1 z8cUAeKZ=~)C#f{tY=$G~G%^qHF>1|q>;$P7rUuh5m>9mZ z3mF@Zsh{S{G7tefd~m8>v9}K`2FP?WDW^vV=EvJLxZUOn z&G&DR!AtHdW-Wk&!P%piY{mDk5pmpaCBnzo=#116dO%Vl(p{)ineojLa~^)T+DL~Q z0EF=?4PEzt`3+sS%)@s0EP^K3*1^MgZ8(N(Qg70!0d)+}C(tcJ0T2}=TE_TwU%Rd) zdW-3XN(TY0Nm@JA!aiChD>pcSJy38Ehobfs-LMS*ABNO%ENp*XtPj;(96B;%BEPp` zY{9PLW-^ES(B0WV)R2GW;n7*>#4pIljbi#n*v*GWJKqZh_{ndsMf)sGbA^-fryx+p{vEPGW0H{?X{s6lr2=$B)$s=R|dI1D= zp#P5Q3p)th_cf^s5pa3~KxEo@06|^n?)OjjjYR=dsvY~n`>2;0`B*Hp6&z=+jN1BW z)F!6wVjYzDm@3rpKy{`!^5zjBGS;UaXW6vjcz*cc!)f&)s3|lkQM2%KYvdtkv&g77 zt)`6c0(g{J1#-JHcJe{&%h^(BwD9Aex8e_t4<|1+Sec@%auJKncAr;bhir&qaXKtV`asT6{^3nvlY+4Hq9J0 z%c8;Jm1(OyD2hcR=bH1irFX(dV8qu#ag*z((p=uSuI$X%J%;#iAC~_#*T5I!f4Dwk z^O4eu=h_jd+B_xddatGby4xoM#zpaELtk*JsN5p=9u0o_%>4Uyiy;utlj_vs>n+up z^Z*Cq8sJesX`1f6@;tQ8Kn_87-Ln4Y3qSV9g#-;>h2uRk4)h1?@!b6!ms72}3<8sY z>C4IrtlB#}Cjh~!d5&C?k879{dSPIIRgz~0VLSEFyQ8nYy?Er?5>*=z0Lu?PSmc(L z{uN{UJ=?@eskVD81sWh``_snjVM867v0zVGKeq(>COA~#GA=MJT<82@nsinFCvp5& zwqP0lHjJ$Dw@rz;eMglp^;Gz36xyqDxBZ9%OW!k(eq=j>B$=rG0*pikSs3Kkhs zO=(>ku(%sLIyzbmxO;pIv1ITN0pti%glMC?)8_$0`NGarX&kpS}jt34e1FJf)X z&s+6v(e#z&B`%+4!n;0pE6pC>P!hz86yjBox|HJ#>_>50acNkcoPHv?weSf)Smesm zf4o6FZ|+}#sIxr)rCk}p^Hq1>JZW!ZCuM2Z39!2MD^|hB45*Drw@nOBg1^sG{R#IL zF7MB|dt|f?bc&@^fO6H=yk=JO=4ne?n=j;Lw!X^REilDpsp11L2ZH?HXFwcZJA{W3 zz4j|Pj>V!9Tf|)m_?)E4G+c-I@v-!JbC>FO)Uwc>bT#^|9CP=r|0tmR*BqOekJ#Xc zaryhEhZMob(9&jWVT`YnI6WvZK)${w|8(DYS>E`x;(IgcKAM6}(nu~j*<66KCovk( z<<~t82p<7E?#_5xOLOzkT)A4)^8DL2K%>43pw&d%!>*4^X{!mH=gnGLTVv4u?w{;# z+ziy`Vr-cLIYt8GV4W(6et6*H^C?2^Gz2cay1w4?bMwx-!PIzoSpP@RcO{_R13YCpovA>$C~z<~ zrYcKOicNb8@T&j;x>T_cExw*6!0H8>(cc;-8z1AttrNAd`}S$92O^(%fPo~0ww$6_sSTU2a;+Juut(Iq|v-M z?{~Jq-%B3%OU|mp@2js4?*P#AM7D{=1po6kKlzCj*?p+IQL4+Y&}GCiUx&q!ZV>M6 zhhOg9$G!TR?9tCFiw{pK1S$8yFR@B+&XW57y?X2}x&J~f*exJhhg()dZ@eMAWFNZO zSjZHz*$787DUbzf>LJ(5(2KE>C)3vDy2i$m8$~fOajH~R6|O*;KWf$pdrJGyHF?&s z`+kqky`1o;wvVn)N*|E@#!;Z?0XGbNh49dg6;ELP$dYf=fyC#i`a~*&iFw8J12zqP zQV$D&bNv5V1mA&7#SqY>Pp9bizbO4PYYE;!ks)E!Anv>RWo1Q>d5^M^hAMbA0S!Iz zzOm3!`)`O1PI>fc*TF$K6vGPVj0JJu_IOv)n+pJW*O1;WR`8OU?Axlae@RWNfdI%> z1sUj0BqlwqoZ*48|GXr8=dw4(oKpe^K^8FM&OYDZMt0kgwP3&vz3PO9f*KAUtdFx! z5W4h8FlSEoEIN#UB{!?-;O8^hD`t}okWsKt`P^rNQEboJZ?V9I0AwvCh*9e^9>lYW zAAwO1p@0sH*~ry9=j|tZ;sD`|7vt!sZJgkAV7zA5BINI#J9V30W*?~ywC^4}P|MhD#Y-{0> z?Tj3@(6Q;q`+IHe(}JY={B>3`fB&Ob-$Qp_E&hd{$y$xw98LIj3J_LUhyPX5y{&1k>+;(9ikHBRfA8+fJx&ke_ro*V?Tzo7Cv$}Oe_>5cU9ZW0QCkk6p1VN| z++0!sbC%%dkMgLHAgHB(e_D7?-!&c*?05HRAWL^uZvXSRwe@7VA=MxN(F>T94-_ov zK5oYee>91(2AxuD20qYj`T-9fhFjck-y<-Ph_DV3ic$FfzyvNN4HX^b21T2w{{gI{ B(_#Ps literal 0 HcmV?d00001 diff --git a/companion/src/images/originals/icons New/read_flash.png b/companion/src/images/originals/icons New/read_flash.png new file mode 100644 index 0000000000000000000000000000000000000000..c9065819b9c44f86bca1d09150e3ef544b7288ef GIT binary patch literal 25584 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

dS829-aS>3?C`0AD!~WVligTn#0_=3wY|O$LZ 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 literal 0 HcmV?d00001 diff --git a/companion/src/images/originals/icons New/save.png b/companion/src/images/originals/icons New/save.png new file mode 100644 index 0000000000000000000000000000000000000000..20352a4f9b93825fd4bd6109d8b360a70524a2a6 GIT binary patch literal 4499 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 literal 0 HcmV?d00001 diff --git a/companion/src/images/originals/icons New/saveas.png b/companion/src/images/originals/icons New/saveas.png new file mode 100644 index 0000000000000000000000000000000000000000..a7d234b20851207d1884d9eac9c2810b506a5189 GIT binary patch literal 10250 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 QcmMzZ07*qoM6N<$g8d-i9smFU literal 0 HcmV?d00001 diff --git a/companion/src/images/originals/icons New/simulate.png b/companion/src/images/originals/icons New/simulate.png new file mode 100644 index 0000000000000000000000000000000000000000..429e12b9a17b1a1c601551414a3420295f1d949a GIT binary patch literal 10065 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 literal 0 HcmV?d00001 diff --git a/companion/src/images/originals/icons New/stop.png b/companion/src/images/originals/icons New/stop.png new file mode 100644 index 0000000000000000000000000000000000000000..3bf2af6e958f4cb76597b5817813e8a2e2b9e271 GIT binary patch literal 312 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 WRR?sFvIGAHgP}BIT;pwyl4D?>X;@zbDB_KDf_) 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

;Xuk~V%275&b%s4M4R`7Mt?7# zT`b_TlzLc3zq|Q|FS0efeE5*3dQuFS0!+f@ohqI1GjLF-3#i6$qh!u~32mnfH9Nad zq!Mm>fLoo13yTZsz0b40ctiTxJ%w;vhrYk{XCTC0divn@(2Y-!whuTuFv_>%o2U;`!;8ZSKfI+OtABlZa-ofEY3|EU-y2$6H^}CM=S=zd#5sQ~13(zy z%@1!Mqk81C2iF(APSoCSwtF9Fgjx)2Qa!I)We2AwvViMz_W~hyZ0LZedNl!Md>*#7 zI&e@>yjE!)kH|i-bF@=Hv%dcq0M++5?ZN|bp=dN3L^nHvF9G>{p7ZC=Q$Q-UNS%G}U;vjb? zhIQv;UIIA^$sR$z3=CCj3=9n|3=F@3LJcn%7)pVryh>nTu$sZZAYL$MSD+10f+@+{ z-G$+Qd;gjJKptm-M`SUO_5fqIli7Aa#sNA_Z>K5dIXQ~B^0!QI2y*vW6}aG{ z4r6Tl(M^qAdW_BPNjDg|9UgKr^=4>Eu{?}tk*YkRUMyyyKGVGTeY4ZT59iiM?r17_ zIJ-}iuqgi7{OGbs%ZJlV{J{cRd_I|#O#<(7Bxg1WtkZcpyGh{O znU}Mg0yd^Q9Tv7x-;|ia<@Dom`#hi-C*E8&bYi*ks_Tm4>GL6fGqOTfB&r|Z8fB4{ zdTQzVb-JG(EnVN&>a@_#hGCYa`G!pmQa^!yQ7v(eC`m~yNwrEYN(E93Mh1o^x(0^2 zhL$0QW>&_QR)&_^28LD!20|q_oKQ66=BH$)RibDxwK6faGBAZ`c=m4cb)W`GkPX54 qX(i=}MX3yqDfvmM3ZA)%>8U}fi7AzZCsRS8&fw|l=d#Wzp$PzsGo|$a literal 2409 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 bp_Jmkv*)Ci@mN1w00000NkvXXu0mjfaA3B# diff --git a/companion/src/themes/classic/48/print.png b/companion/src/themes/classic/48/print.png index 5586786e2965365c0b9207d2b3528ca9bad29b14..5bafa08d874e4ee1adce30d9501792ea4df0a52c 100644 GIT binary patch delta 2504 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 V^>ZOV3i)e;E&hRNS%G}U;vjb? zhIQv;UIIA^$sR$z3=CCj3=9n|3=F@3LJcn%7)pVryh>nTu$sZZAYL$MSD+10f+@+{ z-G$+Qd;gjJKptm-M`SSr1Gg{;GcwGYBLNij_jGX#i8%ar+D2Xm1rC<@#}XoXkG`xs zq`=1@dhyVcbt)gkS4?1dP#+a_cazh!?4yr7qJ2MKWBYqFQb56>fq{{Ug+svQ)A@7W zky|wxel#$@J;mbi^8CkjK%-SlTq8u_#66vP#{1ZRTIdK-#5asjTwiQR~xII-;(%jz!cbt`YiaS*Q)k9#W%2W^81S&4Szzs01*TUZ^kj9yF4d7 z&+nV1a)(r_OMbo=8h$>z_v5!8ehyp$URCQ+ckX_98#w;xgLm0%CID0gRqzT5s0Xi# zPko+zy?Di|gnJL(D@(jyd}`~yWr?jh^LHOVx%2*40GymHxnE5y2{@qE-JQpUOhKgT&$EfWFY{^sQ(EUp;kUu$ zZbbl4kq|Zq!At2Mfe&8LF>pyUjY!jvrz21uEdeSwH-FQ0;JXQf)upoR8sKdL_lI*b z9MBUG$q8$ZHQ*5~YSIE9j^BeeDOg1SM0(X9c;LFQ*<-zD#}?e2Dduj22)6yv5Y!$AG6jLJq9(fFSso1lNJrDp8HqTawn|qm8VKuFeNI zCk^R61b?!w+lc5E8N_=BKJ3E1B1z?}4sau_*{Q2lNQA{?u+qM`Ki)->_Dl9$QKSZV z0^Nn%IJcd&toIQh=78)0&j5U^j})!Oi}b)t%~a3bT{T#P3augl9uxN+zY%zHJ}81T z3Uswoc3zox;Y>0;@5)XshL9})H=9r&z44k~7k@$`g7*nv^`uvoYBV&Ujy#}YkU05=5MYZEpV5o0imH*91p zlYiK%P&R>SyockHE1sM#s8XzJ!N)!~Ak%ul5~6?Rht`NZO@dCAEiomqCm=o)P zcsxDb@%XPTs>M>Ziq!oTco$^wU~U`?qkqunCO1^|p$aXAz@wupj!))nbz(AEMIixl z2f!Nw&Pu8qs1mgrK}zCP<#b5m#VZg0*z))JQd=5~wQ0OihfNFKx%zqKkv+1SI80L= zRtG(>+bO^PcERP925Y5>gc@uHos_5{wg-IYl|2e&ToFTP%%;Sqcp@$tz6aJ7bCm6$7VNy3oU6TbAd~`Z!L8nj zV-DmUQF1f1e%q$g**1lZ)Zpu!=t-140jAYEagxyl%AidWmy_&(S1M0b*6zVOOCse| zG+-j)+}a!<$Y?UOwQQPDX!X1G!hawa27sM&Q2-==GFJIu)X3dLg>vcIc&!lz(+*T= zK&IUz3V0WDqb6R~m-VHDAUT9a;giEdib5rJViwFGESYLElLovqVP(A=J>YUoT9UN zc*7XxIs(GN+i%^*O`!&HlQ6juhf_M^#$)@!Jxr4eKh90gyqEeU&zas&ePa8Ye3)my zE`^x^kk14c99pND%Q0$u^$ zB>Wn<8F}a#9y4%+`I&V@zyU7-FY@2}CEo*E%n#kq^`WZB^UmTQgkiDuMDHtq00000 LNkvXXu0mjf(1r?v diff --git a/companion/src/themes/classic/48/wizard.png b/companion/src/themes/classic/48/wizard.png index 058dbb5365b241651ef96ac46af6064b45afd1c3..3fbd7d780654dc1c60cd0a1b98549a0b578a1979 100644 GIT binary patch literal 3694 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 B7-Ikc literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/16/apppreferences.png b/companion/src/themes/new/16/apppreferences.png new file mode 100644 index 0000000000000000000000000000000000000000..a39e89ef9c6b64365765325a70bd66ed50891aa0 GIT binary patch literal 776 zcmV+j1NZ!iP)EHxMgRZ*00000005htrKP2>q@=Bvmz|uPpkH5OWMpTruenA> zPDn^iN=i{nOHf-|WI;hlMMX-MmZF=RqiSkvZfT(D$(5C-nVG4* zy~n-1$l2N7+S=c{yS%=>z=egEy}iQ2!^YUy-nqHLz`(}b+~eTj=B1^xtgN}p%F^KA z<>TY%?(Xw@dxnydoXpJB)YRJA+Td+%d2n!io}Q+pq`IZ0xuvDMsHnZJuD-9Y!m_fv zw6w;xwY;{r$Gf}3z`)JM#?sKx+SJtD*4E$G*WlUN;M&^Y+uP#Y+~D2agww2@9*>S^7Zue_x1Jo_xJg*ESfC<002jHQchC<0Rk{E zF*7qaH#ayqI5{(Sz20JT4|)Ft+CnJ+1cRW=;-L_^Yr!h_V)Jo_xbty`uh9) z{QUg={r&y@{r>*`{{C^e;p6}S0NqJMK~xwS1;OVc0#E>e(eK`h%7~)9jh2u~6m2b| zAsQ5E(0c#B&H(^$IspIxmERx}32E@F007-0b-7+gQVSgb3av7;S`LTHRYs{*fbdO| z^H!x?uC(UKsZW44J!|J(Mx!g=o~5mTyciYS0Pe!*T!Jms?^R6zrfRPrvSE+anhi66 zxzVh}>>vYAB@ck7^c;|Y{;b}~dMy@jw)+~^gE)G;dmH2?lic_F{mZd{t-bA=?#Ivg z>+^PZe+Ph#V*Kj&FM9p32>_^14rDMW4^K4!00JBi5CH#y#3Uqq6D~&p0000p0*}aI1_o|n5N2eUHAey{*yriu7@~1LIbi|gh0rS@jvr=RSXw$I zg73p_|DD^nwF14AnVgDI9xPAD33^HVa@Dp53;TA7$y8JI#eJbO3!I#2_H Mr>mdKI;Vst0DUNlga7~l literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/16/arrow-right.png b/companion/src/themes/new/16/arrow-right.png new file mode 100644 index 0000000000000000000000000000000000000000..1311fb52f71b509d33f50ff67cf3b5a26a99331d GIT binary patch literal 401 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpafHr zx4R3&|Mvbf`++>p0*}aI1_o|n5N2eUHAey{*yZWs7@~1LIbng)g^-J(M?_Mc41V5? zE14_rY#YYSFGqJIWS@!*1A+}H>AtfOpVOsj_<*OT<57x7RKpN|{zq>YB ztZ87#i_ZG+$*|TT0&An!lnK%-`%~eN8?ZIx>^61 z>+WXB^Z@CbGb;=)0G%SiCS9&_QR;EVU28LD!22(7XoKQ66=BH$)RibDxwK6faGBAZ`c=m4cb)W_YPgg&ebxsLQ E03+Rd*8l(j literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/16/changelog.png b/companion/src/themes/new/16/changelog.png new file mode 100644 index 0000000000000000000000000000000000000000..9e4e6ae57e39e3c34639cf503134e8dfd4ea7801 GIT binary patch literal 975 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 literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/16/configure.png b/companion/src/themes/new/16/configure.png new file mode 100644 index 0000000000000000000000000000000000000000..a627160f9b587105c9d0c1fe0cd73710bbbe3560 GIT binary patch literal 1149 zcmY*XX;70_6n!BqVW-eafQr~bmPx@72uLb6Y#|^)wjx_0A*@9}A&d%iSjDm<``%D0 z$ZBv91zDs*!x~XGH3EZGR)M0FJ$e0Xe|cx_JLkN2&z!k4FU`@xMpjBy3IHH$OSN)F zP~lT!(8#HyC+~uQXplM09DuunCSvI;h(<*@+gN}W-q)Xm29xSc10Y5VfP@qP4v?#a zWdNe_0IbphAe8{1e7U02=_~*uvX1ty*2sY5=~zJOHO^YL&szlQOtpwPjPDH4i~|;2 zbLLov80n_6H$hH`mKh#Aqa%TlvU z)pRZ=hWE;aPs_3Rs$Qi?1X8j%?=#o9TI?g$j4cVf2k0Q4XWd^)MnSg4i;7`9l<&Ze z;X|j27uL6C_41a0mY?XEbTl~|?LUw)cEsx3A|;N}n)h&Vd~l3PEndoe3Nyz9IXpqe zs32)jAf{@qRZF}4hEXv*!Dyxx@rjq3ks05r z`3ByW5u=Dv_1Y|mVgtg*6 zt@;WCMN#tR$wMR#<#*o3s-+_|zYYkrW-ZuY6eEoPTMMmaN zt=h^T0~g7tj1BekxKMF%O8IcAkJopx65Jl4q*5goTcJ&>B1FI1R+$Lmm6>q|3KRRr zes1A*?Moli_w4eouTvhxN1X8e9tMnDZ1TQOB1^uXCW{ZSiG3%lL!bP?5IUv*l9`^J zmc>j+-b=9(zpbet4bXVAC&%xJY#^(jVp+Sh{28nO5;HOY0YJbT80p~+^bAa04U9>K zrX(T(hc_VM@dc(y7M~fyBK$)FuYYDBl8lHXJn?_S;zs@qVgR<*4puD|^rU|Q#8mnu literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/16/contributors.png b/companion/src/themes/new/16/contributors.png new file mode 100644 index 0000000000000000000000000000000000000000..d9091a35010c59c4685560ec0fac48e32b057dc8 GIT binary patch literal 999 zcmVz@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA zFaQARU;qF*m;eA5Z<1fdMgRZPQiJwoO9Q^U@*-A!c=GQQN009Iy;6KoS&u=~+{qgQ&3_B+~11sY%hJ&xA z7^fP|3>OrYW?=dEgW;bML&)>3EA+lSxtqqs%nH^A5J2EC`1g;2i-V6fTtJG)`TwtP z3=BVh0P$yrtN)c5elYPf{D1$7;rEA+4F7-rV&IgNHw3zn8D=p+0I>iAn^jPhV~v!I zpeMs0W`=*i|1tdg1~i26JHx*pzZw30`M~g(?KjYg{~7-O1@eD<`w0#oC;$i`7G`F~ z5OE$(&wuZK0bK$OVURq~3qn7iGcbSu$nf_MkPA#C|CoO;{CxZJ5io%M!VCZiAQl!T zMwkEJenT|DVgsB|zB9;uzsJDB@RZ>e&g9YrqKys0ko|nA2?- zSUDK~1+o4A%ftvw3~c}YF#P!Wk74RpH-?4Wkqoc@@i8#`0lMxNBzjqe#3dM6Sxx?a z{qg{4&?|rdVgw~+pyjrlEQ|qs%>O-rhRfxAOXc3l>&?i<^pAo4_h(2N2U!SA(@d=F zKqoRY{QCUi-M5Fgg8>2vYye0OD9rHm4?p{wFZw=gJSjHx8Fa1t^x=k7Lfc0U{*c< zLzaOZ7+gyx;ZB>GBTow zXGFO%G7thW`K|MP6D$6|dH3NzGMG4j^M7pWnUFbo^;73(#P}tE*x&#BXZY~*FT?Ba zf5CD;e*VO2Aq$LAKVivyZ%5MvQ#~~>|L5QT3~WIB`yWL9+O0bb)0gi2kM1q70TUN& zng8L_r-Wr2_AyLZunsKo3#j=Q)PPybwlKVV|A8UY)0{zAkRPsj(t<4z1MWU}m{5`$ z!te#CdgsBj48Q;WVOY0)AD9*w6lTy5L>X{->-!I=0Y82~0_Z1D)4KJ$z&0~8Ffx4k@|EGj zxyx9+1q)af0K-uxslcup(UE`UAuuuR!$uK=p!_ zFgt@*oHv-ASlo%>tzUnCgK3|D08|(J`u&^1IU*k=e#JzDF}ww`9ps8%a2G%fP}{e1 zk`;Oi3rMLthT$!!3+%o8Pz<<*Es0|D7B)33xH1(sZ(#$tvL`6z2s01{zX1Xa0K7Xj UcWU~++W-In07*qoM6N<$g0yGtzW@LL literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/16/currentmodel.png b/companion/src/themes/new/16/currentmodel.png new file mode 100644 index 0000000000000000000000000000000000000000..6ea21cb4c2d22c40c33e01ee7af9cc47543bc749 GIT binary patch literal 668 zcmV;N0%QG&P)bLMM{B&CTuXobQ~k3!xO8P|xN2KJV}1eV-TDLLrq_hg4d% zm8Yx-fag62hhOyU8zTP$i2J2rYV4M|FnZpI`z3!lA1&87+uqo%HH0Ls&MBX34_x~v zKvNBMA3GYmNQnW$GwA9FUJ84tYcsD@yNyUqH7umLsL!i9>vz;ReTk@c#MjbVZD%JT z^kviqsORAs-?Q4;O3$qY$00W%F}m5Nw^B+3HzhLCW2 z6(AfH$ualKrux@VR=pvY9Z0gHUR#J0C?Z$n4B04em-?TX_wcbWeS{( z$(D2BgljR00009k`OV6i4$!A z0|UeSC(mDhmzEH<4R_Z6K$HP1_g)m>q! zfB5nFhrs`T{}~Ql`p4jDt^VNh)h7!34xD&^t{KG(KR*6g|MSbw!0(^F8~*tGL*UQP zKM#KVVo=<5@vq~#yMGxN7#RHV8t~=a7ljR3;s?IG`I7MK>#qy{{`_-1ImO_^z9!WN z42)b1Y`jthDxM3@E4$4!!0LtXAHILE%)j*i_xIli{{R2)cxsv_N7YR>E} zYuB7zFn{}o_2(Ba-nDDz)s-s`Y}tHq<;wlrwqDMdp1WiF74x~m&g&SLE!(qw`-vSp zfav7TohP%m8H8_U0a^qBwxtYxFNG$(5_YO)@T+E(~0L>nnFx)-p1=}#;km2dxcm+i;#$MuOb95k2;nLL+Wnz@E$$W@L+tYl4ciVbWVUrx4%zG~ec*ZQu;a3)fXYj&_!+Oy^2)7$e^`Ep{k(%0&c82Ek?KCoz5SX2i*xl66QEO7 zOI#yLQW8s2t&)pUffR$0fuV`6fuXLUWr(4fm9eFjsgbsUp_PHb6w4+j6b-rgDVb@N fC>l(yOiZl|Od%Scy_fa*S=ImlWv0h` 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 S9e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00Q_)L_t(I%Z-y=Y*Td@#()2F z{-;}4Mjct_x&ksb2Rg+-jb@9PADallL`9t+7jp_@UKG943q@lfkqb>EBqqxejbDiu zgP&3@nS@?L88y~^YOlU-dE*6@J#H$oeQP4 z-Qmp*hblL2dBa~FO=Tx9Bp!PCEv}87Mcz*I$dIQA8DL*FC z7dbzDigYeTz!&7q)G-vHq6kSLUoCDiD7rU(tS%y@! zMV=+G90z5&fnnHQq&`nuYo22#hd4JrisQK`%F-;`lnCK1HHfyyqEZXgPs~g(nYl>Q zb{*YK;)x>K&13+fc$ftr0Mhe3xw2_zSM=U{-fi5_aMydygY+F4Ar;uj)yN#KHj7(l z0sj_e8yb$Ym@PN$eDnC=SD&^H4<4o~&`B!cqics?&-IH8%Y$U@ufVkCu^kglEkOv6 zT-J{e;5q_jO*kYsHLPV<=RVwMj8&Bu*=!Rtj}Gu_b%G=3da<$aZXSbWYFNhN_(FK7 z54N^-_WyEWT}~A7uWdqE{|*ABW&GdXf!qBKk`?KpAi65tY#R}%G2QYFDrZbN~F#l%|eOBShC7)ABmw%Kz)w^F_ zPNe$|eL2wb%1gBr>;jf!l1Z217!}M+K>W9ovGllppDio-YbrRM)3pz$2EOS1rxAe7 zFT@&iX7=dQ&)w0`^2izve|v(fm#T7JzPvmBbI*6rzx{F8vhBc6pMQ|J?aM~nV*rF( mI$nFCd+%h;V;u+hpZFVa@i;+MvZnI@000045bDP46hOx7_4S6Fo+k-*%fF5)b}93 zC&U$~;NL6RkH<1jEsf+bTE%X-lG|h*ugMB#F|Yq`Wq@c-oBxtVXL;A1(dFlOOxI_3 z-K(DdOwep8v#95?T6;FbRpos*9z6Y#+IY2Y)(b(?rSBifZAg<5oWzQAcxWFl=^EM_Pv*P-P1Am`IJ~=VP3Ax+P=)D3(TS(M>pvE#a0#eJzqY>(Bpx+t`0hR=INfd&`X5*B*X*{_+2hDJqB0emQ#X%f3^eD<|H%aOcy{XV$BB zykEEH{hHk$*6#kWa>x6k)>BUoio3udrgugc2f zn8j@S?xB3%!RU|wx|nN4uYdXbughVZWYepE|9)&&zV~;|pL;UX|1sy>{>Q3w``^Dj z=F-ETqq1&)PGw=!z4b4RsqDz-w2aSeYAvyWQa<%S!x@vj-CgFt*gAPGki%Kv5n0T@ zz%2yAjF;}#{Q(L-@N{tuk+__k;K0=5b4H=7b!ubpT;>xGo^U;R#&~H@%^#*Fr$Y{P z0R~P7Lv1E!#ctAxOU<4Y9d-Mb@7V^gGrBs~R=amqSN;B_9ue6bo0Du^cNZY{B%D`ZXWs?(%hTQy=%(O}r e4W?Emrd9@~5Dm}XO}-A)z~JfX=d#Wzp$PzL-`{lr literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/16/logs.png b/companion/src/themes/new/16/logs.png new file mode 100644 index 0000000000000000000000000000000000000000..880923fb61eca5a683d9d99b2a6593acab7a0ab1 GIT binary patch literal 924 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5)aMf5 z6XFU~@a@5)@7YBlMnuAQ8Ev5p&OkO+08${U15|*f#@d?U_;Ch^IGPmPoTerQA0H6! zTSVe_IjAALGYmO1lmw61^UgA4Vq(zLWccs_q=sq3cerV4S8RX$WBUIeBnU)61{|IG z%8w=p#%)%*}1frfuufYo52SaiO3GtANC8k6E*3MjJ## zIkK!-o163Y&C(k(GLjNk8kqdf@$hWZTbK7vZXOTMpI34B?Do~|tNRzm$kW*5=%CAY zP?5)@A^w1>h(~MdVU{aboRyUpFItqGv^aV3A|(f{M~{RPHVJlmIy9!F2v3p>3Syn$ zD8-!YRaNCyRi!q==llsKhFAPb*_A7f)dIbyTH+c}l9E`GYL#4+3Zxi}3=BPsvQHMA2YsWnyY&U<%Rj?A_$+Kn)C@u6{1- HoD!MT zcmtS$n*aX;8u0foiWt!baQy!R^uj-ee?S-fM-s#8+WbZP=l}orHvz+B5h;cn51&GL z{~1)cnJ_goF)v^~xqjhB8Do2eSD(Kdh$^TuFmdvLF(~w2z5f6Xi~m5jn4~lVBT$@? zlbeB=iHYIyz1s`s=LIFgX;_Fba_@zQ1_L@c-+F1;?h=B!a^R zCh_?6zK#4UdJ4b4e=}g?6#xe!#CC`aK=|XMTMXaczFcs2c2goeaFPA=>f(`&yh=I> ze|~&7VB-@>hljTqz5+F0Thg6~5@YBA^Y+Sdh#^0J7_jqzT=Jjc!=u{_-`>4i zaBD?>B1V*Bi<);=Pi*8<)>ZiP>xaRQPwyChe0a0q_R0x~B@4OzbKq>G50000I`?^JXtW=S0xdr0ePEl&sP$aO*r@9I>YDhK+XTbhyg_MadI;lDQYp?fBksDL_gI; z3|5K|Q$hG(xHEa>vrOoSUyvF6--Nomc5leaE0 ze1vQMk3zu!9~TdUg}NTYVlbwU%@6YcH-+z2t!1D3a#|8iX|6joH{|#6H2>U%!4a{QdhEB^-YJ z{)IImVKo4x`R|`UC~@%b-#_9F0D*sh|6q#*;thCp^%PNg23sIX0kJR;vm(iZ90CfI iPeA+#%BBtg2rvMasJY7}A2Zni0000Pe)vKc4qRtGnCr*_GI z&<-LLOQ;2h4n;v6Dh|@sEK2v(A`P|*jhjl)%MS-7BzH;P-1|7(UA!Evec<7Jxx4S@ z`P_S_fJ;E0^J(w61vOITye7oJ=w<2h*(ORRFn&_8bci8>2 z%i@(qHuIZ2tUZ{|{>na6J4!TwmH!Xl{<2NOZ*cIf48ZqB89QofEUOMcCZhpRN{tP4 z!l3!PiFe-{17F{%h0i}#R~-PYHHe_1SI|m@`v@?1eGcc9;s$WIBoxbvj{;oA)$!zU zIOew#10yvIyTSVRiH~=bb5KTV|kgO08pF^Y`SA6YU0I6{LM*^_cVy&gu^8_%H z2B|=!WH<)g@_gS81_Lq1OaMegTCKKSTVFp&PmWsw m7l1{(WXrhxQLdD36ZNF8W~RZ81psn z$DKR(+4=9apiM<*IRAg|nRC8#&Uen`Ms;96fK#N01~K9daAUcY`IuhESA3Z5J;9;p zHS_pgE{(pkZk`1&(99gQ&D^Oc>i^n z^b-XWoT*WI4f)JEYQ!l-XC7czMYRQLnkJ%ipHWP&V~Y!jT1i4+djOi218uIS)aXiSZ)EDvVhI z5a4ookXl=09n3R;<#_B(M^LYXQp!*TnpLhr%9C=WroqO-S)=5cYDDtpH*1L*z^CMD z6yBhloM=~g(IQM_z4E+mGk7aIY!;Bq#-S;4_VVrdyr`(gbb9kUd>ek60R7D}>IV7K zGz{IY2!>sNX|Gc*BZJ}=u(e)n8z0eq{^z&x4>GlpQbtF{KTdPzR%!n$KLi*6Bo8q^ TOG+zh00000NkvXXu0mjfeSm2n literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/16/paintbrush.png b/companion/src/themes/new/16/paintbrush.png new file mode 100644 index 0000000000000000000000000000000000000000..fc99fd5f27c906426328f28a5dca65a535d9e8b9 GIT binary patch literal 660 zcmV;F0&D$=P)}2#2e{b+Q089;Uc(fS+>-JnGpvRoy&k;pdx5#=0;Dr< z@G|r`dG(m(PcBhknCs}?#%mfUuv}^?&|@cjJqUI6BQmrXikQPv<{jb_C;qCbKO-v{ zdZyEAMYpElP<9q~7%zzLpRjU&6|+B5;Iq%?|LvBl)7pZn@Pmva#*!qZk|cTyY3x`` zfszUs|N06#LEd^&6lOL9;G3q-Un>`HdnuY}q3BKzZMEqHg}{0NqJffMRfgZ{wV#5j un0X;^eKzJm-0K?|b-JPeV2n)sm-Gu^cF6q5#;kb&0000}M{P)I#M&x@SEwKKo2wV_oGm0V@KUnu2 zi1)!MV}&5x1%Lkh6>!aVW+*k8MaVLSDO1uIc1_tUfZ~EJ{UQJL^{)}syzq!VgRpV} z12Ak*!{GPtzYKr=u;SIc{-PPf$@{_#^K;A@ga!HG;*%C^VPFCo@E2$RGX8^vcieJh zFmuQQYxw@>Kf{Nge;HnX{|n~-`1up+g1=A~poSg8$=A*d#+gU6f%Jc{S0FC;*QAkO!F#_BT+&y7jxjHvjtj8%+BI1faU$?_UkKw97^{dhbeo!VyQUic08pV?^Qcj5&dwS3RXaKy&SV+VI5^>9yl|1E2I4j0x-rPHr+bg&W&=M0Wl`=~UrJNW$ yHuvECF5SIG0X%+oWhqB~wJ`3(@Z5gG06ziWUAf#6pOiWP0000gH{H#JAV&E5TbO}q~%{>&i$SLp8z+vclM}Amp8K`{K&iBkkW%9HdI2!TxB@i%Qc8qU3L)yN@caF) z01dxV3Zb<^Ngn{AP{%!Cmf2|AV%qc}$`@xuqfr17i3DAdQ99b19fOA_=j{DR zQMvrff;G#p-+4skUzubw2|%@4rMq{Kk)a?5r)66>*xH259gzFJ{_JLXYXATM07*qoM6N<$g3b!Z?EnA( literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/16/profiles.png b/companion/src/themes/new/16/profiles.png new file mode 100644 index 0000000000000000000000000000000000000000..8343cc5c1ee048573e7c48f2cf8fa9d25c224d7b GIT binary patch literal 665 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l-L#E z6XFV_2LoVM*RkIM|p)gyZTx z!;^Berxz92I$By-yLi|qaB{Ku_?G5GrA6rKm6+P8`JC4<<`I(MW85B*QjyWj{q^si zbwGm{lf2zsY%k;nMglpU1s;*b3=G`DAk4@xYmNj^u*K8GF+}2Wa)JVrfsvu{h7Cpr z8#Zk$E@)zz(J-NVcKh`Hc!vNEl>=u~&L}8psp%Z$f#*wjz-1yiBmRqYDRR=v}|r&Dztyu)LEuSmhL*k zBV#7h*0yHNnj=4WfXN_jC1>KdhiaRF?olmqjVMV;EJ?LWE=mPb3`PcqCb|ZOx`vh^ zhGtgAmR6=l+6IPJ1_o0sn?PZO(2$#-l9^VCqQTV4#MH{b6r$nTyUEvq8W=oX{an^L HB{Ts5D+`ms literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/16/read_eeprom.png b/companion/src/themes/new/16/read_eeprom.png new file mode 100644 index 0000000000000000000000000000000000000000..c9ef59ca416ba66f92f9b45f45dca25b6b9b7605 GIT binary patch literal 911 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5)YlN; z6XFU~ASo%y%*-s-E3C7QMQbgaP@RC_4kqCR41Ajyh2}GeqzelyVBzm%P%cq2v#{{= z@`_JLtgEYU@93B@bB245v)lx3D{C7cKmUlRX#2fdOsNd=^75(anaQc?t^uy8si_i@ zQVNy|VPWAG78cSnGR`g@F0P(o;W0V6Mas&`Qc_Ziii)OY<|U;S>FHUisp+0xzScJO zuI}EU;W5P}l`=9i`uh4oK|!jjs+LwZVd0U{(XmNMDS3GXB_*Zt@rf?3?tFZFAt50V z5fN%?YLb#t_V$j!Az`s`@mbk9K;NmWt7~iPGBGjbz7ooNAs+EmDEWz$#~scm-l$N%) zcg&nQYwx~&r%s)kwtSlE8YSiRQf=)$GiJ@7F>79DPk&xvNqk~bM`!1;EnqoKL}{skK}HtkrlWlfA{WUFJS zZ>;m?MVnUbS{CLV?LK{Cqoe=*0~b!*II`v3nLCGsQd*~O?Oi)}Z}Z~Go4d8ou;#s! zn-_P_PGeolr>}<}Iy3af%g_EZO-&oX=Q4pZD43+U@*n9$q7Y6ZhlH;S|y4GQ!5iwD+5!AhG*|4Uk7Sn@O1TaS?83{ F1OULcGgtrs literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/16/read_eeprom_file.png b/companion/src/themes/new/16/read_eeprom_file.png new file mode 100644 index 0000000000000000000000000000000000000000..7617c17ba9d8577836837cf1312f5a150bff4957 GIT binary patch literal 1242 zcmY*WX;70_6n(*>EJYSkY^$SV2gC&k3RFT{M9~D0Q~_~oH5-wz?^+OX8Ko=*L_h^b z2Vs=W5H=G?LXu|tvO&T}FhCMW*vejQt7C@_{h0pp$GzvCGxxlA?|TKO@mM>XFKqw- zb|JXn2m~G0!)gPP-979h5%}zCPL`#ID(j&0P0KI?5971-JaS`DFWV-@z z>n;Ev*APVXOf&%V1OPCP0dPq!zal;ffJNTvQ&A@n&*sgWNhDHLRaJ3e5ekJul%%92 zGMT)!$ic7I(uZl~bk`mcEi5c>SX^H2P3Jm5BodvTf~^&(Jz2YUR&ELn3Ej(bMA48g z@Z|B6yP5%N|f;s5mSZ(Gl@n zbhMqF9a86HXH#QhoE#k;?AMpq>2wm2*l0AatgM(!rU~Qt*vJ@{%^4bmWspoNmMG;4 zjk;eb5PZWpm^AO4Jo`mgSC?sGLJPz2AUvcQRI60%UQS&jozdMR6bP@dqs~n^lc#nX z4Tj~#r782IQlSv>xg3d-CsPX)15NOBHKc#Q69(5u;q<#{v;Hg=YhiAFP_5zj@mg2{ z(d04&YuglW>Q%-H;aK>iI5gKaOy`rbaOR|Whf!}>T38f8O6mB#$h63TRQ)>R$f#Zg z4<}S}_SJpsuk?(V`3}}-+WVx?$KpSjkJO?wodU)R9k(G})q*#xPa7j=h~RKmTS+ZB=8 z5t-6K$rIct>eOm9LZLXfR`85xpw-BK%;!hvu+C<(E?#HH-4`d^6+CNbmrEgf>#H7~ zgqqK~aI=?q|2N8g5#_d!bffQbYG=tqI;WS#<8q}Ei5!yYhDRSaa8qt~kg{5?UTe8o zKyPmD`i^*m(8=lvTg(6s^mP*8JuU_?ZGHahyH#at| zt*!OpU%MlJ?3WRNj|2hq_aD4%)vEmZ*02r1^>2TgIz>X~Fq%+qt2x!HM_m8WKHIfg z`PTDa^YgE(#dymlO>Bza=#gbMasrAJh7BIFX4~FFh;<6?LOKApTh;>ws%y6+4VyxO zgQB*>WCE}_=|(-AzAbv=b^@8n=<0ZFnwT=r5D630lP-+z&TA9uq4<#SumMOZ@0Y0*UJhgjuY>zN z_jw#>Yiw<%H&vEV%F5|2$*~D>NwmcHmES8+7x#~84e;2TK%%)p7WqOhJB)UB$JcyM zo@pIPpXsmR5$c>y7rc8e4y*FK)JK|b*2WLhH`p{b(#IL8@QlYLX5x5zx(hTH$NsQr zV6O26$MZ{foZVy{8;d`ZwJMTDz8r|9E!@g|ne$%%(bmOlZtkn2+!oUH5lAO;R&E4p z+W9RYTl^GxC)bP<=QAk8j2H|#Ed~K_2<`3Tf%f+B_K))R!yNX<_#Qfd_Qs&m75;aQ mePT#VrqHNAe`4^(`1oSbzW*C$mLI-B3?SqLKA3)taOXeGx>|Jr literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/16/read_flash.png b/companion/src/themes/new/16/read_flash.png new file mode 100644 index 0000000000000000000000000000000000000000..3591516def1ad19f541ecfe858d2d468aa026aee GIT binary patch literal 1148 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fHRz`$f4 z;1l8sR1g#roRO88Q;^%x(x`80WMFD~_|So8PapH}@Q8|usq1KE7UpFZ73dfn@eA-v zNQl3E`}W%POY`T??(OgP4fJ;Q^Kf)^o;q{t`gO|!!h^g51D!qH0wW@W!ovciA_Kxg zd_qHi;?H#T3 z^fmPjw2X{(4RkdP4Rnl*^_)EH^$fLKyxj}S%M;TQlQL5L0(~9aUCQdKBcj5>BEyQR zE3G|Tqoc#3W5cxdG|cU-3o1&p3iDLERjdxN+3sgkU&HPf;^Xb*o{*kw<7j7YYZafK z;_mMo6cs5oO+57tU&Ui3_cJ`MzMk1vwlEG#T+Y-}>}vhIO?Wp&k-bB(>9ac13@ zvpvkg#Kfejr^_!Wz{1MH%*@Qq!xNbpAD@(7?*3j>C^hlY-p zfw2KIKO4K2Ft4!;SBik?Ap^TR`bI|;977#kyu9R;6@-Na1qJz;r8s$llz2l`xI>ir zI)#)D$tZ@&>*#9(BgNFpR6}v$zqDmP7;Jevllk0f7HOb4j7i?^E_=K#J$eu1a29w(7Bet#3xhBt z!>lhkuD ztjydwu}6-msx&eMt;>5SH!tp<-M+eijF%i3XC7GaV8VqBA39E~cp(wFpdltFrp75L zsK_fTs;bQ*}q9TnM7*;QJ?)FK#IZ0z|ch3z);uFGQ`l#%GlD%)JWUF(8|DIie-}%iiX_$ jl+3hB6b+_UCZ<*frVtI!-c7y^)WG2B>gTe~DWM4f#>scJ literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/16/recentdocument.png b/companion/src/themes/new/16/recentdocument.png new file mode 100644 index 0000000000000000000000000000000000000000..47cb004d3eb7d359c20c061491388f33f2fdf7a7 GIT binary patch literal 1106 zcmZWneK6a182^@%P;I^R5M^vD(_QUwUb?$>o08%VC8e|K87izwjSEg|8#-0mq1w({ zz3e!wohgZG#aqN%BtfE15{Z&GdGi*L$ctn@{db?|p3mo=?|r|Y=eh4aWswoV$ITtg z0RYECLxNC{S{^3c7-DyilUE@*ni>!u06_P&ze%|msu37uEaqxv3MMZx8w~=IGn3FR zp&5y(XcRgzIX{bpz5swxL1b7o61ofkB#D|?M>}&<;1<^88()=tmr~lvK9?@G^SWd2ot@iCb4inb zohPWk@ttq)xT0Fl$9MesP8jo;bE}aRSol7!b~oV!7}7E$giO@6zg@U{AWyR`HLxx8z$sz>&;?D?}H zMNN;aW+MoERnbEb_x91SZ|KW{GGYivmqM0G` z3}ulry+Ea`%uds1$&6XbhdH{KMq|>c^o9A=_cZu1^w7#{uy|b~kv$G3@ zT&_?|5chT!dwWXd)~0e>qExC>@?DiuxxcSgL#fefrlvG2D;njlMx)joLaW`|)@pS+ z8cheW?m(y09~|fp3n#AeKlZ@;zucm0GQay6T{o5Ml!YWss#l zG$5HMYPrPvP{t>+Db*VlfpwAT^e-XkW#{qMlKH?r&lb*JmI7?d-&9$-J|uGe^CBe zuEV`Cydl(UBozX_5MZr0H{?_sJdH;NBG OHxwBW^zWsF;{O18u1D(t literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/16/save.png b/companion/src/themes/new/16/save.png new file mode 100644 index 0000000000000000000000000000000000000000..cd0162b619357cfe6196d594c2d1a7ccfacbae18 GIT binary patch literal 3258 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 Ef{Kx7ApigX literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/16/simulate.png b/companion/src/themes/new/16/simulate.png new file mode 100644 index 0000000000000000000000000000000000000000..94a8a40037cc6ac574ba531c3e863101909b60dd GIT binary patch literal 1100 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl-tmOGnnF#-9E#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#N0|S$M zfKP~Pp}ca1qDrNrO0}YLoswd;qEe-za)G>ZrmRA`jC{I`LaMZUhKxd%ERZdiBP*9B zBby0Cvhry%avIz`=KO+YAS7VUFQCfBJ=5EBeL>!ag4_*-xf=^}XSutq%}P7FaNfB^ z^HwLtu1StPKBfP_!oDLj`%X;hJ2|CqRZPh0=-{23JC48Gxc|wb1O0VJ+UiyWd8`Wd zTz52g-MjpC@A7s|$~jPxcc3EoKt;}mQ1|KT;;Ve@b~MHAx{$DId))5q*gaV>yVD~! z1v@V>QJkkHG+Rx0m5a&FIG>xn#aCN0Hh7vY^4FTNK5ois%2xAwsn`FV4ga^49dVcF=#XuH;MD%WVN$YSMOI(S?oTyaKXhB$ELP`VVJLYv zg!lh!p8s=r4!Ls8$l~mL$JhOmcabM&T2YVTq5nn){!FnqS+35zLW6gWCfCU*p`*b9 z>ohpmYjUphq<@S+B9Rzz6B;4`%HO0EiC&u zw`i{s*E&PC$#b2iuJ&7D&(#!~9J%FN#I_&hna#JO#QraI{=d-iMwrm-44&ru)~ye% zCiRGJ(q!Le$iLiG-|O%j_cLGShPs`0=lQ)v;@4vFQ!d<+TtUtlOKFEjMRVrT?Yl@(RxmKIj#mls#p zXuuqv7+C0;8CmI?8d~a`s(azqu3v4(mOYzxZQHlLbL)Z@IHZ>Q=g0qV>71z zWemRQ;kU$CxfK`yswJ)wB`Jv|saDBFsX&Us$iUD<*T7KM&@#l(%*xo(%G5~Pz|hLT sV2Wjv6N-l1{FKbJN)!#IRwkxa2Br`V&)!YG4%EQl>FVdQ&MBb@0CY^Eo&W#< literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/16/stop.png b/companion/src/themes/new/16/stop.png new file mode 100644 index 0000000000000000000000000000000000000000..5c1c8a7df2b405341fb0e4f4d3a73705b9425428 GIT binary patch literal 460 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 literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/16/write_eeprom_file.png b/companion/src/themes/new/16/write_eeprom_file.png new file mode 100644 index 0000000000000000000000000000000000000000..efbce284356a0e0510e394eab32ac31c9a1848a6 GIT binary patch literal 1223 zcmY*XX;71A5PlOAS~WqjV};hiq60mwP67!np(95@hy?~i1VKu3kWd5>G*)f}MjTW; z5GY{kfpi9;L@vt*Nk}3&3Be>^q5+af0@^`22CZ6Z__!$i zx=+>t0Pxi42pWPLSM9?!i2q{Oh6DsK8DX(u0CZhizrw^KIqEnqDjWz#x6UBRXY6QN zEC7YR0GzG>V9A9b!k-`j@QeWfr2&8~M{9mk>;(XQBtC{7iD=y2-B~PFeSQ6fbLUYg z6vE`>mQOyEs@*a zeTA{xZ1b~o)6S_8tyV4-i$^RRjrgJW$M{`h-d` zY%p{Us?<}n!tuXar4OuDt6Hg6DHLqdcG_u(Uf6%&&`A>vcT0z*6Ej`rQ3ow{%JbT4$SPl2s$2mqR%h#c3tIw7l+w-0t*Kvf}eSW`kj9 zNKwL<-H_NauMMZ3l_nNJ2TnjK`NG4MitGy6jh3!qm0IveN54eLJqsn54lpb4r&r3; z%Z6CRgK2p^7q1FL1CT^4RwOMAx2_R=arTU(DrD3T0{6>_=L z>2z3aT9rmDgv3yvu&=MB`L<$64jc3;rQ&W!M}JQrzp<&U^^VKsI>)&70dhqOj~15z zf(5VN5ZCK<-&5B_++JLKyMOwn&-DDSE4}8_iWvQS>;>}2!P?yD! z{kS``K2CJ=WU%|X?)99UoSa54LIwFtTYuyKm};{wVKHUsaPRAB_C158?@(o7visX{ zIGz5NYQDUaIpfusJhrKZhQk?y`U{q@XCf88zjL1WcjIu! zUTm&AU?$%?@d{rZt6LYEu=!BR#CR}8I8aphcDb(B%acz3Jcdsy7&c|X86$l1A$)5@ z$*8s9<(98gd-F9$jy4HkNu(q}ikLe$@aogRoN*C$`d~-L#Geb6{;W6G#cy9{RbY5L zq5IbFc>kyk?80R?#$zw0m2mm!QE45bDP46hOx7_4S6Fo+k-*%fHRz`!IK z;1l8sRNx;Nke-?GzkuQYQijy5^v>Rb|9T7{)XAW4YE&Gc{9l9Ne-Fc}m(QO*dBnrR zBPu4Qtf`(+ko(_&;m7H)yZ3I)pFg{|zuPy^`%A9j#*Hfj!h@z)*f@K--HDY83J?41 z!W0k|^3RdM$uMMadVjkBY+k%_Idv$dm(cR--GUx;s@e{^zkLt~?zvyG{R zp}nJ(p1!8OftHc6u7R$mp@EK(v7Wn+i-D20lc#HCedB*IhQzeQE0M~6fxZszE@k!A zwP}w36dC?$GDJs*MaPC|>uH$VTbI@ry!H_JFUe4rr2fE``@bwhLVB`|qn){}ReXBN zhH%9P9{dS8nW4ef?{pZ{G}T#HSlHOuG_@su>oEP7W2jHHl~+s!|jTk+=?d)CLWaQV6^(Q`-e46DMIJpJMSVkUV1S!inM#NWt0*fl^0Bb#2ymK9 zup0}r83?fn0e!8erK4`+X#4;F|D(^%ZvYdAT}hB%FoU%18ZD2uKOY_Eeg9_9uNvjB z?)h7NfzX}z-p5XxykP&HgNF|t-hXh#?s@aO`m&>4xTas)vL6g~f0)kvBkR`&ph=8L z-tI1&)@Gdtrbh z)H!f8H~siw?zB%IxjDEvZ(HBEd9$;li;?w+s*3E~Ik7Qs@4R`lWJx2F(L1?$arf-X z_SO9>W8CDxxbwh*2NMFUcW?O6;bC35pus7m#3yG?Y>iV=(5AUc0S=m~rn+~}=_wm) zTOaq6)L1ZS_VoCK@Q9F@ps2LvTp|J5>sPEzm0Xkxq!^40 z3{7+m40R1HLk!KVj4iE9jkFC6tqcsNST;GKXvob^$xN$6(O_z2Vrpez3eoWF-Q?>) O4Gf;HelF{r5}E*Xi*zUe literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/24/add.png b/companion/src/themes/new/24/add.png new file mode 100644 index 0000000000000000000000000000000000000000..50dc863b9aef64a2e8e9c80ad9548f2bc6a2c26a GIT binary patch literal 854 zcmV-c1F8IpP)z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA zFaQARU;qF*m;eA5Z<1fdMgRZ;%t=H+RCwBA{Qv(y11$kS0I`4ww=6cSl7IjHV-OY< zTCJh0>Gc2qUj~?4n3$OuKE40^``X2;kwET#T!!zO_KN`^fLQR^{`c=+20lJPJ#AfM zq2IrM!Nr+bSQuWvc*y{?Ko%4NjEsyp%>W1>ycU4;{r>ak$A@ZXQmp{}`$04+Aehx8h%r4}K#o_y-JsW)?;U zAu+*nUKmdU)5SNrF*3{GD1G<%g;XkTN{`~&O@csLD29*5x z8vx#ESQ)WERf|udF1=o9}FiB9=!pw03d+C7X144=i7&OU-?iX63xpP!3VVD z$9HUM8DU8pOaKHB3&hL+{{I1Hq`yR_4E*VWkpUE>Fi!yl5G0a;2LJx`o9LuR$b#P> z??J;2Ab?;#U<9WMY!>_{loK&6Ku!<<0R*#v>(|epD7lqT9DpqTk28qC7Jy4ofB*tp z@afa1-mhQ3YN2ZZ<_|_LZZ3BLAz}Xi|No%|129P6ynb~8$bE?6ElBaQ8^i+$Ag~2M z8=L-uVjj(@|A9VYVP&}lj5J-8vIv?|e*OH_3FL0T2vSA{cnJ#-KrAo~Si^ydi5ch^ zCXivs6%#lZfO!T;a}kOcfB+(*u!EFEs1`7REg%K}1Q1~h{(;LQ6bl%@J|Heh0|XFJ z#Wlz<^tu~YibDqg0mMQm(*O0b000McNliru-U18{2{}=1Pg?*01$s$D zK~zY`%~fqoQ&$*%ZhLQgTUw+a6r@x{DF}j@I!ES)A8~PU8nP_QqFEG|Xcm5rEgBax zHPfll%rIRR$CN2DS)y_3RN}{`5=I2^a}Fr-A+r=Gh0@#hmbUlabM|9pVa&PkW69p+ zBq#5A&-3Ix@AIA)_>WEfFXub}8eeHAPoCYhetqeiq9_L1+gm+xzYc&hQDPN<%q?5C zuPrOvxDr4DfSE%>LWELE_wWB|Q{0zZQ*(SPfP4Uki4a(uo9~>7#U$F_@AU$Be*XLg zuX;S*2&I%BI`r+Q0Onq}aP^=pE7a!`1OT}cAuyGezQ0}+BQzS7s3?xaVlj!zvO;B9 zp^_xik&&nz3Wa4^R%m^FOA~;crvb5J_6&eryWL^+c-)?wH?Kb)81RKtQ!RQ~mN}QJ z1Kr)d2nIu#Hf<`L&gp84#f)fFLThVlL%g1I9F7dF+x=@RfWRo|sHLAfcWKw+#YL;y z+8#7!W@gOMYBh$Aj!x9p9*5881H&+27=RE8l}d#rOBP|-vZdfSmfpM9dMPh2=cPy_ z8cR#FEd$U3fR0sBW_kJ6a-EJ(N=;49pcI;xmOD6e<}6s2BYM42Oh_;=Jg*lGhDj=e z!4T{3@8^1Y9wIL7MHGX5gv5kcOh#vCCyYh|d_Iu~!jrvKRbPHGCiYTkY3VgZG1lmG=Ip+{K0YhU z2}&tBfBw79I5-DDQpGQ1@7s6atm7>Y~nc8-tp=995D*!sGiNEK6gfFFZ{5Ft_fG;^S9hf)IXT5? zFc|GD%O%X7Jq3iQRDr;d`5&9bWJ$7E%+zjA#e)ZrF+3bbFevm&k`#8i+W#U`J%ASg zOe!zmv!4p9v&VX9QcJ066AUP^z`&8c~)zpMy*ye&CRU{g+`#&aoPd0BZ`z9KV^cEE@m>Ud=YC;G&j$?E> zUd{6wmJq^(LScA310X~}M~Cais#V4NA3f^1+tuZ2yLRn|3jlh@KM??!0Hgr;&1y}4 z=iIr=A6YDBvsTN3W!3S&=#T%1Qb3kvh+-5+kA8i0$Bu3L01U=4-SJxdZK6fuLAl$u z?J6lKm^E9HqQcId+YhPLDt}In)4}r^b$55y{p#u?=K&_h2P^LY_z8dz zpLEZ(dyhZY_r)mUcUU}-4!c}D*!B- z=-4y?SPq~lp6Qypy1J&8mX?l%3m5JIU;&T?p!iwSjF|wTIi86cfD6DK{2%OhCs}St TW+r3y00000NkvXXu0mjfSID>r literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/24/arrow-left.png b/companion/src/themes/new/24/arrow-left.png new file mode 100644 index 0000000000000000000000000000000000000000..9ad670cce5a51cf6a38642c181f2690b12a82dfb GIT binary patch literal 489 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1mUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UIIA^$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE z?e4 zRGzcp*q4cu*WY!uD-_6P27<#Ah1c8uu$#C5sQbgm^Kt*}|NcAcz-3@+P^RK}_y7Y# zf{mH>)SNd(K;NpCxJHzuB$lLFB^RXvDF!10Lla#CLtR755JNL7V@n{?HZZg@FbD{| pZ;zrOH$NpatrA6psg;STm4PWl!?SmjuLCtOc)I$ztaD0e0ssS>s~`XX literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/24/arrow-right.png b/companion/src/themes/new/24/arrow-right.png new file mode 100644 index 0000000000000000000000000000000000000000..084d6597c4831fb2f24bdbdca9d3d6d2db767098 GIT binary patch literal 479 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1mUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UIIA^$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE z?e4Kw-MgOP=5M! zu2qam#)Bux#c6j|9QEAN_MgXx=Z)T(*N`FrUO_QmvAUQh^kMk%6I!u7RPhp=F4nnU%365NR72S{WDw1m3qt(U6;; jl9^VCqQTV4#MH{b6r$nTyUEvq8W=oX{an^LB{Ts50~V^R literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/24/changelog.png b/companion/src/themes/new/24/changelog.png new file mode 100644 index 0000000000000000000000000000000000000000..7f26eafccfd430e11cf2dbe28a2e2d14cadef5f2 GIT binary patch literal 1581 zcmZ8geLT~79RJZMk6kJx%5@xS9#(WEa~^BG$a9^Nhn=T(ORcD`PIu~-OXaCXI=YB# zoW@vWnVaXwv5}22^K51lnaNY`EB8m;`}O;NKd;Z{`+0nSzrQ#Sw_|F`I?50PsU1f- zc>$@twl-}5J2#Kn3_(F#D9i}X6?0Fm2tCxD_KjPg1GK{vjIpcp&^ zEdo=F5Q45)K#(X1f~?aZNDG%i^R$5=`6>@rA7|k3Ka^0Z6iV?LO4dLHc=ZXTYp9^p zKlhiHmj~zi`ucr+eYbAiYHn_Z!C-@fgH=^k1OkCZqp?`5#Kc74qo$@Nkw}0M>_bCC z7z}25dK!<%Baui&Ma8VFEReRdvy)Dz7ZeoK*Vl)Khp!jna5!8px4XN$r>BQVB$k(# zlgZ@Z;9yXqtE($EHWpOW)z$sHD-{(L4Gj%ov9q(YwY61JQd&P1O-_yrg~Ex6NwHWA z`k4BJckkYTR%Slo{d=iYIyyGi(b@SPV0I02b8{0S(ZJv!pU>|X2zq;a$H&L}`}@I| z!^6X}`FW5MvI4G8$jHdRz`!~QfSjJb{-2Xb z4nGkbu!JiKL{?{4J@f6pfMm^p7Y5kkonb{9e%S_RlIV3z#|!Dm=r`nQ4u4=cxuomp zotk~PSB|*91_p;pDw{L|a^uNu{lmiRxg94H8WGp%+JU*WI(B<|dqQ@(x_?1^dv^zy zkGT3~dk9s@pCac=)(I_4E3D6=RI8pQa(Mj-h3su1)JnaO3^E_9AaGSk@D`1oaQKwN2;Kxl+3-;FK%CgSxr ze`01?+w$^qQ&UqOttI7e#;Y1O`hMxD+vFk!tF^V22N>+*udJ-Jw6rjp%+=M^j2*7` z!0oz6dAWH*%3C&Xa0Kt?KajS=Ja*{iZd!6=D=!qgrnRF83QOqu8S{^4cgbIO|5%mI zhRd6!0FcHy+ypB>z|<5p^i1qfmRQUo!<{qtTiGDB+>b8DoJ5U0O*5b<;ZUa|AxLHG z+LD9*%mDwV-0E>BdmrQW;Gm$O5QmMea8)}-b#r}NRa0F(v!lp-#^N35z8DNYM-cqFxS_>YKYHMrH zlbqZxpaLp?v-iTGgFJCjS1(;s@_BA)Qb2{5kSg}j_f%Bq({ge&_6`P~^i;EaK`Y9& z&Mq}8t}K?@>$&Bt?Yp0L`}X;CWNRnX6l(VZ@qjKbq!>udS>mc^tqP# z5vfs*wzkfW-wj+{nXRo%Q#c%M`m!M6yhN<0`&663z$>U`_@CwXA#LatH=|c#CN@GP zgr)=0<1j1mJ`AIreWOCqQK8nsmqUSo_FEtZ!&C76 n7Xc9$Loi|2zX-6hwzRUguv!lon|j0r0nl-0Hz%?~(CvQ#xMV4U literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/24/clear.png b/companion/src/themes/new/24/clear.png new file mode 100644 index 0000000000000000000000000000000000000000..92d92c9869f888e13b3f19c6dc3d6b8b48228961 GIT binary patch literal 1225 zcmV;)1UCDLP)z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA zFaQARU;qF*m;eA5Z<1fdMgRZ=KS@MERCwBA{Qv(y11$kS05LJp7ytwi3yiVfUK%d= z|KEQGCKjdyMrH<{zd!y>VPs~+s`=mF{|qb~OgRky8Gir$^=~F46GENi!KYvvAb?oV zHU0m`z`)4Jn5$tcG>M&yiQ&?&H$s1Y{cB=Evjl878&jR0vqt_;&2 z-S{pfrNrLMBgo8v9+n?|{bgWhg@ovbPrpD30X3|FQXk&^Wq5x7XDu*@ro+Sm0th*X zK#|i7gy z`wJYmm;fMvFf0JNo`H>-p;1BbU)?WY%>Vj@T_Xtm0Xc-_FN3@wbIZf`Osqgl8ko=& z0|XEYhT%*MjWXQ7>%Ib2e*+c)s1XVaD}>m`pZ^)SftJYdFxNl+%*p`N(txZ3Ab?nq zwXy>Zmt_B0_wDCzpyB8)XGF6A5iy^BGB9ufEsK{thlv%U>ECZ?l0zr~W(@`|=06PljDPFjFmSyE3QY!y0|XFK z5HWrP6$Ffb{(^($FG|P&%ODn@%UHN7z}!DyJDC3bWI)f#Uw-{(_|MA9z{tw*0VW0z zK*({h@HZP5FY~{DlNo=0hdLW*6)@-gW8+}>%f?*`6zBvg{LRMA%KYbFGt4F4IK zAi)K6#D8{9hQF*_xj=!%Fhcfovc^0Ab4qQ~vV+H3NMDPF6g8wZNcgK?!h3E^GP6 z!^gnz_kS}usCak_VBwAo00M{wM-rdHz{md?XeQ7*3{x=-how7^#ry)Gq8SvX^RO8N n5I~HyZdCvT5Y1Z^009O7AkBuyNk;dD00000NkvXXu0mjfAi@~z literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/24/compare.png b/companion/src/themes/new/24/compare.png new file mode 100644 index 0000000000000000000000000000000000000000..2d9e035d8bb13dc2c3d4a75a9a3149ef68d2006b GIT binary patch literal 1477 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 a7yMzAoa`a)rw4vJ*t$7yQ`hT?!~X|ft@$DV literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/24/copy.png b/companion/src/themes/new/24/copy.png new file mode 100644 index 0000000000000000000000000000000000000000..b9d6c8c2663cb4c66b97bc589847f38602d69dba GIT binary patch literal 645 zcmV;00($+4P)RCwBAV4yKz#3kVwTQWbu%RK>` zTzaG{BSp4`XE)CGjxYQF{NNFdzIPF%DQ@;VK~}%)lcc z$gpJXUZA1B8Giox1ECL}1kH{bp6dVE%B2ZF}33N{AoVFC4ltn~@pblYR z;9+AzNy->LaQAY6hxuQa5B?*PDGxUnLrjoMf`y?b1IPkcQU=A@A1p~3;)CD6;6B*3 z{UBB!xcdb$Y~FK{At~IGfs~|-;R732JFr4n`2U4!e01#w!{a-T7>=I3N>WmW_~0i* zKtqTfXL2iEaE5`Lqzty;@4tTx&Jp=|)3cVEDp^SxWP$d+m6NOpWfT+XuLkGG#s>A}OP*CCLI}k}^rH3N)Y%#C#;0 f4N6M400ImEeN8*X_@}m`00000NkvXXu0mjf5s)2) literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/24/currentmodel.png b/companion/src/themes/new/24/currentmodel.png new file mode 100644 index 0000000000000000000000000000000000000000..91658fa442d4b5a4259fb4e895094f10e9677fc7 GIT binary patch literal 1173 zcmV;G1Zw+uJBt>HklK6m_xKSa33KcXoqA3j(r=f*1ea-jH_qg}CC>XJomIO|6lbf4!?(gKD z*9GoE6q;T4MFJ|&_wYVMp=3mA|aO_>R8rWQ@U_Y-4UQEz_#Y#6HA-w zYE`oYY+VL>GaxyQRAc#yZB6E5+5#?8ae&a8)Y4@kO2vXovOF3{RFs;@s+gIGmzat2 zn(CIib?ZZ_VL*M24UEr>4p07keZtL-=G>972`_tn+8?=L%aL)5htFjF zKdEP}xoO99onMxv(g=if(sgDiX0kI&kV6cRgf`l(v3IX8@ z@;%9}O%^=G|PR|hYhN-qyQ7>XuAS{N)nKzab@0VfCPTVQJ#kRBKU zU;(fMqyyE@LzND6cA*p}pe5SC#R|SZbmByR*854lI>UuCgVP_^@?=wGdHw+dqeT7; z*qbDHIf64rY+nI{MUVx8bijU|;EWO6aX{Dvy_ED+H}twr^0dG3^*g7J_I@z7<-(ZA zs{k-=v43jNI+7ArRaJ#t6V!49_Zq_;2YVABQ6QEML)w6wBlwfd(gzWU!pqr6J`6Pu zvS-fmXRn`s_tn1ZJwrL^1HeCBWy)bbG3Xqt_B>R_d3_}0g4hA1GwZ!S4HkJ23u3;R zA!ZfnWsOiPbWGhC#7BF7+x^;++^*65EscKx0KoQvZ!fvu#R@!{uCzCWLwO=;6W9YF ziDtXTtmleO6kZ0cG)mKxS-iJr;Q8IhCf}ZN7N`Tu0}k~&?_V2{Gb|-Dg8_gUx9y<@ z8O$K~Ja%^A#=#$~gO)e94(2VBno=bbDv}YpW1TVp33h#iO^(%+D$C~6nisI5Ol^;r zh}#uaKr;c=xH)vB1F(ejBuXm7$i&sQMFUnQ&>jkdh(L-0GKvX-Oa`O9BVzfF%?epEG{r4cK1DOQc3#eQ# z1ExMg(u*-gD$tm|+#b?rV|Yhts#MJ%cj->yxXyg3fpcfu02{-V@9v} z^x5Fip#zF^KUY}((#e19kK~&x)j1B&k?sa#-NiQ*w$IngGY4wVZErQ#7a4P-9We+m zv;;PM(`)`Z@kK~ZoLs?MRvK#-1Z=K1R-N1#ys+=l@QbOavf#W(MHO{lSMa6&H>xgd nt~crz1OPxRc=vyk|FiiU=|Smo>5piE00000NkvXXu0mjf!{#Ns literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/24/cut.png b/companion/src/themes/new/24/cut.png new file mode 100644 index 0000000000000000000000000000000000000000..29ca2122f639921c43a79bb0a7a2a8dcf601ca62 GIT binary patch literal 1589 zcmV-52Fm$~P)z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA zFaQARU;qF*m;eA5Z<1fdMgRZ>t4TybRCwBA{Qv(y!;;-s7zhCtRyL-m5AU@!=0&dh z{OQ95WI3=l~#qSil4mBVO14`}dzgfR`hMNra#MABcklJOd*b6jan1zI^?T zRWCpQfh}NVVa990-@pGPh4{EF|9)j*KsH@WQi{PhB#PnJ&z~SJ8v_GlDv(|a#4liK z00IbX0Xqvgq=1^S`{WNJBQp;t8^=d9hXjPhGDyoQGQ55F9vF^ny?=iGi248T-(F-3 z00IbX@?RzvFy;VS#|FgA%#0YAgN+#|#|U-?2*@cYF?a`t10(c1GZPcjR7nxOoQHR= z9sTv|=Lcj*00a=&2RlB=1NHr5kYoMKpv(P%frs@U!|#6x-!K9p8_*I~AZCC@WN=gh zgNV2!$Gdm$r)w!nB|Lia{LhY!E7t*~UL#uo5I|rb{Ql3x@QZ<&;mTJ5hRyeQ7{2^s zX5a#PhZz|8FbqsZKnzs(>lcHZqB4W4cOdt#AKw@2tI8yN|Mrz(LQltnTUX9*0|f}O z1pooW1aTn<|7YN2{?G9I3p2yK1D_ZkJbnc<7^oVUXh8VS-~SB1|NH|cS*Gs+5eXb3 zqM|Fc6~sc`fB4AI($cbg`}!sAKx1B_#~(ldF(Gq6p66g?W_a}CBST-`B!*94e=@KD z!~HKXSpEak`LExUB6`TOkYYmVfcl0E}%RfVg!AN+4^s-M1R^U4mO zmM7Q@2LXTp!fF8n<9~3Fy?+0fVa2X53?D!J6>u?PXBHKgU=kJnsc_-St-rk;%@Ysr zTHlSFB(VX2079_nToKAy#@o303d+C7621T(Z$shmR#F1y%U&@ zPX7PTdF}r{W`+-s_V2#AEid!io9mmty}5Vk&5eEASyK0dMK-=FVyL8Uc^ zfHZ?q{Bj01ZV|>GA73+kdV2ja6AKTYjCs+r@9%DV{rGTuKQ0RZ0toDbdk5z=|7Q?U zW@eWNzq&4a>chjGr9i{)fD8x8OPj9 zf4)D=z{vFD_qTVKSvZA6fyy|67;B9K5I~Sf{`Z&R-|sIEfrj6ODum}sNuvY?MixE> zV8O=l=hyF#ES$n@pz=}KZ7LVHsIJkMXD4rf__%xk5I`*WyvHr7%^;}c&hYy)(DncS z0yE;Db0Qjkjf^Z@b2tRm01#jROKc?AUonaY00000NkvXXu0mjf8sg}; literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/24/duplicate.png b/companion/src/themes/new/24/duplicate.png new file mode 100644 index 0000000000000000000000000000000000000000..8ff23def936283acd8d76f37cc8ab3116cac97fc GIT binary patch literal 1227 zcmY*Xc~H|w7~Q166c9?0s-VtfoT^cvCLqYAOfZxLf#Jx2P*iT~fPx%yh$Vs-7Ai*> zVVW3@1R8=7LO@EA5)33E370h(eo24=Nx4zRfsQn$KkOeJzkT1ndEe~Yo&9!8Lqh_r zEF3HV09Hf-J{;zKJNfx%@cf!NEQ879GAK89G zLZP~^50Xfx^Ya@U8wabZo<4reD=DE;seSkF)9Cbp^72L|Q&LeuZ)+Q>s$#I&vg+#Q zjt+TEO$&#ksHyq2tn$f;g0Ed`t-a~U_I6o7Ga@!Ny}7xE#p&(--k8ndGdmT>GrRH{JSw}R9lYC;Elj-rh;x4j>*6;=|xW0=`-xPz!}xK5uMt zauR|dUaxF$P^Hu921GBVQfOgeK_XGgW!mNCWtmJhGCaMuwl*@X9vk~}V`F1{d`cpo z9vYf~JEm0Xx3;#_i)z+O7EM88j50)8(dOo+>h-)zwYa^#-7wOS(Vbo>xS9SuEti*5 zz|Sw_7fQ!psi7rr`YFC6)J#Gx^m>z7+AGvK)l@sgIx{18o@>ma+>D1H; zS4H>jKn^al|M~DfTDVvFNe>9&tl$LD|~F`hb38R7s7Q41+y&%RyiyNsQOT##Hgi z*$MbbPG^UQL;$Nhk3NQVRPu$aPe)eK)4`Z$2fGF(@6r&v_aDeN2yM-Ocx&i6Wa?T( ztql8OaxC%@yb&VdTmZg&|E^gjEX*?q(OEDPKIXSWsqlwDI1}+W5_&W-4rPyV!8Ux}^X&ij5%Bo}!L7nu2C{H^+82dF zVK5J9IFyHpnctVFpb8w?2Wk1hF2$zwp%|Hfw;xEDYbWPjH!Hn^cR~@XaK}AOEeSO# z6@lj@NEfngT{Ifyee~3czIq#U7^!SmV4z&)c%0RG+t#g%P|yCop@aDwqbv9xuJs_1 z-_*(CwLE`T^a3Ak#v~GKt6PGo?t)ygBDzzzkFG}%71UFGdrkH@{d_s}JU7qW#>uoe zSsv9E+f@*}4&^MLLc5@ku~6hzNF4mj&F5*_?h91h*$7JnHzzxHMbmY2^y2ATT)Viq z@44wlMB?s+a?13BwVC^}=96!=`;dF F_+R4bPs{)S literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/24/edit.png b/companion/src/themes/new/24/edit.png new file mode 100644 index 0000000000000000000000000000000000000000..d4be877f44797cd8c962338b617a313e0468008a GIT binary patch literal 898 zcmV-|1AY97P))LkPZqr*^XcRTOnLm!>e-HdW_q*Tke@8GD%DFmgYWBiL((iE)NfgNW zhu<&-!HiF?m^U`2DmEcus4%-azc{X$^rk5R#wSgq{n!tfjwf^MI;GZ@7^Z7~Lhhf!Z&kD8hqSgls% zQ=jf=4eZaa?4A_DWV*#Q5Z&^i#30Ty8qw6$1ifC5s;VkHvt7iggVSJI4Gj$o$VlAL+aJ)yVlf!zia2#B1nsPA2zxIg8nC0+YZ7I-Kv;k9mNTa|9Rqrc zl7oVxD592$V*BzGc)SLQoJ67F81hR6EHHHIG@9Hpp}!tHZgu$6ugA7_e%w-`E9Qek zvr$(1IQuljcuO-m&gda^3q?8n{KJw#sYbfsVcy1F+QQSGPs+{9kA*^t+28uUy-O3~w>mp6 zcLV^yIVO5@qKzqEKmcuZGi#PFukd*0MOH_$bbg>vqcn=1`{i61rsl)P<&X{6%kVnaL1vEgFToWRM^Mc&dY) z9Ub8)YH{HuCB*PYJ#Pw^Rr8?VD$}9S@eGK^=R;<+LT~&dgDAcffz$uNH13h9P3UkK z=<(wABnN{d7u%y^vz0iB;-P`VffAyHAr`O9z#B%J)Ac5g61i6zTNI%Yp^m;C& zH}H@X^UIY><848fU*|%~ORJ|>wf+iVP9E$WX2xq0KlGkYKHDua+x>$n7C-`?5HgGk zAcH|jo;LwYBbFOU#JHv=V%*FOYvUns9U~ho&h(+S&!oHrgp%6kWE4<@S_AgLN42Ywfrrw2^EuYWo=j(@v%zf<;xvbw!u@ zN&HHVznmKv?Lptv%>pHo${KfUT~nY^EZ3#6@F6ihjI8}sft_oamrXuQQb{j!UC@}Z z!W+AHu^uieDq`DB9?7}~g36_cJc_hEp9`^LsTx)`D1Z4Fi>FxOd@L?MEQ}cFFn@i^U~mkQH^+jVe_Oa{9@ zvGYi1wI8jxf2?q9t75PQ-kW*>K3i9(fA#bVv7;S@M%-K>Xw<;4E$acUBPD?(Z_v=8 zfPjM@*@p#^@t(}B6(KDcXDFSwX%^!&P=o3o@)0MMOk{>e@ctkN>fyOA;~}{QqS6N< zx9*mPwq(sl+nnq~zql=g(N^HhwZD3VM5RW@VsbCeTJk`WoZ}%c3RIlKmhYGMqQm#P z6(-Y4tnWY;RCV&Y{qJMRiM$aH_jJS|4%Vxk>Bw_E*4Uc* zPrNO)yjDfQ&4%*hUgXl%b{DsKGmJ70$v-s~#wsPJZM@b^lhHWlcH{{1u5EvKW$Cdnz~XRBQ&e?y64nB7T? zizs77zBJ=qC@GTm1#LeVSerr>Sr@JLG>Oz|F=sc-PV54Y9`bH^l*Wp(Vjq(1_ULrP z8J1@&=9Mj1N7-!fD72vs`?ZpE>)hA-33c@=!uv%t|86B-5oouxJmz ze_oeHJSH}CZMi$Xz3;I`RT1m0-e_bqQisZy^Y#KkvNLU#T;T3ke! zP+z*1ZeDZ0Ua{Dg+FI|aJC-^B8i01UDN1NMRTy& z^6&^U-QgQ-WrW);PIy*DChVSbI*np+6yT<`{-3$Euin_6G7z&Re)FH3po0Gc;-kCw literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/24/fuses.png b/companion/src/themes/new/24/fuses.png new file mode 100644 index 0000000000000000000000000000000000000000..2620abd66c1bc8f4c64dfa2ccb7d6d6954369b86 GIT binary patch literal 4791 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 RVnF}^002ovPDHLkV1g)qGHn0= literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/24/fwpreferences.png b/companion/src/themes/new/24/fwpreferences.png new file mode 100644 index 0000000000000000000000000000000000000000..e62900a4a7936adacda50f736e038a374918a4dd GIT binary patch literal 1535 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 literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/24/library.png b/companion/src/themes/new/24/library.png new file mode 100644 index 0000000000000000000000000000000000000000..cbd6c1461073df014d2e5153320b89c40d406d22 GIT binary patch literal 1351 zcmV-N1-SZ&P)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00gf|L_t(Y$DNgFOjKtShMzkN z%rG;6$UZE=7AZ&+QECN6P17p2scl>^@dq|FYE!jo8oTmKobNvU}S(17*KXuW@ncB^+!{X47h#Cm)v{vp7%ZHeDD2^B!u93mdRqJqPk9W z_YG3CEKgdqZ1J=>=~)C!7AvPOREmnKI{HTXNlG6_7ZISNQA<=v8{#=^KlmL#s>Z1Z929()`W=Nq4-eXKy&U?=6*Ztz#F5q-GCvIQzql9bf9 z)Uq_QkRJQJY2yNZ#l*8>Ci488EN-{9v3YX>(GmA(XfSi|SQEF~ESNi6Q7c1dOw8w1 zKV1bw_5mV&8uAL%WG)OaGU`F0^Wc-cgsQ@37I>sZK^54XE)M)rCQKG9TBVM&6&I;% zx`jjZA{ho4^Y`GBy=c_>Y03RwC2~L+T!G1A<+rkOQBhS-QhYQ&uhYhV%;g%AqfERWYhz2V z;7)%8e?H8lU!96_M4*p!A>|0~3LoZ5*n0)T zQ3`Y^YO*5T7;UZ0TJ;HzxNMGBeM>+D3wRtFgqYfO1;D7o!IA~(ocQ4o_Q+i1G!>e( zP~0{NOQV;Nj4ue^T+Mm6nf=wW1jNM{(9OSu7^p&S z*-w0imYCe1s2r%{LiNr`m&kqsfvIQU7|{h~51?wYbYksIqqgNC#^gw{Qq3`Yl4gz9wo{60L+5Jm>{beom*v@3`) z#PZ{wsZ&k0W8+%(eE%yg9ldN?pGJB{D1O<8goM*BGd2_sz(~JDdxH|MN8lZg<;-Xo z&E1g<-d9kxJdcCl6-`XBppkjMe~5jDPl~JcH+lP=L~?S&cqQdcKKlIwwAv(EZ>aE& z8rZ(Ei0vEKN;Zd!(-l`ma(oO03+G8manUp1H$sSsU31ICqD{NR{NgR5^jfJ{w4+eO z78Z+rhfj(zhjR+{Y4@}v^H^DhXzlD~aMaG;tsA6yFQ)Rm>tDnWQFp%L%=G{O002ov JPDHLkV1h6`fEfS) literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/24/list.png b/companion/src/themes/new/24/list.png new file mode 100644 index 0000000000000000000000000000000000000000..5eeb664748390c458dc54cd162012d88405c8ef7 GIT binary patch literal 1792 zcmV+b2mknqP)Px#AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy24YJ`L;(K){{a7>y{D4^000SaNLh0L01FZT01FZU(%pXi000H` zNkl4588HV3`&%JZ!&WvZdUNe)J!Al(6;7!Jk9G5_YAyf`UC=eAWQiV`e zBp_65g~pW{+DfhZs}+9=6hRQNBTKFcLJ=V`#db`b#>831O^j{EGoJA>``q!&UC!Z0 za21oJX{Elu&w0N0d(ZN5_&ZLh1En^`!rt^lccxVp|? zKFAZkF7J9^OqQ&#|LFdPeVuL9RnznQy_(<~p~=$=V8$9;*LB*&*mUwHJe zIDRq=uTMrr;dO{+7?_EJ>DP^Ad<_l&ygAd zwUrLoZ7#g~-bom-Mj&Xp;(XQzBP-+3L}B9FSk}P-fY>%Y{z7}By}jBSTy2oMQDTxBo~3U!qtkCyxRs za95vr%`Kv(qRi_4-GPp`pZ`mDrw)%xak){ur3p3>Fd3j~fXD*|1vC=~N8`&SxOm0mE8pkM$30fM0zTrLHJM=u!*fxq=@;q~wvPPDNv^V;Z{eE7HfY)xm+ zCFvJ)9scIq%1EWxKqO9JwTRFPI%YyC%*-XO#Bv?@O-E+A#|*UA#q8;HY@+M?$?XMo zfgk;63W}!$7pD`5E@zCT%LlKC-+v?cO*>dq<7O__RGp|J`sK*@{5=~MS5z?>>>n_~H+KF%bpQYjbrup!GJe^< zubpX2ZTdp*0BC;pKfwXu8xfrf2X`05UK!G%YYO zEipM%F*Z6gIXW{rD=;xSFfdS2-#-8V03~!qSaf7zbY(hiZ)9m^c>ppnF*GeOF)cAU iR53L=G&MRfH7hVNIxsNi?vvL50000Zv literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/24/logs.png b/companion/src/themes/new/24/logs.png new file mode 100644 index 0000000000000000000000000000000000000000..a9c247b27d6f49dd6f8f9592392e070789426819 GIT binary patch literal 1411 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAv7|ftIx;Y9?C1WI$O_~$76-XI zF|0c$^AgBWNcITwWnidMV_;}#VPN@iaR?qBqV?|LI6Y;XNm%p52idl8H$P+_U&U}kkw$?@EzIY z`g#T+GBjl1=4Jp&L1g7FIm~+_4Rk6*1V{qe$msV!M(IlqKyx4pkfq>kpe*0 z1zEN{;yqq2c+MAY)Z=f`r{0;s6(BR^Q42HmlpGx6hrdYj7^k0|XIw7Fe7NW3hJ^Y16CN%)>OD;_ zdSBAhRadjcbR+kaD0(=xm%iQgRXTttaz~-?jTL93w=I&~pZl9{%Lb>7HR{^0^}@n9 z7}FRIzO&`wsb<~SQ2V=3O^!jXFFb-RUFknC3RFv6BT7;dOH!?pi&B9UgOP!uiLQa6 zuAya!p_!GjB@k&F7+M(^1O(obP0 Hl+XkKcNFv5uaq_iu3=8F=Tm! zAx?8x2x-=p6~pVc%a32;)lblZ|3E+7efgH`AYvh`Wf&nHI1x`~^oc$Orh;kZl3`|G(fM z`j5u~kQ%(fT(IQed|)^x;8Gwcqrh8+tj5cXCw(w30IN)yw08c-zl;gG28LKu z$nk5paAq|NEj0{#ube-}z{mW5!JNF{M7U|*)l=vHVdF|*6qF<-6=J&j-3tbmUtbq& zZOu*u@!|fveR$hO2_18VKR>@4uyFH3!XAX7NtGDuONyA3{Kv<@2z~#Wpy5PWfUralY{}10?-+i3cte!o zxC(YoAQlB;9w24|6__w}Qg#9LAo|&%4ULe90OQ|4{0$VMK>U&JtqOnu0|3GmSv6Uf RQyKsO002ovPDHLkV1iMN9IF5T literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/24/moveup.png b/companion/src/themes/new/24/moveup.png new file mode 100644 index 0000000000000000000000000000000000000000..6eb96ec1b4c027a931589c6639f031326be515b5 GIT binary patch literal 708 zcmV;#0z3VQP)#JDkT{S$*G8so~HiQO9GvWq6_qBA=eO-x)GT^JV{2&c6rLOLOTomw>Kj)tRci&zTWn#)UII7Bc6m|y+~>3r6l@ALR! zsQ(ZES4ODvg%MAzV}YA93YzH@iO~b`&oau_HnA*%AlF<-20fyoyc zi6eVN4tim3=^c`xQ%Vjl!5Cq0?<<8@65gWUlotTz5N3R%;48h9} z^H{I~lu`uLzgweFDnfaq0@3~f$YfSWqbE)uh(EY{kDR$WDRCSp>KqR~Y`@%k4q45Q z8HTrSmsz`PQ&K<2C=?8YKvBLxty;#X(`CN0QIT;;W_Oz^7Pb>vsG9aja0fT1nwVU| zCa~M>r?!%ozUAvf+WMf4og1g#BgZYfNLhFWvs2fa^6*y0YE?DOw9HXe%XLeEnqD)z z#42=M|9t`09cWb3vq|bXT?tri5$#sMY||E7)GFE*Ab(3Bmw4XQ6EwOp7s8L&i*VH6 qSEQK*2n|tYM*>m!=l?{02rvMOC1T9hrqDG200000b000McNliru-U18`B|C?ZFYW*U14v0k zK~zY`&6d$?TXhu2KfimEG`7r*Wp$=WC7TQdL6{(du+dROCk!9=GNry2GU{IHpD+*v z!4>uo2m|-3zKm||9Cp|g>=?C>RMV#RW>ecW*==&~{T&~YdvkM_#?B`X9Dcuh?&W*F z-}5`alPKCIB0P_&Ysw@^-Y|_%v+-l>9>!%!$?&{|us48v$KR;`#T4rhNj zOKLd9`B%^LM`e?1XJ!ES?8ixtrAPR#_&xVl@2vwT44;%?7(HDn)%AS6be%Q5Ms_$$ zvH1{dcO?+^xVFMy@{rt1SrX~QC~>A@odl{2)K}o|l~O3+X7MIs3U?N7lSw9_YQu*u zjNexu@Mxz8Gu&08a5+@S z!?D35gPqpsV@3>kkz}C22lv?rB?_rhKy*XNj3WC24E+s-E3FoP?`s9eplpLT z3P7o&AXJ(z_U)L_CNPnkfEYZ@fO-WIBOTVsEF@3DlM&EKAjUUAf-a^Z&}bLsb9r(@ zIq+a@8@Bd33D#}+`4MdG0ttSl&R4-b*xuQh_1XJtSXsEMs?93n%j2wUufQI}{{*GL zJqp?c4ztcSZ_5R-jPM!kryvXtaD3o6OK&Z4_0&~PkDey^`XP?K_A)xoZwzvUG$-VO zSm9AI_GEW=)(9VTy04x5Kec7xhrlHQWxEBxm zSa@8E2ucKrfcT&y(zPn3FirD+q96c|fc82A+qNl}%hc<2n$0F!Yb?vE0Gsx%2T;(4BEtwn1si;IiF-t#<}pP#ccnan$WnZs^`D7L)U z&toXAwWe091tq$Ff5EwYdGdpejg5t#L$9k%`?Q}Q*ILtPG!PLM7JhQ3r$7IwP*}e6 zuV=6y0bqu dfzm-f{09U`X^&i4-i-hN002ovPDHLkV1gQ?zR~~y literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/24/open.png b/companion/src/themes/new/24/open.png new file mode 100644 index 0000000000000000000000000000000000000000..824b3febb362635ff7edeef0c47a79a19edca712 GIT binary patch literal 1270 zcmV}*VTlV;m( zF3p9FrLC;FU@c+;YDkI~XbEcQgHeMwVgn)=5lZr^?UN7s;-z5wpru$ZG!Ig0LqQq} z6|K=`E3xgiW|MSxo84?O$!2Hfoa2AaZf*~P0WB#?r$O#itbC=acvPOA%{+vSh&UBKA-* zy7sp*bapU!&Gji*p3W)eD2{jINJR+8-hRu6OT$fw?D`qTZTG9`%d(`hgMF^%o)~Ca zzXElg?#BDI%{X?bXDfy->_Q?riG4M@QQJ}sUl5-~24x@E`V=e!oasj2{jC^y;<i8$*)cL5`(S=dVV%-G|a@d>A<^pIP@N?|F%N3=iDr`x=m$T7bhH+?|URW&kyt zL;5~1Quy`s{Ds4H4_>8__J7HlQH4SA&6+Aw3RKlp)Nk7P=)o$)W}{#QJGT2n82WM? z{%q0p_Uawsr&|xAqHbq?oMDY?PA-Ql=gwe0liESesNUp$Lt=ZVDK+OhbKhlep?Fg< zirj(#T3zG=B$s%tVPCkd^9}e)N)f+(nZ^t~&ge&Z%?yU}Pz$zIhZI1|G5}RYRdGq+ z#N!>kIQ8+%l#D?X01R3zsO)p|68pRQkzJU>PiF^Vi!vAn0eC2=7#(VR4I2mQI3!jM zFZ-gu@fEtiODr0hK@(jYhKFJG30Dj)+rj3lHh3!@gK3%w27~Z;Jo;HhAP~UCi|6n{ zXFYy7|1HM<9C?wJo>B^W4!n7M_m;{k&B(U1`NJd~3Ri~|Ib>#M5gGmw@yS5~+5C!t&kk~K9Gksal!eR4ce0T$Y64QLh2C^Y>y)zkruT6EoSdE-;h0qq;`T0_x3la=bQB9-vuXD%T=NkEA^j znjyIg!*s}Bp0|YBjQWL;YuM|9NiVf5Rg&PYdYRd#Iz*)41|hZ<`KU6;Z&8r0*hvCW z$qZeNB7ZiN=L%rCM3?-bxdf0--c_x?SATFWWs;Mx2exgYNlL!dixd!3b|@tx4@T9X z0R#%{Wg)-RZ%&@~07*qoM6N<$f)7_!s{jB1 literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/24/paintbrush.png b/companion/src/themes/new/24/paintbrush.png new file mode 100644 index 0000000000000000000000000000000000000000..de9e1806fd8d49ba3d669aede2091366c1d1ed2a GIT binary patch literal 1188 zcmV;V1Y7%wP)y-ci1TjfO zK~zY`rBz!@TvZfZ=iGaTd*{uYQijJc1Eo+vr7BHqh>4_X(r7fMCicf4Bx*Fq52L2k zYJwVKYQzLT8y_(kjWKOfEQ(3Nen?v+B&9%smJw#449uO!ec$6ptqL6#@cf*UlfBp4 zYp;EB2zIzWe#VzqU+I0??Q!KX#!h#>c6DqNVEspdr#}5Fj_wdYr>4R`P+cGH4K>xD zsH(5M^wEjn^8ip0s@M>?Q-Uh5$62i_3gU}P5F7%6`)c3pJ&3aVx~~6!g0^z(;&~#N zstQ9>kzQX1M~Huad+`3vvD+ee?!c|Rp;8Di%MwgohpB5YG!2HX5mPs~%{ly5fc+A% ze6j?Njwk@2)K9}Ob-^Sy2&LdSisa38xxatm+>Qv=6`-&q%AbCv_{F-$n)mfol25J0 zVHpgfQ-W<6SeTD|_2DGq(Jr9mt!=i*4e))Pg~uD4!yn`oWF`+F|81$@4}^Hfi6=-#5D^e`;TgsG}v%mxEMIS!QL;P!c1kKDu0 z^$jeKZ&yK8)t>qWsaeFVDI<8J8+tkcMV67{azj@#fRcf2+r-p$VcQ<~J)Vc>#)jdb zfd9cKF;)3Ch?EbW=fIc^C6Rz8uR~3&rml?7jBd{V&lZ)HRduDKkuaB2irRhUP+eiH zXuDCIIS(jtC@RCE7RHR)96Qo8^7^(Onj0tzxO~k7HqL+f1$+g?sBH;B3qFDiMiJmC zMs6qouMe2HfI*-KCm$2=^0!9z7O}eyY#?~o<7;dqg4g0jI3xihpM8U|p;=G@xawL^ zTpK`T03a4H^=qsjzy|O;6p+h5W45I5FaTY(E{rvl^Be>aMStaewu{+aUuk> zc>x6D3rG-xX|SsHYggv8wJ6(|+Olm=e4UcdT{W~+lS2%MlsY*=I6??OZq<~hBw&Gn zFm}dk*{6Q83?rs%TT-yOfa*?PetWAZwUzS1UN5CS0%$s8H!{o~8d1`H$Kxxpe*z#| z{4FT}=>f^*-_7x&M5(rH8uFP;DhYrw#z07RsNVrR`?RF~y^M1J0000@kk_+;V~g318W#cZIDiz=5-!y=)5jX z=JRqFtTrQ0`kIS*)LYpT=gi!rhvQGqEU5UWcBogv`sbm#=c6Uzq)c|7?7K=AU zFf|g&qRo%x7N6e|9+N%(A`@b=4$<6A9(h6s!Tu`+0zy<+^Pn7o8HPX&J$n7CiB~%z z+Hu7SwgQY6lJ1hkP`~mI0r?*UvJMa5?Sq9c?Qrkveu!?_EY01yKO@Bvf-MBTMl@!s zYcn4Y!lBqTv3aHP3$RJy56e+O7EM)T$OSN=_GYcY2sc*5vEtWW=VOk6!ggitxwNNeJF2$g;=OP@~y#vN3XWarkF-rlMQX2vC5IIDH57p!F?e}(g zKm7v63e&K%x@s3-C$cOc=l}o! literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/24/play.png b/companion/src/themes/new/24/play.png new file mode 100644 index 0000000000000000000000000000000000000000..3ec82b975b7f398ceef11064e7fe647e87f151dc GIT binary patch literal 1243 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 Xa}&mHq;>y#00000NkvXXu0mjfD_$!& literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/24/profiles.png b/companion/src/themes/new/24/profiles.png new file mode 100644 index 0000000000000000000000000000000000000000..394e8079f0c158c40fc40919e3569d60c2505a36 GIT binary patch literal 661 zcmV;G0&4wh&d&NX4C)Q&8F>YB8G-Q~U&i`_{v3hCV{;wn87FT|2Q& z-bDn8Bor-L2+~dO)dcaS@Xl&v8kJ@-!o2-g=kT2K{CNK7e->Fp6BOhd_Eu7*VibDLciZ9 zkw_2q9`maEio7ju-R+~Ay8FyHei~ruC6#dJmmEBlybR@ z)9FN2RWwaQmSrSK;^pOq<>h69!62DTW;S4&O zh(sdDvWyUdPN(zc?mv*CPhUP`)EhiJJg~E~gWYa_Q*Sn#+}zx-zP^s%?|(l<#Sew? z`r}<3yHGekKgTppN~IFo}cGgb*AY93ac`&s!u(60uke z!!XF_^OQ;@0)YU#ySv=p-jdB`iAJMbUS5*V=f}+_9(mSBYcv`>K0dOsu|d6F2f*v~ v0$`dZ!C(*}1nqVk%d*C`zavHe0q^Q7!Ghmo`IiHJ00000NkvXXu0mjfm~AN+ literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/24/read_eeprom.png b/companion/src/themes/new/24/read_eeprom.png new file mode 100644 index 0000000000000000000000000000000000000000..9a0bbd6b761ed265c70228524363bc911897d5d2 GIT binary patch literal 1395 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 O0000rl1uRKK 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 literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/24/saveas.png b/companion/src/themes/new/24/saveas.png new file mode 100644 index 0000000000000000000000000000000000000000..478c4d2cbb892d3c5e60c5cbb249758c194985b6 GIT binary patch literal 1268 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 literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/24/stop.png b/companion/src/themes/new/24/stop.png new file mode 100644 index 0000000000000000000000000000000000000000..9c1258365e327c33d95224e6f97b4e0e13b925a2 GIT binary patch literal 1161 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 Rlh*(M002ovPDHLkV1f!{O&0(F literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/24/wizard.png b/companion/src/themes/new/24/wizard.png new file mode 100644 index 0000000000000000000000000000000000000000..cab6ae467c9c4a919a673483673e626ef7e75b0c GIT binary patch literal 1323 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 jIaDzKvAc+F;okHit2RQhVF;WDVoM^;~4}r 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 literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/32/arrow-left.png b/companion/src/themes/new/32/arrow-left.png new file mode 100644 index 0000000000000000000000000000000000000000..94f5afcb42713a4e3cd86a08bcdd990aa66388bf GIT binary patch literal 567 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyacIC_6YK2V5m}KU}$JzVE6?TYIwoGP-?)y@G60U!DL7K8Qingh9K4 zdyTDD-*J82$F>EtL|9n<f~Mos zt}eP1xUPA*?DAZ#8PA!xUVD37t+SCf2<~rtYQv|O7h^9~<-vGYyJY>`wG~e^Ss%{X zD89>1y4qucS4=_tPm_|r6>k)O7CJ6tWw`5jaK1~biW5H*!v*OZTRA^}QL1^ZW0KvY z`+~XQ^Xi+u?8o{QSsB#-?mT<`$Iq~Pniry0MxA8+arqb1qGJIQgFkpp1_r2ViEBhj zN@7W>RdP`(kYX@0Ff`FMFw`})3^6pbGPblbHqbUOv@$R_dUDnq6b-rgDVb@NC>l(y bOiZl|Od%Scy_k4UEa{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyacIC_6YK2V5m}KU}$JzVE6?TYIwoGP-?)y@G60U!D>$#*Kl9QOv3fDR zE8-km1;v{J4k~T^SQ)cpBU|p&N6bG|oR;poyglHx(+XA3h1{_ki)IummQM94-F0R2 zp5pVzEf4ej$JALM69`&6;&S6I*HD{jn2ng?4tx9%?4qh%uO!J@Y4 zo7TszLOl8!yPundmoP91aPZ{(-@Efqb;BPv$%uV6m)02QB)t{qKfQ~AF=d8DMNWqL z53NaScYmFv$DpEC_PEkrT4BPDCuYYy0u)~Ol;xB*`p_yO&))sa(WglEsiOQUCqir8lN>su;5Vay*xPcUk^SjVBlS*Ldw-d@E38 zhH}@LQ#&uM`_XIYfAPz+qr4f6acuGreZGFFnqnLJ^wO_A+kT#ZDg5V)pLP6Yi-*8K zRV{IiC`m~yNwrEYN(E93Mh1o^x(0^2hL$0QW>&_QR>lU}28LD!21ifMdV``NH$Npa htrA6psg;STm4PWl!?SmjuLCtOc)I$ztaD0e0sxZ>);9nE literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/32/changelog.png b/companion/src/themes/new/32/changelog.png new file mode 100644 index 0000000000000000000000000000000000000000..952a231ddb4b6c51f53f1528e695ac5c7755268b GIT binary patch literal 2209 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 cMPnim@{!c_KIz&^ACJj3zyJUM literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/32/compare.png b/companion/src/themes/new/32/compare.png new file mode 100644 index 0000000000000000000000000000000000000000..4cf84e940c07e3b2bf94fc71e904d01681bd048b GIT binary patch literal 2136 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 U{@M`u8UO$Q07*qoM6N<$f=~@x0RR91 literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/32/cut.png b/companion/src/themes/new/32/cut.png new file mode 100644 index 0000000000000000000000000000000000000000..89ce23045cf6c477e2cdedfa920eeb4226fb23d7 GIT binary patch literal 1418 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 B6z>24 literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/32/exit.png b/companion/src/themes/new/32/exit.png new file mode 100644 index 0000000000000000000000000000000000000000..bc9e301bd53a9d46d9123815d90f380ec8e66c02 GIT binary patch literal 2978 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 literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/32/fuses.png b/companion/src/themes/new/32/fuses.png new file mode 100644 index 0000000000000000000000000000000000000000..e229989bbb930f9b6fde0ba9ba0b1b0caf2e39a6 GIT binary patch literal 5149 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 LNkvXXu0mjfLjSB> literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/32/fwpreferences.png b/companion/src/themes/new/32/fwpreferences.png new file mode 100644 index 0000000000000000000000000000000000000000..42e933b33b5f33d6d71260079ff74c2b14d9c5b8 GIT binary patch literal 2095 zcmV+~2+;S5P)=B_S10Ht+xd02y>e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00);zL_t(o!=0CDjGbi_$A9N} z-@DA*na<4Z?R1vTG|&L0P|_k)p%mE!1DLvFj3^k9PZCYk#sn0^XfP%&!~iBHQnx6e z0xfDIG+6cmEf8BsMQoYrOlR**@Akg$bB-VGotZ9o3V4$H;pTmo|2gOXKj%Ecd$4cq zE}t2O@_y&s`^0gYKu7)4B*s29Ui98}es6VV55R4&mAP|u(@D>ig+6TBUE;1a&HUah zZSX`jJgQ`CS3HZBL0iS2c6D z*?I9KJELjCV)zw?8-f(>vt2ZH)nJ+Fj(X zH93B6_BSnY)zpZmYDR3J23~8M^tgSle!A2nk`5s)(2)!2De%-MMK;|2uM)SP)x0o( zZ|*Mg!!Y7&-aYAKn$K%@q)r!P&RnMZCE*?2+(eyp}GI>Pe@hpJSPTF6D_7sUn_ zFM==hXHF`sZ|tpdSm!wbHAkF-CI>xz8P?|b$cIF>%mMhFS>`|ERK`alW)elEM!2I1 zQt~ho8O3VCaAXbT)0Y*3Fr>dp2<2FnAdoi5ri8OsW+uKYviR0LB|?BATs<{X;fNYl z1Je`b5i4BQ4!54(deR77x2sHYJo-8a4`?C`&yc^*?1q~~eiZ^t!TmEHir%og+>W=Z zf}6|i!dCG{D4?!!*|WqmxW7!guj!ue>?v&yZ+UrU)zm1hWi?{8`OqKdfj8JT8ZlE% z*jLtuDOj0v43w3==HNuAM%_6D2{<@d$z+9m=!JD-BPA*^L~58cE|0Oo*^2^xusV0r z2)yw843S!cnpZDWCP)J1z$E4DqR<=Xmtv!8N~GWx01$bYjA{ZOE_z&pMV-wdQ<2h^ zas;k10Hv0OOdw=K`Ba#gt*9DQ6C*OkN#p)hRU_6~Zai{ADV~p%r=o@})aT4Faa6nz zp&tmnSw1!+QA4Sbu#qKdBwACqS6$$EN2G#RV}W9cnqh$vs}c*nVPcSYBT`QSxVmdf zt>(uHiNSPYbkwU$;)RBR^1^hSQ1yQZY;nA1H}BLd7Ox^CSqd8m?Z% z6N4pz(c2m_87n1koYCYcSCj-r8bqoTd(LffxIpMg3Co*8c1}bb^2~8Y%^)_CKuE*} zLp6KTybyaM(HaM48~2`y@%_^?tnJK#!E{*}i4@hw2^g;$e^}c=rm5!drd?CKS~3c$ z`Sz_Cff%ab;knSvc8b(Q8f(3M)$2gu;F1@onJ!MU|FS&Y%_*kqd^uWYW)QmC5RwUm zpX@!%*Y=iK((K5m9I+k6ErTGe{ZVfZhQJH0U3td$kD+FGKd*!=(3^smoMZWp3Hq{d z;EFCjB$g%Cx8;r)vOhviAKg;HIiNFnk3Vts*^4#(WL zYYK8HND0Tt!$B@3w538)b?*8>yV?uGh0V$Lqzc97Mlu`H}(` za?CF_Na_eeaijuAE)C0;cGJ_wqfe}JYxg}nPFSTK`P$x23{3^)XXtEL50qd63B**e4&R{WpddHZu(=VJhb622iWn^{&)X4J=(5) z!)}rCc6my$YW;SZ7EtAY%5mz)oj8Ai~ovk&Qoo-EzI~PX~DBL>sJ literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/32/information.png b/companion/src/themes/new/32/information.png new file mode 100644 index 0000000000000000000000000000000000000000..48bf9f6f38c404d86774de95515513c97609bafb GIT binary patch literal 1838 zcmV+}2hsS6P)yQnVE7r=o%% zG}bB-!4E|XNgMp&(xyhRX-TTmrYOOLG-+O%bTzvryV=d&P4>RO%^W|>+?lz1HyV53 zuy>X-=l_5H&;NPO8O3dm{KE$)z&wDc?Fzj)m&SE0h5@pf6!jLAYc8(qp#_ZBX1P?OaI?(fQnA=n@#WEe$QBLbYvY@uQ!-mYO!#$-L=jHfBRC3v<*ocZZ4OY zUn~^srP*hujyydHG;gKIss!@8Up=sG%g__|@7T(}=9)~+HfXg?*BS$$RQCo7l=6ur z#AETs5~bqYYnR^G^CVDNO^qG``Q5J`*m+<6iIL$AoVrwIx#ALs?f~C6o&gl6E|;Ti z!rc_2ASF<(6}egX_Zye~`1q4RaU}_TEAZoIi&Pt454ci_=e{w_^LsY()z1%*O>6#s zp#q{nDG)&^|91<8Whb$m%-z|sU3V2Oy#5x@BFY>Rfxj}bZOc#y-fEk0l>v-W{>H%g zXeuN%KAHkisLoVDYJz81DRiozWNzcv#vXj}n?NRxE8x35n@#V(f5%o%T`Kp0hq+dO zDCU-$A%VH27AnZS4=RWbe(Pu^vunu=-TOjr>`Qk7PFD&(Gye7GckbBsl|tF#>SC)4 zT!r8&oTomnGQH5`-LoZLKC*}si7B9bMU+HoQU0^mwqvE%>!pwWbR1{^#sbJ@Q_pT3 zS;w(|F84%E2p%Y*6y>_dnwZ5tKV3(3Z}ZfaL<$5(T$u&~U<{5Dw4L4nBmiyYa+yt) zTGX66(zjg0a=C?TKy*-AS|M6kIm8kqMnF2%&>>;`vNi^6ZAhg12k}c$TcBurURU(x zs!OrzB3gwtEg~U6j{*Tf(f&FmF$EN1-!q=UaZD!&4Tx1NRcEv^n>x`i6z8E3}l5; zxkMW#Ufe--;X+oKB|4eawH^>NNCn(HS^cY zl`BVo^f#aiv;=53>cyApjVk@AC~qoa5Ji6r1v=)8t6&Au+kp}r1~i4GI>p&@hXe2m z&=$a}TsyU|S}7H?34^V>Tj|Q#eZu%7EYlbX%Z^B7`!wrwaQ!zdy)}kLIE@1?jMCO){y;4{1I;U*y^c zhksR_KQ{~92s{wpOx&p>Pfs?g*I&b{lF@+^0ww&D@xR{SgY~{gL_kEa9mU-vnwjY` z7f+u%cIE9K90L}C62aXtzN-Lz;}gF>V5c`txGGEAQh~8_blBLD$#iHo9p&5>EXN|- zrx_p8T$wI&{OHMJXMX$OUSJNG1u+TS@A)K=>Hi{1 zJ4!of3Cc8fCdAK&{*T_ z*Wdg2cbqj_9uudp&q<_6ISCR;jh)aq2_c;lk_koI^;j-9nV&CJigV`;PC3m9ZB9x%gi` cxBYqkAGY6f`z8Ke zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00~@4L_t(&-tC!dP*mp`$A4$9 zu)DC_7C}S>0ga-Qsks<4L1U&-OqwPdtLe1nGL5!2+G#pTC($O8PBKZ%bjC(&J37_a znRZmnbrLYKV@0Ay5k>I2ARyqffUv;c&hDP~oPI!Qh@gvLCYkztJm-DS^Z!4$^E~eh zx8#=me~a{OE8J96tZgqT&5X(eUlG`ZXRKxgEJ$jT3pI7;caHZ1FLR#=v-1*OF@iq&${jiCo^sbv)1ZW0s4zF!%<|80h2xkyE&OzSqph&(lT0ojqGdKMYX$(pyD4A=={`s z$xofhWXDXZTFUsc@qOxhP7{{(sH$baeTLy$ORqB!ACrtC!gK~&k#lP&I+j6jW7U)b%QJdmCu%K8xLy%*xNv*xd%a|g=i{>*honbD z^nMfNC~j+pMN7FLL|hd4&Boc z!_D!4KkUaB>f%T9a@h6hNt_K~MrTi=t1^L-gN;m|By-0P5>d49<&aabnBs^0SH6}E zy9#+j9i)xc@$)D0ICIX+o_*CEuZ}QkY&Nb|(3vlglVd|@f{+Mc)SHL&eO25<0&Sh$ zjLMXIf9WPc-V~M5S(!MUJ)An#ge(hGy&Z2v^j0kq8hWJ*8*d(gW>+V9Qxb@%5fn9o zrm1K~!Gzm1GACFGh9a0^g7`y0(nlo`5+PJg9g>bvz*mVKqod4M*((RY*i+BqhA|d)HjQD&<~)pPqnUo!1WeWrDo@s;oDDN7Glq;T+htG@QfwJfhK~_d z)!i6@rK{I!yUQxrR8&lU&UjvU>2c;wOQG@LW>&qt4|_s8g{zv-#+Vr0B=akqljXTi z4z)XY|3DUB$z#c$b~{t2OSH7L(th5DJGJggH?o)-GX+)iHKrEFqtStIf>Px#_0eKO_S-(|-KuK}g#lLUI30e!kg=S2v*BlI*!pc&$=682;hmWivF@X*UhrUXiy z?@?M`L`P>2s;tLqzkbn^{ibX7K2ha>P!$w4f~pB(V)ZP0axKA@*#zre!7QHuAjx4S z$zh_iJxsGp!DBDLG4DO}3FA4^w40Ket$nSsEDL;|AoeuFbt_M_v42eh!H5@CQ;Dcy zRMA`Z;vM&slzx<8OEJN!S5ZCHy&)HuP0E5bNZCK5wxg1d_WxqQ2~4OeLRAn#4Bi~} zSfY;oYZ55=vVw*t4-SW!2WC!0)dc=<7Y3b)TYfvxTg`X4@e9hcHrJXmL|j+d+I+Iv*bTg2KDgn0?n+gsRXPbYYKiFeY;WU2;1g z9(bMVu75{AoDARrRY>?eaf9xutJ34D)3I#Pd|uzb>aiH@{QcM;I9yT1*on45t?Ki{;q4A!Prlq;exsF8g+xzB+<>9u zIo)q3Nu?@2EX9%|XS^4N@Dhta!`NlK9ioO6J^? zjnD+>1-UsE#*WX%?^iGyb;u&nuPIZ7gull!U=jv>aOSW9o87@(^L#XVPxk}geM#bC zjh;&`iLfk@pEI6iiwap%I9s}*DwLlyp1*9a;OMaymMqL8A<@v+~y*X%}$A~c4NO=n!WpB@0PcRcfqk{{Wfh= zQ8A_%jmI9&;r`j95UN1c6jV(`K`PIT=$CwaOLE<=>58SUjFQe8FEj47a;L+C+jEJgGj_UKjn^%A-x+yy)oWU6 z!D4Oox-D92!D217V6nDl{Wgv7o2*{9MO*de#_u2STXIYK%YOlP3C6N36Tvb70000< KMNUMnLSTZuUdjUi literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/32/list.png b/companion/src/themes/new/32/list.png new file mode 100644 index 0000000000000000000000000000000000000000..3b6f45e451f953745adf24a56b2d4d600121b1b4 GIT binary patch literal 2547 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 JPDHLkV1jeAkk!lvI6;x#X;^) z4C~IxyacIC_6YK2V5m}KU}$JzVE6?TYIwoGP-?)y@G60U!D>@GTJ84< zA3Stga$M{m7qJzUFp!ih19H$g?>7Mt>I_wobhVt0Rkz><5> zXU12?i2)i+)y==Z$y-!pRzoX*iCSC!Ld7Q=ub9~g+$Mm{PD#%TG^s9IF~#h_K9_VQt#fX zzsEScgyLHCj_%QM>(oD)f4Fe=0-tL$+&2cS)C+sE^y$nZfHW!$Li0zgNGd`O1%yxQ$MtQ`yla zvv#T3tABHKTphC|mSvelt0b?=UA%CXZ|v)!l3Tle+V5Pp`T@`D&G+7YnS9-_r|+-) ztF?}@6T0dbvu*pS+9t3_P$;QlVYONOe#V;Z*EY-l`1o&$pe~1rP>1{8+41`mm49=a zF}K!CJr%zPm@rgJTq8)4Gf;HelF{r5}E+d*#rLo literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/32/movedown.png b/companion/src/themes/new/32/movedown.png new file mode 100644 index 0000000000000000000000000000000000000000..03df8294385d2017ef835c0b9fb5609effc36dfa GIT binary patch literal 788 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 literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/32/open.png b/companion/src/themes/new/32/open.png new file mode 100644 index 0000000000000000000000000000000000000000..04914678f170992947fedd58b38a05a24c3fcef3 GIT binary patch literal 2000 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 Y09AhEy7Va`;{X5v07*qoM6N<$f==t<&Hw-a literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/32/play.png b/companion/src/themes/new/32/play.png new file mode 100644 index 0000000000000000000000000000000000000000..fc0f9506f409895525acaafb97790fbe03afc793 GIT binary patch literal 1540 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 literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/32/profiles.png b/companion/src/themes/new/32/profiles.png new file mode 100644 index 0000000000000000000000000000000000000000..03fab9601ac825537cff27e305f7a895e8abdf89 GIT binary patch literal 985 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyacIC_6YK2V5m}KU}$JzVE6?TYIwoGP-?)y@G60U!Dk5ejg!=_p>^@6xAT9$uzd+NQd=qOxIrV?k5VWY3v1@_Hhw zl+n6!6FTx9(FeuMk(1&mbmLS5s+rJ~U{}ZJ=BSt`7^r4g$XVy9nJH<)x~b@s4_BAh zDXmpPK3T7%W<_yjaBV3q`TB+T3vcg?k{;h9Gfhl=F5YqQKET3MA?jc_U2;Og)2Bz5 z9=PLlGRVOt_{gbS$HJTfI(VHMXUT4!vzK}D;-<+vrflw3i#< zeLfott=7%*S;X{_vy+2$;zWh#)>+vqsuBj4R!w`R%$d~ir0t4HK*?vTW$HznH-7xI ziII6?uVu5Fom>wCgME_xXVsoZ`M^L^Epd$~Nl7e8wMs5Z1yT$~28JfO28OzZmLY~_ zR>qcA#s=C3hE@g!M^DargQ6ifKP5A*5=Dclm5Hg9fhk18vv-rP12r&sy85}Sb4q9e E0G(X$b^rhX literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/32/read_eeprom.png b/companion/src/themes/new/32/read_eeprom.png new file mode 100644 index 0000000000000000000000000000000000000000..9e1aa0e2a452d12a8e9bb6616c64380698be86ef GIT binary patch literal 2057 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 JPDHLkV1lM$UxNSu literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/32/read_flash.png b/companion/src/themes/new/32/read_flash.png new file mode 100644 index 0000000000000000000000000000000000000000..2ebd0f34be337103ef4ab1e56903976a1c2d3d79 GIT binary patch literal 2640 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 literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/32/save.png b/companion/src/themes/new/32/save.png new file mode 100644 index 0000000000000000000000000000000000000000..05137c83f0d7327e1c606e859c5928aac3f725da GIT binary patch literal 3767 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 literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/32/saveas.png b/companion/src/themes/new/32/saveas.png new file mode 100644 index 0000000000000000000000000000000000000000..03c95363248b2c535717b73a0257d74c5a822a3b GIT binary patch literal 1682 zcmV;D25tF?P)a&~6!J#)@C-<)%17WkhZ>A!Y(a0hJfd}TWokc$+TE9-F+K*^jrjjSmi z>2#_=Me&H>=FOVrSiE3?lloSx6?VHFHk%EyEbF3a8X}Ph!r?Fm2M2XgRTb@>oxkj> zt-T;g(xcJ2itE`WMV{6_k7w+y?UvcApA_zd87XFpGV>~HijvLxAfZP!bSxH&?wA9h zmfn#b0jR93H0M-TSEJYKEob9$?qmJky(lVK>yn*!q1ss$I(Dl4ifjU42FQp3#uVd) z2|!Vl7#2j~bLk;w$Q~a*F|z~N_C7qneGf)v$e3Eb{>Q47!Br*z-HG6k)5<~7%E%~z zAOKtl5CwAvBR1ApmrP0{!uh zNkrCk$E@Xm%E$F#>D)}L+ue$J(16JsE{eO)z@Q> z+if}*w~2nkOh+}gDkCL`T`Mfu_U;u{2Rt~i*^BDB9JKT}DZx#Kh67+mB(_SGweHT& z7)5HYdpu@bNJ1Ql#?owI?Aqi+%_jr6aLI$WpXmo(GP66TseeLHz9-i>u+WC@qdIsEx7O=k@aXASI1~X_F@5 z^V(W7z3AZuNi0r7eHHSx-8k`e2#1cV*tyz@(rNRNGVTS;TRNm43Wcz8%NF=qkS2@) z{^XAy9h2Mfjz!TyyZ7Vt_b0LMQw5urrC{ca$*_&t%CbU@(WMN^NK4ZJB+UZJh;FXX z+}sQ=qfG=Mw)wUn(ER&hR2>?DW%o+Bb4md&2bTd2jiw$|&BDS$voy!VQw#$}$<>6F z)5Jup*3X9<$8qJ{2iS2i75B|{;K@fOKrXC8jwLnWmYKDK6|Cf0U@(x#VT^cA78>wR3+F6kD zo?)leZMOt1(k`Z=9G?ZeuE!gocO(NIHyZtwETAmd{P0c4qn1Om2}vDGf;jm7>3(pddOHE<8!=fF|U9ety1b z$mbh?yWtpm+x~!OFb5Ovc@ZPhGLvpqJR{=WF<}_r4uAAMW)`_&bCqG@+=rrf zMdJwmHy|Rs)En70ECzJy4TJG}*m&_GKK%GI_?#6eo>CE09d8vc!vOFAUSR{QEG4i!C(-6b{VOt zSgc<(d_G@7=gAz4LKhZIm^Tc-=uxAj((&Vw?Q)rPb#-;=42V%JI!+Yz@hx3s^YZfa zHajZ|V_E-lTN_%S-+6|%fYQau?)uhHKWy!1+2jbu+gUtVX~jlRnZXr1RwL0n0<{rM z_|DtTZfN#Y(7&Ek21H3zid(N;(`Cuzbfj1gGGmAe1!Y7t`-EF#V@Zp)nlV;2t_$5U zjU$?IuCUf`aiX_-I_jJJbcYyLiY-j>4BM-+i`PSV{esK07*qoM6N<$f)yhp8~^|S literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/32/simulate.png b/companion/src/themes/new/32/simulate.png new file mode 100644 index 0000000000000000000000000000000000000000..c67e7cb99d88409ceb349908525a4e8e9a089865 GIT binary patch literal 1925 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 nFflDLIaDzZ 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 bQ-A>gj7vUFY6VE800000NkvXXu0mjffzJi! literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/48/apppreferences.png b/companion/src/themes/new/48/apppreferences.png new file mode 100644 index 0000000000000000000000000000000000000000..be06b9a3f5aed65ae06c72065c2775fe411b39ba GIT binary patch literal 4839 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 literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/48/arrow-right.png b/companion/src/themes/new/48/arrow-right.png new file mode 100644 index 0000000000000000000000000000000000000000..25dfe0dab94d0776c29182fd5cb45abc28823236 GIT binary patch literal 817 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 KMNUMnLSTZ=_%X=< literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/48/compare.png b/companion/src/themes/new/48/compare.png new file mode 100644 index 0000000000000000000000000000000000000000..499c401927a21224104a039b69194f3cca3b836b GIT binary patch literal 3190 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 literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/48/copy.png b/companion/src/themes/new/48/copy.png new file mode 100644 index 0000000000000000000000000000000000000000..49e9835c0a7f5f543c249d563e0caaa086ea2db9 GIT binary patch literal 1521 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 flTm7aCP200000NkvXXu0mjfv%sjK literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/48/duplicate.png b/companion/src/themes/new/48/duplicate.png new file mode 100644 index 0000000000000000000000000000000000000000..903afdd6c52d368b905938a67fa2b1e5addb733c GIT binary patch literal 2191 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 Rlh*(M002ovPDHLkV1li!<^KQx literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/48/edit.png b/companion/src/themes/new/48/edit.png new file mode 100644 index 0000000000000000000000000000000000000000..38bb9d67297b183b6380f5313db7bf86da5011b1 GIT binary patch literal 1981 zcmV;u2SWIXP)qnzJ|=; zVoXQ`O~45rup*K|O(KmoDpRsArHvvsY1*WHoc3Y;vJaD{tsf?(?X>h|(}JS3n>r~; zD=m?xEGAvF1px^!Nobm+5R+ij7+=3%U)%TY+>0To3ls=o=g3Fro|kJqzvus)^W1xZ zXS`5P8kFBSWF?J{R1c{0{}_2D02Yjwb~brry#HJ}Y8^Q+M8`_Za-$6DO zhOE?Z5R{liGBgYR-siA2y@>zr@ajMDT{+y<)ipUVFfdXKA>>PPl^%A_e#CAKLwGQW zTrz=NYQDy&?jrofP1srwVqjZ6-a7Ff8X6kV*4B3X%$YL<4=0K!Ab%N7!&tQw*+dkq z!2~8>GpQ8fGk%n|9>9>f25C`M@9;%0I#JaB>i`Z z=i|r{?<+MKm`3E@1S}0L7%bVY8h`ZYQFL^4Ae~O*#*G^=nM_c~j@nXRs zXeBu@G?j;tk>=-+2tGtf-5!k9?8DpdzK{0ycDP(FoIigar%#_=R6-C0jE|4Q`K=UZ z3w`YKz5jY+LGr)?giS~BnRpZ>wQk&Ucj2A)K7iBdR6+&){r%|c>swSJ5C~vsXb7GA zoalM+3aVXW98G7p9D@2jHoW3i&4sq{%@Mo|r3#-)%gTa95>1oyLUauEZQ&aOW zuQj8i?mv)Hch&m^!HD})yLd@rz22XEII`scO8MQ-f7W~D3;)TovNA}Lgjg(wY&MIk zsw%kMZsp{`<;$1xp=WL^t}P@4z1+m9 zQ>Xff*MI16ICz?-RpT8t4Gw+V0*$d(HG1(+q#;n5zrpP2gw9f@j_LJDxT+^MePc5# zO^%L^j?~oD1j6C);hmLMe7~82EQ%14BFdcm$*!LxseC4%(r47Z*7^!^nHX|uCG;{d zl|=N>XlYOHD~%UUemWN1Qh)`B*4EZZZ%x8$vuO0nSR#@t8VF`Jixh}GmD~lRQPX2G zX^RSiS?xmK=yb5*Ia|>|Fl$+?K-4>I7fhz&fne5pL;sip!4U{;Q9v;3xv78bLD4`k z>%CEd*j=$k2+N^7#N38KFi#`jdLT5Gmm!I9UqA>vus98GzM**wG}q680(=>-BI5Qx~CAT|YHS%{bdkpow;7YwaHe3gHz3W25w zL`f4e=`^HleAN(}2Cy7NDxM}F09W2XAVR9~^AK|cB0`kdOCU0g|hfcFvj*r-S5s_?I74Z>a(+ zDIp}%NJME^?6qK-ka{A`E5U=N$%$lq9$6s=iQxd_3n)v)^>QXV`TKLXu5PIUD=EQ$ z6~pao86?GnM2YQ7l<-5tT!p!^7P6@wrf>wZkXEL=TOLB+1QB@@$L(Pm3BgMsT#q4G z3L2vZrE&(WERzkcCu6jC)t^;1v;6Ay)<$=IxzBDd;TFcsHX~|1X_Oc)smABnHYBE= zgH~oh<#G_CNr*9$E5xkF-t*DOmhOSo>llf3X-EdQLafR9Ei`pyl%S#Sluu7v+ifWOm!9igdN2&puAb|MKc zA*kM0lsNwJeWVTbxI7-?#Nl7OR1^vS{RKOPR#VQsvHvBFmOZT1YrX%P5IloZBBBC?`uch}jB~!<{NZfp zW&kMvM=52=wGyT@1=3Qar6`6>FltMY19QIBwa+B@l?>L&G zS#4`DM%QO3&9=ee+no$eC!Yxb($`Tmr6booL(v+O+3XNfsk;im{{$ESwS^5qWfE^Qmt~F=~TOo&^eOg6eYXw$y9{&L{HYk zDV1u;Iq6h(Go-BO>7;T(6qQ1rwrsn9`~Lp8uFvbb{zaf z*Ub3vH7fvM*DL@)asfb#8|^0m_``VGXBYq$mH~j%)>2VZ7y#H6M=aq-XTA~ZaGa}} zx^Sf=qugXKUAXj5TA9X#Mhgs}mkEV*T5PQG z+#gLi-X)Sry6UDGvPOM}+n(n`xFiP$qSKK>N4HSgPc7zUA7?BBNY?J4@7>WwgK~bmHLr~QqRLEjMQ7I`9Rz@HP+m#t`y@g6SIYi4* zW;P6uzu?P6w{Nh4_`YC}(`qii!$CAQv#kiG%r%SU>fy;YdwA?F+hTvU;^acM;_?7n zmy{T%nVO=ilp?P2!G_1!@T51`p3B>Wg-dr43j+gaWr2ZoVQm(2hE!c%PB+}!(=@#8 z?KIht(<)yb{zDt+Zt*(@w0j;T-@x6!&6)=s>PGQ;9M^q{fA3Hdzd#{|pWlWxQ(vg6 zp#?YShU}?k;7BgbG=oh84_k2xEx(hFkpDS>nt45Fd}1|b>I7PNbHS7QOjT{mcG82Z zHmHYtzi$=*DR4r3D}_v~?*L4h;>7~h@KloJt$WiJ-96|Df)qDZasMiMj#5J15#Zjw znn}rJkaw~L5UmsrEQw#;$MXxPhFj4%>dsCm<-IMW=KUcm8cftE#QrL!cg0V>)i)my zzt$DD#Q}sRUUunVXq*T8YuK&Nu|A4vLXJ*1yuYXa;37z(lu$1HUZO%b=b<)bDF(u3 zkCN*W9HEz2pv!)CD2ooD*KxBNhWkg8$ccg==>-&R9>cjEQVBM561QNBbh{ccqFNX9 z_cth|)EC@a)Bys@qB{pXD=mK*UHh^<;cpyMT6jdg3zb+E64KqFnf&6U;tDnru1r}( zQzCOCFNDS93gzx zQF`!(y2jzJPeT>G29#meATjV5B>VW|M@Yv5;8h62bcJhW81bqf{EQfAd!cyw#xus) zf5hESnvJ(~-RPp#ardY(?4gQT8qEw+(4|Yopr_nwTxQU)`qd-HAILXuuzW&g&hMUKKOler+uTQJ(7a@E z1JlV)g;^HTOD^I30+GU#e@3q@=y}!J-~G>0wy(=TtkqiiJ7PvWfoS?1l;AbK+ehcJ zuhM<8C58h%Z}oReN+@)w8c2R!v8sZm86T(DOmn6$adDa6DvyT*g7zl;Nx}2kfT3u!7gT z5NpQs_xF6cb`p{x(=8)^Dr|3`qO$hPynmnWck(1X0DTAqX0cHQb)57s4au@z;+|F7 zg(3U~RW3>wK1Ib&3=4S~@r~A*CRCzY>4T>Q=!O-)_Tj}t4lT_@lC@prp&vtA9YH1F zoLd&8dPSL}gmZQ;`bsT#y z?)JN7a?v4%3&S+@1xT`1gYS7q&qRrzVH1x@ZZ#iyR^FXccih`!MXmyFrnUbMWiAdJYXWY_|caQ z&R>D(i}4udI6xqc0+nVDZCwa?LIdgS+GX2 z(;Kult|f1D<#AOw@hFi4#O zv7VXBgD!)<=1hdS3*3c8C<(g{-6AfPG7gDn`Y2X%u{&_ zR5r=xw-+k*G^wp3U7Fp4PPkmpT@z}l0^83yo?;=>Ew+!{xVw{{^G?}@T|SGRbBz{c2W9N*>2E#W-R#z} z#D52QhkQ{$CW&S+;5SSne;5OK5XB=g2)aP8|I^azp!6B1#ZK+%U+)xYQXFWj{%yD+E zonf+@ROUw4)}p})gs|6=Z3rOE;>pm{AY-ZAni7c6`%L9ze*yviB4DWa+|*7OCeFXi zpBG*U($7BLl;Q(i_e5@vI}OMsnC&-jg_O8p0GZI=OCzY02!D%ve1O8Af7-kmzCCJR zYu9Kx?<*~b@OyTc0ME4?C>NbG`ZfWyi*#7d?3r}r#3OkT*%aK<`bee18Xn}w{>aM8D5CvH(gSKyv!ENVwoJ6Ykk!%E}%{Po2gGML+u&; z$Z7S$l6Uj~QtHc$P^+4(+L{U=x8HxG1?cs38aiETCw!(OCx)jb z=1;W1uD~lxj27m7uHKdSrj=+ZOjDz!{*}p_5Wg+Fub}Z8{+QjB%P^bM8jEE0xG8dp zI~nZXaKdxXuwshv*M^V^`nq2^{F9B$J^1wv@fve=U-t~VvS=Zq;j#|r{zuuoU1#z+ z-sD6R=^(v!3Qg5eA34dl&AMQZL9G2{ykiEvNwv{Xws^CnmCGuZ%Ext~E_=Ef?Kz1vz#Xbem+ymav!=;C#HZ)+UAB zjM=gsJM8T0m%3K{`LNL5IjSYXbV+WhbNdJj6C`>6ln5`maJmAQ>fUuT9WK(77cMCBEaREX-MGE(> zbT+?Mz717kG{fyAYHd38%0=G%1+{n0tAJQzTI_j}1ygXnC#+UWKN*QlU*~A?p}apv zhE@%A?YXl%5B+(a45be+(=HL$J(o5I(ovTZrCx9JPSCLUy*cD000k?HP{NB+lUWYg zMU+2Wez}pTx&51ixWy*Xvz?Rj-5gR%vc;NR_(HGI>m=DkL|F_1glye;8i=vt)V;g= zWLU3HC-2zgKu&~Bz*GhQ`Hb4_#6*R}#RY;ct>OqE*ULnr>dZo$Vc5J`MZhJ=0wR? zYHKz_5U-W)%Jpa)SysemXYAy#T?2q}4sdjxqL4c0CNdi_>G0HK;B!>3cE8H;xmo=) z_{V=C{zfRJ9bCCcKQ;P0y;v%%J#ugXIJz8OU{{ubHO)*(aa$Nm_({cIVGiFoSpVV( zO6a(b7Mw3uqbHo@=QN*x4j&}!j_)qCGEzdDKtX?A{&Cc%W4%__W1_kRo?7|-$p!pt(Sk405qUk&FZ}|on%n{; zb{2c0KDJQC%e5Iv#-8+>nN?VGQ&g0?p(1ttzz_V3=hd3~RB(~En?ibrdK2ms3Rp(w z@ZGcpWJ0B29?Odie|1hCvSNVDznFm~szXiukAx4rrg?{@GgNPvEue2?ynZq~)q3et z6sziH2ZKud|4Pa^7PnU-4|8|#C51VDY^(UT@sob^D@R$F&IFG;Dyk$S4BK&LKEfi$ z^_2ln6*I}{GcyvL-+ArbUq2=_r^tKhd3)&_*9SKbf9@l|+`j(l^4?pBM`xnA(e;V( zij^UQ;h%m!b~-PvwAwm%=3GuL(}JVAr0kyAZ#n3#PWs?vd$eX!+~RvC)9w2w+%;e4_&KV720*r5urQ$F{|$9Q&MV!w8{ zUorEn(cYdg5e3Z@z|Gm3lk+IYwf zoo?uDvMb5&->#@$X$L1R+-dl-O7^fVm@}vyKHan6dcBxwBmq)agbwHqcAU+aUeF)F^y{8hf27099`yj zr02`Q0;p^2#yE}sJH0af``6wf<)s{7pI4*49GCJRgU^+ZF#$d?$z^HZn;2Du7Em$b z73LRQOOUrcZa(SVLJ7Jbmji8{{WJ&{KxKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=00004XF*Lt006O$eEU(80000WV@Og>004R=004l4008;_004mL004C` z008P>0026e000+nl3&F}000i+Nkl2#+b>AroRXa7id40-TUXUkL7)zy7(o!{qse!t&2zjF>n2*EeG(fEe9 zZ@d6@x(9n7edNEbHrrh^O&f|VO9nC8R7L%(EX&UV@cj)LDVF2@jpMjIIoa9fuI_HP zBFk$wZQY_~@n%rd<-jkWedc_r{YgdX^n+>+K zGzg*y|G)s=dHoG79*_M9-+!$l z%SXOqe$i|;_pQ6>#x#@J3_~}d8#)YK2O$KWmd~|w9UTYm-@N4x8UUP`nS^24XLs%2 zXPem5&U^1WASV+4(%je-GjtugrolfjfO8%XR@K$fwlv$p@$Y{X)3P9nyNl+{vskQF z&@>H(VZhL%gBKf#;aq!rSWYCqf8H!qRGq~w`}gq^do>KhqpGSg9w-`#z$^#^fb)XW$P}WcYZj~ZnMGBLO+0Tx zDrD)T2v2LPkw_#C-m_)%JCoLd!Tx?D)9FNMS$R>K-Tv{e{ri~Iv-+R@WVu-|KU%(M z5j%b~iD4ibi5LKSrUSa1(WfZtW{%_5&7D7=q8S=ALxZMi7`le$<0tgiGiUt?N&4QT zbzso%Z-|6K`JrIYwP0a6&6`XWjSUU&?b^R@6;0E%7OUm(t#{mE>1=NwPX>#cleyXQQ3G8$HJWMnb{ z|4=C*q-m;fNqOKxVU&b_v81%rlAV`}k?08gg9AA7?t6-^>n}_3_$C0sO6cvjrMF2S2*f95U!QRU%=IXa?Z``$i-wh`}`|N0GS(()=2w#laH1GhBh{xe@I;pB z>i#4ii&g1|9!jJt0s!imu?_VAfQNpve`6pJcy&ol4Js-tvG>7xWI8hujf63C=FGxN zg$FRXnETlikJ~AlZYnJ+%VIfJpebrBVd+#@O!NvN$aJ|7@cT)_v5!wk@%S?5hrg<2 zY36^EZ`S% z639zS)by{|lo<#FUcF}VVz_d0@IQZe5jnXzQ^J2K0jZY$hgsC)_!XMV7%C%kA>z+H z$50e?JI8a6%`Yv@uv)Fu#29yFyKwM(D_}8GMt+u+UbcQ694;q*``B+0Ui94&M`@MS zX0_t*Ylo1Vmz#pm3kHLe7Q-(sV7m6;zK3V=CezXR3+89r($c=@BN z`!39IW{#E}!vXy9*#qzvt;c}Ep9f#RZTplfd8$gjkbo=NQvP`R{a!_umz+I)rYjr@ z850xTQFRM=gT*hO_zeIc&_9R|4!(twd1=UNJ&f7u+(qH9IEgRQ6IndZyXO`c7nr4? z(b`F{;)91bK}~2-R0EFm1eVS(MmP{0)hVW9$Ug)ov*=rjv!ZV7!MAQ(j~OCB0bpqw0|668 z^aw;N2U!7pT`@%E7y!)qT8>pN1ztA{w=0Lm?AiG!uBZVa21Y^w*k+9GZwfLPB;q`J zhGZB9LH`gBpbx5S0cVOKU9kNivU+Q)VHj7u8M;yrRBMLj&dz0VRbd|HT)h~FUV06` z*z+V_`u$;awlw0@#~-5Z_B)a1;NVPSL9sy9-`$D+As(D52BBi(>-W7C_^*o@N)?CG z530>9U^K_%_^z+bF0~Qe|n7tH<>`Ihv zsRU6Z%*f8YZqFk>e~u7xHvn=u+s-fJfofS(+_SC{ke8Q(yg4O!^VPS<;H_3Os%z$< z^<*0)Nr9&5&@=-BkuWIN?6FSlnOP{WsNf3c%)V0)gqH!(7aHZSNW=@m)!LcpIJx%fam$King!28#y^S%%ZBQDp3?$Q!~=V;{I|4RFBAUcS*4w zIoVmTJDm9N-Q)0i{Qv-)&5Ww5BKSOAh(#52_Q#-T1~Tm?3?-uAXnKw6C|Vf`h29V? zVtlL|Pr?OHoRjwD9h3+AOGD=PzLOB&oq zPNKUjFb023-&ab8G3bx4Z3%jP@aaLfS9nenl^1wGxtB)ouy6@~D5 zdJr2?&^Z`~q8V_00l!Ys^|1q}JrC^A6h&Fz+tYh05C|9(%Wy@O(bwILpx=+e*@foy zH{Ix{S-IlQ+`PQkd7f`0gcMzlfa+j8?5-%yfX!wD%bRfG({t$S9Ug-(FE2oMdk^9< z1>V8YWX-ah;7>$gVwgHb*WaFW=dfd^EX(q>KCjOgkH@DB55q7J35C$(^C1z7p|reA zShaR-p=c40?RveDPct z`n-LJNea6BacDY0R{AKsnPqQ~HSLXy%?f*W?Cj7~wSHh=ATj>`SUj$uJ#)4t7!2Mh zNm70|6u#Eu@fMYg;2V%Jk2Z!yQlL&b$>K)WXZy8SVR#N#h|gV3x0oeY@VN6 z7 zfl>I4lBOQIoCWCNoez!}hH)Ymivbh`oft5P@jigz3Av%`y8d(|5;3G$3^YaC9@w*+ znIwP^fT1bq8bQwN1(4#(D7?jlWh)lJKM;f@tLO!d#a%svZA9W zn1HSm6u8ph8}>uwxLf0@`r4J&Ld?nhQ6+?Ymkm9wBhd?MB|5UG`o-E^UpqqEGOX&f|4Q^e8YZNIR3V{ zs{UpCIoIX3hj%`x0eIi%^%0ZVjFJWOT^z@~3BZ+n#maHq?;H+Ckst^Nhr=q*^9@tx zz}_Ru+W^)zw{_AmS#&9`Am|^4BFpec73c;*<-$2=>GHzL^WTlB$}3+6e(b7BQSSA5 zy}q`V7F5;LaJ4H}*4oq4&+t6oBM3r!et!OUW?ePQuBs|JJniw3X!M>7Zt5Rc&aVaV z*7B-FdY{M30KiB>L&?>}c)#IOSb6@A5k>hE0OL|2_a0HEeRluu9|J%+$8m2I%`M8v zD=1*2;qZBjTr3ttyQe*9v)eas{-=Nb-FX54q$LkwO{vSen~RxcS7*|{U$ea0;6{@M zZ+vhRy;1gGUpgxtimA|&0^;L@C;)Uqh=BsCU})64(>02y>e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{01e?uL_t(&-nE)}j9t}z$3MSw z?|s|6=UF`-8v`-eK#T&Ih)SvLvX!<08umilBqW5kDyUl;NTVtSLK>RV6tz+kl?D-1 zp%4OMhl(XO7(!z;wjp3}3Q>)hSvp(^UumI3SBM;B=X8hBCHW%6|hu zae7VxZh5PQCd%y}%P)u)SrFmdr@7;dl<Nc{SbCzAXDhv7Mh}VCQE=CIN2UQRUXvxw-V&uf)KYw@>rU2H|&1TGU?R z>dH8mm4}jZouktQ4i^}{agEOUbnf8w4pQbM{ZS1pwy{!Qw5hm=hs*HbUx>uF?5J_u z>MTIEvAh1EXy9J6b;G0FQ5*GVilcxNFe3rHrHAQJ#3ha2g2w-0&>+ABF{_k%f}iC} zeCc|TpWgD?2)CWy?Plq4;SAioZJL!U;ZI8i?lZe}WQ+~dW3dnjiGoL($iO#zf4$)3h1tN(+o$=b24ucfwZ)ZD z9w@YNUU}5x)rcD+Q8g?TAl4wdsRcLZ%;tC2{B$4*?!B8Dz_ap?)PWlrfp^JT+_yVW^4LK_+fRdzRDxi8-yo~%Z=0+>k4BrOe9L& zA_p0P&dAXoL71A+48%f9&&`I8K$VW(=oiHjms~IM_ANUq+_pM@bOvtSSEjwEuy}fc z&DF8`$?6#pC zjaF99K}P@`Aw;u8*t8EMWhCn$3>-Nzjz2Ma{W_7;0XDo<3Hygu-Ofnh|tI!k(%zX+l?!+7(A&q8TSbflMH@1<<`T`^btC zpT9z60wDaGZ3nn(O^G^OJvmrCGj>o@qlSVCUYgPJ2$vYd-Z-IXtZWOIN?Nnyo(ML2 zWvnK6llPC@n#LGaL&Q;WFuJ#TS?QGAzX6*7!n@X#_>Ng|{}7j|SfOT)n(EBKb`*+C zU^Euibw!-jy)Xz3BsI27Dedm)Oq)R<0%};|2tpX2;KuvSUU~hkO6&m2uzGx`a&Fax znpa}AG~$}!=Y13>%0ic#;!!+DKVQv=)kxH+t5Qpp(Sgd9ld$BQs|$pGxpgv_9AvGB z&bp=PZtNvZ59Yyx0Xb2g8uGkRt}-55OAzYKI<|}{0pPvNyT=SH08^ueBl1v$&jDW# z5y?&tOkEs{P&0@X5nkn-i!d_gba+fDE+=j`FWt!E!{sa12bO9a2Pca#^5^O z>!F7T;he+?iHBGluCs+@Kshm16+_l9$)eiYp1{HO=?c$Jczh@=X<8c|(IM1C7#(ND z-@RF05}Mh`rsC?R#Bu6(6SI~I1p{I=s)+}0jMaThdwTK#)Abb7UZo}2HNALjN~prf z-ZB~F>`;v}H4y3vBq(*28Moic^5*f4>@G2Bi2)4M3EmVXoT=dE+vgOV8gT^G#39bs zgo>?otr(2Q%0yz+ z)zC%_Tq%2YS7NG-)Vmc8)K&SvY0rBTo`I^)FrIPHn-dmC0hu|f_-W31>aU^CW=1>znIuIJXBbKVo8+ehK9?$GmRk*jm&NoUS zpE;ojbz>|}^OTwzQ@+_sncoh^>u^jyxHCWu88(oz85?RHBr9ns~JuJJiw^M%D@W zDBuUX4sh+y%ak&XzN`>%u*-KyeL(6Zy@iM=W^8j_ZKtSeASub-jKqXk(UWKeU zPAvxP_QJB~N7?Z90n`i2GXZ&Ns8uC(#YcF&3YgFtIr<{UyJh7!UmE3)UN5seAF?zP z;LPD?-P@!?4ZH~=f{>8w=|a4|7y>nfO@ccQ^%$up%si@x7h(eR2C%5;_?P!8JUmq6 z&yUS>ZSnUvR)$}sOP*{-iwt;Kbwok<$kUXaG(E zP{9cldU*FgRxKWMV$?E=JDxCJ2>8pR-_%aq0I zsqr-P{C3WXDxp?W+6p1rdHSc32pK1o4N8H`v@ZjMY~WZF z8YQqrJ-ruX`}e-^gWp|F*sMZM?cj%#OS=E8+CQ`|0_sRQO(D&Z5aS%YR3u7djzah1N4rj9%lA%Op1SwP z)-UFw7l-(=Nc@=*yD9d)uT};J37o^>i4#y!rekAiF5uXFNH$33_4%po1khrNZNRd8 z$lgi_u}5=4poVh}=ah^%NoVs@8#sc>j0eA8kmu&6H~{?D zxl6cU(*O_j$<0>|*e50iSm)Id2R?1?CdNO!JISKm!gON476wX@FkJIUBM%Ckl63(Y z6T;5+tsDRTp&JDF?Wgzg{DsR7WngyWGwR~%j>Wyt_<_OG5)m{os^0PB{wmasU)yr& z;H)zW2p#0aQBb3^r*B8CgUjUZt2qDZy)(ogG4neA*?wO5ou&L?Y-bF=!Grq;2UeAV z>7>!{BJI!Uhs4LsTtL7%A;1v@M!`AS9CUT}?O4>w)sLPiZ=CbgUN&8HOzR`2OLy5R zQzJY(yno=>vMSSFsB1#fDB#sJ9Wl*4NRC#`9NN511C_&>rL%y>JfP@=j?TUvi@N0x z9$P7Ip8ez=Uc7jD>oc<7dS)*#eexJSJ!zdIqimcU;q>95{zl+ROHj4cU8-th*eA@_ zWlU#cMgZU(VPkF_iI52#c?Z+&ZQ9YfXlr|kOJ7+od)Gg)o6Wy}?81k9>!04k<_lA< zFF#;+?cd4gMu+-4Dxy?l@K`zkF-W}5bnBW)pw5AJQ{p&q=7@J1u4N;& zWZ%T|Ny|q|u5rOABpN zAnokU9V?_bR~!x}j?gKgI3iNQ^QP9;wd~QJRqi{F^vd%9>mPlO&6ghctG_F;_Q^fG z(!k#}W435)n2%TY>kZ}6eOK0TRDe2`R&$yTifq=fyD5E#LtNU_&Em)axg-IChx0vs z-|bx${Pf{onF3h*$Sz*F?D!AwWskLw@1_!lY`t(P0GEtfRN2px%wn#s4)cZTsIHjY zzmIyO-|r9WXrzo}42oUHQ0S6h7P`5&I>bF1GTin*yW+?G_#+GUVjnmj{l?>a*z&1^ zUSZusyLuBRXPa=Q!b(GyA+$9T`vcCbU*H|5wly$&>E)|FGT7YviHCRb>J`U-AUggZ XGwas9vDXfz00000NkvXXu0mjfE_w`p literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/48/information.png b/companion/src/themes/new/48/information.png new file mode 100644 index 0000000000000000000000000000000000000000..d7cb2c22473ddf1a3e7c010f152377c9615de33f GIT binary patch literal 3159 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 literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/48/library.png b/companion/src/themes/new/48/library.png new file mode 100644 index 0000000000000000000000000000000000000000..59122cf0e5640c30c31fd172a90a4a938daa5665 GIT binary patch literal 1961 zcmV;a2UhrrP)A6O6~}+)yfa198(Nv`w7`5|IdY4N$6(P!>p$3MlFViAY%iVuREb>|g^6 zgwzFsO|w9P1Qu0AC4@jFD~M<-SR@urV@OiPNr;_{J$~=qb6C7LGtc80+cSY6q#Vh* z|99q`d++(U=YAL-(Ia|9kLVFS0LjA~Y^V}(=A~yjb^K}ePETOwo7NS9dL!f2U;K?9 zy!LLJ|KFHsH~RWl4)CMzeg^6Zjl^-canO$e!<$eKz}t>5)3tXF9r_?DqR=$^AUJ*CTf%9%Ag^7rZ|E2YmU?x2X=lGG2=S+6H{@r3tRx zHKIs9w4L% zlLwD5yyqzO%WvjZ3Al%@9@z+cQU?!sWC$e#a7crZ1e=H#Z;&;X6jdN}3vHR#`Q5^v zWm=nloRK|;Nf+kS)BCtq5YPKG2NAT{mU%s~fTc?y5w}ZOgtH;w`(ie(7~18bKwf6*8)*8P;seyp6ECfs_mohcq$LK(kyb znddD)*5uLVmHB{YfSXztsE&=XVDzaI)aNdc-2FQe4I`fAVkkmbg}d=K!bpH} z1P(n_V|d$RP`}GF$3BU8szW!B<7V9k&d}@N5|o$!l*h(ZU0*mJa@d z;6e1dMgRi1<)La%zF7G=F7wL#2f>5r8Pd519JkO6%cd$uFPVPvKzf}i_W$ow&^FCDSh+NYAyS3W?*M z;vz_~0h#I=+~(z5ST~t|@j!Z>0i~k^=6OimTK81(um+cTy=3~ugXo$4zgHoV)=Nx# zAMgOa>53tM{|~B=w62Ry zT;}zX=@$>8XD)bg4vqnmB!H*5M7W6qPPYsDCNK4U;r{eQ)I}^{VI?=<;K9QjKk+QL z8-F6Q8*hm4B8U`m(^3p|6|c;H5ZsrZyye0O<>8C5dJ~JlQ_c~GmBG2#q;!y2!p@IC86bVG_lwBj!#0CU!uDG?o z2Ow>Z31ot2b>H!iE9n%GUxZwOai3dJS&gLPJTWEL&XuppdbG*AQ${HThBw2;r)TkY!oq?xLzO5ETPPz);CMO;TWl z{NF^qyxxlhXaLKsKBYIk-zc0!6h)bcWFq2moWFKNQG|#fhYlTLYHEs^nHfR|?Ay1G zD2i}*YPA}>ckga_ZPf@N^f}-4DT>y$Eg>R=5SX2vC5j?0UAn~l{QRn1 v?u)i<+x9>cE>jdm+`M`7Ki1zPdYJTYE~{8q*ycB000000NkvXXu0mjf94o~M literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/48/list.png b/companion/src/themes/new/48/list.png new file mode 100644 index 0000000000000000000000000000000000000000..564d76118b4859943657b05d395e2ba13a6c3b79 GIT binary patch literal 4904 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 aH7hVNIxsNi?vvL50000!iX#- z-+ap+G1esOn2DT0$!|KpzrN?5_de%+?s=Z`zVAKfo|}TVw-OURDhvRCm^IGAiHnH8 zA;{0&-FS9xbAj)&nVlH`JijmU`y!Z|gRVPSVS&27W6RtG=8bc*1AwR#06<9qfL$&{ zSptACuFDD$08n`VAQe>9;)v!R@L#gEvHUJ1O))W zerpRemn+lE{Mf76Te3Y~GmCZcHepk`@BQB;bPG4vuVxfEzQEd)tPJ!nS&rNAOAF>b zFJl}s0G$_Y=dtrGg(`ILh~#B7^w}G#<|}K>)LAYc19i;HD24=S-;QX z&`;fHQx6EvHvRoDcQNwK3~O;GW|}rL^MnnaIzICGNB`^0O)1ur$1r3qWkw>AC}`e2C6`aOyAV?d9pf}Hm2!8pQ6V9szw7&=8d!%))= zs9wK5SuGlIz_8|-7w4l8QH!m{zDYb9WYHfj?K^(96ub?_j|c!sEjg5V4qawlKVVg9 zxUp_b@lgkj8tjoAxU}eG(hhv#YvnC6qkHF+FjDS3bEBN3CJsOT@giH#k2hT|43{jR zWPp&yfmnr&uCcO!29b|#PLyHumO>*i{o3FX{!!j)DnEo3F)QCeHNPG4W6~(?q(0JF z{fh|3@9J`kGa5=7D_j!@FKm2uJsCIwIM#~(+&VvdZ4WJE_}zV9s(&wvcuM@{8ZwPJ z{`PB@@;IRJfuERsSD`_K4nxg%{xk1k8}>M$_+$Wi2nIS%%`AHEX+o)6xtwbmxn8J6 zm`w?SBFRU*++W?Pc+ibjXokyR?8O(I(9m(-N!}u!w1UQ0x5R-7d<x#7IGDN;>W=jP%C+{1n`Tg7g938JJ z-Atl3h0GUh3Ulhv8g87RDsKu-rc}Mr$^poB3^j0!B*YTc(76}I#423TY@iKhY7F;A zjXu@9#yMB&0GE^CntS^!Zp8UaJP^|ZS;gMGIBB!=C8_GgX5y@mY1c1mTZgp^jHBrT zbkV~_2@p~}XVRqn-}d>L8|%@}RvXU}?PI&h9-=P1w#5@)Eers+Z8Kpdc*Ub{t$zY? zbcWyl>~Ri%sxk z_#I_j1u{Mkm$$X9$o`m>S!0Q}S)p>MBPtb_H|XmJIps%NKaHuR8BskP^C+>_4S(KM1c?MKUL@UbO)ms#pH5tSk-m|e*?G3XR?tD)b zWF2g=5h2`0rH7WH2Kk>f8alTgTG5fj$dlFa$ok2K+7n`af8T)R;g1WeiJ>e<{-AGP z%{Sjq4IRA2?7B<0{P%lsrGu&@*r#M}gQRAze}mz8?|j#%#Y7yr)jeKX(j!zh-H6;ypN;FkIwnN5LgX3~X?sw46-(nXU71F&@#z^-j>pe;( znAaisI70wettXJzj%IjJKEhFm-17(&3oeBBZU#UQ#2G!CTXZX8~1kB zmUbb@n1xHLtU{N#rht-_*_yw$j$9NJ4Gvq{y1!G|JNr4Ue1q0l1My!fIZDE=veAowEsvWkUN z#cta`X>z9d(|F#ccezb2xxJg68D}qPxg_o7c4zN4f&5_M*xldE_cOow&Ha80z@}~5 zrfq10ejR^I6)DfeuJa4s?T{Bh^6Qu`;dK!KiO2bup;6zy&-LyNAAnN2u_I6ypha+8 z0QE%D2JWnb2#_X9TQ50K^A2r7{zyFH2_dch^J!%c)XM-GV3Ko1fM*+ozlGTLxwio@;G?v;WYZ$L~bI%1(jZ zkMw#+@9G3#>JQ&F=dPapzE=GDr9YQ%p|V}luU@=h6cE*>vD~5}n1b(r9rWapaOS}l zh)p>X(O1<~#|OSs5kkg1l(k}1^-$Hc#*|_XL{Z6!tmwyKT{pYF;FzF zp{+>}ezUk}Vm=MT(wr$tqW;6_6IR{I_W4r-D#q9#aaE(+c7!e-XD0zH7EDnT^`FnZ zZ8cPyAA0?a>JV&*T{|@~k@Q{5^F+{{!%mL@JexBmLC}BuaXZ*lOo4^-By7|M>_ zn(RWf`0K;M)F?oOTc*IoU;Okv%U5&s0J%7tlDfKdPY z^V1erch`5UU!{Z^TOR1vl#cCdh^4+-#o96ECPsiglQkg|f8~oaRzpc%?_tLLy_|gP znL)ddJ1j<`iWF;Gn(}TJpIH;bU?HC|*+}}(muIbpPpP$D$X>aS>3a0wPpovPLddar z@OwU=0dwhbll|1Mef6Q`HQ^hwhhKTCkFAc8c(5nY*10`U@iXJY)opYAn~y9%CsxC@ z@5q~dAV7#(@x$Mqv;2(VIq!N7pS&jo^ia_*Bx8oxDC;{=RiVQ5ec|L{OrwtT=8t>2QCLzt?~|#9~#Vb9(ejcyKw8p zNP7YZlDsUDX;u6*n41b-d>{Zz5SJOmm~AnL_;Lu_760#OQ^W@bPzzDEax4;R6@o>j zsp10#SP9{N`<%~AG*!H(B$gG$eHn@niW0kkD9NG#WC(=_yB{S0Du56LQ=+I(Jo{4g zzFj9~ul;qhbmQufCl`0$>U&6g%7i{|hhxXTdq$PhgWa00000NkvXXu0mjfo-#8P literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/48/moveup.png b/companion/src/themes/new/48/moveup.png new file mode 100644 index 0000000000000000000000000000000000000000..c2668e845c1c98901eeab864ddbac79efd66f0ca GIT binary patch literal 1504 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 literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/48/paintbrush.png b/companion/src/themes/new/48/paintbrush.png new file mode 100644 index 0000000000000000000000000000000000000000..8f90906c72f2f27eeed152fbb94fe40d1f81a747 GIT binary patch literal 2704 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 KMNUMnLSTYkvp7@$ literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/48/paste.png b/companion/src/themes/new/48/paste.png new file mode 100644 index 0000000000000000000000000000000000000000..2198b77c0694ac7b3d25a0e42054597b632c9089 GIT binary patch literal 1594 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 bp_Jmkv*)Ci@mN1w00000NkvXXu0mjfaA3B# literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/48/print.png b/companion/src/themes/new/48/print.png new file mode 100644 index 0000000000000000000000000000000000000000..5586786e2965365c0b9207d2b3528ca9bad29b14 GIT binary patch literal 3006 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 V^>ZOV3i)e;E&hR!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq8sKd6mGxU^Rn*LA+qju0R_G1}4b> zpAc7|f>AKYLx7QkS?Gc@8iKePBFL4mg6sukmB`|7Hc$ba4Pmfa3UQSI6Ac5zx8h*oIwm#akN~!DEUb_v6Pj<{G63fUunXV~h zAQyLhzKF%<#R8>jIiH^&x3^`{c)p+Ka$U>5p1Ykjr+r>Zdqqt4wcPmQIMD5kN#5=* zo7QHX2j&0<&H|6fVg?3oVGw3ym^DWNm<236T^vI^jwdHbu$r*+_y{;`VN*+U6G&h* zioAKl(qiX=M|W&^c=pur{9$TxI;8aHgp|a=DH;OZo!%Z^p2jCmoZ5IwTSH58b;qhx zD_0t4ab#vCUSF_w@#^L0l`;}CQgV{AmaRIeoRycDdFaHV)YRTs=GDCu*Y*na&)u|l z26OYG#j2}UOrE@1XtBxSZtXJOymvw0XujExGsjt6g;wybC^ z()4cmY24oK65;Ol(Up7SF%1_@Bg3P|6tfcqSsQ;e_QiQMC@HfDtZnqT~(L58g`dX(|D?VR!cZWEB;K^ zvcy|=GCwOWT)%L}GOdu+%a<%sc*1h!*y0ms*97laBXHOAw7Fip+jXvm7n-KBdQX`m za`2mmk-?VrQF{}3XR$ro`g%dCw)2(=buzE3D&^$zHuyK>`Cmz0;r5m3<nC}Q!>*kQ8buZnV4D`m_jr>dpG$yPy>UftDnm{r-UW|+eEO{ literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/48/read_eeprom.png b/companion/src/themes/new/48/read_eeprom.png new file mode 100644 index 0000000000000000000000000000000000000000..a7ef5d2c09687054bc316f3108ca5261bd223146 GIT binary patch literal 3779 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 z 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 literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/48/save.png b/companion/src/themes/new/48/save.png new file mode 100644 index 0000000000000000000000000000000000000000..20352a4f9b93825fd4bd6109d8b360a70524a2a6 GIT binary patch literal 4499 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 literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/48/saveas.png b/companion/src/themes/new/48/saveas.png new file mode 100644 index 0000000000000000000000000000000000000000..f44fdb0b747d4e7f80fe21ebeb5fccf73815760e GIT binary patch literal 2936 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 RD}Mk0002ovPDHLkV1nrA1uXyo literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/48/update.png b/companion/src/themes/new/48/update.png new file mode 100644 index 0000000000000000000000000000000000000000..27112e871ee56338816d6881b615ba6c3aecdb1c GIT binary patch literal 2915 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 Q7ytkO07*qoM6N<$g8IL-UH||9 literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/48/write_eeprom.png b/companion/src/themes/new/48/write_eeprom.png new file mode 100644 index 0000000000000000000000000000000000000000..1c873f8e088da8f5d438f70250daed55ef1611bf GIT binary patch literal 3691 zcmV-x4wUhUP)Px#AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_000eO zNklVl9kx<6}0ssqjII7X>0h8 z+Hf5gvC}5*9}SQIEs&yUQpast$4LE=&no71~#S$skjzsa6NUnG;_v9YjKgCk8nmi{jv=++Yk~So_48125o*EFrXAu>$r{JdSC&EdZ8% z(Slw4wgC*Wjd%(Fctr~Q?BBQ!^DTVM0$?ye2VnQ20gk;dU;_AWc96~ScV1Bf&%QwT z#&PytYY|N*0G%;t7N9?dZ{Z-0eLx});6LyU#(3e15is7tSB$fGz+^y!0XhS;E*SOO z@e@3TKf(RzhxKa`qqrSI*aCdUkI_5t`V!aP-WJ@}(_Q%blTXbJ1T?*FuVKb64EyZ87gPY)`x@|4%>?Qy%^a7YeNjzSRDHkDF- zZFL9%DVz{LTs9-5T?*mKjDA6-dbe&69I zxPP~f;E@^wR<^OlKYWX|f9w+4y=N~W1RHo>_;W>39`bs~C@jlFxm-rAUWX_M&{mfuLtm?Vl>wYW5P0aXgVf#k_N%YbbM<gg_ z0z^>&&kNvr3fpF|Z3~1Dhz=2i5O9Qp=n&T~#uzB25Cj1l;h_Ui83Sbmj@x#iZf}w7 zVzJw_tnRtF*$0co5@boTLZQ%7Qa)&w&6kk27~-oq|B(VW@7cpsj_!9j9A9<0UH5xD zJ|c<&I6^L##aalS=Rr6QJWoLgfn^$CjKLvE5JeG|WkZoAP@ad;Xh3j?5O@KKqQIqe zVq6hWFB>2dLHFJRkQEto^K%$FJA`;50n;=Q@CRrp9BQwKDU@}FB?~B;_~nNR+`9jE z40v7I}RIynd`I^Ya6<5%wuA{w1Wu~dS`?Z(#5P7n~BpFEFDb{v)g zR3+pf2bmW?;>B%gU<&k-Kp^1%c6WErx9`30!KQ0l+o8w; z91aI4ja^~fWSv~_Onz)UoX=H_d#t#=n}MiBIS5D11K2s~`t24eu> z2y6!E4IR~54V7{km1+$QT?1nb9Ho#P5(Ghj-|vScIpFbnAxqN55)(iOL2+dTk=8Dx z3URE&V(_(g58RcbFWQ|q1z2(t(LM?~GVL2L&3hO1r7(-^c z0Ed*u*w`qVn(lny>#N=8{Rg^Y$yK z=uY5buQA4Ixm@m_nmsG~_a6MSM7E&L%?}K4)oQgCjYdoBJK%D;_Qm5%J%rZ5xe-4ghHA zI*O$dVzC$|&Yi>f_yiVXi)*DLD{#47=4u|9&9XWe+DIRNO7Lym| zXNc431;N{f<9CXV-QBCPJZRP@cjx*XrG} zEL3YXEG;b|o6AB~RlND;FEBnaf#u~4O2r}=W3Vh9s;cMf_4+@ks`?Beq+}Q&`vjK)ANm#cCdXD=-+z2C%@a@mSRuGx6_@Ru{My!>C^@OXTIP&l%B=JdNikHr>z zmSu;|of`$E0u-kYlau36oL&f`6DLpp62U+a*F=KIXA|(aUHHPSci_6~ZbW&th@R{E z;0px6fkD$W@RVX|dK#%z3b|}{ea8&LK&@7LyH=|`?e%(x+-^7O_4?|{%8F^4X5MBP zp_Hpcqfx};aeUZ0PzZ&Bn*gAtWmD>wy}MW5ICkW8y;f5dSze4S%)h=`Dm_>(S8f^} z8Z>J))kBDgbUFpE*NO){=$cmJ zD77U?B9y0PkH_r}hr@+hO+CMTdyn(=W1fkI-Uvn_k-~B&^RliR_sFvI-l4N+^66A+ zgCx1+g@rkAlp?*LD2j~Et~3^6NgRLke;~^;vdbATwszW*)WXS=FOYu zrlzJhghByv`}Xbmk#y$(wzRZlR?C&)wzf9+FWx9Wm$2hsoSd9^Y-D)wbZl{9 zrzk2-7cNX;!-kDWrE?e?9RvfzYIzlmG1#^ZP1CZ~YV}`j+y39~?r!$L0}lw*YSlP? z{CFjs%_bX-M#;8qJCn)$zwc=u5D*<=Wqf?h8Hq%iD&^9G!{KP-c|JfX=WC8c3OC+( z@~V|pf& zVfYPvK!8%3ef`+c{#-7%AW4e2xUkq;C=}ePszs-!qOGH&qY*-g%c&@t=H}*@+wE?q z9E6*1zB!)D7nXxT|KZ)cch}#2_gC|qHnvPO1%pR&x%_Fv(El!<%l;&v&$d%aw^){S zj4?L0W5*8r(4j+oyr#_`B7y0t$r^wG0NB3$h6^vh{8BX@ zUyL_j)8gqL==TFUBQkv=N>WcUG5A=jWL3a4?;rXel>0~(4 zr0?IqUwh@%SI;#^LRqzQ%Rnr)Fh~foTrL-X_uY4s`|i7sJ9X-mHaa>QHwIjZr$1?4-5=c5{U%SG<_(Y$=p6Sd!fy; zOrol4J(-AS-EP-*kK4sR{P4rka}(#vUazOVY11YHz?|3X)pzaMwYj6C!}aX5&z4kG zjR9B&U`|d>ev<4TEpR!@%jqfr%+6k@s%rhYWHMp2cWl9l6DMY}%V{-{NGwiINA*g% z)Rssj^YqyB z5{xk<5^)Ux=I3TGKR5IIrJsg|hJK!1P8U~KODpk2f@RXlwpc7?7E7y(ZEdYO$8lS# z)hfJR?-XNfbzx!QQwP5U{cSJs>!ef3$#S_|vnxbaqD5wB?qTO?xTF<<6Wr zod+=Q_xo#8Q&XSitv`E2QC$DS)7{;(xxHhHpW`?#7z}>i(XMip-zokNl{0f_&Ho*J z0000bbVXQnWMOn=I%9HWVRU5xGB7bTEif@HF*#H*HaasoIx#sbFflqXFcNgwLI3~& zC3HntbYx+4WjbwdWNBu305UK!G%YYOEipM%F*Q0gH99agD=;xSFfiuslh*(M002ov JPDHLkV1lK9@>>7^ literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/48/write_eeprom_file.png b/companion/src/themes/new/48/write_eeprom_file.png new file mode 100644 index 0000000000000000000000000000000000000000..57804bd689266d439c0bcfb52578e96972ee8bff GIT binary patch literal 5345 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 literal 0 HcmV?d00001 diff --git a/companion/src/themes/new/48/write_flash.png b/companion/src/themes/new/48/write_flash.png new file mode 100644 index 0000000000000000000000000000000000000000..3600b5e37bcde3e67d54e9b0fdf077e74c2a6337 GIT binary patch literal 4735 zcmV-_5`gWAP)Px#AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_000qm zNklX`I01##P6D>E%T(g9+KG+JsfttO zKroQR*s&{)j2#Cs*aRnD5(i9hFtNcPHcJReNWe&=Wi;AHGnzN^_PciHk2eTL(n!W- zs@zq#-m822_Bmgl)90M;TzD79KYx8qR^z{kCMtcN4&i zFTC*8R4Vn0M<0E3767lYoa?xr2Ux3JmT3Ju4q(sl@b^>{y;3ff#sJvGJcfb4rH?y# ziU~gYI}PCcRp)=~>JNVKJ@eu+Qc zypIhhnYbOnE!@Hy8nxmkA*sC+Iq!-EK7PZ;yHoM_R|@$_4j&wYNZz#d-<-eX;0!P9 z1OA+Ad5Zr~3g?~3`i*_>RAYYs+1X;Lw84;iZWt&mv#Qp8xTrcFR;RXjD{vp*VHKYi z68G1U^{%*3pkza)q3KY6|AM);6(bjWNp!qEd3tLf0Y1m|e48=g^S@O9mtArxy|d@E zY#-d-^vv_mZ3pz7|~ z#p1rzb`D;s(njVEK8ly-GeFMz=3_3mVpok9qkqVYX6ULe)Ma3#9QNI zRQV?^5GI>TrII0~rIN|m390V{vlff_mHGTwLpq(f?a-majmIV$MzQ9*EmgNRYwdGu z6Te*h>}rHqHat9ho?)6P%d|jBq%_#SXPC*6G4i8FS)5&m^W-~J9^m^V_#qEQQ6l5I z?l%j?BR9SH(z6SWpLT)^Ng-AqI(%qJdt2)hXU*wdb^RwlJ+SuqpSQ&#CwA>dFbs*b z!gOrXIgdZCK81Wn&8S#)spQkIEoJK$8X$cNEBJ8M4+cqQciVQdanO(fKZ?Ulbu7msnn{dD8hDZf*`>6eL^olxjt8RK1t)h zOw61nHEft2XV2aSuD!37mu^XNN`~+}T$o)?G8w#7i(%#Wa@xyCDvXY-MdeBzGnW7i zaP(@)D=*FGyz|cG{1wabT$k^UE#i~6|B&umN9*PGaU;Gqpzpe!ErwzA0neTk!06aG z$xIp@Dz*>rprdyVLCqx$LiP;pVdU@#T5HnT3}^KAA`p0B;4WTRyOvs|ieVT?DM7$1zgo}P{r#-E;604z^L+HG7#BWL1OL?ePhRct z+Sq#ud>^D>&(IJrKmP*7ViB!1?KcYku}340cR>NYqczrd@11sg+97UlZ|^b;BP|U{ z5QGeD*~(K-K1sD)!7vPL+s3wSVonUlvUzRutNi?DPtw%X%;o;CFt(nChH}A!1dh4sdTEz_X9lFW8Dic zq9TP55JeHyYL!Z*La9`uQmLS|X7A7*+|pWlUn-nb=-bD(565`$QAw#-VsvDLS2w(Z zWGYx`jZ%tYS@7KvpzXx>&Eb%?)`Qdd!ZZL%M3U^|}cVOa)=WDEeuac~?5 z!!Qs+kV>VHLNY7&Iy`@B<@F`-Q0+Y8P7CRDiY>2hMym+RGO-nh1Qx%rGk_atu;aj4jeduVHu2H>W$L(fB_NrW-lvI;*$!^a#SMH?4H-fe5e5-aR2KkK z)#lW%@B0Kb7ZJ_u{1YD%+%wouSToo^JjCNac?7>w!;v;_&BOD9Y3shZL9Z6|37K3s zfa^}Dn$rN(O{wramyV83AbnHZLdFeJhd2t%+SDW(HR!*e>vIg6K06EjV$ zFijLtDinxZA1fAT_3G6O4sK_3-vjZ?bb)Jk zdemxl*N9ZW?4B+bEL_OJ{RbHzAE$rOB3hc8*)cG{#KZ(q6e0jSW-{ONLA*s2{Pzi- z+}h}VHVsf%TcXto-=Fg*2tq_J0aVL)H*c>@JM$9zH zkEYmivB9~|MsMv}0%|o-kwz>lE=7>1MtfydsxLkOYi>gre*7q19ql}!7P0u8Ey!1=5L6)92Er6fPUcCa;zUu7!((I2Uof9i zseoVdu$!AXxHr$vojYl0XdsbFl1q=$IPkV$a|JxSZ7#lll(QF{$?n1JCqDyCjZH`) z@O+;j3JC%q%QDI3a`bd}lS!vZr&BcKa%9tKvgtIfvu2S za^J><x}H0N00AVENeYt%T+gMizmIG-i|_ed+~C0& zV8Gs+GyLGCg+x(=K=^n6-CZ+>(dEmRAFwQ|SgqEOQsOu^@kETKrY4$NX3^Tw&aBop z+B-Yw?C7Msql4C2v+8WDrG=p(c+kF(=$bmwYkI86!ui7xg2KS{LrSFz$#fFivFqVe zXsWdup6^qxRA_D~()&gUBozO|atk_NR!I0Wj2479Shus5>6bog95VSP6h#|Jk z3}D%^W#pfl(84g#x*kEoC}478l8NynNNLd8Hj8X7hg)+Af)MFQ%vlMrZA28}A$WA7 zMd`vE4}7Z3g8!{>*#$#<<53%#6(|(|8m%;xB1)4*JkP^03@Vip=c^&g7g>BIHJ=w= zva#(t{k3cxqUe84X@NU#yH#KM{`Y%c7yybOsxdZlgsoe)LR8Pb!@KveWW`c!+eQe` z2~cOnp*e$$6oyh5Qu1t3a#=pZ{nw6id+76w$T4`pMnn-3LF9%+uZ<(Uh+?@!Dv_jZ zR-TRveC{4y$s2>sxb8TnX`{8q5RybXF@8LN6N;EzCM$%7FbFw(@DPIogS0l+iM$~V znwy*1ykR4a4LO96h)9BvIDl!Gn3jz&OoV_vqYjrn-No%R^Z9E^IF5-Oi($uN7*2if z8imckFJI!wzJqjh6u9t)B=_FGldYTHK+1Y)uav?vEaFbQbV>^VWHZ^y$k-T4DMm&{ z@H~&niAlPdRhQgx3)$~@vuN3MZL7uD1y)@ z7PmoY45QwSgSrx7wMJ00K$=8Rh#@6TJWePen&KF$64e6&0&QF9C_)DzRjmj`y%rSG z;Qd!!j$sDAkVqsBo)$oc z?_%$f5puaKhYydSErAxGY5`g*v}It#Vz^O+fxt3Myi%DU0>d;>VF0x zkeYm<$evvXP%0vqYao%a(2!sp_gQnwr#%CiOa|Mwk)|Zqoa3woXE8RBCz22f zI52jEbC)dU==eBFX@t_qa)ezBFp43@q=!`uu}UGj=%I@qRv?kJ2y=%~MgU z7Mf%xK_ZzTiXybGw^%I8ps^{3Wtha1anPDdwT5LH^>RcAq9{aqA(qlqwZ^nee9xb1 zkQtOJWdadlCoJ5WOQ}+%R+DwwAtjN}XemjjoA)<0w|$Y5j2S2`L`em$FMzV?A{ePic40swI7rI)0J_YFN%Diu3x zRqxQedGl}deYbMcP1h|O7#N6+j*e0&6!3k&9;+=2%d(E~XCVa25GVnXdS@?@NRrLg z&si)MBW5{tb#&6y)TD$EBWu=t{Zsq)?f;BrS>vs39rxXF=bd+4aml4KerWiAoOkQm zKG##T0000bbVXQnWMOn=I%9HWVRU5xGB7bTEif@HF*#H*HaasoIx#sbFflqXFcNgw zLI3~&C3HntbYx+4WjbwdWNBu305UK!G%YYOEipM%F*Q0gH99agD=;xSFfiuslh*(M N002ovPDHLkV1nO+*fIbB literal 0 HcmV?d00001 diff --git a/companion/src/translations/companion_pl.ts b/companion/src/translations/companion_pl.ts index 90dce07cb..ddf91dee7 100644 --- a/companion/src/translations/companion_pl.ts +++ b/companion/src/translations/companion_pl.ts @@ -2061,119 +2061,119 @@ Jesteś pewien ? MainWindow - - - - + + + + File loaded Plik załadowany - + Display previous warning again at startup ? Wyświetlić poprzednie ostrzeżenie przy uruchomieniu? - + Checking for updates Sprawdź aktualizacje - - - - - + + + + + Unable to check for updates. Nie mogę sprawdzić aktualizacji. - - - - - + + + + + Save As Zapisz jako - + Executable (*.exe) Wykonywalny (*.exe) - + New release available Dostępne jest nowe wydanie - - + + No updates available at this time. Brak aktualizacji dostępnych teraz. - + Would you like to launch the installer? Chcesz uruchomić instalator? - - - - - - - - - - - - - + + + + + + + + + + + + + Error Błąd - - - - - + + + + + Error opening file %1: %2. Błąd otwarcia pliku %1: %2. - + Compilation server termporary failure, try later Serwer kompilacji chwilowo nieczynny, spróbuj później - + Display previous message again at startup ? Czy ponownie wyświetlić poprzednią informację przy uruchomieniu? - + Compilation server temporary failure, try later Serwer kompilacji chwilowo nieczynny, spróbuj później - - + + Compilation server too busy, try later Serwer kompilacji zbyt zajęty, spróbuj później - - + + Unknown server failure, try later Nieznany błąd serwera, spróbuj później - + Firmware %1 does not seem to have ever been downloaded. Version %2 is available. Do you want to download it now ? @@ -2183,31 +2183,31 @@ Pobrać teraz? - - + + Yes Tak - - + + No Nie - - + + Release Notes Informacje o wydaniu - - + + Do you want to download release %1 now ? Chcesz pobrać wydanie %1 teraz? - + A new version of %1 firmware is available (current %2 - newer %3). Do you want to download it now ? Jest dostępna nowa wersja firmware %1 @@ -2215,401 +2215,432 @@ Do you want to download it now ? Chcesz pobrać teraz? - + Ignore this version (r%1)? Zignorować wersję (r%1)? - + Release notes contain very important informations. Do you want to see them now ? Opis wydania zawiera bardzo ważne informacje. Chcesz je przeczytać teraz? + - File saved Plik zapisany - + Firmware updates Aktualizacja firmware - + Current firmware does not provide release notes informations. Aktualny firmware nie zawiera opisu wydania. - + Cannot write file %1: %2. Nie mogę zapisać pliku %1: %2. - - - - - + + + + + Taranis radio not found Nie znaleziono Radia Taranis - - - - + + + + Impossible to identify the radio on your system, please verify the eeprom disk is connected. Identyfikacja radia niemożliwa w Twoim systemie, proszę sprawdzić podłączony dysk eeprom. - - - + + + Backup is impossible Backup jest niemożliwy do wykonania - - - + + + The backup dir set in preferences does not exist Brak ustawień ścieżki backupu - - + + Warning Ostrzeżenie - + Conversion failed Konwersja nieudana - + Restore failed Zapis nieudany - + Backup failed Backup nieudany - + Copyright - + + OpenTX Companion - FW: %1 - Profile: %2 + OpenTX Companion - FW: %1 - Profil: %2 + + + + &Setting... + &Ustawienia... + + + + Edit Settings + Edycja Ustawień + + + + &Downloads... + &Pobieranie... + + + + Download firmware and voice files + Pobierz firmware i pliki dźwiękowe + + + Configure transmitter start screen... Ustawienia ekranu startowego radia... - + &Configure connection software... &Ustawienia oprogramowania łączącego... - + + New Profile + Nowy Profil + + + + Create a new Radio Setting Profile + Utwórz nowy Profil Ustawień Radia + + + Classic Klasyczna - + The multicolor classical Companion icon theme Wielokolorowy klasyczny wygląd ikon Companion - + A monochrome black icon theme Monochromatyczny czarny wygląd ikon - + A monochrome white icon theme Monochromatyczny biały wygląd ikon - + A monochrome blue icon theme Monochromatyczny niebieski wygląd ikon - + Small Małe - + Use small toolbar icons Użyj małych ikon paska narzędzi - + Use normal size toolbar icons Użyj normalnych ikon paska narzędzi - + Normal Normalne - + Use big toolbar icons Użyj dużych ikon paska narzędzi - + Big Duże - + Use huge toolbar icons Użyj olbrzymich ikon paska narzędzi - + Huge Olbrzymie - + System default language Podstawowy język systemu - + Use system default language in menus Użyj podstawowego języka systemu w menu - + Czech Czeski - + Use Czech in menus Użyj Czeskiego w menu - + German Niemiecki - + Use German in menus Użyj Niemieckiego w menu - + English Angielski - + Use English in menus Użyj Angielskiego w menu - + French Francuski - + Use French in menus Użyj Francuskiego w menu - + Italian Włoski - + Use Italian in menus Użyj Włoskiego w menu - + Hebrew Hebrajski - + Use Hebrew in menus Użyj Hebrajskiego w menu - + Polish Polski - + Use Polish in menus Użyj Polskiego w menu - + Portuguese Portugalski - + Use Portuguese in menus Użyj Portualskiego w menu - + Swedish Szwedzki - + Use Swedish in menus Użyj Szwedzkiego w menu - + Russian Rosyjski - + Use Russian in menus Użyj Rosyjskiego w menu - + Manuals and other Documents Podręcznik i dokumentacja - + Open the OpenTX document page in a web browser Otwórz stronę dokumentacji OpenTX w przeglądarce - + Set Icon Theme Ustaw wygląd ikon - + Set Icon Size Ustaw wielkość ikon - + &Settings &Ustawienia - - + + Radio Settings Profiles + Profile Ustawień Radia + + + + &%1 %2 - - - - Companion - Models and Settings Editor - %1 - profile %2 - Companion - Edytor Modeli i Ustawień - %1 - profil %2 + Companion - Edytor Modeli i Ustawień - %1 - profil %2 - - - - - Companion - Models and Settings Editor - %1 - Companion - Edytor Modeli i Ustawień - %1 + Companion - Edytor Modeli i Ustawień - %1 - + A new version of Companion is available (version %1)<br>Would you like to download it? Dostępna jest nowy Companion (wersja %1)<br>Chcesz ją pobrać ? - + A new release of Companion is available please check the OpenTX website! Nowe wydanie Companion jest dostępne, proszę sprawdzić stronę OpenTX! - + Firmware does not longer fit in the Tx, due to selected firmware options Firmware już nie mieści się w pamięci radia ze względu na wybrane parametry - - + + Compilation server requires registration, please check OpenTX web site Serwer kompilacji wymaga rejestracji, proszę odwiedzić stronę OpenTX - + Firmware does not fit in the Tx, due to selected firmware options Firmware już nie mieści się w pamięci radia ze względu na wybrane parametry - + Do you want to write the firmware to the transmitter now ? Chcesz wgrać firmware do radia teraz? - + The selected language will be used the next time you start Companion. Wybrany język będzie użyty po ponownym uruchomieniu Comapnion. - - - + + + OK OK - + The new theme will be loaded the next time you start Companion. Wybrany wygląd będzie użyty po ponownym uruchomieniu Comapnion. - + The icon size will be used the next time you start Companion. Wybrana wiekość ikon będzie użyta po ponownym uruchomieniu Comapnion. - + Open Otwórz - - - - + + + + Read Models and Settings From Tx Wczytaj Modele i Ustawienia z radia - + Write Models and settings from %1 to the Tx? Czy zapisać Modele i Ustawienia z %1 do radia ? - + The file %1 has not been recognized as a valid Models and Settings file Write anyway ? @@ -2618,516 +2649,509 @@ nie został rozpoznany jako prawidłowy pli Modeli i Ustawień. Czy mimo wszystko zapisać? - - - - - - + + + + + + Backup Models and Settings From Tx Zbakupuj Modele i Ustawienia z radia - + Cannot check Models and Settings compatibility! Continue anyway? Nie mogę potwierdzić kompatybilności Modeli i Ustawień. Kontynuować? - + The transmitter firmware belongs to another product family, check file and preferences! Firmwqare radia nalezy do innej rodziny produktów, sprawdź plik i preferencje ! - + The transmitter firmware is outdated, please upgrade! Firmware radia jest przestarzały, proszę zaktualizować! - + Write Models and Settings To Tx Zapisz Modele i Ustawienia do radia - - + + Write Firmware To Tx Zapisz firmware do radia - + Cannot convert Models and Settings for use with this firmware, original data will be used Nie mogę skonwertować Modeli i Ustawień na ten rodzaj firmware, zostaną użyte oryginalne dane - + Restore Models and Settings To Tx Odtwórz Modele i Ustawienia do radia - + Could not restore Models and Settings to TX. The models and settings data file can be found at: %1 Nie mogę odtworzyć Modeli i Ustawień do radia. Plik modeli i ustawień mozna znaleźć w: %1 - + Firmware write failed Zapis firmawe nie powiódł się - + Could not write firmware to to transmitter. The models and settings data file can be found at: %1 Nie mogę zapisać Firmware do radia. Plik modeli i ustawień mozna znaleźć w: %1 - + Cannot backup existing Models and Settings from TX. Firmware write process aborted Nie mogę zbackupować Modeli i Ustawień z radia, Zapis Firmawe przerwany - + Save transmitter Models and Settings to File Zapisz Modele i Ustawienia z radia do pliku - + Impossible to identify the radio on your system, please verify that the eeprom disk is connected. Identyfikacja radia niemożliwa w Twoim systemie, proszę sprawdzić podłączony dysk eeprom. - + Read Tx Firmware to File Odczytaj firmware z radia do pliku - + OpenTX Home Page: <a href='%1'>%1</a> Strona domowa OpenTX: <a href='%1'>%1</a> - + The OpenTX Companion project was originally forked from <a href='%2'>eePe</a> Projekt Companion odłączony z oryginalnego <a href='%2'>eePe</a> - + If you've found this program useful, please support by <a href='%1'>donating</a> Jeśli uważasz, że ten program jest użyteczny, wesprzyj poprzez <a href='%1'>donację</a> - + Version %1, %3 Wersja %1, %3 - + About Companion O aplikacji Companion - + &New &Nowy - + Create a new file Utwórz nowy plik - + &Open... &Otwórz... - + Open an existing file Otwórz istniejący plik - + &loadBackup... &Załaduj backup... - + Load backup from file Załaduj backup z pliku - + &Save &Zapisz - + Save the document to disk Zapisz dokument na dysku - + Save &As... Zapisz j&ako... - + Save the document under a new name Zapisz dokument pod nową nazwą - + Lo&gs Lo&gi - + Ctrl+G - + Open log file Otwórz plik logów - &Downloads and Profiles... - &Pobrania i profile... + &Pobrania i profile... - Firmware and voice file downloads as well as profile definition. - Pobrania plików Firmware i głosów jak również definicje profili. + Pobrania plików Firmware i głosów jak również definicje profili. - + &Check for updates... &Sprawdź aktualizacje... - + Check for new version of Companion Sprawdź nową wersję Companion - + Show Companion contributors list Pokaz listę twórców Companion - + Show Companion changelog Zobacz zmiany w Companion - + &Write Models and Settings To Tx &Zapisz Modele i Ustawienia do radia - + Write Models and Settings to transmitter Zapisz Modele i Ustawienia do radia - + &Read Models and Settings From Tx &Wczytaj Modele i Ustawienia z radia - + Read Models and Settings from transmitter Wczytaj Modele i Ustawienia z radia - + Write Firmware Zapisz firmware - + Write firmware to transmitter Zapisz firmware do radia - + Write Models and Settings from file to Tx Zapisz Modele i Ustawienia z pliku do radia - + Write Models and Settings from file to transmitter Zapisz Modele i Ustawienia z pliku do radia - + Save transmitter Models and Settings to file Zapisz Modele i Ustawienia do pliku - + Save the Models and Settings from the transmitter to a file Zapisz Modele i Ustawienia z radia do pliku - + Read Firmware Wczytaj Firmware - + Read firmware from transmitter Wczytaj Firmware z radia - + Configure software for reading from and writing to the transmitter Ustawienia oprogramowania do odczytu i zapisu radia - + &Read/Write &Odczyt/Zapis - + Write Zapis - - + + Invalid Models and Settings File %1 Błędny plik %1 Modeli i Ustawień - + Invalid binary Models and Settings File %1 Błędny binarny plik %1 Modeli i Ustawień - + Contributors &List... &Lista twórców... - &Old Preferences Dialog... - &Stary ekran preferencji... + &Stary ekran preferencji... - Used the old Preferences Dialog - Użyty stary ekran preferencji + Użyty stary ekran preferencji - &Application Preferences... - Preferencje &Aplikacji... + Preferencje &Aplikacji... - Edit application preferences - Edycja preferencji aplikacji + Edycja preferencji aplikacji - + ChangeLog... Zmiany... - + Firmware ChangeLog... Zmiany firmware... - + Show firmware changelog Zobacz zmiany w firmware - + Compare... Porównaj... - + Compare models Porównaj modele - + Customize the splash screen of your TX Personalizuj obrazek na swoim radiu - + E&xit Za&kończ - + Exit the application Zakończ aplikację companion9x - + Cu&t &Wytnij - + Cut the current selection's contents to the clipboard Wytnij zaznaczenie do schowka - + &Copy &Kopiuj - + Copy the current selection's contents to the clipboard Kopiuj zaznaczenie do schowka - + &Paste &Wklej - + Paste the clipboard's contents into the current selection Wklej zawartość schowka na aktualnej pozycji - + Ctrl+Alt+W - + Ctrl+Alt+R - + &List programmers &Lista programatorów - + List available programmers Lista dostępnych programatorów - + &Fuses... Ustawienia &mikro-kontrolera... - + Show fuses dialog Pokaż okno ustawień mikro-kontrolera - + &Simulate &Symulator - + Alt+S - + Simulate selected model. Symulacja wybranego modelu. - + &Print &Drukuj - + Ctrl+P - + Print current model. Wydrukuj aktualny model. - + &About &O aplikacji - + Show the application's About box O aplikacji companion9x - - + + Recent Files Poprzednie pliki - - + Firmware Profiles Profile firmware - + Set Menu Language Ustaw język menu - + &File &Plik - + &Edit &Edycja - + &Help &Pomoc - + File Plik - + Edit Edycja - + Help Pomoc - + Ready Gotowe - + Unable to find file %1! Nie mogę znaleźć pliku %1! - + Error reading file %1: %2. Błąd odczytu pliku %1: @@ -4766,180 +4790,81 @@ p, li { white-space: pre-wrap; } - - + + Support for frsky telemetry mod Wsparcie dla telemetrii FrSky - - + + Support for jeti telemetry mod Wsparcie telemetrii JETI - - + + Support for receiving ardupilot data Wsparcie dla otrzymywania danych ardupilota - - + + Support for receiving NMEA data Wsparcie dla otrzymywania danych NMEA - + Support for telemetry easy board Wsparcie dla platformy TelemetrEZ - - + + Support for MAVLINK devices Wsparcie urządzeń MAVLINK - + Rotary Encoder use in menus navigation Użycie pokrętła do nawigacji w menu - + Possibility to enable FAI MODE at field Umożliwienie uaktywniania tryb FAI w menu - + FAI MODE always enabled Tryb FAI zawsze aktywny - - - - - - - Enable heli menu and cyclic mix support - Uaktywnione menu Heli i wsparcie dla cyklicznych mikserów - - - Enable TEMPLATES menu - Uaktywnienie menu szablonów + Enable heli menu and cyclic mix support + Uaktywnione menu Heli i wsparcie dla cyklicznych mikserów - No splash screen - Bez loga na ekranie + + + Enable TEMPLATES menu + Uaktywnienie menu szablonów - - - No flight modes - Firmware bez menu faz lotu - - - - - - - - - In model setup menus automatically set source by moving some of them - W menu ustawień modelu automatycznie wybierz źródło poprzez poruszenie nim - - - - - - - - - - - Use alternative SQT5 font - Użyj alternatywnego fontu SQT5 - - - - EEprom write progress bar - Pasek postępu wgrywania EEPROMu - - - - - No Winged Shadow How High support - Bez wsparcia - Winged Shadow How High - - - - - No vario support - Bez wsparcia wario - - - - - No GPS support - Bez wsparcia GPS - - - - - No gauges in the custom telemetry screen - Bez graficznych wskazań telemetrii - - - - Allow compensating for offset errors in FrSky FAS current sensors - Pozwolenie na kompensację błędów w czujnikach natężenia FrSky FAS - - - - OpenTX for FrSky Taranis Rev4a - OpenTX dla platformy FrSky Taranis Rev4a - - - - Use FrSky Taranis sticks in a 9X/9XR - Użyj drążków Taranisa w 9X/9XR - - - - OpenTX for FrSky Taranis - OpenTX dla platformy FrSky Taranis - - - - - Disable HELI menu and cyclic mix support - Dezaktywowane menu Heli i wsparcie dla cyklicznych mikserów - - - - - Disable TEMPLATES menu - Dezaktywowane menu szablonów - - - - - Disable Global variables - dezaktywowane zmienne globalne + No splash screen + Bez loga na ekranie @@ -4948,63 +4873,162 @@ p, li { white-space: pre-wrap; } - Disable curves menus - Bez menu krzywych + No flight modes + Firmware bez menu faz lotu - - - - - Support for radio modified with regular speaker - Wsparcie dla modyfikacji radia zwykłym głośnikiem - - - - - - - - Used if you have modified your radio with voice mode - Używane jeśli radio jest zmodyfikowane w calu użycia komunikatów głosowych - - - - - - - Used if you have modified your radio with haptic mode - Używane jeśli radio jest zmodyfikowane do użycia wibracji - - - - - - - - - Battery graph - Grafika baterii + + + + + + + In model setup menus automatically set source by moving some of them + W menu ustawień modelu automatycznie wybierz źródło poprzez poruszenie nim + + + + + Use alternative SQT5 font + Użyj alternatywnego fontu SQT5 + + + + EEprom write progress bar + Pasek postępu wgrywania EEPROMu + + + + + No Winged Shadow How High support + Bez wsparcia - Winged Shadow How High + + + + + No vario support + Bez wsparcia wario + + + + + No GPS support + Bez wsparcia GPS + + + + + No gauges in the custom telemetry screen + Bez graficznych wskazań telemetrii + + + + Allow compensating for offset errors in FrSky FAS current sensors + Pozwolenie na kompensację błędów w czujnikach natężenia FrSky FAS + + + + OpenTX for FrSky Taranis Rev4a + OpenTX dla platformy FrSky Taranis Rev4a + + + + Use FrSky Taranis sticks in a 9X/9XR + Użyj drążków Taranisa w 9X/9XR + + + + OpenTX for FrSky Taranis + OpenTX dla platformy FrSky Taranis + + + + + Disable HELI menu and cyclic mix support + Dezaktywowane menu Heli i wsparcie dla cyklicznych mikserów + + + + + Disable TEMPLATES menu + Dezaktywowane menu szablonów + + + + + Disable Global variables + dezaktywowane zmienne globalne + + + + + + + + + Disable curves menus + Bez menu krzywych + + + + + + + Support for radio modified with regular speaker + Wsparcie dla modyfikacji radia zwykłym głośnikiem + + + + + + + + Used if you have modified your radio with voice mode + Używane jeśli radio jest zmodyfikowane w calu użycia komunikatów głosowych + + + + + + + Used if you have modified your radio with haptic mode + Używane jeśli radio jest zmodyfikowane do użycia wibracji + + + + + + + + + Battery graph + Grafika baterii + + + + + + Enable the throttle trace in Statistics Uaktywnić śledzenie gazu w statystykach - + Support of FrSky PXX protocol Wsparcie dla protokołu Frsky PXX - - - - - + + + + + Support for DSM2 modules wsparcie modułu DSM2 @@ -5015,16 +5039,6 @@ p, li { white-space: pre-wrap; } Twoje radio prawdopodobnie używa złego firmware, wielkość eepromu jest 4096 ale tylko pierwsze 2048 jest używane - - - - - - - - PPM center adjustment in limits - Limit dostrojenia centrowania PPM - @@ -5032,109 +5046,8 @@ p, li { white-space: pre-wrap; } - - - PPM values displayed in us - Wartości PPM wyświetlane w us (mikrosekundy) - - - - - - - - - Symetrical Limits - Limity symetryczne - - - - - - - - Pots use in menus navigation - Użycie potencjometrów do nawigacji w menu - - - - OpenTX for 9X board - OpenTX dla platformy 9X - - - - - SmartieParts 2.2 Backlight support - Wsparcie podświetlenia SmartieParts 2.2 - - - - - - - - - In model setup menus automatically set switch by moving some of them - W menu modelu automatyczne wybranie przełącznika w przez jego poruszenie - - - - - - - Enable resetting values by pressing up and down at the same time - Szybkie nastawianie wartości -(+) a (-) neguje wartość -(+)a (UP) ustawia max -(-) a (DN) ustawia min -(UP) a (DN) ustawia 0 - - - - - - - - - No graphical check boxes and sliders - Brak graficznych chekboxów i sliderów - - - - - - - - - Don't use bold font for highlighting active items - Nie używaj podświetlenia dla wybranych aktywnych elementów, mikserów, krzywych, expo, etc - - - - OpenTX for M128 / 9X board - OpenTX dla platformy M128 / 9X - - - - - - - EEprom write Progress bar - Pasek postępu zapisywania EEPROM - - - - - - - - Imperial units - Imperialne jednostki w telemetrii - - - - Bluetooth interface - Interface Bluetooth + PPM center adjustment in limits + Limit dostrojenia centrowania PPM @@ -5143,41 +5056,152 @@ p, li { white-space: pre-wrap; } + + + PPM values displayed in us + Wartości PPM wyświetlane w us (mikrosekundy) + + + + + + + + + Symetrical Limits + Limity symetryczne + + + + + + + + Pots use in menus navigation + Użycie potencjometrów do nawigacji w menu + + + + OpenTX for 9X board + OpenTX dla platformy 9X + + + + + SmartieParts 2.2 Backlight support + Wsparcie podświetlenia SmartieParts 2.2 + + + + + + + + + In model setup menus automatically set switch by moving some of them + W menu modelu automatyczne wybranie przełącznika w przez jego poruszenie + + + + + + + Enable resetting values by pressing up and down at the same time + Szybkie nastawianie wartości +(+) a (-) neguje wartość +(+)a (UP) ustawia max +(-) a (DN) ustawia min +(UP) a (DN) ustawia 0 + + + + + + + + + No graphical check boxes and sliders + Brak graficznych chekboxów i sliderów + + + + + + + + + Don't use bold font for highlighting active items + Nie używaj podświetlenia dla wybranych aktywnych elementów, mikserów, krzywych, expo, etc + + + + OpenTX for M128 / 9X board + OpenTX dla platformy M128 / 9X + + + + + + + EEprom write Progress bar + Pasek postępu zapisywania EEPROM + + + + + + + + Imperial units + Imperialne jednostki w telemetrii + + + + Bluetooth interface + Interface Bluetooth + + + + + + + + Global variables Globalne zmienne - + OpenTX for 9XR OpenTX dla platformy 9XR - + OpenTX for 9XR with M128 chip OpenTX dla platformy 9X z układem M128 - + OpenTX for Gruvin9x board / 9X ie: OpenTX dla platformy Gruvin9X / 9X - + Support for SD memory card Wsparcie karty SD - + Support for DSM2 modules using ppm instead of true serial Wsparcie modułu DSM2 przez użycie PPM zamiast prawdziwego szeregowego - + OpenTX for Sky9x board / 9X OpenTX dla platformy Sky9x / 9X - + Enable HELI menu and cyclic mix support Uaktywnij menu HELI i cyklicznych mikserów @@ -5365,27 +5389,27 @@ p, li { white-space: pre-wrap; } ??? - + ??? a>x - + a>x a<x - + a<x |a|>x - + |a|>x |a|<x - + |a|<x @@ -5405,47 +5429,47 @@ p, li { white-space: pre-wrap; } a=b - + a=b a!=b - + a!=b a>b - + a>b a<b - + a<b a>=b - + a>=b a<=b - + a<=b d>=x - + d>=x |d|>=x - + |d|>=x a~x - + a~x @@ -5917,21 +5941,21 @@ p, li { white-space: pre-wrap; } openTx dopuszcza tylko %1 punktów dla wszystkich krzywych - - - - + + + + OpenTX on this board doesn't accept this function OpenTX na tej platformie nie dopuszcza tej funkcji - - + + OpenTX doesn't accept this protocol OpenTX nie obsługuje tego protokołu - + OpenTX doesn't allow this number of channels OpenTX nie obsługuje tej ilości kanałów @@ -5978,6 +6002,21 @@ Zespół OpenTX/Companion. Use Trim from Flight mode %1 + Own Trim as an offset Użyj trymerów dla Fazy Lotu %1 + Własne trymery jako offset + + + FW: %1 + FW:%1 + + + + Pict: %1 + Obrazek:%1 + + + + Profile image + Obrazek Profilu + Setup @@ -5987,107 +6026,114 @@ Zespół OpenTX/Companion. Formularz - + Model Name Nazwa modelu - + Timer2 Timer 02 - + Timer1 Timer 01 - + Throttle Source Źródło gazu - Switch startup Warning - Ostrzeżenie o przełącznikach przy uruchomieniu + Ostrzeżenie o przełącznikach przy uruchomieniu - + Center beep Pikanie przy centrowaniu - + Trim Increment Kroki trymera - ON - Włącz + Włącz - + OFF Wyłącz - Check - Sprawdzenie + Sprawdzenie - + Model Image Obrazek modelu - + + Switch Warnings + Ostrzeżenie o przełącznikach + + + Exponential Wykładnicze - + Extra Fine Bardzo dokładne - + Fine Dokładne - + Medium Średnie - + Coarse Zgrubne - + Extended Limits Rozszerzone limity (125%) - + Extended Trims Poszerzone trymery - + + Display Checklist + Wyświetl Czeklistę + + + Throttle Trim Trymer gazu - + Throttle Warning Ostrzeżenie o gazie - + Reverse throttle operation. If this is checked the throttle will be reversed. Idle will be forward, trim will also be reversed and the throttle warning will be reversed as well. @@ -6097,10 +6143,25 @@ Wolne obroty będą na górze, trymer i ostrzeżenie o otwartym gazie również - + Reverse Throttle Odwrotna praca gazu + + + Pot Warnings + Ostrzeżenie o potencjometrach + + + + Manual + + + + + Auto + Automatyczne + Telemetry @@ -6565,168 +6626,450 @@ Wolne obroty będą na górze, trymer i ostrzeżenie o otwartym gazie również appPreferencesDialog - Application Preferences - Preferencje Aplikacji + Preferencje Aplikacji - + Simulator capture folder Katalog zapisu symulatora - + Remember simulator switch values Zapamiętaj ustawienia przełączników w symulatorze - - - + + + + Open Folder Otwórz katalog - + User Splash Screens Użyj ekranu powitalnego - + + Edit Settings + Edycja Ustawień + + + + Application Settings + Ustawienia Aplikacji + + + + Simulator Settings + Ustawienia Symulatora + + + Blue Niebieskie - + Green Zielone - + Red Czerwone - + Orange Pomarańczowe - + Yellow Żółte - + + Radio Settings + Ustawienia Radia + + + + Mode selection: + +Mode 1: + Left stick: Elevator, Rudder + Right stick: Throttle, Aileron + +Mode 2: + Left stick: Throttle, Rudder + Right stick: Elevator, Aileron + +Mode 3: + Left stick: Elevator, Aileron + Right stick: Throttle, Rudder + +Mode 4: + Left stick: Throttle, Aileron + Right stick: Elevator, Rudder + + + + + + + Mode 1 (RUD ELE THR AIL) + Mod 1 (SK.SW.Gaz.Lot) + + + + Mode 2 (RUD THR ELE AIL) + Mod 2 (SK.Gaz.SW.Lot) + + + + Mode 3 (AIL ELE THR RUD) + + + + + Mode 4 (AIL THR ELE RUD) + Mod 4 (Lot.Gaz.SW.SK) + + + + Channel order + +This is used by the templated to determine which channel goes to what number output. + Kolejność kanałów + +To ustawienie jest używane przez szablony, określa jakie wyjście przypisane jest do kanału. + + + + R E T A + K W G L + + + + R E A T + K W L G + + + + R T E A + + + + + R T A E + K G L W + + + + R A E T + K L W G + + + + R A T E + K L G W + + + + E R T A + W K G L + + + + E R A T + W K L G + + + + E T R A + W G K L + + + + E T A R + W G L K + + + + E A R T + W L K G + + + + E A T R + W L G K + + + + T R E A + G K W L + + + + T R A E + G K L W + + + + T E R A + G W K L + + + + T E A R + G W L K + + + + T A R E + G L K W + + + + T A E R + G L W K + + + + A R E T + L K W G + + + + A R T E + L R G W + + + + A E R T + L W K G + + + + A E T R + L W G K + + + + A T R E + L G K W + + + + A T E R + L G W K + + + + Default Stick Mode + Bazowy mod drążków + + + + Settings Profile + Ustawienia Profilu + + + + Splash Screen + Ekran startowy + + + + Channel Order + Kolejność kanałów + + + + Append version number to FW file name + Dodaj numer Firmware do nazwy pliku + + + + SD Structure path + Struktura karty SD + + + + Select Image + Wybierz obrazek + + + + Offer to write FW to Tx after download + Zaproponuj zapisanie FirmWare do radia po pobraniu + + + + Remove Profile + Usuń Profil + + + + Clear Image + Wyczyść obrazek + + + + Firmware + Firmware + + + Include companion splashes Załącz ekrany powitalne - + Only user defined splashes Tylko własne ekrany powitalne - + Splash Screen Library Biblioteka ekranół powitalnych - + Files to keep Pkili to zapamiętania - + Simulator BackLight Podświetlenie symularota - + Automatic Backup Folder Automatyczny Katalog Backupów - + Only capture to clipboard Przechwyć tylko do schowka - + Joystick Joystick - + Find Executable Znajdź plik wykonywalny - + Google Earth Executable Plik wykonywalny Google Earth - + Calibrate Kalibracja - + Enable Aktywowany - + Show splash screen when Companion starts Pokaz ekran startowy przy uruchamianiu Companion - + Automatic check for OpenTX firmware updates Automatycznie sprawdź aktualizacje firmware OpenTX - + Automatic check for Companion updates Automatycznie sprawdź aktualizacje Companion - + Offer to use wizard for new models Zaproponuj użycie konfiguratora dla nowych modeli - + Enable automatic backup before writing firmware Uaktywnij automatyczny backup przed zapisem firmware - + Select your snapshot folder Katalog zrzutów - - + + No joysticks found Brak oysticka - + Select your library folder Wybierz katalog bibliteki - + Select your Models and Settings backup folder Wybierz folder do backupowania Modeli i Ustawień - + Select Google Earth executable Wybierz wykonywalny plik Google Earth + + + Select the folder replicating your SD structure + Wybierz folder do zreplikowania struktury Twojej karty SD + + + + Not possible to remove profile + Usunięcie profilu jest niemożliwe + + + + The default profile can not be removed. + Podstawowy profil nie moze być usunięty. + + + + Error + Błąd + + + + Cannot load %1. + Nie mogę załadować %1. + + + + Open Image to load + Otwórz obrazek do załadowania + + + + Images (%1) + Obrazki (%1) + avrOutputDialog @@ -7930,20 +8273,20 @@ m2560 dla platformy V4 Odwróć - - + + Load FW Otwórz firmware - - + + Load Pict Otwórz obrazek - - + + Load Profile Załaduj profil @@ -7968,51 +8311,93 @@ m2560 dla platformy V4 - + Open Otwórz - - - - - - + + + + Error Błąd - - Could not find bitmap to replace in file - Nie mogę znaleźć bitmapy w celu zastąpienia pliku + + Cannot load embedded FW image from %1. + Nie mogę załadować wstawionego obrazu FW z %1. - + + Cannot load the image file %1. + Nie mogę załadować pliku obrazka %1. + + + + Cannot load the profile image %1. + Nie mogę załadować obrazu Profilu %1. + + + + Cannot load the library image %1. + Nie mogę załadować obrazu biblioteki %1. + + + + File Saved + Plik Zapisany + + + + The image was saved to the file %1 + Obraz został zapisany do pliku %1 + + + + Image Refresh Error + Błąd odświeżenia obrazka + + + + Failed to refresh image from file %1 + Nieudane odswieżenie obrazka z pliku %1 + + + + File Save Error + Błąd zapisu pliku + + + + Failed to write image to %1 + Nieudany zapis obrazka do %1 + + + Could not find bitmap to replace in file + Nie mogę znaleźć bitmapy w celu zastąpienia pliku + + + Open Image to load Otwórz obrazek do załadowania - + Images (%1) Obrazki (%1) - - Cannot load %1. - Nie mogę wczytać %1. + Nie mogę wczytać %1. - - Could not store image in firmware file %1 - Nie mogę zapamiętać obrazka w pliku firmware %1 + Nie mogę zapamiętać obrazka w pliku firmware %1 - The image file %1 could not be stored - Nie mogę zapamiętać pliku %1 + Nie mogę zapamiętać pliku %1 @@ -8182,172 +8567,133 @@ p, li { white-space: pre-wrap; } fwPreferencesDialog - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CheckBox CheckBox - + Set language of voice. May be different from firmware language Ustaw język komuniaktów głosowych (). Moze być inny od języka firmware - SD Structure path - Struktura karty SD + Struktura karty SD - + Processor ID ID procesora - Default Stick Mode - Bazowy mod drążków + Bazowy mod drążków - Channel Order - Kolejność kanałów + Kolejność kanałów - - Mode selection: - -Mode 1: - Left stick: Elevator, Rudder - Right stick: Throttle, Aileron - -Mode 2: - Left stick: Throttle, Rudder - Right stick: Elevator, Aileron - -Mode 3: - Left stick: Elevator, Aileron - Right stick: Throttle, Rudder - -Mode 4: - Left stick: Throttle, Aileron - Right stick: Elevator, Rudder - - - - - - Mode 1 (RUD ELE THR AIL) - Mod 1 (SK.SW.Gaz.Lot) + Mod 1 (SK.SW.Gaz.Lot) - Mode 2 (RUD THR ELE AIL) - Mod 2 (SK.Gaz.SW.Lot) + Mod 2 (SK.Gaz.SW.Lot) - - Mode 3 (AIL ELE THR RUD) - - - - Mode 4 (AIL THR ELE RUD) - Mod 4 (Lot.Gaz.SW.SK) + Mod 4 (Lot.Gaz.SW.SK) - + Options Opcje - Channel order This is used by the templated to determine which channel goes to what number output. - Kolejność kanałów + Kolejność kanałów To ustawienie jest używane przez szablony, określa jakie wyjście przypisane jest do kanału. - Open Folder - Otwórz katalog + Otwórz katalog - Offer to write FW to Tx after download - Zaproponuj zapisanie FirmWare do radia po pobraniu + Zaproponuj zapisanie FirmWare do radia po pobraniu - Save Profile - Zapisz profil + Zapisz profil - + Menu Language Język Menu - + Voice Language Język komunikatów - + Firmware Type TYp Firmware - Append version number to FW file name - Dodaj numer Firmware do nazwy pliku + Dodaj numer Firmware do nazwy pliku - + Download Voice Pobierz Głos @@ -8357,204 +8703,170 @@ To ustawienie jest używane przez szablony, określa jakie wyjście przypisane j Pobrania i profile - + FwInfo Informacje o Firmware - R E T A - K W G L + K W G L - R E A T - K W L G + K W L G - R T E A - K W G L + K W G L - R T A E - K G L W + K G L W - R A E T - K W L G + K W L G - R A T E - K G L W + K G L W - E R T A - W K G L + W K G L - E R A T - W K L G + W K L G - E T R A - W G K L + W G K L - E T A R - W G L K + W G L K - E A R T - W L K G + W L K G - E A T R - W L G K + W L G K - T R E A - G K W L + G K W L - T R A E - G K L W + G K L W - T E R A - G W K L + G W K L - T E A R - G W L K + G W L K - T A R E - G L K W + G L K W - T A E R - G L W K + G L W K - A R E T - L K W G + L K W G - A R T E - L R G W + L R G W - A E R T - L W K G + L W K G - A E T R - L W G K + L W G K - A T R E - L G K W + L G K W - A T E R - L G W K + L G W K - Profile - Profile + Profile - Open Image - Otwórz obrazek + Otwórz obrazek - Splash Screen - Ekran startowy + Ekran startowy - Clear Image - Wyczyść obrazek + Wyczyść obrazek - + Download FW Pobiesz Firmware - + Check for updates Sprawdź aktualizacje - + Last downloaded release: %1 Ostatnie pobrane wydanie: %1 - + The selected firmware has never been downloaded by Companion. Wybrany firmware nie został nigdy pobrany przez Companion. - + The selected firmware cannot be downloaded by Companion. Companion nie moze pobrac wybranego firmware. - Select the folder replicating your SD structure - Wybierz folder do zreplikowania struktury Twojej karty SD + Wybierz folder do zreplikowania struktury Twojej karty SD - Profile name is empty, profile slot %1 will be deleted.<br>Are you sure ? - Nazwa profilu jest pusta, slot %1 będzie skasowany.<br>Jesteś pewien ? + Nazwa profilu jest pusta, slot %1 będzie skasowany.<br>Jesteś pewien ? - Open Image to load - Otwórz obrazek do załadowania + Otwórz obrazek do załadowania - Images (%1) - Obrazki (%1) + Obrazki (%1) - Error - Błąd + Błąd - Cannot load %1. - Nie mogę załadować %1. + Nie mogę załadować %1. diff --git a/radio/src/eeprom_conversions.cpp b/radio/src/eeprom_conversions.cpp index ab81d93bf..349d685a8 100644 --- a/radio/src/eeprom_conversions.cpp +++ b/radio/src/eeprom_conversions.cpp @@ -439,7 +439,7 @@ void ConvertModel_215_to_216(ModelData &model) sw.v2 = oldModel.customSw[i].v2; sw.delay = oldModel.customSw[i].delay; sw.duration = oldModel.customSw[i].duration; - sw.andsw = oldModel.customSw[i].andsw; + sw.andsw = ConvertSwitch_215_to_216(oldModel.customSw[i].andsw); #if defined(PCBTARANIS) uint8_t cstate = cswFamily(sw.func); if (cstate == LS_FAMILY_BOOL) { @@ -449,7 +449,7 @@ void ConvertModel_215_to_216(ModelData &model) else if (cstate == LS_FAMILY_OFS || cstate == LS_FAMILY_COMP || cstate == LS_FAMILY_DIFF) { sw.v1 = ConvertSource_215_to_216(sw.v1); if (cstate == LS_FAMILY_OFS || cstate == LS_FAMILY_DIFF) { - if (sw.v1 >= MIXSRC_FIRST_TELEM) { + if ((uint8_t)sw.v1 >= MIXSRC_FIRST_TELEM) { switch ((uint8_t)sw.v1) { case MIXSRC_FIRST_TELEM + TELEM_TM1-1: case MIXSRC_FIRST_TELEM + TELEM_TM2-1: @@ -492,7 +492,7 @@ void ConvertModel_215_to_216(ModelData &model) } } } - if (cstate == LS_FAMILY_COMP) { + else if (cstate == LS_FAMILY_COMP) { sw.v2 = ConvertSource_215_to_216(sw.v2); } } diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 4143cf735..fff5b7da2 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -521,7 +521,7 @@ #define TR_TXnRX "Tx:\0Rx:" #define OFS_RX 4 #define TR_ACCEL "Acc:" -#define TR_NODATA CENTER "NO DATA" +#define TR_NODATA CENTER "BRAK DANYCH" #define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%" #define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us" #define STR_US (STR_TMR1LATMAXUS+12) @@ -529,10 +529,10 @@ #define TR_TMR1JITTERUS "Tmr1 Jitter\037\124us" #if defined(CPUARM) - #define TR_TMIXMAXMS "Tmix max" + #define TR_TMIXMAXMS "Tmix maks" #define TR_FREESTACKMINB "Wolny stos" #else - #define TR_TMIXMAXMS "Tmix max\037\124ms" + #define TR_TMIXMAXMS "Tmix maks\037\124ms" #define TR_FREESTACKMINB "Wolny stos\037\124b" #endif From ea3f47c7f23ffdc98d0791f56d29b1a141782ecd Mon Sep 17 00:00:00 2001 From: Kjell Kernen Date: Sun, 16 Feb 2014 16:48:55 +0100 Subject: [PATCH 04/85] I will wrap the unsafe global settings operations in a application data object. I have found several bugs in the current model, where settings labels have been spelled badly or been of the wrong type. --- companion/src/appdata.h | 331 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 331 insertions(+) create mode 100644 companion/src/appdata.h diff --git a/companion/src/appdata.h b/companion/src/appdata.h new file mode 100644 index 000000000..1610d39ea --- /dev/null +++ b/companion/src/appdata.h @@ -0,0 +1,331 @@ +// Companion Application Data Class. +// All temporary and permanent global variables are defined here to make +// initialization and storage safe and visible. +// Do not access variables in QSettings directly, it is not type safe! + + +#ifndef APPDATA_H +#define APPDATA_H +#include + +#define COMPANY "OpenTX Companion" +#define PRODUCT "OpenTX" + +class AppData +{ + private: + // All the global variables + QStringList _recentFileList; + QByteArray _mainWindowGeometry; + QByteArray _mainWindowState; + + QString _firmware; + QString _locale; + QString _cpu_id; + QString _SplashImage; + QString _Name; + QString _SplashFileName; + QString _modelEditGeometry; + + QString _backupPath; + QString _gePath; + QString _lastDir; + QString _lastFlashDir; + QString _lastImagesDir; + QString _libraryPath; + QString _sdPath; + QString _snapshotpath; + + bool _backupEnable; + bool _backupOnFlash; + bool _burnFirmware; + bool _maximized; + bool _js_support; + bool _rename_firmware_files; + bool _show_splash; + bool _snapshot_to_clipboard; + bool _startup_check_companion; + bool _startup_check_fw; + bool _simuSW; + bool _wizardEnable; + + int _backLight; + int _default_channel_order; + int _default_mode; + int _embedded_splashes; // Shouldn't this be bool ?? + int _fwserver; + int _generalEditTab; + int _icon_size; + int _js_ctrl; + int _history_size; + int _modelEditTab; + int _profileId; + int _theme; + int _warningId; + + // Storage functions + + void store(const QByteArray newArray, QByteArray &array, const char *tag) + { + QSettings settings(PRODUCT, COMPANY); + settings.setValue(tag, newArray); + array = newArray; + } + + void store(const QStringList newSList, QStringList &stringList, const char *tag) + { + QSettings settings(PRODUCT, COMPANY); + settings.setValue(tag, newSList); + stringList = newSList; + } + + void store(const QString newString, QString &string, const char *tag) + { + QSettings settings(PRODUCT, COMPANY); + settings.setValue(tag, newString); + string = newString; + } + + void store(const bool newTruth, bool &truth, const char *tag) + { + QSettings settings(PRODUCT, COMPANY); + settings.setValue(tag, newTruth); + truth = newTruth; + } + + void store(const int newNumber, int &number, const char *tag) + { + QSettings settings(PRODUCT, COMPANY); + settings.setValue(tag, newNumber); + number = newNumber; + } + + // Retrieval functions + void retrieve( QByteArray &array, const char *tag, const char *def) + { + QSettings settings(PRODUCT, COMPANY); + array = settings.value(tag, def).toByteArray(); + } + void retrieve( QStringList &stringList, const char *tag, const char *def) + { + QSettings settings(PRODUCT, COMPANY); + stringList = settings.value(tag, def).toStringList(); + } + + void retrieve( QString &string, const char *tag, const char *def) + { + QSettings settings(PRODUCT, COMPANY); + string = settings.value(tag, def).toString(); + } + + void retrieve( bool &truth, const char *tag, const bool def) + { + QSettings settings(PRODUCT, COMPANY); + truth = settings.value(tag, def).toBool(); + } + + void retrieve( int &number, const char *tag, const int def) + { + QSettings settings(PRODUCT, COMPANY); + number = settings.value(tag, def).toInt(); + } + + // Retrieve and Store functions + void getset( QByteArray &array, const char *tag, const char *def) + { + retrieve( array, tag, def); + store(array, array, tag); + } + + void getset( QStringList &stringList, const char *tag, const char *def) + { + retrieve( stringList, tag, def); + store(stringList, stringList, tag); + } + + void getset( QString &string, const char *tag, const char *def) + { + retrieve( string, tag, def); + store(string, string, tag); + } + + void getset( bool &truth, const char *tag, const bool def) + { + retrieve( truth, tag, def); + store(truth, truth, tag); + } + + void getset( int &number, const char *tag, const int def) + { + retrieve( number, tag, def); + store(number, number, tag); + } + +public: + // All the get declarations + QStringList recentFileList() { return _recentFileList; } + QByteArray mainWindowGeometry(){ return _mainWindowGeometry; } + QByteArray mainWindowState() { return _mainWindowState; } + + QString firmware() { return _firmware; } + QString locale() { return _locale; } + QString cpu_id() { return _cpu_id; } + QString SplashImage() { return _SplashImage; } + QString Name() { return _Name; } + QString SplashFileName() { return _SplashFileName; } + QString modelEditGeometry() { return _modelEditGeometry; } + + QString backupPath() { return _backupPath; } + QString gePath() { return _gePath; } + QString lastDir() { return _lastDir; } + QString lastFlashDir() { return _lastFlashDir; } + QString lastImagesDir() { return _lastImagesDir; } + QString libraryPath() { return _libraryPath; } + QString sdPath() { return _sdPath; } + QString snapshotpath() { return _snapshotpath; } + + bool backupEnable() { return _backupEnable; } + bool backupOnFlash() { return _backupOnFlash; } + bool burnFirmware() { return _burnFirmware; } + bool js_support() { return _js_support; } + bool maximized() { return _maximized; } + bool rename_firmware_files() { return _rename_firmware_files; } + bool show_splash() { return _show_splash; } + bool snapshot_to_clipboard() { return _snapshot_to_clipboard; } + bool startup_check_companion() { return _startup_check_companion;} + bool startup_check_fw() { return _startup_check_fw; } + bool simuSW() { return _simuSW; } + bool wizardEnable() { return _wizardEnable; } + + int backLight() { return _backLight; } + int default_channel_order() { return _default_channel_order; } + int default_mode() { return _default_mode; } + int embedded_splashes() { return _embedded_splashes; } + int fwserver() { return _fwserver; } + int generalEditTab() { return _generalEditTab; } + int icon_size() { return _icon_size; } + int history_size() { return _history_size; } + int js_ctr() { return _js_ctrl; } + int modelEditTab() { return _modelEditTab; } + int profileId() { return _profileId; } + int theme() { return _theme; } + int warningId() { return _warningId; } + + // All the set declarations + void recentFileList (const QStringList l) { store(l, _recentFileList, "recentFileList" );} + void mainWindowGeometry (const QByteArray a) { store(a, _mainWindowGeometry, "mainWindowGeometry");} + void mainWindowState (const QByteArray a) { store(a, _mainWindowState, "mainWindowState" );} + + void firmware (const QString str) { store(str, _firmware, "firmware" );} + void locale (const QString str) { store(str, _locale, "locale" );} + void cpu_id (const QString str) { store(str, _cpu_id, "cpu_id" );} + void SplashImage (const QString str) { store(str, _SplashImage, "SplashImage" );} + void Name (const QString str) { store(str, _Name, "Name" );} + void SplashFileName (const QString str) { store(str, _SplashFileName, "SplashFileName" );} + void modelEditGeometry (const QString str) { store(str, _modelEditGeometry, "modelEditGeometry" );} + + void backupPath (const QString str) { store(str, _backupPath, "backupPath" );} + void gePath (const QString str) { store(str, _gePath, "gePath" );} + void lastDir (const QString str) { store(str, _lastDir, "lastDir" );} + void lastFlashDir (const QString str) { store(str, _lastFlashDir, "lastFlashDir" );} + void lastImagesDir (const QString str) { store(str, _lastImagesDir, "lastImagesDir" );} + void libraryPath (const QString str) { store(str, _libraryPath, "libraryPath" );} + void sdPath (const QString str) { store(str, _sdPath, "sdPath" );} + void snapshotpath (const QString str) { store(str, _snapshotpath, "snapshotpath" );} + + void backupEnable (const bool bl) { store(bl, _backupEnable, "backupEnable" );} + void backupOnFlash (const bool bl) { store(bl, _backupOnFlash, "backupOnFlash" );} + void burnFirmware (const bool bl) { store(bl, _burnFirmware, "burnFirmware" );} + void maximized (const bool bl) { store(bl, _maximized, "maximized" );} + void js_support (const bool bl) { store(bl, _js_support, "js_support" );} + void rename_firmware_files (const bool bl) { store(bl, _rename_firmware_files, "rename_firmware_files" );} + void show_splash (const bool bl) { store(bl, _show_splash, "show_splash" );} + void snapshot_to_clipboard (const bool bl) { store(bl, _snapshot_to_clipboard, "snapshot_to_clipboard" );} + void startup_check_companion (const bool bl) { store(bl, _startup_check_companion, "startup_check_companion" );} + void startup_check_fw (const bool bl) { store(bl, _startup_check_fw, "startup_check_fw" );} + void simuSW (const bool bl) { store(bl, _simuSW, "simuSW" );} + void wizardEnable (const bool bl) { store(bl, _wizardEnable, "wizardEnable" );} + + void backLight (const int it) { store(it, _backLight, "backLight" );} + void default_channel_order (const int it) { store(it, _default_channel_order, "default_channel_order" );} + void default_mode (const int it) { store(it, _default_mode, "default_mode" );} + void embedded_splashes (const int it) { store(it, _embedded_splashes, "embedded_splashes" );} + void fwserver (const int it) { store(it, _fwserver, "fwserver" );} + void generalEditTab (const int it) { store(it, _generalEditTab, "generalEditTab" );} + void icon_size (const int it) { store(it, _icon_size, "icon_size" );} + void history_size (const int it) { store(it, _history_size, "history_size" );} + void js_ctrl (const int it) { store(it, _js_ctrl, "js_ctrl" );} + void modelEditTab (const int it) { store(it, _modelEditTab, "modelEditTab" );} + void profileId (const int it) { store(it, _profileId, "profileId" );} + void theme (const int it) { store(it, _theme, "theme" );} + void warningId (const int it) { store(it, _warningId, "warningId" );} + + // Constructor + AppData() + { + // Start by hijacking all left over settings from companion9x, but only do it one time + // Use "location" tag as an indicator that the settings are missing + QSettings c9x_settings("companion9x", "companion9x"); + QSettings settings(PRODUCT, COMPANY); + if (!settings.contains("locale")) { + QStringList keys = c9x_settings.allKeys(); + for (QStringList::iterator i=keys.begin(); i!=keys.end(); i++) { + settings.setValue(*i, c9x_settings.value(*i)); + } + } + + // Load and store all variables. Use default values if setting values are missing + + getset( _recentFileList, "recentFileList" ,"" ); + getset( _mainWindowGeometry, "mainWindowGeometry" ,"" ); + getset( _mainWindowState, "mainWindowState" ,"" ); + + getset( _firmware, "firmware" ,"" ); + getset( _locale, "locale" ,"" ); + getset( _cpu_id, "cpu_id" ,"" ); + getset( _SplashImage, "SplashImage" ,"" ); + getset( _Name, "Name" ,"" ); + getset( _SplashFileName, "SplashFileName" ,"" ); + getset( _modelEditGeometry, "modelEditGeometry" ,"" ); + + getset( _backupPath, "backupPath" ,"" ); + getset( _gePath, "gePath" ,"" ); + getset( _lastDir, "lastDir" ,"" ); + getset( _lastFlashDir, "lastFlashDir" ,"" ); + getset( _lastImagesDir, "lastImagesDir" ,"" ); + getset( _libraryPath, "libraryPath" ,"" ); + getset( _sdPath, "sdPath" ,"" ); + getset( _snapshotpath, "snapshotpath" ,"" ); + + getset( _backupEnable, "backupEnable" ,false ); + getset( _backupOnFlash, "backupOnFlash" ,true ); + getset( _burnFirmware, "burnFirmware" ,false ); + getset( _js_support, "js_support" ,false ); + getset( _maximized, "maximized" ,false ); + getset( _rename_firmware_files, "rename_firmware_files" ,false ); + getset( _show_splash, "show_splash" ,true ); + getset( _snapshot_to_clipboard, "snapshot_to_clipboard" ,false ); + getset( _startup_check_companion, "startup_check_companion" ,true ); + getset( _startup_check_fw, "startup_check_fw" ,true ); + getset( _simuSW, "simuSW" ,false ); + getset( _wizardEnable, "wizardEnable" ,true ); + + getset( _backLight, "backLight" ,0 ); + getset( _default_channel_order, "default_channel_order" ,0 ); + getset( _default_mode, "default_mode" ,1 ); + getset( _embedded_splashes, "embedded_splashes" ,0 ); + getset( _fwserver, "fwserver" ,0 ); + getset( _generalEditTab, "generalEditTab" ,0 ); + getset( _icon_size, "icon_size" ,2 ); + getset( _js_ctrl, "js_ctrl" ,0 ); + getset( _history_size, "history_size" ,6 ); + getset( _modelEditTab, "modelEditTab" ,0 ); + getset( _profileId, "profileId" ,0 ); + getset( _theme, "theme" ,1 ); + getset( _warningId, "warningId" ,0 ); + } + }; + +extern AppData glob; + +#endif // APPDATA_H From acbe17e4bc3bad79b6b04eb75165953b653cadf5 Mon Sep 17 00:00:00 2001 From: Kjell Kernen Date: Sun, 16 Feb 2014 18:17:10 +0100 Subject: [PATCH 05/85] Main and the preferences dialog are done. At least as far as the simple values. I have not made support for complex values like profiles yet. --- companion/src/appdata.h | 2 +- companion/src/apppreferencesdialog.cpp | 149 +++++++++++-------------- companion/src/main.cpp | 40 +++---- companion/src/mainwindow.h | 1 + 4 files changed, 84 insertions(+), 108 deletions(-) diff --git a/companion/src/appdata.h b/companion/src/appdata.h index 1610d39ea..007f96c42 100644 --- a/companion/src/appdata.h +++ b/companion/src/appdata.h @@ -205,7 +205,7 @@ public: int generalEditTab() { return _generalEditTab; } int icon_size() { return _icon_size; } int history_size() { return _history_size; } - int js_ctr() { return _js_ctrl; } + int js_ctrl() { return _js_ctrl; } int modelEditTab() { return _modelEditTab; } int profileId() { return _profileId; } int theme() { return _theme; } diff --git a/companion/src/apppreferencesdialog.cpp b/companion/src/apppreferencesdialog.cpp index cfcb0b3de..0f97b0f1e 100644 --- a/companion/src/apppreferencesdialog.cpp +++ b/companion/src/apppreferencesdialog.cpp @@ -35,61 +35,58 @@ appPreferencesDialog::~appPreferencesDialog() void appPreferencesDialog::writeValues() { - QSettings settings; - settings.setValue("startup_check_companion", ui->startupCheck_companion9x->isChecked()); - settings.setValue("startup_check_fw", ui->startupCheck_fw->isChecked()); - settings.setValue("wizardEnable", ui->wizardEnable_ChkB->isChecked()); - settings.setValue("show_splash", ui->showSplash->isChecked()); - settings.setValue("simuSW", ui->simuSW->isChecked()); - settings.setValue("history_size", ui->historySize->value()); - settings.setValue("backLight", ui->backLightColor->currentIndex()); - settings.setValue("libraryPath", ui->libraryPath->text()); - settings.setValue("gePath", ui->ge_lineedit->text()); - settings.setValue("embedded_splashes", ui->splashincludeCB->currentIndex()); - settings.setValue("backupEnable", ui->backupEnable->isChecked()); + glob.startup_check_companion(ui->startupCheck_companion9x->isChecked()); + glob.startup_check_fw(ui->startupCheck_fw->isChecked()); + glob.wizardEnable(ui->wizardEnable_ChkB->isChecked()); + glob.show_splash(ui->showSplash->isChecked()); + glob.simuSW(ui->simuSW->isChecked()); + glob.history_size(ui->historySize->value()); + glob.backLight(ui->backLightColor->currentIndex()); + glob.libraryPath(ui->libraryPath->text()); + glob.gePath(ui->ge_lineedit->text()); + glob.embedded_splashes(ui->splashincludeCB->currentIndex()); + glob.backupEnable(ui->backupEnable->isChecked()); if (ui->joystickChkB ->isChecked() && ui->joystickCB->isEnabled()) { - settings.setValue("js_support", ui->joystickChkB ->isChecked()); - settings.setValue("js_ctrl", ui->joystickCB ->currentIndex()); + glob.js_support(ui->joystickChkB ->isChecked()); + glob.js_ctrl(ui->joystickCB ->currentIndex()); } else { - settings.remove("js_support"); - settings.remove("js_ctrl"); + glob.js_support(false); + glob.js_ctrl(0); } - settings.setValue("default_channel_order", ui->channelorderCB->currentIndex()); - settings.setValue("default_mode", ui->stickmodeCB->currentIndex()); - settings.setValue("rename_firmware_files", ui->renameFirmware->isChecked()); - settings.setValue("burnFirmware", ui->burnFirmware->isChecked()); - settings.setValue("profileId", ui->profileIndexLE->text()); - settings.setValue("Name", ui->profileNameLE->text()); - settings.setValue("sdPath", ui->sdPath->text()); - settings.setValue("SplashFileName", ui->SplashFileName->text()); + glob.default_channel_order(ui->channelorderCB->currentIndex()); + glob.default_mode(ui->stickmodeCB->currentIndex()); + glob.rename_firmware_files(ui->renameFirmware->isChecked()); + glob.burnFirmware(ui->burnFirmware->isChecked()); + glob.profileId(ui->profileIndexLE->text().toInt()); + glob.Name(ui->profileNameLE->text()); + glob.sdPath(ui->sdPath->text()); + glob.SplashFileName(ui->SplashFileName->text()); if (!ui->SplashFileName->text().isEmpty()) - settings.setValue("SplashImage", ""); - settings.setValue("firmware", ui->firmwareLE->text()); + glob.SplashImage(""); + glob.firmware(ui->firmwareLE->text()); saveProfile(); } void appPreferencesDialog::on_snapshotPathButton_clicked() { - QSettings settings; - QString fileName = QFileDialog::getExistingDirectory(this,tr("Select your snapshot folder"), settings.value("snapshotPath").toString()); + QString fileName = QFileDialog::getExistingDirectory(this,tr("Select your snapshot folder"), glob.snapshotpath()); if (!fileName.isEmpty()) { - settings.setValue("snapshotpath", fileName); - settings.setValue("snapshot_to_clipboard", false); + glob.snapshotpath(fileName); + glob.snapshot_to_clipboard(false); ui->snapshotPath->setText(fileName); } } void appPreferencesDialog::initSettings() { - QSettings settings; - ui->snapshotClipboardCKB->setChecked(settings.value("snapshot_to_clipboard", false).toBool()); - ui->burnFirmware->setChecked(settings.value("burnFirmware", true).toBool()); + ui->snapshotClipboardCKB->setChecked(glob.snapshot_to_clipboard()); + ui->burnFirmware->setChecked(glob.burnFirmware()); - QString Path=settings.value("snapshotPath", "").toString(); + QString Path=glob.snapshotpath(); if (QDir(Path).exists()) { ui->snapshotPath->setText(Path); ui->snapshotPath->setReadOnly(true); @@ -98,38 +95,38 @@ void appPreferencesDialog::initSettings() ui->snapshotPath->setDisabled(true); ui->snapshotPathButton->setDisabled(true); } - ui->startupCheck_companion9x->setChecked(settings.value("startup_check_companion", true).toBool()); - ui->startupCheck_fw->setChecked(settings.value("startup_check_fw", true).toBool()); - ui->wizardEnable_ChkB->setChecked(settings.value("wizardEnable", true).toBool()); - ui->showSplash->setChecked(settings.value("show_splash", true).toBool()); - ui->historySize->setValue(settings.value("history_size", 10).toInt()); - ui->backLightColor->setCurrentIndex(settings.value("backLight", 0).toInt()); - ui->simuSW->setChecked(settings.value("simuSW", false).toBool()); + ui->startupCheck_companion9x->setChecked(glob.startup_check_companion()); + ui->startupCheck_fw->setChecked(glob.startup_check_fw()); + ui->wizardEnable_ChkB->setChecked(glob.wizardEnable()); + ui->showSplash->setChecked(glob.show_splash()); + ui->historySize->setValue(glob.history_size()); + ui->backLightColor->setCurrentIndex(glob.backLight()); + ui->simuSW->setChecked(glob.simuSW()); - Path=settings.value("libraryPath", "").toString(); + Path=glob.libraryPath(); if (QDir(Path).exists()) { ui->libraryPath->setText(Path); } - Path=settings.value("gePath", "").toString(); + Path=glob.gePath(); if (QFile(Path).exists()) { ui->ge_lineedit->setText(Path); } - Path=settings.value("backupPath", "").toString(); + Path=glob.backupPath(); if (!Path.isEmpty()) { if (QDir(Path).exists()) { ui->backupPath->setText(Path); ui->backupEnable->setEnabled(true); - ui->backupEnable->setChecked(settings.value("backupEnable", true).toBool()); + ui->backupEnable->setChecked(glob.backupEnable()); } else { ui->backupEnable->setDisabled(true); } } else { ui->backupEnable->setDisabled(true); } - ui->splashincludeCB->setCurrentIndex(settings.value("embedded_splashes", 0).toInt()); + ui->splashincludeCB->setCurrentIndex(glob.embedded_splashes()); #ifdef JOYSTICKS - ui->joystickChkB->setChecked(settings.value("js_support", false).toBool()); + ui->joystickChkB->setChecked(glob.js_support()); if (ui->joystickChkB->isChecked()) { QStringList joystickNames; joystickNames << tr("No joysticks found"); @@ -147,7 +144,7 @@ void appPreferencesDialog::initSettings() } ui->joystickCB->clear(); ui->joystickCB->insertItems(0, joystickNames); - ui->joystickCB->setCurrentIndex(settings.value("js_ctrl", 0).toInt()); + ui->joystickCB->setCurrentIndex(glob.js_ctrl()); } else { ui->joystickCB->clear(); @@ -156,17 +153,17 @@ void appPreferencesDialog::initSettings() } #endif // Profile Tab Inits - ui->channelorderCB->setCurrentIndex(settings.value("default_channel_order", 0).toInt()); - ui->stickmodeCB->setCurrentIndex(settings.value("default_mode", 1).toInt()); - ui->renameFirmware->setChecked(settings.value("rename_firmware_files", false).toBool()); - Path=settings.value("sdPath", "").toString(); + ui->channelorderCB->setCurrentIndex(glob.default_channel_order()); + ui->stickmodeCB->setCurrentIndex(glob.default_mode()); + ui->renameFirmware->setChecked(glob.rename_firmware_files()); + Path=glob.sdPath(); if (QDir(Path).exists()) { ui->sdPath->setText(Path); } - ui->profileIndexLE->setText(settings.value("profileId", "").toString()); - ui->profileNameLE->setText(settings.value("Name", "").toString()); + ui->profileIndexLE->setText(QString(glob.profileId())); + ui->profileNameLE->setText(glob.Name()); - QString fileName=settings.value("SplashFileName","").toString(); + QString fileName=glob.SplashFileName(); if (!fileName.isEmpty()) { QFile file(fileName); if (file.exists()){ @@ -174,40 +171,37 @@ void appPreferencesDialog::initSettings() displayImage( fileName ); } } - ui->firmwareLE->setText(settings.value("firmware","").toString()); + ui->firmwareLE->setText(glob.firmware()); } void appPreferencesDialog::on_libraryPathButton_clicked() { - QSettings settings; - QString fileName = QFileDialog::getExistingDirectory(this,tr("Select your library folder"), settings.value("libraryPath").toString()); + QString fileName = QFileDialog::getExistingDirectory(this,tr("Select your library folder"), glob.libraryPath()); if (!fileName.isEmpty()) { - settings.setValue("libraryPath", fileName); + glob.libraryPath(fileName); ui->libraryPath->setText(fileName); } } void appPreferencesDialog::on_snapshotClipboardCKB_clicked() { - QSettings settings; if (ui->snapshotClipboardCKB->isChecked()) { ui->snapshotPath->setDisabled(true); ui->snapshotPathButton->setDisabled(true); - settings.setValue("snapshot_to_clipboard", true); + glob.snapshot_to_clipboard(true); } else { ui->snapshotPath->setEnabled(true); ui->snapshotPath->setReadOnly(true); ui->snapshotPathButton->setEnabled(true); - settings.setValue("snapshot_to_clipboard", false); + glob.snapshot_to_clipboard(false); } } void appPreferencesDialog::on_backupPathButton_clicked() { - QSettings settings; - QString fileName = QFileDialog::getExistingDirectory(this,tr("Select your Models and Settings backup folder"), settings.value("backupPath").toString()); + QString fileName = QFileDialog::getExistingDirectory(this,tr("Select your Models and Settings backup folder"), glob.backupPath()); if (!fileName.isEmpty()) { - settings.setValue("backupPath", fileName); + glob.backupPath(fileName); ui->backupPath->setText(fileName); } ui->backupEnable->setEnabled(true); @@ -215,7 +209,6 @@ void appPreferencesDialog::on_backupPathButton_clicked() void appPreferencesDialog::on_ge_pathButton_clicked() { - QSettings settings; QString fileName = QFileDialog::getOpenFileName(this, tr("Select Google Earth executable"),ui->ge_lineedit->text()); if (!fileName.isEmpty()) { ui->ge_lineedit->setText(fileName); @@ -259,8 +252,7 @@ void appPreferencesDialog::on_joystickcalButton_clicked() { void appPreferencesDialog::on_sdPathButton_clicked() { - QSettings settings; - QString fileName = QFileDialog::getExistingDirectory(this,tr("Select the folder replicating your SD structure"), settings.value("sdPath").toString()); + QString fileName = QFileDialog::getExistingDirectory(this,tr("Select the folder replicating your SD structure"), glob.sdPath()); if (!fileName.isEmpty()) { ui->sdPath->setText(fileName); } @@ -270,7 +262,7 @@ void appPreferencesDialog::saveProfile() { QSettings settings; - QString profile=QString("profile") + settings.value("profileId").toString(); + QString profile=QString("profile") + glob.profileId(); QString name=ui->profileNameLE->text(); if (name.isEmpty()) { name = profile; @@ -306,8 +298,7 @@ void appPreferencesDialog::loadProfileString(QString profile, QString label) void appPreferencesDialog::loadProfile() { - QSettings settings; - QString profile=QString("profile") + settings.value("profileId").toString(); + QString profile=QString("profile") + glob.profileId(); loadProfileString( profile, "Name" ); loadProfileString( profile, "default_channel_order" ); @@ -322,12 +313,11 @@ void appPreferencesDialog::loadProfile() void appPreferencesDialog::on_removeProfileButton_clicked() { QSettings settings; - QString profileId = settings.value("profileId").toString(); - if ( profileId == "1" ) + if ( glob.profileId() == 1 ) QMessageBox::information(this, tr("Not possible to remove profile"), tr("The default profile can not be removed.")); else { - QString profile=QString("profile") + profileId; + QString profile=QString("profile") + glob.profileId(); settings.beginGroup("Profiles"); settings.remove(profile); settings.endGroup(); @@ -340,15 +330,13 @@ void appPreferencesDialog::on_removeProfileButton_clicked() bool appPreferencesDialog::displayImage( QString fileName ) { - QSettings settings; - QImage image(fileName); if (image.isNull()) return false; // This code below just figures out if the width of the latest firmware is 128 or 212. It works , but... - QString filePath1 = settings.value("lastFlashDir", "").toString() + "/" + settings.value("firmware", "").toString() + ".bin"; - QString filePath2 = settings.value("lastFlashDir", "").toString() + "/" + settings.value("firmware", "").toString() + ".hex"; + QString filePath1 = glob.lastFlashDir() + "/" + glob.firmware() + ".bin"; + QString filePath2 = glob.lastFlashDir() + "/" + glob.firmware() + ".hex"; QFile file(filePath1); if (!file.exists()) filePath1 = filePath2; @@ -390,12 +378,11 @@ void appPreferencesDialog::on_SplashSelect_clicked() supportedImageFormats += QLatin1String(" *.") + QImageReader::supportedImageFormats()[formatIndex]; } - QSettings settings; QString fileName = QFileDialog::getOpenFileName(this, - tr("Open Image to load"), settings.value("lastImagesDir").toString(), tr("Images (%1)").arg(supportedImageFormats)); + tr("Open Image to load"), glob.lastImagesDir(), tr("Images (%1)").arg(supportedImageFormats)); if (!fileName.isEmpty()) { - settings.setValue("lastImagesDir", QFileInfo(fileName).dir().absolutePath()); + glob.lastImagesDir(QFileInfo(fileName).dir().absolutePath()); if (displayImage(fileName)) ui->SplashFileName->setText(fileName); diff --git a/companion/src/main.cpp b/companion/src/main.cpp index ffaea6801..93bd89123 100644 --- a/companion/src/main.cpp +++ b/companion/src/main.cpp @@ -74,6 +74,9 @@ class MyProxyStyle : public QProxyStyle }; #endif +// Global data and storge object +AppData glob; + int main(int argc, char *argv[]) { Q_INIT_RESOURCE(companion); @@ -86,46 +89,31 @@ int main(int argc, char *argv[]) app.setStyle(new MyProxyStyle); #endif - // Start by borrowing any left over settings from companion9x - QSettings c9x_settings("companion9x", "companion9x"); - QSettings settings; - - if (!settings.contains("pos")) { - QStringList keys = c9x_settings.allKeys(); - for (QStringList::iterator i=keys.begin(); i!=keys.end(); i++) { - settings.setValue(*i, c9x_settings.value(*i)); - } - } - - QString dir; - if (argc) dir = QFileInfo(argv[0]).canonicalPath() + "/lang"; - - QString locale = settings.value("locale",QLocale::system().name()).toString(); - bool showSplash = settings.value("show_splash", true).toBool(); - QTranslator companionTranslator; - companionTranslator.load(":/companion_" + locale); + companionTranslator.load(":/companion_" + glob.locale()); QTranslator qtTranslator; - qtTranslator.load((QString)"qt_" + locale.left(2), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); + qtTranslator.load((QString)"qt_" + glob.locale().left(2), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); app.installTranslator(&companionTranslator); app.installTranslator(&qtTranslator); QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); - QString firmware_id = settings.value("firmware", default_firmware_variant.id).toString(); - firmware_id.replace("open9x", "opentx"); - firmware_id.replace("x9da", "taranis"); + if (glob.firmware().isEmpty()) + glob.firmware(default_firmware_variant.id); + QString tmp_id = glob.firmware(); + tmp_id.replace("open9x", "opentx"); + tmp_id.replace("x9da", "taranis"); + glob.firmware(tmp_id); - QPixmap pixmap = QPixmap(firmware_id.contains("taranis") ? ":/images/splasht.png" : ":/images/splash.png"); + QPixmap pixmap = QPixmap(glob.firmware().contains("taranis") ? ":/images/splasht.png" : ":/images/splash.png"); QSplashScreen *splash = new QSplashScreen(pixmap); RegisterFirmwares(); - settings.setValue("firmware", firmware_id); - current_firmware_variant = GetFirmwareVariant(firmware_id); + current_firmware_variant = GetFirmwareVariant(glob.firmware()); MainWindow *mainWin = new MainWindow(); - if (showSplash) { + if (glob.show_splash()) { splash->show(); QTimer::singleShot(1000*SPLASH_TIME, splash, SLOT(close())); QTimer::singleShot(1000*SPLASH_TIME, mainWin, SLOT(show())); diff --git a/companion/src/mainwindow.h b/companion/src/mainwindow.h index 505878ef2..517158f0f 100644 --- a/companion/src/mainwindow.h +++ b/companion/src/mainwindow.h @@ -45,6 +45,7 @@ #include #include #include +#include "appdata.h" #include "downloaddialog.h" #include "eeprominterface.h" From fdc9873ab8fe282a723c2506a48c11cb31e1599a Mon Sep 17 00:00:00 2001 From: Kjell Kernen Date: Mon, 17 Feb 2014 01:16:24 +0100 Subject: [PATCH 06/85] Profile date is now type safe. Semi working, not complete yet. --- companion/src/appdata.h | 416 ++++++++++++++++++------- companion/src/apppreferencesdialog.cpp | 68 ++-- companion/src/apppreferencesdialog.h | 2 +- companion/src/mainwindow.cpp | 166 ++++------ companion/src/mainwindow.h | 8 +- 5 files changed, 396 insertions(+), 264 deletions(-) diff --git a/companion/src/appdata.h b/companion/src/appdata.h index 007f96c42..2d7add453 100644 --- a/companion/src/appdata.h +++ b/companion/src/appdata.h @@ -10,11 +10,296 @@ #define COMPANY "OpenTX Companion" #define PRODUCT "OpenTX" +#define MAX_PROFILES 15 -class AppData +class DataObj { + public: + void store(const QByteArray newArray, QByteArray &array, const char *tag, const QString group1="", const QString group2="" ) + { + QSettings settings(PRODUCT, COMPANY); + if (!group1.isEmpty()) settings.beginGroup(group1); + if (!group2.isEmpty()) settings.beginGroup(group2); + + settings.setValue(tag, newArray); + array = newArray; + + if (!group1.isEmpty()) settings.endGroup(); + if (!group2.isEmpty()) settings.endGroup(); + } + + void store(const QStringList newSList, QStringList &stringList, const char *tag, const QString group1="", const QString group2="" ) + { + QSettings settings(PRODUCT, COMPANY); + if (!group1.isEmpty()) settings.beginGroup(group1); + if (!group2.isEmpty()) settings.beginGroup(group2); + + settings.setValue(tag, newSList); + stringList = newSList; + + if (!group1.isEmpty()) settings.endGroup(); + if (!group2.isEmpty()) settings.endGroup(); + } + + void store(const QString newString, QString &string, const char *tag, const QString group1="", const QString group2="" ) + { + QSettings settings(PRODUCT, COMPANY); + if (!group1.isEmpty()) settings.beginGroup(group1); + if (!group2.isEmpty()) settings.beginGroup(group2); + + settings.setValue(tag, newString); + string = newString; + + if (!group1.isEmpty()) settings.endGroup(); + if (!group2.isEmpty()) settings.endGroup(); + } + + void store(const bool newTruth, bool &truth, const char *tag, const QString group1="", const QString group2="" ) + { + QSettings settings(PRODUCT, COMPANY); + if (!group1.isEmpty()) settings.beginGroup(group1); + if (!group2.isEmpty()) settings.beginGroup(group2); + + settings.setValue(tag, newTruth); + truth = newTruth; + + if (!group1.isEmpty()) settings.endGroup(); + if (!group2.isEmpty()) settings.endGroup(); + } + + void store(const int newNumber, int &number, const char *tag, const QString group1="", const QString group2="" ) + { + QSettings settings(PRODUCT, COMPANY); + if (!group1.isEmpty()) settings.beginGroup(group1); + if (!group2.isEmpty()) settings.beginGroup(group2); + + settings.setValue(tag, newNumber); + number = newNumber; + + if (!group1.isEmpty()) settings.endGroup(); + if (!group2.isEmpty()) settings.endGroup(); + } + + // Retrieval functions + void retrieve( QByteArray &array, const char *tag, const char *def, const QString group1="", const QString group2="" ) + { + QSettings settings(PRODUCT, COMPANY); + if (!group1.isEmpty()) settings.beginGroup(group1); + if (!group2.isEmpty()) settings.beginGroup(group2); + + array = settings.value(tag, def).toByteArray(); + + if (!group1.isEmpty()) settings.endGroup(); + if (!group2.isEmpty()) settings.endGroup(); + } + + void retrieve( QStringList &stringList, const char *tag, const char *def, const QString group1="", const QString group2="" ) + { + QSettings settings(PRODUCT, COMPANY); + if (!group1.isEmpty()) settings.beginGroup(group1); + if (!group2.isEmpty()) settings.beginGroup(group2); + + stringList = settings.value(tag, def).toStringList(); + + if (!group1.isEmpty()) settings.endGroup(); + if (!group2.isEmpty()) settings.endGroup(); + } + + void retrieve( QString &string, const char *tag, const char *def, const QString group1="", const QString group2="" ) + { + QSettings settings(PRODUCT, COMPANY); + if (!group1.isEmpty()) settings.beginGroup(group1); + if (!group2.isEmpty()) settings.beginGroup(group2); + + string = settings.value(tag, def).toString(); + + if (!group1.isEmpty()) settings.endGroup(); + if (!group2.isEmpty()) settings.endGroup(); + } + + void retrieve( bool &truth, const char *tag, const bool def, const QString group1="", const QString group2="" ) + { + QSettings settings(PRODUCT, COMPANY); + if (!group1.isEmpty()) settings.beginGroup(group1); + if (!group2.isEmpty()) settings.beginGroup(group2); + + truth = settings.value(tag, def).toBool(); + + if (!group1.isEmpty()) settings.endGroup(); + if (!group2.isEmpty()) settings.endGroup(); + } + + void retrieve( int &number, const char *tag, const int def, const QString group1="", const QString group2="" ) + { + QSettings settings(PRODUCT, COMPANY); + if (!group1.isEmpty()) settings.beginGroup(group1); + if (!group2.isEmpty()) settings.beginGroup(group2); + + number = settings.value(tag, def).toInt(); + + if (!group1.isEmpty()) settings.endGroup(); + if (!group2.isEmpty()) settings.endGroup(); + } + + // Retrieve and Store functions + void getset( QByteArray &array, const char *tag, const char *def, const QString group1="", const QString group2="" ) + { + retrieve( array, tag, def, group1, group2); + store(array, array, tag, group1, group2); + } + + void getset( QStringList &stringList, const char *tag, const char *def, const QString group1="", const QString group2="" ) + { + retrieve( stringList, tag, def, group1, group2); + store(stringList, stringList, tag, group1, group2); + } + + void getset( QString &string, const char *tag, const char *def, const QString group1="", const QString group2="" ) + { + retrieve( string, tag, def, group1, group2); + store(string, string, tag, group1, group2); + } + + void getset( bool &truth, const char *tag, const bool def, const QString group1="", const QString group2="" ) + { + retrieve( truth, tag, def, group1, group2); + store(truth, truth, tag, group1, group2); + } + + void getset( int &number, const char *tag, const int def, const QString group1="", const QString group2="" ) + { + retrieve( number, tag, def, group1, group2); + store(number, number, tag, group1, group2); + } +}; + +class Profile:DataObj +{ + private: + // Class Internal Variable + int index; + + // Application Variables + QString _firmware; + QString _Name; + QString _sdPath; + QString _SplashFileName; + bool _burnFirmware; + bool _rename_firmware_files; + int _default_channel_order; + int _default_mode; + + // Firmware Variables + QString _Beeper; + QString _countryCode; + QString _currentCalib; + QString _Display; + QString _GSStickMode; + QString _Haptic; + QString _PPM_Multiplier; + QString _Speaker; + QString _StickPotCalib; + QString _TrainerCalib; + QString _VbatCalib; + QString _vBatWarn; + + public: + // All the get declarations + QString firmware() { return _firmware; } + QString Name() { return _Name; } + QString sdPath() { return _sdPath; } + QString SplashFileName() { return _SplashFileName; } + bool burnFirmware() { return _burnFirmware; } + bool rename_firmware_files() { return _rename_firmware_files; } + int default_channel_order() { return _default_channel_order; } + int default_mode() { return _default_mode; } + + QString Beeper() { return _Beeper; } + QString countryCode() { return _countryCode; } + QString currentCalib() { return _currentCalib; } + QString Display() { return _Display; } + QString GSStickMode() { return _GSStickMode; } + QString Haptic() { return _Haptic; } + QString PPM_Multiplier() { return _PPM_Multiplier; } + QString Speaker() { return _Speaker; } + QString StickPotCalib() { return _StickPotCalib; } + QString TrainerCalib() { return _TrainerCalib; } + QString VbatCalib() { return _VbatCalib; } + QString vBatWarn() { return _vBatWarn; } + + + // All the set declarations + void firmware (const QString str) { store(str, _firmware, "firmware" ,"Profiles", QString("profile%1").arg(index));} + void Name (const QString str) { store(str, _Name, "Name" ,"Profiles", QString("profile%1").arg(index));} + void sdPath (const QString str) { store(str, _sdPath, "sdPath" ,"Profiles", QString("profile%1").arg(index));} + void SplashFileName (const QString str) { store(str, _SplashFileName, "SplashFileName" ,"Profiles", QString("profile%1").arg(index));} + void burnFirmware (const bool bl) { store(bl, _burnFirmware, "burnFirmware" ,"Profiles", QString("profile%1").arg(index));} + void rename_firmware_files (const bool bl) { store(bl, _rename_firmware_files, "rename_firmware_files" ,"Profiles", QString("profile%1").arg(index));} + void default_channel_order (const int it) { store(it, _default_channel_order, "default_channel_order" ,"Profiles", QString("profile%1").arg(index));} + void default_mode (const int it) { store(it, _default_mode, "default_mode" ,"Profiles", QString("profile%1").arg(index));} + + void Beeper (const QString str) { store(str, _Beeper, "Beeper" ,"Profiles", QString("profile%1").arg(index));} + void countryCode (const QString str) { store(str, _countryCode, "countryCode" ,"Profiles", QString("profile%1").arg(index));} + void currentCalib (const QString str) { store(str, _currentCalib, "currentCalib" ,"Profiles", QString("profile%1").arg(index));} + void Display (const QString str) { store(str, _Display, "Display" ,"Profiles", QString("profile%1").arg(index));} + void GSStickMode (const QString str) { store(str, _GSStickMode, "GSStickMode" ,"Profiles", QString("profile%1").arg(index));} + void Haptic (const QString str) { store(str, _Haptic, "Haptic" ,"Profiles", QString("profile%1").arg(index));} + void PPM_Multiplier (const QString str) { store(str, _PPM_Multiplier, "PPM_Multiplier" ,"Profiles", QString("profile%1").arg(index));} + void Speaker (const QString str) { store(str, _Speaker, "Speaker" ,"Profiles", QString("profile%1").arg(index));} + void StickPotCalib (const QString str) { store(str, _StickPotCalib, "StickPotCalib" ,"Profiles", QString("profile%1").arg(index));} + void TrainerCalib (const QString str) { store(str, _TrainerCalib, "TrainerCalib" ,"Profiles", QString("profile%1").arg(index));} + void VbatCalib (const QString str) { store(str, _VbatCalib, "VbatCalib" ,"Profiles", QString("profile%1").arg(index));} + void vBatWarn (const QString str) { store(str, _vBatWarn, "vBatWarn" ,"Profiles", QString("profile%1").arg(index));} + + // Constructor + Profile() + { + index = -1; + } + + void init(int newIndex) + { + index = newIndex; + + QString pName; + retrieve( pName, "Name", "", "Profiles", QString("profile%1").arg(newIndex)); + if ( newIndex > 1 && pName.isEmpty()) + return; + + // Load and store all variables. Use default values if setting values are missing + + getset( _firmware, "firmware" ,"" ,"Profiles", QString("profile%1").arg(index)); + getset( _Name, "Name" ,"----" ,"Profiles", QString("profile%1").arg(index)); + getset( _sdPath, "sdPath" ,"" ,"Profiles", QString("profile%1").arg(index)); + getset( _SplashFileName, "SplashFileName" ,"" ,"Profiles", QString("profile%1").arg(index)); + getset( _burnFirmware, "burnFirmware" ,false ,"Profiles", QString("profile%1").arg(index)); + getset( _rename_firmware_files, "rename_firmware_files" ,false ,"Profiles", QString("profile%1").arg(index)); + getset( _default_channel_order, "default_channel_order" ,0 ,"Profiles", QString("profile%1").arg(index)); + getset( _default_mode, "default_mode" ,1 ,"Profiles", QString("profile%1").arg(index)); + + getset( _Beeper, "Beeper" ,"" ,"Profiles", QString("profile%1").arg(index)); + getset( _countryCode, "countryCode" ,"" ,"Profiles", QString("profile%1").arg(index)); + getset( _currentCalib, "currentCalib" ,"" ,"Profiles", QString("profile%1").arg(index)); + getset( _Display, "Display" ,"" ,"Profiles", QString("profile%1").arg(index)); + getset( _GSStickMode, "GSStickMode" ,"" ,"Profiles", QString("profile%1").arg(index)); + getset( _Haptic, "Haptic" ,"" ,"Profiles", QString("profile%1").arg(index)); + getset( _PPM_Multiplier, "PPM_Multiplier" ,"" ,"Profiles", QString("profile%1").arg(index)); + getset( _Speaker, "Speaker" ,"" ,"Profiles", QString("profile%1").arg(index)); + getset( _StickPotCalib, "StickPotCalib" ,"" ,"Profiles", QString("profile%1").arg(index)); + getset( _TrainerCalib, "TrainerCalib" ,"" ,"Profiles", QString("profile%1").arg(index)); + getset( _VbatCalib, "VbatCalib" ,"" ,"Profiles", QString("profile%1").arg(index)); + getset( _vBatWarn, "vBatWarn" ,"" ,"Profiles", QString("profile%1").arg(index)); + } +}; + +class AppData:DataObj +{ // All the global variables + public: + Profile profile[MAX_PROFILES]; + + private: QStringList _recentFileList; QByteArray _mainWindowGeometry; QByteArray _mainWindowState; @@ -65,101 +350,6 @@ class AppData // Storage functions - void store(const QByteArray newArray, QByteArray &array, const char *tag) - { - QSettings settings(PRODUCT, COMPANY); - settings.setValue(tag, newArray); - array = newArray; - } - - void store(const QStringList newSList, QStringList &stringList, const char *tag) - { - QSettings settings(PRODUCT, COMPANY); - settings.setValue(tag, newSList); - stringList = newSList; - } - - void store(const QString newString, QString &string, const char *tag) - { - QSettings settings(PRODUCT, COMPANY); - settings.setValue(tag, newString); - string = newString; - } - - void store(const bool newTruth, bool &truth, const char *tag) - { - QSettings settings(PRODUCT, COMPANY); - settings.setValue(tag, newTruth); - truth = newTruth; - } - - void store(const int newNumber, int &number, const char *tag) - { - QSettings settings(PRODUCT, COMPANY); - settings.setValue(tag, newNumber); - number = newNumber; - } - - // Retrieval functions - void retrieve( QByteArray &array, const char *tag, const char *def) - { - QSettings settings(PRODUCT, COMPANY); - array = settings.value(tag, def).toByteArray(); - } - void retrieve( QStringList &stringList, const char *tag, const char *def) - { - QSettings settings(PRODUCT, COMPANY); - stringList = settings.value(tag, def).toStringList(); - } - - void retrieve( QString &string, const char *tag, const char *def) - { - QSettings settings(PRODUCT, COMPANY); - string = settings.value(tag, def).toString(); - } - - void retrieve( bool &truth, const char *tag, const bool def) - { - QSettings settings(PRODUCT, COMPANY); - truth = settings.value(tag, def).toBool(); - } - - void retrieve( int &number, const char *tag, const int def) - { - QSettings settings(PRODUCT, COMPANY); - number = settings.value(tag, def).toInt(); - } - - // Retrieve and Store functions - void getset( QByteArray &array, const char *tag, const char *def) - { - retrieve( array, tag, def); - store(array, array, tag); - } - - void getset( QStringList &stringList, const char *tag, const char *def) - { - retrieve( stringList, tag, def); - store(stringList, stringList, tag); - } - - void getset( QString &string, const char *tag, const char *def) - { - retrieve( string, tag, def); - store(string, string, tag); - } - - void getset( bool &truth, const char *tag, const bool def) - { - retrieve( truth, tag, def); - store(truth, truth, tag); - } - - void getset( int &number, const char *tag, const int def) - { - retrieve( number, tag, def); - store(number, number, tag); - } public: // All the get declarations @@ -273,6 +463,12 @@ public: settings.setValue(*i, c9x_settings.value(*i)); } } + + //Initialize the index variables of the profiles + for (int i=0; isdPath->setText(Path); } - ui->profileIndexLE->setText(QString(glob.profileId())); + ui->profileIndexLE->setText(QString("%1").arg(glob.profileId())); ui->profileNameLE->setText(glob.Name()); QString fileName=glob.SplashFileName(); @@ -260,54 +260,34 @@ void appPreferencesDialog::on_sdPathButton_clicked() void appPreferencesDialog::saveProfile() { - QSettings settings; - - QString profile=QString("profile") + glob.profileId(); + // The profile name may NEVER be empty + QString profile=QString("profile") + QString("%1").arg(glob.profileId()); QString name=ui->profileNameLE->text(); if (name.isEmpty()) { name = profile; ui->profileNameLE->setText(name); } - settings.beginGroup("Profiles"); - settings.beginGroup(profile); - settings.setValue("Name",name); - settings.setValue("default_channel_order", ui->channelorderCB->currentIndex()); - settings.setValue("default_mode", ui->stickmodeCB->currentIndex()); - settings.setValue("burnFirmware", ui->burnFirmware->isChecked()); - settings.setValue("rename_firmware_files", ui->renameFirmware->isChecked()); - settings.setValue("sdPath", ui->sdPath->text()); - settings.setValue("SplashFileName", ui->SplashFileName->text()); - settings.setValue("firmware", ui->firmwareLE->text()); - settings.endGroup(); - settings.endGroup(); + glob.profile[glob.profileId()].Name( name ); + glob.profile[glob.profileId()].default_channel_order( ui->channelorderCB->currentIndex()); + glob.profile[glob.profileId()].default_mode( ui->stickmodeCB->currentIndex()); + glob.profile[glob.profileId()].burnFirmware( ui->burnFirmware->isChecked()); + glob.profile[glob.profileId()].rename_firmware_files( ui->renameFirmware->isChecked()); + glob.profile[glob.profileId()].sdPath( ui->sdPath->text()); + glob.profile[glob.profileId()].SplashFileName( ui->SplashFileName->text()); + glob.profile[glob.profileId()].firmware( ui->firmwareLE->text()); } -void appPreferencesDialog::loadProfileString(QString profile, QString label) +void appPreferencesDialog::loadFromProfile() { - QSettings settings; - QString value; - - settings.beginGroup("Profiles"); - settings.beginGroup(profile); - value = settings.value(label).toString(); - settings.endGroup(); - settings.endGroup(); - - settings.setValue( label, value ); -} - -void appPreferencesDialog::loadProfile() -{ - QString profile=QString("profile") + glob.profileId(); - - loadProfileString( profile, "Name" ); - loadProfileString( profile, "default_channel_order" ); - loadProfileString( profile, "default_mode" ); - loadProfileString( profile, "burnFirmware" ); - loadProfileString( profile, "rename_firmware_files" ); - loadProfileString( profile, "sdPath" ); - loadProfileString( profile, "SplashFileName" ); - loadProfileString( profile, "firmware" ); + int i = glob.profileId(); + glob.Name( glob.profile[i].Name() ); + glob.default_channel_order( glob.profile[i].default_channel_order()); + glob.default_mode( glob.profile[i].default_mode()); + glob.burnFirmware( glob.profile[i].burnFirmware()); + glob.rename_firmware_files( glob.profile[i].rename_firmware_files()); + glob.sdPath( glob.profile[i].sdPath()); + glob.SplashFileName( glob.profile[i].SplashFileName()); + glob.firmware( glob.profile[i].firmware()); } void appPreferencesDialog::on_removeProfileButton_clicked() @@ -317,13 +297,13 @@ void appPreferencesDialog::on_removeProfileButton_clicked() QMessageBox::information(this, tr("Not possible to remove profile"), tr("The default profile can not be removed.")); else { - QString profile=QString("profile") + glob.profileId(); + QString profile=QString("profile") + QString("%1").arg(glob.profileId()); settings.beginGroup("Profiles"); settings.remove(profile); settings.endGroup(); - settings.setValue("profileId", "1"); + glob.profileId( 1 ); - loadProfile(); + loadFromProfile(); initSettings(); } } diff --git a/companion/src/apppreferencesdialog.h b/companion/src/apppreferencesdialog.h index b6f6c3896..18ce2f1e3 100644 --- a/companion/src/apppreferencesdialog.h +++ b/companion/src/apppreferencesdialog.h @@ -26,7 +26,7 @@ private: bool displayImage( QString fileName ); void saveProfile(); void loadProfileString(QString profile, QString label); - void loadProfile(); + void loadFromProfile(); private slots: void writeValues(); diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index 991861451..8d395e570 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -90,23 +90,23 @@ MainWindow::MainWindow(): mdiArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); mdiArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); setCentralWidget(mdiArea); - connect(mdiArea, SIGNAL(subWindowActivated(QMdiSubWindow*)), - this, SLOT(updateMenus())); + connect(mdiArea, SIGNAL(subWindowActivated(QMdiSubWindow*)), this, SLOT(updateMenus())); windowMapper = new QSignalMapper(this); - connect(windowMapper, SIGNAL(mapped(QWidget*)), - this, SLOT(setActiveSubWindow(QWidget*))); + connect(windowMapper, SIGNAL(mapped(QWidget*)), this, SLOT(setActiveSubWindow(QWidget*))); - MaxRecentFiles=MAX_RECENT; - QSettings settings; - - restoreGeometry(settings.value("mainWindowGeometry").toByteArray()); createActions(); - createMenus(); createToolBars(); createStatusBar(); updateMenus(); - readSettings(); + + restoreState(glob.mainWindowState()); + + if (glob.profileId() == 0) + { + createProfile(); + glob.profileId( 1 ); + } setUnifiedTitleAndToolBarOnMac(true); this->setWindowIcon(QIcon(":/icon.png")); @@ -116,7 +116,7 @@ MainWindow::MainWindow(): // give time to the splash to disappear and main window to open before starting updates int updateDelay = 1000; - bool showSplash = settings.value("show_splash", true).toBool(); + bool showSplash = glob.show_splash(); if (showSplash) { updateDelay += (SPLASH_TIME*1000); } @@ -169,8 +169,7 @@ MainWindow::MainWindow(): void MainWindow::displayWarnings() { - QSettings settings; - int warnId=settings.value("warningId", 0 ).toInt(); + int warnId=glob.warningId(); if (warnId0) { @@ -181,10 +180,10 @@ void MainWindow::displayWarnings() res = QMessageBox::question(this, "Companion",tr("Display previous message again at startup ?"),QMessageBox::Yes | QMessageBox::No); } if (res == QMessageBox::No) { - settings.setValue("warningId", WARNING_ID); + glob.warningId(WARNING_ID); } } else if (warnId==0) { - settings.setValue("warningId", WARNING_ID); + glob.warningId(WARNING_ID); } } @@ -203,12 +202,11 @@ void MainWindow::checkForUpdates(bool ignoreSettings, QString & fwId) showcheckForUpdatesResult = ignoreSettings; check1done = true; check2done = true; - QSettings settings; fwToUpdate = fwId; QString stamp = GetFirmware(fwToUpdate)->stamp; if (!stamp.isEmpty()) { - if (checkFW || ignoreSettings) { + if (glob.startup_check_fw() || ignoreSettings) { check1done=false; manager1 = new QNetworkAccessManager(this); connect(manager1, SIGNAL(finished(QNetworkReply*)), this, SLOT(reply1Finished(QNetworkReply*))); @@ -219,7 +217,7 @@ void MainWindow::checkForUpdates(bool ignoreSettings, QString & fwId) } } - if (checkCompanion || ignoreSettings) { + if (glob.startup_check_companion() || ignoreSettings) { check2done = false; manager2 = new QNetworkAccessManager(this); connect(manager2, SIGNAL(finished(QNetworkReply*)),this, SLOT(checkForUpdateFinished(QNetworkReply*))); @@ -269,16 +267,14 @@ void MainWindow::checkForUpdateFinished(QNetworkReply * reply) "Would you like to download it?").arg(version) , QMessageBox::Yes | QMessageBox::No); - QSettings settings; - if (ret == QMessageBox::Yes) { #if defined __APPLE__ - QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), settings.value("lastUpdatesDir").toString() + QString(C9X_INSTALLER).arg(version)); + QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), glob.lastUpdatesDir() + QString(C9X_INSTALLER).arg(version)); #else - QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), settings.value("lastUpdatesDir").toString() + QString(C9X_INSTALLER).arg(version), tr("Executable (*.exe)")); + QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), glob.lastUpdatesDir() + QString(C9X_INSTALLER).arg(version), tr("Executable (*.exe)")); #endif if (!fileName.isEmpty()) { - settings.setValue("lastUpdatesDir", QFileInfo(fileName).dir().absolutePath()); + glob.lastUpdatesDir(QFileInfo(fileName).dir().absolutePath()); downloadDialog * dd = new downloadDialog(this, QString(OPENTX_COMPANION_DOWNLOADS C9X_INSTALLER).arg(version), fileName); installer_fileName = fileName; connect(dd, SIGNAL(accepted()), this, SLOT(updateDownloaded())); @@ -311,11 +307,10 @@ void MainWindow::updateDownloaded() void MainWindow::downloadLatestFW(FirmwareInfo * firmware, const QString & firmwareId) { QString url, ext, cpuid; - QSettings settings; url = firmware->getUrl(firmwareId); - cpuid=settings.value("cpuid","").toString(); + cpuid=glob.cpu_id(); ext = url.mid(url.lastIndexOf(".")); - QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), settings.value("lastFlashDir").toString() + "/" + firmwareId + ext); + QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), glob.lastFlashDir() + "/" + firmwareId + ext); if (!fileName.isEmpty()) { downloadedFW = firmwareId; needRename=true; @@ -324,7 +319,7 @@ void MainWindow::downloadLatestFW(FirmwareInfo * firmware, const QString & firmw url.append("&cpuid="); url.append(cpuid); } - settings.setValue("lastFlashDir", QFileInfo(fileName).dir().absolutePath()); + glob.lastFlashDir(QFileInfo(fileName).dir().absolutePath()); downloadDialog * dd = new downloadDialog(this, url, fileName); connect(dd, SIGNAL(accepted()), this, SLOT(reply1Accepted())); dd->exec(); @@ -457,7 +452,7 @@ void MainWindow::reply1Finished(QNetworkReply * reply) } QSettings settings; - cpuid=settings.value("cpuid","").toString(); + cpuid=glob.cpu_id(); QByteArray qba = reply->readAll(); int i = qba.indexOf("SVN_VERS"); int warning = qba.indexOf("WARNING"); @@ -471,9 +466,7 @@ void MainWindow::reply1Finished(QNetworkReply * reply) if(!cres) { QMessageBox::warning(this, "Companion", tr("Unable to check for updates.")); - int server = settings.value("fwserver",0).toInt(); - server++; - settings.setValue("fwserver",server); + glob.fwserver(glob.fwserver()+1); return; } @@ -571,12 +564,12 @@ void MainWindow::reply1Finished(QNetworkReply * reply) QString url = GetFirmware(fwToUpdate)->getUrl(fwToUpdate); QString ext = url.mid(url.lastIndexOf(".")); needRename=false; - bool addversion=settings.value("rename_firmware_files", false).toBool(); + bool addversion=glob.rename_firmware_files(); QString fileName; if (addversion) { - fileName = QFileDialog::getSaveFileName(this, tr("Save As"), settings.value("lastFlashDir").toString() + "/" + fwToUpdate + newrev + ext); + fileName = QFileDialog::getSaveFileName(this, tr("Save As"), glob.lastFlashDir() + "/" + fwToUpdate + newrev + ext); } else { - fileName = QFileDialog::getSaveFileName(this, tr("Save As"), settings.value("lastFlashDir").toString() + "/" + fwToUpdate + ext); + fileName = QFileDialog::getSaveFileName(this, tr("Save As"), glob.lastFlashDir() + "/" + fwToUpdate + ext); } if (!fileName.isEmpty()) { if (!cpuid.isEmpty()) { @@ -584,7 +577,7 @@ void MainWindow::reply1Finished(QNetworkReply * reply) url.append(cpuid); } downloadedFWFilename = fileName; - settings.setValue("lastFlashDir", QFileInfo(fileName).dir().absolutePath()); + glob.lastFlashDir(QFileInfo(fileName).dir().absolutePath()); downloadDialog * dd = new downloadDialog(this, url, fileName); currentFWrev_temp = NewFwRev; connect(dd, SIGNAL(accepted()), this, SLOT(reply1Accepted())); @@ -598,9 +591,7 @@ void MainWindow::reply1Finished(QNetworkReply * reply) } else { if(check1done && check2done) { QMessageBox::warning(this, "Companion", tr("Unable to check for updates.")); - int server = settings.value("fwserver",0).toInt(); - server++; - settings.setValue("fwserver",server); + glob.fwserver(glob.fwserver()+1); return; } } @@ -608,9 +599,8 @@ void MainWindow::reply1Finished(QNetworkReply * reply) void MainWindow::closeEvent(QCloseEvent *event) { - QSettings settings; - settings.setValue("mainWindowGeometry", saveGeometry()); - settings.setValue("mainWindowState", saveState()); + glob.mainWindowGeometry(saveGeometry()); + glob.mainWindowState(saveState()); mdiArea->closeAllSubWindows(); if (mdiArea->currentSubWindow()) { event->ignore(); @@ -622,8 +612,7 @@ void MainWindow::closeEvent(QCloseEvent *event) void MainWindow::setLanguage(QString langString) { - QSettings settings; - settings.setValue("locale", langString ); + glob.locale( langString ); QMessageBox msgBox; msgBox.setText(tr("The selected language will be used the next time you start Companion.")); @@ -634,8 +623,7 @@ void MainWindow::setLanguage(QString langString) void MainWindow::setTheme(int index) { - QSettings settings; - settings.setValue("theme", index ); + glob.theme( index ); QMessageBox msgBox; msgBox.setText(tr("The new theme will be loaded the next time you start Companion.")); @@ -646,8 +634,7 @@ void MainWindow::setTheme(int index) void MainWindow::setIconThemeSize(int index) { - QSettings settings; - settings.setValue("icon_size", index ); + glob.icon_size( index ); QMessageBox msgBox; msgBox.setText(tr("The icon size will be used the next time you start Companion.")); @@ -671,10 +658,9 @@ void MainWindow::openDocURL() void MainWindow::openFile() { - QSettings settings; - QString fileName = QFileDialog::getOpenFileName(this, tr("Open"), settings.value("lastDir").toString(),tr(EEPROM_FILES_FILTER)); + QString fileName = QFileDialog::getOpenFileName(this, tr("Open"), glob.lastDir(), tr(EEPROM_FILES_FILTER)); if (!fileName.isEmpty()) { - settings.setValue("lastDir", QFileInfo(fileName).dir().absolutePath()); + glob.lastDir(QFileInfo(fileName).dir().absolutePath()); QMdiSubWindow *existing = findMdiChild(fileName); if (existing) { @@ -704,11 +690,9 @@ void MainWindow::saveAs() void MainWindow::openRecentFile() { - QSettings settings; QAction *action = qobject_cast(sender()); if (action) { QString fileName=action->data().toString(); - // settings.setValue("lastDir", QFileInfo(fileName).dir().absolutePath()); QMdiSubWindow *existing = findMdiChild(fileName); if (existing) { @@ -1113,14 +1097,14 @@ void MainWindow::writeFileToEeprom() burnDialog *cd = new burnDialog(this, 1, &fileName, &backup); cd->exec(); if (!fileName.isEmpty()) { - settings.setValue("lastDir", QFileInfo(fileName).dir().absolutePath()); + glob.lastDir(QFileInfo(fileName).dir().absolutePath()); int ret = QMessageBox::question(this, "Companion", tr("Write Models and settings from %1 to the Tx?").arg(QFileInfo(fileName).fileName()), QMessageBox::Yes | QMessageBox::No); if (ret != QMessageBox::Yes) return; if (!isValidEEPROM(fileName)) ret = QMessageBox::question(this, "Companion", tr("The file %1\nhas not been recognized as a valid Models and Settings file\nWrite anyway ?").arg(QFileInfo(fileName).fileName()), QMessageBox::Yes | QMessageBox::No); if (ret != QMessageBox::Yes) return; - bool backupEnable = settings.value("backupEnable", true).toBool(); - QString backupPath = settings.value("backupPath", "").toString(); + bool backupEnable = glob.backupEnable(); + QString backupPath = glob.backupPath(); if (!backupPath.isEmpty()) { if (!QDir(backupPath).exists()) { if (backupEnable) { @@ -1361,9 +1345,8 @@ bool MainWindow::convertEEPROM(QString backupFile, QString restoreFile, QString void MainWindow::writeFlash(QString fileToFlash) { - QSettings settings; QString fileName; - bool backup = settings.value("backupOnFlash", false).toBool(); + bool backup = glob.backupOnFlash(); if(!fileToFlash.isEmpty()) fileName = fileToFlash; burnDialog *cd = new burnDialog(this, 2, &fileName, &backup); @@ -1371,12 +1354,12 @@ void MainWindow::writeFlash(QString fileToFlash) if (IS_TARANIS(GetEepromInterface()->getBoard())) backup=false; if (!fileName.isEmpty()) { - settings.setValue("backupOnFlash", backup); + glob.backupOnFlash(backup); if (backup) { QString tempDir = QDir::tempPath(); QString backupFile = tempDir + "/backup.bin"; - bool backupEnable=settings.value("backupEnable", true).toBool(); - QString backupPath=settings.value("backupPath", "").toString(); + bool backupEnable=glob.backupEnable(); + QString backupPath=glob.backupPath(); if (!backupPath.isEmpty() && !IS_TARANIS(GetEepromInterface()->getBoard())) { if (!QDir(backupPath).exists()) { if (backupEnable) { @@ -1430,8 +1413,8 @@ void MainWindow::writeFlash(QString fileToFlash) } } else { - bool backupEnable=settings.value("backupEnable", true).toBool(); - QString backupPath=settings.value("backupPath", "").toString(); + bool backupEnable=glob.backupEnable(); + QString backupPath=glob.backupPath(); if (!QDir(backupPath).exists()) { if (backupEnable) { QMessageBox::warning(this, tr("Backup is impossible"), tr("The backup dir set in preferences does not exist")); @@ -1460,8 +1443,7 @@ void MainWindow::writeFlash(QString fileToFlash) void MainWindow::readEepromToFile() { - QSettings settings; - QString fileName = QFileDialog::getSaveFileName(this, tr("Save transmitter Models and Settings to File"), settings.value("lastDir").toString(), tr(EXTERNAL_EEPROM_FILES_FILTER)); + QString fileName = QFileDialog::getSaveFileName(this, tr("Save transmitter Models and Settings to File"), glob.lastDir(), tr(EXTERNAL_EEPROM_FILES_FILTER)); if (!fileName.isEmpty()) { EEPROMInterface *eepromInterface = GetEepromInterface(); if (IS_TARANIS(eepromInterface->getBoard())) { @@ -1480,7 +1462,7 @@ void MainWindow::readEepromToFile() } } else { - settings.setValue("lastDir", QFileInfo(fileName).dir().absolutePath()); + glob.lastDir(QFileInfo(fileName).dir().absolutePath()); QStringList str = GetReceiveEEpromCommand(fileName); avrOutputDialog *ad = new avrOutputDialog(this, GetAvrdudeLocation(), str, tr("Read Models and Settings From Tx")); ad->setWindowIcon(CompanionIcon("read_eeprom.png")); @@ -1492,14 +1474,13 @@ void MainWindow::readEepromToFile() void MainWindow::readFlash() { - QSettings settings; - QString fileName = QFileDialog::getSaveFileName(this,tr("Read Tx Firmware to File"), settings.value("lastFlashDir").toString(),tr(FLASH_FILES_FILTER)); + QString fileName = QFileDialog::getSaveFileName(this,tr("Read Tx Firmware to File"), glob.lastFlashDir(),tr(FLASH_FILES_FILTER)); if (!fileName.isEmpty()) { QFile file(fileName); if (file.exists()) { file.remove(); } - settings.setValue("lastFlashDir",QFileInfo(fileName).dir().absolutePath()); + glob.lastFlashDir(QFileInfo(fileName).dir().absolutePath()); QStringList str = GetReceiveFlashCommand(fileName); avrOutputDialog *ad = new avrOutputDialog(this, GetAvrdudeLocation(), str, "Read Firmware From Tx"); ad->setWindowIcon(CompanionIcon("read_flash.png")); @@ -1578,8 +1559,7 @@ void MainWindow::updateMenus() updateIconSizeActions(); updateIconThemeActions(); - QSettings settings; - setWindowTitle(tr("OpenTX Companion - FW: %1 - Profile: %2").arg(GetCurrentFirmware()->name).arg(settings.value("profileId").toString())); + setWindowTitle(tr("OpenTX Companion - FW: %1 - Profile: %2").arg(GetCurrentFirmware()->name).arg( QString("%1").arg(glob.profileId()) )); } MdiChild *MainWindow::createMdiChild() @@ -1630,7 +1610,7 @@ void MainWindow::createActions() separatorAct = new QAction(this); separatorAct->setSeparator(true); - for (int i = 0; i < MaxRecentFiles; ++i) { + for (int i = 0; i < MAX_RECENT; ++i) { recentFileActs[i] = new QAction(this); recentFileActs[i]->setVisible(false); connect(recentFileActs[i], SIGNAL(triggered()), this, SLOT(openRecentFile())); @@ -1728,7 +1708,7 @@ void MainWindow::createMenus() fileMenu->addAction(saveAsAct); fileMenu->addMenu(recentFileMenu); recentFileMenu->setIcon(CompanionIcon("recentdocument.png")); - for (int i=0; iaddAction(recentFileActs[i]); fileMenu->addSeparator(); fileMenu->addAction(logsAct); @@ -1810,7 +1790,7 @@ void MainWindow::createMenus() QMenu *MainWindow::createRecentFileMenu() { QMenu *recentFileMenu = new QMenu(this); - for ( int i = 0; i < MaxRecentFiles; ++i) + for ( int i = 0; i < MAX_RECENT; ++i) recentFileMenu->addAction(recentFileActs[i]); return recentFileMenu; } @@ -1831,10 +1811,8 @@ QMenu *MainWindow::createProfilesMenu() void MainWindow::createToolBars() { - QSettings settings; - int icon_size=settings.value("icon_size",2 ).toInt(); QSize size; - switch(icon_size) { + switch(glob.icon_size()) { case 0: size=QSize(16,16); break; @@ -1919,20 +1897,6 @@ void MainWindow::createStatusBar() statusBar()->showMessage(tr("Ready")); } -void MainWindow::readSettings() -{ - QSettings settings; - restoreState(settings.value("mainWindowState").toByteArray()); - checkCompanion = settings.value("startup_check_companion", true).toBool(); - checkFW = settings.value("startup_check_fw", true).toBool(); - MaxRecentFiles =settings.value("history_size",10).toInt(); - if (settings.value("profileId",0).toInt() == 0) - { - createProfile(); - settings.setValue("profileId", "1"); - } -} - MdiChild *MainWindow::activeMdiChild() { if (QMdiSubWindow *activeSubWindow = mdiArea->activeSubWindow()) @@ -1965,7 +1929,7 @@ void MainWindow::updateRecentFileActions() QSettings settings; QStringList files = settings.value("recentFileList").toStringList(); - numRecentFiles = qMin(files.size(), (int)MaxRecentFiles); + numRecentFiles = qMin(files.size(), glob.history_size()); for ( i = 0; i < numRecentFiles; ++i) { QString text = tr("&%1 %2").arg(i + 1).arg(strippedName(files[i])); @@ -1973,15 +1937,14 @@ void MainWindow::updateRecentFileActions() recentFileActs[i]->setData(files[i]); recentFileActs[i]->setVisible(true); } - for ( j = numRecentFiles; j < MaxRecentFiles; ++j) + for ( j = numRecentFiles; j < glob.history_size(); ++j) recentFileActs[j]->setVisible(false); } void MainWindow::updateIconSizeActions() { - QSettings settings; - int size = settings.value("icon_size","0").toInt(); - switch (size){ + switch (glob.icon_size()) + { case 0: smallIconAct->setChecked(true); break; case 1: normalIconAct->setChecked(true); break; case 2: bigIconAct->setChecked(true); break; @@ -1991,8 +1954,7 @@ void MainWindow::updateIconSizeActions() void MainWindow::updateLanguageActions() { - QSettings settings; - QString langId = settings.value("locale","").toString(); + QString langId = glob.locale(); if (langId=="") sysLangAct->setChecked(true); @@ -2022,9 +1984,8 @@ void MainWindow::updateLanguageActions() void MainWindow::updateIconThemeActions() { - QSettings settings; - int size = settings.value("theme","1").toInt(); - switch (size){ + switch (glob.theme()) + { case 0: classicThemeAct->setChecked(true); break; case 1: newThemeAct->setChecked(true); break; case 2: monoWhiteAct->setChecked(true); break; @@ -2037,7 +1998,7 @@ void MainWindow::updateProfilesActions() { int i; QSettings settings; - int activeProfile = settings.value("profileId").toInt(); + int activeProfile = glob.profileId(); settings.beginGroup("Profiles"); for (i=0; i Date: Mon, 17 Feb 2014 15:28:50 +0100 Subject: [PATCH 07/85] Profiles working. Next all duplicated variables will be removed from global and only exists in profile. --- companion/src/appdata.h | 84 ++++++++++++++---- companion/src/apppreferencesdialog.cpp | 78 ++++++---------- companion/src/apppreferencesdialog.ui | 74 ++++++++-------- companion/src/mainwindow.cpp | 118 +++++++++---------------- 4 files changed, 173 insertions(+), 181 deletions(-) diff --git a/companion/src/appdata.h b/companion/src/appdata.h index 2d7add453..0a1d33589 100644 --- a/companion/src/appdata.h +++ b/companion/src/appdata.h @@ -230,8 +230,12 @@ class Profile:DataObj // All the set declarations + void Name (const QString str) { if (str.isEmpty()) // Name may never be empty! + store("----", _Name, "Name" ,"Profiles", QString("profile%1").arg(index)); + else + store(str, _Name, "Name" ,"Profiles", QString("profile%1").arg(index));} + void firmware (const QString str) { store(str, _firmware, "firmware" ,"Profiles", QString("profile%1").arg(index));} - void Name (const QString str) { store(str, _Name, "Name" ,"Profiles", QString("profile%1").arg(index));} void sdPath (const QString str) { store(str, _sdPath, "sdPath" ,"Profiles", QString("profile%1").arg(index));} void SplashFileName (const QString str) { store(str, _SplashFileName, "SplashFileName" ,"Profiles", QString("profile%1").arg(index));} void burnFirmware (const bool bl) { store(bl, _burnFirmware, "burnFirmware" ,"Profiles", QString("profile%1").arg(index));} @@ -258,17 +262,33 @@ class Profile:DataObj index = -1; } - void init(int newIndex) + void remove() + { + // Remove all profile values from settings file + QSettings settings(PRODUCT, COMPANY); + settings.beginGroup("Profiles"); + settings.remove(QString("profile%1").arg(index)); + settings.endGroup(); + + // Reset all profile variables to initial values + init(index); + } + + bool existsOnDisk() { - index = newIndex; + QSettings settings(PRODUCT, COMPANY); + settings.beginGroup("Profiles"); + settings.beginGroup(QString("profile%1").arg(index)); + QStringList keyList = settings.allKeys(); + settings.endGroup(); + settings.endGroup(); - QString pName; - retrieve( pName, "Name", "", "Profiles", QString("profile%1").arg(newIndex)); - if ( newIndex > 1 && pName.isEmpty()) - return; + return (keyList.length() > 0); + } + void flush() + { // Load and store all variables. Use default values if setting values are missing - getset( _firmware, "firmware" ,"" ,"Profiles", QString("profile%1").arg(index)); getset( _Name, "Name" ,"----" ,"Profiles", QString("profile%1").arg(index)); getset( _sdPath, "sdPath" ,"" ,"Profiles", QString("profile%1").arg(index)); @@ -289,7 +309,43 @@ class Profile:DataObj getset( _StickPotCalib, "StickPotCalib" ,"" ,"Profiles", QString("profile%1").arg(index)); getset( _TrainerCalib, "TrainerCalib" ,"" ,"Profiles", QString("profile%1").arg(index)); getset( _VbatCalib, "VbatCalib" ,"" ,"Profiles", QString("profile%1").arg(index)); - getset( _vBatWarn, "vBatWarn" ,"" ,"Profiles", QString("profile%1").arg(index)); + getset( _vBatWarn, "vBatWarn" ,"" ,"Profiles", QString("profile%1").arg(index)); + } + + void init(int newIndex) + { + index = newIndex; + + _firmware = ""; + _Name = ""; + _sdPath = ""; + _SplashFileName = ""; + _burnFirmware = false; + _rename_firmware_files = false; + _default_channel_order = 0; + _default_mode = 1; + + _Beeper = ""; + _countryCode = ""; + _currentCalib = ""; + _Display = ""; + _GSStickMode = ""; + _Haptic = ""; + _PPM_Multiplier = ""; + _Speaker = ""; + _StickPotCalib = ""; + _TrainerCalib = ""; + _VbatCalib = ""; + _vBatWarn = ""; + + QString pName; + retrieve( pName, "Name", "", "Profiles", QString("profile%1").arg(index)); + + // Do not write empty profiles to disk except the default (0) profile. + if ( index > 0 && !existsOnDisk()) + return; + + flush(); } }; @@ -307,7 +363,6 @@ class AppData:DataObj QString _firmware; QString _locale; QString _cpu_id; - QString _SplashImage; QString _Name; QString _SplashFileName; QString _modelEditGeometry; @@ -360,7 +415,6 @@ public: QString firmware() { return _firmware; } QString locale() { return _locale; } QString cpu_id() { return _cpu_id; } - QString SplashImage() { return _SplashImage; } QString Name() { return _Name; } QString SplashFileName() { return _SplashFileName; } QString modelEditGeometry() { return _modelEditGeometry; } @@ -409,7 +463,6 @@ public: void firmware (const QString str) { store(str, _firmware, "firmware" );} void locale (const QString str) { store(str, _locale, "locale" );} void cpu_id (const QString str) { store(str, _cpu_id, "cpu_id" );} - void SplashImage (const QString str) { store(str, _SplashImage, "SplashImage" );} void Name (const QString str) { store(str, _Name, "Name" );} void SplashFileName (const QString str) { store(str, _SplashFileName, "SplashFileName" );} void modelEditGeometry (const QString str) { store(str, _modelEditGeometry, "modelEditGeometry" );} @@ -466,7 +519,7 @@ public: //Initialize the index variables of the profiles for (int i=0; iprofileNameLE->text()); glob.sdPath(ui->sdPath->text()); glob.SplashFileName(ui->SplashFileName->text()); - if (!ui->SplashFileName->text().isEmpty()) - glob.SplashImage(""); glob.firmware(ui->firmwareLE->text()); saveProfile(); @@ -85,13 +83,10 @@ void appPreferencesDialog::initSettings() { ui->snapshotClipboardCKB->setChecked(glob.snapshot_to_clipboard()); ui->burnFirmware->setChecked(glob.burnFirmware()); - - QString Path=glob.snapshotpath(); - if (QDir(Path).exists()) { - ui->snapshotPath->setText(Path); - ui->snapshotPath->setReadOnly(true); - } - if (ui->snapshotClipboardCKB->isChecked()) { + ui->snapshotPath->setText(glob.snapshotpath()); + ui->snapshotPath->setReadOnly(true); + if (ui->snapshotClipboardCKB->isChecked()) + { ui->snapshotPath->setDisabled(true); ui->snapshotPathButton->setDisabled(true); } @@ -102,19 +97,12 @@ void appPreferencesDialog::initSettings() ui->historySize->setValue(glob.history_size()); ui->backLightColor->setCurrentIndex(glob.backLight()); ui->simuSW->setChecked(glob.simuSW()); + ui->libraryPath->setText(glob.libraryPath()); + ui->ge_lineedit->setText(glob.gePath()); - Path=glob.libraryPath(); - if (QDir(Path).exists()) { - ui->libraryPath->setText(Path); - } - Path=glob.gePath(); - if (QFile(Path).exists()) { - ui->ge_lineedit->setText(Path); - } - Path=glob.backupPath(); - if (!Path.isEmpty()) { - if (QDir(Path).exists()) { - ui->backupPath->setText(Path); + if (!glob.backupPath().isEmpty()) { + if (QDir(glob.backupPath()).exists()) { + ui->backupPath->setText(glob.backupPath()); ui->backupEnable->setEnabled(true); ui->backupEnable->setChecked(glob.backupEnable()); } else { @@ -156,22 +144,12 @@ void appPreferencesDialog::initSettings() ui->channelorderCB->setCurrentIndex(glob.default_channel_order()); ui->stickmodeCB->setCurrentIndex(glob.default_mode()); ui->renameFirmware->setChecked(glob.rename_firmware_files()); - Path=glob.sdPath(); - if (QDir(Path).exists()) { - ui->sdPath->setText(Path); - } + ui->sdPath->setText(glob.sdPath()); ui->profileIndexLE->setText(QString("%1").arg(glob.profileId())); ui->profileNameLE->setText(glob.Name()); - - QString fileName=glob.SplashFileName(); - if (!fileName.isEmpty()) { - QFile file(fileName); - if (file.exists()){ - ui->SplashFileName->setText(fileName); - displayImage( fileName ); - } - } ui->firmwareLE->setText(glob.firmware()); + ui->SplashFileName->setText(glob.SplashFileName()); + displayImage( glob.SplashFileName() ); } void appPreferencesDialog::on_libraryPathButton_clicked() @@ -261,13 +239,10 @@ void appPreferencesDialog::on_sdPathButton_clicked() void appPreferencesDialog::saveProfile() { // The profile name may NEVER be empty - QString profile=QString("profile") + QString("%1").arg(glob.profileId()); - QString name=ui->profileNameLE->text(); - if (name.isEmpty()) { - name = profile; - ui->profileNameLE->setText(name); - } - glob.profile[glob.profileId()].Name( name ); + if (ui->profileNameLE->text().isEmpty()) + ui->profileNameLE->setText("----"); + + glob.profile[glob.profileId()].Name( ui->profileNameLE->text() ); glob.profile[glob.profileId()].default_channel_order( ui->channelorderCB->currentIndex()); glob.profile[glob.profileId()].default_mode( ui->stickmodeCB->currentIndex()); glob.profile[glob.profileId()].burnFirmware( ui->burnFirmware->isChecked()); @@ -293,16 +268,12 @@ void appPreferencesDialog::loadFromProfile() void appPreferencesDialog::on_removeProfileButton_clicked() { QSettings settings; - if ( glob.profileId() == 1 ) + if ( glob.profileId() == 0 ) QMessageBox::information(this, tr("Not possible to remove profile"), tr("The default profile can not be removed.")); else { - QString profile=QString("profile") + QString("%1").arg(glob.profileId()); - settings.beginGroup("Profiles"); - settings.remove(profile); - settings.endGroup(); - glob.profileId( 1 ); - + glob.profile[glob.profileId()].remove(); + glob.profileId( 0 ); loadFromProfile(); initSettings(); } @@ -310,6 +281,9 @@ void appPreferencesDialog::on_removeProfileButton_clicked() bool appPreferencesDialog::displayImage( QString fileName ) { + // Start by filling the pixmap with white + ui->imageLabel->setPixmap(QPixmap()); + QImage image(fileName); if (image.isNull()) return false; @@ -361,11 +335,11 @@ void appPreferencesDialog::on_SplashSelect_clicked() QString fileName = QFileDialog::getOpenFileName(this, tr("Open Image to load"), glob.lastImagesDir(), tr("Images (%1)").arg(supportedImageFormats)); - if (!fileName.isEmpty()) { + if (!fileName.isEmpty()){ glob.lastImagesDir(QFileInfo(fileName).dir().absolutePath()); - - if (displayImage(fileName)) - ui->SplashFileName->setText(fileName); + + displayImage(fileName); + ui->SplashFileName->setText(fileName); } } diff --git a/companion/src/apppreferencesdialog.ui b/companion/src/apppreferencesdialog.ui index 9a7680a42..c15874915 100644 --- a/companion/src/apppreferencesdialog.ui +++ b/companion/src/apppreferencesdialog.ui @@ -7,7 +7,7 @@ 0 0 685 - 462 + 446 @@ -839,16 +839,6 @@ This is used by the templated to determine which channel goes to what number out - - - - - 0 - 0 - - - - @@ -872,7 +862,35 @@ This is used by the templated to determine which channel goes to what number out - + + + + Firmware + + + + + + + false + + + + + + + Select Image + + + + + + + Clear Image + + + + false @@ -885,17 +903,13 @@ This is used by the templated to determine which channel goes to what number out - - - - Firmware - - - - - - - false + + + + + 0 + 0 + @@ -933,20 +947,6 @@ This is used by the templated to determine which channel goes to what number out - - - - Select Image - - - - - - - Clear Image - - - diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index 8d395e570..8918796be 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -102,12 +102,6 @@ MainWindow::MainWindow(): restoreState(glob.mainWindowState()); - if (glob.profileId() == 0) - { - createProfile(); - glob.profileId( 1 ); - } - setUnifiedTitleAndToolBarOnMac(true); this->setWindowIcon(QIcon(":/icon.png")); this->setIconSize(QSize(32,32)); @@ -708,42 +702,33 @@ void MainWindow::openRecentFile() } } -void MainWindow::loadProfile() +void MainWindow::loadProfile() //TODO Load all variables - Also HW! { - QSettings settings; QAction *action = qobject_cast(sender()); if (action) { + // Set the new profile number int profnum=action->data().toInt(); - QSettings settings; - settings.setValue("profileId",profnum); - settings.beginGroup("Profiles"); - QString profile=QString("profile%1").arg(profnum); - settings.beginGroup(profile); - QString profileName=settings.value("Name", "").toString(); - int chord=settings.value("default_channel_order", 0).toInt(); - int defmod=settings.value("default_mode", 0).toInt(); - bool burnfw=settings.value("burnFirmware", false).toBool(); - QString sdPath=settings.value("sdPath", ".").toString(); - bool renfw=settings.value("rename_firmware_files", false).toBool(); - QString SplashFileName=settings.value("SplashFileName","").toString(); - QString SplashImage=settings.value("SplashImage", "").toString(); - QString firmware_id=settings.value("firmware", default_firmware_variant.id).toString(); - firmware_id.replace("open9x","opentx"); - firmware_id.replace("x9da","taranis"); - settings.setValue("firmware", firmware_id); - settings.endGroup(); - settings.endGroup(); - settings.setValue("Name", profileName ); - settings.setValue("default_channel_order", chord); - settings.setValue("default_mode", defmod); - settings.setValue("burnFirmware", burnfw); - settings.setValue("rename_firmware_files", renfw); - settings.setValue("sdPath", sdPath); - settings.setValue("SplashFileName", SplashFileName); - settings.setValue("SplashImage", SplashImage); - settings.setValue("firmware", firmware_id); - current_firmware_variant = GetFirmwareVariant(firmware_id); + glob.profileId( profnum ); + + // Upgrade old firmware names + QString firmware = glob.profile[profnum].firmware(); + firmware.replace("open9x","opentx"); + firmware.replace("x9da","taranis"); + glob.profile[profnum].firmware(firmware); + + // Copy profile data from profile to main variables + glob.Name( glob.profile[profnum].Name() ); + glob.default_channel_order( glob.profile[profnum].default_channel_order() ); + glob.default_mode( glob.profile[profnum].default_mode() ); + glob.burnFirmware( glob.profile[profnum].burnFirmware() ); + glob.rename_firmware_files( glob.profile[profnum].rename_firmware_files() ); + glob.sdPath( glob.profile[profnum].sdPath() ); + glob.SplashFileName( glob.profile[profnum].SplashFileName() ); + glob.firmware( glob.profile[profnum].firmware() ); + + // TODO Get rid of this global variable - glob.firmware is the real source + current_firmware_variant = GetFirmwareVariant(glob.firmware()); foreach (QMdiSubWindow *window, mdiArea->subWindowList()) { MdiChild *mdiChild = qobject_cast(window->widget()); @@ -1091,7 +1076,6 @@ void MainWindow::readEeprom() void MainWindow::writeFileToEeprom() { - QSettings settings; QString fileName; bool backup = false; burnDialog *cd = new burnDialog(this, 1, &fileName, &backup); @@ -1559,7 +1543,7 @@ void MainWindow::updateMenus() updateIconSizeActions(); updateIconThemeActions(); - setWindowTitle(tr("OpenTX Companion - FW: %1 - Profile: %2").arg(GetCurrentFirmware()->name).arg( QString("%1").arg(glob.profileId()) )); + setWindowTitle(tr("OpenTX Companion - FW: %1 - Profile: %2").arg(GetCurrentFirmware()->name).arg( glob.Name() )); } MdiChild *MainWindow::createMdiChild() @@ -1802,8 +1786,8 @@ QMenu *MainWindow::createProfilesMenu() for ( i = 0; i < MAX_PROFILES; ++i) { profilesMenu->addAction(profileActs[i]); } - if ( i>0 ) - profilesMenu->addSeparator(); + profilesMenu->addSeparator(); + profilesMenu->addAction(createProfileAct); profilesMenu->setIcon(CompanionIcon("profiles.png")); return profilesMenu; @@ -1996,52 +1980,34 @@ void MainWindow::updateIconThemeActions() void MainWindow::updateProfilesActions() { - int i; - QSettings settings; - int activeProfile = glob.profileId(); - - settings.beginGroup("Profiles"); - for (i=0; isetText(text); - profileActs[i]->setData(i+1); + profileActs[i]->setData(i); profileActs[i]->setVisible(true); - if ((i+1) == activeProfile) + if (i == glob.profileId()) profileActs[i]->setChecked(true); } - else { + else + { profileActs[i]->setVisible(false); } - settings.endGroup(); } } void MainWindow::createProfile() -{ - int firstFreeIndex = 0; - QSettings settings; - settings.beginGroup("Profiles"); - for (int i=0; firstFreeIndex ==0 && i Date: Mon, 17 Feb 2014 20:59:11 +0100 Subject: [PATCH 08/85] Revert "Merge branch 'next'" This reverts commit a2ecdaa4841ee070329a8547fc7b6cc963a07bd9, reversing changes made to c90959009164d9ec627fa87c538be5c7faf36ebe. --- .gitignore | 2 - DONATIONS.txt | 1 - companion/src/CMakeLists.txt | 15 +- companion/src/burndialog.cpp | 4 +- companion/src/customizesplashdialog.cpp | 2 +- companion/src/eeprominterface.cpp | 10 +- companion/src/eeprominterface.h | 18 +- .../opentx/opentxTaranisSimulator.cpp | 33 +- .../src/firmwares/opentx/opentxeeprom.cpp | 22 +- companion/src/flashinterface.cpp | 2 +- companion/src/flashinterface.h | 2 +- companion/src/fwpreferencesdialog.ui | 2 +- companion/src/helpers.cpp | 4 +- companion/src/mainwindow.cpp | 584 +- companion/src/mainwindow.h | 80 +- companion/src/mdichild.cpp | 2 +- companion/src/mdichild.h | 2 +- companion/src/translations.qrc.in | 7 +- companion/src/translations/companion_fi.ts | 11084 ---------------- companion/src/translations/companion_pl.ts | 948 +- companion/src/translations/companion_sv.ts | 660 +- radio/.gitignore | 1 - radio/src/.gitignore | 3 +- radio/src/Makefile | 35 +- radio/src/eeprom_conversions.cpp | 19 +- radio/src/fonts/sqt5/font_fi_04x06.png | Bin 168 -> 0 bytes radio/src/fonts/sqt5/font_fi_05x07.png | Bin 174 -> 0 bytes radio/src/fonts/sqt5/font_fi_08x10.png | Bin 196 -> 0 bytes radio/src/fonts/sqt5/font_fi_10x14.png | Bin 214 -> 0 bytes radio/src/fonts/std/font_fi_04x06.png | Bin 169 -> 0 bytes radio/src/fonts/std/font_fi_05x07.png | Bin 160 -> 0 bytes radio/src/fonts/std/font_fi_08x10.png | Bin 208 -> 0 bytes radio/src/fonts/std/font_fi_10x14.png | Bin 233 -> 0 bytes radio/src/lcd.cpp | 3 - radio/src/lua.cpp | 1124 -- radio/src/lua/Makefile | 114 - radio/src/lua/README | 6 - radio/src/lua/doc/contents.html | 533 - radio/src/lua/doc/logo.gif | Bin 4232 -> 0 bytes radio/src/lua/doc/lua.1 | 116 - radio/src/lua/doc/lua.css | 83 - radio/src/lua/doc/luac.1 | 118 - radio/src/lua/doc/manual.css | 26 - radio/src/lua/doc/manual.html | 10507 --------------- radio/src/lua/doc/osi-certified-72x60.png | Bin 3774 -> 0 bytes radio/src/lua/doc/readme.html | 412 - radio/src/lua/src/Makefile | 187 - radio/src/lua/src/lapi.c | 1284 -- radio/src/lua/src/lapi.h | 24 - radio/src/lua/src/lauxlib.c | 997 -- radio/src/lua/src/lauxlib.h | 215 - radio/src/lua/src/lbaselib.c | 456 - radio/src/lua/src/lbitlib.c | 210 - radio/src/lua/src/lcode.c | 881 -- radio/src/lua/src/lcode.h | 83 - radio/src/lua/src/lcorolib.c | 154 - radio/src/lua/src/lctype.c | 52 - radio/src/lua/src/lctype.h | 95 - radio/src/lua/src/ldblib.c | 396 - radio/src/lua/src/ldebug.c | 580 - radio/src/lua/src/ldebug.h | 34 - radio/src/lua/src/ldo.c | 673 - radio/src/lua/src/ldo.h | 46 - radio/src/lua/src/ldump.c | 173 - radio/src/lua/src/lfunc.c | 161 - radio/src/lua/src/lfunc.h | 33 - radio/src/lua/src/lgc.c | 1213 -- radio/src/lua/src/lgc.h | 157 - radio/src/lua/src/linit.c | 66 - radio/src/lua/src/liolib.c | 663 - radio/src/lua/src/llex.c | 527 - radio/src/lua/src/llex.h | 78 - radio/src/lua/src/llimits.h | 309 - radio/src/lua/src/lmathlib.c | 278 - radio/src/lua/src/lmem.c | 98 - radio/src/lua/src/lmem.h | 57 - radio/src/lua/src/loadlib.c | 731 - radio/src/lua/src/lobject.c | 287 - radio/src/lua/src/lobject.h | 607 - radio/src/lua/src/lopcodes.c | 107 - radio/src/lua/src/lopcodes.h | 288 - radio/src/lua/src/loslib.c | 322 - radio/src/lua/src/lparser.c | 1638 --- radio/src/lua/src/lparser.h | 119 - radio/src/lua/src/lstate.c | 322 - radio/src/lua/src/lstate.h | 228 - radio/src/lua/src/lstring.c | 185 - radio/src/lua/src/lstring.h | 46 - radio/src/lua/src/lstrlib.c | 1017 -- radio/src/lua/src/ltable.c | 589 - radio/src/lua/src/ltable.h | 41 - radio/src/lua/src/ltablib.c | 282 - radio/src/lua/src/ltm.c | 77 - radio/src/lua/src/ltm.h | 57 - radio/src/lua/src/lua.c | 496 - radio/src/lua/src/lua.h | 455 - radio/src/lua/src/lua.hpp | 9 - radio/src/lua/src/luac.c | 431 - radio/src/lua/src/luaconf.h | 562 - radio/src/lua/src/lualib.h | 55 - radio/src/lua/src/lundump.c | 258 - radio/src/lua/src/lundump.h | 28 - radio/src/lua/src/lvm.c | 867 -- radio/src/lua/src/lvm.h | 44 - radio/src/lua/src/lzio.c | 76 - radio/src/lua/src/lzio.h | 65 - radio/src/maths.cpp | 2 +- radio/src/myeeprom.h | 8 +- radio/src/opentx.cpp | 24 +- radio/src/simpgmspace.cpp | 4 +- radio/src/telemetry/frsky.h | 6 +- radio/src/telemetry/frsky_sport.cpp | 8 +- radio/src/telemetry/frsky_sport.h | 4 - radio/src/translations.cpp | 8 - radio/src/translations.h | 3 - radio/src/translations/.gitignore | 1 - radio/src/translations/cz.h.txt | 2 +- radio/src/translations/de.h.txt | 2 +- radio/src/translations/en.h | 2 +- radio/src/translations/es.h.txt | 2 +- radio/src/translations/fi.h.txt | 800 -- radio/src/translations/fr.h.txt | 2 +- radio/src/translations/it.h.txt | 2 +- radio/src/translations/pl.h.txt | 29 +- radio/src/translations/pt.h.txt | 2 +- radio/src/translations/se.h.txt | 2 +- radio/util/translate.py | 7 - 127 files changed, 1083 insertions(+), 46890 deletions(-) delete mode 100644 .gitignore delete mode 100644 companion/src/translations/companion_fi.ts delete mode 100644 radio/.gitignore delete mode 100644 radio/src/fonts/sqt5/font_fi_04x06.png delete mode 100644 radio/src/fonts/sqt5/font_fi_05x07.png delete mode 100644 radio/src/fonts/sqt5/font_fi_08x10.png delete mode 100644 radio/src/fonts/sqt5/font_fi_10x14.png delete mode 100644 radio/src/fonts/std/font_fi_04x06.png delete mode 100644 radio/src/fonts/std/font_fi_05x07.png delete mode 100644 radio/src/fonts/std/font_fi_08x10.png delete mode 100644 radio/src/fonts/std/font_fi_10x14.png delete mode 100644 radio/src/lua.cpp delete mode 100644 radio/src/lua/Makefile delete mode 100644 radio/src/lua/README delete mode 100644 radio/src/lua/doc/contents.html delete mode 100644 radio/src/lua/doc/logo.gif delete mode 100644 radio/src/lua/doc/lua.1 delete mode 100644 radio/src/lua/doc/lua.css delete mode 100644 radio/src/lua/doc/luac.1 delete mode 100644 radio/src/lua/doc/manual.css delete mode 100644 radio/src/lua/doc/manual.html delete mode 100644 radio/src/lua/doc/osi-certified-72x60.png delete mode 100644 radio/src/lua/doc/readme.html delete mode 100644 radio/src/lua/src/Makefile delete mode 100644 radio/src/lua/src/lapi.c delete mode 100644 radio/src/lua/src/lapi.h delete mode 100644 radio/src/lua/src/lauxlib.c delete mode 100644 radio/src/lua/src/lauxlib.h delete mode 100644 radio/src/lua/src/lbaselib.c delete mode 100644 radio/src/lua/src/lbitlib.c delete mode 100644 radio/src/lua/src/lcode.c delete mode 100644 radio/src/lua/src/lcode.h delete mode 100644 radio/src/lua/src/lcorolib.c delete mode 100644 radio/src/lua/src/lctype.c delete mode 100644 radio/src/lua/src/lctype.h delete mode 100644 radio/src/lua/src/ldblib.c delete mode 100644 radio/src/lua/src/ldebug.c delete mode 100644 radio/src/lua/src/ldebug.h delete mode 100644 radio/src/lua/src/ldo.c delete mode 100644 radio/src/lua/src/ldo.h delete mode 100644 radio/src/lua/src/ldump.c delete mode 100644 radio/src/lua/src/lfunc.c delete mode 100644 radio/src/lua/src/lfunc.h delete mode 100644 radio/src/lua/src/lgc.c delete mode 100644 radio/src/lua/src/lgc.h delete mode 100644 radio/src/lua/src/linit.c delete mode 100644 radio/src/lua/src/liolib.c delete mode 100644 radio/src/lua/src/llex.c delete mode 100644 radio/src/lua/src/llex.h delete mode 100644 radio/src/lua/src/llimits.h delete mode 100644 radio/src/lua/src/lmathlib.c delete mode 100644 radio/src/lua/src/lmem.c delete mode 100644 radio/src/lua/src/lmem.h delete mode 100644 radio/src/lua/src/loadlib.c delete mode 100644 radio/src/lua/src/lobject.c delete mode 100644 radio/src/lua/src/lobject.h delete mode 100644 radio/src/lua/src/lopcodes.c delete mode 100644 radio/src/lua/src/lopcodes.h delete mode 100644 radio/src/lua/src/loslib.c delete mode 100644 radio/src/lua/src/lparser.c delete mode 100644 radio/src/lua/src/lparser.h delete mode 100644 radio/src/lua/src/lstate.c delete mode 100644 radio/src/lua/src/lstate.h delete mode 100644 radio/src/lua/src/lstring.c delete mode 100644 radio/src/lua/src/lstring.h delete mode 100644 radio/src/lua/src/lstrlib.c delete mode 100644 radio/src/lua/src/ltable.c delete mode 100644 radio/src/lua/src/ltable.h delete mode 100644 radio/src/lua/src/ltablib.c delete mode 100644 radio/src/lua/src/ltm.c delete mode 100644 radio/src/lua/src/ltm.h delete mode 100644 radio/src/lua/src/lua.c delete mode 100644 radio/src/lua/src/lua.h delete mode 100644 radio/src/lua/src/lua.hpp delete mode 100644 radio/src/lua/src/luac.c delete mode 100644 radio/src/lua/src/luaconf.h delete mode 100644 radio/src/lua/src/lualib.h delete mode 100644 radio/src/lua/src/lundump.c delete mode 100644 radio/src/lua/src/lundump.h delete mode 100644 radio/src/lua/src/lvm.c delete mode 100644 radio/src/lua/src/lvm.h delete mode 100644 radio/src/lua/src/lzio.c delete mode 100644 radio/src/lua/src/lzio.h delete mode 100644 radio/src/translations/fi.h.txt diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 541e88799..000000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/.project -/.settings diff --git a/DONATIONS.txt b/DONATIONS.txt index 327369f8f..ad2efa2db 100644 --- a/DONATIONS.txt +++ b/DONATIONS.txt @@ -318,4 +318,3 @@ Robert Miller Aviomotive - www.aviomotive.com Mark Gaskievicz Roland Müller -Frank Gewalt diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt index 6356ce744..20c86879c 100644 --- a/companion/src/CMakeLists.txt +++ b/companion/src/CMakeLists.txt @@ -80,15 +80,7 @@ IF( Subversion_FOUND ) # Subversion_WC_INFO( ${PROJECT_SOURCE_DIR} C9X ) ENDIF( ) -set(RADIO_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/../../radio/src) - -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${RADIO_SRC_DIRECTORY}/../.. - ${RADIO_SRC_DIRECTORY} - ${RADIO_SRC_DIRECTORY}/fonts/std - ${RADIO_SRC_DIRECTORY}/lua/src -) +INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/../.. ${PROJECT_SOURCE_DIR}/../../radio/src/fonts/std ) set(TH9X_CHECKOUT_DIRECTORY ${PROJECT_BINARY_DIR}/firmwares/th9x) add_custom_command( @@ -117,6 +109,8 @@ add_custom_command( DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/firmwares/ersky9x/ersky9xsimulator.cpp ) +set(RADIO_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/../../radio/src) + add_custom_command( OUTPUT ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.lbm COMMAND make lbm @@ -304,7 +298,8 @@ ENDIF( ) INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ) INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ) -SET( LANGUAGES he pl pt ru de fr it sv cs fi) + +SET( LANGUAGES he pl pt ru de fr it sv cs ) FOREACH( language ${LANGUAGES} ) SET( companion_TS ${companion_TS} translations/companion_${language}.ts ) ENDFOREACH( language ) diff --git a/companion/src/burndialog.cpp b/companion/src/burndialog.cpp index bfdf0bc76..f1d7f5482 100644 --- a/companion/src/burndialog.cpp +++ b/companion/src/burndialog.cpp @@ -212,8 +212,8 @@ void burnDialog::checkFw(QString fileName) ui->SplashFrame->show(); ui->ImageLoadButton->setEnabled(true); ui->libraryButton->setEnabled(true); - ui->FwImage->setFixedSize(flash.getSplashWidth(), flash.getSplashHeight()); - ui->imageLabel->setFixedSize(flash.getSplashWidth(), flash.getSplashHeight()); + ui->FwImage->setFixedSize(flash.getSplashWidth(),flash.getSplashHeight()); + ui->imageLabel->setFixedSize(flash.getSplashWidth(),flash.getSplashHeight()); ui->FwImage->show(); ui->FwImage->setPixmap(QPixmap::fromImage(flash.getSplash())); QString ImageStr = settings.value("SplashImage", "").toString(); diff --git a/companion/src/customizesplashdialog.cpp b/companion/src/customizesplashdialog.cpp index 420266b7a..5e072e851 100644 --- a/companion/src/customizesplashdialog.cpp +++ b/companion/src/customizesplashdialog.cpp @@ -37,7 +37,7 @@ bool Side::displayImage( QString fileName, Source pictSource ) return false; else image = flash.getSplash(); - *format = (flash.getSplashWidth()==WIDTH_TARANIS ? LCDTARANIS : LCD9X); + *format = flash.getSplashWidth()==WIDTH_TARANIS ? LCDTARANIS : LCD9X; } else { image.load(fileName); diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp index bb2861cf8..6a3806b21 100644 --- a/companion/src/eeprominterface.cpp +++ b/companion/src/eeprominterface.cpp @@ -57,8 +57,8 @@ RawSourceRange RawSource::getRange(bool singleprec) break; case TELEMETRY_SOURCE_TIMER1: case TELEMETRY_SOURCE_TIMER2: - result.step = singleprec ? 5 : 1; - result.max = singleprec ? 255*5 : 7200; + result.step = singleprec ? 3 : 1; + result.max = singleprec ? 765 : 7200; break; case TELEMETRY_SOURCE_RSSI_TX: case TELEMETRY_SOURCE_RSSI_RX: @@ -175,9 +175,9 @@ QString RawSource::toString() static const QString telemetry[] = { QObject::tr("Batt"), QObject::tr("Timer1"), QObject::tr("Timer2"), (IS_TARANIS(GetEepromInterface()->getBoard()) ? QObject::tr("SWR") : QObject::tr("Tx")), (IS_TARANIS(GetEepromInterface()->getBoard()) ? QObject::tr("RSSI") : QObject::tr("Rx")), QObject::tr("A1"), QObject::tr("A2"), QObject::tr("Alt"), QObject::tr("Rpm"), QObject::tr("Fuel"), QObject::tr("T1"), QObject::tr("T2"), QObject::tr("Speed"), QObject::tr("Dist"), QObject::tr("GPS Alt"), QObject::tr("Cell"), QObject::tr("Cels"), QObject::tr("Vfas"), QObject::tr("Curr"), - QObject::tr("Cnsp"), QObject::tr("Powr"), QObject::tr("AccX"), QObject::tr("AccY"), QObject::tr("AccZ"), QObject::tr("HDG "), QObject::tr("VSpd"), QObject::tr("ASpd"), QObject::tr("dTE"), - QObject::tr("A1-"), QObject::tr("A2-"), QObject::tr("Alt-"), QObject::tr("Alt+"), QObject::tr("Rpm+"), QObject::tr("T1+"), QObject::tr("T2+"), QObject::tr("Spd+"), QObject::tr("Dst+"), QObject::tr("Cel-"), QObject::tr("Vfs-"), QObject::tr("Cur+"), QObject::tr("Pwr+"), - QObject::tr("ACC "), QObject::tr("Time"), + QObject::tr("Cnsp"), QObject::tr("Powr"), QObject::tr("AccX"), QObject::tr("AccY"), QObject::tr("AccZ"), QObject::tr("HDG "), QObject::tr("VSpd"), QObject::tr("A1-"), + QObject::tr("A2-"), QObject::tr("Alt-"), QObject::tr("Alt+"), QObject::tr("Rpm+"), QObject::tr("T1+"), QObject::tr("T2+"), QObject::tr("Spd+"), QObject::tr("Dst+"), + QObject::tr("Cur+"), QObject::tr("Pwr+"), QObject::tr("ACC "), QObject::tr("Time"), }; static const QString virtualSwitches[] = { QObject::tr("LS1"), QObject::tr("LS2"), QObject::tr("LS3"), QObject::tr("LS4"), QObject::tr("LS5"), QObject::tr("LS6"), QObject::tr("LS7"), QObject::tr("LS8"), QObject::tr("LS9"), QObject::tr("LSA"), diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h index 60f99b41a..4c5780b82 100644 --- a/companion/src/eeprominterface.h +++ b/companion/src/eeprominterface.h @@ -198,8 +198,6 @@ enum TelemetrySource { TELEMETRY_SOURCE_ACCZ, TELEMETRY_SOURCE_HDG, TELEMETRY_SOURCE_VERTICAL_SPEED, - TELEMETRY_SOURCE_ASPD, - TELEMETRY_SOURCE_DTE, TELEMETRY_SOURCE_A1_MIN, TELEMETRY_SOURCE_A2_MIN, TELEMETRY_SOURCE_ALT_MIN, @@ -209,8 +207,7 @@ enum TelemetrySource { TELEMETRY_SOURCE_T2_MAX, TELEMETRY_SOURCE_SPEED_MAX, TELEMETRY_SOURCE_DIST_MAX, - TELEMETRY_SOURCE_CELL_MIN, - TELEMETRY_SOURCE_VFAS_MIN, + TELEMETRY_SOURCE_CURRENT_MAX, TELEMETRY_SOURCE_POWER_MAX, TELEMETRY_SOURCE_ACC, TELEMETRY_SOURCE_GPS_TIME, @@ -856,17 +853,6 @@ class ModuleData { void clear() { memset(this, 0, sizeof(ModuleData)); } }; -#define C9X_MAX_SCRIPTS 3 -#define C9X_MAX_SCRIPT_INPUTS 10 -class ScriptData { - public: - ScriptData() { clear(); } - char filename[10+1]; - char name[10+1]; - int inputs[C9X_MAX_SCRIPT_INPUTS]; - void clear() { memset(this, 0, sizeof(ScriptData)); } -}; - class ModelData { public: ModelData(); @@ -921,8 +907,6 @@ class ModelData { ModuleData moduleData[C9X_NUM_MODULES+1/*trainer*/]; - ScriptData scriptData[C9X_MAX_SCRIPTS]; - void clear(); bool isempty(); void setDefault(uint8_t id); diff --git a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp index 266dd8c7f..fbd65c564 100644 --- a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp +++ b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp @@ -49,8 +49,7 @@ #define PPM_CENTER_ADJUSTABLE #define PPM_LIMITS_SYMETRICAL #define FAI_CHOICE -#define LUA -#define LUA_MODEL_SCRIPTS + #define EEPROM_VARIANT 3 #undef min @@ -116,36 +115,6 @@ inline int geteepromsize() { #include "radio/src/translations/tts_pt.cpp" #include "radio/src/translations/tts_sk.cpp" #include "radio/src/translations/tts_pl.cpp" - -#include "radio/src/lua.cpp" -#include "radio/src/lua/src/lapi.c" -#include "radio/src/lua/src/lcode.c" -#include "radio/src/lua/src/lctype.c" -#include "radio/src/lua/src/ldebug.c" -#include "radio/src/lua/src/ldo.c" -#include "radio/src/lua/src/ldump.c" -#include "radio/src/lua/src/lfunc.c" -#include "radio/src/lua/src/lgc.c" -#include "radio/src/lua/src/llex.c" -#include "radio/src/lua/src/lmem.c" -#include "radio/src/lua/src/lobject.c" -#include "radio/src/lua/src/lopcodes.c" -#include "radio/src/lua/src/lparser.c" -#include "radio/src/lua/src/lstate.c" -#include "radio/src/lua/src/lstring.c" -#include "radio/src/lua/src/ltable.c" -#include "radio/src/lua/src/ltm.c" -#include "radio/src/lua/src/lundump.c" -#include "radio/src/lua/src/lvm.c" -#include "radio/src/lua/src/lzio.c" -#include "radio/src/lua/src/lbaselib.c" -#include "radio/src/lua/src/linit.c" -#include "radio/src/lua/src/lmathlib.c" -#include "radio/src/lua/src/loadlib.c" -#include "radio/src/lua/src/lauxlib.c" -#include "radio/src/lua/src/ltablib.c" -#include "radio/src/lua/src/lcorolib.c" - int16_t g_anas[NUM_STICKS+BOARD_X9D_NUM_POTS]; diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp index 92b5c4b3e..320378fc5 100644 --- a/companion/src/firmwares/opentx/opentxeeprom.cpp +++ b/companion/src/firmwares/opentx/opentxeeprom.cpp @@ -235,13 +235,8 @@ class SourcesConversionTable: public ConversionTable { if (afterrelease21March2013) addConversion(RawSource(SOURCE_TYPE_TELEMETRY, 0), val++); - for (int i=1; i= 216) { - for (int i=0; i<3; i++) { - ScriptData & script = modelData.scriptData[i]; - internalField.Append(new ZCharField<10>(script.filename)); - internalField.Append(new ZCharField<10>(script.name)); - for (int j=0; j<10; j++) { - internalField.Append(new SignedField<8>(script.inputs[j])); - } - } - for (int i=0; i<32; i++) { + // TODO ScriptData scriptsData[MAX_SCRIPTS]; + internalField.Append(new SpareBitsField<720>()); + for (int i=0; i<32; i++) internalField.Append(new ZCharField<4>(modelData.inputNames[i])); - } internalField.Append(new UnsignedField<8>(modelData.nPotsToWarn)); for (int i=0; i < GetEepromInterface()->getCapability(Pots); i++) { internalField.Append(new SignedField<8>(modelData.potPosition[i])); - } + } } } diff --git a/companion/src/flashinterface.cpp b/companion/src/flashinterface.cpp index b72c39cbf..86c677ef8 100644 --- a/companion/src/flashinterface.cpp +++ b/companion/src/flashinterface.cpp @@ -413,7 +413,7 @@ bool FlashInterface::setSplash(const QImage & newsplash) } } -int FlashInterface::getSplashWidth() +uint FlashInterface::getSplashWidth() { return splash_width; } diff --git a/companion/src/flashinterface.h b/companion/src/flashinterface.h index 402c2410d..d7e6f0de9 100644 --- a/companion/src/flashinterface.h +++ b/companion/src/flashinterface.h @@ -59,7 +59,7 @@ public: QImage getSplash(); bool setSplash(const QImage & newsplash); bool hasSplash(); - int getSplashWidth(); + uint getSplashWidth(); uint getSplashHeight(); uint getSplashColors(); QImage::Format getSplashFormat(); diff --git a/companion/src/fwpreferencesdialog.ui b/companion/src/fwpreferencesdialog.ui index 28585c2ac..7f4370fe7 100644 --- a/companion/src/fwpreferencesdialog.ui +++ b/companion/src/fwpreferencesdialog.ui @@ -23,7 +23,7 @@ - Downloads + Downloads and Profiles diff --git a/companion/src/helpers.cpp b/companion/src/helpers.cpp index 9a9f2caf4..e3d98d9fa 100644 --- a/companion/src/helpers.cpp +++ b/companion/src/helpers.cpp @@ -48,8 +48,8 @@ void populateGvSourceCB(QComboBox *b, int value) void populateVoiceLangCB(QComboBox *b, QString language) { - QString strings[] = { QObject::tr("English"), QObject::tr("Finnish"), QObject::tr("French"), QObject::tr("Italian"), QObject::tr("German"), QObject::tr("Czech"), QObject::tr("Slovak"), QObject::tr("Spanish"), QObject::tr("Polish"), QObject::tr("Portuguese"), QObject::tr("Swedish"), NULL}; - QString langcode[] = { "en", "fi","fr", "it", "de", "cz", "sk", "es", "pl", "pt", "se", NULL}; + QString strings[] = { QObject::tr("English"), QObject::tr("French"), QObject::tr("Italian"), QObject::tr("German"), QObject::tr("Czech"), QObject::tr("Slovak"), QObject::tr("Spanish"), QObject::tr("Polish"), QObject::tr("Portuguese"), QObject::tr("Swedish"), NULL}; + QString langcode[] = { "en", "fr", "it", "de", "cz", "sk", "es", "pl", "pt", "se", NULL}; b->clear(); for (int i=0; strings[i]!=NULL; i++) { diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index 991861451..5a9ec02ab 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -98,16 +98,32 @@ MainWindow::MainWindow(): MaxRecentFiles=MAX_RECENT; QSettings settings; - + int icon_size=settings.value("icon_size", 1).toInt(); + switch (icon_size) { + case 0: + ISize="16"; + break; + case 1: + ISize="24"; + break; + case 2: + ISize="32"; + break; + case 3: + ISize="48"; + break; + default: + ISize="24"; + break; + } restoreGeometry(settings.value("mainWindowGeometry").toByteArray()); createActions(); - createMenus(); createToolBars(); createStatusBar(); updateMenus(); - readSettings(); + readSettings(); setUnifiedTitleAndToolBarOnMac(true); this->setWindowIcon(QIcon(":/icon.png")); this->setIconSize(QSize(32,32)); @@ -145,7 +161,7 @@ MainWindow::MainWindow(): int fileType = getFileType(str); if(fileType==FILE_TYPE_HEX) { - writeFlash(str); + burnToFlash(str); } if(fileType==FILE_TYPE_EEPE || fileType==FILE_TYPE_EEPM || fileType==FILE_TYPE_BIN) { @@ -219,7 +235,7 @@ void MainWindow::checkForUpdates(bool ignoreSettings, QString & fwId) } } - if (checkCompanion || ignoreSettings) { + if (checkCompanion9x || ignoreSettings) { check2done = false; manager2 = new QNetworkAccessManager(this); connect(manager2, SIGNAL(finished(QNetworkReply*)),this, SLOT(checkForUpdateFinished(QNetworkReply*))); @@ -335,6 +351,8 @@ void MainWindow::reply1Accepted() { QString errormsg; QSettings settings; + bool autoflash=settings.value("burnFirmware", true).toBool(); + bool addversion=settings.value("rename_firmware_files", false).toBool(); settings.beginGroup("FwRevisions"); if (downloadedFWFilename.isEmpty()) { if (!(downloadedFW.isEmpty())) { @@ -419,7 +437,7 @@ void MainWindow::reply1Accepted() int pos=rev.lastIndexOf("-r"); if (pos>0) { currentFWrev=rev.mid(pos+2).toInt(); - if (settings.value("rename_firmware_files", false).toBool() && needRename) { + if (addversion && needRename) { QFileInfo fi(downloadedFWFilename); QString path=fi.path()+QDir::separator (); path.append(fi.completeBaseName()); @@ -432,10 +450,10 @@ void MainWindow::reply1Accepted() downloadedFWFilename=path; } settings.setValue(downloadedFW, currentFWrev); - if (settings.value("burnFirmware", true).toBool()) { + if (autoflash) { int ret = QMessageBox::question(this, "Companion", tr("Do you want to write the firmware to the transmitter now ?"), QMessageBox::Yes | QMessageBox::No); if (ret == QMessageBox::Yes) { - writeFlash(downloadedFWFilename); + burnToFlash(downloadedFWFilename); } } } @@ -663,7 +681,7 @@ void MainWindow::newFile() child->show(); } -void MainWindow::openDocURL() +void MainWindow::openDocumentURL() { QString link = "http://www.open-tx.org/documents.html"; QDesktopServices::openUrl(QUrl(link)); @@ -770,14 +788,14 @@ void MainWindow::loadProfile() } } -void MainWindow::appPrefs() +void MainWindow::appPreferences() { appPreferencesDialog *pd = new appPreferencesDialog(this); pd->exec(); updateMenus(); } -void MainWindow::fwPrefs() +void MainWindow::fwPreferences() { fwPreferencesDialog *pd = new fwPreferencesDialog(this); pd->exec(); @@ -840,10 +858,10 @@ void MainWindow::paste() activeMdiChild()->paste(); } -void MainWindow::writeEeprom() +void MainWindow::burnTo() { if (activeMdiChild()) - activeMdiChild()->writeEeprom(); + activeMdiChild()->burnTo(); } void MainWindow::simulate() @@ -1064,7 +1082,7 @@ QString MainWindow::FindTaranisPath() } -void MainWindow::readEeprom() +void MainWindow::burnFrom() { QString tempDir = QDir::tempPath(); QString tempFile; @@ -1105,7 +1123,7 @@ void MainWindow::readEeprom() } } -void MainWindow::writeFileToEeprom() +void MainWindow::burnExtenalToEEPROM() { QSettings settings; QString fileName; @@ -1359,7 +1377,7 @@ bool MainWindow::convertEEPROM(QString backupFile, QString restoreFile, QString return true; } -void MainWindow::writeFlash(QString fileToFlash) +void MainWindow::burnToFlash(QString fileToFlash) { QSettings settings; QString fileName; @@ -1458,7 +1476,7 @@ void MainWindow::writeFlash(QString fileToFlash) } } -void MainWindow::readEepromToFile() +void MainWindow::burnExtenalFromEEPROM() { QSettings settings; QString fileName = QFileDialog::getSaveFileName(this, tr("Save transmitter Models and Settings to File"), settings.value("lastDir").toString(), tr(EXTERNAL_EEPROM_FILES_FILTER)); @@ -1490,7 +1508,7 @@ void MainWindow::readEepromToFile() } } -void MainWindow::readFlash() +void MainWindow::burnFromFlash() { QSettings settings; QString fileName = QFileDialog::getSaveFileName(this,tr("Read Tx Firmware to File"), settings.value("lastFlashDir").toString(),tr(FLASH_FILES_FILTER)); @@ -1562,10 +1580,11 @@ void MainWindow::updateMenus() saveAct->setEnabled(hasMdiChild); saveAsAct->setEnabled(hasMdiChild); pasteAct->setEnabled(hasMdiChild ? activeMdiChild()->hasPasteData() : false); - writeEepromAct->setEnabled(hasMdiChild); + burnToAct->setEnabled(hasMdiChild); separatorAct->setVisible(hasMdiChild); - bool hasSelection = (activeMdiChild() && activeMdiChild()->hasSelection()); + bool hasSelection = (activeMdiChild() && + activeMdiChild()->hasSelection()); cutAct->setEnabled(hasSelection); copyAct->setEnabled(hasSelection); simulateAct->setEnabled(hasSelection); @@ -1574,9 +1593,6 @@ void MainWindow::updateMenus() compareAct->setEnabled(activeMdiChild()); updateRecentFileActions(); updateProfilesActions(); - updateLanguageActions(); - updateIconSizeActions(); - updateIconThemeActions(); QSettings settings; setWindowTitle(tr("OpenTX Companion - FW: %1 - Profile: %2").arg(GetCurrentFirmware()->name).arg(settings.value("profileId").toString())); @@ -1597,39 +1613,152 @@ MdiChild *MainWindow::createMdiChild() return child; } -QAction * MainWindow::addAct(QString icon, QString sName, QString lName, QKeySequence::StandardKey shortcut, const char *slot) -{ - QAction * newAction = new QAction( this ); - if (!icon.isEmpty()) - newAction->setIcon(CompanionIcon(icon)); - if (!sName.isEmpty()) - newAction->setText(sName); - if (!lName.isEmpty()) - newAction->setStatusTip(lName); - if (shortcut != 0) - newAction->setShortcuts(shortcut); - connect(newAction, SIGNAL(triggered()), this, slot); - return newAction; -} - -QAction * MainWindow::addAct(QString icon, QString sName, QString lName, const char *slot) -{ - return addAct(icon, sName, lName, QKeySequence::UnknownKey, slot); -} - -QAction * MainWindow::addAct(QActionGroup *aGroup, QString sName, QString lName, const char *slot) -{ - QAction *action = addAct("", sName, lName, QKeySequence::UnknownKey, slot); - action->setCheckable(true); - aGroup->addAction(action); - return action; -} - void MainWindow::createActions() { + newAct = new QAction(CompanionIcon("new.png"), tr("&New"), this); + newAct->setShortcuts(QKeySequence::New); + newAct->setStatusTip(tr("Create a new file")); + connect(newAct, SIGNAL(triggered()), this, SLOT(newFile())); + + openAct = new QAction(CompanionIcon("open.png"), tr("&Open..."), this); + openAct->setShortcuts(QKeySequence::Open); + openAct->setStatusTip(tr("Open an existing file")); + connect(openAct, SIGNAL(triggered()), this, SLOT(openFile())); + + loadbackupAct = new QAction(CompanionIcon("open.png"), tr("&loadBackup..."), this); + loadbackupAct->setStatusTip(tr("Load backup from file")); + connect(loadbackupAct, SIGNAL(triggered()), this, SLOT(loadBackup())); + + saveAct = new QAction(CompanionIcon("save.png"), tr("&Save"), this); + saveAct->setShortcuts(QKeySequence::Save); + saveAct->setStatusTip(tr("Save the document to disk")); + connect(saveAct, SIGNAL(triggered()), this, SLOT(save())); + + saveAsAct = new QAction(CompanionIcon("saveas.png"), tr("Save &As..."), this); + saveAsAct->setShortcuts(QKeySequence::SaveAs); + saveAsAct->setStatusTip(tr("Save the document under a new name")); + connect(saveAsAct, SIGNAL(triggered()), this, SLOT(saveAs())); + + logsAct = new QAction(CompanionIcon("logs.png"), tr("Lo&gs"), this); + logsAct->setShortcut(tr("Ctrl+G")); + logsAct->setStatusTip(tr("Open log file")); + connect(logsAct, SIGNAL(triggered()), this, SLOT(logFile())); + + appPreferencesAct = new QAction(CompanionIcon("apppreferences.png"), tr("&Setting..."), this); + appPreferencesAct->setStatusTip(tr("Edit Settings")); + connect(appPreferencesAct, SIGNAL(triggered()), this, SLOT(appPreferences())); + + fwPreferencesAct = new QAction(CompanionIcon("fwpreferences.png"), tr("&Downloads..."), this); + fwPreferencesAct->setStatusTip(tr("Download firmware and voice files")); + connect(fwPreferencesAct, SIGNAL(triggered()), this, SLOT(fwPreferences())); + + checkForUpdatesAct = new QAction(CompanionIcon("update.png"), tr("&Check for updates..."), this); + checkForUpdatesAct->setStatusTip(tr("Check for new version of Companion")); + connect(checkForUpdatesAct, SIGNAL(triggered()), this, SLOT(doUpdates())); + + contributorsAct = new QAction(CompanionIcon("contributors.png"), tr("Contributors &List..."), this); + contributorsAct->setStatusTip(tr("Show Companion contributors list")); + connect(contributorsAct, SIGNAL(triggered()), this, SLOT(contributors())); + + changelogAct = new QAction(CompanionIcon("changelog.png"), tr("ChangeLog..."), this); + changelogAct->setStatusTip(tr("Show Companion changelog")); + connect(changelogAct, SIGNAL(triggered()), this, SLOT(changelog())); + + fwchangelogAct = new QAction(CompanionIcon("changelog.png"), tr("Firmware ChangeLog..."), this); + fwchangelogAct->setStatusTip(tr("Show firmware changelog")); + connect(fwchangelogAct, SIGNAL(triggered()), this, SLOT(fwchangelog())); + + compareAct = new QAction(CompanionIcon("compare.png"), tr("Compare..."), this); + compareAct->setStatusTip(tr("Compare models")); + compareAct->setEnabled(false); + connect(compareAct, SIGNAL(triggered()), this, SLOT(compare())); + + customizeSplashAct = new QAction(CompanionIcon("paintbrush.png"), tr("Configure transmitter start screen..."), this); + customizeSplashAct->setStatusTip(tr("Customize the splash screen of your TX")); + connect(customizeSplashAct, SIGNAL(triggered()), this, SLOT(customizeSplash())); + + exitAct = new QAction(CompanionIcon("exit.png"), tr("E&xit"), this); + exitAct->setShortcuts(QKeySequence::Quit); + exitAct->setStatusTip(tr("Exit the application")); + connect(exitAct, SIGNAL(triggered()), qApp, SLOT(closeAllWindows())); + + cutAct = new QAction(CompanionIcon("cut.png"), tr("Cu&t"), this); + cutAct->setShortcuts(QKeySequence::Cut); + cutAct->setStatusTip(tr("Cut the current selection's contents to the " + "clipboard")); + connect(cutAct, SIGNAL(triggered()), this, SLOT(cut())); + + copyAct = new QAction(CompanionIcon("copy.png"), tr("&Copy"), this); + copyAct->setShortcuts(QKeySequence::Copy); + copyAct->setStatusTip(tr("Copy the current selection's contents to the " + "clipboard")); + connect(copyAct, SIGNAL(triggered()), this, SLOT(copy())); + + pasteAct = new QAction(CompanionIcon("paste.png"), tr("&Paste"), this); + pasteAct->setShortcuts(QKeySequence::Paste); + pasteAct->setStatusTip(tr("Paste the clipboard's contents into the current " + "selection")); + connect(pasteAct, SIGNAL(triggered()), this, SLOT(paste())); + + burnToAct = new QAction(CompanionIcon("write_eeprom.png"), tr("&Write Models and Settings To Tx"), this); + burnToAct->setShortcut(tr("Ctrl+Alt+W")); + burnToAct->setStatusTip(tr("Write Models and Settings to transmitter")); + connect(burnToAct,SIGNAL(triggered()),this,SLOT(burnTo())); + + burnFromAct = new QAction(CompanionIcon("read_eeprom.png"), tr("&Read Models and Settings From Tx"), this); + burnFromAct->setShortcut(tr("Ctrl+Alt+R")); + burnFromAct->setStatusTip(tr("Read Models and Settings from transmitter")); + connect(burnFromAct,SIGNAL(triggered()),this,SLOT(burnFrom())); + + burnToFlashAct = new QAction(CompanionIcon("write_flash.png"), tr("Write Firmware"), this); + burnToFlashAct->setStatusTip(tr("Write firmware to transmitter")); + connect(burnToFlashAct,SIGNAL(triggered()),this,SLOT(burnToFlash())); + + burnExtenalToEEPROMAct = new QAction(CompanionIcon("write_eeprom_file.png"), tr("Write Models and Settings from file to Tx"), this); + burnExtenalToEEPROMAct->setStatusTip(tr("Write Models and Settings from file to transmitter")); + connect(burnExtenalToEEPROMAct,SIGNAL(triggered()),this,SLOT(burnExtenalToEEPROM())); + + burnExtenalFromEEPROMAct = new QAction(CompanionIcon("read_eeprom_file.png"), tr("Save transmitter Models and Settings to file"), this); + burnExtenalFromEEPROMAct->setStatusTip(tr("Save the Models and Settings from the transmitter to a file")); + connect(burnExtenalFromEEPROMAct,SIGNAL(triggered()),this,SLOT(burnExtenalFromEEPROM())); + + burnFromFlashAct = new QAction(CompanionIcon("read_flash.png"), tr("Read Firmware"), this); + burnFromFlashAct->setStatusTip(tr("Read firmware from transmitter")); + connect(burnFromFlashAct,SIGNAL(triggered()),this,SLOT(burnFromFlash())); + + burnConfigAct = new QAction(CompanionIcon("configure.png"), tr("&Configure connection software..."), this); + burnConfigAct->setStatusTip(tr("Configure software for reading from and writing to the transmitter")); + connect(burnConfigAct,SIGNAL(triggered()),this,SLOT(burnConfig())); + EEPROMInterface *eepromInterface = GetEepromInterface(); + if (!IS_ARM(eepromInterface->getBoard())) { + burnListAct = new QAction(CompanionIcon("list.png"), tr("&List programmers"), this); + burnListAct->setStatusTip(tr("List available programmers")); + connect(burnListAct,SIGNAL(triggered()),this,SLOT(burnList())); + + burnFusesAct = new QAction(CompanionIcon("fuses.png"), tr("&Fuses..."), this); + burnFusesAct->setStatusTip(tr("Show fuses dialog")); + connect(burnFusesAct,SIGNAL(triggered()),this,SLOT(burnFuses())); + } + + simulateAct = new QAction(CompanionIcon("simulate.png"), tr("&Simulate"), this); + simulateAct->setShortcut(tr("Alt+S")); + simulateAct->setStatusTip(tr("Simulate selected model.")); + simulateAct->setEnabled(false); + connect(simulateAct,SIGNAL(triggered()),this,SLOT(simulate())); + + printAct = new QAction(CompanionIcon("print.png"), tr("&Print"), this); + printAct->setShortcut(tr("Ctrl+P")); + printAct->setStatusTip(tr("Print current model.")); + printAct->setEnabled(false); + connect(printAct,SIGNAL(triggered()),this,SLOT(print())); + separatorAct = new QAction(this); separatorAct->setSeparator(true); + aboutAct = new QAction(CompanionIcon("information.png"), tr("&About"), this); + aboutAct->setStatusTip(tr("Show the application's About box")); + connect(aboutAct, SIGNAL(triggered()), this, SLOT(about())); + for (int i = 0; i < MaxRecentFiles; ++i) { recentFileActs[i] = new QAction(this); recentFileActs[i]->setVisible(false); @@ -1637,80 +1766,96 @@ void MainWindow::createActions() } updateRecentFileActions(); - QActionGroup *profilesAlignmentGroup = new QActionGroup(this); for (int i=0; isetVisible(false); - profileActs[i]->setCheckable(true); - profilesAlignmentGroup->addAction(profileActs[i]); connect(profileActs[i], SIGNAL(triggered()), this, SLOT(loadProfile())); } updateProfilesActions(); + createProfileAct = new QAction(tr("New Profile"), this); + createProfileAct->setStatusTip(tr("Create a new Radio Setting Profile")); + connect(createProfileAct, SIGNAL(triggered()), this, SLOT(createProfile())); - newAct = addAct("new.png", tr("New"), tr("Create a new file"), QKeySequence::New, SLOT(newFile())); - openAct = addAct("open.png", tr("Open..."), tr("Open an existing file"), QKeySequence::Open, SLOT(openFile())); - saveAct = addAct("save.png", tr("Save..."), tr("Save the document to disk"), QKeySequence::Save, SLOT(save())); - saveAsAct = addAct("saveas.png", tr("Save As..."), tr("Save the document to disk"), QKeySequence::SaveAs, SLOT(saveAs())); - exitAct = addAct("exit.png", tr("Exit"), tr("Exit the application"), QKeySequence::Quit, SLOT(newFile())); - cutAct = addAct("cut.png", tr("Cut"), tr("Cut current selection to the clipboard"), QKeySequence::Cut, SLOT(cut())); - copyAct = addAct("copy.png", tr("Copy..."), tr("Copy current selection to the clipboard"), QKeySequence::Copy, SLOT(copy())); - pasteAct = addAct("paste.png", tr("Paste..."), tr("Paste clipboard into current selection"), QKeySequence::Paste, SLOT(paste())); - - QActionGroup *themeAlignGroup = new QActionGroup(this); - classicThemeAct = addAct( themeAlignGroup, tr("Classical"), tr("The classical Companion icon theme"), SLOT(setClassicTheme())); - newThemeAct = addAct( themeAlignGroup, tr("New"), tr("The new Companion 2 icon theme"), SLOT(setNewTheme())); - monoThemeAct = addAct( themeAlignGroup, tr("Monochrome"), tr("A monochrome black icon theme"), SLOT(setMonochromeTheme())); - monoWhiteAct = addAct( themeAlignGroup, tr("MonoWhite"), tr("A monochrome white icon theme"), SLOT(setMonoWhiteTheme())); - monoBlueAct = addAct( themeAlignGroup, tr("MonoBlue"), tr("A monochrome blue icon theme"), SLOT(setMonoBlueTheme())); + classicThemeAct = new QAction(tr("Classical"), this); + classicThemeAct->setStatusTip(tr("The classical Companion icon theme")); + connect(classicThemeAct, SIGNAL(triggered()), this, SLOT(setClassicTheme())); + newThemeAct = new QAction(tr("New"), this); + newThemeAct->setStatusTip(tr("The Companion 2.0 colored icon theme")); + connect(newThemeAct, SIGNAL(triggered()), this, SLOT(setNewTheme())); + monoThemeAct = new QAction("Monochrome",this); + monoThemeAct->setStatusTip(tr("A monochrome black icon theme")); + connect(monoThemeAct, SIGNAL(triggered()), this, SLOT(setMonochromeTheme())); + monoWhiteThemeAct = new QAction("MonoWhite",this); + monoWhiteThemeAct->setStatusTip(tr("A monochrome white icon theme")); + connect(monoWhiteThemeAct, SIGNAL(triggered()), this, SLOT(setMonoWhiteTheme())); + monoBlueThemeAct = new QAction("MonoBlue",this); + monoBlueThemeAct->setStatusTip(tr("A monochrome blue icon theme")); + connect(monoBlueThemeAct, SIGNAL(triggered()), this, SLOT(setMonoBlueTheme())); - QActionGroup *iconAlignGroup = new QActionGroup(this); - smallIconAct = addAct( iconAlignGroup, tr("Small"), tr("Use small toolbar icons"), SLOT(setSmallIconThemeSize())); - normalIconAct = addAct( iconAlignGroup, tr("Normal"), tr("Use normal size toolbar icons"), SLOT(setNormalIconThemeSize())); - bigIconAct = addAct( iconAlignGroup, tr("Big"), tr("Use big toolbar icons"), SLOT(setBigIconThemeSize())); - hugeIconAct = addAct( iconAlignGroup, tr("Huge"), tr("Use huge toolbar icons"), SLOT(setHugeIconThemeSize())); + smallIconAct = new QAction(tr("Small"),this); + smallIconAct->setStatusTip(tr("Use small toolbar icons")); + connect(smallIconAct, SIGNAL(triggered()), this, SLOT(setSmallIconThemeSize())); + normalIconAct = new QAction(this); + normalIconAct->setStatusTip(tr("Use normal size toolbar icons")); + normalIconAct->setText(tr("Normal")); + connect(normalIconAct, SIGNAL(triggered()), this, SLOT(setNormalIconThemeSize())); + bigIconAct = new QAction(this); + bigIconAct->setStatusTip(tr("Use big toolbar icons")); + bigIconAct->setText(tr("Big")); + connect(bigIconAct, SIGNAL(triggered()), this, SLOT(setBigIconThemeSize())); + hugeIconAct = new QAction(this); + hugeIconAct->setStatusTip(tr("Use huge toolbar icons")); + hugeIconAct->setText(tr("Huge")); + connect(hugeIconAct, SIGNAL(triggered()), this, SLOT(setHugeIconThemeSize())); - QActionGroup *langAlignGroup = new QActionGroup(this); - sysLangAct = addAct( langAlignGroup, tr("System language"), tr("Use system language in menus"), SLOT(setSysLanguage())); - czechLangAct = addAct( langAlignGroup, tr("Czech"), tr("Use Czech in menus"), SLOT(setCZLanguage())); - germanLangAct = addAct( langAlignGroup, tr("German"), tr("Use German in menus"), SLOT(setDELanguage())); - englishLangAct = addAct( langAlignGroup, tr("English"), tr("Use English in menus"), SLOT(setENLanguage())); - finnishLangAct = addAct( langAlignGroup, tr("Finnish"), tr("Use Finnish in menus"), SLOT(setFILanguage())); - frenchLangAct = addAct( langAlignGroup, tr("French"), tr("Use French in menus"), SLOT(setFRLanguage())); - italianLangAct = addAct( langAlignGroup, tr("Italian"), tr("Use Italian in menus"), SLOT(setITLanguage())); - hebrewLangAct = addAct( langAlignGroup, tr("Hebrew"), tr("Use Hebrew in menus"), SLOT(setHELanguage())); - polishLangAct = addAct( langAlignGroup, tr("Polish"), tr("Use Polish in menus"), SLOT(setPLLanguage())); - portugueseLangAct = addAct( langAlignGroup, tr("Portuguese"), tr("Use Portuguese in menus"), SLOT(setPTLanguage())); - swedishLangAct = addAct( langAlignGroup, tr("Swedish"), tr("Use Swedish in menus"), SLOT(setSELanguage())); - russianLangAct = addAct( langAlignGroup, tr("Russian"), tr("Use Russian in menus"), SLOT(setRULanguage())); + defaultLanguageAct = new QAction(tr("System default language"),this); + defaultLanguageAct->setStatusTip(tr("Use system default language in menus")); + connect(defaultLanguageAct, SIGNAL(triggered()), this, SLOT(setDefaultLanguage())); + + czechLanguageAct = new QAction(tr("Czech"),this); + czechLanguageAct->setStatusTip(tr("Use Czech in menus")); + connect(czechLanguageAct, SIGNAL(triggered()), this, SLOT(setCZLanguage())); + + germanLanguageAct = new QAction(tr("German"),this); + germanLanguageAct->setStatusTip(tr("Use German in menus")); + connect(germanLanguageAct, SIGNAL(triggered()), this, SLOT(setDELanguage())); + + englishLanguageAct = new QAction(tr("English"),this); + englishLanguageAct->setStatusTip(tr("Use English in menus")); + connect(englishLanguageAct, SIGNAL(triggered()), this, SLOT(setENLanguage())); + + frenchLanguageAct = new QAction(tr("French"),this); + frenchLanguageAct->setStatusTip(tr("Use French in menus")); + connect(frenchLanguageAct, SIGNAL(triggered()), this, SLOT(setFRLanguage())); + + italianLanguageAct = new QAction(tr("Italian"),this); + italianLanguageAct->setStatusTip(tr("Use Italian in menus")); + connect(italianLanguageAct, SIGNAL(triggered()), this, SLOT(setITLanguage())); + + hebrewLanguageAct = new QAction(tr("Hebrew"),this); + hebrewLanguageAct->setStatusTip(tr("Use Hebrew in menus")); + connect(hebrewLanguageAct, SIGNAL(triggered()), this, SLOT(setHELanguage())); + + polishLanguageAct = new QAction(tr("Polish"),this); + polishLanguageAct->setStatusTip(tr("Use Polish in menus")); + connect(polishLanguageAct, SIGNAL(triggered()), this, SLOT(setPLLanguage())); + + portugueseLanguageAct = new QAction(tr("Portuguese"),this); + portugueseLanguageAct->setStatusTip(tr("Use Portuguese in menus")); + connect(portugueseLanguageAct, SIGNAL(triggered()), this, SLOT(setPTLanguage())); + + swedishLanguageAct = new QAction(tr("Swedish"),this); + swedishLanguageAct->setStatusTip(tr("Use Swedish in menus")); + connect(swedishLanguageAct, SIGNAL(triggered()), this, SLOT(setSELanguage())); + + russianLanguageAct = new QAction(tr("Russian"),this); + russianLanguageAct->setStatusTip(tr("Use Russian in menus")); + connect(russianLanguageAct, SIGNAL(triggered()), this, SLOT(setRULanguage())); + + openDocumentURLAct = new QAction(tr("Manuals and other Documents"),this); + openDocumentURLAct->setStatusTip(tr("Open the OpenTX document page in a web browser")); + connect(openDocumentURLAct, SIGNAL(triggered()), this, SLOT(openDocumentURL())); - aboutAct = addAct("information.png", tr("About"), tr("Show the application's About box"), SLOT(about())); - printAct = addAct("print.png", tr("Print"), tr("Print current model"), SLOT(print())); - simulateAct = addAct("simulate.png", tr("Simulate"), tr("Simulate selected model"), SLOT(simulate())); - loadbackupAct = addAct("open.png", tr("loadBackup..."), tr("Load backup from file"), SLOT(loadBackup())); - logsAct = addAct("logs.png", tr("Logs"), tr("Open log file"), SLOT(logFile())); - appPrefsAct = addAct("apppreferences.png",tr("Setting..."), tr("Edit Settings"), SLOT(appPrefs())); - fwPrefsAct = addAct("fwpreferences.png", tr("Downloads..."), tr("Download firmware and voice files"), SLOT(fwPrefs())); - checkForUpdatesAct = addAct("update.png", tr("Check for updates..."), tr("Check OpenTX and Companion updates"), SLOT(doUpdates())); - changelogAct = addAct("changelog.png", tr("ChangeLog..."), tr("Show Companion changelog"), SLOT(changelog())); - fwchangelogAct = addAct("changelog.png", tr("Firmware ChangeLog..."), tr("Show firmware changelog"), SLOT(fwchangelog())); - compareAct = addAct("compare.png", tr("Compare..."), tr("Compare models"), SLOT(compare())); - editSplashAct = addAct("paintbrush.png", tr("Edit Tx Splash Image..."),tr("edit the splash screen of your TX"), SLOT(customizeSplash())); - burnListAct = addAct("list.png", tr("List programmers"), tr("List available programmers"), SLOT(burnList())); - burnFusesAct = addAct("fuses.png", tr("Fuses..."), tr("Show fuses dialog"), SLOT(burnFuses())); - readFlashAct = addAct("read_flash.png", tr("Read Firmware"), tr("Read firmware from transmitter"), SLOT(readFlash())); - writeFlashAct = addAct("write_flash.png", tr("Write Firmware"), tr("Write firmware to transmitter"), SLOT(writeFlash())); - createProfileAct = addAct("", tr("New Profile"), tr("Create a new Radio Setting Profile"), SLOT(createProfile())); - openDocURLAct = addAct("", tr("Manuals and other Documents"), tr("Open the OpenTX document page in a web browser"), SLOT(openDocURL())); - writeEepromAct = addAct("write_eeprom.png", tr("Write Models and Settings To Tx"), tr("Write Models and Settings to transmitter"), SLOT(writeEeprom())); - readEepromAct = addAct("read_eeprom.png", tr("Read Models and Settings From Tx"), tr("Read Models and Settings from transmitter"), SLOT(readEeprom())); - burnConfigAct = addAct("configure.png", tr("Configure connection software..."), tr("Configure software for reading from and writing to the transmitter"), SLOT(burnConfig())); - writeFileToEepromAct = addAct("write_eeprom_file.png", tr("Write Models and Settings from file to Tx"), tr("Write Models and Settings from file to transmitter"), SLOT(writeFileToEeprom())); - readEepromToFileAct = addAct("read_eeprom_file.png", tr("Save Tx Models and Settings to file"), tr("Save the Models and Settings from the transmitter to a file"), SLOT(readEepromToFile())); - contributorsAct = addAct("contributors.png", tr("Contributors"), tr("A tribute to those who have contributed to OpenTX and Companion"), SLOT(contributors())); - - compareAct->setEnabled(false); - simulateAct->setEnabled(false); - printAct->setEnabled(false); } void MainWindow::createMenus() @@ -1720,8 +1865,8 @@ void MainWindow::createMenus() QMenu *languageMenu=new QMenu(tr("Set Menu Language")); QMenu *themeMenu=new QMenu(tr("Set Icon Theme")); QMenu *iconThemeSizeMenu=new QMenu(tr("Set Icon Size")); - - fileMenu = menuBar()->addMenu(tr("File")); + + fileMenu = menuBar()->addMenu(tr("&File")); fileMenu->addAction(newAct); fileMenu->addAction(openAct); fileMenu->addAction(saveAct); @@ -1737,55 +1882,53 @@ void MainWindow::createMenus() fileMenu->addAction(printAct); fileMenu->addAction(compareAct); fileMenu->addSeparator(); - fileMenu->addAction(fwPrefsAct); + fileMenu->addAction(fwPreferencesAct); fileMenu->addMenu(createProfilesMenu()); fileMenu->addAction(exitAct); - editMenu = menuBar()->addMenu(tr("Edit")); + editMenu = menuBar()->addMenu(tr("&Edit")); editMenu->addAction(cutAct); editMenu->addAction(copyAct); editMenu->addAction(pasteAct); - settingsMenu = menuBar()->addMenu(tr("Settings")); + settingsMenu = menuBar()->addMenu(tr("&Settings")); settingsMenu->addMenu(languageMenu); - languageMenu->addAction(sysLangAct); - languageMenu->addAction(englishLangAct); - languageMenu->addAction(czechLangAct); - languageMenu->addAction(germanLangAct); - languageMenu->addAction(finnishLangAct); - languageMenu->addAction(frenchLangAct); - languageMenu->addAction(hebrewLangAct); - languageMenu->addAction(italianLangAct); - languageMenu->addAction(polishLangAct); - languageMenu->addAction(portugueseLangAct); - languageMenu->addAction(swedishLangAct); - languageMenu->addAction(russianLangAct); - + languageMenu->addAction(defaultLanguageAct); + languageMenu->addAction(englishLanguageAct); + languageMenu->addAction(czechLanguageAct); + languageMenu->addAction(germanLanguageAct); + languageMenu->addAction(frenchLanguageAct); + languageMenu->addAction(hebrewLanguageAct); + languageMenu->addAction(italianLanguageAct); + languageMenu->addAction(polishLanguageAct); + languageMenu->addAction(portugueseLanguageAct); + languageMenu->addAction(swedishLanguageAct); + languageMenu->addAction(russianLanguageAct); settingsMenu->addMenu(themeMenu); themeMenu->addAction(classicThemeAct); themeMenu->addAction(newThemeAct); themeMenu->addAction(monoThemeAct); - themeMenu->addAction(monoBlueAct); - themeMenu->addAction(monoWhiteAct); + themeMenu->addAction(monoBlueThemeAct); + themeMenu->addAction(monoWhiteThemeAct); settingsMenu->addMenu(iconThemeSizeMenu); iconThemeSizeMenu->addAction(smallIconAct); iconThemeSizeMenu->addAction(normalIconAct); iconThemeSizeMenu->addAction(bigIconAct); iconThemeSizeMenu->addAction(hugeIconAct); settingsMenu->addSeparator(); - settingsMenu->addAction(appPrefsAct); - settingsMenu->addAction(editSplashAct); + settingsMenu->addAction(appPreferencesAct); + settingsMenu->addAction(customizeSplashAct); settingsMenu->addAction(burnConfigAct); - burnMenu = menuBar()->addMenu(tr("Read/Write")); - burnMenu->addAction(writeEepromAct); - burnMenu->addAction(readEepromAct); + burnMenu = menuBar()->addMenu(tr("&Read/Write")); + burnMenu->addAction(burnToAct); + burnMenu->addAction(burnFromAct); burnMenu->addSeparator(); - burnMenu->addAction(writeFileToEepromAct); - burnMenu->addAction(readEepromToFileAct); + burnMenu->addAction(burnExtenalToEEPROMAct); + burnMenu->addAction(burnExtenalFromEEPROMAct); burnMenu->addSeparator(); - burnMenu->addAction(writeFlashAct); - burnMenu->addAction(readFlashAct); + burnMenu->addAction(burnToFlashAct); + burnMenu->addAction(burnFromFlashAct); burnMenu->addSeparator(); burnMenu->addSeparator(); EEPROMInterface *eepromInterface = GetEepromInterface(); @@ -1794,12 +1937,13 @@ void MainWindow::createMenus() burnMenu->addAction(burnListAct); } menuBar()->addSeparator(); - helpMenu = menuBar()->addMenu(tr("Help")); + + helpMenu = menuBar()->addMenu(tr("&Help")); helpMenu->addSeparator(); helpMenu->addAction(checkForUpdatesAct); helpMenu->addSeparator(); helpMenu->addAction(aboutAct); - helpMenu->addAction(openDocURLAct); + helpMenu->addAction(openDocumentURLAct); helpMenu->addSeparator(); helpMenu->addAction(changelogAct); helpMenu->addAction(fwchangelogAct); @@ -1856,29 +2000,23 @@ void MainWindow::createToolBars() fileToolBar->setObjectName("File"); fileToolBar->addAction(newAct); fileToolBar->addAction(openAct); - - QToolButton * recentToolButton = new QToolButton; - recentToolButton->setPopupMode(QToolButton::InstantPopup); - recentToolButton->setMenu(createRecentFileMenu()); - recentToolButton->setIcon(CompanionIcon("recentdocument.png")); - recentToolButton->setToolTip(tr("Recent Files")); - recentToolButton->setStatusTip(tr("Show a selection list of recent documents")); - + QToolButton * recentToolButton = new QToolButton; + recentToolButton->setPopupMode(QToolButton::InstantPopup); + recentToolButton->setMenu(createRecentFileMenu()); + recentToolButton->setIcon(CompanionIcon("recentdocument.png")); + recentToolButton->setToolTip(tr("Recent Files")); fileToolBar->addWidget(recentToolButton); fileToolBar->addAction(saveAct); fileToolBar->addAction(logsAct); fileToolBar->addSeparator(); - fileToolBar->addAction(appPrefsAct); - fileToolBar->addAction(fwPrefsAct); - fileToolBar->addAction(editSplashAct); - - QToolButton * profileButton = new QToolButton; - profileButton->setPopupMode(QToolButton::InstantPopup); - profileButton->setMenu(createProfilesMenu()); - profileButton->setIcon(CompanionIcon("profiles.png")); - profileButton->setToolTip(tr("Radio Profiles")); - profileButton->setStatusTip(tr("Show a selection list of radio settings profiles")); - + fileToolBar->addAction(appPreferencesAct); + fileToolBar->addAction(fwPreferencesAct); + fileToolBar->addAction(customizeSplashAct); + profileButton = new QToolButton; + profileButton->setPopupMode(QToolButton::InstantPopup); + profileButton->setMenu(createProfilesMenu()); + profileButton->setIcon(CompanionIcon("profiles.png")); + profileButton->setToolTip(tr("Firmware Profiles")); fileToolBar->addWidget(profileButton); fileToolBar->addSeparator(); fileToolBar->addAction(simulateAct); @@ -1896,14 +2034,14 @@ void MainWindow::createToolBars() addToolBar( Qt::LeftToolBarArea, burnToolBar ); burnToolBar->setIconSize(size); burnToolBar->setObjectName("Write"); - burnToolBar->addAction(writeEepromAct); - burnToolBar->addAction(readEepromAct); + burnToolBar->addAction(burnToAct); + burnToolBar->addAction(burnFromAct); burnToolBar->addSeparator(); - burnToolBar->addAction(writeFileToEepromAct); - burnToolBar->addAction(readEepromToFileAct); + burnToolBar->addAction(burnExtenalToEEPROMAct); + burnToolBar->addAction(burnExtenalFromEEPROMAct); burnToolBar->addSeparator(); - burnToolBar->addAction(writeFlashAct); - burnToolBar->addAction(readFlashAct); + burnToolBar->addAction(burnToFlashAct); + burnToolBar->addAction(burnFromFlashAct); burnToolBar->addSeparator(); burnToolBar->addAction(burnConfigAct); @@ -1923,7 +2061,7 @@ void MainWindow::readSettings() { QSettings settings; restoreState(settings.value("mainWindowState").toByteArray()); - checkCompanion = settings.value("startup_check_companion", true).toBool(); + checkCompanion9x = settings.value("startup_check_companion", true).toBool(); checkFW = settings.value("startup_check_fw", true).toBool(); MaxRecentFiles =settings.value("history_size",10).toInt(); if (settings.value("profileId",0).toInt() == 0) @@ -1975,88 +2113,36 @@ void MainWindow::updateRecentFileActions() } for ( j = numRecentFiles; j < MaxRecentFiles; ++j) recentFileActs[j]->setVisible(false); -} - -void MainWindow::updateIconSizeActions() -{ - QSettings settings; - int size = settings.value("icon_size","0").toInt(); - switch (size){ - case 0: smallIconAct->setChecked(true); break; - case 1: normalIconAct->setChecked(true); break; - case 2: bigIconAct->setChecked(true); break; - case 3: hugeIconAct->setChecked(true); break; - } -} - -void MainWindow::updateLanguageActions() -{ - QSettings settings; - QString langId = settings.value("locale","").toString(); - - if (langId=="") - sysLangAct->setChecked(true); - else if (langId=="cs_CZ") - czechLangAct->setChecked(true); - else if (langId=="de_DE") - germanLangAct->setChecked(true); - else if (langId=="en") - englishLangAct->setChecked(true); - else if (langId=="fi_FI") - finnishLangAct->setChecked(true); - else if (langId=="fr_FR") - frenchLangAct->setChecked(true); - else if (langId=="it_IT") - italianLangAct->setChecked(true); - else if (langId=="he_IL") - hebrewLangAct->setChecked(true); - else if (langId=="pl_PL") - polishLangAct->setChecked(true); - else if (langId=="pt_PT") - portugueseLangAct->setChecked(true); - else if (langId=="ru_RU") - russianLangAct->setChecked(true); - else if (langId=="sv_SE") - swedishLangAct->setChecked(true); -} - -void MainWindow::updateIconThemeActions() -{ - QSettings settings; - int size = settings.value("theme","1").toInt(); - switch (size){ - case 0: classicThemeAct->setChecked(true); break; - case 1: newThemeAct->setChecked(true); break; - case 2: monoWhiteAct->setChecked(true); break; - case 3: monoThemeAct->setChecked(true); break; - case 4: monoBlueAct->setChecked(true); break; - } + + // separatorAct->setVisible(numRecentFiles > 0); } void MainWindow::updateProfilesActions() -{ - int i; - QSettings settings; - int activeProfile = settings.value("profileId").toInt(); + { + int i; + QSettings settings; + int activeProfile = settings.value("profileId").toInt(); - settings.beginGroup("Profiles"); - for (i=0; isetText(text); - profileActs[i]->setData(i+1); - profileActs[i]->setVisible(true); - if ((i+1) == activeProfile) - profileActs[i]->setChecked(true); - } - else { - profileActs[i]->setVisible(false); + settings.beginGroup("Profiles"); + for (i=0; isetText(text); + profileActs[i]->setData(i+1); + profileActs[i]->setVisible(true); + if ((i+1) == activeProfile) + profileActs[i]->setIcon(CompanionIcon("arrow-right.png")); + else + profileActs[i]->setIcon(CompanionIcon("")); + + } else { + profileActs[i]->setVisible(false); + } + settings.endGroup(); } - settings.endGroup(); - } } void MainWindow::createProfile() diff --git a/companion/src/mainwindow.h b/companion/src/mainwindow.h index 505878ef2..2881d70d0 100644 --- a/companion/src/mainwindow.h +++ b/companion/src/mainwindow.h @@ -81,14 +81,13 @@ public slots: void downloadLatestFW(FirmwareInfo *firmware, const QString & firmwareId); private slots: - void openDocURL(); + void openDocumentURL(); void setLanguage(QString langString); - void setSysLanguage() {setLanguage("");}; + void setDefaultLanguage() {setLanguage("");}; void setCZLanguage() {setLanguage("cs_CZ");}; void setDELanguage() {setLanguage("de_DE");}; void setENLanguage() {setLanguage("en");}; - void setFILanguage() {setLanguage("fi_FI");}; void setFRLanguage() {setLanguage("fr_FR");}; void setITLanguage() {setLanguage("it_IT");}; void setHELanguage() {setLanguage("he_IL");}; @@ -128,12 +127,12 @@ private slots: void logFile(); void copy(); void paste(); - void writeEeprom(); - void readEeprom(); - void writeFlash(QString fileToFlash=""); - void readFlash(); - void writeFileToEeprom(); - void readEepromToFile(); + void burnTo(); + void burnFrom(); + void burnToFlash(QString fileToFlash=""); + void burnFromFlash(); + void burnExtenalToEEPROM(); + void burnExtenalFromEEPROM(); void burnConfig(); void burnList(); void burnFuses(); @@ -146,8 +145,8 @@ private slots: void compare(); void print(); void loadBackup(); - void appPrefs(); - void fwPrefs(); + void appPreferences(); + void fwPreferences(); void updateMenus(); void createProfile(); MdiChild *createMdiChild(); @@ -158,20 +157,12 @@ private slots: private: void createActions(); - QAction * addAct(QString, QString, QString, QKeySequence::StandardKey, const char *); - QAction * addAct(QActionGroup *, QString, QString, const char *); - QAction * addAct(QString, QString, QString, const char *); - void createMenus(); void createToolBars(); void createStatusBar(); void readSettings(); void updateRecentFileActions(); void updateProfilesActions(); - void updateIconSizeActions(); - void updateLanguageActions(); - void updateIconThemeActions(); - int getFileType(const QString &fullFileName); QString FindTaranisPath(); QString Theme; @@ -201,11 +192,12 @@ private: QString downloadedFWFilename; downloadDialog * downloadDialog_forWait; - bool checkCompanion; + bool checkCompanion9x; bool checkFW; bool needRename; bool showcheckForUpdatesResult; int MaxRecentFiles; +// int ActiveProfile; int currentFWrev; int currentFWrev_temp; int NewFwRev; @@ -230,26 +222,26 @@ private: QAction *saveAct; QAction *saveAsAct; QAction *exitAct; - QAction *appPrefsAct; - QAction *fwPrefsAct; + QAction *appPreferencesAct; + QAction *fwPreferencesAct; QAction *checkForUpdatesAct; QAction *contributorsAct; QAction *changelogAct; QAction *fwchangelogAct; QAction *compareAct; - QAction *editSplashAct; + QAction *customizeSplashAct; QAction *cutAct; QAction *copyAct; QAction *pasteAct; - QAction *writeEepromAct; - QAction *readEepromAct; + QAction *burnToAct; + QAction *burnFromAct; QAction *burnConfigAct; QAction *burnListAct; QAction *burnFusesAct; - QAction *writeFlashAct; - QAction *readFlashAct; - QAction *writeFileToEepromAct; - QAction *readEepromToFileAct; + QAction *burnToFlashAct; + QAction *burnFromFlashAct; + QAction *burnExtenalToEEPROMAct; + QAction *burnExtenalFromEEPROMAct; QAction *simulateAct; QAction *separatorAct; QAction *aboutAct; @@ -262,26 +254,26 @@ private: QAction *classicThemeAct; QAction *newThemeAct; QAction *monoThemeAct; - QAction *monoBlueAct; - QAction *monoWhiteAct; + QAction *monoBlueThemeAct; + QAction *monoWhiteThemeAct; QAction *smallIconAct; QAction *normalIconAct; QAction *bigIconAct; QAction *hugeIconAct; - QAction *sysLangAct; - QAction *englishLangAct; - QAction *czechLangAct; - QAction *germanLangAct; - QAction *frenchLangAct; - QAction *finnishLangAct; - QAction *italianLangAct; - QAction *hebrewLangAct; - QAction *polishLangAct; - QAction *portugueseLangAct; - QAction *swedishLangAct; - QAction *russianLangAct; - QAction *openDocURLAct; + QAction *defaultLanguageAct; + QAction *englishLanguageAct; + QAction *czechLanguageAct; + QAction *germanLanguageAct; + QAction *frenchLanguageAct; + QAction *italianLanguageAct; + QAction *hebrewLanguageAct; + QAction *polishLanguageAct; + QAction *portugueseLanguageAct; + QAction *swedishLanguageAct; + QAction *russianLanguageAct; + QAction *openDocumentURLAct; QString fwToUpdate; + QToolButton * profileButton; }; #endif diff --git a/companion/src/mdichild.cpp b/companion/src/mdichild.cpp index 97d737d09..498e342af 100644 --- a/companion/src/mdichild.cpp +++ b/companion/src/mdichild.cpp @@ -506,7 +506,7 @@ QString MdiChild::strippedName(const QString &fullFileName) return QFileInfo(fullFileName).fileName(); } -void MdiChild::writeEeprom() // write to Tx +void MdiChild::burnTo() // write to Tx { QSettings settings; bool backupEnable=settings.value("backupEnable", true).toBool(); diff --git a/companion/src/mdichild.h b/companion/src/mdichild.h index 7a18491eb..ae7bbfbf4 100644 --- a/companion/src/mdichild.h +++ b/companion/src/mdichild.h @@ -94,7 +94,7 @@ public slots: void cut(); void copy(); void paste(); - void writeEeprom(); + void burnTo(); void simulate(); void print(int model=-1, QString filename=""); void setModified(); diff --git a/companion/src/translations.qrc.in b/companion/src/translations.qrc.in index a23b017ea..792ed43c9 100644 --- a/companion/src/translations.qrc.in +++ b/companion/src/translations.qrc.in @@ -1,14 +1,13 @@ - companion_cs.qm - companion_de.qm - companion_fi.qm companion_fr.qm + companion_de.qm companion_he.qm companion_it.qm companion_pl.qm companion_pt.qm - companion_sv.qm companion_ru.qm + companion_sv.qm + companion_cs.qm diff --git a/companion/src/translations/companion_fi.ts b/companion/src/translations/companion_fi.ts deleted file mode 100644 index 96023cc65..000000000 --- a/companion/src/translations/companion_fi.ts +++ /dev/null @@ -1,11084 +0,0 @@ - - - - - Channels - - - Name - - - - - Offset - - - - - Min - - - - - Max - - - - - Invert - - - - - Center - - - - - Sym - - - - - Channel %1 - - - - - --- - - - - - INV - - - - - CurveGroup - - - Diff - - - - - Expo - - - - - Func - - - - - Curve - - - - - Curves - - - Form - - - - - Standard - - - - - Custom - - - - - Lines - - - - - Smooth - - - - - Curve type - - - - - Curve name - - - - - Curve %1 - - - - - %1 points - - - - - Are you sure you want to reset curve %1 ? - - - - - Editing curve %1 - - - - - Not enough free points in EEPROM to store the curve. - - - - - CustomFunctionsPanel - - - Switch - - - - - Action - - - - - Parameters - - - - - Enable - - - - - CF%1 - - - - - ON - - - - - Error - - - - - Unable to find sound file %1! - - - - - &Delete - - - - - Delete - - - - - &Copy - - - - - Ctrl+C - - - - - &Cut - - - - - Ctrl+X - - - - - &Paste - - - - - Ctrl+V - - - - - Dialog - - - Dialog - - - - - Curve type - - - - - Coefficient - - - - - Both - - - - - x>0 - - - - - x<0 - - - - - Y at X=0 - - - - - Side - - - - - Y at X=-100 - - - - - Y at X=100 - - - - - Linear - - - - - Single Expo - - - - - Symmetrical f(x)=-f(-x) - - - - - Symmetrical f(x)=f(-x) - - - - - ExpoDialog - - - The source for the mixer - - - - - Input name - - - - - Weight - - - - - - GV - - - - - Phase used by the input. - - - - - Flight modes - - - - - 0 - - - - - 1 - - - - - 2 - - - - - 3 - - - - - 4 - - - - - 5 - - - - - 6 - - - - - 7 - - - - - 8 - - - - - Switch - - - - - Switch used by the input. -If blank then the input is considered to be "ON" all the time. - - - - - Stick Side - - - - - NEG - - - - - POS - - - - - ALL - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; text-decoration: underline;">Delay ans Slow</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These values control the speed and delay of the output of the mix. </p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Delay is not zero the actuation of the mix will be delayed by the specified amount of seconds.</p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Slow is not zero then the speed of the mix will be set by the value specified -&gt; the value states the number of seconds it takes to transit from -100 to 100.</p></body></html> - - - - - Scale - - - - - Include Trim - - - - - No - - - - - Yes - - - - - Curve - - - - - The curve used by the input - - - - - Source - - - - - Line name - - - - - Edit %1 - - - - - Rud - - - - - Ele - - - - - Thr - - - - - Ail - - - - - FlightMode - - - Form - - - - - Fade In - - - - - Fade Out - - - - - Name - - - - - Switch - - - - - trim1 - - - - - trim2 - - - - - trim4 - - - - - trim3 - - - - - Rud - - - - - Ele - - - - - Thr - - - - - Ail - - - - - Rotary Encoder %1 - - - - - GVAR%1 - - - - - FlightModes - - - Flight Mode %1 - - - - - (%1) - - - - - (default) - - - - - GeneralEdit - - - General Edit - - - - - Retrieve calib. and hw settings from profile - - - - - Store calib. and hw settings in selected profile - - - - - General settings used throught the transmitter. -These will be relevant for all models in the same EEPROM. - - - - - Setup - - - - - Country Code - - - - - America - - - - - Japan - - - - - Europe - - - - - MAVLink Baud Rate - - - - - Voice Language - - - - - Measurement Units - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Single Beep Every whole Minute</span></p></body></html> - - - - - Every Minute - - - - - Beeps at 30, 15, 10, and down from5 seconds - - - - - Count Down to Zero - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Flash backlight on timer beep</span></p></body></html> - - - - - Flash on beep - - - - - Beep volume - - - - - Wav volume - - - - - Vario volume - - - - - Background volume - - - - - PPMSim - - - - - 4800 Baud - - - - - 9600 Baud - - - - - 14400 Baud - - - - - 19200 Baud - - - - - 38400 Baud - - - - - 57600 Baud - - - - - 76800 Baud - - - - - 115200 Baud - - - - - Beeper Length - - - - - Pot Scrolling Enable - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">LCD Screen Contrast</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Values can be 20-45</span></p></body></html> - - - - - Haptic Length - - - - - Mode selection: - -Mode 1: - Left stick: Elevator, Rudder - Right stick: Throttle, Aileron - -Mode 2: - Left stick: Throttle, Rudder - Right stick: Elevator, Aileron - -Mode 3: - Left stick: Elevator, Aileron - Right stick: Throttle, Rudder - -Mode 4: - Left stick: Throttle, Aileron - Right stick: Elevator, Rudder - - - - - - - Mode 1 (RUD ELE THR AIL) - - - - - Mode 2 (RUD THR ELE AIL) - - - - - Mode 3 (AIL ELE THR RUD) - - - - - Mode 4 (AIL THR ELE RUD) - - - - - LCD Display Type - - - - - BackLight On Stick Move - - - - - - sec - - - - - Beeper Mode - - - - - Timeshift from UTC - - - - - RotEnc Navigation - - - - - FrSky Internal Alarm - - - - - THR - - - - - RUD - - - - - ELE - - - - - AIL - - - - - GEA - - - - - ID0 - - - - - ID1 - - - - - ID2 - - - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" text-decoration: underline;">Warnings</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These will define startup warnings.</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Throttle warning - will alert if the throttle is not at idle during startup</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Switch warning - will alert if switches are not in their defaul position</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Memory warning - will alert if there's not a lot of memory left</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Silent mode warning - will alert you if the beeper is set to quiet (0)</p></body></html> - - - - - GPS Coordinates - - - - - hh° (N/S) mm' ss''.dd - - - - - NMEA - - - - - If you enable FAI, you loose the vario, the play functions, the telemetry screen. This function cannot be disabled by the radio. - - - - - Channel order - -This is used by the templated to determine which channel goes to what number output. - - - - - R E T A - - - - - R E A T - - - - - R T E A - - - - - R T A E - - - - - R A E T - - - - - R A T E - - - - - E R T A - - - - - E R A T - - - - - E T R A - - - - - E T A R - - - - - E A R T - - - - - E A T R - - - - - T R E A - - - - - T R A E - - - - - T E R A - - - - - T E A R - - - - - T A R E - - - - - T A E R - - - - - A R E T - - - - - A R T E - - - - - A E R T - - - - - A E T R - - - - - A T R E - - - - - A T E R - - - - - Show Owner Name on Splash - - - - - Speaker Pitch (spkr only) - - - - - - X-Short - - - - - - Short - - - - - - Normal - - - - - - Long - - - - - - X-Long - - - - - StickScroll - - - - - FAI Mode - - - - - Haptic Strength - - - - - Beeper - - - - - Speaker - - - - - BeeperVoice - - - - - SpeakerVoice - - - - - Show Splash Screen on Startup - - - - - Metric - - - - - Imperial - - - - - Channel Order (For Templates) - - - - - Stick Mode - - - - - Haptic Mode - - - - - Owner Name - - - - - BackLight Invert - - - - - Standard - - - - - Optrex - - - - - - Show splash screen on startup - - - - - - Quiet - - - - - Only Alarms - - - - - - No Keys - - - - - - All - - - - - - - - - - - - - - - Beeper volume - -0 - Quiet. No beeps at all. -1 - No Keys. Normal beeps but menu keys do not beep. -2 - Normal. -3 - Loud. -4 - Extra loud. - - - - - Alarms Only - - - - - If this value is not 0, any keypress will turn on the backlight and turn it off after the specified number of seconds. - - - - - Timer Beeps - - - - - BackLight Brightness - - - - - Contrast - - - - - BackLight Auto OFF after - - - - - Single - - - - - Oversample - - - - - Filter - - - - - This is the switch selectrion for turning on the backlight (if installed). - - - - - - - Bandgap Measuring Enable - - - - - Input Filter - - - - - CrossTrim - - - - - Sound Mode - - - - - BackLight Switch - - - - - Battery calibration: -This value will be added to the measured battery voltage. Use this value to calibrate the meter with an external meter. - - - - - Battery Calibration - - - - - Battery Warning - - - - - Battery warning voltage. -This is the threashhold where the battery warning sounds. - -Acceptable values are 5v..10v - - - - - Telemetry NO DATA Alarm - - - - - Readonly Unlock - - - - - Speaker Volume - - - - - If not zero will sound beeps if the transmitter has been left without inputs for the specified number of minutes. - - - - - min - - - - - Inactivity Timer - - - - - SC - - - - - SE - - - - - SA - - - - - SF - - - - - SH - - - - - SD - - - - - SB - - - - - SG - - - - - Alarm Warning - - - - - Memory Startup Warning - - - - - Trainer - - - - - Mode - - - - - Input - - - - - Weight - - - - - Switch - - - - - - PPM 1 - - - - - - - - Off - - - - - - - - += (Sum) - - - - - - - - := (Replace) - - - - - - - - chn1 - - - - - - - - chn2 - - - - - - - - chn3 - - - - - - - - chn4 - - - - - - PPM 2 - - - - - - PPM 3 - - - - - - PPM 4 - - - - - Telemetry - - - - - RSSI Alarm 1 - - - - - - ---- - - - - - - Yellow - - - - - - Orange - - - - - - Red - - - - - RSSI Alarm 2 - - - - - NO DATA Alarm - - - - - Calibration - - - - - POT 4 - - - - - POT 3 - - - - - POT 2 - - - - - POT 1 - - - - - STICK 3 - - - - - - Negative span - - - - - - Mid value - - - - - - Positive span - - - - - STICK 1 - - - - - STICK 2 - - - - - STICK 4 - - - - - Battery - - - - - v - - - - - PPM Multiplier - - - - - Current - - - - - - Pot (normal) - - - - - - Multipos Switch - - - - - S1 Type - - - - - S2 Type - - - - - If you enable FAI, you loose the vario, the play functions, the telemetry screen. -This function cannot be disabled by the radio. -Are you sure ? - - - - - - Warning - - - - - Wrong data in profile, radio calibration was not retrieved - - - - - Wrong data in profile, hw related parameters were not retrieved - - - - - Do you want to store calibration in %1 profile<br>overwriting existing calibration? - - - - - Calibration and HW parameters saved. - - - - - Heli - - - Form - - - - - Invert Elevator - - - - - Invert Aileron - - - - - Invert Collective - - - - - Invert - - - - - Off - - - - - 120 - - - - - 120X - - - - - 140 - - - - - 90 - - - - - Collective - - - - - Swash Type - - - - - Swash Ring - - - - - InputsPanel - - - - Move Up - - - - - - Ctrl+Up - - - - - - Move Down - - - - - - Ctrl+Down - - - - - Clear All Settings - - - - - Source(%1) - - - - - No Trim - - - - - Weight(%1) - - - - - Switch(%1) - - - - - Not enough available inputs! - - - - - Delete Selected Inputs? - - - - - &Add - - - - - Ctrl+A - - - - - &Edit - - - - - Enter - - - - - &Delete - - - - - Delete - - - - - &Copy - - - - - Ctrl+C - - - - - &Cut - - - - - Ctrl+X - - - - - &Paste - - - - - Ctrl+V - - - - - Du&plicate - - - - - Ctrl+U - - - - - Clear Inputs? - - - - - Really clear all the inputs? - - - - - LogicalSwitchesPanel - - - Condition - - - - - V1 - - - - - V2 - - - - - AND - - - - - Duration - - - - - Delay - - - - - - LS%1 - - - - - &Delete - - - - - Delete - - - - - &Copy - - - - - Ctrl+C - - - - - &Cut - - - - - Ctrl+X - - - - - &Paste - - - - - Ctrl+V - - - - - MainWindow - - - - - - File loaded - - - - - Display previous warning again at startup ? - - - - - Display previous message again at startup ? - - - - - Checking for updates - - - - - - - - - Unable to check for updates. - - - - - A new version of Companion is available (version %1)<br>Would you like to download it? - - - - - - - - - Save As - - - - - Executable (*.exe) - - - - - New release available - - - - - A new release of Companion is available please check the OpenTX website! - - - - - - No updates available at this time. - - - - - Would you like to launch the installer? - - - - - - - - - - - - - - - - - Error - - - - - - - - - Error opening file %1: -%2. - - - - - Firmware does not longer fit in the Tx, due to selected firmware options - - - - - Compilation server temporary failure, try later - - - - - - Compilation server too busy, try later - - - - - - Compilation server requires registration, please check OpenTX web site - - - - - - Unknown server failure, try later - - - - - Firmware does not fit in the Tx, due to selected firmware options - - - - - Compilation server termporary failure, try later - - - - - Do you want to write the firmware to the transmitter now ? - - - - - Firmware %1 does not seem to have ever been downloaded. -Version %2 is available. -Do you want to download it now ? - - - - - - Yes - - - - - - No - - - - - - Release Notes - - - - - - Do you want to download release %1 now ? - - - - - A new version of %1 firmware is available (current %2 - newer %3). -Do you want to download it now ? - - - - - Ignore this version (r%1)? - - - - - Release notes contain very important informations. Do you want to see them now ? - - - - - The selected language will be used the next time you start Companion. - - - - - - - OK - - - - - The new theme will be loaded the next time you start Companion. - - - - - The icon size will be used the next time you start Companion. - - - - - Open - - - - - - File saved - - - - - Firmware updates - - - - - Current firmware does not provide release notes informations. - - - - - Cannot write file %1: -%2. - - - - - - - - - Taranis radio not found - - - - - - - - Impossible to identify the radio on your system, please verify the eeprom disk is connected. - - - - - - - - - Read Models and Settings From Tx - - - - - Write Models and settings from %1 to the Tx? - - - - - The file %1 -has not been recognized as a valid Models and Settings file -Write anyway ? - - - - - - - Backup is impossible - - - - - - - The backup dir set in preferences does not exist - - - - - - - - - - Backup Models and Settings From Tx - - - - - Cannot check Models and Settings compatibility! Continue anyway? - - - - - - Warning - - - - - The transmitter firmware belongs to another product family, check file and preferences! - - - - - The transmitter firmware is outdated, please upgrade! - - - - - - Write Models and Settings To Tx - - - - - - Write Firmware To Tx - - - - - Conversion failed - - - - - Cannot convert Models and Settings for use with this firmware, original data will be used - - - - - Restore Models and Settings To Tx - - - - - Restore failed - - - - - Could not restore Models and Settings to TX. The models and settings data file can be found at: %1 - - - - - Firmware write failed - - - - - Could not write firmware to to transmitter. The models and settings data file can be found at: %1 - - - - - Backup failed - - - - - Cannot backup existing Models and Settings from TX. Firmware write process aborted - - - - - Save transmitter Models and Settings to File - - - - - Impossible to identify the radio on your system, please verify that the eeprom disk is connected. - - - - - Read Tx Firmware to File - - - - - OpenTX Home Page: <a href='%1'>%1</a> - - - - - The OpenTX Companion project was originally forked from <a href='%2'>eePe</a> - - - - - If you've found this program useful, please support by <a href='%1'>donating</a> - - - - - Version %1, %3 - - - - - Copyright - - - - - About Companion - Noin Companion - - - - OpenTX Companion - FW: %1 - Profile: %2 - - - - - - New - - - - - Create a new file - - - - - Open... - - - - - Open an existing file - - - - - Save... - - - - - - Save the document to disk - - - - - Save As... - - - - - Exit - - - - - Exit the application - - - - - Cut - - - - - Cut current selection to the clipboard - - - - - Copy... - - - - - Copy current selection to the clipboard - - - - - Paste... - - - - - Paste clipboard into current selection - - - - - Classical - - - - - The classical Companion icon theme - - - - - The new Companion 2 icon theme - - - - - Monochrome - - - - - A monochrome black icon theme - - - - - MonoWhite - - - - - A monochrome white icon theme - - - - - MonoBlue - - - - - A monochrome blue icon theme - - - - - Small - - - - - Use small toolbar icons - - - - - Normal - - - - - Use normal size toolbar icons - - - - - Big - - - - - Use big toolbar icons - - - - - Huge - - - - - Use huge toolbar icons - - - - - System language - - - - - Use system language in menus - - - - - Czech - - - - - Use Czech in menus - - - - - German - - - - - Use German in menus - - - - - English - - - - - Use English in menus - - - - - French - - - - - Use French in menus - - - - - Italian - - - - - Use Italian in menus - - - - - Hebrew - - - - - Use Hebrew in menus - - - - - Polish - - - - - Use Polish in menus - - - - - Portuguese - - - - - Use Portuguese in menus - - - - - Swedish - - - - - Use Swedish in menus - - - - - Russian - - - - - Use Russian in menus - - - - - About - Noin - - - - Show the application's About box - - - - - Print - - - - - Print current model - - - - - Simulate - - - - - Simulate selected model - - - - - loadBackup... - - - - - Load backup from file - - - - - Logs - - - - - Open log file - - - - - Setting... - - - - - Edit Settings - - - - - Downloads... - - - - - Download firmware and voice files - - - - - Check for updates... - - - - - Check OpenTX and Companion updates - - - - - ChangeLog... - - - - - Show Companion changelog - - - - - Firmware ChangeLog... - - - - - Show firmware changelog - - - - - Compare... - - - - - Compare models - - - - - Edit Tx Splash Image... - - - - - edit the splash screen of your TX - - - - - List programmers - - - - - List available programmers - - - - - Fuses... - - - - - Show fuses dialog - - - - - Read Firmware - - - - - Read firmware from transmitter - - - - - Write Firmware - - - - - Write firmware to transmitter - - - - - New Profile - - - - - Create a new Radio Setting Profile - - - - - Manuals and other Documents - - - - - Open the OpenTX document page in a web browser - - - - - Write Models and Settings to transmitter - - - - - Read Models and Settings from transmitter - - - - - Configure connection software... - - - - - Configure software for reading from and writing to the transmitter - - - - - Write Models and Settings from file to Tx - - - - - Write Models and Settings from file to transmitter - - - - - Save Tx Models and Settings to file - - - - - Save the Models and Settings from the transmitter to a file - - - - - Contributors - - - - - A tribute to those who have contributed to OpenTX and Companion - - - - - - Recent Files - - - - - Set Menu Language - - - - - Set Icon Theme - - - - - Set Icon Size - - - - - - File - - - - - - Edit - - - - - Settings - - - - - Read/Write - - - - - - Help - - - - - Radio Settings Profiles - - - - - Show a selection list of recent documents - - - - - Radio Profiles - - - - - Show a selection list of radio settings profiles - - - - - Write - - - - - Ready - - - - - - &%1 %2 - - - - - Unable to find file %1! - - - - - - Invalid Models and Settings File %1 - - - - - Error reading file %1: -%2. - - - - - Invalid binary Models and Settings File %1 - - - - - MdiChild - - - free bytes - - - - - - - Companion - - - - - Do you want to use model wizard? - - - - - Ask this question again ? - - - - - Editing model %1: - - - - - - - - - - - - - - - - - - - - - - - Error - - - - - - Unable to find file %1! - - - - - - - - Error opening file %1: -%2. - - - - - - Invalid EEPROM File %1 - - - - - - Error reading file %1: -%2. - - - - - Invalid binary EEPROM File %1 - - - - - - - - Save As - - - - - - - - Cannot write file %1: -%2. - - - - - - Error writing file %1: -%2. - - - - - %1 has been modified. -Do you want to save your changes? - - - - - Backup is impossible - - - - - The backup dir set in preferences does not exist - - - - - Cannot write temporary file! - - - - - - - Taranis radio not found - - - - - - - Impossible to identify the radio on your system, please verify the eeprom disk is connected. - - - - - - - Backup EEPROM From Tx - - - - - Cannot check eeprom compatibility! Continue anyway? - - - - - - Warning - - - - - Firmware in radio is of a different family of eeprom written, check file and preferences! - - - - - Firmware in flash is outdated, please upgrade! - - - - - Write EEPROM To Tx - - - - - Open - - - - - Invalid binary backup File %1 - - - - - MixerDialog - - - Dialog - - - - - Delay - - - - - Slow - - - - - Up - - - - - Down - - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; text-decoration: underline;">Delay ans Slow</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These values control the speed and delay of the output of the mix. </p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Delay is not zero the actuation of the mix will be delayed by the specified amount of seconds.</p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Slow is not zero then the speed of the mix will be set by the value specified -&gt; the value states the number of seconds it takes to transit from -100 to 100.</p></body></html> - - - - - Include Trim - - - - - Offset - - - - - Weight - - - - - 0 - - - - - 1 - - - - - 2 - - - - - 3 - - - - - 4 - - - - - 5 - - - - - 6 - - - - - 7 - - - - - 8 - - - - - Name - - - - - Source - - - - - Multiplex - - - - - Warning - - - - - The curve used by the mix - - - - - Include DR/Expo - - - - - Flight modes - - - - - Switch - - - - - Mixer warning. -Setting this value will cause a beep to be emmitted when this value is active. - - - - - OFF - - - - - 1 Beep - - - - - 2 Beep - - - - - 3 Beep - - - - - No - - - - - Yes - - - - - - - GV - - - - - - - - The source for the mixer - - - - - Multiplexer - -This determines how mixer values are added. - -"+" means the value of the current mix is added to the previous mixes in the same channel. -"*" means the value of the current mix is amultiplied with the previous mixes in the same channel. -"R" means the value replaces the previous values. If the switch is off the value will be ignored. - - - - - ADD - - - - - MULTIPLY - - - - - REPLACE - - - - - Curve - - - - - Switch used by the mix. -If blank then the mix is considered to be "ON" all the time. - - - - - DEST -> X%1 - - - - - DEST -> CH%1%2 - - - - - Rud - - - - - Ele - - - - - Thr - - - - - Ail - - - - - MixesPanel - - - - Move Up - - - - - - Ctrl+Up - - - - - - Move Down - - - - - - Ctrl+Down - - - - - Clear Mixes - - - - - - - X%1 - - - - - - - CH%1%2 - - - - - Weight(%1) - - - - - Switch(%1) - - - - - No Trim - - - - - No DR/Expo - - - - - Offset(%1) - - - - - Delay(u%1:d%2) - - - - - Slow(u%1:d%2) - - - - - Warn(%1) - - - - - Not enough available mixers! - - - - - Delete Selected Mixes? - - - - - &Add - - - - - Ctrl+A - - - - - &Edit - - - - - Enter - - - - - &Delete - - - - - Delete - - - - - &Copy - - - - - Ctrl+C - - - - - &Cut - - - - - Ctrl+X - - - - - &Paste - - - - - Ctrl+V - - - - - Du&plicate - - - - - Ctrl+U - - - - - Clear Mixes? - - - - - Really clear all the mixes? - - - - - ModelEdit - - - Dialog - - - - - Simulate - - - - - Clear Curves? - - - - - Really clear all the curves? - - - - - Setup - - - - - Heli - - - - - Flight Modes - - - - - Inputs - - - - - Mixes - - - - - Channels - - - - - Logical Switches - - - - - Switch Assignment - - - - - Curves - - - - - Telemetry - - - - - ModelsListWidget - - - &Edit - - - - - &Restore from backup - - - - - &Model Wizard - - - - - &Delete - - - - - Delete - - - - - &Copy - - - - - Ctrl+C - - - - - &Cut - - - - - Ctrl+X - - - - - &Paste - - - - - Ctrl+V - - - - - D&uplicate - - - - - Ctrl+U - - - - - &Use as default - - - - - P&rint model - - - - - Alt+R - - - - - &Simulate model - - - - - Alt+S - - - - - General Settings - - - - - Delete Selected Models? - - - - - - Cannot delete default model. - - - - - Cannot cut default model. - - - - - Do you want to overwrite TX general settings? - - - - - You are pasting on an not empty model, are you sure? - - - - - No free slot available, cannot duplicate - - - - - Module - - - Form - - - - - Failsafe Mode - - - - - Start - - - - - PPM delay - - - - - usec - - - - - Negative - - - - - Positive - - - - - RX Number - - - - - Master - - - - - Slave - - - - - Polarity - - - - - Trainer Mode - - - - - mSec - - - - - PPM Frame Length - - - - - Label - - - - - - ch - - - - - Channels - - - - - Hold - - - - - Custom - - - - - No Pulses - - - - - Failsafe Positions - - - - - Protocol - - - - - ModulePanel - - - Trainer Output - - - - - Internal Radio System - - - - - External Radio Module - - - - - QObject - - - FW: %1 - - - - - Pict: %1 - - - - - Profile image - - - - - - Rud - - - - - - Ele - - - - - - Thr - - - - - - Ail - - - - - - - P1 - - - - - - - P2 - - - - - - - P3 - - - - - - S1 - - - - - - S2 - - - - - - LS - - - - - - RS - - - - - - - REa - - - - - - - REb - - - - - TrmR - - - - - TrmE - - - - - TrmT - - - - - TrmA - - - - - Batt - - - - - - - - Timer1 - - - - - - - - Timer2 - - - - - SWR - - - - - Tx - - - - - RSSI - - - - - Rx - - - - - A1 - - - - - A2 - - - - - Alt - - - - - Rpm - - - - - Fuel - - - - - T1 - - - - - T2 - - - - - Speed - - - - - Dist - - - - - GPS Alt - - - - - Cell - - - - - Cels - - - - - Vfas - - - - - Curr - - - - - Cnsp - - - - - Powr - - - - - AccX - - - - - AccY - - - - - AccZ - - - - - HDG - - - - - VSpd - - - - - ASpd - - - - - dTE - - - - - A1- - - - - - A2- - - - - - Alt- - - - - - Alt+ - - - - - Rpm+ - - - - - T1+ - - - - - T2+ - - - - - Spd+ - - - - - Dst+ - - - - - Cel- - - - - - Vfs- - - - - - Cur+ - - - - - Pwr+ - - - - - ACC - - - - - Time - - - - - - LS1 - - - - - - LS2 - - - - - - LS3 - - - - - - LS4 - - - - - - LS5 - - - - - - LS6 - - - - - - LS7 - - - - - - LS8 - - - - - - LS9 - - - - - - LSA - - - - - - LSB - - - - - - LSC - - - - - - LSD - - - - - - LSE - - - - - - LSF - - - - - - LSG - - - - - - LSH - - - - - - LSI - - - - - - LSJ - - - - - - LSK - - - - - - LSL - - - - - - LSM - - - - - - LSN - - - - - - LSO - - - - - - LSP - - - - - - LSQ - - - - - - LSR - - - - - - LSS - - - - - - LST - - - - - - LSU - - - - - - LSV - - - - - - LSW - - - - - - - - ---- - - - - - Input %1 - - - - - MAX - - - - - CYC%1 - - - - - PPM%1 - - - - - CH%1%2 - - - - - X%1 - - - - - - - GV%1 - - - - - S11 - - - - - S12 - - - - - S13 - - - - - S14 - - - - - S15 - - - - - S16 - - - - - S21 - - - - - S22 - - - - - S23 - - - - - S24 - - - - - S25 - - - - - S26 - - - - - RudTrim Left - - - - - RudTrim Right - - - - - EleTrim Down - - - - - EleTrim Up - - - - - ThrTrim Down - - - - - ThrTrim Up - - - - - AilTrim Left - - - - - AilTrim Right - - - - - - - OFF - - - - - ABS - - - - - THs - - - - - TH% - - - - - THt - - - - - - ON - - - - - ??? - - - - - Diff(%1) - - - - - Expo(%1) - - - - - Function(%1) - - - - - Curve(%1) - - - - - !Curve(%1) - - - - - - - --- - - - - - a>x - - - - - a<x - - - - - |a|>x - - - - - |a|<x - - - - - AND - - - - - OR - - - - - XOR - - - - - a=b - - - - - a!=b - - - - - a>b - - - - - a<b - - - - - a>=b - - - - - a<=b - - - - - d>=x - - - - - |d|>=x - - - - - a~x - - - - - Timer - - - - - Sticky - - - - - Stay - - - - - Unknown - - - - - STAY(%1, [%2:%3]) - - - - - STICKY(%1, %2) - - - - - TIMER(%1, %2) - - - - - Delay %1 sec - - - - - Duration %1 sec - - - - - - - - - - <font color=red><b>Inconsistent parameter</b></font> - - - - - - - All - - - - - - - Telemetry - - - - - - Value - - - - - - Decr: - - - - - - Incr: - - - - - Safety %1 - - - - - Trainer - - - - - Trainer RUD - - - - - Trainer ELE - - - - - Trainer THR - - - - - Trainer AIL - - - - - Instant Trim - - - - - Play Sound - - - - - Play Haptic - - - - - Reset - - - - - Set Timer %1 - - - - - Vario - - - - - Play Track - - - - - Play Both - - - - - Play Value - - - - - Start Logs - - - - - Volume - - - - - Backlight - - - - - Background Music - - - - - Background Music Pause - - - - - Adjust GV%1 - - - - - - No repeat - - - - - %1 sec - - - - - th9x - - - - - er9x - - - - - ersky9x - - - - - - Simultaneous usage of expo and curves is no longer supported - - - - - Simultaneous usage of expo and curves is no longer supported in open9x - - - - - openTx only accepts %1 points in all curves - - - - - - - - OpenTX on this board doesn't accept this function - - - - - - OpenTX doesn't accept this protocol - - - - - OpenTX doesn't allow this number of channels - - - - - Your radio probably uses a wrong firmware, - eeprom size is 4096 but only the first 2048 are used - - - - - - - - Warning - - - - - EEPROM saved with these warnings: - - - - - - Support for frsky telemetry mod - - - - - Support for telemetry easy board - - - - - - Support for jeti telemetry mod - - - - - - Support for receiving ardupilot data - - - - - - Support for receiving NMEA data - - - - - - Support for MAVLINK devices - - - - - Rotary Encoder use in menus navigation - - - - - - - - - Pots use in menus navigation - - - - - Possibility to enable FAI MODE at field - - - - - FAI MODE always enabled - - - - - OpenTX for 9X board - - - - - - - - - Enable heli menu and cyclic mix support - - - - - - - - - - Enable TEMPLATES menu - - - - - - - - No splash screen - - - - - - - - - - No flight modes - - - - - - - - - - Disable curves menus - - - - - - - - Support for radio modified with regular speaker - - - - - - - - - Used if you have modified your radio with voice mode - - - - - - - - Used if you have modified your radio with haptic mode - - - - - - - - - Support for DSM2 modules - - - - - - - - - - PPM center adjustment in limits - - - - - - - - - - - - PPM values displayed in us - - - - - - - - - - Global variables - - - - - - - - - - Symetrical Limits - - - - - - SmartieParts 2.2 Backlight support - - - - - - - - - - In model setup menus automatically set source by moving some of them - - - - - - - - - - In model setup menus automatically set switch by moving some of them - - - - - - - - Enable resetting values by pressing up and down at the same time - - - - - - - - - - No graphical check boxes and sliders - - - - - - - - - - Battery graph - - - - - - - - - - Don't use bold font for highlighting active items - - - - - - - - - - - - Use alternative SQT5 font - - - - - - - - Enable the throttle trace in Statistics - - - - - EEprom write progress bar - - - - - - - - - Imperial units - - - - - - No Winged Shadow How High support - - - - - - No vario support - - - - - - No GPS support - - - - - - No gauges in the custom telemetry screen - - - - - Allow compensating for offset errors in FrSky FAS current sensors - - - - - OpenTX for M128 / 9X board - - - - - - - - EEprom write Progress bar - - - - - OpenTX for 9XR - - - - - OpenTX for 9XR with M128 chip - - - - - OpenTX for Gruvin9x board / 9X - - - - - Support for SD memory card - - - - - Support of FrSky PXX protocol - - - - - Support for DSM2 modules using ppm instead of true serial - - - - - OpenTX for Sky9x board / 9X - - - - - Enable HELI menu and cyclic mix support - - - - - Use FrSky Taranis sticks in a 9X/9XR - - - - - Bluetooth interface - - - - - OpenTX for FrSky Taranis - - - - - - Disable HELI menu and cyclic mix support - - - - - - Disable TEMPLATES menu - - - - - - Disable Global variables - - - - - OpenTX for FrSky Taranis Rev4a - - - - - th9x on this board doesn't have Rotary Encoders - - - - - - FM%1 - - - - - Input%1 - - - - - Rud Trim - - - - - Ele Trim - - - - - Thr Trim - - - - - Ail Trim - - - - - Rot Enc - - - - - English - - - - - French - - - - - Italian - - - - - German - - - - - Czech - - - - - Slovak - - - - - Spanish - - - - - Polish - - - - - Portuguese - - - - - Swedish - - - - - - THR - - - - - CH%1 - - - - - No - - - - - RotEnc A - - - - - Rot Enc B - - - - - Rot Enc C - - - - - Rot Enc D - - - - - Rot Enc E - - - - - !Flight mode %1 - - - - - Flight mode %1 - - - - - Own value - - - - - Flight mode %1 value - - - - - Keys - - - - - Sticks - - - - - Keys + Sticks - - - - - - -GV%1 - - - - - Yellow - - - - - Orange - - - - - Red - - - - - Winged Shadow How High - - - - - Winged Shadow How High (not supported) - - - - - FrSky Sensor Hub - - - - - - None - - - - - Imperial - - - - - Metric - - - - - Extra Fine - - - - - Fine - - - - - Medium - - - - - Coarse - - - - - Exponential - - - - - Count Up - - - - - Count Down - - - - - %1:%2, - - - - - : %1 Channels, %2usec Delay - - - - - Flight modes(%1) - - - - - Flight mode(%1) - - - - - Rudder - - - - - Elevator - - - - - Throttle - - - - - Aileron - - - - - - - Simulator for this firmware is not yet available - - - - - Played once, not during startup - - - - - %1s - - - - - Value - - - - - Source - - - - - GVAR - - - - - Increment - - - - - Rotary Encoder - - - - - Trim disabled - - - - - Own Trim - - - - - Use Trim from Flight mode %1 - - - - - Use Trim from Flight mode %1 + Own Trim as an offset - - - - - Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next OpenTX/Companion funding model. - -We are really appreciative for that! - -The OpenTX/Companion Team. - - - - - Setup - - - Form - - - - - Model Image - - - - - Model Name - - - - - Timer2 - - - - - Timer1 - - - - - Throttle Source - - - - - Switch Warnings - - - - - Center beep - - - - - Trim Increment - - - - - Exponential - - - - - Extra Fine - - - - - Fine - - - - - Medium - - - - - Coarse - - - - - Extended Limits - - - - - Extended Trims - - - - - Display Checklist - - - - - Throttle Trim - - - - - Throttle Warning - - - - - Reverse throttle operation. -If this is checked the throttle will be reversed. Idle will be forward, trim will also be reversed and the throttle warning will be reversed as well. - - - - - - - Reverse Throttle - - - - - Pot Warnings - - - - - OFF - - - - - Manual - - - - - Auto - - - - - Telemetry - - - Form - - - - - - - - A1 - - - - - - - - A2 - - - - - RSSI - - - - - Alarm 1 - - - - - - ---- - - - - - - Yellow - - - - - - Orange - - - - - - Red - - - - - Alarm 2 - - - - - Serial Protocol - - - - - Volt source - - - - - Metric - - - - - Imperial - - - - - Current source - - - - - Protocol - - - - - NONE - - - - - - FAS - - - - - None - - - - - FrSky Sensor Hub - - - - - CEL - - - - - 2 - - - - - 3 - - - - - 4 - - - - - Units - - - - - Blades - - - - - Altimetry / Vario - - - - - Alti - - - - - Alti+ - - - - - Vario - - - - - Sink Max - - - - - Off - - - - - Climb Max - - - - - Sink Min - - - - - Climb Min - - - - - Vario source - - - - - Vario limits - - - - - Use GPS as altitude source - - - - - Display altitude in toolbar - - - - - Various - - - - - mAh count - - - - - FAS Offset - - - - - Persistent mAh - - - - - TelemetryAnalog - - - Form - - - - - Unit - - - - - Max Value - - - - - Alarm 1 - - - - - - ---- - - - - - - Yellow - - - - - - Orange - - - - - - Red - - - - - - < - - - - - - > - - - - - Alarm 2 - - - - - Min Value - - - - - Volts (V) - - - - - Amps (A) - - - - - Speed (m/s or ft/s) - - - - - Raw (-) - - - - - Speed (km/h or miles/h) - - - - - Meters (m or ft) - - - - - Temp (°) - - - - - Fuel (%) - - - - - mAmps (mA) - - - - - Range - - - - - TelemetryCustomScreen - - - Form - - - - - Custom Screen Type - - - - - Nums - - - - - Bars - - - - - Min - - - - - Source - - - - - Gauge - - - - - Max - - - - - TelemetryPanel - - - Telemetry screen %1 - - - - - Winged Shadow How High - - - - - Winged Shadow How High (not supported) - - - - - Timer - - - Form - - - - - mm:ss - - - - - Countdown - - - - - MinuteBeep - - - - - Persistent - - - - - (00:00:00) - - - - - TimerPanel - - - None - - - - - Beeps - - - - - Countdown - - - - - appPreferencesDialog - - - Edit Settings - - - - - Application Settings - - - - - Automatic Backup Folder - - - - - User Splash Screens - - - - - Include companion splashes - - - - - Only user defined splashes - - - - - Google Earth Executable - - - - - Automatic check for OpenTX firmware updates - - - - - - - - Open Folder - - - - - Find Executable - - - - - Files to keep - - - - - Splash Screen Library - - - - - Enable automatic backup before writing firmware - - - - - Automatic check for Companion updates - - - - - Offer to use wizard for new models - - - - - Show splash screen when Companion starts - - - - - Simulator Settings - - - - - Simulator BackLight - - - - - Enable - - - - - Blue - - - - - Green - - - - - Red - - - - - Orange - - - - - Yellow - - - - - Joystick - - - - - Only capture to clipboard - - - - - Calibrate - - - - - Remember simulator switch values - - - - - Simulator capture folder - - - - - Radio Settings - - - - - Mode selection: - -Mode 1: - Left stick: Elevator, Rudder - Right stick: Throttle, Aileron - -Mode 2: - Left stick: Throttle, Rudder - Right stick: Elevator, Aileron - -Mode 3: - Left stick: Elevator, Aileron - Right stick: Throttle, Rudder - -Mode 4: - Left stick: Throttle, Aileron - Right stick: Elevator, Rudder - - - - - - - Mode 1 (RUD ELE THR AIL) - - - - - Mode 2 (RUD THR ELE AIL) - - - - - Mode 3 (AIL ELE THR RUD) - - - - - Mode 4 (AIL THR ELE RUD) - - - - - Channel order - -This is used by the templated to determine which channel goes to what number output. - - - - - R E T A - - - - - R E A T - - - - - R T E A - - - - - R T A E - - - - - R A E T - - - - - R A T E - - - - - E R T A - - - - - E R A T - - - - - E T R A - - - - - E T A R - - - - - E A R T - - - - - E A T R - - - - - T R E A - - - - - T R A E - - - - - T E R A - - - - - T E A R - - - - - T A R E - - - - - T A E R - - - - - A R E T - - - - - A R T E - - - - - A E R T - - - - - A E T R - - - - - A T R E - - - - - A T E R - - - - - Default Stick Mode - - - - - Settings Profile - - - - - Splash Screen - - - - - Channel Order - - - - - Append version number to FW file name - - - - - SD Structure path - - - - - Offer to write FW to Tx after download - - - - - Remove Profile - - - - - Firmware - - - - - Select Image - - - - - Clear Image - - - - - Select your snapshot folder - - - - - - No joysticks found - - - - - Select your library folder - - - - - Select your Models and Settings backup folder - - - - - Select Google Earth executable - - - - - Select the folder replicating your SD structure - - - - - Not possible to remove profile - - - - - The default profile can not be removed. - - - - - Open Image to load - - - - - Images (%1) - - - - - avrOutputDialog - - - Dialog - - - - - Show Details - - - - - result - - - - - executable not found - - - - - - Error - - - - - Cannot open source file - - - - - Cannot write destination - - - - - Writing file: - - - - - ie: OpenTX for 9X board or OpenTX for 9XR board - - - - - ie: OpenTX for M128 / 9X board or OpenTX for 9XR board with M128 chip - - - - - ie: OpenTX for Gruvin9X board - - - - - Your radio uses a %1 CPU!!! - -Please check advanced burn options to set the correct cpu type. - - - - - Your radio uses a %1 CPU!!! - -Please select an appropriate firmware type to program it. - - - - - -You are currently using: - %1 - - - - - - Writing - - - - - - Reading - - - - - - Verifying - - - - - done - exit code %1 - - - - - done with errors - - - - - - done - SUCCESSFUL - - - - - did not finish correctly - - - - - did not finish correctly! -Do you want some help ? - - - - - Copy did not finish correctly - - - - - finished correctly - - - - - Copy finished correctly - - - - - Started - - - - - FUSES: Low=%1 High=%2 Ext=%3 - - - - - burnConfigDialog - - - Programmer Configuration - - - - - - Location of sam-ba executable - - - - - - - - The location of the AVRDUDE executable. - - - - - DFU-Util Location - - - - - Location of AVRDUDE executable - - - - - - - Use this button to browse and look for the AVRDUDE executable file. - - - - - - - Browse... - - - - - Programmer - - - - - Programmer used for communicating with the controller. -Please consult the programmer's documentation and the AVRDUDE documentation to select the appropriate programmer. - - - - - List all available programmers. - - - - - List Available - - - - - - Extra arguments that will be passed to AVRDUDE on every call - - - - - - Extra arguments used in AVRDUDE. -This can be used for providing extra information to AVRDUDE. - -Please only use this if you know what you are doing. There are no error checks and you could cripple your controller. - - - - - Extra Arguments - - - - - Show AVRDUDE help - - - - - Show Help - - - - - Communication port to the programmer. - - - - - - - Port - - - - - AVRDUDE Location - - - - - MCU - - - - - - CPU of your TX - - - - - - CPU present on your 9x radio -Should be m64 for stock radios -m2560 for v4.1 boards - - - - - SAM-BA Location - - - - - ARM MCU - - - - - sam-ba serial port - - - - - Alternate device - - - - - Use advanced controls - - - - - DFU-UTIL Configuration - - - - - SAM-BA Configuration - - - - - AVRDUDE Configuration - - - - - - - Select Location - - - - - - Companion - - - - - <b><u>WARNING!</u></b><br>This will reset the fuses of %1 to the factory settings.<br>Writing fuses can mess up your radio.<br>Do this only if you are sure they are wrong!<br>Are you sure you want to continue? - - - - - <b><u>WARNING!</u></b><br>Normally CPU type is automatically selected according to the chosen firmware.<br>If you change the CPU type the resulting eeprom could be inconsistent. - - - - - burnDialog - - - Customize Splash - - - - - Cancel - - - - - - Write to TX - - - - - <html><head/><body><p>Modify calibration parameters using settings from current profile</p></body></html> - - - - - Patch calibration setting from profile - - - - - <html><head/><body><p>Modify HW parameters using settings from current profile</p></body></html> - - - - - Patch HW setting from profile - - - - - Date & Time - - - - - SVN - - - - - Variant - - - - - - Browse for file - - - - - Allows Companion to write to older version of the firmware - - - - - Check Firmware compatibility - - - - - Backup and restore Models and Settings - - - - - Current Profile - - - - - Invert Color - - - - - Use image in settings - - - - - Substitute image in firmware - - - - - Load Image - - - - - Open Splash Library - - - - - ... - - - - - Write firmware to TX - - - - - Write Models and Settings to TX - - - - - Write Models and Settings in %1 to TX - - - - - Current profile - - - - - Open - - - - - Choose file to load Models and Settings from - - - - - - - - - - Warning - - - - - %1 is not a known firmware - - - - - Burn anyway ! - - - - - - - - - - - - - - Error - - - - - Unable to find file %1! - - - - - - - Error opening file %1: -%2. - - - - - - - Invalid binary Models and Settings File %1, Proceed anyway ? - - - - - Error reading file %1: -%2. - - - - - Open Image to load - - - - - Images (%1) - - - - - - Cannot load %1. - - - - - Cannot save customized firmware - - - - - Custom image not found - - - - - No firmware selected - - - - - Wrong radio calibration data in profile, Settings not patched - - - - - Wrong radio setting data in profile, Settings not patched - - - - - - Cannot write file %1: -%2. - - - - - Error writing file %1: -%2. - - - - - compareDialog - - - Dialog - - - - - Drag first model here - - - - - Drag second model here - - - - - Close - - - - - Print - - - - - Print to file - - - - - - No name - - - - - General Model Settings - - - - - - - Name - - - - - - EEprom Size - - - - - - Timer1 - - - - - - Timer2 - - - - - - Protocol - - - - - - Pulse Polarity - - - - - - Throttle Trim - - - - - - - - Enabled - - - - - - - - Disabled - - - - - - Throttle Expo - - - - - - Trim Increment - - - - - - Center Beep - - - - - Flight modes Settings - - - - - - Fades - - - - - - Trims - - - - - - - - - - - - Switch - - - - - - - - Flight mode name - - - - - - IN - - - - - - OUT - - - - - - - - - - - - - - FM - - - - - - Gvars - - - - - - Rot. Enc. - - - - - Limits - - - - - - - - - - - Offset - - - - - - - - - Min - - - - - - - - - Max - - - - - - - Invert - - - - - - - - - CH - - - - - - INV - - - - - - NOR - - - - - Global Variables - - - - - - GV - - - - - Expo/Dr Settings - - - - - - Weight - - - - - - - - Flight modes - - - - - - - - Flight mode - - - - - - - - DISABLED - - - - - Mixers - - - - - - noTrim - - - - - - Delay(u%1:d%2) - - - - - - Slow(u%1:d%2) - - - - - - Warn - - - - - Curves - - - - - 5 Points Curves - - - - - - - - pt %1 - - - - - - Curve - - - - - 9 Points Curves - - - - - Logical Switches - - - - - - LS - - - - - Switch Assignment - - - - - - Function - - - - - - Param - - - - - - Repeat - - - - - - Enable - - - - - CF - - - - - Telemetry Settings - - - - - - Analog - - - - - - Unit - - - - - - Scale - - - - - - - - A%1 - - - - - - Alarm 1 - - - - - - Alarm 2 - - - - - - - - Type - - - - - - - - Condition - - - - - - - - Value - - - - - - RSSI Alarm - - - - - - Custom Telemetry View - - - - - - Telemetry Bars - - - - - - Bar Number - - - - - - Source - - - - - Print Document - - - - - Select PDF output file - - - - - contributorsDialog - - - Dialog - - - - - People who have contributed to this project - - - - - Coders - - - - - Honors go to Rafal Tomczak (RadioClone), Thomas Husterer (th9x) and Erez Raviv (er9x and eePe) - - - - - Thank you all !!! - - - - - Contributors - - - - - Companion Release Notes - - - - - OpenTX Release Notes - - - - - customizeSplashDialog - - - Transmitter Splash Screen Editor - - - - - - Invert - - - - - - Open Splash Library - - - - - - - - ... - - - - - - Load Profile - - - - - - Load FW - - - - - - Load Pict - - - - - - Save - - - - - Open - - - - - - - - Error - - - - - Cannot load embedded FW image from %1. - - - - - Open Image to load - - - - - Images (%1) - - - - - Cannot load the image file %1. - - - - - Cannot load the profile image %1. - - - - - Cannot load the library image %1. - - - - - File Saved - - - - - The image was saved to the file %1 - - - - - Image Refresh Error - - - - - Failed to refresh image from file %1 - - - - - File Save Error - - - - - Failed to write image to %1 - - - - - downloadDialog - - - Downloading: - - - - - Unable to save the file %1: %2. - - - - - Companion - - - - - Download failed: %1. - - - - - fusesDialog - - - Fuses - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Reads the current fuses in the AVR controller.</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Proper states for </span><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">AtMega 64 </span><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">:</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">EEPROM erase fuse not set: 0E, 81, FF</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">EEPROM erase fuse set: 0E, 89, FF</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Proper states for AtMega 2560 :</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">EEPROM erase fuse not set: D7, 11, FC</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">EEPROM erase fuse set: D7, 19, FC</span></p></body></html> - - - - - Read Fuses - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600; text-decoration: underline;">Reset Fuses</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Fuses in the AVR tell it how to behave. Pressing this button sets the fuses to the default parameters needed in the FW. These parameters are different for stock and 4.1 MB, please verify you selected the appropriate processor type in preferences.</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">This button also sets the &quot;EEPROM protect&quot; Fuse.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">This prevents erasing of the EEPROM when the flash memory is written.</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600; text-decoration: underline;">WARNING</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Setting fuses can lead to problems and even a total lockout from your controller. Do this only if you know what you are doing.</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">When in doubt consult either the project's page or the 9xforum (http://9xforums.com/forum/)</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">If you do get locked out - google lookup for &quot;dealing with Fuse Bricks&quot;.</span></p></body></html> - - - - - Reset Fuses -EEPROM - PROTECT - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600; text-decoration: underline;">Reset Fuses</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Fuses in the AVR tell it how to behave. Pressing this button sets the fuses to the default parameters needed in the </span><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">FW. These parameters are different for stock and 4.1 MB, please verify you selected the appropriate processor type in preferences.</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">This button also clears the &quot;EEPROM protect&quot; Fuse.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">This causes erasing of the EEPROM when the flash memory is written.</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600; text-decoration: underline;">WARNING</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Setting fuses can lead to problems and even a total lockout from your controller. Do this only if you know what you are doing.</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">When in doubt consult either the project's page or the 9xforum (http://9xforums.com/forum/)</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">If you do get locked out - google lookup for &quot;dealing with Fuse Bricks&quot;.</span></p></body></html> - - - - - Reset Fuses -EEPROM - DELETE - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; text-decoration: underline;">WARNING</span></p> -<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;"></p> -<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Changing the fuses can mess up your radio.</p> -<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Proceed only if you know what you are doing.</p></body></html> - - - - - fwPreferencesDialog - - - Downloads - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - CheckBox - - - - - Menu Language - - - - - Firmware Type - - - - - Check for updates - - - - - Voice Language - - - - - Set language of voice. -May be different from firmware language - - - - - Download Voice - - - - - Download FW - - - - - Options - - - - - Processor ID - - - - - FwInfo - - - - - Last downloaded release: %1 - - - - - The selected firmware has never been downloaded by Companion. - - - - - The selected firmware cannot be downloaded by Companion. - - - - - joystickDialog - - - Configure Joystick - - - - - Ch2 - - - - - - - - - - - - Not Assigned - - - - - - - - - - - - Right Vertical - - - - - - - - - - - - Right Horizontal - - - - - - - - - - - - Left Vertical - - - - - - - - - - - - Left Horizontal - - - - - - - - - - - - P1 - - - - - - - - - - - - P2 - - - - - - - - - - - - P3/LS - - - - - - - - - - - - RS - - - - - Ch1 - - - - - Ch4 - - - - - Ch6 - - - - - Ch3 - - - - - Ch5 - - - - - Ch7 - - - - - Ch8 - - - - - Instructions - - - - - Cancel - - - - - Next - - - - - Ok - - - - - Move sticks and pots in every direction making full movement -Press next when finished - - - - - - Error - - - - - Cannot open joystick. - - - - - Place sticks and pots in middle position. -Press next when done - - - - - Map joystick channels to controls using comboboxes. -Press next when done - - - - - Check inversion checkbox to get maximum at top-right position. -Press next when done - - - - - Press ok to save configuration -Press cancel to abort joystick calibration - - - - - Duplicated stick assignement - - - - - logsDialog - - - Companion Log Viewer - - - - - Filename - - - - - Open LogFile - - - - - Zoom - - - - - X - - - - - Y - - - - - Fly sessions - - - - - Telemetry logs - - - - - Time - - - - - Error - - - - - Cannot write file %1: -%2. - - - - - Select your log file - - - - - Available fields - - - - - The selected logfile contains %1 invalid lines out of %2 total lines - - - - - mdiChild - - - Simulate Tx - - - - - modelConfigDialog - - - Model Configuration Wizard - - - - - Engine - - - - - Model Type - - - - - Airplane - - - - - Helicopter - - - - - Glider - - - - - Wing - - - - - Aileron controls - - - - - No Ailerons - - - - - 1 Servo (or Y) - - - - - - - 2 Servos - - - - - Flaps controls - - - - - No Flaps - - - - - 1 Servo (or inverting Y) - - - - - Spoilers - - - - - No Spoilers/Airbrakes - - - - - 1 Servo (or Y or inverting Y) - - - - - Swash Plate - - - - - Swash plate - - - - - 90° / Fixed / Coax - - - - - 120° - - - - - 120X° - - - - - 140° - - - - - FlyBarLess - - - - - Tail - - - - - Tail controls - - - - - 1 Servo Elevator / 1 Servo Rudder - - - - - V Tail - - - - - 2 Servos Elevator / 1 Servo Rudder - - - - - Gyroscope - - - - - NoGyro - - - - - Switch control - - - - - Pot control - - - - - Channel style - - - - - Open9x Style - - - - - Futaba Style - - - - - 2 - - - - - 3 - - - - - 4 - - - - - 5 - - - - - 6 - - - - - 7 - - - - - 8 - - - - - 9 - - - - - 1 - - - - - 10 - - - - - Ele2 - - - - - Use advanced controls - - - - - Spoiler2 - - - - - Flap2 - - - - - Flap1 - - - - - Rud2 - - - - - - - - - - - AUTO - - - - - - - - - - - CH01 - - - - - - - - - - - CH02 - - - - - - - - - - - CH03 - - - - - - - - - - - CH04 - - - - - - - - - - - CH05 - - - - - - - - - - - CH06 - - - - - - - - - - - CH07 - - - - - - - - - - - CH08 - - - - - - - - - - - CH09 - - - - - - - - - - - CH10 - - - - - Ail2 - - - - - Spoiler 1 - - - - - Delta wing - - - - - - Not present - - - - - Present - - - - - Rudder - - - - - Single rudder - - - - - Dual rudder (with 2 servos) - - - - - Apply configuration ? - - - - - Apply configuration deleting existing model ? - - - - - preferencesDialog - - - - Preferences - - - - - - Simu BackLight - - - - - - Simulator capture folder - - - - - - Joystick - - - - - Remember simulator switches - - - - - - Enable - - - - - - Use clipboard only - - - - - - Calibrate - - - - - - Blue - - - - - - Green - - - - - - Red - - - - - - Orange - - - - - - Yellow - - - - - - - - - - Open Folder - - - - - - Personal splash library - - - - - - Include companion splashes - - - - - - Only user defined splashes - - - - - - Splash library behaviour - - - - - - Custom TX splash screen - - - - - - Open Image - - - - - - - - ... - - - - - - Invert Pixels - - - - - Mode selection: - -Mode 1: - Left stick: Elevator, Rudder - Right stick: Throttle, Aileron - -Mode 2: - Left stick: Throttle, Rudder - Right stick: Elevator, Aileron - -Mode 3: - Left stick: Elevator, Aileron - Right stick: Throttle, Rudder - -Mode 4: - Left stick: Throttle, Aileron - Right stick: Elevator, Rudder - - - - - - - Mode 1 (RUD ELE THR AIL) - - - - - Mode 2 (RUD THR ELE AIL) - - - - - Mode 3 (AIL ELE THR RUD) - - - - - Mode 4 (AIL THR ELE RUD) - - - - - auto backup before write - - - - - Automatic Backup Folder - - - - - Show Splash At Start - - - - - Ask use of wizard for new models - - - - - Remember switches in simulator - - - - - Channel order - -This is used by the templated to determine which channel goes to what number output. - - - - - R E T A - - - - - R E A T - - - - - R T E A - - - - - R T A E - - - - - R A E T - - - - - R A T E - - - - - E R T A - - - - - E R A T - - - - - E T R A - - - - - E T A R - - - - - E A R T - - - - - E A T R - - - - - T R E A - - - - - T R A E - - - - - T E R A - - - - - T E A R - - - - - T A R E - - - - - T A E R - - - - - A R E T - - - - - A R T E - - - - - A E R T - - - - - A E T R - - - - - A T R E - - - - - A T E R - - - - - FwInfo - - - - - Check for updates - - - - - Ask for flashing after Download - - - - - Export Profile - - - - - Save Profile - - - - - Import Profile - - - - - Profile Name - - - - - Default Stick Mode - - - - - Default Channel Order - - - - - Profile slot - - - - - Automatically add version number to the filename after download - - - - - Voice - - - - - - Download - - - - - Set language of voice. -May be different from firmware language - - - - - Language - - - - - Firmware - - - - - SD Structure path - - - - - Processor ID - - - - - Recent History Size - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - CheckBox - - - - - Check for updates on startup - - - - - Check for selected Fw updates - - - - - Google Earth Executable - - - - - Find Executable - - - - - Last downloaded release: %1 - - - - - The selected firmware has never been downloaded by Companion. - - - - - The selected firmware cannot be downloaded by Companion. - - - - - Image stored in settings - - - - - - No joysticks found - - - - - Select your library folder - - - - - Select your snapshot folder - - - - - Select your Models and Settings backup folder - - - - - Select Google Earth executable - - - - - - Error - - - - - - Cannot load %1. - - - - - Select the folder replicating your SD structure - - - - - Profile name is empty, profile slot %1 will be deleted.<br>Are you sure ? - - - - - Export profile As - - - - - Profile slot is not empty, profile slot %1 will we overwritten.<br>Are you sure ? - - - - - Open Profile to import - - - - - Open Image to load - - - - - Images (%1) - - - - - printDialog - - - Dialog - - - - - Close - - - - - Print - - - - - Print to file - - - - - Setup for: - - - - - printed on: %1 - - - - - General Model Settings - - - - - - - - Name - - - - - EEprom Size - - - - - Timer1 - - - - - Timer2 - - - - - Protocol - - - - - Pulse Polarity - - - - - Throttle Trim - - - - - - - Enabled - - - - - - Disabled - - - - - Throttle Expo - - - - - Trim Increment - - - - - Center Beep - - - - - Flight modes Settings - - - - - Fades - - - - - Trims - - - - - Gvars - - - - - Rot.Enc. - - - - - - - - Switch - - - - - Flight mode name - - - - - IN - - - - - OUT - - - - - - - - FM - - - - - Expo/Dr Settings - - - - - Weight - - - - - - Flight modes - - - - - - Flight mode - - - - - - DISABLED - - - - - Mixers - - - - - - - - CH - - - - - noTrim - - - - - - - - - Offset - - - - - Delay(u%1:d%2) - - - - - Slow(u%1:d%2) - - - - - Warn - - - - - Limits - - - - - - - - Min - - - - - - - - Max - - - - - - - Invert - - - - - - - INV - - - - - - - NOR - - - - - Curves - - - - - - - Curve - - - - - pt %1 - - - - - Logical Switches - - - - - - LS - - - - - Global Variables - - - - - GV - - - - - Switch Assignments - - - - - Function - - - - - Parameter - - - - - Repeat - - - - - Telemetry Settings - - - - - - Alarm 1 - - - - - - Alarm 2 - - - - - Analog - - - - - Unit - - - - - Scale - - - - - - - - Type - - - - - - - - Condition - - - - - - - - Value - - - - - A%1 - - - - - RSSI Alarm - - - - - Frsky serial protocol - - - - - System of units - - - - - Propeller blades - - - - - - Custom Telemetry View - - - - - Telemetry Bars - - - - - Bar Number - - - - - Source - - - - - Print Document - - - - - Select PDF output file - - - - - ODF files (*.odt);;PDF Files(*.pdf);;HTML-Files (*.htm *.html);;All Files (*) - - - - - simulatorDialog - - - Companion Simulator - - - - - - - - Right Double Click to Reset - - - - - THR - - - - - RUD - - - - - ELE - - - - - AIL - - - - - - Hold X - - - - - - Fix X - - - - - - Fix Y - - - - - - Hold Y - - - - - - - - TextLabel - - - - - TRN - - - - - GEA - - - - - ID0 - - - - - ID1 - - - - - ID2 - - - - - BEEP - - - - - P1 - - - - - - - 0 % - - - - - P2 - - - - - P3 - - - - - 9x Simulator - - - - - Outputs - - - - - LS1 - - - - - LS2 - - - - - LS3 - - - - - LS4 - - - - - LS5 - - - - - LS6 - - - - - LS7 - - - - - LS8 - - - - - LS9 - - - - - LSA - - - - - LSB - - - - - LSC - - - - - LSD - - - - - LSE - - - - - LSF - - - - - LSG - - - - - LSH - - - - - LSI - - - - - LSJ - - - - - LSK - - - - - LSL - - - - - LSM - - - - - LSN - - - - - LSO - - - - - LSP - - - - - LSQ - - - - - LSR - - - - - LSS - - - - - LST - - - - - LSU - - - - - LSV - - - - - LSW - - - - - CH1 - - - - - - - - - - - - - - - - - - - - -100.1 - - - - - CH9 - - - - - CH2 - - - - - CH10 - - - - - CH3 - - - - - CH11 - - - - - CH4 - - - - - CH12 - - - - - CH5 - - - - - CH13 - - - - - CH6 - - - - - CH14 - - - - - CH7 - - - - - CH15 - - - - - CH8 - - - - - CH16 - - - - - - Warning - - - - - Joystick enabled but not configured correctly - - - - - Cannot open joystick, joystick disabled - - - - - Firmware %1 error: %2 - - - - - - Flight mode: %1(%2) - - - - - Simulating Tx (%1) - - - - - Simulating - - - - - splashLibrary - - - - ... - - - - - Splash Library - page %1 of %2 - - - - - Warning - - - - - Invalid image in library %1 - - - - - Information - - - - - No valid image found in library, check your settings - - - - - xsimulatorDialog - - - Companion Simulator - - - - - - Hold Y - - - - - - Fix Y - - - - - - Fix X - - - - - - Hold X - - - - - - SD - - - - - - SC - - - - - - - - Right Double Click to Reset - - - - - - S2 - - - - - - SG - - - - - - RS - - - - - - SH - - - - - - - - TextLabel - - - - - - S1 - - - - - - SB - - - - - - SA - - - - - - SE - - - - - - - SF - - - - - - LS - - - - - Taranis Simulator - - - - - Outputs - - - - - CH1 - - - - - - - - - - - - - - - - - - - - -100.1 - - - - - CH9 - - - - - CH2 - - - - - CH10 - - - - - CH3 - - - - - CH11 - - - - - CH4 - - - - - CH12 - - - - - CH5 - - - - - CH13 - - - - - CH6 - - - - - CH14 - - - - - CH7 - - - - - CH15 - - - - - CH8 - - - - - CH16 - - - - - LSK - - - - - LSC - - - - - LSD - - - - - LS7 - - - - - LSL - - - - - LSB - - - - - LS1 - - - - - LSH - - - - - LSG - - - - - LSE - - - - - LSF - - - - - LS8 - - - - - LS9 - - - - - LSA - - - - - LSM - - - - - LSJ - - - - - LSI - - - - - LS4 - - - - - LS5 - - - - - LS2 - - - - - LS3 - - - - - LS6 - - - - - LSN - - - - - LSO - - - - - LSP - - - - - LSQ - - - - - LSR - - - - - LSS - - - - - LST - - - - - LSU - - - - - LSV - - - - - LSW - - - - - - Warning - - - - - Joystick enabled but not configured correctly - - - - - Cannot open joystick, joystick disabled - - - - - Firmware %1 error: %2 - - - - - - Flight mode: %1(%2) - - - - - Simulating Tx (%1) - - - - - Simulating - - - - diff --git a/companion/src/translations/companion_pl.ts b/companion/src/translations/companion_pl.ts index 8f9fde66b..ddf91dee7 100644 --- a/companion/src/translations/companion_pl.ts +++ b/companion/src/translations/companion_pl.ts @@ -2061,119 +2061,119 @@ Jesteś pewien ? MainWindow - - - - + + + + File loaded Plik załadowany - + Display previous warning again at startup ? Wyświetlić poprzednie ostrzeżenie przy uruchomieniu? - + Checking for updates Sprawdź aktualizacje - - - - - + + + + + Unable to check for updates. Nie mogę sprawdzić aktualizacji. - - - - - + + + + + Save As Zapisz jako - + Executable (*.exe) Wykonywalny (*.exe) - + New release available Dostępne jest nowe wydanie - - + + No updates available at this time. Brak aktualizacji dostępnych teraz. - + Would you like to launch the installer? Chcesz uruchomić instalator? - - - - - - - - - - - - - + + + + + + + + + + + + + Error Błąd - - - - - + + + + + Error opening file %1: %2. Błąd otwarcia pliku %1: %2. - + Compilation server termporary failure, try later Serwer kompilacji chwilowo nieczynny, spróbuj później - + Display previous message again at startup ? Czy ponownie wyświetlić poprzednią informację przy uruchomieniu? - + Compilation server temporary failure, try later Serwer kompilacji chwilowo nieczynny, spróbuj później - - + + Compilation server too busy, try later Serwer kompilacji zbyt zajęty, spróbuj później - - + + Unknown server failure, try later Nieznany błąd serwera, spróbuj później - + Firmware %1 does not seem to have ever been downloaded. Version %2 is available. Do you want to download it now ? @@ -2183,31 +2183,31 @@ Pobrać teraz? - - + + Yes Tak - - + + No Nie - - + + Release Notes Informacje o wydaniu - - + + Do you want to download release %1 now ? Chcesz pobrać wydanie %1 teraz? - + A new version of %1 firmware is available (current %2 - newer %3). Do you want to download it now ? Jest dostępna nowa wersja firmware %1 @@ -2215,434 +2215,348 @@ Do you want to download it now ? Chcesz pobrać teraz? - + Ignore this version (r%1)? Zignorować wersję (r%1)? - + Release notes contain very important informations. Do you want to see them now ? Opis wydania zawiera bardzo ważne informacje. Chcesz je przeczytać teraz? - - + + File saved Plik zapisany - + Firmware updates Aktualizacja firmware - + Current firmware does not provide release notes informations. Aktualny firmware nie zawiera opisu wydania. - + Cannot write file %1: %2. Nie mogę zapisać pliku %1: %2. - - - - - + + + + + Taranis radio not found Nie znaleziono Radia Taranis - - - - + + + + Impossible to identify the radio on your system, please verify the eeprom disk is connected. Identyfikacja radia niemożliwa w Twoim systemie, proszę sprawdzić podłączony dysk eeprom. - - - + + + Backup is impossible Backup jest niemożliwy do wykonania - - - + + + The backup dir set in preferences does not exist Brak ustawień ścieżki backupu - - + + Warning Ostrzeżenie - + Conversion failed Konwersja nieudana - + Restore failed Zapis nieudany - + Backup failed Backup nieudany - + Copyright - + OpenTX Companion - FW: %1 - Profile: %2 OpenTX Companion - FW: %1 - Profil: %2 + &Setting... - &Ustawienia... + &Ustawienia... - + Edit Settings Edycja Ustawień + &Downloads... - &Pobieranie... + &Pobieranie... - + Download firmware and voice files Pobierz firmware i pliki dźwiękowe + Configure transmitter start screen... - Ustawienia ekranu startowego radia... + Ustawienia ekranu startowego radia... + &Configure connection software... - &Ustawienia oprogramowania łączącego... + &Ustawienia oprogramowania łączącego... - + New Profile Nowy Profil - + Create a new Radio Setting Profile Utwórz nowy Profil Ustawień Radia + Classic - Klasyczna + Klasyczna + The multicolor classical Companion icon theme - Wielokolorowy klasyczny wygląd ikon Companion + Wielokolorowy klasyczny wygląd ikon Companion - + A monochrome black icon theme Monochromatyczny czarny wygląd ikon - + A monochrome white icon theme Monochromatyczny biały wygląd ikon - + A monochrome blue icon theme Monochromatyczny niebieski wygląd ikon - + Small Małe - + Use small toolbar icons Użyj małych ikon paska narzędzi - + Use normal size toolbar icons Użyj normalnych ikon paska narzędzi - + Normal Normalne - + Use big toolbar icons Użyj dużych ikon paska narzędzi - + Big Duże - + Use huge toolbar icons Użyj olbrzymich ikon paska narzędzi - + Huge Olbrzymie + System default language - Podstawowy język systemu + Podstawowy język systemu + Use system default language in menus - Użyj podstawowego języka systemu w menu + Użyj podstawowego języka systemu w menu - + Czech Czeski - + Use Czech in menus Użyj Czeskiego w menu - + German Niemiecki - + Use German in menus Użyj Niemieckiego w menu - + English Angielski - + Use English in menus Użyj Angielskiego w menu - + French Francuski - + Use French in menus Użyj Francuskiego w menu - + Italian Włoski - + Use Italian in menus Użyj Włoskiego w menu - + Hebrew Hebrajski - + Use Hebrew in menus Użyj Hebrajskiego w menu - + Polish Polski - + Use Polish in menus Użyj Polskiego w menu - + Portuguese Portugalski - + Use Portuguese in menus Użyj Portualskiego w menu - + Swedish Szwedzki - + Use Swedish in menus Użyj Szwedzkiego w menu - + Russian Rosyjski - + Use Russian in menus Użyj Rosyjskiego w menu - - About - O aplikacji - - - - Print - Drukuj - - - - Print current model - Drukuj aktualny model - - - - Simulate - Symulacja - - - - Simulate selected model - Symulacja wybranego modelu - - - - loadBackup... - Załaduj backup... - - - - Logs - Logi - - - - Setting... - Ustawienia... - - - - Downloads... - Pobieranie... - - - - Check for updates... - Sprawdź aktualizacje... - - - - Check OpenTX and Companion updates - Sprawdź aktualizacje OpenTX i Companion - - - - Edit Tx Splash Image... - Edytor erkanu startowego radia... - - - - edit the splash screen of your TX - Edytuj ekran startowy swojego radia - - - - List programmers - Lista programatorów - - - - Fuses... - Bezpieczniki... - - - + Manuals and other Documents Podręcznik i dokumentacja - + Open the OpenTX document page in a web browser Otwórz stronę dokumentacji OpenTX w przeglądarce - - Configure connection software... - Ustawienia oprogramowania łączącego... - - - - Save Tx Models and Settings to file - Zapisz modele radia i ustawienia do pliku - - - - Contributors - Współpracownicy - - - - A tribute to those who have contributed to OpenTX and Companion - Hołd dla tych, którzy przyczynili się do rozwoju OpenTX i Companion - - - + Set Icon Theme Ustaw wygląd ikon - + Set Icon Size Ustaw wielkość ikon + &Settings - &Ustawienia + &Ustawienia - + Radio Settings Profiles Profile Ustawień Radia - - + + &%1 %2 @@ -2655,79 +2569,78 @@ Chcesz pobrać teraz? Companion - Edytor Modeli i Ustawień - %1 - + A new version of Companion is available (version %1)<br>Would you like to download it? Dostępna jest nowy Companion (wersja %1)<br>Chcesz ją pobrać ? - + A new release of Companion is available please check the OpenTX website! Nowe wydanie Companion jest dostępne, proszę sprawdzić stronę OpenTX! - + Firmware does not longer fit in the Tx, due to selected firmware options Firmware już nie mieści się w pamięci radia ze względu na wybrane parametry - - + + Compilation server requires registration, please check OpenTX web site Serwer kompilacji wymaga rejestracji, proszę odwiedzić stronę OpenTX - + Firmware does not fit in the Tx, due to selected firmware options Firmware już nie mieści się w pamięci radia ze względu na wybrane parametry - + Do you want to write the firmware to the transmitter now ? Chcesz wgrać firmware do radia teraz? - + The selected language will be used the next time you start Companion. Wybrany język będzie użyty po ponownym uruchomieniu Comapnion. - - - + + + OK OK - + The new theme will be loaded the next time you start Companion. Wybrany wygląd będzie użyty po ponownym uruchomieniu Comapnion. - + The icon size will be used the next time you start Companion. Wybrana wiekość ikon będzie użyta po ponownym uruchomieniu Comapnion. - + Open Otwórz - - - - - + + + + Read Models and Settings From Tx Wczytaj Modele i Ustawienia z radia - + Write Models and settings from %1 to the Tx? Czy zapisać Modele i Ustawienia z %1 do radia ? - + The file %1 has not been recognized as a valid Models and Settings file Write anyway ? @@ -2736,163 +2649,173 @@ nie został rozpoznany jako prawidłowy pli Modeli i Ustawień. Czy mimo wszystko zapisać? - - - - - - + + + + + + Backup Models and Settings From Tx Zbakupuj Modele i Ustawienia z radia - + Cannot check Models and Settings compatibility! Continue anyway? Nie mogę potwierdzić kompatybilności Modeli i Ustawień. Kontynuować? - + The transmitter firmware belongs to another product family, check file and preferences! Firmwqare radia nalezy do innej rodziny produktów, sprawdź plik i preferencje ! - + The transmitter firmware is outdated, please upgrade! Firmware radia jest przestarzały, proszę zaktualizować! - - + Write Models and Settings To Tx Zapisz Modele i Ustawienia do radia - - + + Write Firmware To Tx Zapisz firmware do radia - + Cannot convert Models and Settings for use with this firmware, original data will be used Nie mogę skonwertować Modeli i Ustawień na ten rodzaj firmware, zostaną użyte oryginalne dane - + Restore Models and Settings To Tx Odtwórz Modele i Ustawienia do radia - + Could not restore Models and Settings to TX. The models and settings data file can be found at: %1 Nie mogę odtworzyć Modeli i Ustawień do radia. Plik modeli i ustawień mozna znaleźć w: %1 - + Firmware write failed Zapis firmawe nie powiódł się - + Could not write firmware to to transmitter. The models and settings data file can be found at: %1 Nie mogę zapisać Firmware do radia. Plik modeli i ustawień mozna znaleźć w: %1 - + Cannot backup existing Models and Settings from TX. Firmware write process aborted Nie mogę zbackupować Modeli i Ustawień z radia, Zapis Firmawe przerwany - + Save transmitter Models and Settings to File Zapisz Modele i Ustawienia z radia do pliku - + Impossible to identify the radio on your system, please verify that the eeprom disk is connected. Identyfikacja radia niemożliwa w Twoim systemie, proszę sprawdzić podłączony dysk eeprom. - + Read Tx Firmware to File Odczytaj firmware z radia do pliku - + OpenTX Home Page: <a href='%1'>%1</a> Strona domowa OpenTX: <a href='%1'>%1</a> - + The OpenTX Companion project was originally forked from <a href='%2'>eePe</a> Projekt Companion odłączony z oryginalnego <a href='%2'>eePe</a> - + If you've found this program useful, please support by <a href='%1'>donating</a> Jeśli uważasz, że ten program jest użyteczny, wesprzyj poprzez <a href='%1'>donację</a> - + Version %1, %3 Wersja %1, %3 - + About Companion O aplikacji Companion + &New - &Nowy + &Nowy - + Create a new file Utwórz nowy plik + &Open... - &Otwórz... + &Otwórz... - + Open an existing file Otwórz istniejący plik + &loadBackup... - &Załaduj backup... + &Załaduj backup... - + Load backup from file Załaduj backup z pliku + &Save - &Zapisz + &Zapisz - - + Save the document to disk Zapisz dokument na dysku + Save &As... - Zapisz j&ako... + Zapisz j&ako... + Save the document under a new name - Zapisz dokument pod nową nazwą + Zapisz dokument pod nową nazwą + Lo&gs - Lo&gi + Lo&gi - + + Ctrl+G + + + + Open log file Otwórz plik logów @@ -2905,187 +2828,115 @@ Czy mimo wszystko zapisać? Pobrania plików Firmware i głosów jak również definicje profili. + &Check for updates... - &Sprawdź aktualizacje... + &Sprawdź aktualizacje... + Check for new version of Companion - Sprawdź nową wersję Companion + Sprawdź nową wersję Companion + Show Companion contributors list - Pokaz listę twórców Companion + Pokaz listę twórców Companion - + Show Companion changelog Zobacz zmiany w Companion + &Write Models and Settings To Tx - &Zapisz Modele i Ustawienia do radia + &Zapisz Modele i Ustawienia do radia - + Write Models and Settings to transmitter Zapisz Modele i Ustawienia do radia + &Read Models and Settings From Tx - &Wczytaj Modele i Ustawienia z radia + &Wczytaj Modele i Ustawienia z radia - + Read Models and Settings from transmitter Wczytaj Modele i Ustawienia z radia - + Write Firmware Zapisz firmware - - Open... - Otwórz... - - - - Save... - Zapisz... - - - - Save As... - Zapisz jako... - - - - Exit - Zakończ - - - - Cut - Wytnij - - - - Cut current selection to the clipboard - Wytnij zaznaczenie do schowka - - - - Copy... - Kopiuj... - - - - Copy current selection to the clipboard - Wytnij zaznaczenie do schowka - - - - Paste... - Wklej... - - - - Paste clipboard into current selection - Wytnij zaznaczenie do schowka - - - - The new Companion 2 icon theme - Nowy zestaw ikon Companion 2 - - - - Monochrome - Monochromatyczny - - - - MonoWhite - MonoBiały - - - - MonoBlue - MonoNiebieski - - - - System language - Język systemu - - - - Use system language in menus - Użyj języka systemu w menu - - - + Write firmware to transmitter Zapisz firmware do radia - + Write Models and Settings from file to Tx Zapisz Modele i Ustawienia z pliku do radia - + Write Models and Settings from file to transmitter Zapisz Modele i Ustawienia z pliku do radia + Save transmitter Models and Settings to file - Zapisz Modele i Ustawienia do pliku + Zapisz Modele i Ustawienia do pliku - + Save the Models and Settings from the transmitter to a file Zapisz Modele i Ustawienia z radia do pliku - + Read Firmware Wczytaj Firmware - + Read firmware from transmitter Wczytaj Firmware z radia - + Configure software for reading from and writing to the transmitter Ustawienia oprogramowania do odczytu i zapisu radia + &Read/Write - &Odczyt/Zapis + &Odczyt/Zapis - + Write Zapis - - + + Invalid Models and Settings File %1 Błędny plik %1 Modeli i Ustawień - + Invalid binary Models and Settings File %1 Błędny binarny plik %1 Modeli i Ustawień + Contributors &List... - &Lista twórców... + &Lista twórców... &Old Preferences Dialog... @@ -3104,212 +2955,203 @@ Czy mimo wszystko zapisać? Edycja preferencji aplikacji - + ChangeLog... Zmiany... - + Firmware ChangeLog... Zmiany firmware... - + Show firmware changelog Zobacz zmiany w firmware - + Compare... Porównaj... - + Compare models Porównaj modele + Customize the splash screen of your TX - Personalizuj obrazek na swoim radiu + Personalizuj obrazek na swoim radiu + E&xit - Za&kończ + Za&kończ - + Exit the application Zakończ aplikację companion9x + Cu&t - &Wytnij + &Wytnij + Cut the current selection's contents to the clipboard - Wytnij zaznaczenie do schowka + Wytnij zaznaczenie do schowka + &Copy - &Kopiuj + &Kopiuj + Copy the current selection's contents to the clipboard - Kopiuj zaznaczenie do schowka - - - &Paste - &Wklej - - - Paste the clipboard's contents into the current selection - Wklej zawartość schowka na aktualnej pozycji - - - &List programmers - &Lista programatorów + Kopiuj zaznaczenie do schowka + &Paste + &Wklej + + + + Paste the clipboard's contents into the current selection + Wklej zawartość schowka na aktualnej pozycji + + + + Ctrl+Alt+W + + + + + Ctrl+Alt+R + + + + + &List programmers + &Lista programatorów + + + List available programmers Lista dostępnych programatorów + &Fuses... - Ustawienia &mikro-kontrolera... + Ustawienia &mikro-kontrolera... - + Show fuses dialog Pokaż okno ustawień mikro-kontrolera + &Simulate - &Symulator + &Symulator + + Alt+S + + + + Simulate selected model. - Symulacja wybranego modelu. + Symulacja wybranego modelu. + &Print - &Drukuj + &Drukuj + + Ctrl+P + + + + Print current model. - Wydrukuj aktualny model. + Wydrukuj aktualny model. + &About - &O aplikacji + &O aplikacji - + Show the application's About box O aplikacji companion9x - - Classical - Klasyczny - - - - The classical Companion icon theme - Klasyczny zestaw ikon Companion - - - - - New - Nowy - - - The Companion 2.0 colored icon theme - Kolowy zestaw ikon Companion 2.0 - - - - + + Recent Files Poprzednie pliki + Firmware Profiles - Profile firmware + Profile firmware - + Set Menu Language Ustaw język menu + &File - &Plik + &Plik + &Edit - &Edycja + &Edycja + &Help - &Pomoc + &Pomoc - - + File Plik - - + Edit Edycja - - Settings - Ustawienia - - - - Read/Write - Odczyt/Zapis - - - - + Help Pomoc - - Show a selection list of recent documents - Pokaż listę wyboru poprzednich dokumentów - - - - Radio Profiles - Profile Radia - - - - Show a selection list of radio settings profiles - Pokaż listę wyboru profili ustawiań radia - - - + Ready Gotowe - + Unable to find file %1! Nie mogę znaleźć pliku %1! - + Error reading file %1: %2. Błąd odczytu pliku %1: @@ -4539,7 +4381,7 @@ p, li { white-space: pre-wrap; } - + A1- @@ -4584,7 +4426,7 @@ p, li { white-space: pre-wrap; } - + Cur+ @@ -4599,7 +4441,7 @@ p, li { white-space: pre-wrap; } - + Pwr+ @@ -5484,26 +5326,6 @@ p, li { white-space: pre-wrap; } Safety %1 Bezpieczny %1 - - - ASpd - - - - - dTE - - - - - Cel- - - - - - Vfs- - - RudTrim Left @@ -6114,26 +5936,26 @@ p, li { white-space: pre-wrap; } Równoległe użycie expo i krzywych nie jest dłużej wspierane - + openTx only accepts %1 points in all curves openTx dopuszcza tylko %1 punktów dla wszystkich krzywych - - - - + + + + OpenTX on this board doesn't accept this function OpenTX na tej platformie nie dopuszcza tej funkcji - - + + OpenTX doesn't accept this protocol OpenTX nie obsługuje tego protokołu - + OpenTX doesn't allow this number of channels OpenTX nie obsługuje tej ilości kanałów @@ -6181,17 +6003,17 @@ Zespół OpenTX/Companion. Użyj trymerów dla Fazy Lotu %1 + Własne trymery jako offset - + FW: %1 FW:%1 - + Pict: %1 Obrazek:%1 - + Profile image Obrazek Profilu @@ -6821,7 +6643,7 @@ Wolne obroty będą na górze, trymer i ostrzeżenie o otwartym gazie również - + Open Folder Otwórz katalog @@ -7078,27 +6900,27 @@ To ustawienie jest używane przez szablony, określa jakie wyjście przypisane j Struktura karty SD - + Select Image Wybierz obrazek - + Offer to write FW to Tx after download Zaproponuj zapisanie FirmWare do radia po pobraniu - + Remove Profile Usuń Profil - + Clear Image Wyczyść obrazek - + Firmware Firmware @@ -7188,61 +7010,63 @@ To ustawienie jest używane przez szablony, określa jakie wyjście przypisane j Uaktywnij automatyczny backup przed zapisem firmware - + Select your snapshot folder Katalog zrzutów - - + + No joysticks found Brak oysticka - + Select your library folder Wybierz katalog bibliteki - + Select your Models and Settings backup folder Wybierz folder do backupowania Modeli i Ustawień - + Select Google Earth executable Wybierz wykonywalny plik Google Earth - + Select the folder replicating your SD structure Wybierz folder do zreplikowania struktury Twojej karty SD - + Not possible to remove profile Usunięcie profilu jest niemożliwe - + The default profile can not be removed. Podstawowy profil nie moze być usunięty. + Error - Błąd + Błąd + Cannot load %1. - Nie mogę załadować %1. + Nie mogę załadować %1. - + Open Image to load Otwórz obrazek do załadowania - + Images (%1) Obrazki (%1) @@ -8487,65 +8311,65 @@ m2560 dla platformy V4 - + Open Otwórz - - - - + + + + Error Błąd - + Cannot load embedded FW image from %1. Nie mogę załadować wstawionego obrazu FW z %1. - + Cannot load the image file %1. Nie mogę załadować pliku obrazka %1. - + Cannot load the profile image %1. Nie mogę załadować obrazu Profilu %1. - + Cannot load the library image %1. Nie mogę załadować obrazu biblioteki %1. - + File Saved Plik Zapisany - + The image was saved to the file %1 Obraz został zapisany do pliku %1 - + Image Refresh Error Błąd odświeżenia obrazka - + Failed to refresh image from file %1 Nieudane odswieżenie obrazka z pliku %1 - + File Save Error Błąd zapisu pliku - + Failed to write image to %1 Nieudany zapis obrazka do %1 @@ -8554,12 +8378,12 @@ m2560 dla platformy V4 Nie mogę znaleźć bitmapy w celu zastąpienia pliku - + Open Image to load Otwórz obrazek do załadowania - + Images (%1) Obrazki (%1) @@ -8742,11 +8566,6 @@ p, li { white-space: pre-wrap; } fwPreferencesDialog - - - Downloads - Pobrania - @@ -8879,8 +8698,9 @@ To ustawienie jest używane przez szablony, określa jakie wyjście przypisane j Pobierz Głos + Downloads and Profiles - Pobrania i profile + Pobrania i profile diff --git a/companion/src/translations/companion_sv.ts b/companion/src/translations/companion_sv.ts index 9b2636f07..16b2798b4 100644 --- a/companion/src/translations/companion_sv.ts +++ b/companion/src/translations/companion_sv.ts @@ -2064,15 +2064,15 @@ FAI-funktionen kan inte slås av i sändaren. MainWindow - + - + File loaded Filen har laddats - + @@ -2134,252 +2134,58 @@ Vill du ladda ned den nya versionen nu ? Copyright - - New - Ny - - - - Open... - Öppna... - - - - Save... - Spara... - - - - Save As... - Spara Som... - - - - Exit - Avsluta - - - - Cut - Klipp Ut - - - - Cut current selection to the clipboard - Klipp ut markeringens innehåll till klippbordet - - - - Copy... - Kopiera... - - - - Copy current selection to the clipboard - Kopiera markeringens innehåll till klippbordet - - - - Paste... - Klistra In... - - - - Paste clipboard into current selection - Klistra in klippbokens innehåll i det valda avsnittet - - - - Classical - Klassiskt - - - - The classical Companion icon theme - Det klassiska Companion-temat - - - - The new Companion 2 icon theme - Det nya Companion2-temat - - - - Companion2 - Companion2 - - - - Monochrome - Monokromt - - - - MonoWhite - MonoVitt - - - - MonoBlue - MonoBlått - - - - System language - Systemspråk - - - - Use system language in menus - Använd systemspråket i menyerna - - - - About - Om - - - - Print - Skriv ut - - - - Print current model - Skriv ut modell - - - - Simulate - Simulera - - - - Simulate selected model - Simulera modell - - - loadBackup... - Ladda backup från fil... - - - - Logs - Loggar - - - - Setting... - Inställningar... - - - - Downloads... - Nedladdningar... - - - - Check for updates... - Sök efter uppdateringar... - - - - Edit Tx Splash Image... - Startbildsredigerare... - - - - edit the splash screen of your TX - Editera startbilder för din sändare - - - - List programmers - Programmerare - - - - Fuses... - Säkringar... - - - - Configure connection software... - Inställningar för kommunikation... - - - - Save Tx Models and Settings to file - Spara sändarens Modeller och Inställningar till fil - - - - Contributors - Bidragande - - - - A tribute to those who have contributed to OpenTX and Companion - Ett tack till alla de som bidragit till OpenTX och Companion - - - - Settings - Inställningar - - - - Read/Write - Läs/Skriv - - - - + + &%1 %2 &%1 %2 + &New - &Ny + &Ny - + Create a new file Skapa ny fil + &Open... - &Öppna... + &Öppna... - + Open an existing file Öppna en existerande fil + &Save - &Spara + &Spara - - + Save the document to disk Spara dokumentet till fil + Save &As... - Spara S&om... + Spara S&om... + Save the document under a new name - Spara dokumentet under nytt namn + Spara dokumentet under nytt namn + &Check for updates... - &Sök efter uppdateringar... + &Sök efter uppdateringar... - + Display previous message again at startup ? Skall föregående varning visas igen vid uppstart ? @@ -2428,22 +2234,24 @@ Vill du ladda ned den nu ? Säkerhetskopieringen misslyckades - + OpenTX Companion - FW: %1 - Profile: %2 OpenTX Companion - FW: %1 - Profil: %2 + &Setting... - &Inställningar... + &Inställningar... - + Edit Settings Redigera Inställningar + &Downloads... - &Nedladdningar... + &Nedladdningar... @@ -2451,67 +2259,79 @@ Vill du ladda ned den nu ? Ladda ned firmware och röstfiler + Customize the splash screen of your TX - Ställ din sändares startbild + Ställ din sändares startbild + E&xit - &Avsluta + &Avsluta - + Exit the application Avsluta programmet + Cu&t - Klipp &Ut + Klipp &Ut + Cut the current selection's contents to the clipboard - Klipp ut markeringens innehåll till klippbordet + Klipp ut markeringens innehåll till klippbordet + &Copy - &Kopiera + &Kopiera + Copy the current selection's contents to the clipboard - Kopiera markeringens innehåll till klippbordet + Kopiera markeringens innehåll till klippbordet + &Paste - Klistra &In + Klistra &In + Paste the clipboard's contents into the current selection - Klistra in klippbokens innehåll i det valda avsnittet + Klistra in klippbokens innehåll i det valda avsnittet + Ctrl+Alt+W - Ctrl+Alt+W + Ctrl+Alt+W + Ctrl+Alt+R - Ctrl+Alt+R + Ctrl+Alt+R - + Configure software for reading from and writing to the transmitter Inställningar för mjukvaran som kommunicerar med sändaren + &List programmers - &Programmerare + &Programmerare - + List available programmers Lista upp tillgängliga prorammerare + &Fuses... - S&äkringar... + S&äkringar... @@ -2519,47 +2339,55 @@ Vill du ladda ned den nu ? Visa säkrings-dialog + &Simulate - S&imulera + S&imulera + Alt+S - Alt+S + Alt+S + Simulate selected model. - Simulera den valda modellen. + Simulera den valda modellen. + &Print - Skriv &ut + Skriv &ut + Ctrl+P - Ctrl+P + Ctrl+P + Print current model. - Skriv ut den valda modellen. + Skriv ut den valda modellen. + &About - &Om + &Om - + Show the application's About box Visa information om programmet - - + + Recent Files Senaste Filer + &File - &Arkiv + &Arkiv Companion - Models and Settings Editor - %1 - profile %2 @@ -2570,7 +2398,7 @@ Vill du ladda ned den nu ? Companion - Editor för Modeller och Inställningar - %1 - + Checking for updates Letar efter uppdateringar @@ -2621,51 +2449,54 @@ Vill du ladda ned den nu ? Redigera programmets inställningar - + Show Companion changelog Visa en lista med förändringar av Companion + &Write Models and Settings To Tx - &Skriv Modeller och Inställningar till sändaren + &Skriv Modeller och Inställningar till sändaren - + Write Models and Settings to transmitter Skriv Modeller och Inställningar till sändaren + &Read Models and Settings From Tx - &Läs Modeller och Inställningar från sändaren + &Läs Modeller och Inställningar från sändaren - + Read Models and Settings from transmitter Läs Modeller och Inställningar från sändaren - + Write Firmware Skriv Firmware - + Write firmware to transmitter Skriv firmware till sändaren - + Write Models and Settings from file to Tx Skriv Modeller och Inställningar från fil till sändaren - + Write Models and Settings from file to transmitter Skriv Modeller och Inställningar från fil till sändaren + Save transmitter Models and Settings to file - Spara sändarens Modeller och Inställningar till en fil + Spara sändarens Modeller och Inställningar till en fil @@ -2673,43 +2504,42 @@ Vill du ladda ned den nu ? Spara sändarens Modeller och Inställningar till en fil - + Read Firmware Läs Firmware - + Read firmware from transmitter Läs firmware från sändaren - + Set Menu Language Ställ in Menyspråk + &Edit - &Redigera + &Redigera + &Help - &Hjälp + &Hjälp - - + File Arkiv - - + Edit Redigera - - + Help Hjälp @@ -2719,11 +2549,12 @@ Vill du ladda ned den nu ? Redo + Contributors &List... - &Bidragsgivare... + &Bidragsgivare... - + Display previous warning again at startup ? SKall föregående varning visas igen vid uppstart ? @@ -2733,7 +2564,7 @@ Vill du ladda ned den nu ? - + @@ -2745,7 +2576,7 @@ Vill du ladda ned den nu ? Fel - + Cannot write file %1: %2. Filen %1 kunde inte skrivas: @@ -2759,7 +2590,7 @@ Vill du ladda ned den nu ? - + Error opening file %1: @@ -2768,7 +2599,7 @@ Vill du ladda ned den nu ? %2. - + Compilation server termporary failure, try later Tillfälligt fel i byggservern. Försök igen senare @@ -2785,17 +2616,17 @@ Vill du ladda ned den nu ? Okänt server-fel. Försök igen senare - + Compare... Jämför... - + Compare models Jämför modeller - + Backup is impossible @@ -2815,21 +2646,22 @@ Vill du ladda ned den nu ? Varning - + Firmware Profiles Profiler för Firmware + &Read/Write - &Läs/Skriv + &Läs/Skriv - + Write Skriv - + Unable to find file %1! Kan inte hitta filen %1 ! @@ -2841,21 +2673,24 @@ Vill du ladda ned den nu ? %2. + &loadBackup... - ladda&Backup... + ladda&Backup... - + Load backup from file Ladda backup från fil + Lo&gs - &Loggar + &Loggar + Ctrl+G - Ctrl+G + Ctrl+G @@ -2863,7 +2698,7 @@ Vill du ladda ned den nu ? Öppna loggfil - + @@ -2956,12 +2791,11 @@ Vill du ladda ned den nu ? - Read Models and Settings From Tx Läs Modeller och Inställningar från sändaren - + The file %1 has not been recognized as a valid Models and Settings file Write anyway ? @@ -2996,12 +2830,11 @@ Starta skrivningen i alla fall ? - Write Models and Settings To Tx Skriv Modeller och Inställningar till sändaren - + Write Firmware To Tx Skriv firmware till sändaren @@ -3065,67 +2898,72 @@ Starta skrivningen i alla fall ? Ladda ned firmware och röstfiler. Definera profildata. - + Check for new version of Companion Sök efter ny version av Companion + Show Companion contributors list - Visa vilka som bidragit till Companion + Visa vilka som bidragit till Companion - + ChangeLog... Förändringar... - + Firmware ChangeLog... Firmware-förändringar... - + Show firmware changelog Visa firmware-förändringar + Configure transmitter start screen... - Konfigurera sändarens startbild... + Konfigurera sändarens startbild... + &Configure connection software... - Inställningar för &kommunikation... + Inställningar för &kommunikation... - + New Profile Ny Profil - + Create a new Radio Setting Profile Lägg till en ny profil med radio-inställningar + Classic - Klassiskt + Klassiskt + The multicolor classical Companion icon theme - Det flerfärgade klassiska Companion-temat + Det flerfärgade klassiska Companion-temat - + A monochrome black icon theme Ett monokromt svart tema - + A monochrome white icon theme Ett monokromt vitt tema - + A monochrome blue icon theme Ett monokromt blått tema @@ -3135,165 +2973,162 @@ Starta skrivningen i alla fall ? Liten - + Use small toolbar icons Använd små ikoner i verktygsfälten - + Use normal size toolbar icons Använd normalstora ikoner i verktygsfälten - + Normal Normal - + Use big toolbar icons Använd stora ikoner i verktygsfälten - + Big Stor - + Use huge toolbar icons Använd mycket stora ikoner i verktygsfälten - + Huge Mycket Stor + System default language - Systemspråk + Systemspråk + Use system default language in menus - Använd systemspråket i menyerna (om tillgängligt) + Använd systemspråket i menyerna (om tillgängligt) - + Czech Czeckiska - + Use Czech in menus Använd Tjeckiska i menyerna - + German Tyska - + Use German in menus Använd Tyska i menyerna - + English Engelska - + Use English in menus Använd Engelska i menyerna - + French Franska - + Use French in menus Använd Franska i menyerna - + Italian Italienska - + Use Italian in menus Använd Italienska i menyerna - + Hebrew Hebreiska - + Use Hebrew in menus Använd Hebreiska i menyerna - + Polish Polska - + Use Polish in menus Använd Polska i menyerna - + Portuguese Portugisiska - + Use Portuguese in menus Använd Portugisiska i menyerna - + Swedish Svenska - + Use Swedish in menus Använd Svenska i menyerna - + Russian Ryska - + Use Russian in menus Använd Ryska i menyerna - - Load Backup... - Ladda backup från fil... - - - + Manuals and other Documents Manualer och andra Dokument - + Open the OpenTX document page in a web browser Öppna OpenTX dokumentsida i en webbläsare - + Set Icon Theme Ställ in Ikontema @@ -3303,16 +3138,17 @@ Starta skrivningen i alla fall ? Ställ in Ikonstorlek + &Settings - &Inställningar + &Inställningar - + Radio Settings Profiles Profiler för Radioinställningar - + Invalid Models and Settings File %1 Filen innehåller inte Modeller och Inställningar: %1 @@ -4841,12 +4677,12 @@ p, li { white-space: pre-wrap; } VHastighet - + A1- A1- - + A2- A2- @@ -4886,12 +4722,12 @@ p, li { white-space: pre-wrap; } Avstånd+ - + Cur+ Ström+ - + ACC ACC @@ -5413,27 +5249,7 @@ p, li { white-space: pre-wrap; } HDG - - ASpd - - - - - dTE - - - - - Cel- - - - - - Vfs- - - - - + RudTrim Left RoderTrim Vänster @@ -5580,17 +5396,17 @@ p, li { white-space: pre-wrap; } Timer - Timer + Sticky - Klistrig + Klistrig Stay - Håll + @@ -5600,17 +5416,17 @@ p, li { white-space: pre-wrap; } STAY(%1, [%2:%3]) - HÅLL(%1, [%2:%3]) + STICKY(%1, %2) - KLISTRIG(%1, %2) + TIMER(%1, %2) - TIMER(%1, %2) + @@ -5843,12 +5659,12 @@ p, li { white-space: pre-wrap; } RSSI - + Pwr+ - + S11 S11 @@ -5999,12 +5815,12 @@ p, li { white-space: pre-wrap; } Flygläge %1 värde - + openTx only accepts %1 points in all curves openTX accepterar bar %1 punkter i alla kurvor - + @@ -6181,7 +5997,7 @@ Gruppen bakom OpenTX/Companion. Använd trim från flygläge %1 + Eget trim som offset - + FW: %1 FW: %1 @@ -6805,16 +6621,19 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga appPreferencesDialog + Application Preferences - Programmets Inställningar + Programmets Inställningar + Simulator capture folder Lagra simulatorbilder i + Remember simulator switch values Spara läget för alla brytare i simulatorn @@ -6822,12 +6641,16 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga - + + + + Open Folder Öppna katalog - + + User Splash Screens Egna Startbilder @@ -6848,26 +6671,31 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga + Blue Blå + Green Grön + Red Röd + Orange Orange + Yellow Gul @@ -7097,12 +6925,12 @@ Detta används av mallen för att koppla kanal till output-nummer. Sökväg till SD-struktur - + Select Image Välj Bild - + Offer to write FW to Tx after download Skriv FW till Tx efter nedladdning @@ -7112,102 +6940,119 @@ Detta används av mallen för att koppla kanal till output-nummer. Ta bort Profil - + Clear Image Ta bort Bild - + Firmware Firmware - + + Include companion splashes Användarens bilder och Companion-bilder + Only user defined splashes Enbart användarens bilder + Splash Screen Library Bibliotek för startbilder + Files to keep Behåll filer + Simulator BackLight Simulatorbelysning + Automatic Backup Folder Säkerhetskopiera till folder + Only capture to clipboard Spara bara bilder till Urklipp + Joystick Joystick + Find Executable Sök Program + Google Earth Executable Sökväg till Google Earth + Calibrate Kalibrera + Enable Aktivera + Show splash screen when Companion starts Visa en start-bild då Companion startas + Automatic check for OpenTX firmware updates Sök automatiskt efter uppdateringar av OpenTX + Automatic check for Companion updates Sök automatiskt efter uppdateringar av Companion + Offer to use wizard for new models Erbjud användning av modellguiden för nya modeller + Enable automatic backup before writing firmware Säkerhetskopiera innan firmware-skrivning - + Select your snapshot folder Välj katalog för snapshots av Tx-simulatorn @@ -7248,15 +7093,17 @@ Detta används av mallen för att koppla kanal till output-nummer. Standard-profilen kan inte tas bort. + Error - Fel + Fel + Cannot load %1. - Det går inte att ladda %1. + Det går inte att ladda %1. - + Open Image to load Öppna bild för laddning @@ -8461,38 +8308,38 @@ m2560 för v4.1-kort Startbildsredigerare - - + + Invert Invertera - - + + Load FW Ladda FW - - + + Load Pict Ladda Bild - - + + Load Profile Ladda Profil - - + + Save Spara - - + + Open Splash Library Öppna bildbibliotek @@ -8586,9 +8433,10 @@ m2560 för v4.1-kort Det gick inte att spara bilden i filen %1 - - - + + + + ... ... diff --git a/radio/.gitignore b/radio/.gitignore deleted file mode 100644 index 7091e5b78..000000000 --- a/radio/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/gtest-1.6.0 diff --git a/radio/src/.gitignore b/radio/src/.gitignore index 3a16d35fe..4ef246e21 100644 --- a/radio/src/.gitignore +++ b/radio/src/.gitignore @@ -1,6 +1,7 @@ /stamp-opentx.h /opentx.elf /simu +/eeprom.bin /opentx.hex /opentx.map /simu.d @@ -8,9 +9,7 @@ /*.sh /*.o /*.bin -/*.bin.* /*.lst /SCRIPTS /SOUNDS /LOGS -/*.bat diff --git a/radio/src/Makefile b/radio/src/Makefile index bf19f243a..053b0371d 100644 --- a/radio/src/Makefile +++ b/radio/src/Makefile @@ -216,7 +216,7 @@ TX_CADDY = NO IRPROTOS = NO # TRANSLATIONS -# Values = cz, de, en, fi, fr, it, se, es, pl, pt +# Values = cz, de, en, fr, it, se, es, pl, pt TRANSLATIONS = EN # TTS @@ -258,10 +258,6 @@ GVARS = NO # Values = NO, POT1, POT2, POT3, 3POS = NO -# Lua interpreter embedded -# Values = NO, NO_MODEL_SCRIPTS, YES -LUA = NO - # Menu Lock modes # Values = NO, READONLY, NOMENUS MENUS_LOCK == NO @@ -659,20 +655,6 @@ ifeq ($(PCB), TARANIS) EXTRABOARDSRC += targets/taranis/usbd_usr.cpp targets/taranis/usbd_storage_msd.cpp SRC += targets/sky9x/syscalls.c - ifneq ($(LUA), NO) - ifeq ($(LUA), YES) - CPPDEFS += -DLUA_MODEL_SCRIPTS - endif - CPPDEFS += -DLUA - INCDIRS += lua/src - CPPSRC += lua.cpp - LUASRC = lua/src/lapi.c lua/src/lcode.c lua/src/lctype.c lua/src/ldebug.c lua/src/ldo.c lua/src/ldump.c lua/src/lfunc.c lua/src/lgc.c lua/src/llex.c lua/src/lmem.c \ - lua/src/lobject.c lua/src/lopcodes.c lua/src/lparser.c lua/src/lstate.c lua/src/lstring.c lua/src/ltable.c lua/src/ltm.c lua/src/lundump.c lua/src/lvm.c lua/src/lzio.c \ - lua/src/lbaselib.c lua/src/linit.c lua/src/lmathlib.c lua/src/loadlib.c lua/src/lauxlib.c lua/src/ltablib.c lua/src/lcorolib.c - # lua/src/loslib.c lua/src/lbitlib.c lua/src/lstrlib.c lua/src/liolib.c lua/src/ldblib.c - SRC += $(LUASRC) - endif - ifeq ($(SDCARD), YES) EXTRABOARDSRC += FatFs/ff.c FatFs/fattime.c FatFs/option/ccsbcs.c targets/taranis/diskio.cpp CPPDEFS += -DVOICE @@ -1086,7 +1068,7 @@ else build: stamp_header tra lbm allsrc.cpp elf remallsrc bin endif -tra: translations/cz.h translations/de.h translations/es.h translations/fi.h translations/fr.h translations/it.h translations/pl.h translations/pt.h translations/se.h +tra: translations/cz.h translations/de.h translations/es.h translations/fr.h translations/it.h translations/pl.h translations/pt.h translations/se.h lbm: fonts bitmaps/sticks.lbm elf: $(TARGET).elf @@ -1098,11 +1080,13 @@ sym: $(TARGET).sym # Build stamp-file stamp_header: - @echo "// Automatically generated file (Makefile) - do not edit" > stamp-opentx.h + @echo + @echo "Generate Version-stamp:" + @echo "//Automatically generated file (Makefile) - do not edit" > stamp-opentx.h @echo "#define DATE_STR \"`date +%Y-%m-%d | tr -d '\r\n'`\"" >> stamp-opentx.h @echo "#define TIME_STR \"`date +%H:%M:%S | tr -d '\r\n'`\"" >> stamp-opentx.h @echo "#define VERS_STR \"$(VERSION)\"" >> stamp-opentx.h - @echo "#define VERS_NUM $(VERSION)" >> stamp-opentx.h + @cat stamp-opentx.h 9x-stamp: @echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > stamp-opentx-9x.txt @@ -1155,11 +1139,6 @@ translations/es.h: translations/es.h.txt @echo "Create Spanish language specific header files" $(TRANSLATE) translations/es.h.txt translations/es.h es -translations/fi.h: translations/fi.h.txt - @echo - @echo "Create Finnish language specific header files" - $(TRANSLATE) translations/fi.h.txt translations/fi.h fi - translations/fr.h: translations/fr.h.txt @echo @echo "Create French language specific header files" @@ -1245,7 +1224,7 @@ FOXLIB=-L/usr/local/lib \ -Wl,-rpath,$(FOXPATH)/src/.libs simu: stamp_header $(BOARDSRC) $(CPPSRC) Makefile simu.cpp simpgmspace.cpp *.h tra lbm eeprom.bin - g++ $(CPPFLAGS) $(INCFLAGS) simu.cpp $(BOARDSRC) $(CPPSRC) $(LUASRC) simpgmspace.cpp -MD -DSIMU -O0 -o simu $(FOXINC) $(FOXLIB) -pthread -fexceptions + g++ $(CPPFLAGS) $(INCFLAGS) simu.cpp $(BOARDSRC) $(CPPSRC) simpgmspace.cpp -MD -DSIMU -O0 -o simu $(FOXINC) $(FOXLIB) -pthread -fexceptions eeprom.bin: dd if=/dev/zero of=$@ bs=1 count=2048 diff --git a/radio/src/eeprom_conversions.cpp b/radio/src/eeprom_conversions.cpp index 8a0e6bac9..349d685a8 100644 --- a/radio/src/eeprom_conversions.cpp +++ b/radio/src/eeprom_conversions.cpp @@ -228,13 +228,6 @@ int ConvertSource_215_to_216(int source, bool insertZero=false) // 4 GVARS added if (source > MIXSRC_GVAR1+4) source += 4; - // ASpd and dTE added - if (source >= MIXSRC_FIRST_TELEM-1+TELEM_ASPD) - source += 2; - // Cel- and Vfas- added - if (source >= MIXSRC_FIRST_TELEM-1+TELEM_MIN_CELL) - source += 2; - return source; } @@ -248,19 +241,11 @@ int ConvertSwitch_215_to_216(int swtch) return swtch + (2*4) + (2*6); // 4 trims and 2 * 6-pos added as switches } #else -int ConvertSource_215_to_216(int source, bool insertZero=false) +int ConvertSource_215_to_216(int source, bool removeZero=false) { - if (insertZero) - source += 1; // 4 GVARS added if (source > MIXSRC_GVAR1+4) source += 4; - // ASpd and dTE added - if (source >= MIXSRC_FIRST_TELEM-1+TELEM_ASPD) - source += 2; - // Cel- and Vfas- added - if (source >= MIXSRC_FIRST_TELEM-1+TELEM_MIN_CELL) - source += 2; return source; } @@ -582,7 +567,7 @@ void ConvertModel_215_to_216(ModelData &model) } if (fn.func == FUNC_PLAY_VALUE || fn.func == FUNC_VOLUME || (IS_ADJUST_GV_FUNC(fn.func) && fn.all.mode == FUNC_ADJUST_GVAR_SOURCE)) { #if defined(PCBTARANIS) - fn.all.val = ConvertSource_215_to_216(fn.all.val, true); + fn.all.param = ConvertSource_215_to_216(fn.all.param, true); #endif } } diff --git a/radio/src/fonts/sqt5/font_fi_04x06.png b/radio/src/fonts/sqt5/font_fi_04x06.png deleted file mode 100644 index 39346ec75d1ec84857031221e41e779fa8c52b27..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^azM<^$P6S^)$=z2DYgKg5LY1m|NsA`H|O64vKW)R z-CY3FVdQ I&MBb@01Ij`r2qf` diff --git a/radio/src/fonts/sqt5/font_fi_05x07.png b/radio/src/fonts/sqt5/font_fi_05x07.png deleted file mode 100644 index 59311bd3ce230a046deb23e71aa7739bf5cfbf5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^azM<%$P6T}6y8k-QfvV}A+A9B|Ns9>Z_d99WHBar zySp%Su*!M>Ih+L^k;M!Q+`=Ht$S`Y;1W=H@#M9T6{Vs>Jh`RE&iQl#Yh4egK978y+ zC%-s5ZP%d<|LXt9v$3UiD)ZcbZnHfhVM5}D1P!*$Q|9e9_ye?vpTRU&8%^kc+2_V+hA} z+tV8b4=C_BU$mdbt^d5|LElvme(ivhjWK#xtzW9NnM5y6zc+iLN)YDw$mMy+r!>#`vJ{k@O1TaS?83{1OR%wI+FkZ diff --git a/radio/src/fonts/sqt5/font_fi_10x14.png b/radio/src/fonts/sqt5/font_fi_10x14.png deleted file mode 100644 index dbd4d48d4f7bdc59fed88763ea93066dc09d4534..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^Hb5-E$P6S4V)|-;6kC8#h%1o(|NsBeoAd7iS&T{E z?k)@+tg;?J4rhT!WHAE+w=f7ZGR&GI0Tg5}@$_|Nzsn&lYR0tU@%l4Bp)gMu#}JO| z$v^m6oFVdQ&MBb@ E09VyT8vp$WaWQu6{1- HoD!MZ_d99WN{XF zL>4nJa0`PlBg3pY5H=O_PcD{oD#ez{WxX=g>*e#978y+C;#|={}tEayE&c8 zJhqS&K+sj18QXOboFyt=akR{0D|u? Ai~s-t diff --git a/radio/src/fonts/std/font_fi_08x10.png b/radio/src/fonts/std/font_fi_08x10.png deleted file mode 100644 index 70fbdbcfd949dc94b05b48fae816deed5ab8f806..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^20+Zi$P6UqO4bMgDYgKg5LY1m|NsA`H|O64vKW)R z-CYOfEFEKkwh$$jE#~ al3`MvTQ2v?z*?XS7(8A5T-G@yGywpk=1&9w diff --git a/radio/src/lcd.cpp b/radio/src/lcd.cpp index 85ef0a709..e076fd278 100644 --- a/radio/src/lcd.cpp +++ b/radio/src/lcd.cpp @@ -1236,14 +1236,12 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val, #endif case TELEM_CELL-1: - case TELEM_MIN_CELL-1: putsTelemetryValue(x, y, val, UNIT_VOLTS, att|PREC2); break; case TELEM_TX_VOLTAGE-1: case TELEM_VFAS-1: case TELEM_CELLS_SUM-1: - case TELEM_MIN_VFAS-1: putsTelemetryValue(x, y, val, UNIT_VOLTS, att|PREC1); break; @@ -1265,7 +1263,6 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val, case TELEM_ACCy-1: case TELEM_ACCz-1: case TELEM_VSPD-1: - case TELEM_ASPD-1: putsTelemetryValue(x, y, val, UNIT_RAW, att|PREC2); break; diff --git a/radio/src/lua.cpp b/radio/src/lua.cpp deleted file mode 100644 index 0e18824fa..000000000 --- a/radio/src/lua.cpp +++ /dev/null @@ -1,1124 +0,0 @@ -/* - * Authors (alphabetical order) - * - Andre Bernet - * - Andreas Weitl - * - Bertrand Songis - * - Bryan J. Rentoul (Gruvin) - * - Cameron Weeks - * - Erez Raviv - * - Gabriel Birkus - * - Jean-Pierre Parisy - * - Karl Szmutny - * - Michael Blandford - * - Michal Hlavinka - * - Pat Mackenzie - * - Philip Moss - * - Rob Thomson - * - Romolo Manfredini - * - Thomas Husterer - * - * opentx is based on code named - * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, - * er9x by Erez Raviv: http://code.google.com/p/er9x/, - * and the original (and ongoing) project by - * Thomas Husterer, th9x: http://code.google.com/p/th9x/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - */ - -#include "opentx.h" -#include "stamp-opentx.h" - -#if !defined(SIMU) -extern "C" { -#endif - #include - #include - #include -#if !defined(SIMU) -} -#endif - -#define lua_registerint(L, n, i) (lua_pushinteger(L, (i)), lua_setglobal(L, (n))) -#define lua_pushtablenil(L, k) (lua_pushstring(L, (k)), lua_pushnil(L), lua_settable(L, -3)) -#define lua_pushtableboolean(L, k, v) (lua_pushstring(L, (k)), lua_pushboolean(L, (v)), lua_settable(L, -3)) -#define lua_pushtablenumber(L, k, v) (lua_pushstring(L, (k)), lua_pushinteger(L, (v)), lua_settable(L, -3)) -#define lua_pushtablestring(L, k, v) (lua_pushstring(L, (k)), lua_pushstring(L, (v)), lua_settable(L, -3)) -#define lua_pushtablezstring(L, k, v) { char _zz[sizeof(v)+1]; zchar2str(_zz, (v), sizeof(v)); lua_pushstring(L, (k)); lua_pushstring(L, _zz); lua_settable(L, -3); } -#define lua_registerlib(L, name, tab) (luaL_newmetatable(L, name), luaL_setfuncs(L, tab, 0), lua_setglobal(L, name)) - -lua_State *L = NULL; -uint8_t luaState = 0; -ScriptInternalData scriptInternalData[MAX_SCRIPTS] = { { SCRIPT_NOFILE, 0 } }; -ScriptInternalData standaloneScript = { SCRIPT_NOFILE, 0 }; - -#define PERMANENT_SCRIPTS_MAX_INSTRUCTIONS (1000/100) -#define MANUAL_SCRIPTS_MAX_INSTRUCTIONS (10000/100) -#define SCRIPTS_MAX_HEAP 50 -#define SET_LUA_INSTRUCTIONS_COUNT(x) (instructionsPercent=0, lua_sethook(L, hook, LUA_MASKCOUNT, x)) - -static int instructionsPercent = 0; -void hook(lua_State* L, lua_Debug *ar) -{ - instructionsPercent++; - if (instructionsPercent > 100) { - // From now on, as soon as a line is executed, error - // keep erroring until you're script reaches the top - lua_sethook(L, hook, LUA_MASKLINE, 0); - luaL_error(L, ""); - } -} - -static int luaGetVersion(lua_State *L) -{ - lua_pushnumber(L, VERS_NUM); - return 1; -} - -static int luaGetTime(lua_State *L) -{ - lua_pushunsigned(L, get_tmr10ms()); - return 1; -} - -static int luaGetValue(lua_State *L) -{ - if (lua_isnumber(L, 1)) { - int src = luaL_checkinteger(L, 1); - lua_pushinteger(L, getValue(src)); - return 1; - } - else { - const char *what = luaL_checkstring(L, 1); - if (!strcmp(what, "altitude")) { - lua_pushnumber(L, double(frskyData.hub.baroAltitude)/100); - return 1; - } - else if (!strcmp(what, "latitude")) { - if (frskyData.hub.gpsFix) - lua_pushnumber(L, gpsToDouble(frskyData.hub.gpsLatitudeNS=='S', frskyData.hub.gpsLatitude_bp, frskyData.hub.gpsLatitude_ap)); - else - lua_pushnil(L); - return 1; - } - else if (!strcmp(what, "longitude")) { - if (frskyData.hub.gpsFix) - lua_pushnumber(L, gpsToDouble(frskyData.hub.gpsLongitudeEW=='W', frskyData.hub.gpsLongitude_bp, frskyData.hub.gpsLongitude_ap)); - else - lua_pushnil(L); - return 1; - } - else if (!strcmp(what, "pilot latitude")) { - if (frskyData.hub.gpsFix) - lua_pushnumber(L, pilotLatitude); - else - lua_pushnil(L); - return 1; - } - else if (!strcmp(what, "pilot longitude")) { - if (frskyData.hub.gpsFix) - lua_pushnumber(L, pilotLongitude); - else - lua_pushnil(L); - return 1; - } - } - - return 0; -} - -static int luaPlayFile(lua_State *L) -{ - const char * filename = luaL_checkstring(L, 1); - PLAY_FILE(filename, 0, 0); - return 0; -} - -static int luaLcdLock(lua_State *L) -{ - lcd_locked = true; - return 0; -} - -static int luaLcdClear(lua_State *L) -{ - lcd_clear(); - return 0; -} - -static int luaLcdDrawPoint(lua_State *L) -{ - int x = luaL_checkinteger(L, 1); - int y = luaL_checkinteger(L, 2); - lcd_plot(x, y); - return 0; -} - -static int luaLcdDrawLine(lua_State *L) -{ - int x1 = luaL_checkinteger(L, 1); - int y1 = luaL_checkinteger(L, 2); - int x2 = luaL_checkinteger(L, 3); - int y2 = luaL_checkinteger(L, 4); - lcd_line(x1, y1, x2, y2); - return 0; -} - -static int luaLcdDrawRectangle(lua_State *L) -{ - int x = luaL_checkinteger(L, 1); - int y = luaL_checkinteger(L, 2); - int w = luaL_checkinteger(L, 3); - int h = luaL_checkinteger(L, 4); - lcd_rect(x, y, w, h, 0xff, 0); - return 0; -} - -static int luaLcdDrawText(lua_State *L) -{ - int x = luaL_checkinteger(L, 1); - int y = luaL_checkinteger(L, 2); - const char * s = luaL_checkstring(L, 3); - int att = luaL_checkinteger(L, 4); - lcd_putsAtt(x, y, s, att); - return 0; -} - -static int luaLcdDrawSwitch(lua_State *L) -{ - int x = luaL_checkinteger(L, 1); - int y = luaL_checkinteger(L, 2); - int s = luaL_checkinteger(L, 3); - int att = luaL_checkinteger(L, 4); - putsSwitches(x, y, s, att); - return 0; -} - -static int luaLcdDrawPixmap(lua_State *L) -{ - int x = luaL_checkinteger(L, 1); - int y = luaL_checkinteger(L, 2); - const char * filename = luaL_checkstring(L, 3); - // TODO int att = luaL_checkinteger(L, 4); - bmp_ptr_t bitmap = 0; - const pm_char * error = bmpLoad(bitmap, filename, LCD_W, LCD_H); - if (bitmap && !error) { - lcd_bmp(x, y, bitmap); - // free(bitmap); - } - return 0; -} - -static int luaLcdDrawScreenTitle(lua_State *L) -{ - const char * str = luaL_checkstring(L, 1); - int idx = luaL_checkinteger(L, 2); - int cnt = luaL_checkinteger(L, 3); - - displayScreenIndex(idx-1, cnt, 0); - lcd_filled_rect(0, 0, LCD_W, FH, SOLID, FILL_WHITE|GREY_DEFAULT); - title(str); - - return 0; -} - -static int luaModelGetTimer(lua_State *L) -{ - int idx = luaL_checkunsigned(L, 1); - if (idx < MAX_TIMERS) { - TimerData & timer = g_model.timers[idx]; - lua_newtable(L); - lua_pushtablenumber(L, "mode", timer.mode); - lua_pushtablenumber(L, "start", timer.start); - lua_pushtablenumber(L, "value", timersStates[idx].val); - lua_pushtablenumber(L, "countdownBeep", timer.countdownBeep); - lua_pushtableboolean(L, "minuteBeep", timer.minuteBeep); - lua_pushtableboolean(L, "persistent", timer.persistent); - } - else { - lua_pushnil(L); - } - return 1; -} - -static int luaModelSetTimer(lua_State *L) -{ - int idx = luaL_checkunsigned(L, 1); - - if (idx < MAX_TIMERS) { - TimerData & timer = g_model.timers[idx]; - luaL_checktype(L, -1, LUA_TTABLE); - for (lua_pushnil(L); lua_next(L, -2); lua_pop(L, 1)) { - luaL_checktype(L, -2, LUA_TSTRING); // key is string - const char * key = luaL_checkstring(L, -2); - if (!strcmp(key, "mode")) { - timer.mode = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "start")) { - timer.start = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "value")) { - timersStates[idx].val = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "countdownBeep")) { - timer.countdownBeep = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "minuteBeep")) { - timer.minuteBeep = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "persistent")) { - timer.persistent = luaL_checkinteger(L, -1); - } - } - eeDirty(EE_MODEL); - } - return 0; -} - -static int getFirstInput(int chn) -{ - for (int i=0; isrcRaw || expo->chn>chn) break; - if (expo->chn == chn) { - return i; - } - } - return -1; -} - -static int getInputsCountFromFirst(int chn, int first) -{ - int count = 0; - if (first >= 0) { - for (int i=first; isrcRaw || expo->chn!=chn) break; - count++; - } - } - return count; -} - -static int getInputsCount(int chn) -{ - int first = getFirstInput(chn); - return getInputsCountFromFirst(chn, first); -} - -static int luaModelGetInputsCount(lua_State *L) -{ - int chn = luaL_checkunsigned(L, 1); - int count = getInputsCount(chn); - lua_pushinteger(L, count); - return 1; -} - -static int luaModelGetInput(lua_State *L) -{ - int chn = luaL_checkunsigned(L, 1); - int idx = luaL_checkunsigned(L, 2); - int first = getFirstInput(chn); - int count = getInputsCountFromFirst(chn, first); - if (first>=0 && idxname); - lua_pushtablenumber(L, "source", expo->srcRaw); - lua_pushtablenumber(L, "weight", expo->weight); - lua_pushtablenumber(L, "offset", expo->offset); - } - else { - lua_pushnil(L); - } - return 1; -} - -static int luaModelInsertInput(lua_State *L) -{ - int chn = luaL_checkunsigned(L, 1); - int idx = luaL_checkunsigned(L, 2); - - int first = getFirstInput(chn); - int count = getInputsCountFromFirst(chn, first); - - if (chnname, name, sizeof(expo->name)); - } - else if (!strcmp(key, "source")) { - expo->srcRaw = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "weight")) { - expo->weight = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "offset")) { - expo->offset = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "switch")) { - expo->swtch = luaL_checkinteger(L, -1); - } - } - } - - return 0; -} - -static int luaModelDeleteInput(lua_State *L) -{ - int chn = luaL_checkunsigned(L, 1); - int idx = luaL_checkunsigned(L, 2); - - int first = getFirstInput(chn); - int count = getInputsCountFromFirst(chn, first); - - if (first>=0 && idxsrcRaw || mix->destCh>chn) break; - if (mix->destCh == chn) { - return i; - } - } - return -1; -} - -static int getMixesCountFromFirst(int chn, int first) -{ - int count = 0; - if (first >= 0) { - for (int i=first; isrcRaw || mix->destCh!=chn) break; - count++; - } - } - return count; -} - -static int getMixesCount(int chn) -{ - int first = getFirstMix(chn); - return getMixesCountFromFirst(chn, first); -} - -static int luaModelGetMixesCount(lua_State *L) -{ - int chn = luaL_checkunsigned(L, 1); - int count = getMixesCount(chn); - lua_pushinteger(L, count); - return 1; -} - -static int luaModelGetMix(lua_State *L) -{ - int chn = luaL_checkunsigned(L, 1); - int idx = luaL_checkunsigned(L, 2); - int first = getFirstMix(chn); - int count = getMixesCountFromFirst(chn, first); - if (first>=0 && idxname); - lua_pushtablenumber(L, "source", mix->srcRaw); - lua_pushtablenumber(L, "weight", mix->weight); - lua_pushtablenumber(L, "offset", mix->offset); - lua_pushtablenumber(L, "switch", mix->swtch); - lua_pushtablenumber(L, "multiplex", mix->mltpx); - } - else { - lua_pushnil(L); - } - return 1; -} - -static int luaModelInsertMix(lua_State *L) -{ - int chn = luaL_checkunsigned(L, 1); - int idx = luaL_checkunsigned(L, 2); - - int first = getFirstMix(chn); - int count = getMixesCountFromFirst(chn, first); - - if (chnname, name, sizeof(mix->name)); - } - else if (!strcmp(key, "source")) { - mix->srcRaw = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "weight")) { - mix->weight = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "offset")) { - mix->offset = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "switch")) { - mix->swtch = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "multiplex")) { - mix->mltpx = luaL_checkinteger(L, -1); - } - } - } - - return 0; -} - -static int luaModelDeleteMix(lua_State *L) -{ - int chn = luaL_checkunsigned(L, 1); - int idx = luaL_checkunsigned(L, 2); - - int first = getFirstMix(chn); - int count = getMixesCountFromFirst(chn, first); - - if (first>=0 && idxfunc); - lua_pushtablenumber(L, "v1", sw->v1); - lua_pushtablenumber(L, "v2", sw->v2); - lua_pushtablenumber(L, "v3", sw->v3); - lua_pushtablenumber(L, "and", sw->andsw); - lua_pushtablenumber(L, "delay", sw->delay); - lua_pushtablenumber(L, "duration", sw->duration); - } - else { - lua_pushnil(L); - } - return 1; -} - -static int luaModelSetLogicalSwitch(lua_State *L) -{ - int idx = luaL_checkunsigned(L, 1); - if (idx < NUM_CSW) { - LogicalSwitchData * sw = cswAddress(idx); - luaL_checktype(L, -1, LUA_TTABLE); - for (lua_pushnil(L); lua_next(L, -2); lua_pop(L, 1)) { - luaL_checktype(L, -2, LUA_TSTRING); // key is string - const char * key = luaL_checkstring(L, -2); - if (!strcmp(key, "function")) { - sw->func = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "v1")) { - sw->v1 = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "v2")) { - sw->v2 = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "v3")) { - sw->v3 = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "and")) { - sw->andsw = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "delay")) { - sw->delay = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "duration")) { - sw->duration = luaL_checkinteger(L, -1); - } - } - } - - return 0; -} - -static int luaModelGetCustomFunction(lua_State *L) -{ - int idx = luaL_checkunsigned(L, 1); - if (idx < NUM_CFN) { - CustomFnData * cfn = &g_model.funcSw[idx]; - lua_newtable(L); - lua_pushtablenumber(L, "switch", CFN_SWITCH(cfn)); - lua_pushtablenumber(L, "function", CFN_FUNC(cfn)); - lua_pushtablezstring(L, "name", cfn->play.name); - lua_pushtablenumber(L, "value", cfn->all.val); - lua_pushtablenumber(L, "mode", cfn->all.mode); - lua_pushtablenumber(L, "active", CFN_ACTIVE(cfn)); - } - else { - lua_pushnil(L); - } - return 1; -} - -static int luaModelSetCustomFunction(lua_State *L) -{ - int idx = luaL_checkunsigned(L, 1); - if (idx < NUM_CFN) { - CustomFnData * cfn = &g_model.funcSw[idx]; - luaL_checktype(L, -1, LUA_TTABLE); - for (lua_pushnil(L); lua_next(L, -2); lua_pop(L, 1)) { - luaL_checktype(L, -2, LUA_TSTRING); // key is string - const char * key = luaL_checkstring(L, -2); - if (!strcmp(key, "switch")) { - CFN_SWITCH(cfn) = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "function")) { - CFN_FUNC(cfn) = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "name")) { - const char * name = luaL_checkstring(L, -1); - str2zchar(cfn->play.name, name, sizeof(cfn->play.name)); - } - else if (!strcmp(key, "value")) { - cfn->all.val = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "mode")) { - cfn->all.mode = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "active")) { - CFN_ACTIVE(cfn) = luaL_checkinteger(L, -1); - } - } - } - - return 0; -} - -static int luaModelGetOutput(lua_State *L) -{ - int idx = luaL_checkunsigned(L, 1); - if (idx < NUM_CHNOUT) { - LimitData * limit = limitAddress(idx); - lua_newtable(L); - lua_pushtablezstring(L, "name", limit->name); - lua_pushtablenumber(L, "min", limit->min); - lua_pushtablenumber(L, "max", limit->min); - lua_pushtablenumber(L, "offset", limit->offset); - lua_pushtablenumber(L, "ppmCenter", limit->ppmCenter); - lua_pushtableboolean(L, "symetrical", limit->symetrical); - lua_pushtableboolean(L, "revert", limit->revert); - if (limit->curve) - lua_pushtablenil(L, "curve"); - else - lua_pushtablenumber(L, "curve", limit->curve-1); - } - else { - lua_pushnil(L); - } - return 1; -} - -static int luaModelSetOutput(lua_State *L) -{ - int idx = luaL_checkunsigned(L, 1); - if (idx < NUM_CHNOUT) { - LimitData * limit = limitAddress(idx); - luaL_checktype(L, -1, LUA_TTABLE); - for (lua_pushnil(L); lua_next(L, -2); lua_pop(L, 1)) { - luaL_checktype(L, -2, LUA_TSTRING); // key is string - const char * key = luaL_checkstring(L, -2); - if (!strcmp(key, "name")) { - const char * name = luaL_checkstring(L, -1); - str2zchar(limit->name, name, sizeof(limit->name)); - } - else if (!strcmp(key, "min")) { - limit->min = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "max")) { - limit->max = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "offset")) { - limit->offset = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "ppmCenter")) { - limit->ppmCenter = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "symetrical")) { - limit->symetrical = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "revert")) { - limit->revert = luaL_checkinteger(L, -1); - } - else if (!strcmp(key, "curve")) { - if (lua_isnil(L, -1)) - limit->curve = 0; - else - limit->curve = luaL_checkinteger(L, -1) + 1; - } - } - } - - return 0; -} -static int luaPopupInput(lua_State *L) -{ - uint8_t event = luaL_checkinteger(L, 2); - s_warning_input_value = luaL_checkinteger(L, 3); - s_warning_input_min = luaL_checkinteger(L, 4); - s_warning_input_max = luaL_checkinteger(L, 5); - s_warning = luaL_checkstring(L, 1); - s_warning_type = WARNING_TYPE_INPUT; - displayWarning(event); - if (s_warning_result) { - s_warning_result = 0; - lua_pushstring(L, "OK"); - } - else if (!s_warning) { - lua_pushstring(L, "CANCEL"); - } - else { - lua_pushinteger(L, s_warning_input_value); - } - s_warning = NULL; - return 1; -} - -int luaGetInputs(ScriptInternalData & sid) -{ - if (!lua_istable(L, -1)) - return -1; - - sid.inputsCount = 0; - for (lua_pushnil(L); lua_next(L, -2) && sid.inputsCount100) { - TRACE("Script killed"); - standaloneScript.state = SCRIPT_KILLED; - } - else { - TRACE("Script error"); - standaloneScript.state = SCRIPT_SYNTAX_ERROR; - } - luaState = LUASTATE_RELOAD_MODEL_SCRIPTS; - } - else { - int scriptResult = lua_tointeger(L, -1); - lua_pop(L, 1); /* pop returned value */ - if (scriptResult == 0) { - if (lua_gc(L, LUA_GCCOUNT, 0) > SCRIPTS_MAX_HEAP) { - TRACE("Script memory leak"); - standaloneScript.state = SCRIPT_LEAK; - luaState = LUASTATE_RELOAD_MODEL_SCRIPTS; - } - } - else { - TRACE("Script finished with status %d", scriptResult); - standaloneScript.state = SCRIPT_NOFILE; - luaState = LUASTATE_RELOAD_MODEL_SCRIPTS; - } - } - } - else { - TRACE("Script error: %s", lua_tostring(L, -1)); - standaloneScript.state = (instructionsPercent > 100 ? SCRIPT_KILLED : SCRIPT_SYNTAX_ERROR); - luaState = LUASTATE_RELOAD_MODEL_SCRIPTS; - } - - if (standaloneScript.state != SCRIPT_OK) { - luaError(standaloneScript.state); - } - - } - } - else { - // model scripts - if (luaState & LUASTATE_RELOAD_MODEL_SCRIPTS) { - luaState = 0; - LUA_RESET(); - luaLoadModelScripts(); - } - - for (int i=0; i 100 ? SCRIPT_KILLED : SCRIPT_SYNTAX_ERROR); - TRACE("Script %10s disabled", sd.file); - break; - } - sid.outputs[j].value = lua_tointeger(L, -1); - lua_pop(L, 1); - } - } - else { - if (instructionsPercent > 100) { - TRACE("Script %10s killed", sd.file); - sid.state = SCRIPT_KILLED; - } - else { - TRACE("Script %10s error: %s", sd.file, lua_tostring(L, -1)); - sid.state = SCRIPT_SYNTAX_ERROR; - } - } - - if (sid.state != SCRIPT_OK) { - luaFree(sid); - } - else { - sid.memory += lua_gc(L, LUA_GCCOUNT, 0) - prev_mem; - if (instructionsPercent > sid.instructions) { - sid.instructions = instructionsPercent; - } - } - } - } - - // TRACE("gc=%d", lua_gc(L, LUA_GCCOUNT, 0)); - - if (lua_gc(L, LUA_GCCOUNT, 0) > SCRIPTS_MAX_HEAP) { - uint8_t max_memory = 0; - int8_t max_idx = -1; - for (int i=0; i max_memory && sid.memory > 15) { - max_idx = i; - } - } - if (max_idx >= 0) { - ScriptInternalData & sid = scriptInternalData[max_idx]; - TRACE("Script %d killed", max_idx); - sid.state = SCRIPT_LEAK; - luaFree(sid); - } - } - } -} diff --git a/radio/src/lua/Makefile b/radio/src/lua/Makefile deleted file mode 100644 index bd9515fd8..000000000 --- a/radio/src/lua/Makefile +++ /dev/null @@ -1,114 +0,0 @@ -# Makefile for installing Lua -# See doc/readme.html for installation and customization instructions. - -# == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT ======================= - -# Your platform. See PLATS for possible values. -PLAT= none - -# Where to install. The installation starts in the src and doc directories, -# so take care if INSTALL_TOP is not an absolute path. See the local target. -# You may want to make INSTALL_LMOD and INSTALL_CMOD consistent with -# LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h. -INSTALL_TOP= /usr/local -INSTALL_BIN= $(INSTALL_TOP)/bin -INSTALL_INC= $(INSTALL_TOP)/include -INSTALL_LIB= $(INSTALL_TOP)/lib -INSTALL_MAN= $(INSTALL_TOP)/man/man1 -INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V -INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V - -# How to install. If your install program does not support "-p", then -# you may have to run ranlib on the installed liblua.a. -INSTALL= install -p -INSTALL_EXEC= $(INSTALL) -m 0755 -INSTALL_DATA= $(INSTALL) -m 0644 -# -# If you don't have "install" you can use "cp" instead. -# INSTALL= cp -p -# INSTALL_EXEC= $(INSTALL) -# INSTALL_DATA= $(INSTALL) - -# Other utilities. -MKDIR= mkdir -p -RM= rm -f - -# == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= - -# Convenience platforms targets. -PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris - -# What to install. -TO_BIN= lua luac -TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp -TO_LIB= liblua.a -TO_MAN= lua.1 luac.1 - -# Lua version and release. -V= 5.2 -R= $V.1 - -# Targets start here. -all: $(PLAT) - -$(PLATS) clean: - cd src && $(MAKE) $@ - -test: dummy - src/lua -v - -install: dummy - cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) - cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN) - cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) - cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) - cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) - -uninstall: - cd src && cd $(INSTALL_BIN) && $(RM) $(TO_BIN) - cd src && cd $(INSTALL_INC) && $(RM) $(TO_INC) - cd src && cd $(INSTALL_LIB) && $(RM) $(TO_LIB) - cd doc && cd $(INSTALL_MAN) && $(RM) $(TO_MAN) - -local: - $(MAKE) install INSTALL_TOP=../install - -none: - @echo "Please do 'make PLATFORM' where PLATFORM is one of these:" - @echo " $(PLATS)" - @echo "See doc/readme.html for complete instructions." - -# make may get confused with test/ and install/ -dummy: - -# echo config parameters -echo: - @cd src && $(MAKE) -s echo - @echo "PLAT= $(PLAT)" - @echo "V= $V" - @echo "R= $R" - @echo "TO_BIN= $(TO_BIN)" - @echo "TO_INC= $(TO_INC)" - @echo "TO_LIB= $(TO_LIB)" - @echo "TO_MAN= $(TO_MAN)" - @echo "INSTALL_TOP= $(INSTALL_TOP)" - @echo "INSTALL_BIN= $(INSTALL_BIN)" - @echo "INSTALL_INC= $(INSTALL_INC)" - @echo "INSTALL_LIB= $(INSTALL_LIB)" - @echo "INSTALL_MAN= $(INSTALL_MAN)" - @echo "INSTALL_LMOD= $(INSTALL_LMOD)" - @echo "INSTALL_CMOD= $(INSTALL_CMOD)" - @echo "INSTALL_EXEC= $(INSTALL_EXEC)" - @echo "INSTALL_DATA= $(INSTALL_DATA)" - -# echo pkg-config data -pc: - @echo "version=$R" - @echo "prefix=$(INSTALL_TOP)" - @echo "libdir=$(INSTALL_LIB)" - @echo "includedir=$(INSTALL_INC)" - -# list targets that do not create files (but not all makes understand .PHONY) -.PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho - -# (end of Makefile) diff --git a/radio/src/lua/README b/radio/src/lua/README deleted file mode 100644 index 6e2aee6ce..000000000 --- a/radio/src/lua/README +++ /dev/null @@ -1,6 +0,0 @@ - -This is Lua 5.2.2, released on 21 Mar 2013. - -For installation instructions, license details, and -further information about Lua, see doc/readme.html. - diff --git a/radio/src/lua/doc/contents.html b/radio/src/lua/doc/contents.html deleted file mode 100644 index 0ce297da1..000000000 --- a/radio/src/lua/doc/contents.html +++ /dev/null @@ -1,533 +0,0 @@ - - - -Lua 5.2 Reference Manual - contents - - - - - - - -


-

- -Lua 5.2 Reference Manual -

- -

-The reference manual is the official definition of the Lua language. -For a complete introduction to Lua programming, see the book -Programming in Lua. - -

-start -· -contents -· -index -


- -Copyright © 2011–2013 Lua.org, PUC-Rio. -Freely available under the terms of the -Lua license. - - -

Contents

- - -

Index

- - - - - - - -
-

Lua functions

-

-_G
-_VERSION
- -

-assert
-collectgarbage
-dofile
-error
-getmetatable
-ipairs
-load
-loadfile
-next
-pairs
-pcall
-print
-rawequal
-rawget
-rawlen
-rawset
-require
-select
-setmetatable
-tonumber
-tostring
-type
-xpcall
- -

-bit32.arshift
-bit32.band
-bit32.bnot
-bit32.bor
-bit32.btest
-bit32.bxor
-bit32.extract
-bit32.lrotate
-bit32.lshift
-bit32.replace
-bit32.rrotate
-bit32.rshift
- -

-coroutine.create
-coroutine.resume
-coroutine.running
-coroutine.status
-coroutine.wrap
-coroutine.yield
- -

-debug.debug
-debug.getuservalue
-debug.gethook
-debug.getinfo
-debug.getlocal
-debug.getmetatable
-debug.getregistry
-debug.getupvalue
-debug.setuservalue
-debug.sethook
-debug.setlocal
-debug.setmetatable
-debug.setupvalue
-debug.traceback
-debug.upvalueid
-debug.upvaluejoin
- -

-file:close
-file:flush
-file:lines
-file:read
-file:seek
-file:setvbuf
-file:write
- -

-io.close
-io.flush
-io.input
-io.lines
-io.open
-io.output
-io.popen
-io.read
-io.stderr
-io.stdin
-io.stdout
-io.tmpfile
-io.type
-io.write
- -

-

 

-

-math.abs
-math.acos
-math.asin
-math.atan
-math.atan2
-math.ceil
-math.cos
-math.cosh
-math.deg
-math.exp
-math.floor
-math.fmod
-math.frexp
-math.huge
-math.ldexp
-math.log
-math.max
-math.min
-math.modf
-math.pi
-math.pow
-math.rad
-math.random
-math.randomseed
-math.sin
-math.sinh
-math.sqrt
-math.tan
-math.tanh
- -

-os.clock
-os.date
-os.difftime
-os.execute
-os.exit
-os.getenv
-os.remove
-os.rename
-os.setlocale
-os.time
-os.tmpname
- -

-package.config
-package.cpath
-package.loaded
-package.loadlib
-package.path
-package.preload
-package.searchers
-package.searchpath
- -

-string.byte
-string.char
-string.dump
-string.find
-string.format
-string.gmatch
-string.gsub
-string.len
-string.lower
-string.match
-string.rep
-string.reverse
-string.sub
-string.upper
- -

-table.concat
-table.insert
-table.pack
-table.remove
-table.sort
-table.unpack
- -

-

C API

-

-lua_Alloc
-lua_CFunction
-lua_Debug
-lua_Hook
-lua_Integer
-lua_Number
-lua_Reader
-lua_State
-lua_Unsigned
-lua_Writer
- -

-lua_absindex
-lua_arith
-lua_atpanic
-lua_call
-lua_callk
-lua_checkstack
-lua_close
-lua_compare
-lua_concat
-lua_copy
-lua_createtable
-lua_dump
-lua_error
-lua_gc
-lua_getallocf
-lua_getctx
-lua_getfield
-lua_getglobal
-lua_gethook
-lua_gethookcount
-lua_gethookmask
-lua_getinfo
-lua_getlocal
-lua_getmetatable
-lua_getstack
-lua_gettable
-lua_gettop
-lua_getupvalue
-lua_getuservalue
-lua_insert
-lua_isboolean
-lua_iscfunction
-lua_isfunction
-lua_islightuserdata
-lua_isnil
-lua_isnone
-lua_isnoneornil
-lua_isnumber
-lua_isstring
-lua_istable
-lua_isthread
-lua_isuserdata
-lua_len
-lua_load
-lua_newstate
-lua_newtable
-lua_newthread
-lua_newuserdata
-lua_next
-lua_pcall
-lua_pcallk
-lua_pop
-lua_pushboolean
-lua_pushcclosure
-lua_pushcfunction
-lua_pushfstring
-lua_pushglobaltable
-lua_pushinteger
-lua_pushlightuserdata
-lua_pushliteral
-lua_pushlstring
-lua_pushnil
-lua_pushnumber
-lua_pushstring
-lua_pushthread
-lua_pushunsigned
-lua_pushvalue
-lua_pushvfstring
-lua_rawequal
-lua_rawget
-lua_rawgeti
-lua_rawgetp
-lua_rawlen
-lua_rawset
-lua_rawseti
-lua_rawsetp
-lua_register
-lua_remove
-lua_replace
-lua_resume
-lua_setallocf
-lua_setfield
-lua_setglobal
-lua_sethook
-lua_setlocal
-lua_setmetatable
-lua_settable
-lua_settop
-lua_setupvalue
-lua_setuservalue
-lua_status
-lua_toboolean
-lua_tocfunction
-lua_tointeger
-lua_tointegerx
-lua_tolstring
-lua_tonumber
-lua_tonumberx
-lua_topointer
-lua_tostring
-lua_tothread
-lua_tounsigned
-lua_tounsignedx
-lua_touserdata
-lua_type
-lua_typename
-lua_upvalueid
-lua_upvalueindex
-lua_upvaluejoin
-lua_version
-lua_xmove
-lua_yield
-lua_yieldk
- -

-

auxiliary library

-

-luaL_Buffer
-luaL_Reg
- -

-luaL_addchar
-luaL_addlstring
-luaL_addsize
-luaL_addstring
-luaL_addvalue
-luaL_argcheck
-luaL_argerror
-luaL_buffinit
-luaL_buffinitsize
-luaL_callmeta
-luaL_checkany
-luaL_checkint
-luaL_checkinteger
-luaL_checklong
-luaL_checklstring
-luaL_checknumber
-luaL_checkoption
-luaL_checkstack
-luaL_checkstring
-luaL_checktype
-luaL_checkudata
-luaL_checkunsigned
-luaL_checkversion
-luaL_dofile
-luaL_dostring
-luaL_error
-luaL_execresult
-luaL_fileresult
-luaL_getmetafield
-luaL_getmetatable
-luaL_getsubtable
-luaL_gsub
-luaL_len
-luaL_loadbuffer
-luaL_loadbufferx
-luaL_loadfile
-luaL_loadfilex
-luaL_loadstring
-luaL_newlib
-luaL_newlibtable
-luaL_newmetatable
-luaL_newstate
-luaL_openlibs
-luaL_optint
-luaL_optinteger
-luaL_optlong
-luaL_optlstring
-luaL_optnumber
-luaL_optstring
-luaL_optunsigned
-luaL_prepbuffer
-luaL_prepbuffsize
-luaL_pushresult
-luaL_pushresultsize
-luaL_ref
-luaL_requiref
-luaL_setfuncs
-luaL_setmetatable
-luaL_testudata
-luaL_tolstring
-luaL_traceback
-luaL_typename
-luaL_unref
-luaL_where
- -

- -
- -Last update: -Tue Mar 12 11:22:18 BRT 2013 - - - - - diff --git a/radio/src/lua/doc/logo.gif b/radio/src/lua/doc/logo.gif deleted file mode 100644 index 2f5e4ac2e742fbb7675e739879211553758aea9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4232 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 PWz_J}_#7St0k8iB@FZjZ diff --git a/radio/src/lua/doc/lua.1 b/radio/src/lua/doc/lua.1 deleted file mode 100644 index 1dbf04366..000000000 --- a/radio/src/lua/doc/lua.1 +++ /dev/null @@ -1,116 +0,0 @@ -.\" $Id: lua.man,v 1.13 2011/11/16 17:16:53 lhf Exp $ -.TH LUA 1 "$Date: 2011/11/16 17:16:53 $" -.SH NAME -lua \- Lua interpreter -.SH SYNOPSIS -.B lua -[ -.I options -] -[ -.I script -[ -.I args -] -] -.SH DESCRIPTION -.B lua -is the standalone Lua interpreter. -It loads and executes Lua programs, -either in textual source form or -in precompiled binary form. -(Precompiled binaries are output by -.BR luac , -the Lua compiler.) -.B lua -can be used as a batch interpreter and also interactively. -.LP -The given -.I options -are handled in order and then -the Lua program in file -.I script -is loaded and executed. -The given -.I args -are available to -.I script -as strings in a global table named -.BR arg . -If no options or arguments are given, -then -.B "\-v \-i" -is assumed when the standard input is a terminal; -otherwise, -.B "\-" -is assumed. -.LP -In interactive mode, -.B lua -prompts the user, -reads lines from the standard input, -and executes them as they are read. -If a line does not contain a complete statement, -then a secondary prompt is displayed and -lines are read until a complete statement is formed or -a syntax error is found. -If a line starts with -.BR '=' , -then -.B lua -evaluates and displays -the values of the expressions in the remainder of the line. -.LP -At the very start, -before even handling the command line, -.B lua -checks the contents of the environment variables -.B LUA_INIT_5_2 -or -.BR LUA_INIT , -in that order. -If the contents is of the form -.RI '@ filename ', -then -.I filename -is executed. -Otherwise, the string is assumed to be a Lua statement and is executed. -.SH OPTIONS -.TP -.BI \-e " stat" -execute statement -.IR stat . -.TP -.B \-i -enter interactive mode after executing -.IR script . -.TP -.BI \-l " name" -execute the equivalent of -.IB name =require(' name ') -before executing -.IR script . -.TP -.B \-v -show version information. -.TP -.B \-E -ignore environment variables. -.TP -.B \-\- -stop handling options. -.TP -.B \- -stop handling options and execute the standard input as a file. -.SH "SEE ALSO" -.BR luac (1) -.br -The documentation at lua.org, -especially section 7 of the reference manual. -.SH DIAGNOSTICS -Error messages should be self explanatory. -.SH AUTHORS -R. Ierusalimschy, -L. H. de Figueiredo, -W. Celes -.\" EOF diff --git a/radio/src/lua/doc/lua.css b/radio/src/lua/doc/lua.css deleted file mode 100644 index 240e85eb8..000000000 --- a/radio/src/lua/doc/lua.css +++ /dev/null @@ -1,83 +0,0 @@ -body { - color: #000000 ; - background-color: #FFFFFF ; - font-family: Helvetica, Arial, sans-serif ; - text-align: justify ; - margin-right: 30px ; - margin-left: 30px ; -} - -h1, h2, h3, h4 { - font-family: Verdana, Geneva, sans-serif ; - font-weight: normal ; - font-style: italic ; -} - -h2 { - padding-top: 0.4em ; - padding-bottom: 0.4em ; - padding-left: 1em ; - padding-right: 1em ; - background-color: #E0E0FF ; - border-radius: 8px ; -} - -h3 { - padding-left: 0.5em ; - border-left: solid #E0E0FF 1em ; -} - -table h3 { - padding-left: 0px ; - border-left: none ; -} - -a:link { - color: #000080 ; - background-color: inherit ; - text-decoration: none ; -} - -a:visited { - background-color: inherit ; - text-decoration: none ; -} - -a:link:hover, a:visited:hover { - color: #000080 ; - background-color: #E0E0FF ; -} - -a:link:active, a:visited:active { - color: #FF0000 ; -} - -hr { - border: 0 ; - height: 1px ; - color: #a0a0a0 ; - background-color: #a0a0a0 ; -} - -:target { - background-color: #F8F8F8 ; - padding: 8px ; - border: solid #a0a0a0 2px ; -} - -.footer { - color: gray ; - font-size: small ; -} - -input[type=text] { - border: solid #a0a0a0 2px ; - border-radius: 2em ; - -moz-border-radius: 2em ; - background-image: url('images/search.png') ; - background-repeat: no-repeat; - background-position: 4px center ; - padding-left: 20px ; - height: 2em ; -} - diff --git a/radio/src/lua/doc/luac.1 b/radio/src/lua/doc/luac.1 deleted file mode 100644 index 33a4ed00a..000000000 --- a/radio/src/lua/doc/luac.1 +++ /dev/null @@ -1,118 +0,0 @@ -.\" $Id: luac.man,v 1.29 2011/11/16 13:53:40 lhf Exp $ -.TH LUAC 1 "$Date: 2011/11/16 13:53:40 $" -.SH NAME -luac \- Lua compiler -.SH SYNOPSIS -.B luac -[ -.I options -] [ -.I filenames -] -.SH DESCRIPTION -.B luac -is the Lua compiler. -It translates programs written in the Lua programming language -into binary files containing precompiled chunks -that can be later loaded and executed. -.LP -The main advantages of precompiling chunks are: -faster loading, -protecting source code from accidental user changes, -and -off-line syntax checking. -Precompiling does not imply faster execution -because in Lua chunks are always compiled into bytecodes before being executed. -.B luac -simply allows those bytecodes to be saved in a file for later execution. -Precompiled chunks are not necessarily smaller than the corresponding source. -The main goal in precompiling is faster loading. -.LP -In the command line, -you can mix -text files containing Lua source and -binary files containing precompiled chunks. -.B luac -produces a single output file containing the combined bytecodes -for all files given. -Executing the combined file is equivalent to executing the given files. -By default, -the output file is named -.BR luac.out , -but you can change this with the -.B \-o -option. -.LP -Precompiled chunks are -.I not -portable across different architectures. -Moreover, -the internal format of precompiled chunks -is likely to change when a new version of Lua is released. -Make sure you save the source files of all Lua programs that you precompile. -.LP -.SH OPTIONS -.TP -.B \-l -produce a listing of the compiled bytecode for Lua's virtual machine. -Listing bytecodes is useful to learn about Lua's virtual machine. -If no files are given, then -.B luac -loads -.B luac.out -and lists its contents. -Use -.B \-l \-l -for a full listing. -.TP -.BI \-o " file" -output to -.IR file , -instead of the default -.BR luac.out . -(You can use -.B "'\-'" -for standard output, -but not on platforms that open standard output in text mode.) -The output file may be one of the given files because -all files are loaded before the output file is written. -Be careful not to overwrite precious files. -.TP -.B \-p -load files but do not generate any output file. -Used mainly for syntax checking and for testing precompiled chunks: -corrupted files will probably generate errors when loaded. -If no files are given, then -.B luac -loads -.B luac.out -and tests its contents. -No messages are displayed if the file loads without errors. -.TP -.B \-s -strip debug information before writing the output file. -This saves some space in very large chunks, -but if errors occur when running a stripped chunk, -then the error messages may not contain the full information they usually do. -In particular, -line numbers and names of local variables are lost. -.TP -.B \-v -show version information. -.TP -.B \-\- -stop handling options. -.TP -.B \- -stop handling options and process standard input. -.SH "SEE ALSO" -.BR lua (1) -.br -The documentation at lua.org. -.SH DIAGNOSTICS -Error messages should be self explanatory. -.SH AUTHORS -R. Ierusalimschy, -L. H. de Figueiredo, -W. Celes -.\" EOF diff --git a/radio/src/lua/doc/manual.css b/radio/src/lua/doc/manual.css deleted file mode 100644 index 269bd4358..000000000 --- a/radio/src/lua/doc/manual.css +++ /dev/null @@ -1,26 +0,0 @@ -h3 code { - font-family: inherit ; - font-size: inherit ; -} - -pre, code { - font-size: 12pt ; -} - -span.apii { - float: right ; - font-family: inherit ; - font-style: normal ; - font-size: small ; - color: gray ; -} - -p+h1, ul+h1 { - padding-top: 0.4em ; - padding-bottom: 0.4em ; - padding-left: 24px ; - margin-left: -24px ; - background-color: #E0E0FF ; - border-radius: 8px ; -} - diff --git a/radio/src/lua/doc/manual.html b/radio/src/lua/doc/manual.html deleted file mode 100644 index 85365363f..000000000 --- a/radio/src/lua/doc/manual.html +++ /dev/null @@ -1,10507 +0,0 @@ - - - - -Lua 5.2 Reference Manual - - - - - - - -
-

- -Lua 5.2 Reference Manual -

- -by Roberto Ierusalimschy, Luiz Henrique de Figueiredo, Waldemar Celes -

- -Copyright © 2011–2013 Lua.org, PUC-Rio. -Freely available under the terms of the -Lua license. - -


-

- -contents -· -index - - -

- - - - - - -

1 – Introduction

- -

-Lua is an extension programming language designed to support -general procedural programming with data description -facilities. -It also offers good support for object-oriented programming, -functional programming, and data-driven programming. -Lua is intended to be used as a powerful, lightweight, -embeddable scripting language for any program that needs one. -Lua is implemented as a library, written in clean C, -the common subset of Standard C and C++. - - -

-Being an extension language, Lua has no notion of a "main" program: -it only works embedded in a host client, -called the embedding program or simply the host. -The host program can invoke functions to execute a piece of Lua code, -can write and read Lua variables, -and can register C functions to be called by Lua code. -Through the use of C functions, Lua can be augmented to cope with -a wide range of different domains, -thus creating customized programming languages sharing a syntactical framework. -The Lua distribution includes a sample host program called lua, -which uses the Lua library to offer a complete, standalone Lua interpreter, -for interactive or batch use. - - -

-Lua is free software, -and is provided as usual with no guarantees, -as stated in its license. -The implementation described in this manual is available -at Lua's official web site, www.lua.org. - - -

-Like any other reference manual, -this document is dry in places. -For a discussion of the decisions behind the design of Lua, -see the technical papers available at Lua's web site. -For a detailed introduction to programming in Lua, -see Roberto's book, Programming in Lua. - - - -

2 – Basic Concepts

- -

-This section describes the basic concepts of the language. - - - -

2.1 – Values and Types

- -

-Lua is a dynamically typed language. -This means that -variables do not have types; only values do. -There are no type definitions in the language. -All values carry their own type. - - -

-All values in Lua are first-class values. -This means that all values can be stored in variables, -passed as arguments to other functions, and returned as results. - - -

-There are eight basic types in Lua: -nil, boolean, number, -string, function, userdata, -thread, and table. -Nil is the type of the value nil, -whose main property is to be different from any other value; -it usually represents the absence of a useful value. -Boolean is the type of the values false and true. -Both nil and false make a condition false; -any other value makes it true. -Number represents real (double-precision floating-point) numbers. -Operations on numbers follow the same rules of -the underlying C implementation, -which, in turn, usually follows the IEEE 754 standard. -(It is easy to build Lua interpreters that use other -internal representations for numbers, -such as single-precision floats or long integers; -see file luaconf.h.) -String represents immutable sequences of bytes. - -Lua is 8-bit clean: -strings can contain any 8-bit value, -including embedded zeros ('\0'). - - -

-Lua can call (and manipulate) functions written in Lua and -functions written in C -(see §3.4.9). - - -

-The type userdata is provided to allow arbitrary C data to -be stored in Lua variables. -A userdata value is a pointer to a block of raw memory. -There are two kinds of userdata: -full userdata, where the block of memory is managed by Lua, -and light userdata, where the block of memory is managed by the host. -Userdata has no predefined operations in Lua, -except assignment and identity test. -By using metatables, -the programmer can define operations for full userdata values -(see §2.4). -Userdata values cannot be created or modified in Lua, -only through the C API. -This guarantees the integrity of data owned by the host program. - - -

-The type thread represents independent threads of execution -and it is used to implement coroutines (see §2.6). -Do not confuse Lua threads with operating-system threads. -Lua supports coroutines on all systems, -even those that do not support threads. - - -

-The type table implements associative arrays, -that is, arrays that can be indexed not only with numbers, -but with any Lua value except nil and NaN -(Not a Number, a special numeric value used to represent -undefined or unrepresentable results, such as 0/0). -Tables can be heterogeneous; -that is, they can contain values of all types (except nil). -Any key with value nil is not considered part of the table. -Conversely, any key that is not part of a table has -an associated value nil. - - -

-Tables are the sole data structuring mechanism in Lua; -they can be used to represent ordinary arrays, sequences, -symbol tables, sets, records, graphs, trees, etc. -To represent records, Lua uses the field name as an index. -The language supports this representation by -providing a.name as syntactic sugar for a["name"]. -There are several convenient ways to create tables in Lua -(see §3.4.8). - - -

-We use the term sequence to denote a table where -the set of all positive numeric keys is equal to {1..n} -for some integer n, -which is called the length of the sequence (see §3.4.6). - - -

-Like indices, -the values of table fields can be of any type. -In particular, -because functions are first-class values, -table fields can contain functions. -Thus tables can also carry methods (see §3.4.10). - - -

-The indexing of tables follows -the definition of raw equality in the language. -The expressions a[i] and a[j] -denote the same table element -if and only if i and j are raw equal -(that is, equal without metamethods). - - -

-Tables, functions, threads, and (full) userdata values are objects: -variables do not actually contain these values, -only references to them. -Assignment, parameter passing, and function returns -always manipulate references to such values; -these operations do not imply any kind of copy. - - -

-The library function type returns a string describing the type -of a given value (see §6.1). - - - - - -

2.2 – Environments and the Global Environment

- -

-As will be discussed in §3.2 and §3.3.3, -any reference to a global name var is syntactically translated -to _ENV.var. -Moreover, every chunk is compiled in the scope of -an external local variable called _ENV (see §3.3.2), -so _ENV itself is never a global name in a chunk. - - -

-Despite the existence of this external _ENV variable and -the translation of global names, -_ENV is a completely regular name. -In particular, -you can define new variables and parameters with that name. -Each reference to a global name uses the _ENV that is -visible at that point in the program, -following the usual visibility rules of Lua (see §3.5). - - -

-Any table used as the value of _ENV is called an environment. - - -

-Lua keeps a distinguished environment called the global environment. -This value is kept at a special index in the C registry (see §4.5). -In Lua, the variable _G is initialized with this same value. - - -

-When Lua compiles a chunk, -it initializes the value of its _ENV upvalue -with the global environment (see load). -Therefore, by default, -global variables in Lua code refer to entries in the global environment. -Moreover, all standard libraries are loaded in the global environment -and several functions there operate on that environment. -You can use load (or loadfile) -to load a chunk with a different environment. -(In C, you have to load the chunk and then change the value -of its first upvalue.) - - -

-If you change the global environment in the registry -(through C code or the debug library), -all chunks loaded after the change will get the new environment. -Previously loaded chunks are not affected, however, -as each has its own reference to the environment in its _ENV variable. -Moreover, the variable _G -(which is stored in the original global environment) -is never updated by Lua. - - - - - -

2.3 – Error Handling

- -

-Because Lua is an embedded extension language, -all Lua actions start from C code in the host program -calling a function from the Lua library (see lua_pcall). -Whenever an error occurs during -the compilation or execution of a Lua chunk, -control returns to the host, -which can take appropriate measures -(such as printing an error message). - - -

-Lua code can explicitly generate an error by calling the -error function. -If you need to catch errors in Lua, -you can use pcall or xpcall -to call a given function in protected mode. - - -

-Whenever there is an error, -an error object (also called an error message) -is propagated with information about the error. -Lua itself only generates errors where the error object is a string, -but programs may generate errors with -any value for the error object. - - -

-When you use xpcall or lua_pcall, -you may give a message handler -to be called in case of errors. -This function is called with the original error message -and returns a new error message. -It is called before the error unwinds the stack, -so that it can gather more information about the error, -for instance by inspecting the stack and creating a stack traceback. -This message handler is still protected by the protected call; -so, an error inside the message handler -will call the message handler again. -If this loop goes on, Lua breaks it and returns an appropriate message. - - - - - -

2.4 – Metatables and Metamethods

- -

-Every value in Lua can have a metatable. -This metatable is an ordinary Lua table -that defines the behavior of the original value -under certain special operations. -You can change several aspects of the behavior -of operations over a value by setting specific fields in its metatable. -For instance, when a non-numeric value is the operand of an addition, -Lua checks for a function in the field "__add" of the value's metatable. -If it finds one, -Lua calls this function to perform the addition. - - -

-The keys in a metatable are derived from the event names; -the corresponding values are called metamethods. -In the previous example, the event is "add" -and the metamethod is the function that performs the addition. - - -

-You can query the metatable of any value -using the getmetatable function. - - -

-You can replace the metatable of tables -using the setmetatable function. -You cannot change the metatable of other types from Lua -(except by using the debug library); -you must use the C API for that. - - -

-Tables and full userdata have individual metatables -(although multiple tables and userdata can share their metatables). -Values of all other types share one single metatable per type; -that is, there is one single metatable for all numbers, -one for all strings, etc. -By default, a value has no metatable, -but the string library sets a metatable for the string type (see §6.4). - - -

-A metatable controls how an object behaves in arithmetic operations, -order comparisons, concatenation, length operation, and indexing. -A metatable also can define a function to be called -when a userdata or a table is garbage collected. -When Lua performs one of these operations over a value, -it checks whether this value has a metatable with the corresponding event. -If so, the value associated with that key (the metamethod) -controls how Lua will perform the operation. - - -

-Metatables control the operations listed next. -Each operation is identified by its corresponding name. -The key for each operation is a string with its name prefixed by -two underscores, '__'; -for instance, the key for operation "add" is the -string "__add". - - -

-The semantics of these operations is better explained by a Lua function -describing how the interpreter executes the operation. -The code shown here in Lua is only illustrative; -the real behavior is hard coded in the interpreter -and it is much more efficient than this simulation. -All functions used in these descriptions -(rawget, tonumber, etc.) -are described in §6.1. -In particular, to retrieve the metamethod of a given object, -we use the expression - -

-     metatable(obj)[event]
-

-This should be read as - -

-     rawget(getmetatable(obj) or {}, event)
-

-This means that the access to a metamethod does not invoke other metamethods, -and access to objects with no metatables does not fail -(it simply results in nil). - - -

-For the unary - and # operators, -the metamethod is called with a dummy second argument. -This extra argument is only to simplify Lua's internals; -it may be removed in future versions and therefore it is not present -in the following code. -(For most uses this extra argument is irrelevant.) - - - -

    - -
  • "add": -the + operation. - - - -

    -The function getbinhandler below defines how Lua chooses a handler -for a binary operation. -First, Lua tries the first operand. -If its type does not define a handler for the operation, -then Lua tries the second operand. - -

    -     function getbinhandler (op1, op2, event)
    -       return metatable(op1)[event] or metatable(op2)[event]
    -     end
    -

    -By using this function, -the behavior of the op1 + op2 is - -

    -     function add_event (op1, op2)
    -       local o1, o2 = tonumber(op1), tonumber(op2)
    -       if o1 and o2 then  -- both operands are numeric?
    -         return o1 + o2   -- '+' here is the primitive 'add'
    -       else  -- at least one of the operands is not numeric
    -         local h = getbinhandler(op1, op2, "__add")
    -         if h then
    -           -- call the handler with both operands
    -           return (h(op1, op2))
    -         else  -- no handler available: default behavior
    -           error(···)
    -         end
    -       end
    -     end
    -

    -

  • - -
  • "sub": -the - operation. - -Behavior similar to the "add" operation. -
  • - -
  • "mul": -the * operation. - -Behavior similar to the "add" operation. -
  • - -
  • "div": -the / operation. - -Behavior similar to the "add" operation. -
  • - -
  • "mod": -the % operation. - -Behavior similar to the "add" operation, -with the operation -o1 - floor(o1/o2)*o2 as the primitive operation. -
  • - -
  • "pow": -the ^ (exponentiation) operation. - -Behavior similar to the "add" operation, -with the function pow (from the C math library) -as the primitive operation. -
  • - -
  • "unm": -the unary - operation. - - -
    -     function unm_event (op)
    -       local o = tonumber(op)
    -       if o then  -- operand is numeric?
    -         return -o  -- '-' here is the primitive 'unm'
    -       else  -- the operand is not numeric.
    -         -- Try to get a handler from the operand
    -         local h = metatable(op).__unm
    -         if h then
    -           -- call the handler with the operand
    -           return (h(op))
    -         else  -- no handler available: default behavior
    -           error(···)
    -         end
    -       end
    -     end
    -

    -

  • - -
  • "concat": -the .. (concatenation) operation. - - -
    -     function concat_event (op1, op2)
    -       if (type(op1) == "string" or type(op1) == "number") and
    -          (type(op2) == "string" or type(op2) == "number") then
    -         return op1 .. op2  -- primitive string concatenation
    -       else
    -         local h = getbinhandler(op1, op2, "__concat")
    -         if h then
    -           return (h(op1, op2))
    -         else
    -           error(···)
    -         end
    -       end
    -     end
    -

    -

  • - -
  • "len": -the # operation. - - -
    -     function len_event (op)
    -       if type(op) == "string" then
    -         return strlen(op)      -- primitive string length
    -       else
    -         local h = metatable(op).__len
    -         if h then
    -           return (h(op))       -- call handler with the operand
    -         elseif type(op) == "table" then
    -           return #op              -- primitive table length
    -         else  -- no handler available: error
    -           error(···)
    -         end
    -       end
    -     end
    -

    -See §3.4.6 for a description of the length of a table. -

  • - -
  • "eq": -the == operation. - -The function getequalhandler defines how Lua chooses a metamethod -for equality. -A metamethod is selected only when both values -being compared have the same type -and the same metamethod for the selected operation, -and the values are either tables or full userdata. - -
    -     function getequalhandler (op1, op2)
    -       if type(op1) ~= type(op2) or
    -          (type(op1) ~= "table" and type(op1) ~= "userdata") then
    -         return nil     -- different values
    -       end
    -       local mm1 = metatable(op1).__eq
    -       local mm2 = metatable(op2).__eq
    -       if mm1 == mm2 then return mm1 else return nil end
    -     end
    -

    -The "eq" event is defined as follows: - -

    -     function eq_event (op1, op2)
    -       if op1 == op2 then   -- primitive equal?
    -         return true   -- values are equal
    -       end
    -       -- try metamethod
    -       local h = getequalhandler(op1, op2)
    -       if h then
    -         return not not h(op1, op2)
    -       else
    -         return false
    -       end
    -     end
    -

    -Note that the result is always a boolean. -

  • - -
  • "lt": -the < operation. - - -
    -     function lt_event (op1, op2)
    -       if type(op1) == "number" and type(op2) == "number" then
    -         return op1 < op2   -- numeric comparison
    -       elseif type(op1) == "string" and type(op2) == "string" then
    -         return op1 < op2   -- lexicographic comparison
    -       else
    -         local h = getbinhandler(op1, op2, "__lt")
    -         if h then
    -           return not not h(op1, op2)
    -         else
    -           error(···)
    -         end
    -       end
    -     end
    -

    -Note that the result is always a boolean. -

  • - -
  • "le": -the <= operation. - - -
    -     function le_event (op1, op2)
    -       if type(op1) == "number" and type(op2) == "number" then
    -         return op1 <= op2   -- numeric comparison
    -       elseif type(op1) == "string" and type(op2) == "string" then
    -         return op1 <= op2   -- lexicographic comparison
    -       else
    -         local h = getbinhandler(op1, op2, "__le")
    -         if h then
    -           return not not h(op1, op2)
    -         else
    -           h = getbinhandler(op1, op2, "__lt")
    -           if h then
    -             return not h(op2, op1)
    -           else
    -             error(···)
    -           end
    -         end
    -       end
    -     end
    -

    -Note that, in the absence of a "le" metamethod, -Lua tries the "lt", assuming that a <= b is -equivalent to not (b < a). - - -

    -As with the other comparison operators, -the result is always a boolean. -

  • - -
  • "index": -The indexing access table[key]. -Note that the metamethod is tried only -when key is not present in table. -(When table is not a table, -no key is ever present, -so the metamethod is always tried.) - - -
    -     function gettable_event (table, key)
    -       local h
    -       if type(table) == "table" then
    -         local v = rawget(table, key)
    -         -- if key is present, return raw value
    -         if v ~= nil then return v end
    -         h = metatable(table).__index
    -         if h == nil then return nil end
    -       else
    -         h = metatable(table).__index
    -         if h == nil then
    -           error(···)
    -         end
    -       end
    -       if type(h) == "function" then
    -         return (h(table, key))     -- call the handler
    -       else return h[key]           -- or repeat operation on it
    -       end
    -     end
    -

    -

  • - -
  • "newindex": -The indexing assignment table[key] = value. -Note that the metamethod is tried only -when key is not present in table. - - -
    -     function settable_event (table, key, value)
    -       local h
    -       if type(table) == "table" then
    -         local v = rawget(table, key)
    -         -- if key is present, do raw assignment
    -         if v ~= nil then rawset(table, key, value); return end
    -         h = metatable(table).__newindex
    -         if h == nil then rawset(table, key, value); return end
    -       else
    -         h = metatable(table).__newindex
    -         if h == nil then
    -           error(···)
    -         end
    -       end
    -       if type(h) == "function" then
    -         h(table, key,value)           -- call the handler
    -       else h[key] = value             -- or repeat operation on it
    -       end
    -     end
    -

    -

  • - -
  • "call": -called when Lua calls a value. - - -
    -     function function_event (func, ...)
    -       if type(func) == "function" then
    -         return func(...)   -- primitive call
    -       else
    -         local h = metatable(func).__call
    -         if h then
    -           return h(func, ...)
    -         else
    -           error(···)
    -         end
    -       end
    -     end
    -

    -

  • - -
- - - - -

2.5 – Garbage Collection

- -

-Lua performs automatic memory management. -This means that -you have to worry neither about allocating memory for new objects -nor about freeing it when the objects are no longer needed. -Lua manages memory automatically by running -a garbage collector to collect all dead objects -(that is, objects that are no longer accessible from Lua). -All memory used by Lua is subject to automatic management: -strings, tables, userdata, functions, threads, internal structures, etc. - - -

-Lua implements an incremental mark-and-sweep collector. -It uses two numbers to control its garbage-collection cycles: -the garbage-collector pause and -the garbage-collector step multiplier. -Both use percentage points as units -(e.g., a value of 100 means an internal value of 1). - - -

-The garbage-collector pause -controls how long the collector waits before starting a new cycle. -Larger values make the collector less aggressive. -Values smaller than 100 mean the collector will not wait to -start a new cycle. -A value of 200 means that the collector waits for the total memory in use -to double before starting a new cycle. - - -

-The garbage-collector step multiplier -controls the relative speed of the collector relative to -memory allocation. -Larger values make the collector more aggressive but also increase -the size of each incremental step. -Values smaller than 100 make the collector too slow and -can result in the collector never finishing a cycle. -The default is 200, -which means that the collector runs at "twice" -the speed of memory allocation. - - -

-If you set the step multiplier to a very large number -(larger than 10% of the maximum number of -bytes that the program may use), -the collector behaves like a stop-the-world collector. -If you then set the pause to 200, -the collector behaves as in old Lua versions, -doing a complete collection every time Lua doubles its -memory usage. - - -

-You can change these numbers by calling lua_gc in C -or collectgarbage in Lua. -You can also use these functions to control -the collector directly (e.g., stop and restart it). - - -

-As an experimental feature in Lua 5.2, -you can change the collector's operation mode -from incremental to generational. -A generational collector assumes that most objects die young, -and therefore it traverses only young (recently created) objects. -This behavior can reduce the time used by the collector, -but also increases memory usage (as old dead objects may accumulate). -To mitigate this second problem, -from time to time the generational collector performs a full collection. -Remember that this is an experimental feature; -you are welcome to try it, -but check your gains. - - - -

2.5.1 – Garbage-Collection Metamethods

- -

-You can set garbage-collector metamethods for tables -and, using the C API, -for full userdata (see §2.4). -These metamethods are also called finalizers. -Finalizers allow you to coordinate Lua's garbage collection -with external resource management -(such as closing files, network or database connections, -or freeing your own memory). - - -

-For an object (table or userdata) to be finalized when collected, -you must mark it for finalization. - -You mark an object for finalization when you set its metatable -and the metatable has a field indexed by the string "__gc". -Note that if you set a metatable without a __gc field -and later create that field in the metatable, -the object will not be marked for finalization. -However, after an object is marked, -you can freely change the __gc field of its metatable. - - -

-When a marked object becomes garbage, -it is not collected immediately by the garbage collector. -Instead, Lua puts it in a list. -After the collection, -Lua does the equivalent of the following function -for each object in that list: - -

-     function gc_event (obj)
-       local h = metatable(obj).__gc
-       if type(h) == "function" then
-         h(obj)
-       end
-     end
-
- -

-At the end of each garbage-collection cycle, -the finalizers for objects are called in -the reverse order that they were marked for collection, -among those collected in that cycle; -that is, the first finalizer to be called is the one associated -with the object marked last in the program. -The execution of each finalizer may occur at any point during -the execution of the regular code. - - -

-Because the object being collected must still be used by the finalizer, -it (and other objects accessible only through it) -must be resurrected by Lua. -Usually, this resurrection is transient, -and the object memory is freed in the next garbage-collection cycle. -However, if the finalizer stores the object in some global place -(e.g., a global variable), -then there is a permanent resurrection. -In any case, -the object memory is freed only when it becomes completely inaccessible; -its finalizer will never be called twice. - - -

-When you close a state (see lua_close), -Lua calls the finalizers of all objects marked for finalization, -following the reverse order that they were marked. -If any finalizer marks new objects for collection during that phase, -these new objects will not be finalized. - - - - - -

2.5.2 – Weak Tables

- -

-A weak table is a table whose elements are -weak references. -A weak reference is ignored by the garbage collector. -In other words, -if the only references to an object are weak references, -then the garbage collector will collect that object. - - -

-A weak table can have weak keys, weak values, or both. -A table with weak keys allows the collection of its keys, -but prevents the collection of its values. -A table with both weak keys and weak values allows the collection of -both keys and values. -In any case, if either the key or the value is collected, -the whole pair is removed from the table. -The weakness of a table is controlled by the -__mode field of its metatable. -If the __mode field is a string containing the character 'k', -the keys in the table are weak. -If __mode contains 'v', -the values in the table are weak. - - -

-A table with weak keys and strong values -is also called an ephemeron table. -In an ephemeron table, -a value is considered reachable only if its key is reachable. -In particular, -if the only reference to a key comes through its value, -the pair is removed. - - -

-Any change in the weakness of a table may take effect only -at the next collect cycle. -In particular, if you change the weakness to a stronger mode, -Lua may still collect some items from that table -before the change takes effect. - - -

-Only objects that have an explicit construction -are removed from weak tables. -Values, such as numbers and light C functions, -are not subject to garbage collection, -and therefore are not removed from weak tables -(unless its associated value is collected). -Although strings are subject to garbage collection, -they do not have an explicit construction, -and therefore are not removed from weak tables. - - -

-Resurrected objects -(that is, objects being finalized -and objects accessible only through objects being finalized) -have a special behavior in weak tables. -They are removed from weak values before running their finalizers, -but are removed from weak keys only in the next collection -after running their finalizers, when such objects are actually freed. -This behavior allows the finalizer to access properties -associated with the object through weak tables. - - -

-If a weak table is among the resurrected objects in a collection cycle, -it may not be properly cleared until the next cycle. - - - - - - - -

2.6 – Coroutines

- -

-Lua supports coroutines, -also called collaborative multithreading. -A coroutine in Lua represents an independent thread of execution. -Unlike threads in multithread systems, however, -a coroutine only suspends its execution by explicitly calling -a yield function. - - -

-You create a coroutine by calling coroutine.create. -Its sole argument is a function -that is the main function of the coroutine. -The create function only creates a new coroutine and -returns a handle to it (an object of type thread); -it does not start the coroutine. - - -

-You execute a coroutine by calling coroutine.resume. -When you first call coroutine.resume, -passing as its first argument -a thread returned by coroutine.create, -the coroutine starts its execution, -at the first line of its main function. -Extra arguments passed to coroutine.resume are passed on -to the coroutine main function. -After the coroutine starts running, -it runs until it terminates or yields. - - -

-A coroutine can terminate its execution in two ways: -normally, when its main function returns -(explicitly or implicitly, after the last instruction); -and abnormally, if there is an unprotected error. -In the first case, coroutine.resume returns true, -plus any values returned by the coroutine main function. -In case of errors, coroutine.resume returns false -plus an error message. - - -

-A coroutine yields by calling coroutine.yield. -When a coroutine yields, -the corresponding coroutine.resume returns immediately, -even if the yield happens inside nested function calls -(that is, not in the main function, -but in a function directly or indirectly called by the main function). -In the case of a yield, coroutine.resume also returns true, -plus any values passed to coroutine.yield. -The next time you resume the same coroutine, -it continues its execution from the point where it yielded, -with the call to coroutine.yield returning any extra -arguments passed to coroutine.resume. - - -

-Like coroutine.create, -the coroutine.wrap function also creates a coroutine, -but instead of returning the coroutine itself, -it returns a function that, when called, resumes the coroutine. -Any arguments passed to this function -go as extra arguments to coroutine.resume. -coroutine.wrap returns all the values returned by coroutine.resume, -except the first one (the boolean error code). -Unlike coroutine.resume, -coroutine.wrap does not catch errors; -any error is propagated to the caller. - - -

-As an example of how coroutines work, -consider the following code: - -

-     function foo (a)
-       print("foo", a)
-       return coroutine.yield(2*a)
-     end
-     
-     co = coroutine.create(function (a,b)
-           print("co-body", a, b)
-           local r = foo(a+1)
-           print("co-body", r)
-           local r, s = coroutine.yield(a+b, a-b)
-           print("co-body", r, s)
-           return b, "end"
-     end)
-     
-     print("main", coroutine.resume(co, 1, 10))
-     print("main", coroutine.resume(co, "r"))
-     print("main", coroutine.resume(co, "x", "y"))
-     print("main", coroutine.resume(co, "x", "y"))
-

-When you run it, it produces the following output: - -

-     co-body 1       10
-     foo     2
-     main    true    4
-     co-body r
-     main    true    11      -9
-     co-body x       y
-     main    true    10      end
-     main    false   cannot resume dead coroutine
-
- -

-You can also create and manipulate coroutines through the C API: -see functions lua_newthread, lua_resume, -and lua_yield. - - - - - -

3 – The Language

- -

-This section describes the lexis, the syntax, and the semantics of Lua. -In other words, -this section describes -which tokens are valid, -how they can be combined, -and what their combinations mean. - - -

-Language constructs will be explained using the usual extended BNF notation, -in which -{a} means 0 or more a's, and -[a] means an optional a. -Non-terminals are shown like non-terminal, -keywords are shown like kword, -and other terminal symbols are shown like ‘=’. -The complete syntax of Lua can be found in §9 -at the end of this manual. - - - -

3.1 – Lexical Conventions

- -

-Lua is a free-form language. -It ignores spaces (including new lines) and comments -between lexical elements (tokens), -except as delimiters between names and keywords. - - -

-Names -(also called identifiers) -in Lua can be any string of letters, -digits, and underscores, -not beginning with a digit. -Identifiers are used to name variables, table fields, and labels. - - -

-The following keywords are reserved -and cannot be used as names: - - -

-     and       break     do        else      elseif    end
-     false     for       function  goto      if        in
-     local     nil       not       or        repeat    return
-     then      true      until     while
-
- -

-Lua is a case-sensitive language: -and is a reserved word, but And and AND -are two different, valid names. -As a convention, names starting with an underscore followed by -uppercase letters (such as _VERSION) -are reserved for variables used by Lua. - - -

-The following strings denote other tokens: - -

-     +     -     *     /     %     ^     #
-     ==    ~=    <=    >=    <     >     =
-     (     )     {     }     [     ]     ::
-     ;     :     ,     .     ..    ...
-
- -

-Literal strings -can be delimited by matching single or double quotes, -and can contain the following C-like escape sequences: -'\a' (bell), -'\b' (backspace), -'\f' (form feed), -'\n' (newline), -'\r' (carriage return), -'\t' (horizontal tab), -'\v' (vertical tab), -'\\' (backslash), -'\"' (quotation mark [double quote]), -and '\'' (apostrophe [single quote]). -A backslash followed by a real newline -results in a newline in the string. -The escape sequence '\z' skips the following span -of white-space characters, -including line breaks; -it is particularly useful to break and indent a long literal string -into multiple lines without adding the newlines and spaces -into the string contents. - - -

-A byte in a literal string can also be specified by its numerical value. -This can be done with the escape sequence \xXX, -where XX is a sequence of exactly two hexadecimal digits, -or with the escape sequence \ddd, -where ddd is a sequence of up to three decimal digits. -(Note that if a decimal escape is to be followed by a digit, -it must be expressed using exactly three digits.) -Strings in Lua can contain any 8-bit value, including embedded zeros, -which can be specified as '\0'. - - -

-Literal strings can also be defined using a long format -enclosed by long brackets. -We define an opening long bracket of level n as an opening -square bracket followed by n equal signs followed by another -opening square bracket. -So, an opening long bracket of level 0 is written as [[, -an opening long bracket of level 1 is written as [=[, -and so on. -A closing long bracket is defined similarly; -for instance, a closing long bracket of level 4 is written as ]====]. -A long literal starts with an opening long bracket of any level and -ends at the first closing long bracket of the same level. -It can contain any text except a closing bracket of the proper level. -Literals in this bracketed form can run for several lines, -do not interpret any escape sequences, -and ignore long brackets of any other level. -Any kind of end-of-line sequence -(carriage return, newline, carriage return followed by newline, -or newline followed by carriage return) -is converted to a simple newline. - - -

-Any byte in a literal string not -explicitly affected by the previous rules represents itself. -However, Lua opens files for parsing in text mode, -and the system file functions may have problems with -some control characters. -So, it is safer to represent -non-text data as a quoted literal with -explicit escape sequences for non-text characters. - - -

-For convenience, -when the opening long bracket is immediately followed by a newline, -the newline is not included in the string. -As an example, in a system using ASCII -(in which 'a' is coded as 97, -newline is coded as 10, and '1' is coded as 49), -the five literal strings below denote the same string: - -

-     a = 'alo\n123"'
-     a = "alo\n123\""
-     a = '\97lo\10\04923"'
-     a = [[alo
-     123"]]
-     a = [==[
-     alo
-     123"]==]
-
- -

-A numerical constant can be written with an optional fractional part -and an optional decimal exponent, -marked by a letter 'e' or 'E'. -Lua also accepts hexadecimal constants, -which start with 0x or 0X. -Hexadecimal constants also accept an optional fractional part -plus an optional binary exponent, -marked by a letter 'p' or 'P'. -Examples of valid numerical constants are - -

-     3     3.0     3.1416     314.16e-2     0.31416E1
-     0xff  0x0.1E  0xA23p-4   0X1.921FB54442D18P+1
-
- -

-A comment starts with a double hyphen (--) -anywhere outside a string. -If the text immediately after -- is not an opening long bracket, -the comment is a short comment, -which runs until the end of the line. -Otherwise, it is a long comment, -which runs until the corresponding closing long bracket. -Long comments are frequently used to disable code temporarily. - - - - - -

3.2 – Variables

- -

-Variables are places that store values. -There are three kinds of variables in Lua: -global variables, local variables, and table fields. - - -

-A single name can denote a global variable or a local variable -(or a function's formal parameter, -which is a particular kind of local variable): - -

-	var ::= Name
-

-Name denotes identifiers, as defined in §3.1. - - -

-Any variable name is assumed to be global unless explicitly declared -as a local (see §3.3.7). -Local variables are lexically scoped: -local variables can be freely accessed by functions -defined inside their scope (see §3.5). - - -

-Before the first assignment to a variable, its value is nil. - - -

-Square brackets are used to index a table: - -

-	var ::= prefixexp ‘[’ exp ‘]’
-

-The meaning of accesses to table fields can be changed via metatables. -An access to an indexed variable t[i] is equivalent to -a call gettable_event(t,i). -(See §2.4 for a complete description of the -gettable_event function. -This function is not defined or callable in Lua. -We use it here only for explanatory purposes.) - - -

-The syntax var.Name is just syntactic sugar for -var["Name"]: - -

-	var ::= prefixexp ‘.’ Name
-
- -

-An access to a global variable x -is equivalent to _ENV.x. -Due to the way that chunks are compiled, -_ENV is never a global name (see §2.2). - - - - - -

3.3 – Statements

- -

-Lua supports an almost conventional set of statements, -similar to those in Pascal or C. -This set includes -assignments, control structures, function calls, -and variable declarations. - - - -

3.3.1 – Blocks

- -

-A block is a list of statements, -which are executed sequentially: - -

-	block ::= {stat}
-

-Lua has empty statements -that allow you to separate statements with semicolons, -start a block with a semicolon -or write two semicolons in sequence: - -

-	stat ::= ‘;’
-
- -

-Function calls and assignments -can start with an open parenthesis. -This possibility leads to an ambiguity in Lua's grammar. -Consider the following fragment: - -

-     a = b + c
-     (print or io.write)('done')
-

-The grammar could see it in two ways: - -

-     a = b + c(print or io.write)('done')
-     
-     a = b + c; (print or io.write)('done')
-

-The current parser always sees such constructions -in the first way, -interpreting the open parenthesis -as the start of the arguments to a call. -To avoid this ambiguity, -it is a good practice to always precede with a semicolon -statements that start with a parenthesis: - -

-     ;(print or io.write)('done')
-
- -

-A block can be explicitly delimited to produce a single statement: - -

-	stat ::= do block end
-

-Explicit blocks are useful -to control the scope of variable declarations. -Explicit blocks are also sometimes used to -add a return statement in the middle -of another block (see §3.3.4). - - - - - -

3.3.2 – Chunks

- -

-The unit of compilation of Lua is called a chunk. -Syntactically, -a chunk is simply a block: - -

-	chunk ::= block
-
- -

-Lua handles a chunk as the body of an anonymous function -with a variable number of arguments -(see §3.4.10). -As such, chunks can define local variables, -receive arguments, and return values. -Moreover, such anonymous function is compiled as in the -scope of an external local variable called _ENV (see §2.2). -The resulting function always has _ENV as its only upvalue, -even if it does not use that variable. - - -

-A chunk can be stored in a file or in a string inside the host program. -To execute a chunk, -Lua first precompiles the chunk into instructions for a virtual machine, -and then it executes the compiled code -with an interpreter for the virtual machine. - - -

-Chunks can also be precompiled into binary form; -see program luac for details. -Programs in source and compiled forms are interchangeable; -Lua automatically detects the file type and acts accordingly. - - - - - - -

3.3.3 – Assignment

- -

-Lua allows multiple assignments. -Therefore, the syntax for assignment -defines a list of variables on the left side -and a list of expressions on the right side. -The elements in both lists are separated by commas: - -

-	stat ::= varlist ‘=’ explist
-	varlist ::= var {‘,’ var}
-	explist ::= exp {‘,’ exp}
-

-Expressions are discussed in §3.4. - - -

-Before the assignment, -the list of values is adjusted to the length of -the list of variables. -If there are more values than needed, -the excess values are thrown away. -If there are fewer values than needed, -the list is extended with as many nil's as needed. -If the list of expressions ends with a function call, -then all values returned by that call enter the list of values, -before the adjustment -(except when the call is enclosed in parentheses; see §3.4). - - -

-The assignment statement first evaluates all its expressions -and only then are the assignments performed. -Thus the code - -

-     i = 3
-     i, a[i] = i+1, 20
-

-sets a[3] to 20, without affecting a[4] -because the i in a[i] is evaluated (to 3) -before it is assigned 4. -Similarly, the line - -

-     x, y = y, x
-

-exchanges the values of x and y, -and - -

-     x, y, z = y, z, x
-

-cyclically permutes the values of x, y, and z. - - -

-The meaning of assignments to global variables -and table fields can be changed via metatables. -An assignment to an indexed variable t[i] = val is equivalent to -settable_event(t,i,val). -(See §2.4 for a complete description of the -settable_event function. -This function is not defined or callable in Lua. -We use it here only for explanatory purposes.) - - -

-An assignment to a global variable x = val -is equivalent to the assignment -_ENV.x = val (see §2.2). - - - - - -

3.3.4 – Control Structures

-The control structures -if, while, and repeat have the usual meaning and -familiar syntax: - - - - -

-	stat ::= while exp do block end
-	stat ::= repeat block until exp
-	stat ::= if exp then block {elseif exp then block} [else block] end
-

-Lua also has a for statement, in two flavors (see §3.3.5). - - -

-The condition expression of a -control structure can return any value. -Both false and nil are considered false. -All values different from nil and false are considered true -(in particular, the number 0 and the empty string are also true). - - -

-In the repeat–until loop, -the inner block does not end at the until keyword, -but only after the condition. -So, the condition can refer to local variables -declared inside the loop block. - - -

-The goto statement transfers the program control to a label. -For syntactical reasons, -labels in Lua are considered statements too: - - - -

-	stat ::= goto Name
-	stat ::= label
-	label ::= ‘::’ Name ‘::’
-
- -

-A label is visible in the entire block where it is defined, -except -inside nested blocks where a label with the same name is defined and -inside nested functions. -A goto may jump to any visible label as long as it does not -enter into the scope of a local variable. - - -

-Labels and empty statements are called void statements, -as they perform no actions. - - -

-The break statement terminates the execution of a -while, repeat, or for loop, -skipping to the next statement after the loop: - - -

-	stat ::= break
-

-A break ends the innermost enclosing loop. - - -

-The return statement is used to return values -from a function or a chunk (which is a function in disguise). - -Functions can return more than one value, -so the syntax for the return statement is - -

-	stat ::= return [explist] [‘;’]
-
- -

-The return statement can only be written -as the last statement of a block. -If it is really necessary to return in the middle of a block, -then an explicit inner block can be used, -as in the idiom do return end, -because now return is the last statement in its (inner) block. - - - - - -

3.3.5 – For Statement

- -

- -The for statement has two forms: -one numeric and one generic. - - -

-The numeric for loop repeats a block of code while a -control variable runs through an arithmetic progression. -It has the following syntax: - -

-	stat ::= for Name ‘=’ exp ‘,’ exp [‘,’ exp] do block end
-

-The block is repeated for name starting at the value of -the first exp, until it passes the second exp by steps of the -third exp. -More precisely, a for statement like - -

-     for v = e1, e2, e3 do block end
-

-is equivalent to the code: - -

-     do
-       local var, limit, step = tonumber(e1), tonumber(e2), tonumber(e3)
-       if not (var and limit and step) then error() end
-       while (step > 0 and var <= limit) or (step <= 0 and var >= limit) do
-         local v = var
-         block
-         var = var + step
-       end
-     end
-

-Note the following: - -

    - -
  • -All three control expressions are evaluated only once, -before the loop starts. -They must all result in numbers. -
  • - -
  • -var, limit, and step are invisible variables. -The names shown here are for explanatory purposes only. -
  • - -
  • -If the third expression (the step) is absent, -then a step of 1 is used. -
  • - -
  • -You can use break to exit a for loop. -
  • - -
  • -The loop variable v is local to the loop; -you cannot use its value after the for ends or is broken. -If you need this value, -assign it to another variable before breaking or exiting the loop. -
  • - -
- -

-The generic for statement works over functions, -called iterators. -On each iteration, the iterator function is called to produce a new value, -stopping when this new value is nil. -The generic for loop has the following syntax: - -

-	stat ::= for namelist in explist do block end
-	namelist ::= Name {‘,’ Name}
-

-A for statement like - -

-     for var_1, ···, var_n in explist do block end
-

-is equivalent to the code: - -

-     do
-       local f, s, var = explist
-       while true do
-         local var_1, ···, var_n = f(s, var)
-         if var_1 == nil then break end
-         var = var_1
-         block
-       end
-     end
-

-Note the following: - -

    - -
  • -explist is evaluated only once. -Its results are an iterator function, -a state, -and an initial value for the first iterator variable. -
  • - -
  • -f, s, and var are invisible variables. -The names are here for explanatory purposes only. -
  • - -
  • -You can use break to exit a for loop. -
  • - -
  • -The loop variables var_i are local to the loop; -you cannot use their values after the for ends. -If you need these values, -then assign them to other variables before breaking or exiting the loop. -
  • - -
- - - - -

3.3.6 – Function Calls as Statements

-To allow possible side-effects, -function calls can be executed as statements: - -

-	stat ::= functioncall
-

-In this case, all returned values are thrown away. -Function calls are explained in §3.4.9. - - - - - -

3.3.7 – Local Declarations

-Local variables can be declared anywhere inside a block. -The declaration can include an initial assignment: - -

-	stat ::= local namelist [‘=’ explist]
-

-If present, an initial assignment has the same semantics -of a multiple assignment (see §3.3.3). -Otherwise, all variables are initialized with nil. - - -

-A chunk is also a block (see §3.3.2), -and so local variables can be declared in a chunk outside any explicit block. - - -

-The visibility rules for local variables are explained in §3.5. - - - - - - - -

3.4 – Expressions

- -

-The basic expressions in Lua are the following: - -

-	exp ::= prefixexp
-	exp ::= nil | false | true
-	exp ::= Number
-	exp ::= String
-	exp ::= functiondef
-	exp ::= tableconstructor
-	exp ::= ‘...’
-	exp ::= exp binop exp
-	exp ::= unop exp
-	prefixexp ::= var | functioncall | ‘(’ exp ‘)’
-
- -

-Numbers and literal strings are explained in §3.1; -variables are explained in §3.2; -function definitions are explained in §3.4.10; -function calls are explained in §3.4.9; -table constructors are explained in §3.4.8. -Vararg expressions, -denoted by three dots ('...'), can only be used when -directly inside a vararg function; -they are explained in §3.4.10. - - -

-Binary operators comprise arithmetic operators (see §3.4.1), -relational operators (see §3.4.3), logical operators (see §3.4.4), -and the concatenation operator (see §3.4.5). -Unary operators comprise the unary minus (see §3.4.1), -the unary not (see §3.4.4), -and the unary length operator (see §3.4.6). - - -

-Both function calls and vararg expressions can result in multiple values. -If a function call is used as a statement (see §3.3.6), -then its return list is adjusted to zero elements, -thus discarding all returned values. -If an expression is used as the last (or the only) element -of a list of expressions, -then no adjustment is made -(unless the expression is enclosed in parentheses). -In all other contexts, -Lua adjusts the result list to one element, -either discarding all values except the first one -or adding a single nil if there are no values. - - -

-Here are some examples: - -

-     f()                -- adjusted to 0 results
-     g(f(), x)          -- f() is adjusted to 1 result
-     g(x, f())          -- g gets x plus all results from f()
-     a,b,c = f(), x     -- f() is adjusted to 1 result (c gets nil)
-     a,b = ...          -- a gets the first vararg parameter, b gets
-                        -- the second (both a and b can get nil if there
-                        -- is no corresponding vararg parameter)
-     
-     a,b,c = x, f()     -- f() is adjusted to 2 results
-     a,b,c = f()        -- f() is adjusted to 3 results
-     return f()         -- returns all results from f()
-     return ...         -- returns all received vararg parameters
-     return x,y,f()     -- returns x, y, and all results from f()
-     {f()}              -- creates a list with all results from f()
-     {...}              -- creates a list with all vararg parameters
-     {f(), nil}         -- f() is adjusted to 1 result
-
- -

-Any expression enclosed in parentheses always results in only one value. -Thus, -(f(x,y,z)) is always a single value, -even if f returns several values. -(The value of (f(x,y,z)) is the first value returned by f -or nil if f does not return any values.) - - - -

3.4.1 – Arithmetic Operators

-Lua supports the usual arithmetic operators: -the binary + (addition), -- (subtraction), * (multiplication), -/ (division), % (modulo), and ^ (exponentiation); -and unary - (mathematical negation). -If the operands are numbers, or strings that can be converted to -numbers (see §3.4.2), -then all operations have the usual meaning. -Exponentiation works for any exponent. -For instance, x^(-0.5) computes the inverse of the square root of x. -Modulo is defined as - -

-     a % b == a - math.floor(a/b)*b
-

-That is, it is the remainder of a division that rounds -the quotient towards minus infinity. - - - - - -

3.4.2 – Coercion

- -

-Lua provides automatic conversion between -string and number values at run time. -Any arithmetic operation applied to a string tries to convert -this string to a number, following the rules of the Lua lexer. -(The string may have leading and trailing spaces and a sign.) -Conversely, whenever a number is used where a string is expected, -the number is converted to a string, in a reasonable format. -For complete control over how numbers are converted to strings, -use the format function from the string library -(see string.format). - - - - - -

3.4.3 – Relational Operators

-The relational operators in Lua are - -

-     ==    ~=    <     >     <=    >=
-

-These operators always result in false or true. - - -

-Equality (==) first compares the type of its operands. -If the types are different, then the result is false. -Otherwise, the values of the operands are compared. -Numbers and strings are compared in the usual way. -Tables, userdata, and threads -are compared by reference: -two objects are considered equal only if they are the same object. -Every time you create a new object -(a table, userdata, or thread), -this new object is different from any previously existing object. -Closures with the same reference are always equal. -Closures with any detectable difference -(different behavior, different definition) are always different. - - -

-You can change the way that Lua compares tables and userdata -by using the "eq" metamethod (see §2.4). - - -

-The conversion rules of §3.4.2 -do not apply to equality comparisons. -Thus, "0"==0 evaluates to false, -and t[0] and t["0"] denote different -entries in a table. - - -

-The operator ~= is exactly the negation of equality (==). - - -

-The order operators work as follows. -If both arguments are numbers, then they are compared as such. -Otherwise, if both arguments are strings, -then their values are compared according to the current locale. -Otherwise, Lua tries to call the "lt" or the "le" -metamethod (see §2.4). -A comparison a > b is translated to b < a -and a >= b is translated to b <= a. - - - - - -

3.4.4 – Logical Operators

-The logical operators in Lua are -and, or, and not. -Like the control structures (see §3.3.4), -all logical operators consider both false and nil as false -and anything else as true. - - -

-The negation operator not always returns false or true. -The conjunction operator and returns its first argument -if this value is false or nil; -otherwise, and returns its second argument. -The disjunction operator or returns its first argument -if this value is different from nil and false; -otherwise, or returns its second argument. -Both and and or use short-cut evaluation; -that is, -the second operand is evaluated only if necessary. -Here are some examples: - -

-     10 or 20            --> 10
-     10 or error()       --> 10
-     nil or "a"          --> "a"
-     nil and 10          --> nil
-     false and error()   --> false
-     false and nil       --> false
-     false or nil        --> nil
-     10 and 20           --> 20
-

-(In this manual, ---> indicates the result of the preceding expression.) - - - - - -

3.4.5 – Concatenation

-The string concatenation operator in Lua is -denoted by two dots ('..'). -If both operands are strings or numbers, then they are converted to -strings according to the rules mentioned in §3.4.2. -Otherwise, the __concat metamethod is called (see §2.4). - - - - - -

3.4.6 – The Length Operator

- -

-The length operator is denoted by the unary prefix operator #. -The length of a string is its number of bytes -(that is, the usual meaning of string length when each -character is one byte). - - -

-A program can modify the behavior of the length operator for -any value but strings through the __len metamethod (see §2.4). - - -

-Unless a __len metamethod is given, -the length of a table t is only defined if the -table is a sequence, -that is, -the set of its positive numeric keys is equal to {1..n} -for some integer n. -In that case, n is its length. -Note that a table like - -

-     {10, 20, nil, 40}
-

-is not a sequence, because it has the key 4 -but does not have the key 3. -(So, there is no n such that the set {1..n} is equal -to the set of positive numeric keys of that table.) -Note, however, that non-numeric keys do not interfere -with whether a table is a sequence. - - - - - -

3.4.7 – Precedence

-Operator precedence in Lua follows the table below, -from lower to higher priority: - -

-     or
-     and
-     <     >     <=    >=    ~=    ==
-     ..
-     +     -
-     *     /     %
-     not   #     - (unary)
-     ^
-

-As usual, -you can use parentheses to change the precedences of an expression. -The concatenation ('..') and exponentiation ('^') -operators are right associative. -All other binary operators are left associative. - - - - - -

3.4.8 – Table Constructors

-Table constructors are expressions that create tables. -Every time a constructor is evaluated, a new table is created. -A constructor can be used to create an empty table -or to create a table and initialize some of its fields. -The general syntax for constructors is - -

-	tableconstructor ::= ‘{’ [fieldlist] ‘}’
-	fieldlist ::= field {fieldsep field} [fieldsep]
-	field ::= ‘[’ exp ‘]’ ‘=’ exp | Name ‘=’ exp | exp
-	fieldsep ::= ‘,’ | ‘;’
-
- -

-Each field of the form [exp1] = exp2 adds to the new table an entry -with key exp1 and value exp2. -A field of the form name = exp is equivalent to -["name"] = exp. -Finally, fields of the form exp are equivalent to -[i] = exp, where i are consecutive numerical integers, -starting with 1. -Fields in the other formats do not affect this counting. -For example, - -

-     a = { [f(1)] = g; "x", "y"; x = 1, f(x), [30] = 23; 45 }
-

-is equivalent to - -

-     do
-       local t = {}
-       t[f(1)] = g
-       t[1] = "x"         -- 1st exp
-       t[2] = "y"         -- 2nd exp
-       t.x = 1            -- t["x"] = 1
-       t[3] = f(x)        -- 3rd exp
-       t[30] = 23
-       t[4] = 45          -- 4th exp
-       a = t
-     end
-
- -

-If the last field in the list has the form exp -and the expression is a function call or a vararg expression, -then all values returned by this expression enter the list consecutively -(see §3.4.9). - - -

-The field list can have an optional trailing separator, -as a convenience for machine-generated code. - - - - - -

3.4.9 – Function Calls

-A function call in Lua has the following syntax: - -

-	functioncall ::= prefixexp args
-

-In a function call, -first prefixexp and args are evaluated. -If the value of prefixexp has type function, -then this function is called -with the given arguments. -Otherwise, the prefixexp "call" metamethod is called, -having as first parameter the value of prefixexp, -followed by the original call arguments -(see §2.4). - - -

-The form - -

-	functioncall ::= prefixexp ‘:’ Name args
-

-can be used to call "methods". -A call v:name(args) -is syntactic sugar for v.name(v,args), -except that v is evaluated only once. - - -

-Arguments have the following syntax: - -

-	args ::= ‘(’ [explist] ‘)’
-	args ::= tableconstructor
-	args ::= String
-

-All argument expressions are evaluated before the call. -A call of the form f{fields} is -syntactic sugar for f({fields}); -that is, the argument list is a single new table. -A call of the form f'string' -(or f"string" or f[[string]]) -is syntactic sugar for f('string'); -that is, the argument list is a single literal string. - - -

-A call of the form return functioncall is called -a tail call. -Lua implements proper tail calls -(or proper tail recursion): -in a tail call, -the called function reuses the stack entry of the calling function. -Therefore, there is no limit on the number of nested tail calls that -a program can execute. -However, a tail call erases any debug information about the -calling function. -Note that a tail call only happens with a particular syntax, -where the return has one single function call as argument; -this syntax makes the calling function return exactly -the returns of the called function. -So, none of the following examples are tail calls: - -

-     return (f(x))        -- results adjusted to 1
-     return 2 * f(x)
-     return x, f(x)       -- additional results
-     f(x); return         -- results discarded
-     return x or f(x)     -- results adjusted to 1
-
- - - - -

3.4.10 – Function Definitions

- -

-The syntax for function definition is - -

-	functiondef ::= function funcbody
-	funcbody ::= ‘(’ [parlist] ‘)’ block end
-
- -

-The following syntactic sugar simplifies function definitions: - -

-	stat ::= function funcname funcbody
-	stat ::= local function Name funcbody
-	funcname ::= Name {‘.’ Name} [‘:’ Name]
-

-The statement - -

-     function f () body end
-

-translates to - -

-     f = function () body end
-

-The statement - -

-     function t.a.b.c.f () body end
-

-translates to - -

-     t.a.b.c.f = function () body end
-

-The statement - -

-     local function f () body end
-

-translates to - -

-     local f; f = function () body end
-

-not to - -

-     local f = function () body end
-

-(This only makes a difference when the body of the function -contains references to f.) - - -

-A function definition is an executable expression, -whose value has type function. -When Lua precompiles a chunk, -all its function bodies are precompiled too. -Then, whenever Lua executes the function definition, -the function is instantiated (or closed). -This function instance (or closure) -is the final value of the expression. - - -

-Parameters act as local variables that are -initialized with the argument values: - -

-	parlist ::= namelist [‘,’ ‘...’] | ‘...’
-

-When a function is called, -the list of arguments is adjusted to -the length of the list of parameters, -unless the function is a vararg function, -which is indicated by three dots ('...') -at the end of its parameter list. -A vararg function does not adjust its argument list; -instead, it collects all extra arguments and supplies them -to the function through a vararg expression, -which is also written as three dots. -The value of this expression is a list of all actual extra arguments, -similar to a function with multiple results. -If a vararg expression is used inside another expression -or in the middle of a list of expressions, -then its return list is adjusted to one element. -If the expression is used as the last element of a list of expressions, -then no adjustment is made -(unless that last expression is enclosed in parentheses). - - -

-As an example, consider the following definitions: - -

-     function f(a, b) end
-     function g(a, b, ...) end
-     function r() return 1,2,3 end
-

-Then, we have the following mapping from arguments to parameters and -to the vararg expression: - -

-     CALL            PARAMETERS
-     
-     f(3)             a=3, b=nil
-     f(3, 4)          a=3, b=4
-     f(3, 4, 5)       a=3, b=4
-     f(r(), 10)       a=1, b=10
-     f(r())           a=1, b=2
-     
-     g(3)             a=3, b=nil, ... -->  (nothing)
-     g(3, 4)          a=3, b=4,   ... -->  (nothing)
-     g(3, 4, 5, 8)    a=3, b=4,   ... -->  5  8
-     g(5, r())        a=5, b=1,   ... -->  2  3
-
- -

-Results are returned using the return statement (see §3.3.4). -If control reaches the end of a function -without encountering a return statement, -then the function returns with no results. - - -

- -There is a system-dependent limit on the number of values -that a function may return. -This limit is guaranteed to be larger than 1000. - - -

-The colon syntax -is used for defining methods, -that is, functions that have an implicit extra parameter self. -Thus, the statement - -

-     function t.a.b.c:f (params) body end
-

-is syntactic sugar for - -

-     t.a.b.c.f = function (self, params) body end
-
- - - - - - -

3.5 – Visibility Rules

- -

- -Lua is a lexically scoped language. -The scope of a local variable begins at the first statement after -its declaration and lasts until the last non-void statement -of the innermost block that includes the declaration. -Consider the following example: - -

-     x = 10                -- global variable
-     do                    -- new block
-       local x = x         -- new 'x', with value 10
-       print(x)            --> 10
-       x = x+1
-       do                  -- another block
-         local x = x+1     -- another 'x'
-         print(x)          --> 12
-       end
-       print(x)            --> 11
-     end
-     print(x)              --> 10  (the global one)
-
- -

-Notice that, in a declaration like local x = x, -the new x being declared is not in scope yet, -and so the second x refers to the outside variable. - - -

-Because of the lexical scoping rules, -local variables can be freely accessed by functions -defined inside their scope. -A local variable used by an inner function is called -an upvalue, or external local variable, -inside the inner function. - - -

-Notice that each execution of a local statement -defines new local variables. -Consider the following example: - -

-     a = {}
-     local x = 20
-     for i=1,10 do
-       local y = 0
-       a[i] = function () y=y+1; return x+y end
-     end
-

-The loop creates ten closures -(that is, ten instances of the anonymous function). -Each of these closures uses a different y variable, -while all of them share the same x. - - - - - -

4 – The Application Program Interface

- -

- -This section describes the C API for Lua, that is, -the set of C functions available to the host program to communicate -with Lua. -All API functions and related types and constants -are declared in the header file lua.h. - - -

-Even when we use the term "function", -any facility in the API may be provided as a macro instead. -Except where stated otherwise, -all such macros use each of their arguments exactly once -(except for the first argument, which is always a Lua state), -and so do not generate any hidden side-effects. - - -

-As in most C libraries, -the Lua API functions do not check their arguments for validity or consistency. -However, you can change this behavior by compiling Lua -with the macro LUA_USE_APICHECK defined. - - - -

4.1 – The Stack

- -

-Lua uses a virtual stack to pass values to and from C. -Each element in this stack represents a Lua value -(nil, number, string, etc.). - - -

-Whenever Lua calls C, the called function gets a new stack, -which is independent of previous stacks and of stacks of -C functions that are still active. -This stack initially contains any arguments to the C function -and it is where the C function pushes its results -to be returned to the caller (see lua_CFunction). - - -

-For convenience, -most query operations in the API do not follow a strict stack discipline. -Instead, they can refer to any element in the stack -by using an index: -A positive index represents an absolute stack position -(starting at 1); -a negative index represents an offset relative to the top of the stack. -More specifically, if the stack has n elements, -then index 1 represents the first element -(that is, the element that was pushed onto the stack first) -and -index n represents the last element; -index -1 also represents the last element -(that is, the element at the top) -and index -n represents the first element. - - - - - -

4.2 – Stack Size

- -

-When you interact with the Lua API, -you are responsible for ensuring consistency. -In particular, -you are responsible for controlling stack overflow. -You can use the function lua_checkstack -to ensure that the stack has extra slots when pushing new elements. - - -

-Whenever Lua calls C, -it ensures that the stack has at least LUA_MINSTACK extra slots. -LUA_MINSTACK is defined as 20, -so that usually you do not have to worry about stack space -unless your code has loops pushing elements onto the stack. - - -

-When you call a Lua function -without a fixed number of results (see lua_call), -Lua ensures that the stack has enough size for all results, -but it does not ensure any extra space. -So, before pushing anything in the stack after such a call -you should use lua_checkstack. - - - - - -

4.3 – Valid and Acceptable Indices

- -

-Any function in the API that receives stack indices -works only with valid indices or acceptable indices. - - -

-A valid index is an index that refers to a -real position within the stack, that is, -its position lies between 1 and the stack top -(1 ≤ abs(index) ≤ top). - -Usually, functions that can modify the value at an index -require valid indices. - - -

-Unless otherwise noted, -any function that accepts valid indices also accepts pseudo-indices, -which represent some Lua values that are accessible to C code -but which are not in the stack. -Pseudo-indices are used to access the registry -and the upvalues of a C function (see §4.4). - - -

-Functions that do not need a specific stack position, -but only a value in the stack (e.g., query functions), -can be called with acceptable indices. -An acceptable index can be any valid index, -including the pseudo-indices, -but it also can be any positive index after the stack top -within the space allocated for the stack, -that is, indices up to the stack size. -(Note that 0 is never an acceptable index.) -Except when noted otherwise, -functions in the API work with acceptable indices. - - -

-Acceptable indices serve to avoid extra tests -against the stack top when querying the stack. -For instance, a C function can query its third argument -without the need to first check whether there is a third argument, -that is, without the need to check whether 3 is a valid index. - - -

-For functions that can be called with acceptable indices, -any non-valid index is treated as if it -contains a value of a virtual type LUA_TNONE, -which behaves like a nil value. - - - - - -

4.4 – C Closures

- -

-When a C function is created, -it is possible to associate some values with it, -thus creating a C closure -(see lua_pushcclosure); -these values are called upvalues and are -accessible to the function whenever it is called. - - -

-Whenever a C function is called, -its upvalues are located at specific pseudo-indices. -These pseudo-indices are produced by the macro -lua_upvalueindex. -The first value associated with a function is at position -lua_upvalueindex(1), and so on. -Any access to lua_upvalueindex(n), -where n is greater than the number of upvalues of the -current function (but not greater than 256), -produces an acceptable but invalid index. - - - - - -

4.5 – Registry

- -

-Lua provides a registry, -a predefined table that can be used by any C code to -store whatever Lua values it needs to store. -The registry table is always located at pseudo-index -LUA_REGISTRYINDEX, -which is a valid index. -Any C library can store data into this table, -but it should take care to choose keys -that are different from those used -by other libraries, to avoid collisions. -Typically, you should use as key a string containing your library name, -or a light userdata with the address of a C object in your code, -or any Lua object created by your code. -As with global names, -string keys starting with an underscore followed by -uppercase letters are reserved for Lua. - - -

-The integer keys in the registry are used by the reference mechanism, -implemented by the auxiliary library, -and by some predefined values. -Therefore, integer keys should not be used for other purposes. - - -

-When you create a new Lua state, -its registry comes with some predefined values. -These predefined values are indexed with integer keys -defined as constants in lua.h. -The following constants are defined: - -

    -
  • LUA_RIDX_MAINTHREAD: At this index the registry has -the main thread of the state. -(The main thread is the one created together with the state.) -
  • - -
  • LUA_RIDX_GLOBALS: At this index the registry has -the global environment. -
  • -
- - - - -

4.6 – Error Handling in C

- -

-Internally, Lua uses the C longjmp facility to handle errors. -(You can also choose to use exceptions if you compile Lua as C++; -search for LUAI_THROW in the source code.) -When Lua faces any error -(such as a memory allocation error, type errors, syntax errors, -and runtime errors) -it raises an error; -that is, it does a long jump. -A protected environment uses setjmp -to set a recovery point; -any error jumps to the most recent active recovery point. - - -

-If an error happens outside any protected environment, -Lua calls a panic function (see lua_atpanic) -and then calls abort, -thus exiting the host application. -Your panic function can avoid this exit by -never returning -(e.g., doing a long jump to your own recovery point outside Lua). - - -

-The panic function runs as if it were a message handler (see §2.3); -in particular, the error message is at the top of the stack. -However, there is no guarantees about stack space. -To push anything on the stack, -the panic function should first check the available space (see §4.2). - - -

-Most functions in the API can throw an error, -for instance due to a memory allocation error. -The documentation for each function indicates whether -it can throw errors. - - -

-Inside a C function you can throw an error by calling lua_error. - - - - - -

4.7 – Handling Yields in C

- -

-Internally, Lua uses the C longjmp facility to yield a coroutine. -Therefore, if a function foo calls an API function -and this API function yields -(directly or indirectly by calling another function that yields), -Lua cannot return to foo any more, -because the longjmp removes its frame from the C stack. - - -

-To avoid this kind of problem, -Lua raises an error whenever it tries to yield across an API call, -except for three functions: -lua_yieldk, lua_callk, and lua_pcallk. -All those functions receive a continuation function -(as a parameter called k) to continue execution after a yield. - - -

-We need to set some terminology to explain continuations. -We have a C function called from Lua which we will call -the original function. -This original function then calls one of those three functions in the C API, -which we will call the callee function, -that then yields the current thread. -(This can happen when the callee function is lua_yieldk, -or when the callee function is either lua_callk or lua_pcallk -and the function called by them yields.) - - -

-Suppose the running thread yields while executing the callee function. -After the thread resumes, -it eventually will finish running the callee function. -However, -the callee function cannot return to the original function, -because its frame in the C stack was destroyed by the yield. -Instead, Lua calls a continuation function, -which was given as an argument to the callee function. -As the name implies, -the continuation function should continue the task -of the original function. - - -

-Lua treats the continuation function as if it were the original function. -The continuation function receives the same Lua stack -from the original function, -in the same state it would be if the callee function had returned. -(For instance, -after a lua_callk the function and its arguments are -removed from the stack and replaced by the results from the call.) -It also has the same upvalues. -Whatever it returns is handled by Lua as if it were the return -of the original function. - - -

-The only difference in the Lua state between the original function -and its continuation is the result of a call to lua_getctx. - - - - - -

4.8 – Functions and Types

- -

-Here we list all functions and types from the C API in -alphabetical order. -Each function has an indicator like this: -[-o, +p, x] - - -

-The first field, o, -is how many elements the function pops from the stack. -The second field, p, -is how many elements the function pushes onto the stack. -(Any function always pushes its results after popping its arguments.) -A field in the form x|y means the function can push (or pop) -x or y elements, -depending on the situation; -an interrogation mark '?' means that -we cannot know how many elements the function pops/pushes -by looking only at its arguments -(e.g., they may depend on what is on the stack). -The third field, x, -tells whether the function may throw errors: -'-' means the function never throws any error; -'e' means the function may throw errors; -'v' means the function may throw an error on purpose. - - - -


lua_absindex

-[-0, +0, –] -

int lua_absindex (lua_State *L, int idx);
- -

-Converts the acceptable index idx into an absolute index -(that is, one that does not depend on the stack top). - - - - - -


lua_Alloc

-
typedef void * (*lua_Alloc) (void *ud,
-                             void *ptr,
-                             size_t osize,
-                             size_t nsize);
- -

-The type of the memory-allocation function used by Lua states. -The allocator function must provide a -functionality similar to realloc, -but not exactly the same. -Its arguments are -ud, an opaque pointer passed to lua_newstate; -ptr, a pointer to the block being allocated/reallocated/freed; -osize, the original size of the block or some code about what -is being allocated; -nsize, the new size of the block. - - -

-When ptr is not NULL, -osize is the size of the block pointed by ptr, -that is, the size given when it was allocated or reallocated. - - -

-When ptr is NULL, -osize encodes the kind of object that Lua is allocating. -osize is any of -LUA_TSTRING, LUA_TTABLE, LUA_TFUNCTION, -LUA_TUSERDATA, or LUA_TTHREAD when (and only when) -Lua is creating a new object of that type. -When osize is some other value, -Lua is allocating memory for something else. - - -

-Lua assumes the following behavior from the allocator function: - - -

-When nsize is zero, -the allocator should behave like free -and return NULL. - - -

-When nsize is not zero, -the allocator should behave like realloc. -The allocator returns NULL -if and only if it cannot fulfill the request. -Lua assumes that the allocator never fails when -osize >= nsize. - - -

-Here is a simple implementation for the allocator function. -It is used in the auxiliary library by luaL_newstate. - -

-     static void *l_alloc (void *ud, void *ptr, size_t osize,
-                                                size_t nsize) {
-       (void)ud;  (void)osize;  /* not used */
-       if (nsize == 0) {
-         free(ptr);
-         return NULL;
-       }
-       else
-         return realloc(ptr, nsize);
-     }
-

-Note that Standard C ensures -that free(NULL) has no effect and that -realloc(NULL, size) is equivalent to malloc(size). -This code assumes that realloc does not fail when shrinking a block. -(Although Standard C does not ensure this behavior, -it seems to be a safe assumption.) - - - - - -


lua_arith

-[-(2|1), +1, e] -

void lua_arith (lua_State *L, int op);
- -

-Performs an arithmetic operation over the two values -(or one, in the case of negation) -at the top of the stack, -with the value at the top being the second operand, -pops these values, and pushes the result of the operation. -The function follows the semantics of the corresponding Lua operator -(that is, it may call metamethods). - - -

-The value of op must be one of the following constants: - -

- - - - -

lua_atpanic

-[-0, +0, –] -

lua_CFunction lua_atpanic (lua_State *L, lua_CFunction panicf);
- -

-Sets a new panic function and returns the old one (see §4.6). - - - - - -


lua_call

-[-(nargs+1), +nresults, e] -

void lua_call (lua_State *L, int nargs, int nresults);
- -

-Calls a function. - - -

-To call a function you must use the following protocol: -first, the function to be called is pushed onto the stack; -then, the arguments to the function are pushed -in direct order; -that is, the first argument is pushed first. -Finally you call lua_call; -nargs is the number of arguments that you pushed onto the stack. -All arguments and the function value are popped from the stack -when the function is called. -The function results are pushed onto the stack when the function returns. -The number of results is adjusted to nresults, -unless nresults is LUA_MULTRET. -In this case, all results from the function are pushed. -Lua takes care that the returned values fit into the stack space. -The function results are pushed onto the stack in direct order -(the first result is pushed first), -so that after the call the last result is on the top of the stack. - - -

-Any error inside the called function is propagated upwards -(with a longjmp). - - -

-The following example shows how the host program can do the -equivalent to this Lua code: - -

-     a = f("how", t.x, 14)
-

-Here it is in C: - -

-     lua_getglobal(L, "f");                  /* function to be called */
-     lua_pushstring(L, "how");                        /* 1st argument */
-     lua_getglobal(L, "t");                    /* table to be indexed */
-     lua_getfield(L, -1, "x");        /* push result of t.x (2nd arg) */
-     lua_remove(L, -2);                  /* remove 't' from the stack */
-     lua_pushinteger(L, 14);                          /* 3rd argument */
-     lua_call(L, 3, 1);     /* call 'f' with 3 arguments and 1 result */
-     lua_setglobal(L, "a");                         /* set global 'a' */
-

-Note that the code above is "balanced": -at its end, the stack is back to its original configuration. -This is considered good programming practice. - - - - - -


lua_callk

-[-(nargs + 1), +nresults, e] -

void lua_callk (lua_State *L, int nargs, int nresults, int ctx,
-                lua_CFunction k);
- -

-This function behaves exactly like lua_call, -but allows the called function to yield (see §4.7). - - - - - -


lua_CFunction

-
typedef int (*lua_CFunction) (lua_State *L);
- -

-Type for C functions. - - -

-In order to communicate properly with Lua, -a C function must use the following protocol, -which defines the way parameters and results are passed: -a C function receives its arguments from Lua in its stack -in direct order (the first argument is pushed first). -So, when the function starts, -lua_gettop(L) returns the number of arguments received by the function. -The first argument (if any) is at index 1 -and its last argument is at index lua_gettop(L). -To return values to Lua, a C function just pushes them onto the stack, -in direct order (the first result is pushed first), -and returns the number of results. -Any other value in the stack below the results will be properly -discarded by Lua. -Like a Lua function, a C function called by Lua can also return -many results. - - -

-As an example, the following function receives a variable number -of numerical arguments and returns their average and sum: - -

-     static int foo (lua_State *L) {
-       int n = lua_gettop(L);    /* number of arguments */
-       lua_Number sum = 0;
-       int i;
-       for (i = 1; i <= n; i++) {
-         if (!lua_isnumber(L, i)) {
-           lua_pushstring(L, "incorrect argument");
-           lua_error(L);
-         }
-         sum += lua_tonumber(L, i);
-       }
-       lua_pushnumber(L, sum/n);        /* first result */
-       lua_pushnumber(L, sum);         /* second result */
-       return 2;                   /* number of results */
-     }
-
- - - - -

lua_checkstack

-[-0, +0, –] -

int lua_checkstack (lua_State *L, int extra);
- -

-Ensures that there are at least extra free stack slots in the stack. -It returns false if it cannot fulfill the request, -because it would cause the stack to be larger than a fixed maximum size -(typically at least a few thousand elements) or -because it cannot allocate memory for the new stack size. -This function never shrinks the stack; -if the stack is already larger than the new size, -it is left unchanged. - - - - - -


lua_close

-[-0, +0, –] -

void lua_close (lua_State *L);
- -

-Destroys all objects in the given Lua state -(calling the corresponding garbage-collection metamethods, if any) -and frees all dynamic memory used by this state. -On several platforms, you may not need to call this function, -because all resources are naturally released when the host program ends. -On the other hand, long-running programs that create multiple states, -such as daemons or web servers, -might need to close states as soon as they are not needed. - - - - - -


lua_compare

-[-0, +0, e] -

int lua_compare (lua_State *L, int index1, int index2, int op);
- -

-Compares two Lua values. -Returns 1 if the value at index index1 satisfies op -when compared with the value at index index2, -following the semantics of the corresponding Lua operator -(that is, it may call metamethods). -Otherwise returns 0. -Also returns 0 if any of the indices is non valid. - - -

-The value of op must be one of the following constants: - -

    - -
  • LUA_OPEQ: compares for equality (==)
  • -
  • LUA_OPLT: compares for less than (<)
  • -
  • LUA_OPLE: compares for less or equal (<=)
  • - -
- - - - -

lua_concat

-[-n, +1, e] -

void lua_concat (lua_State *L, int n);
- -

-Concatenates the n values at the top of the stack, -pops them, and leaves the result at the top. -If n is 1, the result is the single value on the stack -(that is, the function does nothing); -if n is 0, the result is the empty string. -Concatenation is performed following the usual semantics of Lua -(see §3.4.5). - - - - - -


lua_copy

-[-0, +0, –] -

void lua_copy (lua_State *L, int fromidx, int toidx);
- -

-Moves the element at index fromidx -into the valid index toidx -without shifting any element -(therefore replacing the value at that position). - - - - - -


lua_createtable

-[-0, +1, e] -

void lua_createtable (lua_State *L, int narr, int nrec);
- -

-Creates a new empty table and pushes it onto the stack. -Parameter narr is a hint for how many elements the table -will have as a sequence; -parameter nrec is a hint for how many other elements -the table will have. -Lua may use these hints to preallocate memory for the new table. -This pre-allocation is useful for performance when you know in advance -how many elements the table will have. -Otherwise you can use the function lua_newtable. - - - - - -


lua_dump

-[-0, +0, e] -

int lua_dump (lua_State *L, lua_Writer writer, void *data);
- -

-Dumps a function as a binary chunk. -Receives a Lua function on the top of the stack -and produces a binary chunk that, -if loaded again, -results in a function equivalent to the one dumped. -As it produces parts of the chunk, -lua_dump calls function writer (see lua_Writer) -with the given data -to write them. - - -

-The value returned is the error code returned by the last -call to the writer; -0 means no errors. - - -

-This function does not pop the Lua function from the stack. - - - - - -


lua_error

-[-1, +0, v] -

int lua_error (lua_State *L);
- -

-Generates a Lua error. -The error message (which can actually be a Lua value of any type) -must be on the stack top. -This function does a long jump, -and therefore never returns -(see luaL_error). - - - - - -


lua_gc

-[-0, +0, e] -

int lua_gc (lua_State *L, int what, int data);
- -

-Controls the garbage collector. - - -

-This function performs several tasks, -according to the value of the parameter what: - -

    - -
  • LUA_GCSTOP: -stops the garbage collector. -
  • - -
  • LUA_GCRESTART: -restarts the garbage collector. -
  • - -
  • LUA_GCCOLLECT: -performs a full garbage-collection cycle. -
  • - -
  • LUA_GCCOUNT: -returns the current amount of memory (in Kbytes) in use by Lua. -
  • - -
  • LUA_GCCOUNTB: -returns the remainder of dividing the current amount of bytes of -memory in use by Lua by 1024. -
  • - -
  • LUA_GCSTEP: -performs an incremental step of garbage collection. -The step "size" is controlled by data -(larger values mean more steps) in a non-specified way. -If you want to control the step size -you must experimentally tune the value of data. -The function returns 1 if the step finished a -garbage-collection cycle. -
  • - -
  • LUA_GCSETPAUSE: -sets data as the new value -for the pause of the collector (see §2.5). -The function returns the previous value of the pause. -
  • - -
  • LUA_GCSETSTEPMUL: -sets data as the new value for the step multiplier of -the collector (see §2.5). -The function returns the previous value of the step multiplier. -
  • - -
  • LUA_GCISRUNNING: -returns a boolean that tells whether the collector is running -(i.e., not stopped). -
  • - -
  • LUA_GCGEN: -changes the collector to generational mode -(see §2.5). -
  • - -
  • LUA_GCINC: -changes the collector to incremental mode. -This is the default mode. -
  • - -
- -

-For more details about these options, -see collectgarbage. - - - - - -


lua_getallocf

-[-0, +0, –] -

lua_Alloc lua_getallocf (lua_State *L, void **ud);
- -

-Returns the memory-allocation function of a given state. -If ud is not NULL, Lua stores in *ud the -opaque pointer passed to lua_newstate. - - - - - -


lua_getctx

-[-0, +0, –] -

int lua_getctx (lua_State *L, int *ctx);
- -

-This function is called by a continuation function (see §4.7) -to retrieve the status of the thread and a context information. - - -

-When called in the original function, -lua_getctx always returns LUA_OK -and does not change the value of its argument ctx. -When called inside a continuation function, -lua_getctx returns LUA_YIELD and sets -the value of ctx to be the context information -(the value passed as the ctx argument -to the callee together with the continuation function). - - -

-When the callee is lua_pcallk, -Lua may also call its continuation function -to handle errors during the call. -That is, upon an error in the function called by lua_pcallk, -Lua may not return to the original function -but instead may call the continuation function. -In that case, a call to lua_getctx will return the error code -(the value that would be returned by lua_pcallk); -the value of ctx will be set to the context information, -as in the case of a yield. - - - - - -


lua_getfield

-[-0, +1, e] -

void lua_getfield (lua_State *L, int index, const char *k);
- -

-Pushes onto the stack the value t[k], -where t is the value at the given index. -As in Lua, this function may trigger a metamethod -for the "index" event (see §2.4). - - - - - -


lua_getglobal

-[-0, +1, e] -

void lua_getglobal (lua_State *L, const char *name);
- -

-Pushes onto the stack the value of the global name. - - - - - -


lua_getmetatable

-[-0, +(0|1), –] -

int lua_getmetatable (lua_State *L, int index);
- -

-Pushes onto the stack the metatable of the value at the given index. -If the value does not have a metatable, -the function returns 0 and pushes nothing on the stack. - - - - - -


lua_gettable

-[-1, +1, e] -

void lua_gettable (lua_State *L, int index);
- -

-Pushes onto the stack the value t[k], -where t is the value at the given index -and k is the value at the top of the stack. - - -

-This function pops the key from the stack -(putting the resulting value in its place). -As in Lua, this function may trigger a metamethod -for the "index" event (see §2.4). - - - - - -


lua_gettop

-[-0, +0, –] -

int lua_gettop (lua_State *L);
- -

-Returns the index of the top element in the stack. -Because indices start at 1, -this result is equal to the number of elements in the stack -(and so 0 means an empty stack). - - - - - -


lua_getuservalue

-[-0, +1, –] -

void lua_getuservalue (lua_State *L, int index);
- -

-Pushes onto the stack the Lua value associated with the userdata -at the given index. -This Lua value must be a table or nil. - - - - - -


lua_insert

-[-1, +1, –] -

void lua_insert (lua_State *L, int index);
- -

-Moves the top element into the given valid index, -shifting up the elements above this index to open space. -This function cannot be called with a pseudo-index, -because a pseudo-index is not an actual stack position. - - - - - -


lua_Integer

-
typedef ptrdiff_t lua_Integer;
- -

-The type used by the Lua API to represent signed integral values. - - -

-By default it is a ptrdiff_t, -which is usually the largest signed integral type the machine handles -"comfortably". - - - - - -


lua_isboolean

-[-0, +0, –] -

int lua_isboolean (lua_State *L, int index);
- -

-Returns 1 if the value at the given index is a boolean, -and 0 otherwise. - - - - - -


lua_iscfunction

-[-0, +0, –] -

int lua_iscfunction (lua_State *L, int index);
- -

-Returns 1 if the value at the given index is a C function, -and 0 otherwise. - - - - - -


lua_isfunction

-[-0, +0, –] -

int lua_isfunction (lua_State *L, int index);
- -

-Returns 1 if the value at the given index is a function -(either C or Lua), and 0 otherwise. - - - - - -


lua_islightuserdata

-[-0, +0, –] -

int lua_islightuserdata (lua_State *L, int index);
- -

-Returns 1 if the value at the given index is a light userdata, -and 0 otherwise. - - - - - -


lua_isnil

-[-0, +0, –] -

int lua_isnil (lua_State *L, int index);
- -

-Returns 1 if the value at the given index is nil, -and 0 otherwise. - - - - - -


lua_isnone

-[-0, +0, –] -

int lua_isnone (lua_State *L, int index);
- -

-Returns 1 if the given index is not valid, -and 0 otherwise. - - - - - -


lua_isnoneornil

-[-0, +0, –] -

int lua_isnoneornil (lua_State *L, int index);
- -

-Returns 1 if the given index is not valid -or if the value at this index is nil, -and 0 otherwise. - - - - - -


lua_isnumber

-[-0, +0, –] -

int lua_isnumber (lua_State *L, int index);
- -

-Returns 1 if the value at the given index is a number -or a string convertible to a number, -and 0 otherwise. - - - - - -


lua_isstring

-[-0, +0, –] -

int lua_isstring (lua_State *L, int index);
- -

-Returns 1 if the value at the given index is a string -or a number (which is always convertible to a string), -and 0 otherwise. - - - - - -


lua_istable

-[-0, +0, –] -

int lua_istable (lua_State *L, int index);
- -

-Returns 1 if the value at the given index is a table, -and 0 otherwise. - - - - - -


lua_isthread

-[-0, +0, –] -

int lua_isthread (lua_State *L, int index);
- -

-Returns 1 if the value at the given index is a thread, -and 0 otherwise. - - - - - -


lua_isuserdata

-[-0, +0, –] -

int lua_isuserdata (lua_State *L, int index);
- -

-Returns 1 if the value at the given index is a userdata -(either full or light), and 0 otherwise. - - - - - -


lua_len

-[-0, +1, e] -

void lua_len (lua_State *L, int index);
- -

-Returns the "length" of the value at the given index; -it is equivalent to the '#' operator in Lua (see §3.4.6). -The result is pushed on the stack. - - - - - -


lua_load

-[-0, +1, –] -

int lua_load (lua_State *L,
-              lua_Reader reader,
-              void *data,
-              const char *source,
-              const char *mode);
- -

-Loads a Lua chunk (without running it). -If there are no errors, -lua_load pushes the compiled chunk as a Lua -function on top of the stack. -Otherwise, it pushes an error message. - - -

-The return values of lua_load are: - -

    - -
  • LUA_OK: no errors;
  • - -
  • LUA_ERRSYNTAX: -syntax error during precompilation;
  • - -
  • LUA_ERRMEM: -memory allocation error;
  • - -
  • LUA_ERRGCMM: -error while running a __gc metamethod. -(This error has no relation with the chunk being loaded. -It is generated by the garbage collector.) -
  • - -
- -

-The lua_load function uses a user-supplied reader function -to read the chunk (see lua_Reader). -The data argument is an opaque value passed to the reader function. - - -

-The source argument gives a name to the chunk, -which is used for error messages and in debug information (see §4.9). - - -

-lua_load automatically detects whether the chunk is text or binary -and loads it accordingly (see program luac). -The string mode works as in function load, -with the addition that -a NULL value is equivalent to the string "bt". - - -

-lua_load uses the stack internally, -so the reader function should always leave the stack -unmodified when returning. - - -

-If the resulting function has one upvalue, -this upvalue is set to the value of the global environment -stored at index LUA_RIDX_GLOBALS in the registry (see §4.5). -When loading main chunks, -this upvalue will be the _ENV variable (see §2.2). - - - - - -


lua_newstate

-[-0, +0, –] -

lua_State *lua_newstate (lua_Alloc f, void *ud);
- -

-Creates a new thread running in a new, independent state. -Returns NULL if cannot create the thread or the state -(due to lack of memory). -The argument f is the allocator function; -Lua does all memory allocation for this state through this function. -The second argument, ud, is an opaque pointer that Lua -passes to the allocator in every call. - - - - - -


lua_newtable

-[-0, +1, e] -

void lua_newtable (lua_State *L);
- -

-Creates a new empty table and pushes it onto the stack. -It is equivalent to lua_createtable(L, 0, 0). - - - - - -


lua_newthread

-[-0, +1, e] -

lua_State *lua_newthread (lua_State *L);
- -

-Creates a new thread, pushes it on the stack, -and returns a pointer to a lua_State that represents this new thread. -The new thread returned by this function shares with the original thread -its global environment, -but has an independent execution stack. - - -

-There is no explicit function to close or to destroy a thread. -Threads are subject to garbage collection, -like any Lua object. - - - - - -


lua_newuserdata

-[-0, +1, e] -

void *lua_newuserdata (lua_State *L, size_t size);
- -

-This function allocates a new block of memory with the given size, -pushes onto the stack a new full userdata with the block address, -and returns this address. -The host program can freely use this memory. - - - - - -


lua_next

-[-1, +(2|0), e] -

int lua_next (lua_State *L, int index);
- -

-Pops a key from the stack, -and pushes a key–value pair from the table at the given index -(the "next" pair after the given key). -If there are no more elements in the table, -then lua_next returns 0 (and pushes nothing). - - -

-A typical traversal looks like this: - -

-     /* table is in the stack at index 't' */
-     lua_pushnil(L);  /* first key */
-     while (lua_next(L, t) != 0) {
-       /* uses 'key' (at index -2) and 'value' (at index -1) */
-       printf("%s - %s\n",
-              lua_typename(L, lua_type(L, -2)),
-              lua_typename(L, lua_type(L, -1)));
-       /* removes 'value'; keeps 'key' for next iteration */
-       lua_pop(L, 1);
-     }
-
- -

-While traversing a table, -do not call lua_tolstring directly on a key, -unless you know that the key is actually a string. -Recall that lua_tolstring may change -the value at the given index; -this confuses the next call to lua_next. - - -

-See function next for the caveats of modifying -the table during its traversal. - - - - - -


lua_Number

-
typedef double lua_Number;
- -

-The type of numbers in Lua. -By default, it is double, but that can be changed in luaconf.h. -Through this configuration file you can change -Lua to operate with another type for numbers (e.g., float or long). - - - - - -


lua_pcall

-[-(nargs + 1), +(nresults|1), –] -

int lua_pcall (lua_State *L, int nargs, int nresults, int msgh);
- -

-Calls a function in protected mode. - - -

-Both nargs and nresults have the same meaning as -in lua_call. -If there are no errors during the call, -lua_pcall behaves exactly like lua_call. -However, if there is any error, -lua_pcall catches it, -pushes a single value on the stack (the error message), -and returns an error code. -Like lua_call, -lua_pcall always removes the function -and its arguments from the stack. - - -

-If msgh is 0, -then the error message returned on the stack -is exactly the original error message. -Otherwise, msgh is the stack index of a -message handler. -(In the current implementation, this index cannot be a pseudo-index.) -In case of runtime errors, -this function will be called with the error message -and its return value will be the message -returned on the stack by lua_pcall. - - -

-Typically, the message handler is used to add more debug -information to the error message, such as a stack traceback. -Such information cannot be gathered after the return of lua_pcall, -since by then the stack has unwound. - - -

-The lua_pcall function returns one of the following codes -(defined in lua.h): - -

    - -
  • LUA_OK (0): -success.
  • - -
  • LUA_ERRRUN: -a runtime error. -
  • - -
  • LUA_ERRMEM: -memory allocation error. -For such errors, Lua does not call the message handler. -
  • - -
  • LUA_ERRERR: -error while running the message handler. -
  • - -
  • LUA_ERRGCMM: -error while running a __gc metamethod. -(This error typically has no relation with the function being called. -It is generated by the garbage collector.) -
  • - -
- - - - -

lua_pcallk

-[-(nargs + 1), +(nresults|1), –] -

int lua_pcallk (lua_State *L,
-                int nargs,
-                int nresults,
-                int errfunc,
-                int ctx,
-                lua_CFunction k);
- -

-This function behaves exactly like lua_pcall, -but allows the called function to yield (see §4.7). - - - - - -


lua_pop

-[-n, +0, –] -

void lua_pop (lua_State *L, int n);
- -

-Pops n elements from the stack. - - - - - -


lua_pushboolean

-[-0, +1, –] -

void lua_pushboolean (lua_State *L, int b);
- -

-Pushes a boolean value with value b onto the stack. - - - - - -


lua_pushcclosure

-[-n, +1, e] -

void lua_pushcclosure (lua_State *L, lua_CFunction fn, int n);
- -

-Pushes a new C closure onto the stack. - - -

-When a C function is created, -it is possible to associate some values with it, -thus creating a C closure (see §4.4); -these values are then accessible to the function whenever it is called. -To associate values with a C function, -first these values should be pushed onto the stack -(when there are multiple values, the first value is pushed first). -Then lua_pushcclosure -is called to create and push the C function onto the stack, -with the argument n telling how many values should be -associated with the function. -lua_pushcclosure also pops these values from the stack. - - -

-The maximum value for n is 255. - - -

-When n is zero, -this function creates a light C function, -which is just a pointer to the C function. -In that case, it never throws a memory error. - - - - - -


lua_pushcfunction

-[-0, +1, –] -

void lua_pushcfunction (lua_State *L, lua_CFunction f);
- -

-Pushes a C function onto the stack. -This function receives a pointer to a C function -and pushes onto the stack a Lua value of type function that, -when called, invokes the corresponding C function. - - -

-Any function to be registered in Lua must -follow the correct protocol to receive its parameters -and return its results (see lua_CFunction). - - -

-lua_pushcfunction is defined as a macro: - -

-     #define lua_pushcfunction(L,f)  lua_pushcclosure(L,f,0)
-

-Note that f is used twice. - - - - - -


lua_pushfstring

-[-0, +1, e] -

const char *lua_pushfstring (lua_State *L, const char *fmt, ...);
- -

-Pushes onto the stack a formatted string -and returns a pointer to this string. -It is similar to the ANSI C function sprintf, -but has some important differences: - -

    - -
  • -You do not have to allocate space for the result: -the result is a Lua string and Lua takes care of memory allocation -(and deallocation, through garbage collection). -
  • - -
  • -The conversion specifiers are quite restricted. -There are no flags, widths, or precisions. -The conversion specifiers can only be -'%%' (inserts a '%' in the string), -'%s' (inserts a zero-terminated string, with no size restrictions), -'%f' (inserts a lua_Number), -'%p' (inserts a pointer as a hexadecimal numeral), -'%d' (inserts an int), and -'%c' (inserts an int as a byte). -
  • - -
- - - - -

lua_pushglobaltable

-[-0, +1, –] -

void lua_pushglobaltable (lua_State *L);
- -

-Pushes the global environment onto the stack. - - - - - -


lua_pushinteger

-[-0, +1, –] -

void lua_pushinteger (lua_State *L, lua_Integer n);
- -

-Pushes a number with value n onto the stack. - - - - - -


lua_pushlightuserdata

-[-0, +1, –] -

void lua_pushlightuserdata (lua_State *L, void *p);
- -

-Pushes a light userdata onto the stack. - - -

-Userdata represent C values in Lua. -A light userdata represents a pointer, a void*. -It is a value (like a number): -you do not create it, it has no individual metatable, -and it is not collected (as it was never created). -A light userdata is equal to "any" -light userdata with the same C address. - - - - - -


lua_pushliteral

-[-0, +1, e] -

const char *lua_pushliteral (lua_State *L, const char *s);
- -

-This macro is equivalent to lua_pushlstring, -but can be used only when s is a literal string. -It automatically provides the string length. - - - - - -


lua_pushlstring

-[-0, +1, e] -

const char *lua_pushlstring (lua_State *L, const char *s, size_t len);
- -

-Pushes the string pointed to by s with size len -onto the stack. -Lua makes (or reuses) an internal copy of the given string, -so the memory at s can be freed or reused immediately after -the function returns. -The string can contain any binary data, -including embedded zeros. - - -

-Returns a pointer to the internal copy of the string. - - - - - -


lua_pushnil

-[-0, +1, –] -

void lua_pushnil (lua_State *L);
- -

-Pushes a nil value onto the stack. - - - - - -


lua_pushnumber

-[-0, +1, –] -

void lua_pushnumber (lua_State *L, lua_Number n);
- -

-Pushes a number with value n onto the stack. - - - - - -


lua_pushstring

-[-0, +1, e] -

const char *lua_pushstring (lua_State *L, const char *s);
- -

-Pushes the zero-terminated string pointed to by s -onto the stack. -Lua makes (or reuses) an internal copy of the given string, -so the memory at s can be freed or reused immediately after -the function returns. - - -

-Returns a pointer to the internal copy of the string. - - -

-If s is NULL, pushes nil and returns NULL. - - - - - -


lua_pushthread

-[-0, +1, –] -

int lua_pushthread (lua_State *L);
- -

-Pushes the thread represented by L onto the stack. -Returns 1 if this thread is the main thread of its state. - - - - - -


lua_pushunsigned

-[-0, +1, –] -

void lua_pushunsigned (lua_State *L, lua_Unsigned n);
- -

-Pushes a number with value n onto the stack. - - - - - -


lua_pushvalue

-[-0, +1, –] -

void lua_pushvalue (lua_State *L, int index);
- -

-Pushes a copy of the element at the given index -onto the stack. - - - - - -


lua_pushvfstring

-[-0, +1, e] -

const char *lua_pushvfstring (lua_State *L,
-                              const char *fmt,
-                              va_list argp);
- -

-Equivalent to lua_pushfstring, except that it receives a va_list -instead of a variable number of arguments. - - - - - -


lua_rawequal

-[-0, +0, –] -

int lua_rawequal (lua_State *L, int index1, int index2);
- -

-Returns 1 if the two values in indices index1 and -index2 are primitively equal -(that is, without calling metamethods). -Otherwise returns 0. -Also returns 0 if any of the indices are non valid. - - - - - -


lua_rawget

-[-1, +1, –] -

void lua_rawget (lua_State *L, int index);
- -

-Similar to lua_gettable, but does a raw access -(i.e., without metamethods). - - - - - -


lua_rawgeti

-[-0, +1, –] -

void lua_rawgeti (lua_State *L, int index, int n);
- -

-Pushes onto the stack the value t[n], -where t is the table at the given index. -The access is raw; -that is, it does not invoke metamethods. - - - - - -


lua_rawgetp

-[-0, +1, –] -

void lua_rawgetp (lua_State *L, int index, const void *p);
- -

-Pushes onto the stack the value t[k], -where t is the table at the given index and -k is the pointer p represented as a light userdata. -The access is raw; -that is, it does not invoke metamethods. - - - - - -


lua_rawlen

-[-0, +0, –] -

size_t lua_rawlen (lua_State *L, int index);
- -

-Returns the raw "length" of the value at the given index: -for strings, this is the string length; -for tables, this is the result of the length operator ('#') -with no metamethods; -for userdata, this is the size of the block of memory allocated -for the userdata; -for other values, it is 0. - - - - - -


lua_rawset

-[-2, +0, e] -

void lua_rawset (lua_State *L, int index);
- -

-Similar to lua_settable, but does a raw assignment -(i.e., without metamethods). - - - - - -


lua_rawseti

-[-1, +0, e] -

void lua_rawseti (lua_State *L, int index, int n);
- -

-Does the equivalent of t[n] = v, -where t is the table at the given index -and v is the value at the top of the stack. - - -

-This function pops the value from the stack. -The assignment is raw; -that is, it does not invoke metamethods. - - - - - -


lua_rawsetp

-[-1, +0, e] -

void lua_rawsetp (lua_State *L, int index, const void *p);
- -

-Does the equivalent of t[k] = v, -where t is the table at the given index, -k is the pointer p represented as a light userdata, -and v is the value at the top of the stack. - - -

-This function pops the value from the stack. -The assignment is raw; -that is, it does not invoke metamethods. - - - - - -


lua_Reader

-
typedef const char * (*lua_Reader) (lua_State *L,
-                                    void *data,
-                                    size_t *size);
- -

-The reader function used by lua_load. -Every time it needs another piece of the chunk, -lua_load calls the reader, -passing along its data parameter. -The reader must return a pointer to a block of memory -with a new piece of the chunk -and set size to the block size. -The block must exist until the reader function is called again. -To signal the end of the chunk, -the reader must return NULL or set size to zero. -The reader function may return pieces of any size greater than zero. - - - - - -


lua_register

-[-0, +0, e] -

void lua_register (lua_State *L, const char *name, lua_CFunction f);
- -

-Sets the C function f as the new value of global name. -It is defined as a macro: - -

-     #define lua_register(L,n,f) \
-            (lua_pushcfunction(L, f), lua_setglobal(L, n))
-
- - - - -

lua_remove

-[-1, +0, –] -

void lua_remove (lua_State *L, int index);
- -

-Removes the element at the given valid index, -shifting down the elements above this index to fill the gap. -This function cannot be called with a pseudo-index, -because a pseudo-index is not an actual stack position. - - - - - -


lua_replace

-[-1, +0, –] -

void lua_replace (lua_State *L, int index);
- -

-Moves the top element into the given valid index -without shifting any element -(therefore replacing the value at the given index), -and then pops the top element. - - - - - -


lua_resume

-[-?, +?, –] -

int lua_resume (lua_State *L, lua_State *from, int nargs);
- -

-Starts and resumes a coroutine in a given thread. - - -

-To start a coroutine, -you push onto the thread stack the main function plus any arguments; -then you call lua_resume, -with nargs being the number of arguments. -This call returns when the coroutine suspends or finishes its execution. -When it returns, the stack contains all values passed to lua_yield, -or all values returned by the body function. -lua_resume returns -LUA_YIELD if the coroutine yields, -LUA_OK if the coroutine finishes its execution -without errors, -or an error code in case of errors (see lua_pcall). - - -

-In case of errors, -the stack is not unwound, -so you can use the debug API over it. -The error message is on the top of the stack. - - -

-To resume a coroutine, -you remove any results from the last lua_yield, -put on its stack only the values to -be passed as results from yield, -and then call lua_resume. - - -

-The parameter from represents the coroutine that is resuming L. -If there is no such coroutine, -this parameter can be NULL. - - - - - -


lua_setallocf

-[-0, +0, –] -

void lua_setallocf (lua_State *L, lua_Alloc f, void *ud);
- -

-Changes the allocator function of a given state to f -with user data ud. - - - - - -


lua_setfield

-[-1, +0, e] -

void lua_setfield (lua_State *L, int index, const char *k);
- -

-Does the equivalent to t[k] = v, -where t is the value at the given index -and v is the value at the top of the stack. - - -

-This function pops the value from the stack. -As in Lua, this function may trigger a metamethod -for the "newindex" event (see §2.4). - - - - - -


lua_setglobal

-[-1, +0, e] -

void lua_setglobal (lua_State *L, const char *name);
- -

-Pops a value from the stack and -sets it as the new value of global name. - - - - - -


lua_setmetatable

-[-1, +0, –] -

void lua_setmetatable (lua_State *L, int index);
- -

-Pops a table from the stack and -sets it as the new metatable for the value at the given index. - - - - - -


lua_settable

-[-2, +0, e] -

void lua_settable (lua_State *L, int index);
- -

-Does the equivalent to t[k] = v, -where t is the value at the given index, -v is the value at the top of the stack, -and k is the value just below the top. - - -

-This function pops both the key and the value from the stack. -As in Lua, this function may trigger a metamethod -for the "newindex" event (see §2.4). - - - - - -


lua_settop

-[-?, +?, –] -

void lua_settop (lua_State *L, int index);
- -

-Accepts any index, or 0, -and sets the stack top to this index. -If the new top is larger than the old one, -then the new elements are filled with nil. -If index is 0, then all stack elements are removed. - - - - - -


lua_setuservalue

-[-1, +0, –] -

void lua_setuservalue (lua_State *L, int index);
- -

-Pops a table or nil from the stack and sets it as -the new value associated to the userdata at the given index. - - - - - -


lua_State

-
typedef struct lua_State lua_State;
- -

-An opaque structure that points to a thread and indirectly -(through the thread) to the whole state of a Lua interpreter. -The Lua library is fully reentrant: -it has no global variables. -All information about a state is accessible through this structure. - - -

-A pointer to this structure must be passed as the first argument to -every function in the library, except to lua_newstate, -which creates a Lua state from scratch. - - - - - -


lua_status

-[-0, +0, –] -

int lua_status (lua_State *L);
- -

-Returns the status of the thread L. - - -

-The status can be 0 (LUA_OK) for a normal thread, -an error code if the thread finished the execution -of a lua_resume with an error, -or LUA_YIELD if the thread is suspended. - - -

-You can only call functions in threads with status LUA_OK. -You can resume threads with status LUA_OK -(to start a new coroutine) or LUA_YIELD -(to resume a coroutine). - - - - - -


lua_toboolean

-[-0, +0, –] -

int lua_toboolean (lua_State *L, int index);
- -

-Converts the Lua value at the given index to a C boolean -value (0 or 1). -Like all tests in Lua, -lua_toboolean returns true for any Lua value -different from false and nil; -otherwise it returns false. -(If you want to accept only actual boolean values, -use lua_isboolean to test the value's type.) - - - - - -


lua_tocfunction

-[-0, +0, –] -

lua_CFunction lua_tocfunction (lua_State *L, int index);
- -

-Converts a value at the given index to a C function. -That value must be a C function; -otherwise, returns NULL. - - - - - -


lua_tointeger

-[-0, +0, –] -

lua_Integer lua_tointeger (lua_State *L, int index);
- -

-Equivalent to lua_tointegerx with isnum equal to NULL. - - - - - -


lua_tointegerx

-[-0, +0, –] -

lua_Integer lua_tointegerx (lua_State *L, int index, int *isnum);
- -

-Converts the Lua value at the given index -to the signed integral type lua_Integer. -The Lua value must be a number or a string convertible to a number -(see §3.4.2); -otherwise, lua_tointegerx returns 0. - - -

-If the number is not an integer, -it is truncated in some non-specified way. - - -

-If isnum is not NULL, -its referent is assigned a boolean value that -indicates whether the operation succeeded. - - - - - -


lua_tolstring

-[-0, +0, e] -

const char *lua_tolstring (lua_State *L, int index, size_t *len);
- -

-Converts the Lua value at the given index to a C string. -If len is not NULL, -it also sets *len with the string length. -The Lua value must be a string or a number; -otherwise, the function returns NULL. -If the value is a number, -then lua_tolstring also -changes the actual value in the stack to a string. -(This change confuses lua_next -when lua_tolstring is applied to keys during a table traversal.) - - -

-lua_tolstring returns a fully aligned pointer -to a string inside the Lua state. -This string always has a zero ('\0') -after its last character (as in C), -but can contain other zeros in its body. -Because Lua has garbage collection, -there is no guarantee that the pointer returned by lua_tolstring -will be valid after the corresponding value is removed from the stack. - - - - - -


lua_tonumber

-[-0, +0, –] -

lua_Number lua_tonumber (lua_State *L, int index);
- -

-Equivalent to lua_tonumberx with isnum equal to NULL. - - - - - -


lua_tonumberx

-[-0, +0, –] -

lua_Number lua_tonumberx (lua_State *L, int index, int *isnum);
- -

-Converts the Lua value at the given index -to the C type lua_Number (see lua_Number). -The Lua value must be a number or a string convertible to a number -(see §3.4.2); -otherwise, lua_tonumberx returns 0. - - -

-If isnum is not NULL, -its referent is assigned a boolean value that -indicates whether the operation succeeded. - - - - - -


lua_topointer

-[-0, +0, –] -

const void *lua_topointer (lua_State *L, int index);
- -

-Converts the value at the given index to a generic -C pointer (void*). -The value can be a userdata, a table, a thread, or a function; -otherwise, lua_topointer returns NULL. -Different objects will give different pointers. -There is no way to convert the pointer back to its original value. - - -

-Typically this function is used only for debug information. - - - - - -


lua_tostring

-[-0, +0, e] -

const char *lua_tostring (lua_State *L, int index);
- -

-Equivalent to lua_tolstring with len equal to NULL. - - - - - -


lua_tothread

-[-0, +0, –] -

lua_State *lua_tothread (lua_State *L, int index);
- -

-Converts the value at the given index to a Lua thread -(represented as lua_State*). -This value must be a thread; -otherwise, the function returns NULL. - - - - - -


lua_tounsigned

-[-0, +0, –] -

lua_Unsigned lua_tounsigned (lua_State *L, int index);
- -

-Equivalent to lua_tounsignedx with isnum equal to NULL. - - - - - -


lua_tounsignedx

-[-0, +0, –] -

lua_Unsigned lua_tounsignedx (lua_State *L, int index, int *isnum);
- -

-Converts the Lua value at the given index -to the unsigned integral type lua_Unsigned. -The Lua value must be a number or a string convertible to a number -(see §3.4.2); -otherwise, lua_tounsignedx returns 0. - - -

-If the number is not an integer, -it is truncated in some non-specified way. -If the number is outside the range of representable values, -it is normalized to the remainder of its division by -one more than the maximum representable value. - - -

-If isnum is not NULL, -its referent is assigned a boolean value that -indicates whether the operation succeeded. - - - - - -


lua_touserdata

-[-0, +0, –] -

void *lua_touserdata (lua_State *L, int index);
- -

-If the value at the given index is a full userdata, -returns its block address. -If the value is a light userdata, -returns its pointer. -Otherwise, returns NULL. - - - - - -


lua_type

-[-0, +0, –] -

int lua_type (lua_State *L, int index);
- -

-Returns the type of the value in the given valid index, -or LUA_TNONE for a non-valid (but acceptable) index. -The types returned by lua_type are coded by the following constants -defined in lua.h: -LUA_TNIL, -LUA_TNUMBER, -LUA_TBOOLEAN, -LUA_TSTRING, -LUA_TTABLE, -LUA_TFUNCTION, -LUA_TUSERDATA, -LUA_TTHREAD, -and -LUA_TLIGHTUSERDATA. - - - - - -


lua_typename

-[-0, +0, –] -

const char *lua_typename (lua_State *L, int tp);
- -

-Returns the name of the type encoded by the value tp, -which must be one the values returned by lua_type. - - - - - -


lua_Unsigned

-
typedef unsigned long lua_Unsigned;
- -

-The type used by the Lua API to represent unsigned integral values. -It must have at least 32 bits. - - -

-By default it is an unsigned int or an unsigned long, -whichever can hold 32-bit values. - - - - - -


lua_upvalueindex

-[-0, +0, –] -

int lua_upvalueindex (int i);
- -

-Returns the pseudo-index that represents the i-th upvalue of -the running function (see §4.4). - - - - - -


lua_version

-[-0, +0, v] -

const lua_Number *lua_version (lua_State *L);
- -

-Returns the address of the version number stored in the Lua core. -When called with a valid lua_State, -returns the address of the version used to create that state. -When called with NULL, -returns the address of the version running the call. - - - - - -


lua_Writer

-
typedef int (*lua_Writer) (lua_State *L,
-                           const void* p,
-                           size_t sz,
-                           void* ud);
- -

-The type of the writer function used by lua_dump. -Every time it produces another piece of chunk, -lua_dump calls the writer, -passing along the buffer to be written (p), -its size (sz), -and the data parameter supplied to lua_dump. - - -

-The writer returns an error code: -0 means no errors; -any other value means an error and stops lua_dump from -calling the writer again. - - - - - -


lua_xmove

-[-?, +?, –] -

void lua_xmove (lua_State *from, lua_State *to, int n);
- -

-Exchange values between different threads of the same state. - - -

-This function pops n values from the stack from, -and pushes them onto the stack to. - - - - - -


lua_yield

-[-?, +?, –] -

int lua_yield (lua_State *L, int nresults);
- -

-This function is equivalent to lua_yieldk, -but it has no continuation (see §4.7). -Therefore, when the thread resumes, -it returns to the function that called -the function calling lua_yield. - - - - - -


lua_yieldk

-[-?, +?, –] -

int lua_yieldk (lua_State *L, int nresults, int ctx, lua_CFunction k);
- -

-Yields a coroutine. - - -

-This function should only be called as the -return expression of a C function, as follows: - -

-     return lua_yieldk (L, n, i, k);
-

-When a C function calls lua_yieldk in that way, -the running coroutine suspends its execution, -and the call to lua_resume that started this coroutine returns. -The parameter nresults is the number of values from the stack -that are passed as results to lua_resume. - - -

-When the coroutine is resumed again, -Lua calls the given continuation function k to continue -the execution of the C function that yielded (see §4.7). -This continuation function receives the same stack -from the previous function, -with the results removed and -replaced by the arguments passed to lua_resume. -Moreover, -the continuation function may access the value ctx -by calling lua_getctx. - - - - - - - -

4.9 – The Debug Interface

- -

-Lua has no built-in debugging facilities. -Instead, it offers a special interface -by means of functions and hooks. -This interface allows the construction of different -kinds of debuggers, profilers, and other tools -that need "inside information" from the interpreter. - - - -


lua_Debug

-
typedef struct lua_Debug {
-  int event;
-  const char *name;           /* (n) */
-  const char *namewhat;       /* (n) */
-  const char *what;           /* (S) */
-  const char *source;         /* (S) */
-  int currentline;            /* (l) */
-  int linedefined;            /* (S) */
-  int lastlinedefined;        /* (S) */
-  unsigned char nups;         /* (u) number of upvalues */
-  unsigned char nparams;      /* (u) number of parameters */
-  char isvararg;              /* (u) */
-  char istailcall;            /* (t) */
-  char short_src[LUA_IDSIZE]; /* (S) */
-  /* private part */
-  other fields
-} lua_Debug;
- -

-A structure used to carry different pieces of -information about a function or an activation record. -lua_getstack fills only the private part -of this structure, for later use. -To fill the other fields of lua_Debug with useful information, -call lua_getinfo. - - -

-The fields of lua_Debug have the following meaning: - -

    - -
  • source: -the source of the chunk that created the function. -If source starts with a '@', -it means that the function was defined in a file where -the file name follows the '@'. -If source starts with a '=', -the remainder of its contents describe the source in a user-dependent manner. -Otherwise, -the function was defined in a string where -source is that string. -
  • - -
  • short_src: -a "printable" version of source, to be used in error messages. -
  • - -
  • linedefined: -the line number where the definition of the function starts. -
  • - -
  • lastlinedefined: -the line number where the definition of the function ends. -
  • - -
  • what: -the string "Lua" if the function is a Lua function, -"C" if it is a C function, -"main" if it is the main part of a chunk. -
  • - -
  • currentline: -the current line where the given function is executing. -When no line information is available, -currentline is set to -1. -
  • - -
  • name: -a reasonable name for the given function. -Because functions in Lua are first-class values, -they do not have a fixed name: -some functions can be the value of multiple global variables, -while others can be stored only in a table field. -The lua_getinfo function checks how the function was -called to find a suitable name. -If it cannot find a name, -then name is set to NULL. -
  • - -
  • namewhat: -explains the name field. -The value of namewhat can be -"global", "local", "method", -"field", "upvalue", or "" (the empty string), -according to how the function was called. -(Lua uses the empty string when no other option seems to apply.) -
  • - -
  • istailcall: -true if this function invocation was called by a tail call. -In this case, the caller of this level is not in the stack. -
  • - -
  • nups: -the number of upvalues of the function. -
  • - -
  • nparams: -the number of fixed parameters of the function -(always 0 for C functions). -
  • - -
  • isvararg: -true if the function is a vararg function -(always true for C functions). -
  • - -
- - - - -

lua_gethook

-[-0, +0, –] -

lua_Hook lua_gethook (lua_State *L);
- -

-Returns the current hook function. - - - - - -


lua_gethookcount

-[-0, +0, –] -

int lua_gethookcount (lua_State *L);
- -

-Returns the current hook count. - - - - - -


lua_gethookmask

-[-0, +0, –] -

int lua_gethookmask (lua_State *L);
- -

-Returns the current hook mask. - - - - - -


lua_getinfo

-[-(0|1), +(0|1|2), e] -

int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar);
- -

-Gets information about a specific function or function invocation. - - -

-To get information about a function invocation, -the parameter ar must be a valid activation record that was -filled by a previous call to lua_getstack or -given as argument to a hook (see lua_Hook). - - -

-To get information about a function you push it onto the stack -and start the what string with the character '>'. -(In that case, -lua_getinfo pops the function from the top of the stack.) -For instance, to know in which line a function f was defined, -you can write the following code: - -

-     lua_Debug ar;
-     lua_getglobal(L, "f");  /* get global 'f' */
-     lua_getinfo(L, ">S", &ar);
-     printf("%d\n", ar.linedefined);
-
- -

-Each character in the string what -selects some fields of the structure ar to be filled or -a value to be pushed on the stack: - -

    - -
  • 'n': fills in the field name and namewhat; -
  • - -
  • 'S': -fills in the fields source, short_src, -linedefined, lastlinedefined, and what; -
  • - -
  • 'l': fills in the field currentline; -
  • - -
  • 't': fills in the field istailcall; -
  • - -
  • 'u': fills in the fields -nups, nparams, and isvararg; -
  • - -
  • 'f': -pushes onto the stack the function that is -running at the given level; -
  • - -
  • 'L': -pushes onto the stack a table whose indices are the -numbers of the lines that are valid on the function. -(A valid line is a line with some associated code, -that is, a line where you can put a break point. -Non-valid lines include empty lines and comments.) -
  • - -
- -

-This function returns 0 on error -(for instance, an invalid option in what). - - - - - -


lua_getlocal

-[-0, +(0|1), –] -

const char *lua_getlocal (lua_State *L, lua_Debug *ar, int n);
- -

-Gets information about a local variable of -a given activation record or a given function. - - -

-In the first case, -the parameter ar must be a valid activation record that was -filled by a previous call to lua_getstack or -given as argument to a hook (see lua_Hook). -The index n selects which local variable to inspect; -see debug.getlocal for details about variable indices -and names. - - -

-lua_getlocal pushes the variable's value onto the stack -and returns its name. - - -

-In the second case, ar should be NULL and the function -to be inspected must be at the top of the stack. -In this case, only parameters of Lua functions are visible -(as there is no information about what variables are active) -and no values are pushed onto the stack. - - -

-Returns NULL (and pushes nothing) -when the index is greater than -the number of active local variables. - - - - - -


lua_getstack

-[-0, +0, –] -

int lua_getstack (lua_State *L, int level, lua_Debug *ar);
- -

-Gets information about the interpreter runtime stack. - - -

-This function fills parts of a lua_Debug structure with -an identification of the activation record -of the function executing at a given level. -Level 0 is the current running function, -whereas level n+1 is the function that has called level n -(except for tail calls, which do not count on the stack). -When there are no errors, lua_getstack returns 1; -when called with a level greater than the stack depth, -it returns 0. - - - - - -


lua_getupvalue

-[-0, +(0|1), –] -

const char *lua_getupvalue (lua_State *L, int funcindex, int n);
- -

-Gets information about a closure's upvalue. -(For Lua functions, -upvalues are the external local variables that the function uses, -and that are consequently included in its closure.) -lua_getupvalue gets the index n of an upvalue, -pushes the upvalue's value onto the stack, -and returns its name. -funcindex points to the closure in the stack. -(Upvalues have no particular order, -as they are active through the whole function. -So, they are numbered in an arbitrary order.) - - -

-Returns NULL (and pushes nothing) -when the index is greater than the number of upvalues. -For C functions, this function uses the empty string "" -as a name for all upvalues. - - - - - -


lua_Hook

-
typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
- -

-Type for debugging hook functions. - - -

-Whenever a hook is called, its ar argument has its field -event set to the specific event that triggered the hook. -Lua identifies these events with the following constants: -LUA_HOOKCALL, LUA_HOOKRET, -LUA_HOOKTAILCALL, LUA_HOOKLINE, -and LUA_HOOKCOUNT. -Moreover, for line events, the field currentline is also set. -To get the value of any other field in ar, -the hook must call lua_getinfo. - - -

-For call events, event can be LUA_HOOKCALL, -the normal value, or LUA_HOOKTAILCALL, for a tail call; -in this case, there will be no corresponding return event. - - -

-While Lua is running a hook, it disables other calls to hooks. -Therefore, if a hook calls back Lua to execute a function or a chunk, -this execution occurs without any calls to hooks. - - -

-Hook functions cannot have continuations, -that is, they cannot call lua_yieldk, -lua_pcallk, or lua_callk with a non-null k. - - -

-Hook functions can yield under the following conditions: -Only count and line events can yield -and they cannot yield any value; -to yield a hook function must finish its execution -calling lua_yield with nresults equal to zero. - - - - - -


lua_sethook

-[-0, +0, –] -

int lua_sethook (lua_State *L, lua_Hook f, int mask, int count);
- -

-Sets the debugging hook function. - - -

-Argument f is the hook function. -mask specifies on which events the hook will be called: -it is formed by a bitwise or of the constants -LUA_MASKCALL, -LUA_MASKRET, -LUA_MASKLINE, -and LUA_MASKCOUNT. -The count argument is only meaningful when the mask -includes LUA_MASKCOUNT. -For each event, the hook is called as explained below: - -

    - -
  • The call hook: is called when the interpreter calls a function. -The hook is called just after Lua enters the new function, -before the function gets its arguments. -
  • - -
  • The return hook: is called when the interpreter returns from a function. -The hook is called just before Lua leaves the function. -There is no standard way to access the values -to be returned by the function. -
  • - -
  • The line hook: is called when the interpreter is about to -start the execution of a new line of code, -or when it jumps back in the code (even to the same line). -(This event only happens while Lua is executing a Lua function.) -
  • - -
  • The count hook: is called after the interpreter executes every -count instructions. -(This event only happens while Lua is executing a Lua function.) -
  • - -
- -

-A hook is disabled by setting mask to zero. - - - - - -


lua_setlocal

-[-(0|1), +0, –] -

const char *lua_setlocal (lua_State *L, lua_Debug *ar, int n);
- -

-Sets the value of a local variable of a given activation record. -Parameters ar and n are as in lua_getlocal -(see lua_getlocal). -lua_setlocal assigns the value at the top of the stack -to the variable and returns its name. -It also pops the value from the stack. - - -

-Returns NULL (and pops nothing) -when the index is greater than -the number of active local variables. - - - - - -


lua_setupvalue

-[-(0|1), +0, –] -

const char *lua_setupvalue (lua_State *L, int funcindex, int n);
- -

-Sets the value of a closure's upvalue. -It assigns the value at the top of the stack -to the upvalue and returns its name. -It also pops the value from the stack. -Parameters funcindex and n are as in the lua_getupvalue -(see lua_getupvalue). - - -

-Returns NULL (and pops nothing) -when the index is greater than the number of upvalues. - - - - - -


lua_upvalueid

-[-0, +0, –] -

void *lua_upvalueid (lua_State *L, int funcindex, int n);
- -

-Returns an unique identifier for the upvalue numbered n -from the closure at index funcindex. -Parameters funcindex and n are as in the lua_getupvalue -(see lua_getupvalue) -(but n cannot be greater than the number of upvalues). - - -

-These unique identifiers allow a program to check whether different -closures share upvalues. -Lua closures that share an upvalue -(that is, that access a same external local variable) -will return identical ids for those upvalue indices. - - - - - -


lua_upvaluejoin

-[-0, +0, –] -

void lua_upvaluejoin (lua_State *L, int funcindex1, int n1,
-                                    int funcindex2, int n2);
- -

-Make the n1-th upvalue of the Lua closure at index funcindex1 -refer to the n2-th upvalue of the Lua closure at index funcindex2. - - - - - - - -

5 – The Auxiliary Library

- -

- -The auxiliary library provides several convenient functions -to interface C with Lua. -While the basic API provides the primitive functions for all -interactions between C and Lua, -the auxiliary library provides higher-level functions for some -common tasks. - - -

-All functions and types from the auxiliary library -are defined in header file lauxlib.h and -have a prefix luaL_. - - -

-All functions in the auxiliary library are built on -top of the basic API, -and so they provide nothing that cannot be done with that API. -Nevertheless, the use of the auxiliary library ensures -more consistency to your code. - - -

-Several functions in the auxiliary library use internally some -extra stack slots. -When a function in the auxiliary library uses less than five slots, -it does not check the stack size; -it simply assumes that there are enough slots. - - -

-Several functions in the auxiliary library are used to -check C function arguments. -Because the error message is formatted for arguments -(e.g., "bad argument #1"), -you should not use these functions for other stack values. - - -

-Functions called luaL_check* -always throw an error if the check is not satisfied. - - - -

5.1 – Functions and Types

- -

-Here we list all functions and types from the auxiliary library -in alphabetical order. - - - -


luaL_addchar

-[-?, +?, e] -

void luaL_addchar (luaL_Buffer *B, char c);
- -

-Adds the byte c to the buffer B -(see luaL_Buffer). - - - - - -


luaL_addlstring

-[-?, +?, e] -

void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l);
- -

-Adds the string pointed to by s with length l to -the buffer B -(see luaL_Buffer). -The string can contain embedded zeros. - - - - - -


luaL_addsize

-[-?, +?, e] -

void luaL_addsize (luaL_Buffer *B, size_t n);
- -

-Adds to the buffer B (see luaL_Buffer) -a string of length n previously copied to the -buffer area (see luaL_prepbuffer). - - - - - -


luaL_addstring

-[-?, +?, e] -

void luaL_addstring (luaL_Buffer *B, const char *s);
- -

-Adds the zero-terminated string pointed to by s -to the buffer B -(see luaL_Buffer). -The string cannot contain embedded zeros. - - - - - -


luaL_addvalue

-[-1, +?, e] -

void luaL_addvalue (luaL_Buffer *B);
- -

-Adds the value at the top of the stack -to the buffer B -(see luaL_Buffer). -Pops the value. - - -

-This is the only function on string buffers that can (and must) -be called with an extra element on the stack, -which is the value to be added to the buffer. - - - - - -


luaL_argcheck

-[-0, +0, v] -

void luaL_argcheck (lua_State *L,
-                    int cond,
-                    int arg,
-                    const char *extramsg);
- -

-Checks whether cond is true. -If not, raises an error with a standard message. - - - - - -


luaL_argerror

-[-0, +0, v] -

int luaL_argerror (lua_State *L, int arg, const char *extramsg);
- -

-Raises an error with a standard message -that includes extramsg as a comment. - - -

-This function never returns, -but it is an idiom to use it in C functions -as return luaL_argerror(args). - - - - - -


luaL_Buffer

-
typedef struct luaL_Buffer luaL_Buffer;
- -

-Type for a string buffer. - - -

-A string buffer allows C code to build Lua strings piecemeal. -Its pattern of use is as follows: - -

    - -
  • First declare a variable b of type luaL_Buffer.
  • - -
  • Then initialize it with a call luaL_buffinit(L, &b).
  • - -
  • -Then add string pieces to the buffer calling any of -the luaL_add* functions. -
  • - -
  • -Finish by calling luaL_pushresult(&b). -This call leaves the final string on the top of the stack. -
  • - -
- -

-If you know beforehand the total size of the resulting string, -you can use the buffer like this: - -

    - -
  • First declare a variable b of type luaL_Buffer.
  • - -
  • Then initialize it and preallocate a space of -size sz with a call luaL_buffinitsize(L, &b, sz).
  • - -
  • Then copy the string into that space.
  • - -
  • -Finish by calling luaL_pushresultsize(&b, sz), -where sz is the total size of the resulting string -copied into that space. -
  • - -
- -

-During its normal operation, -a string buffer uses a variable number of stack slots. -So, while using a buffer, you cannot assume that you know where -the top of the stack is. -You can use the stack between successive calls to buffer operations -as long as that use is balanced; -that is, -when you call a buffer operation, -the stack is at the same level -it was immediately after the previous buffer operation. -(The only exception to this rule is luaL_addvalue.) -After calling luaL_pushresult the stack is back to its -level when the buffer was initialized, -plus the final string on its top. - - - - - -


luaL_buffinit

-[-0, +0, –] -

void luaL_buffinit (lua_State *L, luaL_Buffer *B);
- -

-Initializes a buffer B. -This function does not allocate any space; -the buffer must be declared as a variable -(see luaL_Buffer). - - - - - -


luaL_buffinitsize

-[-?, +?, e] -

char *luaL_buffinitsize (lua_State *L, luaL_Buffer *B, size_t sz);
- -

-Equivalent to the sequence -luaL_buffinit, luaL_prepbuffsize. - - - - - -


luaL_callmeta

-[-0, +(0|1), e] -

int luaL_callmeta (lua_State *L, int obj, const char *e);
- -

-Calls a metamethod. - - -

-If the object at index obj has a metatable and this -metatable has a field e, -this function calls this field passing the object as its only argument. -In this case this function returns true and pushes onto the -stack the value returned by the call. -If there is no metatable or no metamethod, -this function returns false (without pushing any value on the stack). - - - - - -


luaL_checkany

-[-0, +0, v] -

void luaL_checkany (lua_State *L, int arg);
- -

-Checks whether the function has an argument -of any type (including nil) at position arg. - - - - - -


luaL_checkint

-[-0, +0, v] -

int luaL_checkint (lua_State *L, int arg);
- -

-Checks whether the function argument arg is a number -and returns this number cast to an int. - - - - - -


luaL_checkinteger

-[-0, +0, v] -

lua_Integer luaL_checkinteger (lua_State *L, int arg);
- -

-Checks whether the function argument arg is a number -and returns this number cast to a lua_Integer. - - - - - -


luaL_checklong

-[-0, +0, v] -

long luaL_checklong (lua_State *L, int arg);
- -

-Checks whether the function argument arg is a number -and returns this number cast to a long. - - - - - -


luaL_checklstring

-[-0, +0, v] -

const char *luaL_checklstring (lua_State *L, int arg, size_t *l);
- -

-Checks whether the function argument arg is a string -and returns this string; -if l is not NULL fills *l -with the string's length. - - -

-This function uses lua_tolstring to get its result, -so all conversions and caveats of that function apply here. - - - - - -


luaL_checknumber

-[-0, +0, v] -

lua_Number luaL_checknumber (lua_State *L, int arg);
- -

-Checks whether the function argument arg is a number -and returns this number. - - - - - -


luaL_checkoption

-[-0, +0, v] -

int luaL_checkoption (lua_State *L,
-                      int arg,
-                      const char *def,
-                      const char *const lst[]);
- -

-Checks whether the function argument arg is a string and -searches for this string in the array lst -(which must be NULL-terminated). -Returns the index in the array where the string was found. -Raises an error if the argument is not a string or -if the string cannot be found. - - -

-If def is not NULL, -the function uses def as a default value when -there is no argument arg or when this argument is nil. - - -

-This is a useful function for mapping strings to C enums. -(The usual convention in Lua libraries is -to use strings instead of numbers to select options.) - - - - - -


luaL_checkstack

-[-0, +0, v] -

void luaL_checkstack (lua_State *L, int sz, const char *msg);
- -

-Grows the stack size to top + sz elements, -raising an error if the stack cannot grow to that size. -msg is an additional text to go into the error message -(or NULL for no additional text). - - - - - -


luaL_checkstring

-[-0, +0, v] -

const char *luaL_checkstring (lua_State *L, int arg);
- -

-Checks whether the function argument arg is a string -and returns this string. - - -

-This function uses lua_tolstring to get its result, -so all conversions and caveats of that function apply here. - - - - - -


luaL_checktype

-[-0, +0, v] -

void luaL_checktype (lua_State *L, int arg, int t);
- -

-Checks whether the function argument arg has type t. -See lua_type for the encoding of types for t. - - - - - -


luaL_checkudata

-[-0, +0, v] -

void *luaL_checkudata (lua_State *L, int arg, const char *tname);
- -

-Checks whether the function argument arg is a userdata -of the type tname (see luaL_newmetatable) and -returns the userdata address (see lua_touserdata). - - - - - -


luaL_checkunsigned

-[-0, +0, v] -

lua_Unsigned luaL_checkunsigned (lua_State *L, int arg);
- -

-Checks whether the function argument arg is a number -and returns this number cast to a lua_Unsigned. - - - - - -


luaL_checkversion

-[-0, +0, –] -

void luaL_checkversion (lua_State *L);
- -

-Checks whether the core running the call, -the core that created the Lua state, -and the code making the call are all using the same version of Lua. -Also checks whether the core running the call -and the core that created the Lua state -are using the same address space. - - - - - -


luaL_dofile

-[-0, +?, e] -

int luaL_dofile (lua_State *L, const char *filename);
- -

-Loads and runs the given file. -It is defined as the following macro: - -

-     (luaL_loadfile(L, filename) || lua_pcall(L, 0, LUA_MULTRET, 0))
-

-It returns false if there are no errors -or true in case of errors. - - - - - -


luaL_dostring

-[-0, +?, –] -

int luaL_dostring (lua_State *L, const char *str);
- -

-Loads and runs the given string. -It is defined as the following macro: - -

-     (luaL_loadstring(L, str) || lua_pcall(L, 0, LUA_MULTRET, 0))
-

-It returns false if there are no errors -or true in case of errors. - - - - - -


luaL_error

-[-0, +0, v] -

int luaL_error (lua_State *L, const char *fmt, ...);
- -

-Raises an error. -The error message format is given by fmt -plus any extra arguments, -following the same rules of lua_pushfstring. -It also adds at the beginning of the message the file name and -the line number where the error occurred, -if this information is available. - - -

-This function never returns, -but it is an idiom to use it in C functions -as return luaL_error(args). - - - - - -


luaL_execresult

-[-0, +3, e] -

int luaL_execresult (lua_State *L, int stat);
- -

-This function produces the return values for -process-related functions in the standard library -(os.execute and io.close). - - - - - -


luaL_fileresult

-[-0, +(1|3), e] -

int luaL_fileresult (lua_State *L, int stat, const char *fname);
- -

-This function produces the return values for -file-related functions in the standard library -(io.open, os.rename, file:seek, etc.). - - - - - -


luaL_getmetafield

-[-0, +(0|1), e] -

int luaL_getmetafield (lua_State *L, int obj, const char *e);
- -

-Pushes onto the stack the field e from the metatable -of the object at index obj. -If the object does not have a metatable, -or if the metatable does not have this field, -returns false and pushes nothing. - - - - - -


luaL_getmetatable

-[-0, +1, –] -

void luaL_getmetatable (lua_State *L, const char *tname);
- -

-Pushes onto the stack the metatable associated with name tname -in the registry (see luaL_newmetatable). - - - - - -


luaL_getsubtable

-[-0, +1, e] -

int luaL_getsubtable (lua_State *L, int idx, const char *fname);
- -

-Ensures that the value t[fname], -where t is the value at index idx, -is a table, -and pushes that table onto the stack. -Returns true if it finds a previous table there -and false if it creates a new table. - - - - - -


luaL_gsub

-[-0, +1, e] -

const char *luaL_gsub (lua_State *L,
-                       const char *s,
-                       const char *p,
-                       const char *r);
- -

-Creates a copy of string s by replacing -any occurrence of the string p -with the string r. -Pushes the resulting string on the stack and returns it. - - - - - -


luaL_len

-[-0, +0, e] -

int luaL_len (lua_State *L, int index);
- -

-Returns the "length" of the value at the given index -as a number; -it is equivalent to the '#' operator in Lua (see §3.4.6). -Raises an error if the result of the operation is not a number. -(This case only can happen through metamethods.) - - - - - -


luaL_loadbuffer

-[-0, +1, –] -

int luaL_loadbuffer (lua_State *L,
-                     const char *buff,
-                     size_t sz,
-                     const char *name);
- -

-Equivalent to luaL_loadbufferx with mode equal to NULL. - - - - - -


luaL_loadbufferx

-[-0, +1, –] -

int luaL_loadbufferx (lua_State *L,
-                      const char *buff,
-                      size_t sz,
-                      const char *name,
-                      const char *mode);
- -

-Loads a buffer as a Lua chunk. -This function uses lua_load to load the chunk in the -buffer pointed to by buff with size sz. - - -

-This function returns the same results as lua_load. -name is the chunk name, -used for debug information and error messages. -The string mode works as in function lua_load. - - - - - -


luaL_loadfile

-[-0, +1, e] -

int luaL_loadfile (lua_State *L, const char *filename);
- -

-Equivalent to luaL_loadfilex with mode equal to NULL. - - - - - -


luaL_loadfilex

-[-0, +1, e] -

int luaL_loadfilex (lua_State *L, const char *filename,
-                                            const char *mode);
- -

-Loads a file as a Lua chunk. -This function uses lua_load to load the chunk in the file -named filename. -If filename is NULL, -then it loads from the standard input. -The first line in the file is ignored if it starts with a #. - - -

-The string mode works as in function lua_load. - - -

-This function returns the same results as lua_load, -but it has an extra error code LUA_ERRFILE -if it cannot open/read the file or the file has a wrong mode. - - -

-As lua_load, this function only loads the chunk; -it does not run it. - - - - - -


luaL_loadstring

-[-0, +1, –] -

int luaL_loadstring (lua_State *L, const char *s);
- -

-Loads a string as a Lua chunk. -This function uses lua_load to load the chunk in -the zero-terminated string s. - - -

-This function returns the same results as lua_load. - - -

-Also as lua_load, this function only loads the chunk; -it does not run it. - - - - - -


luaL_newlib

-[-0, +1, e] -

void luaL_newlib (lua_State *L, const luaL_Reg *l);
- -

-Creates a new table and registers there -the functions in list l. -It is implemented as the following macro: - -

-     (luaL_newlibtable(L,l), luaL_setfuncs(L,l,0))
-
- - - - -

luaL_newlibtable

-[-0, +1, e] -

void luaL_newlibtable (lua_State *L, const luaL_Reg l[]);
- -

-Creates a new table with a size optimized -to store all entries in the array l -(but does not actually store them). -It is intended to be used in conjunction with luaL_setfuncs -(see luaL_newlib). - - -

-It is implemented as a macro. -The array l must be the actual array, -not a pointer to it. - - - - - -


luaL_newmetatable

-[-0, +1, e] -

int luaL_newmetatable (lua_State *L, const char *tname);
- -

-If the registry already has the key tname, -returns 0. -Otherwise, -creates a new table to be used as a metatable for userdata, -adds it to the registry with key tname, -and returns 1. - - -

-In both cases pushes onto the stack the final value associated -with tname in the registry. - - - - - -


luaL_newstate

-[-0, +0, –] -

lua_State *luaL_newstate (void);
- -

-Creates a new Lua state. -It calls lua_newstate with an -allocator based on the standard C realloc function -and then sets a panic function (see §4.6) that prints -an error message to the standard error output in case of fatal -errors. - - -

-Returns the new state, -or NULL if there is a memory allocation error. - - - - - -


luaL_openlibs

-[-0, +0, e] -

void luaL_openlibs (lua_State *L);
- -

-Opens all standard Lua libraries into the given state. - - - - - -


luaL_optint

-[-0, +0, v] -

int luaL_optint (lua_State *L, int arg, int d);
- -

-If the function argument arg is a number, -returns this number cast to an int. -If this argument is absent or is nil, -returns d. -Otherwise, raises an error. - - - - - -


luaL_optinteger

-[-0, +0, v] -

lua_Integer luaL_optinteger (lua_State *L,
-                             int arg,
-                             lua_Integer d);
- -

-If the function argument arg is a number, -returns this number cast to a lua_Integer. -If this argument is absent or is nil, -returns d. -Otherwise, raises an error. - - - - - -


luaL_optlong

-[-0, +0, v] -

long luaL_optlong (lua_State *L, int arg, long d);
- -

-If the function argument arg is a number, -returns this number cast to a long. -If this argument is absent or is nil, -returns d. -Otherwise, raises an error. - - - - - -


luaL_optlstring

-[-0, +0, v] -

const char *luaL_optlstring (lua_State *L,
-                             int arg,
-                             const char *d,
-                             size_t *l);
- -

-If the function argument arg is a string, -returns this string. -If this argument is absent or is nil, -returns d. -Otherwise, raises an error. - - -

-If l is not NULL, -fills the position *l with the result's length. - - - - - -


luaL_optnumber

-[-0, +0, v] -

lua_Number luaL_optnumber (lua_State *L, int arg, lua_Number d);
- -

-If the function argument arg is a number, -returns this number. -If this argument is absent or is nil, -returns d. -Otherwise, raises an error. - - - - - -


luaL_optstring

-[-0, +0, v] -

const char *luaL_optstring (lua_State *L,
-                            int arg,
-                            const char *d);
- -

-If the function argument arg is a string, -returns this string. -If this argument is absent or is nil, -returns d. -Otherwise, raises an error. - - - - - -


luaL_optunsigned

-[-0, +0, v] -

lua_Unsigned luaL_optunsigned (lua_State *L,
-                               int arg,
-                               lua_Unsigned u);
- -

-If the function argument arg is a number, -returns this number cast to a lua_Unsigned. -If this argument is absent or is nil, -returns u. -Otherwise, raises an error. - - - - - -


luaL_prepbuffer

-[-?, +?, e] -

char *luaL_prepbuffer (luaL_Buffer *B);
- -

-Equivalent to luaL_prepbuffsize -with the predefined size LUAL_BUFFERSIZE. - - - - - -


luaL_prepbuffsize

-[-?, +?, e] -

char *luaL_prepbuffsize (luaL_Buffer *B, size_t sz);
- -

-Returns an address to a space of size sz -where you can copy a string to be added to buffer B -(see luaL_Buffer). -After copying the string into this space you must call -luaL_addsize with the size of the string to actually add -it to the buffer. - - - - - -


luaL_pushresult

-[-?, +1, e] -

void luaL_pushresult (luaL_Buffer *B);
- -

-Finishes the use of buffer B leaving the final string on -the top of the stack. - - - - - -


luaL_pushresultsize

-[-?, +1, e] -

void luaL_pushresultsize (luaL_Buffer *B, size_t sz);
- -

-Equivalent to the sequence luaL_addsize, luaL_pushresult. - - - - - -


luaL_ref

-[-1, +0, e] -

int luaL_ref (lua_State *L, int t);
- -

-Creates and returns a reference, -in the table at index t, -for the object at the top of the stack (and pops the object). - - -

-A reference is a unique integer key. -As long as you do not manually add integer keys into table t, -luaL_ref ensures the uniqueness of the key it returns. -You can retrieve an object referred by reference r -by calling lua_rawgeti(L, t, r). -Function luaL_unref frees a reference and its associated object. - - -

-If the object at the top of the stack is nil, -luaL_ref returns the constant LUA_REFNIL. -The constant LUA_NOREF is guaranteed to be different -from any reference returned by luaL_ref. - - - - - -


luaL_Reg

-
typedef struct luaL_Reg {
-  const char *name;
-  lua_CFunction func;
-} luaL_Reg;
- -

-Type for arrays of functions to be registered by -luaL_setfuncs. -name is the function name and func is a pointer to -the function. -Any array of luaL_Reg must end with an sentinel entry -in which both name and func are NULL. - - - - - -


luaL_requiref

-[-0, +1, e] -

void luaL_requiref (lua_State *L, const char *modname,
-                    lua_CFunction openf, int glb);
- -

-Calls function openf with string modname as an argument -and sets the call result in package.loaded[modname], -as if that function has been called through require. - - -

-If glb is true, -also stores the result into global modname. - - -

-Leaves a copy of that result on the stack. - - - - - -


luaL_setfuncs

-[-nup, +0, e] -

void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup);
- -

-Registers all functions in the array l -(see luaL_Reg) into the table on the top of the stack -(below optional upvalues, see next). - - -

-When nup is not zero, -all functions are created sharing nup upvalues, -which must be previously pushed on the stack -on top of the library table. -These values are popped from the stack after the registration. - - - - - -


luaL_setmetatable

-[-0, +0, –] -

void luaL_setmetatable (lua_State *L, const char *tname);
- -

-Sets the metatable of the object at the top of the stack -as the metatable associated with name tname -in the registry (see luaL_newmetatable). - - - - - -


luaL_testudata

-[-0, +0, e] -

void *luaL_testudata (lua_State *L, int arg, const char *tname);
- -

-This function works like luaL_checkudata, -except that, when the test fails, -it returns NULL instead of throwing an error. - - - - - -


luaL_tolstring

-[-0, +1, e] -

const char *luaL_tolstring (lua_State *L, int idx, size_t *len);
- -

-Converts any Lua value at the given index to a C string -in a reasonable format. -The resulting string is pushed onto the stack and also -returned by the function. -If len is not NULL, -the function also sets *len with the string length. - - -

-If the value has a metatable with a "__tostring" field, -then luaL_tolstring calls the corresponding metamethod -with the value as argument, -and uses the result of the call as its result. - - - - - -


luaL_traceback

-[-0, +1, e] -

void luaL_traceback (lua_State *L, lua_State *L1, const char *msg,
-                     int level);
- -

-Creates and pushes a traceback of the stack L1. -If msg is not NULL it is appended -at the beginning of the traceback. -The level parameter tells at which level -to start the traceback. - - - - - -


luaL_typename

-[-0, +0, –] -

const char *luaL_typename (lua_State *L, int index);
- -

-Returns the name of the type of the value at the given index. - - - - - -


luaL_unref

-[-0, +0, –] -

void luaL_unref (lua_State *L, int t, int ref);
- -

-Releases reference ref from the table at index t -(see luaL_ref). -The entry is removed from the table, -so that the referred object can be collected. -The reference ref is also freed to be used again. - - -

-If ref is LUA_NOREF or LUA_REFNIL, -luaL_unref does nothing. - - - - - -


luaL_where

-[-0, +1, e] -

void luaL_where (lua_State *L, int lvl);
- -

-Pushes onto the stack a string identifying the current position -of the control at level lvl in the call stack. -Typically this string has the following format: - -

-     chunkname:currentline:
-

-Level 0 is the running function, -level 1 is the function that called the running function, -etc. - - -

-This function is used to build a prefix for error messages. - - - - - - - -

6 – Standard Libraries

- -

-The standard Lua libraries provide useful functions -that are implemented directly through the C API. -Some of these functions provide essential services to the language -(e.g., type and getmetatable); -others provide access to "outside" services (e.g., I/O); -and others could be implemented in Lua itself, -but are quite useful or have critical performance requirements that -deserve an implementation in C (e.g., table.sort). - - -

-All libraries are implemented through the official C API -and are provided as separate C modules. -Currently, Lua has the following standard libraries: - -

    - -
  • basic library (§6.1);
  • - -
  • coroutine library (§6.2);
  • - -
  • package library (§6.3);
  • - -
  • string manipulation (§6.4);
  • - -
  • table manipulation (§6.5);
  • - -
  • mathematical functions (§6.6) (sin, log, etc.);
  • - -
  • bitwise operations (§6.7);
  • - -
  • input and output (§6.8);
  • - -
  • operating system facilities (§6.9);
  • - -
  • debug facilities (§6.10).
  • - -

-Except for the basic and the package libraries, -each library provides all its functions as fields of a global table -or as methods of its objects. - - -

-To have access to these libraries, -the C host program should call the luaL_openlibs function, -which opens all standard libraries. -Alternatively, -the host program can open them individually by using -luaL_requiref to call -luaopen_base (for the basic library), -luaopen_package (for the package library), -luaopen_coroutine (for the coroutine library), -luaopen_string (for the string library), -luaopen_table (for the table library), -luaopen_math (for the mathematical library), -luaopen_bit32 (for the bit library), -luaopen_io (for the I/O library), -luaopen_os (for the Operating System library), -and luaopen_debug (for the debug library). -These functions are declared in lualib.h. - - - -

6.1 – Basic Functions

- -

-The basic library provides core functions to Lua. -If you do not include this library in your application, -you should check carefully whether you need to provide -implementations for some of its facilities. - - -

-


assert (v [, message])

-Issues an error when -the value of its argument v is false (i.e., nil or false); -otherwise, returns all its arguments. -message is an error message; -when absent, it defaults to "assertion failed!" - - - - -

-


collectgarbage ([opt [, arg]])

- - -

-This function is a generic interface to the garbage collector. -It performs different functions according to its first argument, opt: - -

    - -
  • "collect": -performs a full garbage-collection cycle. -This is the default option. -
  • - -
  • "stop": -stops automatic execution of the garbage collector. -The collector will run only when explicitly invoked, -until a call to restart it. -
  • - -
  • "restart": -restarts automatic execution of the garbage collector. -
  • - -
  • "count": -returns the total memory in use by Lua (in Kbytes) and -a second value with the total memory in bytes modulo 1024. -The first value has a fractional part, -so the following equality is always true: - -
    -     k, b = collectgarbage("count")
    -     assert(k*1024 == math.floor(k)*1024 + b)
    -

    -(The second result is useful when Lua is compiled -with a non floating-point type for numbers.) -

  • - -
  • "step": -performs a garbage-collection step. -The step "size" is controlled by arg -(larger values mean more steps) in a non-specified way. -If you want to control the step size -you must experimentally tune the value of arg. -Returns true if the step finished a collection cycle. -
  • - -
  • "setpause": -sets arg as the new value for the pause of -the collector (see §2.5). -Returns the previous value for pause. -
  • - -
  • "setstepmul": -sets arg as the new value for the step multiplier of -the collector (see §2.5). -Returns the previous value for step. -
  • - -
  • "isrunning": -returns a boolean that tells whether the collector is running -(i.e., not stopped). -
  • - -
  • "generational": -changes the collector to generational mode. -This is an experimental feature (see §2.5). -
  • - -
  • "incremental": -changes the collector to incremental mode. -This is the default mode. -
  • - -
- - - -

-


dofile ([filename])

-Opens the named file and executes its contents as a Lua chunk. -When called without arguments, -dofile executes the contents of the standard input (stdin). -Returns all values returned by the chunk. -In case of errors, dofile propagates the error -to its caller (that is, dofile does not run in protected mode). - - - - -

-


error (message [, level])

-Terminates the last protected function called -and returns message as the error message. -Function error never returns. - - -

-Usually, error adds some information about the error position -at the beginning of the message, if the message is a string. -The level argument specifies how to get the error position. -With level 1 (the default), the error position is where the -error function was called. -Level 2 points the error to where the function -that called error was called; and so on. -Passing a level 0 avoids the addition of error position information -to the message. - - - - -

-


_G

-A global variable (not a function) that -holds the global environment (see §2.2). -Lua itself does not use this variable; -changing its value does not affect any environment, -nor vice-versa. - - - - -

-


getmetatable (object)

- - -

-If object does not have a metatable, returns nil. -Otherwise, -if the object's metatable has a "__metatable" field, -returns the associated value. -Otherwise, returns the metatable of the given object. - - - - -

-


ipairs (t)

- - -

-If t has a metamethod __ipairs, -calls it with t as argument and returns the first three -results from the call. - - -

-Otherwise, -returns three values: an iterator function, the table t, and 0, -so that the construction - -

-     for i,v in ipairs(t) do body end
-

-will iterate over the pairs (1,t[1]), (2,t[2]), ..., -up to the first integer key absent from the table. - - - - -

-


load (ld [, source [, mode [, env]]])

- - -

-Loads a chunk. - - -

-If ld is a string, the chunk is this string. -If ld is a function, -load calls it repeatedly to get the chunk pieces. -Each call to ld must return a string that concatenates -with previous results. -A return of an empty string, nil, or no value signals the end of the chunk. - - -

-If there are no syntactic errors, -returns the compiled chunk as a function; -otherwise, returns nil plus the error message. - - -

-If the resulting function has upvalues, -the first upvalue is set to the value of env, -if that parameter is given, -or to the value of the global environment. -(When you load a main chunk, -the resulting function will always have exactly one upvalue, -the _ENV variable (see §2.2). -When you load a binary chunk created from a function (see string.dump), -the resulting function can have arbitrary upvalues.) - - -

-source is used as the source of the chunk for error messages -and debug information (see §4.9). -When absent, -it defaults to ld, if ld is a string, -or to "=(load)" otherwise. - - -

-The string mode controls whether the chunk can be text or binary -(that is, a precompiled chunk). -It may be the string "b" (only binary chunks), -"t" (only text chunks), -or "bt" (both binary and text). -The default is "bt". - - - - -

-


loadfile ([filename [, mode [, env]]])

- - -

-Similar to load, -but gets the chunk from file filename -or from the standard input, -if no file name is given. - - - - -

-


next (table [, index])

- - -

-Allows a program to traverse all fields of a table. -Its first argument is a table and its second argument -is an index in this table. -next returns the next index of the table -and its associated value. -When called with nil as its second argument, -next returns an initial index -and its associated value. -When called with the last index, -or with nil in an empty table, -next returns nil. -If the second argument is absent, then it is interpreted as nil. -In particular, -you can use next(t) to check whether a table is empty. - - -

-The order in which the indices are enumerated is not specified, -even for numeric indices. -(To traverse a table in numeric order, -use a numerical for.) - - -

-The behavior of next is undefined if, -during the traversal, -you assign any value to a non-existent field in the table. -You may however modify existing fields. -In particular, you may clear existing fields. - - - - -

-


pairs (t)

- - -

-If t has a metamethod __pairs, -calls it with t as argument and returns the first three -results from the call. - - -

-Otherwise, -returns three values: the next function, the table t, and nil, -so that the construction - -

-     for k,v in pairs(t) do body end
-

-will iterate over all key–value pairs of table t. - - -

-See function next for the caveats of modifying -the table during its traversal. - - - - -

-


pcall (f [, arg1, ···])

- - -

-Calls function f with -the given arguments in protected mode. -This means that any error inside f is not propagated; -instead, pcall catches the error -and returns a status code. -Its first result is the status code (a boolean), -which is true if the call succeeds without errors. -In such case, pcall also returns all results from the call, -after this first result. -In case of any error, pcall returns false plus the error message. - - - - -

-


print (···)

-Receives any number of arguments -and prints their values to stdout, -using the tostring function to convert each argument to a string. -print is not intended for formatted output, -but only as a quick way to show a value, -for instance for debugging. -For complete control over the output, -use string.format and io.write. - - - - -

-


rawequal (v1, v2)

-Checks whether v1 is equal to v2, -without invoking any metamethod. -Returns a boolean. - - - - -

-


rawget (table, index)

-Gets the real value of table[index], -without invoking any metamethod. -table must be a table; -index may be any value. - - - - -

-


rawlen (v)

-Returns the length of the object v, -which must be a table or a string, -without invoking any metamethod. -Returns an integer number. - - - - -

-


rawset (table, index, value)

-Sets the real value of table[index] to value, -without invoking any metamethod. -table must be a table, -index any value different from nil and NaN, -and value any Lua value. - - -

-This function returns table. - - - - -

-


select (index, ···)

- - -

-If index is a number, -returns all arguments after argument number index; -a negative number indexes from the end (-1 is the last argument). -Otherwise, index must be the string "#", -and select returns the total number of extra arguments it received. - - - - -

-


setmetatable (table, metatable)

- - -

-Sets the metatable for the given table. -(You cannot change the metatable of other types from Lua, only from C.) -If metatable is nil, -removes the metatable of the given table. -If the original metatable has a "__metatable" field, -raises an error. - - -

-This function returns table. - - - - -

-


tonumber (e [, base])

- - -

-When called with no base, -tonumber tries to convert its argument to a number. -If the argument is already a number or -a string convertible to a number (see §3.4.2), -then tonumber returns this number; -otherwise, it returns nil. - - -

-When called with base, -then e should be a string to be interpreted as -an integer numeral in that base. -The base may be any integer between 2 and 36, inclusive. -In bases above 10, the letter 'A' (in either upper or lower case) -represents 10, 'B' represents 11, and so forth, -with 'Z' representing 35. -If the string e is not a valid numeral in the given base, -the function returns nil. - - - - -

-


tostring (v)

-Receives a value of any type and -converts it to a string in a reasonable format. -(For complete control of how numbers are converted, -use string.format.) - - -

-If the metatable of v has a "__tostring" field, -then tostring calls the corresponding value -with v as argument, -and uses the result of the call as its result. - - - - -

-


type (v)

-Returns the type of its only argument, coded as a string. -The possible results of this function are -"nil" (a string, not the value nil), -"number", -"string", -"boolean", -"table", -"function", -"thread", -and "userdata". - - - - -

-


_VERSION

-A global variable (not a function) that -holds a string containing the current interpreter version. -The current contents of this variable is "Lua 5.2". - - - - -

-


xpcall (f, msgh [, arg1, ···])

- - -

-This function is similar to pcall, -except that it sets a new message handler msgh. - - - - - - - -

6.2 – Coroutine Manipulation

- -

-The operations related to coroutines comprise a sub-library of -the basic library and come inside the table coroutine. -See §2.6 for a general description of coroutines. - - -

-


coroutine.create (f)

- - -

-Creates a new coroutine, with body f. -f must be a Lua function. -Returns this new coroutine, -an object with type "thread". - - - - -

-


coroutine.resume (co [, val1, ···])

- - -

-Starts or continues the execution of coroutine co. -The first time you resume a coroutine, -it starts running its body. -The values val1, ... are passed -as the arguments to the body function. -If the coroutine has yielded, -resume restarts it; -the values val1, ... are passed -as the results from the yield. - - -

-If the coroutine runs without any errors, -resume returns true plus any values passed to yield -(if the coroutine yields) or any values returned by the body function -(if the coroutine terminates). -If there is any error, -resume returns false plus the error message. - - - - -

-


coroutine.running ()

- - -

-Returns the running coroutine plus a boolean, -true when the running coroutine is the main one. - - - - -

-


coroutine.status (co)

- - -

-Returns the status of coroutine co, as a string: -"running", -if the coroutine is running (that is, it called status); -"suspended", if the coroutine is suspended in a call to yield, -or if it has not started running yet; -"normal" if the coroutine is active but not running -(that is, it has resumed another coroutine); -and "dead" if the coroutine has finished its body function, -or if it has stopped with an error. - - - - -

-


coroutine.wrap (f)

- - -

-Creates a new coroutine, with body f. -f must be a Lua function. -Returns a function that resumes the coroutine each time it is called. -Any arguments passed to the function behave as the -extra arguments to resume. -Returns the same values returned by resume, -except the first boolean. -In case of error, propagates the error. - - - - -

-


coroutine.yield (···)

- - -

-Suspends the execution of the calling coroutine. -Any arguments to yield are passed as extra results to resume. - - - - - - - -

6.3 – Modules

- -

-The package library provides basic -facilities for loading modules in Lua. -It exports one function directly in the global environment: -require. -Everything else is exported in a table package. - - -

-


require (modname)

- - -

-Loads the given module. -The function starts by looking into the package.loaded table -to determine whether modname is already loaded. -If it is, then require returns the value stored -at package.loaded[modname]. -Otherwise, it tries to find a loader for the module. - - -

-To find a loader, -require is guided by the package.searchers sequence. -By changing this sequence, -we can change how require looks for a module. -The following explanation is based on the default configuration -for package.searchers. - - -

-First require queries package.preload[modname]. -If it has a value, -this value (which should be a function) is the loader. -Otherwise require searches for a Lua loader using the -path stored in package.path. -If that also fails, it searches for a C loader using the -path stored in package.cpath. -If that also fails, -it tries an all-in-one loader (see package.searchers). - - -

-Once a loader is found, -require calls the loader with two arguments: -modname and an extra value dependent on how it got the loader. -(If the loader came from a file, -this extra value is the file name.) -If the loader returns any non-nil value, -require assigns the returned value to package.loaded[modname]. -If the loader does not return a non-nil value and -has not assigned any value to package.loaded[modname], -then require assigns true to this entry. -In any case, require returns the -final value of package.loaded[modname]. - - -

-If there is any error loading or running the module, -or if it cannot find any loader for the module, -then require raises an error. - - - - -

-


package.config

- - -

-A string describing some compile-time configurations for packages. -This string is a sequence of lines: - -

    - -
  • The first line is the directory separator string. -Default is '\' for Windows and '/' for all other systems.
  • - -
  • The second line is the character that separates templates in a path. -Default is ';'.
  • - -
  • The third line is the string that marks the -substitution points in a template. -Default is '?'.
  • - -
  • The fourth line is a string that, in a path in Windows, -is replaced by the executable's directory. -Default is '!'.
  • - -
  • The fifth line is a mark to ignore all text before it -when building the luaopen_ function name. -Default is '-'.
  • - -
- - - -

-


package.cpath

- - -

-The path used by require to search for a C loader. - - -

-Lua initializes the C path package.cpath in the same way -it initializes the Lua path package.path, -using the environment variable LUA_CPATH_5_2 -or the environment variable LUA_CPATH -or a default path defined in luaconf.h. - - - - -

-


package.loaded

- - -

-A table used by require to control which -modules are already loaded. -When you require a module modname and -package.loaded[modname] is not false, -require simply returns the value stored there. - - -

-This variable is only a reference to the real table; -assignments to this variable do not change the -table used by require. - - - - -

-


package.loadlib (libname, funcname)

- - -

-Dynamically links the host program with the C library libname. - - -

-If funcname is "*", -then it only links with the library, -making the symbols exported by the library -available to other dynamically linked libraries. -Otherwise, -it looks for a function funcname inside the library -and returns this function as a C function. -So, funcname must follow the lua_CFunction prototype -(see lua_CFunction). - - -

-This is a low-level function. -It completely bypasses the package and module system. -Unlike require, -it does not perform any path searching and -does not automatically adds extensions. -libname must be the complete file name of the C library, -including if necessary a path and an extension. -funcname must be the exact name exported by the C library -(which may depend on the C compiler and linker used). - - -

-This function is not supported by Standard C. -As such, it is only available on some platforms -(Windows, Linux, Mac OS X, Solaris, BSD, -plus other Unix systems that support the dlfcn standard). - - - - -

-


package.path

- - -

-The path used by require to search for a Lua loader. - - -

-At start-up, Lua initializes this variable with -the value of the environment variable LUA_PATH_5_2 or -the environment variable LUA_PATH or -with a default path defined in luaconf.h, -if those environment variables are not defined. -Any ";;" in the value of the environment variable -is replaced by the default path. - - - - -

-


package.preload

- - -

-A table to store loaders for specific modules -(see require). - - -

-This variable is only a reference to the real table; -assignments to this variable do not change the -table used by require. - - - - -

-


package.searchers

- - -

-A table used by require to control how to load modules. - - -

-Each entry in this table is a searcher function. -When looking for a module, -require calls each of these searchers in ascending order, -with the module name (the argument given to require) as its -sole parameter. -The function can return another function (the module loader) -plus an extra value that will be passed to that loader, -or a string explaining why it did not find that module -(or nil if it has nothing to say). - - -

-Lua initializes this table with four searcher functions. - - -

-The first searcher simply looks for a loader in the -package.preload table. - - -

-The second searcher looks for a loader as a Lua library, -using the path stored at package.path. -The search is done as described in function package.searchpath. - - -

-The third searcher looks for a loader as a C library, -using the path given by the variable package.cpath. -Again, -the search is done as described in function package.searchpath. -For instance, -if the C path is the string - -

-     "./?.so;./?.dll;/usr/local/?/init.so"
-

-the searcher for module foo -will try to open the files ./foo.so, ./foo.dll, -and /usr/local/foo/init.so, in that order. -Once it finds a C library, -this searcher first uses a dynamic link facility to link the -application with the library. -Then it tries to find a C function inside the library to -be used as the loader. -The name of this C function is the string "luaopen_" -concatenated with a copy of the module name where each dot -is replaced by an underscore. -Moreover, if the module name has a hyphen, -its prefix up to (and including) the first hyphen is removed. -For instance, if the module name is a.v1-b.c, -the function name will be luaopen_b_c. - - -

-The fourth searcher tries an all-in-one loader. -It searches the C path for a library for -the root name of the given module. -For instance, when requiring a.b.c, -it will search for a C library for a. -If found, it looks into it for an open function for -the submodule; -in our example, that would be luaopen_a_b_c. -With this facility, a package can pack several C submodules -into one single library, -with each submodule keeping its original open function. - - -

-All searchers except the first one (preload) return as the extra value -the file name where the module was found, -as returned by package.searchpath. -The first searcher returns no extra value. - - - - -

-


package.searchpath (name, path [, sep [, rep]])

- - -

-Searches for the given name in the given path. - - -

-A path is a string containing a sequence of -templates separated by semicolons. -For each template, -the function replaces each interrogation mark (if any) -in the template with a copy of name -wherein all occurrences of sep -(a dot, by default) -were replaced by rep -(the system's directory separator, by default), -and then tries to open the resulting file name. - - -

-For instance, if the path is the string - -

-     "./?.lua;./?.lc;/usr/local/?/init.lua"
-

-the search for the name foo.a -will try to open the files -./foo/a.lua, ./foo/a.lc, and -/usr/local/foo/a/init.lua, in that order. - - -

-Returns the resulting name of the first file that it can -open in read mode (after closing the file), -or nil plus an error message if none succeeds. -(This error message lists all file names it tried to open.) - - - - - - - -

6.4 – String Manipulation

- -

-This library provides generic functions for string manipulation, -such as finding and extracting substrings, and pattern matching. -When indexing a string in Lua, the first character is at position 1 -(not at 0, as in C). -Indices are allowed to be negative and are interpreted as indexing backwards, -from the end of the string. -Thus, the last character is at position -1, and so on. - - -

-The string library provides all its functions inside the table -string. -It also sets a metatable for strings -where the __index field points to the string table. -Therefore, you can use the string functions in object-oriented style. -For instance, string.byte(s,i) -can be written as s:byte(i). - - -

-The string library assumes one-byte character encodings. - - -

-


string.byte (s [, i [, j]])

-Returns the internal numerical codes of the characters s[i], -s[i+1], ..., s[j]. -The default value for i is 1; -the default value for j is i. -These indices are corrected -following the same rules of function string.sub. - - -

-Numerical codes are not necessarily portable across platforms. - - - - -

-


string.char (···)

-Receives zero or more integers. -Returns a string with length equal to the number of arguments, -in which each character has the internal numerical code equal -to its corresponding argument. - - -

-Numerical codes are not necessarily portable across platforms. - - - - -

-


string.dump (function)

- - -

-Returns a string containing a binary representation of the given function, -so that a later load on this string returns -a copy of the function (but with new upvalues). - - - - -

-


string.find (s, pattern [, init [, plain]])

- - -

-Looks for the first match of -pattern in the string s. -If it finds a match, then find returns the indices of s -where this occurrence starts and ends; -otherwise, it returns nil. -A third, optional numerical argument init specifies -where to start the search; -its default value is 1 and can be negative. -A value of true as a fourth, optional argument plain -turns off the pattern matching facilities, -so the function does a plain "find substring" operation, -with no characters in pattern being considered magic. -Note that if plain is given, then init must be given as well. - - -

-If the pattern has captures, -then in a successful match -the captured values are also returned, -after the two indices. - - - - -

-


string.format (formatstring, ···)

- - -

-Returns a formatted version of its variable number of arguments -following the description given in its first argument (which must be a string). -The format string follows the same rules as the ANSI C function sprintf. -The only differences are that the options/modifiers -*, h, L, l, n, -and p are not supported -and that there is an extra option, q. -The q option formats a string between double quotes, -using escape sequences when necessary to ensure that -it can safely be read back by the Lua interpreter. -For instance, the call - -

-     string.format('%q', 'a string with "quotes" and \n new line')
-

-may produce the string: - -

-     "a string with \"quotes\" and \
-      new line"
-
- -

-Options -A and a (when available), -E, e, f, -G, and g all expect a number as argument. -Options c, d, -i, o, u, X, and x -also expect a number, -but the range of that number may be limited by -the underlying C implementation. -For options o, u, X, and x, -the number cannot be negative. -Option q expects a string; -option s expects a string without embedded zeros. -If the argument to option s is not a string, -it is converted to one following the same rules of tostring. - - - - -

-


string.gmatch (s, pattern)

-Returns an iterator function that, -each time it is called, -returns the next captures from pattern over the string s. -If pattern specifies no captures, -then the whole match is produced in each call. - - -

-As an example, the following loop -will iterate over all the words from string s, -printing one per line: - -

-     s = "hello world from Lua"
-     for w in string.gmatch(s, "%a+") do
-       print(w)
-     end
-

-The next example collects all pairs key=value from the -given string into a table: - -

-     t = {}
-     s = "from=world, to=Lua"
-     for k, v in string.gmatch(s, "(%w+)=(%w+)") do
-       t[k] = v
-     end
-
- -

-For this function, a caret '^' at the start of a pattern does not -work as an anchor, as this would prevent the iteration. - - - - -

-


string.gsub (s, pattern, repl [, n])

-Returns a copy of s -in which all (or the first n, if given) -occurrences of the pattern have been -replaced by a replacement string specified by repl, -which can be a string, a table, or a function. -gsub also returns, as its second value, -the total number of matches that occurred. -The name gsub comes from Global SUBstitution. - - -

-If repl is a string, then its value is used for replacement. -The character % works as an escape character: -any sequence in repl of the form %d, -with d between 1 and 9, -stands for the value of the d-th captured substring. -The sequence %0 stands for the whole match. -The sequence %% stands for a single %. - - -

-If repl is a table, then the table is queried for every match, -using the first capture as the key. - - -

-If repl is a function, then this function is called every time a -match occurs, with all captured substrings passed as arguments, -in order. - - -

-In any case, -if the pattern specifies no captures, -then it behaves as if the whole pattern was inside a capture. - - -

-If the value returned by the table query or by the function call -is a string or a number, -then it is used as the replacement string; -otherwise, if it is false or nil, -then there is no replacement -(that is, the original match is kept in the string). - - -

-Here are some examples: - -

-     x = string.gsub("hello world", "(%w+)", "%1 %1")
-     --> x="hello hello world world"
-     
-     x = string.gsub("hello world", "%w+", "%0 %0", 1)
-     --> x="hello hello world"
-     
-     x = string.gsub("hello world from Lua", "(%w+)%s*(%w+)", "%2 %1")
-     --> x="world hello Lua from"
-     
-     x = string.gsub("home = $HOME, user = $USER", "%$(%w+)", os.getenv)
-     --> x="home = /home/roberto, user = roberto"
-     
-     x = string.gsub("4+5 = $return 4+5$", "%$(.-)%$", function (s)
-           return load(s)()
-         end)
-     --> x="4+5 = 9"
-     
-     local t = {name="lua", version="5.2"}
-     x = string.gsub("$name-$version.tar.gz", "%$(%w+)", t)
-     --> x="lua-5.2.tar.gz"
-
- - - -

-


string.len (s)

-Receives a string and returns its length. -The empty string "" has length 0. -Embedded zeros are counted, -so "a\000bc\000" has length 5. - - - - -

-


string.lower (s)

-Receives a string and returns a copy of this string with all -uppercase letters changed to lowercase. -All other characters are left unchanged. -The definition of what an uppercase letter is depends on the current locale. - - - - -

-


string.match (s, pattern [, init])

-Looks for the first match of -pattern in the string s. -If it finds one, then match returns -the captures from the pattern; -otherwise it returns nil. -If pattern specifies no captures, -then the whole match is returned. -A third, optional numerical argument init specifies -where to start the search; -its default value is 1 and can be negative. - - - - -

-


string.rep (s, n [, sep])

-Returns a string that is the concatenation of n copies of -the string s separated by the string sep. -The default value for sep is the empty string -(that is, no separator). - - - - -

-


string.reverse (s)

-Returns a string that is the string s reversed. - - - - -

-


string.sub (s, i [, j])

-Returns the substring of s that -starts at i and continues until j; -i and j can be negative. -If j is absent, then it is assumed to be equal to -1 -(which is the same as the string length). -In particular, -the call string.sub(s,1,j) returns a prefix of s -with length j, -and string.sub(s, -i) returns a suffix of s -with length i. - - -

-If, after the translation of negative indices, -i is less than 1, -it is corrected to 1. -If j is greater than the string length, -it is corrected to that length. -If, after these corrections, -i is greater than j, -the function returns the empty string. - - - - -

-


string.upper (s)

-Receives a string and returns a copy of this string with all -lowercase letters changed to uppercase. -All other characters are left unchanged. -The definition of what a lowercase letter is depends on the current locale. - - - -

6.4.1 – Patterns

- - -

Character Class:

-A character class is used to represent a set of characters. -The following combinations are allowed in describing a character class: - -

    - -
  • x: -(where x is not one of the magic characters -^$()%.[]*+-?) -represents the character x itself. -
  • - -
  • .: (a dot) represents all characters.
  • - -
  • %a: represents all letters.
  • - -
  • %c: represents all control characters.
  • - -
  • %d: represents all digits.
  • - -
  • %g: represents all printable characters except space.
  • - -
  • %l: represents all lowercase letters.
  • - -
  • %p: represents all punctuation characters.
  • - -
  • %s: represents all space characters.
  • - -
  • %u: represents all uppercase letters.
  • - -
  • %w: represents all alphanumeric characters.
  • - -
  • %x: represents all hexadecimal digits.
  • - -
  • %x: (where x is any non-alphanumeric character) -represents the character x. -This is the standard way to escape the magic characters. -Any punctuation character (even the non magic) -can be preceded by a '%' -when used to represent itself in a pattern. -
  • - -
  • [set]: -represents the class which is the union of all -characters in set. -A range of characters can be specified by -separating the end characters of the range, -in ascending order, with a '-', -All classes %x described above can also be used as -components in set. -All other characters in set represent themselves. -For example, [%w_] (or [_%w]) -represents all alphanumeric characters plus the underscore, -[0-7] represents the octal digits, -and [0-7%l%-] represents the octal digits plus -the lowercase letters plus the '-' character. - - -

    -The interaction between ranges and classes is not defined. -Therefore, patterns like [%a-z] or [a-%%] -have no meaning. -

  • - -
  • [^set]: -represents the complement of set, -where set is interpreted as above. -
  • - -

-For all classes represented by single letters (%a, %c, etc.), -the corresponding uppercase letter represents the complement of the class. -For instance, %S represents all non-space characters. - - -

-The definitions of letter, space, and other character groups -depend on the current locale. -In particular, the class [a-z] may not be equivalent to %l. - - - - - -

Pattern Item:

-A pattern item can be - -

    - -
  • -a single character class, -which matches any single character in the class; -
  • - -
  • -a single character class followed by '*', -which matches 0 or more repetitions of characters in the class. -These repetition items will always match the longest possible sequence; -
  • - -
  • -a single character class followed by '+', -which matches 1 or more repetitions of characters in the class. -These repetition items will always match the longest possible sequence; -
  • - -
  • -a single character class followed by '-', -which also matches 0 or more repetitions of characters in the class. -Unlike '*', -these repetition items will always match the shortest possible sequence; -
  • - -
  • -a single character class followed by '?', -which matches 0 or 1 occurrence of a character in the class; -
  • - -
  • -%n, for n between 1 and 9; -such item matches a substring equal to the n-th captured string -(see below); -
  • - -
  • -%bxy, where x and y are two distinct characters; -such item matches strings that start with x, end with y, -and where the x and y are balanced. -This means that, if one reads the string from left to right, -counting +1 for an x and -1 for a y, -the ending y is the first y where the count reaches 0. -For instance, the item %b() matches expressions with -balanced parentheses. -
  • - -
  • -%f[set], a frontier pattern; -such item matches an empty string at any position such that -the next character belongs to set -and the previous character does not belong to set. -The set set is interpreted as previously described. -The beginning and the end of the subject are handled as if -they were the character '\0'. -
  • - -
- - - - -

Pattern:

-A pattern is a sequence of pattern items. -A caret '^' at the beginning of a pattern anchors the match at the -beginning of the subject string. -A '$' at the end of a pattern anchors the match at the -end of the subject string. -At other positions, -'^' and '$' have no special meaning and represent themselves. - - - - - -

Captures:

-A pattern can contain sub-patterns enclosed in parentheses; -they describe captures. -When a match succeeds, the substrings of the subject string -that match captures are stored (captured) for future use. -Captures are numbered according to their left parentheses. -For instance, in the pattern "(a*(.)%w(%s*))", -the part of the string matching "a*(.)%w(%s*)" is -stored as the first capture (and therefore has number 1); -the character matching "." is captured with number 2, -and the part matching "%s*" has number 3. - - -

-As a special case, the empty capture () captures -the current string position (a number). -For instance, if we apply the pattern "()aa()" on the -string "flaaap", there will be two captures: 3 and 5. - - - - - - - - - - - -

6.5 – Table Manipulation

- -

-This library provides generic functions for table manipulation. -It provides all its functions inside the table table. - - -

-Remember that, whenever an operation needs the length of a table, -the table should be a proper sequence -or have a __len metamethod (see §3.4.6). -All functions ignore non-numeric keys -in tables given as arguments. - - -

-For performance reasons, -all table accesses (get/set) performed by these functions are raw. - - -

-


table.concat (list [, sep [, i [, j]]])

- - -

-Given a list where all elements are strings or numbers, -returns the string list[i]..sep..list[i+1] ··· sep..list[j]. -The default value for sep is the empty string, -the default for i is 1, -and the default for j is #list. -If i is greater than j, returns the empty string. - - - - -

-


table.insert (list, [pos,] value)

- - -

-Inserts element value at position pos in list, -shifting up the elements -list[pos], list[pos+1], ···, list[#list]. -The default value for pos is #list+1, -so that a call table.insert(t,x) inserts x at the end -of list t. - - - - -

-


table.pack (···)

- - -

-Returns a new table with all parameters stored into keys 1, 2, etc. -and with a field "n" with the total number of parameters. -Note that the resulting table may not be a sequence. - - - - -

-


table.remove (list [, pos])

- - -

-Removes from list the element at position pos, -returning the value of the removed element. -When pos is an integer between 1 and #list, -it shifts down the elements -list[pos+1], list[pos+2], ···, list[#list] -and erases element list[#list]; -The index pos can also be 0 when #list is 0, -or #list + 1; -in those cases, the function erases the element list[pos]. - - -

-The default value for pos is #list, -so that a call table.remove(t) removes the last element -of list t. - - - - -

-


table.sort (list [, comp])

- - -

-Sorts list elements in a given order, in-place, -from list[1] to list[#list]. -If comp is given, -then it must be a function that receives two list elements -and returns true when the first element must come -before the second in the final order -(so that not comp(list[i+1],list[i]) will be true after the sort). -If comp is not given, -then the standard Lua operator < is used instead. - - -

-The sort algorithm is not stable; -that is, elements considered equal by the given order -may have their relative positions changed by the sort. - - - - -

-


table.unpack (list [, i [, j]])

- - -

-Returns the elements from the given table. -This function is equivalent to - -

-     return list[i], list[i+1], ···, list[j]
-

-By default, i is 1 and j is #list. - - - - - - - -

6.6 – Mathematical Functions

- -

-This library is an interface to the standard C math library. -It provides all its functions inside the table math. - - -

-


math.abs (x)

- - -

-Returns the absolute value of x. - - - - -

-


math.acos (x)

- - -

-Returns the arc cosine of x (in radians). - - - - -

-


math.asin (x)

- - -

-Returns the arc sine of x (in radians). - - - - -

-


math.atan (x)

- - -

-Returns the arc tangent of x (in radians). - - - - -

-


math.atan2 (y, x)

- - -

-Returns the arc tangent of y/x (in radians), -but uses the signs of both parameters to find the -quadrant of the result. -(It also handles correctly the case of x being zero.) - - - - -

-


math.ceil (x)

- - -

-Returns the smallest integer larger than or equal to x. - - - - -

-


math.cos (x)

- - -

-Returns the cosine of x (assumed to be in radians). - - - - -

-


math.cosh (x)

- - -

-Returns the hyperbolic cosine of x. - - - - -

-


math.deg (x)

- - -

-Returns the angle x (given in radians) in degrees. - - - - -

-


math.exp (x)

- - -

-Returns the value ex. - - - - -

-


math.floor (x)

- - -

-Returns the largest integer smaller than or equal to x. - - - - -

-


math.fmod (x, y)

- - -

-Returns the remainder of the division of x by y -that rounds the quotient towards zero. - - - - -

-


math.frexp (x)

- - -

-Returns m and e such that x = m2e, -e is an integer and the absolute value of m is -in the range [0.5, 1) -(or zero when x is zero). - - - - -

-


math.huge

- - -

-The value HUGE_VAL, -a value larger than or equal to any other numerical value. - - - - -

-


math.ldexp (m, e)

- - -

-Returns m2e (e should be an integer). - - - - -

-


math.log (x [, base])

- - -

-Returns the logarithm of x in the given base. -The default for base is e -(so that the function returns the natural logarithm of x). - - - - -

-


math.max (x, ···)

- - -

-Returns the maximum value among its arguments. - - - - -

-


math.min (x, ···)

- - -

-Returns the minimum value among its arguments. - - - - -

-


math.modf (x)

- - -

-Returns two numbers, -the integral part of x and the fractional part of x. - - - - -

-


math.pi

- - -

-The value of π. - - - - -

-


math.pow (x, y)

- - -

-Returns xy. -(You can also use the expression x^y to compute this value.) - - - - -

-


math.rad (x)

- - -

-Returns the angle x (given in degrees) in radians. - - - - -

-


math.random ([m [, n]])

- - -

-This function is an interface to the simple -pseudo-random generator function rand provided by Standard C. -(No guarantees can be given for its statistical properties.) - - -

-When called without arguments, -returns a uniform pseudo-random real number -in the range [0,1). -When called with an integer number m, -math.random returns -a uniform pseudo-random integer in the range [1, m]. -When called with two integer numbers m and n, -math.random returns a uniform pseudo-random -integer in the range [m, n]. - - - - -

-


math.randomseed (x)

- - -

-Sets x as the "seed" -for the pseudo-random generator: -equal seeds produce equal sequences of numbers. - - - - -

-


math.sin (x)

- - -

-Returns the sine of x (assumed to be in radians). - - - - -

-


math.sinh (x)

- - -

-Returns the hyperbolic sine of x. - - - - -

-


math.sqrt (x)

- - -

-Returns the square root of x. -(You can also use the expression x^0.5 to compute this value.) - - - - -

-


math.tan (x)

- - -

-Returns the tangent of x (assumed to be in radians). - - - - -

-


math.tanh (x)

- - -

-Returns the hyperbolic tangent of x. - - - - - - - -

6.7 – Bitwise Operations

- -

-This library provides bitwise operations. -It provides all its functions inside the table bit32. - - -

-Unless otherwise stated, -all functions accept numeric arguments in the range -(-251,+251); -each argument is normalized to -the remainder of its division by 232 -and truncated to an integer (in some unspecified way), -so that its final value falls in the range [0,232 - 1]. -Similarly, all results are in the range [0,232 - 1]. -Note that bit32.bnot(0) is 0xFFFFFFFF, -which is different from -1. - - -

-


bit32.arshift (x, disp)

- - -

-Returns the number x shifted disp bits to the right. -The number disp may be any representable integer. -Negative displacements shift to the left. - - -

-This shift operation is what is called arithmetic shift. -Vacant bits on the left are filled -with copies of the higher bit of x; -vacant bits on the right are filled with zeros. -In particular, -displacements with absolute values higher than 31 -result in zero or 0xFFFFFFFF (all original bits are shifted out). - - - - -

-


bit32.band (···)

- - -

-Returns the bitwise and of its operands. - - - - -

-


bit32.bnot (x)

- - -

-Returns the bitwise negation of x. -For any integer x, -the following identity holds: - -

-     assert(bit32.bnot(x) == (-1 - x) % 2^32)
-
- - - -

-


bit32.bor (···)

- - -

-Returns the bitwise or of its operands. - - - - -

-


bit32.btest (···)

- - -

-Returns a boolean signaling -whether the bitwise and of its operands is different from zero. - - - - -

-


bit32.bxor (···)

- - -

-Returns the bitwise exclusive or of its operands. - - - - -

-


bit32.extract (n, field [, width])

- - -

-Returns the unsigned number formed by the bits -field to field + width - 1 from n. -Bits are numbered from 0 (least significant) to 31 (most significant). -All accessed bits must be in the range [0, 31]. - - -

-The default for width is 1. - - - - -

-


bit32.replace (n, v, field [, width])

- - -

-Returns a copy of n with -the bits field to field + width - 1 -replaced by the value v. -See bit32.extract for details about field and width. - - - - -

-


bit32.lrotate (x, disp)

- - -

-Returns the number x rotated disp bits to the left. -The number disp may be any representable integer. - - -

-For any valid displacement, -the following identity holds: - -

-     assert(bit32.lrotate(x, disp) == bit32.lrotate(x, disp % 32))
-

-In particular, -negative displacements rotate to the right. - - - - -

-


bit32.lshift (x, disp)

- - -

-Returns the number x shifted disp bits to the left. -The number disp may be any representable integer. -Negative displacements shift to the right. -In any direction, vacant bits are filled with zeros. -In particular, -displacements with absolute values higher than 31 -result in zero (all bits are shifted out). - - -

-For positive displacements, -the following equality holds: - -

-     assert(bit32.lshift(b, disp) == (b * 2^disp) % 2^32)
-
- - - -

-


bit32.rrotate (x, disp)

- - -

-Returns the number x rotated disp bits to the right. -The number disp may be any representable integer. - - -

-For any valid displacement, -the following identity holds: - -

-     assert(bit32.rrotate(x, disp) == bit32.rrotate(x, disp % 32))
-

-In particular, -negative displacements rotate to the left. - - - - -

-


bit32.rshift (x, disp)

- - -

-Returns the number x shifted disp bits to the right. -The number disp may be any representable integer. -Negative displacements shift to the left. -In any direction, vacant bits are filled with zeros. -In particular, -displacements with absolute values higher than 31 -result in zero (all bits are shifted out). - - -

-For positive displacements, -the following equality holds: - -

-     assert(bit32.rshift(b, disp) == math.floor(b % 2^32 / 2^disp))
-
- -

-This shift operation is what is called logical shift. - - - - - - - -

6.8 – Input and Output Facilities

- -

-The I/O library provides two different styles for file manipulation. -The first one uses implicit file descriptors; -that is, there are operations to set a default input file and a -default output file, -and all input/output operations are over these default files. -The second style uses explicit file descriptors. - - -

-When using implicit file descriptors, -all operations are supplied by table io. -When using explicit file descriptors, -the operation io.open returns a file descriptor -and then all operations are supplied as methods of the file descriptor. - - -

-The table io also provides -three predefined file descriptors with their usual meanings from C: -io.stdin, io.stdout, and io.stderr. -The I/O library never closes these files. - - -

-Unless otherwise stated, -all I/O functions return nil on failure -(plus an error message as a second result and -a system-dependent error code as a third result) -and some value different from nil on success. -On non-Posix systems, -the computation of the error message and error code -in case of errors -may be not thread safe, -because they rely on the global C variable errno. - - -

-


io.close ([file])

- - -

-Equivalent to file:close(). -Without a file, closes the default output file. - - - - -

-


io.flush ()

- - -

-Equivalent to io.output():flush(). - - - - -

-


io.input ([file])

- - -

-When called with a file name, it opens the named file (in text mode), -and sets its handle as the default input file. -When called with a file handle, -it simply sets this file handle as the default input file. -When called without parameters, -it returns the current default input file. - - -

-In case of errors this function raises the error, -instead of returning an error code. - - - - -

-


io.lines ([filename ···])

- - -

-Opens the given file name in read mode -and returns an iterator function that -works like file:lines(···) over the opened file. -When the iterator function detects the end of file, -it returns nil (to finish the loop) and automatically closes the file. - - -

-The call io.lines() (with no file name) is equivalent -to io.input():lines(); -that is, it iterates over the lines of the default input file. -In this case it does not close the file when the loop ends. - - -

-In case of errors this function raises the error, -instead of returning an error code. - - - - -

-


io.open (filename [, mode])

- - -

-This function opens a file, -in the mode specified in the string mode. -It returns a new file handle, -or, in case of errors, nil plus an error message. - - -

-The mode string can be any of the following: - -

    -
  • "r": read mode (the default);
  • -
  • "w": write mode;
  • -
  • "a": append mode;
  • -
  • "r+": update mode, all previous data is preserved;
  • -
  • "w+": update mode, all previous data is erased;
  • -
  • "a+": append update mode, previous data is preserved, - writing is only allowed at the end of file.
  • -

-The mode string can also have a 'b' at the end, -which is needed in some systems to open the file in binary mode. - - - - -

-


io.output ([file])

- - -

-Similar to io.input, but operates over the default output file. - - - - -

-


io.popen (prog [, mode])

- - -

-This function is system dependent and is not available -on all platforms. - - -

-Starts program prog in a separated process and returns -a file handle that you can use to read data from this program -(if mode is "r", the default) -or to write data to this program -(if mode is "w"). - - - - -

-


io.read (···)

- - -

-Equivalent to io.input():read(···). - - - - -

-


io.tmpfile ()

- - -

-Returns a handle for a temporary file. -This file is opened in update mode -and it is automatically removed when the program ends. - - - - -

-


io.type (obj)

- - -

-Checks whether obj is a valid file handle. -Returns the string "file" if obj is an open file handle, -"closed file" if obj is a closed file handle, -or nil if obj is not a file handle. - - - - -

-


io.write (···)

- - -

-Equivalent to io.output():write(···). - - - - -

-


file:close ()

- - -

-Closes file. -Note that files are automatically closed when -their handles are garbage collected, -but that takes an unpredictable amount of time to happen. - - -

-When closing a file handle created with io.popen, -file:close returns the same values -returned by os.execute. - - - - -

-


file:flush ()

- - -

-Saves any written data to file. - - - - -

-


file:lines (···)

- - -

-Returns an iterator function that, -each time it is called, -reads the file according to the given formats. -When no format is given, -uses "*l" as a default. -As an example, the construction - -

-     for c in file:lines(1) do body end
-

-will iterate over all characters of the file, -starting at the current position. -Unlike io.lines, this function does not close the file -when the loop ends. - - -

-In case of errors this function raises the error, -instead of returning an error code. - - - - -

-


file:read (···)

- - -

-Reads the file file, -according to the given formats, which specify what to read. -For each format, -the function returns a string (or a number) with the characters read, -or nil if it cannot read data with the specified format. -When called without formats, -it uses a default format that reads the next line -(see below). - - -

-The available formats are - -

    - -
  • "*n": -reads a number; -this is the only format that returns a number instead of a string. -
  • - -
  • "*a": -reads the whole file, starting at the current position. -On end of file, it returns the empty string. -
  • - -
  • "*l": -reads the next line skipping the end of line, -returning nil on end of file. -This is the default format. -
  • - -
  • "*L": -reads the next line keeping the end of line (if present), -returning nil on end of file. -
  • - -
  • number: -reads a string with up to this number of bytes, -returning nil on end of file. -If number is zero, -it reads nothing and returns an empty string, -or nil on end of file. -
  • - -
- - - -

-


file:seek ([whence [, offset]])

- - -

-Sets and gets the file position, -measured from the beginning of the file, -to the position given by offset plus a base -specified by the string whence, as follows: - -

    -
  • "set": base is position 0 (beginning of the file);
  • -
  • "cur": base is current position;
  • -
  • "end": base is end of file;
  • -

-In case of success, seek returns the final file position, -measured in bytes from the beginning of the file. -If seek fails, it returns nil, -plus a string describing the error. - - -

-The default value for whence is "cur", -and for offset is 0. -Therefore, the call file:seek() returns the current -file position, without changing it; -the call file:seek("set") sets the position to the -beginning of the file (and returns 0); -and the call file:seek("end") sets the position to the -end of the file, and returns its size. - - - - -

-


file:setvbuf (mode [, size])

- - -

-Sets the buffering mode for an output file. -There are three available modes: - -

    - -
  • "no": -no buffering; the result of any output operation appears immediately. -
  • - -
  • "full": -full buffering; output operation is performed only -when the buffer is full or when -you explicitly flush the file (see io.flush). -
  • - -
  • "line": -line buffering; output is buffered until a newline is output -or there is any input from some special files -(such as a terminal device). -
  • - -

-For the last two cases, size -specifies the size of the buffer, in bytes. -The default is an appropriate size. - - - - -

-


file:write (···)

- - -

-Writes the value of each of its arguments to file. -The arguments must be strings or numbers. - - -

-In case of success, this function returns file. -Otherwise it returns nil plus a string describing the error. - - - - - - - -

6.9 – Operating System Facilities

- -

-This library is implemented through table os. - - -

-


os.clock ()

- - -

-Returns an approximation of the amount in seconds of CPU time -used by the program. - - - - -

-


os.date ([format [, time]])

- - -

-Returns a string or a table containing date and time, -formatted according to the given string format. - - -

-If the time argument is present, -this is the time to be formatted -(see the os.time function for a description of this value). -Otherwise, date formats the current time. - - -

-If format starts with '!', -then the date is formatted in Coordinated Universal Time. -After this optional character, -if format is the string "*t", -then date returns a table with the following fields: -year (four digits), month (1–12), day (1–31), -hour (0–23), min (0–59), sec (0–61), -wday (weekday, Sunday is 1), -yday (day of the year), -and isdst (daylight saving flag, a boolean). -This last field may be absent -if the information is not available. - - -

-If format is not "*t", -then date returns the date as a string, -formatted according to the same rules as the ANSI C function strftime. - - -

-When called without arguments, -date returns a reasonable date and time representation that depends on -the host system and on the current locale -(that is, os.date() is equivalent to os.date("%c")). - - -

-On non-Posix systems, -this function may be not thread safe -because of its reliance on C function gmtime and C function localtime. - - - - -

-


os.difftime (t2, t1)

- - -

-Returns the number of seconds from time t1 to time t2. -In POSIX, Windows, and some other systems, -this value is exactly t2-t1. - - - - -

-


os.execute ([command])

- - -

-This function is equivalent to the ANSI C function system. -It passes command to be executed by an operating system shell. -Its first result is true -if the command terminated successfully, -or nil otherwise. -After this first result -the function returns a string and a number, -as follows: - -

    - -
  • "exit": -the command terminated normally; -the following number is the exit status of the command. -
  • - -
  • "signal": -the command was terminated by a signal; -the following number is the signal that terminated the command. -
  • - -
- -

-When called without a command, -os.execute returns a boolean that is true if a shell is available. - - - - -

-


os.exit ([code [, close])

- - -

-Calls the ANSI C function exit to terminate the host program. -If code is true, -the returned status is EXIT_SUCCESS; -if code is false, -the returned status is EXIT_FAILURE; -if code is a number, -the returned status is this number. -The default value for code is true. - - -

-If the optional second argument close is true, -closes the Lua state before exiting. - - - - -

-


os.getenv (varname)

- - -

-Returns the value of the process environment variable varname, -or nil if the variable is not defined. - - - - -

-


os.remove (filename)

- - -

-Deletes the file (or empty directory, on POSIX systems) -with the given name. -If this function fails, it returns nil, -plus a string describing the error and the error code. - - - - -

-


os.rename (oldname, newname)

- - -

-Renames file or directory named oldname to newname. -If this function fails, it returns nil, -plus a string describing the error and the error code. - - - - -

-


os.setlocale (locale [, category])

- - -

-Sets the current locale of the program. -locale is a system-dependent string specifying a locale; -category is an optional string describing which category to change: -"all", "collate", "ctype", -"monetary", "numeric", or "time"; -the default category is "all". -The function returns the name of the new locale, -or nil if the request cannot be honored. - - -

-If locale is the empty string, -the current locale is set to an implementation-defined native locale. -If locale is the string "C", -the current locale is set to the standard C locale. - - -

-When called with nil as the first argument, -this function only returns the name of the current locale -for the given category. - - -

-This function may be not thread safe -because of its reliance on C function setlocale. - - - - -

-


os.time ([table])

- - -

-Returns the current time when called without arguments, -or a time representing the date and time specified by the given table. -This table must have fields year, month, and day, -and may have fields -hour (default is 12), -min (default is 0), -sec (default is 0), -and isdst (default is nil). -For a description of these fields, see the os.date function. - - -

-The returned value is a number, whose meaning depends on your system. -In POSIX, Windows, and some other systems, -this number counts the number -of seconds since some given start time (the "epoch"). -In other systems, the meaning is not specified, -and the number returned by time can be used only as an argument to -os.date and os.difftime. - - - - -

-


os.tmpname ()

- - -

-Returns a string with a file name that can -be used for a temporary file. -The file must be explicitly opened before its use -and explicitly removed when no longer needed. - - -

-On POSIX systems, -this function also creates a file with that name, -to avoid security risks. -(Someone else might create the file with wrong permissions -in the time between getting the name and creating the file.) -You still have to open the file to use it -and to remove it (even if you do not use it). - - -

-When possible, -you may prefer to use io.tmpfile, -which automatically removes the file when the program ends. - - - - - - - -

6.10 – The Debug Library

- -

-This library provides -the functionality of the debug interface (§4.9) to Lua programs. -You should exert care when using this library. -Several of its functions -violate basic assumptions about Lua code -(e.g., that variables local to a function -cannot be accessed from outside; -that userdata metatables cannot be changed by Lua code; -that Lua programs do not crash) -and therefore can compromise otherwise secure code. -Moreover, some functions in this library may be slow. - - -

-All functions in this library are provided -inside the debug table. -All functions that operate over a thread -have an optional first argument which is the -thread to operate over. -The default is always the current thread. - - -

-


debug.debug ()

- - -

-Enters an interactive mode with the user, -running each string that the user enters. -Using simple commands and other debug facilities, -the user can inspect global and local variables, -change their values, evaluate expressions, and so on. -A line containing only the word cont finishes this function, -so that the caller continues its execution. - - -

-Note that commands for debug.debug are not lexically nested -within any function and so have no direct access to local variables. - - - - -

-


debug.gethook ([thread])

- - -

-Returns the current hook settings of the thread, as three values: -the current hook function, the current hook mask, -and the current hook count -(as set by the debug.sethook function). - - - - -

-


debug.getinfo ([thread,] f [, what])

- - -

-Returns a table with information about a function. -You can give the function directly -or you can give a number as the value of f, -which means the function running at level f of the call stack -of the given thread: -level 0 is the current function (getinfo itself); -level 1 is the function that called getinfo -(except for tail calls, which do not count on the stack); -and so on. -If f is a number larger than the number of active functions, -then getinfo returns nil. - - -

-The returned table can contain all the fields returned by lua_getinfo, -with the string what describing which fields to fill in. -The default for what is to get all information available, -except the table of valid lines. -If present, -the option 'f' -adds a field named func with the function itself. -If present, -the option 'L' -adds a field named activelines with the table of -valid lines. - - -

-For instance, the expression debug.getinfo(1,"n").name returns -a table with a name for the current function, -if a reasonable name can be found, -and the expression debug.getinfo(print) -returns a table with all available information -about the print function. - - - - -

-


debug.getlocal ([thread,] f, local)

- - -

-This function returns the name and the value of the local variable -with index local of the function at level f of the stack. -This function accesses not only explicit local variables, -but also parameters, temporaries, etc. - - -

-The first parameter or local variable has index 1, and so on, -until the last active variable. -Negative indices refer to vararg parameters; --1 is the first vararg parameter. -The function returns nil if there is no variable with the given index, -and raises an error when called with a level out of range. -(You can call debug.getinfo to check whether the level is valid.) - - -

-Variable names starting with '(' (open parenthesis) -represent internal variables -(loop control variables, temporaries, varargs, and C function locals). - - -

-The parameter f may also be a function. -In that case, getlocal returns only the name of function parameters. - - - - -

-


debug.getmetatable (value)

- - -

-Returns the metatable of the given value -or nil if it does not have a metatable. - - - - -

-


debug.getregistry ()

- - -

-Returns the registry table (see §4.5). - - - - -

-


debug.getupvalue (f, up)

- - -

-This function returns the name and the value of the upvalue -with index up of the function f. -The function returns nil if there is no upvalue with the given index. - - - - -

-


debug.getuservalue (u)

- - -

-Returns the Lua value associated to u. -If u is not a userdata, -returns nil. - - - - -

-


debug.sethook ([thread,] hook, mask [, count])

- - -

-Sets the given function as a hook. -The string mask and the number count describe -when the hook will be called. -The string mask may have the following characters, -with the given meaning: - -

    -
  • 'c': the hook is called every time Lua calls a function;
  • -
  • 'r': the hook is called every time Lua returns from a function;
  • -
  • 'l': the hook is called every time Lua enters a new line of code.
  • -

-With a count different from zero, -the hook is called after every count instructions. - - -

-When called without arguments, -debug.sethook turns off the hook. - - -

-When the hook is called, its first parameter is a string -describing the event that has triggered its call: -"call" (or "tail call"), -"return", -"line", and "count". -For line events, -the hook also gets the new line number as its second parameter. -Inside a hook, -you can call getinfo with level 2 to get more information about -the running function -(level 0 is the getinfo function, -and level 1 is the hook function). - - - - -

-


debug.setlocal ([thread,] level, local, value)

- - -

-This function assigns the value value to the local variable -with index local of the function at level level of the stack. -The function returns nil if there is no local -variable with the given index, -and raises an error when called with a level out of range. -(You can call getinfo to check whether the level is valid.) -Otherwise, it returns the name of the local variable. - - -

-See debug.getlocal for more information about -variable indices and names. - - - - -

-


debug.setmetatable (value, table)

- - -

-Sets the metatable for the given value to the given table -(which can be nil). -Returns value. - - - - -

-


debug.setupvalue (f, up, value)

- - -

-This function assigns the value value to the upvalue -with index up of the function f. -The function returns nil if there is no upvalue -with the given index. -Otherwise, it returns the name of the upvalue. - - - - -

-


debug.setuservalue (udata, value)

- - -

-Sets the given value as -the Lua value associated to the given udata. -value must be a table or nil; -udata must be a full userdata. - - -

-Returns udata. - - - - -

-


debug.traceback ([thread,] [message [, level]])

- - -

-If message is present but is neither a string nor nil, -this function returns message without further processing. -Otherwise, -it returns a string with a traceback of the call stack. -An optional message string is appended -at the beginning of the traceback. -An optional level number tells at which level -to start the traceback -(default is 1, the function calling traceback). - - - - -

-


debug.upvalueid (f, n)

- - -

-Returns an unique identifier (as a light userdata) -for the upvalue numbered n -from the given function. - - -

-These unique identifiers allow a program to check whether different -closures share upvalues. -Lua closures that share an upvalue -(that is, that access a same external local variable) -will return identical ids for those upvalue indices. - - - - -

-


debug.upvaluejoin (f1, n1, f2, n2)

- - -

-Make the n1-th upvalue of the Lua closure f1 -refer to the n2-th upvalue of the Lua closure f2. - - - - - - - -

7 – Lua Standalone

- -

-Although Lua has been designed as an extension language, -to be embedded in a host C program, -it is also frequently used as a standalone language. -An interpreter for Lua as a standalone language, -called simply lua, -is provided with the standard distribution. -The standalone interpreter includes -all standard libraries, including the debug library. -Its usage is: - -

-     lua [options] [script [args]]
-

-The options are: - -

    -
  • -e stat: executes string stat;
  • -
  • -l mod: "requires" mod;
  • -
  • -i: enters interactive mode after running script;
  • -
  • -v: prints version information;
  • -
  • -E: ignores environment variables;
  • -
  • --: stops handling options;
  • -
  • -: executes stdin as a file and stops handling options.
  • -

-After handling its options, lua runs the given script, -passing to it the given args as string arguments. -When called without arguments, -lua behaves as lua -v -i -when the standard input (stdin) is a terminal, -and as lua - otherwise. - - -

-When called without option -E, -the interpreter checks for an environment variable LUA_INIT_5_2 -(or LUA_INIT if it is not defined) -before running any argument. -If the variable content has the format @filename, -then lua executes the file. -Otherwise, lua executes the string itself. - - -

-When called with option -E, -besides ignoring LUA_INIT, -Lua also ignores -the values of LUA_PATH and LUA_CPATH, -setting the values of -package.path and package.cpath -with the default paths defined in luaconf.h. - - -

-All options are handled in order, except -i and -E. -For instance, an invocation like - -

-     $ lua -e'a=1' -e 'print(a)' script.lua
-

-will first set a to 1, then print the value of a, -and finally run the file script.lua with no arguments. -(Here $ is the shell prompt. Your prompt may be different.) - - -

-Before starting to run the script, -lua collects all arguments in the command line -in a global table called arg. -The script name is stored at index 0, -the first argument after the script name goes to index 1, -and so on. -Any arguments before the script name -(that is, the interpreter name plus the options) -go to negative indices. -For instance, in the call - -

-     $ lua -la b.lua t1 t2
-

-the interpreter first runs the file a.lua, -then creates a table - -

-     arg = { [-2] = "lua", [-1] = "-la",
-             [0] = "b.lua",
-             [1] = "t1", [2] = "t2" }
-

-and finally runs the file b.lua. -The script is called with arg[1], arg[2], ... -as arguments; -it can also access these arguments with the vararg expression '...'. - - -

-In interactive mode, -if you write an incomplete statement, -the interpreter waits for its completion -by issuing a different prompt. - - -

-In case of unprotected errors in the script, -the interpreter reports the error to the standard error stream. -If the error object is a string, -the interpreter adds a stack traceback to it. -Otherwise, if the error object has a metamethod __tostring, -the interpreter calls this metamethod to produce the final message. -Finally, if the error object is nil, -the interpreter does not report the error. - - -

-When finishing normally, -the interpreter closes its main Lua state -(see lua_close). -The script can avoid this step by -calling os.exit to terminate. - - -

-To allow the use of Lua as a -script interpreter in Unix systems, -the standalone interpreter skips -the first line of a chunk if it starts with #. -Therefore, Lua scripts can be made into executable programs -by using chmod +x and the #! form, -as in - -

-     #!/usr/local/bin/lua
-

-(Of course, -the location of the Lua interpreter may be different in your machine. -If lua is in your PATH, -then - -

-     #!/usr/bin/env lua
-

-is a more portable solution.) - - - -

8 – Incompatibilities with the Previous Version

- -

-Here we list the incompatibilities that you may find when moving a program -from Lua 5.1 to Lua 5.2. -You can avoid some incompatibilities by compiling Lua with -appropriate options (see file luaconf.h). -However, -all these compatibility options will be removed in the next version of Lua. -Similarly, -all features marked as deprecated in Lua 5.1 -have been removed in Lua 5.2. - - - -

8.1 – Changes in the Language

-
    - -
  • -The concept of environment changed. -Only Lua functions have environments. -To set the environment of a Lua function, -use the variable _ENV or the function load. - - -

    -C functions no longer have environments. -Use an upvalue with a shared table if you need to keep -shared state among several C functions. -(You may use luaL_setfuncs to open a C library -with all functions sharing a common upvalue.) - - -

    -To manipulate the "environment" of a userdata -(which is now called user value), -use the new functions -lua_getuservalue and lua_setuservalue. -

  • - -
  • -Lua identifiers cannot use locale-dependent letters. -
  • - -
  • -Doing a step or a full collection in the garbage collector -does not restart the collector if it has been stopped. -
  • - -
  • -Weak tables with weak keys now perform like ephemeron tables. -
  • - -
  • -The event tail return in debug hooks was removed. -Instead, tail calls generate a special new event, -tail call, so that the debugger can know that -there will not be a corresponding return event. -
  • - -
  • -Equality between function values has changed. -Now, a function definition may not create a new value; -it may reuse some previous value if there is no -observable difference to the new function. -
  • - -
- - - - -

8.2 – Changes in the Libraries

-
    - -
  • -Function module is deprecated. -It is easy to set up a module with regular Lua code. -Modules are not expected to set global variables. -
  • - -
  • -Functions setfenv and getfenv were removed, -because of the changes in environments. -
  • - -
  • -Function math.log10 is deprecated. -Use math.log with 10 as its second argument, instead. -
  • - -
  • -Function loadstring is deprecated. -Use load instead; it now accepts string arguments -and are exactly equivalent to loadstring. -
  • - -
  • -Function table.maxn is deprecated. -Write it in Lua if you really need it. -
  • - -
  • -Function os.execute now returns true when command -terminates successfully and nil plus error information -otherwise. -
  • - -
  • -Function unpack was moved into the table library -and therefore must be called as table.unpack. -
  • - -
  • -Character class %z in patterns is deprecated, -as now patterns may contain '\0' as a regular character. -
  • - -
  • -The table package.loaders was renamed package.searchers. -
  • - -
  • -Lua does not have bytecode verification anymore. -So, all functions that load code -(load and loadfile) -are potentially insecure when loading untrusted binary data. -(Actually, those functions were already insecure because -of flaws in the verification algorithm.) -When in doubt, -use the mode argument of those functions -to restrict them to loading textual chunks. -
  • - -
  • -The standard paths in the official distribution may -change between versions. -
  • - -
- - - - -

8.3 – Changes in the API

-
    - -
  • -Pseudoindex LUA_GLOBALSINDEX was removed. -You must get the global environment from the registry -(see §4.5). -
  • - -
  • -Pseudoindex LUA_ENVIRONINDEX -and functions lua_getfenv/lua_setfenv -were removed, -as C functions no longer have environments. -
  • - -
  • -Function luaL_register is deprecated. -Use luaL_setfuncs so that your module does not create globals. -(Modules are not expected to set global variables anymore.) -
  • - -
  • -The osize argument to the allocation function -may not be zero when creating a new block, -that is, when ptr is NULL -(see lua_Alloc). -Use only the test ptr == NULL to check whether -the block is new. -
  • - -
  • -Finalizers (__gc metamethods) for userdata are called in the -reverse order that they were marked for finalization, -not that they were created (see §2.5.1). -(Most userdata are marked immediately after they are created.) -Moreover, -if the metatable does not have a __gc field when set, -the finalizer will not be called, -even if it is set later. -
  • - -
  • -luaL_typerror was removed. -Write your own version if you need it. -
  • - -
  • -Function lua_cpcall is deprecated. -You can simply push the function with lua_pushcfunction -and call it with lua_pcall. -
  • - -
  • -Functions lua_equal and lua_lessthan are deprecated. -Use the new lua_compare with appropriate options instead. -
  • - -
  • -Function lua_objlen was renamed lua_rawlen. -
  • - -
  • -Function lua_load has an extra parameter, mode. -Pass NULL to simulate the old behavior. -
  • - -
  • -Function lua_resume has an extra parameter, from. -Pass NULL or the thread doing the call. -
  • - -
- - - - -

9 – The Complete Syntax of Lua

- -

-Here is the complete syntax of Lua in extended BNF. -(It does not describe operator precedences.) - - - - -

-
-	chunk ::= block
-
-	block ::= {stat} [retstat]
-
-	stat ::=  ‘;’ | 
-		 varlist ‘=’ explist | 
-		 functioncall | 
-		 label | 
-		 break | 
-		 goto Name | 
-		 do block end | 
-		 while exp do block end | 
-		 repeat block until exp | 
-		 if exp then block {elseif exp then block} [else block] end | 
-		 for Name ‘=’ exp ‘,’ exp [‘,’ exp] do block end | 
-		 for namelist in explist do block end | 
-		 function funcname funcbody | 
-		 local function Name funcbody | 
-		 local namelist [‘=’ explist] 
-
-	retstat ::= return [explist] [‘;’]
-
-	label ::= ‘::’ Name ‘::’
-
-	funcname ::= Name {‘.’ Name} [‘:’ Name]
-
-	varlist ::= var {‘,’ var}
-
-	var ::=  Name | prefixexp ‘[’ exp ‘]’ | prefixexp ‘.’ Name 
-
-	namelist ::= Name {‘,’ Name}
-
-	explist ::= exp {‘,’ exp}
-
-	exp ::=  nil | false | true | Number | String | ‘...’ | functiondef | 
-		 prefixexp | tableconstructor | exp binop exp | unop exp 
-
-	prefixexp ::= var | functioncall | ‘(’ exp ‘)’
-
-	functioncall ::=  prefixexp args | prefixexp ‘:’ Name args 
-
-	args ::=  ‘(’ [explist] ‘)’ | tableconstructor | String 
-
-	functiondef ::= function funcbody
-
-	funcbody ::= ‘(’ [parlist] ‘)’ block end
-
-	parlist ::= namelist [‘,’ ‘...’] | ‘...’
-
-	tableconstructor ::= ‘{’ [fieldlist] ‘}’
-
-	fieldlist ::= field {fieldsep field} [fieldsep]
-
-	field ::= ‘[’ exp ‘]’ ‘=’ exp | Name ‘=’ exp | exp
-
-	fieldsep ::= ‘,’ | ‘;’
-
-	binop ::= ‘+’ | ‘-’ | ‘*’ | ‘/’ | ‘^’ | ‘%’ | ‘..’ | 
-		 ‘<’ | ‘<=’ | ‘>’ | ‘>=’ | ‘==’ | ‘~=’ | 
-		 and | or
-
-	unop ::= ‘-’ | not | ‘#’
-
-
- -

- - - - - - - -


- -Last update: -Thu Mar 21 12:58:59 BRT 2013 - - - - - diff --git a/radio/src/lua/doc/osi-certified-72x60.png b/radio/src/lua/doc/osi-certified-72x60.png deleted file mode 100644 index 07df5f6ee7a7a8b2108025dcd815f73f145a83af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3774 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 - - -Lua 5.2 readme - - - - - - - -
-

-Lua -Welcome to Lua 5.2 -

- -

-about -· -installation -· -changes -· -license -· -reference manual - -

About Lua

- -

-Lua is a powerful, fast, lightweight, embeddable scripting language -developed by a -team -at -PUC-Rio, -the Pontifical Catholic University of Rio de Janeiro in Brazil. -Lua is -free software -used in many products and projects around the world. - -

-Lua's -official web site -provides complete information -about Lua, -including -an -executive summary -and -updated -documentation, -especially the -reference manual, -which may differ slightly from the -local copy -distributed in this package. - -

Installing Lua

- -

-Lua is distributed in -source -form. -You need to build it before using it. -Building Lua should be straightforward -because -Lua is implemented in pure ANSI C and compiles unmodified in all known -platforms that have an ANSI C compiler. -Lua also compiles unmodified as C++. -The instructions given below for building Lua are for Unix-like platforms. -See also -instructions for other systems -and -customization options. - -

-If you don't have the time or the inclination to compile Lua yourself, -get a binary from -LuaBinaries. -Try also -Lua for Windows, -an easy-to-use distribution of Lua that includes many useful libraries. - -

Building Lua

- -

-In most Unix-like platforms, simply do "make" with a suitable target. -Here are the details. - -

    -
  1. -Open a terminal window and move to -the top-level directory, which is named lua-5.2.2. -The Makefile there controls both the build process and the installation process. -

    -

  2. - Do "make" and see if your platform is listed. - The platforms currently supported are: -

    -

    - aix ansi bsd freebsd generic linux macosx mingw posix solaris -

    -

    - If your platform is listed, just do "make xxx", where xxx - is your platform name. -

    - If your platform is not listed, try the closest one or posix, generic, - ansi, in this order. -

    -

  3. -The compilation takes only a few moments -and produces three files in the src directory: -lua (the interpreter), -luac (the compiler), -and liblua.a (the library). -

    -

  4. - To check that Lua has been built correctly, do "make test" - after building Lua. This will run the interpreter and print its version string. -
-

-If you're running Linux and get compilation errors, -make sure you have installed the readline development package. -If you get link errors after that, -then try "make linux MYLIBS=-ltermcap". - -

Installing Lua

-

- Once you have built Lua, you may want to install it in an official - place in your system. In this case, do "make install". The official - place and the way to install files are defined in the Makefile. You'll - probably need the right permissions to install files. - -

- To build and install Lua in one step, do "make xxx install", - where xxx is your platform name. - -

- To install Lua locally, do "make local". - This will create a directory install with subdirectories - bin, include, lib, man, - and install Lua as listed below. - - To install Lua locally, but in some other directory, do - "make install INSTALL_TOP=xxx", where xxx is your chosen directory. - -

-
- bin: -
- lua luac -
- include: -
- lua.h luaconf.h lualib.h lauxlib.h lua.hpp -
- lib: -
- liblua.a -
- man/man1: -
- lua.1 luac.1 -
- -

- These are the only directories you need for development. - If you only want to run Lua programs, - you only need the files in bin and man. - The files in include and lib are needed for - embedding Lua in C or C++ programs. - -

Customization

-

- Three kinds of things can be customized by editing a file: -

    -
  • Where and how to install Lua — edit Makefile. -
  • How to build Lua — edit src/Makefile. -
  • Lua features — edit src/luaconf.h. -
- -

- You don't actually need to edit the Makefiles because you may set the - relevant variables in the command line when invoking make. - Nevertheless, it's probably best to edit and save the Makefiles to - record the changes you need. - -

- On the other hand, if you need to customize some Lua features, you'll need - to edit src/luaconf.h before building and installing Lua. - The edited file will be the one installed, and - it will be used by any Lua clients that you build, to ensure consistency. - Further customization is available to experts by editing the Lua sources. - -

- We strongly recommend that you enable dynamic loading in src/luaconf.h. - This is done automatically for all platforms listed above that have - this feature and also for Windows. - -

Building Lua on other systems

- -

- If you're not using the usual Unix tools, then the instructions for - building Lua depend on the compiler you use. You'll need to create - projects (or whatever your compiler uses) for building the library, - the interpreter, and the compiler, as follows: - -

-
-library: -
-lapi.c lcode.c lctype.c ldebug.c ldo.c ldump.c lfunc.c lgc.c llex.c -lmem.c lobject.c lopcodes.c lparser.c lstate.c lstring.c ltable.c -ltm.c lundump.c lvm.c lzio.c -lauxlib.c lbaselib.c lbitlib.c lcorolib.c ldblib.c liolib.c -lmathlib.c loslib.c lstrlib.c ltablib.c loadlib.c linit.c -
-interpreter: -
- library, lua.c -
-compiler: -
- library, luac.c -
- -

- To use Lua as a library in your own programs you'll need to know how to - create and use libraries with your compiler. Moreover, to dynamically load - C libraries for Lua you'll need to know how to create dynamic libraries - and you'll need to make sure that the Lua API functions are accessible to - those dynamic libraries — but don't link the Lua library - into each dynamic library. For Unix, we recommend that the Lua library - be linked statically into the host program and its symbols exported for - dynamic linking; src/Makefile does this for the Lua interpreter. - For Windows, we recommend that the Lua library be a DLL. - -

- As mentioned above, you may edit src/luaconf.h to customize - some features before building Lua. - -

Changes since Lua 5.1

- -

-Here are the main changes introduced in Lua 5.2. -The -reference manual -lists the -incompatibilities that had to be introduced. - -

Main changes

-
    -
  • yieldable pcall and metamethods -
  • new lexical scheme for globals -
  • ephemeron tables -
  • new library for bitwise operations -
  • light C functions -
  • emergency garbage collector -
  • goto statement -
  • finalizers for tables -
- -Here are the other changes introduced in Lua 5.2: -

Language

-
    -
  • no more fenv for threads or functions -
  • tables honor the __len metamethod -
  • hex and \z escapes in strings -
  • support for hexadecimal floats -
  • order metamethods work for different types -
  • no more verification of opcode consistency -
  • hook event "tail return" replaced by "tail call" -
  • empty statement -
  • break statement may appear in the middle of a block -
- -

Libraries

-
    -
  • arguments for function called through xpcall -
  • optional 'mode' argument to load and loadfile (to control binary x text) -
  • optional 'env' argument to load and loadfile (environment for loaded chunk) -
  • loadlib may load libraries with global names (RTLD_GLOBAL) -
  • new function package.searchpath -
  • modules receive their paths when loaded -
  • optional base in math.log -
  • optional separator in string.rep -
  • file:write returns file -
  • closing a pipe returns exit status -
  • os.exit may close state -
  • new metamethods __pairs and __ipairs -
  • new option 'isrunning' for collectgarbage and lua_gc -
  • frontier patterns -
  • \0 in patterns -
  • new option *L for io.read -
  • options for io.lines -
  • debug.getlocal can access function varargs -
- -

C API

-
    -
  • main thread predefined in the registry -
  • new functions -lua_absindex, -lua_arith, -lua_compare, -lua_copy, -lua_len, -lua_rawgetp, -lua_rawsetp, -lua_upvalueid, -lua_upvaluejoin, -lua_version. -
  • new functions -luaL_checkversion, -luaL_setmetatable, -luaL_testudata, -luaL_tolstring. -
  • lua_pushstring and pushlstring return string -
  • nparams and isvararg available in debug API -
  • new lua_Unsigned -
- -

Implementation

-
    -
  • max constants per function raised to 226 -
  • generational mode for garbage collection (experimental) -
  • NaN trick (experimental) -
  • internal (immutable) version of ctypes -
  • simpler implementation for string buffers -
  • parser uses much less C-stack space (no more auto arrays) -
- -

Lua standalone interpreter

-
    -
  • new -E option to avoid environment variables -
  • handling of non-string error messages -
- -

License

- -[osi certified] - - -

-Lua is free software distributed under the terms of the -MIT license -reproduced below; -it may be used for any purpose, including commercial purposes, -at absolutely no cost without having to ask us. - -The only requirement is that if you do use Lua, -then you should give us credit by including the appropriate copyright notice somewhere in your product or its documentation. - -For details, see -this. - -

-Copyright © 1994–2013 Lua.org, PUC-Rio. - -

-Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -

-The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -

-

- -


- -Last update: -Fri Feb 22 09:24:20 BRT 2013 - - - - - diff --git a/radio/src/lua/src/Makefile b/radio/src/lua/src/Makefile deleted file mode 100644 index fea895bc0..000000000 --- a/radio/src/lua/src/Makefile +++ /dev/null @@ -1,187 +0,0 @@ -# Makefile for building Lua -# See ../doc/readme.html for installation and customization instructions. - -# == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT ======================= - -# Your platform. See PLATS for possible values. -PLAT= none - -CC= gcc -CFLAGS= -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS) -LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) -LIBS= -lm $(SYSLIBS) $(MYLIBS) - -AR= ar rcu -RANLIB= ranlib -RM= rm -f - -SYSCFLAGS= -SYSLDFLAGS= -SYSLIBS= - -MYCFLAGS= -MYLDFLAGS= -MYLIBS= -MYOBJS= - -# == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= - -PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris - -LUA_A= liblua.a -CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ - lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ - ltm.o lundump.o lvm.o lzio.o -LIB_O= lauxlib.o lbaselib.o lbitlib.o lcorolib.o ldblib.o liolib.o \ - lmathlib.o loslib.o lstrlib.o ltablib.o loadlib.o linit.o -BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) - -LUA_T= lua -LUA_O= lua.o - -LUAC_T= luac -LUAC_O= luac.o - -ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) -ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) -ALL_A= $(LUA_A) - -# Targets start here. -default: $(PLAT) - -all: $(ALL_T) - -o: $(ALL_O) - -a: $(ALL_A) - -$(LUA_A): $(BASE_O) - $(AR) $@ $(BASE_O) - $(RANLIB) $@ - -$(LUA_T): $(LUA_O) $(LUA_A) - $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) - -$(LUAC_T): $(LUAC_O) $(LUA_A) - $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) - -clean: - $(RM) $(ALL_T) $(ALL_O) - -depend: - @$(CC) $(CFLAGS) -MM l*.c - -echo: - @echo "PLAT= $(PLAT)" - @echo "CC= $(CC)" - @echo "CFLAGS= $(CFLAGS)" - @echo "LDFLAGS= $(SYSLDFLAGS)" - @echo "LIBS= $(LIBS)" - @echo "AR= $(AR)" - @echo "RANLIB= $(RANLIB)" - @echo "RM= $(RM)" - -# Convenience targets for popular platforms -ALL= all - -none: - @echo "Please do 'make PLATFORM' where PLATFORM is one of these:" - @echo " $(PLATS)" - -aix: - $(MAKE) $(ALL) CC="xlc" CFLAGS="-O2 -DLUA_USE_POSIX -DLUA_USE_DLOPEN" SYSLIBS="-ldl" SYSLDFLAGS="-brtl -bexpall" - -ansi: - $(MAKE) $(ALL) SYSCFLAGS="-DLUA_ANSI" - -bsd: - $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" SYSLIBS="-Wl,-E" - -freebsd: - $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -lreadline" - -generic: $(ALL) - -linux: - $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline" - -macosx: - $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline" - -mingw: - $(MAKE) "LUA_A=lua52.dll" "LUA_T=lua.exe" \ - "AR=$(CC) -shared -o" "RANLIB=strip --strip-unneeded" \ - "SYSCFLAGS=-DLUA_BUILD_AS_DLL" "SYSLIBS=" "SYSLDFLAGS=-s" lua.exe - $(MAKE) "LUAC_T=luac.exe" luac.exe - -posix: - $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX" - -solaris: - $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" SYSLIBS="-ldl" - -# list targets that do not create files (but not all makes understand .PHONY) -.PHONY: all $(PLATS) default o a clean depend echo none - -# DO NOT DELETE - -lapi.o: lapi.c lua.h luaconf.h lapi.h llimits.h lstate.h lobject.h ltm.h \ - lzio.h lmem.h ldebug.h ldo.h lfunc.h lgc.h lstring.h ltable.h lundump.h \ - lvm.h -lauxlib.o: lauxlib.c lua.h luaconf.h lauxlib.h -lbaselib.o: lbaselib.c lua.h luaconf.h lauxlib.h lualib.h -lbitlib.o: lbitlib.c lua.h luaconf.h lauxlib.h lualib.h -lcode.o: lcode.c lua.h luaconf.h lcode.h llex.h lobject.h llimits.h \ - lzio.h lmem.h lopcodes.h lparser.h ldebug.h lstate.h ltm.h ldo.h lgc.h \ - lstring.h ltable.h lvm.h -lcorolib.o: lcorolib.c lua.h luaconf.h lauxlib.h lualib.h -lctype.o: lctype.c lctype.h lua.h luaconf.h llimits.h -ldblib.o: ldblib.c lua.h luaconf.h lauxlib.h lualib.h -ldebug.o: ldebug.c lua.h luaconf.h lapi.h llimits.h lstate.h lobject.h \ - ltm.h lzio.h lmem.h lcode.h llex.h lopcodes.h lparser.h ldebug.h ldo.h \ - lfunc.h lstring.h lgc.h ltable.h lvm.h -ldo.o: ldo.c lua.h luaconf.h lapi.h llimits.h lstate.h lobject.h ltm.h \ - lzio.h lmem.h ldebug.h ldo.h lfunc.h lgc.h lopcodes.h lparser.h \ - lstring.h ltable.h lundump.h lvm.h -ldump.o: ldump.c lua.h luaconf.h lobject.h llimits.h lstate.h ltm.h \ - lzio.h lmem.h lundump.h -lfunc.o: lfunc.c lua.h luaconf.h lfunc.h lobject.h llimits.h lgc.h \ - lstate.h ltm.h lzio.h lmem.h -lgc.o: lgc.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h ltm.h \ - lzio.h lmem.h ldo.h lfunc.h lgc.h lstring.h ltable.h -linit.o: linit.c lua.h luaconf.h lualib.h lauxlib.h -liolib.o: liolib.c lua.h luaconf.h lauxlib.h lualib.h -llex.o: llex.c lua.h luaconf.h lctype.h llimits.h ldo.h lobject.h \ - lstate.h ltm.h lzio.h lmem.h llex.h lparser.h lstring.h lgc.h ltable.h -lmathlib.o: lmathlib.c lua.h luaconf.h lauxlib.h lualib.h -lmem.o: lmem.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h \ - ltm.h lzio.h lmem.h ldo.h lgc.h -loadlib.o: loadlib.c lua.h luaconf.h lauxlib.h lualib.h -lobject.o: lobject.c lua.h luaconf.h lctype.h llimits.h ldebug.h lstate.h \ - lobject.h ltm.h lzio.h lmem.h ldo.h lstring.h lgc.h lvm.h -lopcodes.o: lopcodes.c lopcodes.h llimits.h lua.h luaconf.h -loslib.o: loslib.c lua.h luaconf.h lauxlib.h lualib.h -lparser.o: lparser.c lua.h luaconf.h lcode.h llex.h lobject.h llimits.h \ - lzio.h lmem.h lopcodes.h lparser.h ldebug.h lstate.h ltm.h ldo.h lfunc.h \ - lstring.h lgc.h ltable.h -lstate.o: lstate.c lua.h luaconf.h lapi.h llimits.h lstate.h lobject.h \ - ltm.h lzio.h lmem.h ldebug.h ldo.h lfunc.h lgc.h llex.h lstring.h \ - ltable.h -lstring.o: lstring.c lua.h luaconf.h lmem.h llimits.h lobject.h lstate.h \ - ltm.h lzio.h lstring.h lgc.h -lstrlib.o: lstrlib.c lua.h luaconf.h lauxlib.h lualib.h -ltable.o: ltable.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h \ - ltm.h lzio.h lmem.h ldo.h lgc.h lstring.h ltable.h lvm.h -ltablib.o: ltablib.c lua.h luaconf.h lauxlib.h lualib.h -ltm.o: ltm.c lua.h luaconf.h lobject.h llimits.h lstate.h ltm.h lzio.h \ - lmem.h lstring.h lgc.h ltable.h -lua.o: lua.c lua.h luaconf.h lauxlib.h lualib.h -luac.o: luac.c lua.h luaconf.h lauxlib.h lobject.h llimits.h lstate.h \ - ltm.h lzio.h lmem.h lundump.h ldebug.h lopcodes.h -lundump.o: lundump.c lua.h luaconf.h ldebug.h lstate.h lobject.h \ - llimits.h ltm.h lzio.h lmem.h ldo.h lfunc.h lstring.h lgc.h lundump.h -lvm.o: lvm.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h ltm.h \ - lzio.h lmem.h ldo.h lfunc.h lgc.h lopcodes.h lstring.h ltable.h lvm.h -lzio.o: lzio.c lua.h luaconf.h llimits.h lmem.h lstate.h lobject.h ltm.h \ - lzio.h - diff --git a/radio/src/lua/src/lapi.c b/radio/src/lua/src/lapi.c deleted file mode 100644 index 791d85454..000000000 --- a/radio/src/lua/src/lapi.c +++ /dev/null @@ -1,1284 +0,0 @@ -/* -** $Id: lapi.c,v 2.171 2013/03/16 21:10:18 roberto Exp $ -** Lua API -** See Copyright Notice in lua.h -*/ - - -#include -#include - -#define lapi_c -#define LUA_CORE - -#include "lua.h" - -#include "lapi.h" -#include "ldebug.h" -#include "ldo.h" -#include "lfunc.h" -#include "lgc.h" -#include "lmem.h" -#include "lobject.h" -#include "lstate.h" -#include "lstring.h" -#include "ltable.h" -#include "ltm.h" -#include "lundump.h" -#include "lvm.h" - - - -const char lua_ident[] = - "$LuaVersion: " LUA_COPYRIGHT " $" - "$LuaAuthors: " LUA_AUTHORS " $"; - - -/* value at a non-valid index */ -#define NONVALIDVALUE cast(TValue *, luaO_nilobject) - -/* corresponding test */ -#define isvalid(o) ((o) != luaO_nilobject) - -/* test for pseudo index */ -#define ispseudo(i) ((i) <= LUA_REGISTRYINDEX) - -/* test for valid but not pseudo index */ -#define isstackindex(i, o) (isvalid(o) && !ispseudo(i)) - -#define api_checkvalidindex(L, o) api_check(L, isvalid(o), "invalid index") - -#define api_checkstackindex(L, i, o) \ - api_check(L, isstackindex(i, o), "index not in the stack") - - -static TValue *index2addr (lua_State *L, int idx) { - CallInfo *ci = L->ci; - if (idx > 0) { - TValue *o = ci->func + idx; - api_check(L, idx <= ci->top - (ci->func + 1), "unacceptable index"); - if (o >= L->top) return NONVALIDVALUE; - else return o; - } - else if (!ispseudo(idx)) { /* negative index */ - api_check(L, idx != 0 && -idx <= L->top - (ci->func + 1), "invalid index"); - return L->top + idx; - } - else if (idx == LUA_REGISTRYINDEX) - return &G(L)->l_registry; - else { /* upvalues */ - idx = LUA_REGISTRYINDEX - idx; - api_check(L, idx <= MAXUPVAL + 1, "upvalue index too large"); - if (ttislcf(ci->func)) /* light C function? */ - return NONVALIDVALUE; /* it has no upvalues */ - else { - CClosure *func = clCvalue(ci->func); - return (idx <= func->nupvalues) ? &func->upvalue[idx-1] : NONVALIDVALUE; - } - } -} - - -/* -** to be called by 'lua_checkstack' in protected mode, to grow stack -** capturing memory errors -*/ -static void growstack (lua_State *L, void *ud) { - int size = *(int *)ud; - luaD_growstack(L, size); -} - - -LUA_API int lua_checkstack (lua_State *L, int size) { - int res; - CallInfo *ci = L->ci; - lua_lock(L); - if (L->stack_last - L->top > size) /* stack large enough? */ - res = 1; /* yes; check is OK */ - else { /* no; need to grow stack */ - int inuse = cast_int(L->top - L->stack) + EXTRA_STACK; - if (inuse > LUAI_MAXSTACK - size) /* can grow without overflow? */ - res = 0; /* no */ - else /* try to grow stack */ - res = (luaD_rawrunprotected(L, &growstack, &size) == LUA_OK); - } - if (res && ci->top < L->top + size) - ci->top = L->top + size; /* adjust frame top */ - lua_unlock(L); - return res; -} - - -LUA_API void lua_xmove (lua_State *from, lua_State *to, int n) { - int i; - if (from == to) return; - lua_lock(to); - api_checknelems(from, n); - api_check(from, G(from) == G(to), "moving among independent states"); - api_check(from, to->ci->top - to->top >= n, "not enough elements to move"); - from->top -= n; - for (i = 0; i < n; i++) { - setobj2s(to, to->top++, from->top + i); - } - lua_unlock(to); -} - - -LUA_API lua_CFunction lua_atpanic (lua_State *L, lua_CFunction panicf) { - lua_CFunction old; - lua_lock(L); - old = G(L)->panic; - G(L)->panic = panicf; - lua_unlock(L); - return old; -} - - -LUA_API const lua_Number *lua_version (lua_State *L) { - static const lua_Number version = LUA_VERSION_NUM; - if (L == NULL) return &version; - else return G(L)->version; -} - - - -/* -** basic stack manipulation -*/ - - -/* -** convert an acceptable stack index into an absolute index -*/ -LUA_API int lua_absindex (lua_State *L, int idx) { - return (idx > 0 || ispseudo(idx)) - ? idx - : cast_int(L->top - L->ci->func + idx); -} - - -LUA_API int lua_gettop (lua_State *L) { - return cast_int(L->top - (L->ci->func + 1)); -} - - -LUA_API void lua_settop (lua_State *L, int idx) { - StkId func = L->ci->func; - lua_lock(L); - if (idx >= 0) { - api_check(L, idx <= L->stack_last - (func + 1), "new top too large"); - while (L->top < (func + 1) + idx) - setnilvalue(L->top++); - L->top = (func + 1) + idx; - } - else { - api_check(L, -(idx+1) <= (L->top - (func + 1)), "invalid new top"); - L->top += idx+1; /* `subtract' index (index is negative) */ - } - lua_unlock(L); -} - - -LUA_API void lua_remove (lua_State *L, int idx) { - StkId p; - lua_lock(L); - p = index2addr(L, idx); - api_checkstackindex(L, idx, p); - while (++p < L->top) setobjs2s(L, p-1, p); - L->top--; - lua_unlock(L); -} - - -LUA_API void lua_insert (lua_State *L, int idx) { - StkId p; - StkId q; - lua_lock(L); - p = index2addr(L, idx); - api_checkstackindex(L, idx, p); - for (q = L->top; q > p; q--) /* use L->top as a temporary */ - setobjs2s(L, q, q - 1); - setobjs2s(L, p, L->top); - lua_unlock(L); -} - - -static void moveto (lua_State *L, TValue *fr, int idx) { - TValue *to = index2addr(L, idx); - api_checkvalidindex(L, to); - setobj(L, to, fr); - if (idx < LUA_REGISTRYINDEX) /* function upvalue? */ - luaC_barrier(L, clCvalue(L->ci->func), fr); - /* LUA_REGISTRYINDEX does not need gc barrier - (collector revisits it before finishing collection) */ -} - - -LUA_API void lua_replace (lua_State *L, int idx) { - lua_lock(L); - api_checknelems(L, 1); - moveto(L, L->top - 1, idx); - L->top--; - lua_unlock(L); -} - - -LUA_API void lua_copy (lua_State *L, int fromidx, int toidx) { - TValue *fr; - lua_lock(L); - fr = index2addr(L, fromidx); - moveto(L, fr, toidx); - lua_unlock(L); -} - - -LUA_API void lua_pushvalue (lua_State *L, int idx) { - lua_lock(L); - setobj2s(L, L->top, index2addr(L, idx)); - api_incr_top(L); - lua_unlock(L); -} - - - -/* -** access functions (stack -> C) -*/ - - -LUA_API int lua_type (lua_State *L, int idx) { - StkId o = index2addr(L, idx); - return (isvalid(o) ? ttypenv(o) : LUA_TNONE); -} - - -LUA_API const char *lua_typename (lua_State *L, int t) { - UNUSED(L); - return ttypename(t); -} - - -LUA_API int lua_iscfunction (lua_State *L, int idx) { - StkId o = index2addr(L, idx); - return (ttislcf(o) || (ttisCclosure(o))); -} - - -LUA_API int lua_isnumber (lua_State *L, int idx) { - TValue n; - const TValue *o = index2addr(L, idx); - return tonumber(o, &n); -} - - -LUA_API int lua_isstring (lua_State *L, int idx) { - int t = lua_type(L, idx); - return (t == LUA_TSTRING || t == LUA_TNUMBER); -} - - -LUA_API int lua_isuserdata (lua_State *L, int idx) { - const TValue *o = index2addr(L, idx); - return (ttisuserdata(o) || ttislightuserdata(o)); -} - - -LUA_API int lua_rawequal (lua_State *L, int index1, int index2) { - StkId o1 = index2addr(L, index1); - StkId o2 = index2addr(L, index2); - return (isvalid(o1) && isvalid(o2)) ? luaV_rawequalobj(o1, o2) : 0; -} - - -LUA_API void lua_arith (lua_State *L, int op) { - StkId o1; /* 1st operand */ - StkId o2; /* 2nd operand */ - lua_lock(L); - if (op != LUA_OPUNM) /* all other operations expect two operands */ - api_checknelems(L, 2); - else { /* for unary minus, add fake 2nd operand */ - api_checknelems(L, 1); - setobjs2s(L, L->top, L->top - 1); - L->top++; - } - o1 = L->top - 2; - o2 = L->top - 1; - if (ttisnumber(o1) && ttisnumber(o2)) { - setnvalue(o1, luaO_arith(op, nvalue(o1), nvalue(o2))); - } - else - luaV_arith(L, o1, o1, o2, cast(TMS, op - LUA_OPADD + TM_ADD)); - L->top--; - lua_unlock(L); -} - - -LUA_API int lua_compare (lua_State *L, int index1, int index2, int op) { - StkId o1, o2; - int i = 0; - lua_lock(L); /* may call tag method */ - o1 = index2addr(L, index1); - o2 = index2addr(L, index2); - if (isvalid(o1) && isvalid(o2)) { - switch (op) { - case LUA_OPEQ: i = equalobj(L, o1, o2); break; - case LUA_OPLT: i = luaV_lessthan(L, o1, o2); break; - case LUA_OPLE: i = luaV_lessequal(L, o1, o2); break; - default: api_check(L, 0, "invalid option"); - } - } - lua_unlock(L); - return i; -} - - -LUA_API lua_Number lua_tonumberx (lua_State *L, int idx, int *isnum) { - TValue n; - const TValue *o = index2addr(L, idx); - if (tonumber(o, &n)) { - if (isnum) *isnum = 1; - return nvalue(o); - } - else { - if (isnum) *isnum = 0; - return 0; - } -} - - -LUA_API lua_Integer lua_tointegerx (lua_State *L, int idx, int *isnum) { - TValue n; - const TValue *o = index2addr(L, idx); - if (tonumber(o, &n)) { - lua_Integer res; - lua_Number num = nvalue(o); - lua_number2integer(res, num); - if (isnum) *isnum = 1; - return res; - } - else { - if (isnum) *isnum = 0; - return 0; - } -} - - -LUA_API lua_Unsigned lua_tounsignedx (lua_State *L, int idx, int *isnum) { - TValue n; - const TValue *o = index2addr(L, idx); - if (tonumber(o, &n)) { - lua_Unsigned res; - lua_Number num = nvalue(o); - lua_number2unsigned(res, num); - if (isnum) *isnum = 1; - return res; - } - else { - if (isnum) *isnum = 0; - return 0; - } -} - - -LUA_API int lua_toboolean (lua_State *L, int idx) { - const TValue *o = index2addr(L, idx); - return !l_isfalse(o); -} - - -LUA_API const char *lua_tolstring (lua_State *L, int idx, size_t *len) { - StkId o = index2addr(L, idx); - if (!ttisstring(o)) { - lua_lock(L); /* `luaV_tostring' may create a new string */ - if (!luaV_tostring(L, o)) { /* conversion failed? */ - if (len != NULL) *len = 0; - lua_unlock(L); - return NULL; - } - luaC_checkGC(L); - o = index2addr(L, idx); /* previous call may reallocate the stack */ - lua_unlock(L); - } - if (len != NULL) *len = tsvalue(o)->len; - return svalue(o); -} - - -LUA_API size_t lua_rawlen (lua_State *L, int idx) { - StkId o = index2addr(L, idx); - switch (ttypenv(o)) { - case LUA_TSTRING: return tsvalue(o)->len; - case LUA_TUSERDATA: return uvalue(o)->len; - case LUA_TTABLE: return luaH_getn(hvalue(o)); - default: return 0; - } -} - - -LUA_API lua_CFunction lua_tocfunction (lua_State *L, int idx) { - StkId o = index2addr(L, idx); - if (ttislcf(o)) return fvalue(o); - else if (ttisCclosure(o)) - return clCvalue(o)->f; - else return NULL; /* not a C function */ -} - - -LUA_API void *lua_touserdata (lua_State *L, int idx) { - StkId o = index2addr(L, idx); - switch (ttypenv(o)) { - case LUA_TUSERDATA: return (rawuvalue(o) + 1); - case LUA_TLIGHTUSERDATA: return pvalue(o); - default: return NULL; - } -} - - -LUA_API lua_State *lua_tothread (lua_State *L, int idx) { - StkId o = index2addr(L, idx); - return (!ttisthread(o)) ? NULL : thvalue(o); -} - - -LUA_API const void *lua_topointer (lua_State *L, int idx) { - StkId o = index2addr(L, idx); - switch (ttype(o)) { - case LUA_TTABLE: return hvalue(o); - case LUA_TLCL: return clLvalue(o); - case LUA_TCCL: return clCvalue(o); - case LUA_TLCF: return cast(void *, cast(size_t, fvalue(o))); - case LUA_TTHREAD: return thvalue(o); - case LUA_TUSERDATA: - case LUA_TLIGHTUSERDATA: - return lua_touserdata(L, idx); - default: return NULL; - } -} - - - -/* -** push functions (C -> stack) -*/ - - -LUA_API void lua_pushnil (lua_State *L) { - lua_lock(L); - setnilvalue(L->top); - api_incr_top(L); - lua_unlock(L); -} - - -LUA_API void lua_pushnumber (lua_State *L, lua_Number n) { - lua_lock(L); - setnvalue(L->top, n); - luai_checknum(L, L->top, - luaG_runerror(L, "C API - attempt to push a signaling NaN")); - api_incr_top(L); - lua_unlock(L); -} - - -LUA_API void lua_pushinteger (lua_State *L, lua_Integer n) { - lua_lock(L); - setnvalue(L->top, cast_num(n)); - api_incr_top(L); - lua_unlock(L); -} - - -LUA_API void lua_pushunsigned (lua_State *L, lua_Unsigned u) { - lua_Number n; - lua_lock(L); - n = lua_unsigned2number(u); - setnvalue(L->top, n); - api_incr_top(L); - lua_unlock(L); -} - - -LUA_API const char *lua_pushlstring (lua_State *L, const char *s, size_t len) { - TString *ts; - lua_lock(L); - luaC_checkGC(L); - ts = luaS_newlstr(L, s, len); - setsvalue2s(L, L->top, ts); - api_incr_top(L); - lua_unlock(L); - return getstr(ts); -} - - -LUA_API const char *lua_pushstring (lua_State *L, const char *s) { - if (s == NULL) { - lua_pushnil(L); - return NULL; - } - else { - TString *ts; - lua_lock(L); - luaC_checkGC(L); - ts = luaS_new(L, s); - setsvalue2s(L, L->top, ts); - api_incr_top(L); - lua_unlock(L); - return getstr(ts); - } -} - - -LUA_API const char *lua_pushvfstring (lua_State *L, const char *fmt, - va_list argp) { - const char *ret; - lua_lock(L); - luaC_checkGC(L); - ret = luaO_pushvfstring(L, fmt, argp); - lua_unlock(L); - return ret; -} - - -LUA_API const char *lua_pushfstring (lua_State *L, const char *fmt, ...) { - const char *ret; - va_list argp; - lua_lock(L); - luaC_checkGC(L); - va_start(argp, fmt); - ret = luaO_pushvfstring(L, fmt, argp); - va_end(argp); - lua_unlock(L); - return ret; -} - - -LUA_API void lua_pushcclosure (lua_State *L, lua_CFunction fn, int n) { - lua_lock(L); - if (n == 0) { - setfvalue(L->top, fn); - } - else { - Closure *cl; - api_checknelems(L, n); - api_check(L, n <= MAXUPVAL, "upvalue index too large"); - luaC_checkGC(L); - cl = luaF_newCclosure(L, n); - cl->c.f = fn; - L->top -= n; - while (n--) - setobj2n(L, &cl->c.upvalue[n], L->top + n); - setclCvalue(L, L->top, cl); - } - api_incr_top(L); - lua_unlock(L); -} - - -LUA_API void lua_pushboolean (lua_State *L, int b) { - lua_lock(L); - setbvalue(L->top, (b != 0)); /* ensure that true is 1 */ - api_incr_top(L); - lua_unlock(L); -} - - -LUA_API void lua_pushlightuserdata (lua_State *L, void *p) { - lua_lock(L); - setpvalue(L->top, p); - api_incr_top(L); - lua_unlock(L); -} - - -LUA_API int lua_pushthread (lua_State *L) { - lua_lock(L); - setthvalue(L, L->top, L); - api_incr_top(L); - lua_unlock(L); - return (G(L)->mainthread == L); -} - - - -/* -** get functions (Lua -> stack) -*/ - - -LUA_API void lua_getglobal (lua_State *L, const char *var) { - Table *reg = hvalue(&G(L)->l_registry); - const TValue *gt; /* global table */ - lua_lock(L); - gt = luaH_getint(reg, LUA_RIDX_GLOBALS); - setsvalue2s(L, L->top++, luaS_new(L, var)); - luaV_gettable(L, gt, L->top - 1, L->top - 1); - lua_unlock(L); -} - - -LUA_API void lua_gettable (lua_State *L, int idx) { - StkId t; - lua_lock(L); - t = index2addr(L, idx); - luaV_gettable(L, t, L->top - 1, L->top - 1); - lua_unlock(L); -} - - -LUA_API void lua_getfield (lua_State *L, int idx, const char *k) { - StkId t; - lua_lock(L); - t = index2addr(L, idx); - setsvalue2s(L, L->top, luaS_new(L, k)); - api_incr_top(L); - luaV_gettable(L, t, L->top - 1, L->top - 1); - lua_unlock(L); -} - - -LUA_API void lua_rawget (lua_State *L, int idx) { - StkId t; - lua_lock(L); - t = index2addr(L, idx); - api_check(L, ttistable(t), "table expected"); - setobj2s(L, L->top - 1, luaH_get(hvalue(t), L->top - 1)); - lua_unlock(L); -} - - -LUA_API void lua_rawgeti (lua_State *L, int idx, int n) { - StkId t; - lua_lock(L); - t = index2addr(L, idx); - api_check(L, ttistable(t), "table expected"); - setobj2s(L, L->top, luaH_getint(hvalue(t), n)); - api_incr_top(L); - lua_unlock(L); -} - - -LUA_API void lua_rawgetp (lua_State *L, int idx, const void *p) { - StkId t; - TValue k; - lua_lock(L); - t = index2addr(L, idx); - api_check(L, ttistable(t), "table expected"); - setpvalue(&k, cast(void *, p)); - setobj2s(L, L->top, luaH_get(hvalue(t), &k)); - api_incr_top(L); - lua_unlock(L); -} - - -LUA_API void lua_createtable (lua_State *L, int narray, int nrec) { - Table *t; - lua_lock(L); - luaC_checkGC(L); - t = luaH_new(L); - sethvalue(L, L->top, t); - api_incr_top(L); - if (narray > 0 || nrec > 0) - luaH_resize(L, t, narray, nrec); - lua_unlock(L); -} - - -LUA_API int lua_getmetatable (lua_State *L, int objindex) { - const TValue *obj; - Table *mt = NULL; - int res; - lua_lock(L); - obj = index2addr(L, objindex); - switch (ttypenv(obj)) { - case LUA_TTABLE: - mt = hvalue(obj)->metatable; - break; - case LUA_TUSERDATA: - mt = uvalue(obj)->metatable; - break; - default: - mt = G(L)->mt[ttypenv(obj)]; - break; - } - if (mt == NULL) - res = 0; - else { - sethvalue(L, L->top, mt); - api_incr_top(L); - res = 1; - } - lua_unlock(L); - return res; -} - - -LUA_API void lua_getuservalue (lua_State *L, int idx) { - StkId o; - lua_lock(L); - o = index2addr(L, idx); - api_check(L, ttisuserdata(o), "userdata expected"); - if (uvalue(o)->env) { - sethvalue(L, L->top, uvalue(o)->env); - } else - setnilvalue(L->top); - api_incr_top(L); - lua_unlock(L); -} - - -/* -** set functions (stack -> Lua) -*/ - - -LUA_API void lua_setglobal (lua_State *L, const char *var) { - Table *reg = hvalue(&G(L)->l_registry); - const TValue *gt; /* global table */ - lua_lock(L); - api_checknelems(L, 1); - gt = luaH_getint(reg, LUA_RIDX_GLOBALS); - setsvalue2s(L, L->top++, luaS_new(L, var)); - luaV_settable(L, gt, L->top - 1, L->top - 2); - L->top -= 2; /* pop value and key */ - lua_unlock(L); -} - - -LUA_API void lua_settable (lua_State *L, int idx) { - StkId t; - lua_lock(L); - api_checknelems(L, 2); - t = index2addr(L, idx); - luaV_settable(L, t, L->top - 2, L->top - 1); - L->top -= 2; /* pop index and value */ - lua_unlock(L); -} - - -LUA_API void lua_setfield (lua_State *L, int idx, const char *k) { - StkId t; - lua_lock(L); - api_checknelems(L, 1); - t = index2addr(L, idx); - setsvalue2s(L, L->top++, luaS_new(L, k)); - luaV_settable(L, t, L->top - 1, L->top - 2); - L->top -= 2; /* pop value and key */ - lua_unlock(L); -} - - -LUA_API void lua_rawset (lua_State *L, int idx) { - StkId t; - lua_lock(L); - api_checknelems(L, 2); - t = index2addr(L, idx); - api_check(L, ttistable(t), "table expected"); - setobj2t(L, luaH_set(L, hvalue(t), L->top-2), L->top-1); - invalidateTMcache(hvalue(t)); - luaC_barrierback(L, gcvalue(t), L->top-1); - L->top -= 2; - lua_unlock(L); -} - - -LUA_API void lua_rawseti (lua_State *L, int idx, int n) { - StkId t; - lua_lock(L); - api_checknelems(L, 1); - t = index2addr(L, idx); - api_check(L, ttistable(t), "table expected"); - luaH_setint(L, hvalue(t), n, L->top - 1); - luaC_barrierback(L, gcvalue(t), L->top-1); - L->top--; - lua_unlock(L); -} - - -LUA_API void lua_rawsetp (lua_State *L, int idx, const void *p) { - StkId t; - TValue k; - lua_lock(L); - api_checknelems(L, 1); - t = index2addr(L, idx); - api_check(L, ttistable(t), "table expected"); - setpvalue(&k, cast(void *, p)); - setobj2t(L, luaH_set(L, hvalue(t), &k), L->top - 1); - luaC_barrierback(L, gcvalue(t), L->top - 1); - L->top--; - lua_unlock(L); -} - - -LUA_API int lua_setmetatable (lua_State *L, int objindex) { - TValue *obj; - Table *mt; - lua_lock(L); - api_checknelems(L, 1); - obj = index2addr(L, objindex); - if (ttisnil(L->top - 1)) - mt = NULL; - else { - api_check(L, ttistable(L->top - 1), "table expected"); - mt = hvalue(L->top - 1); - } - switch (ttypenv(obj)) { - case LUA_TTABLE: { - hvalue(obj)->metatable = mt; - if (mt) { - luaC_objbarrierback(L, gcvalue(obj), mt); - luaC_checkfinalizer(L, gcvalue(obj), mt); - } - break; - } - case LUA_TUSERDATA: { - uvalue(obj)->metatable = mt; - if (mt) { - luaC_objbarrier(L, rawuvalue(obj), mt); - luaC_checkfinalizer(L, gcvalue(obj), mt); - } - break; - } - default: { - G(L)->mt[ttypenv(obj)] = mt; - break; - } - } - L->top--; - lua_unlock(L); - return 1; -} - - -LUA_API void lua_setuservalue (lua_State *L, int idx) { - StkId o; - lua_lock(L); - api_checknelems(L, 1); - o = index2addr(L, idx); - api_check(L, ttisuserdata(o), "userdata expected"); - if (ttisnil(L->top - 1)) - uvalue(o)->env = NULL; - else { - api_check(L, ttistable(L->top - 1), "table expected"); - uvalue(o)->env = hvalue(L->top - 1); - luaC_objbarrier(L, gcvalue(o), hvalue(L->top - 1)); - } - L->top--; - lua_unlock(L); -} - - -/* -** `load' and `call' functions (run Lua code) -*/ - - -#define checkresults(L,na,nr) \ - api_check(L, (nr) == LUA_MULTRET || (L->ci->top - L->top >= (nr) - (na)), \ - "results from function overflow current stack size") - - -LUA_API int lua_getctx (lua_State *L, int *ctx) { - if (L->ci->callstatus & CIST_YIELDED) { - if (ctx) *ctx = L->ci->u.c.ctx; - return L->ci->u.c.status; - } - else return LUA_OK; -} - - -LUA_API void lua_callk (lua_State *L, int nargs, int nresults, int ctx, - lua_CFunction k) { - StkId func; - lua_lock(L); - api_check(L, k == NULL || !isLua(L->ci), - "cannot use continuations inside hooks"); - api_checknelems(L, nargs+1); - api_check(L, L->status == LUA_OK, "cannot do calls on non-normal thread"); - checkresults(L, nargs, nresults); - func = L->top - (nargs+1); - if (k != NULL && L->nny == 0) { /* need to prepare continuation? */ - L->ci->u.c.k = k; /* save continuation */ - L->ci->u.c.ctx = ctx; /* save context */ - luaD_call(L, func, nresults, 1); /* do the call */ - } - else /* no continuation or no yieldable */ - luaD_call(L, func, nresults, 0); /* just do the call */ - adjustresults(L, nresults); - lua_unlock(L); -} - - - -/* -** Execute a protected call. -*/ -struct CallS { /* data to `f_call' */ - StkId func; - int nresults; -}; - - -static void f_call (lua_State *L, void *ud) { - struct CallS *c = cast(struct CallS *, ud); - luaD_call(L, c->func, c->nresults, 0); -} - - - -LUA_API int lua_pcallk (lua_State *L, int nargs, int nresults, int errfunc, - int ctx, lua_CFunction k) { - struct CallS c; - int status; - ptrdiff_t func; - lua_lock(L); - api_check(L, k == NULL || !isLua(L->ci), - "cannot use continuations inside hooks"); - api_checknelems(L, nargs+1); - api_check(L, L->status == LUA_OK, "cannot do calls on non-normal thread"); - checkresults(L, nargs, nresults); - if (errfunc == 0) - func = 0; - else { - StkId o = index2addr(L, errfunc); - api_checkstackindex(L, errfunc, o); - func = savestack(L, o); - } - c.func = L->top - (nargs+1); /* function to be called */ - if (k == NULL || L->nny > 0) { /* no continuation or no yieldable? */ - c.nresults = nresults; /* do a 'conventional' protected call */ - status = luaD_pcall(L, f_call, &c, savestack(L, c.func), func); - } - else { /* prepare continuation (call is already protected by 'resume') */ - CallInfo *ci = L->ci; - ci->u.c.k = k; /* save continuation */ - ci->u.c.ctx = ctx; /* save context */ - /* save information for error recovery */ - ci->extra = savestack(L, c.func); - ci->u.c.old_allowhook = L->allowhook; - ci->u.c.old_errfunc = L->errfunc; - L->errfunc = func; - /* mark that function may do error recovery */ - ci->callstatus |= CIST_YPCALL; - luaD_call(L, c.func, nresults, 1); /* do the call */ - ci->callstatus &= ~CIST_YPCALL; - L->errfunc = ci->u.c.old_errfunc; - status = LUA_OK; /* if it is here, there were no errors */ - } - adjustresults(L, nresults); - lua_unlock(L); - return status; -} - - -LUA_API int lua_load (lua_State *L, lua_Reader reader, void *data, - const char *chunkname, const char *mode) { - ZIO z; - int status; - lua_lock(L); - if (!chunkname) chunkname = "?"; - luaZ_init(L, &z, reader, data); - status = luaD_protectedparser(L, &z, chunkname, mode); - if (status == LUA_OK) { /* no errors? */ - LClosure *f = clLvalue(L->top - 1); /* get newly created function */ - if (f->nupvalues == 1) { /* does it have one upvalue? */ - /* get global table from registry */ - Table *reg = hvalue(&G(L)->l_registry); - const TValue *gt = luaH_getint(reg, LUA_RIDX_GLOBALS); - /* set global table as 1st upvalue of 'f' (may be LUA_ENV) */ - setobj(L, f->upvals[0]->v, gt); - luaC_barrier(L, f->upvals[0], gt); - } - } - lua_unlock(L); - return status; -} - - -LUA_API int lua_dump (lua_State *L, lua_Writer writer, void *data) { - int status; - TValue *o; - lua_lock(L); - api_checknelems(L, 1); - o = L->top - 1; - if (isLfunction(o)) - status = luaU_dump(L, getproto(o), writer, data, 0); - else - status = 1; - lua_unlock(L); - return status; -} - - -LUA_API int lua_status (lua_State *L) { - return L->status; -} - - -/* -** Garbage-collection function -*/ - -LUA_API int lua_gc (lua_State *L, int what, int data) { - int res = 0; - global_State *g; - lua_lock(L); - g = G(L); - switch (what) { - case LUA_GCSTOP: { - g->gcrunning = 0; - break; - } - case LUA_GCRESTART: { - luaE_setdebt(g, 0); - g->gcrunning = 1; - break; - } - case LUA_GCCOLLECT: { - luaC_fullgc(L, 0); - break; - } - case LUA_GCCOUNT: { - /* GC values are expressed in Kbytes: #bytes/2^10 */ - res = cast_int(gettotalbytes(g) >> 10); - break; - } - case LUA_GCCOUNTB: { - res = cast_int(gettotalbytes(g) & 0x3ff); - break; - } - case LUA_GCSTEP: { - if (g->gckind == KGC_GEN) { /* generational mode? */ - res = (g->GCestimate == 0); /* true if it will do major collection */ - luaC_forcestep(L); /* do a single step */ - } - else { - lu_mem debt = cast(lu_mem, data) * 1024 - GCSTEPSIZE; - if (g->gcrunning) - debt += g->GCdebt; /* include current debt */ - luaE_setdebt(g, debt); - luaC_forcestep(L); - if (g->gcstate == GCSpause) /* end of cycle? */ - res = 1; /* signal it */ - } - break; - } - case LUA_GCSETPAUSE: { - res = g->gcpause; - g->gcpause = data; - break; - } - case LUA_GCSETMAJORINC: { - res = g->gcmajorinc; - g->gcmajorinc = data; - break; - } - case LUA_GCSETSTEPMUL: { - res = g->gcstepmul; - g->gcstepmul = data; - break; - } - case LUA_GCISRUNNING: { - res = g->gcrunning; - break; - } - case LUA_GCGEN: { /* change collector to generational mode */ - luaC_changemode(L, KGC_GEN); - break; - } - case LUA_GCINC: { /* change collector to incremental mode */ - luaC_changemode(L, KGC_NORMAL); - break; - } - default: res = -1; /* invalid option */ - } - lua_unlock(L); - return res; -} - - - -/* -** miscellaneous functions -*/ - - -LUA_API int lua_error (lua_State *L) { - lua_lock(L); - api_checknelems(L, 1); - luaG_errormsg(L); - /* code unreachable; will unlock when control actually leaves the kernel */ - return 0; /* to avoid warnings */ -} - - -LUA_API int lua_next (lua_State *L, int idx) { - StkId t; - int more; - lua_lock(L); - t = index2addr(L, idx); - api_check(L, ttistable(t), "table expected"); - more = luaH_next(L, hvalue(t), L->top - 1); - if (more) { - api_incr_top(L); - } - else /* no more elements */ - L->top -= 1; /* remove key */ - lua_unlock(L); - return more; -} - - -LUA_API void lua_concat (lua_State *L, int n) { - lua_lock(L); - api_checknelems(L, n); - if (n >= 2) { - luaC_checkGC(L); - luaV_concat(L, n); - } - else if (n == 0) { /* push empty string */ - setsvalue2s(L, L->top, luaS_newlstr(L, "", 0)); - api_incr_top(L); - } - /* else n == 1; nothing to do */ - lua_unlock(L); -} - - -LUA_API void lua_len (lua_State *L, int idx) { - StkId t; - lua_lock(L); - t = index2addr(L, idx); - luaV_objlen(L, L->top, t); - api_incr_top(L); - lua_unlock(L); -} - - -LUA_API lua_Alloc lua_getallocf (lua_State *L, void **ud) { - lua_Alloc f; - lua_lock(L); - if (ud) *ud = G(L)->ud; - f = G(L)->frealloc; - lua_unlock(L); - return f; -} - - -LUA_API void lua_setallocf (lua_State *L, lua_Alloc f, void *ud) { - lua_lock(L); - G(L)->ud = ud; - G(L)->frealloc = f; - lua_unlock(L); -} - - -LUA_API void *lua_newuserdata (lua_State *L, size_t size) { - Udata *u; - lua_lock(L); - luaC_checkGC(L); - u = luaS_newudata(L, size, NULL); - setuvalue(L, L->top, u); - api_incr_top(L); - lua_unlock(L); - return u + 1; -} - - - -static const char *aux_upvalue (StkId fi, int n, TValue **val, - GCObject **owner) { - switch (ttype(fi)) { - case LUA_TCCL: { /* C closure */ - CClosure *f = clCvalue(fi); - if (!(1 <= n && n <= f->nupvalues)) return NULL; - *val = &f->upvalue[n-1]; - if (owner) *owner = obj2gco(f); - return ""; - } - case LUA_TLCL: { /* Lua closure */ - LClosure *f = clLvalue(fi); - TString *name; - Proto *p = f->p; - if (!(1 <= n && n <= p->sizeupvalues)) return NULL; - *val = f->upvals[n-1]->v; - if (owner) *owner = obj2gco(f->upvals[n - 1]); - name = p->upvalues[n-1].name; - return (name == NULL) ? "" : getstr(name); - } - default: return NULL; /* not a closure */ - } -} - - -LUA_API const char *lua_getupvalue (lua_State *L, int funcindex, int n) { - const char *name; - TValue *val = NULL; /* to avoid warnings */ - lua_lock(L); - name = aux_upvalue(index2addr(L, funcindex), n, &val, NULL); - if (name) { - setobj2s(L, L->top, val); - api_incr_top(L); - } - lua_unlock(L); - return name; -} - - -LUA_API const char *lua_setupvalue (lua_State *L, int funcindex, int n) { - const char *name; - TValue *val = NULL; /* to avoid warnings */ - GCObject *owner = NULL; /* to avoid warnings */ - StkId fi; - lua_lock(L); - fi = index2addr(L, funcindex); - api_checknelems(L, 1); - name = aux_upvalue(fi, n, &val, &owner); - if (name) { - L->top--; - setobj(L, val, L->top); - luaC_barrier(L, owner, L->top); - } - lua_unlock(L); - return name; -} - - -static UpVal **getupvalref (lua_State *L, int fidx, int n, LClosure **pf) { - LClosure *f; - StkId fi = index2addr(L, fidx); - api_check(L, ttisLclosure(fi), "Lua function expected"); - f = clLvalue(fi); - api_check(L, (1 <= n && n <= f->p->sizeupvalues), "invalid upvalue index"); - if (pf) *pf = f; - return &f->upvals[n - 1]; /* get its upvalue pointer */ -} - - -LUA_API void *lua_upvalueid (lua_State *L, int fidx, int n) { - StkId fi = index2addr(L, fidx); - switch (ttype(fi)) { - case LUA_TLCL: { /* lua closure */ - return *getupvalref(L, fidx, n, NULL); - } - case LUA_TCCL: { /* C closure */ - CClosure *f = clCvalue(fi); - api_check(L, 1 <= n && n <= f->nupvalues, "invalid upvalue index"); - return &f->upvalue[n - 1]; - } - default: { - api_check(L, 0, "closure expected"); - return NULL; - } - } -} - - -LUA_API void lua_upvaluejoin (lua_State *L, int fidx1, int n1, - int fidx2, int n2) { - LClosure *f1; - UpVal **up1 = getupvalref(L, fidx1, n1, &f1); - UpVal **up2 = getupvalref(L, fidx2, n2, NULL); - *up1 = *up2; - luaC_objbarrier(L, f1, *up2); -} - diff --git a/radio/src/lua/src/lapi.h b/radio/src/lua/src/lapi.h deleted file mode 100644 index 0909a3911..000000000 --- a/radio/src/lua/src/lapi.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -** $Id: lapi.h,v 2.7 2009/11/27 15:37:59 roberto Exp $ -** Auxiliary functions from Lua API -** See Copyright Notice in lua.h -*/ - -#ifndef lapi_h -#define lapi_h - - -#include "llimits.h" -#include "lstate.h" - -#define api_incr_top(L) {L->top++; api_check(L, L->top <= L->ci->top, \ - "stack overflow");} - -#define adjustresults(L,nres) \ - { if ((nres) == LUA_MULTRET && L->ci->top < L->top) L->ci->top = L->top; } - -#define api_checknelems(L,n) api_check(L, (n) < (L->top - L->ci->func), \ - "not enough elements in the stack") - - -#endif diff --git a/radio/src/lua/src/lauxlib.c b/radio/src/lua/src/lauxlib.c deleted file mode 100644 index 1c52b82a6..000000000 --- a/radio/src/lua/src/lauxlib.c +++ /dev/null @@ -1,997 +0,0 @@ -/* -** $Id: lauxlib.c,v 1.248 2013/03/21 13:54:57 roberto Exp $ -** Auxiliary functions for building Lua libraries -** See Copyright Notice in lua.h -*/ - - -#include -#include -#include -#include -#include - - -/* This file uses only the official API of Lua. -** Any function declared here could be written as an application function. -*/ - -#define lauxlib_c - -#include "lua.h" - -#include "lauxlib.h" - - -/* -** {====================================================== -** Traceback -** ======================================================= -*/ - - -#define LEVELS1 12 /* size of the first part of the stack */ -#define LEVELS2 10 /* size of the second part of the stack */ - - -#if defined(USE_FATFS) -int lua__getc(FIL *f) -{ - char c; - UINT result; - if (f_read(f, &c, 1, &result) == FR_OK && result == 1) - return c; - else - return -1; -} -#endif - - -/* -** search for 'objidx' in table at index -1. -** return 1 + string at top if find a good name. -*/ -static int findfield (lua_State *L, int objidx, int level) { - if (level == 0 || !lua_istable(L, -1)) - return 0; /* not found */ - lua_pushnil(L); /* start 'next' loop */ - while (lua_next(L, -2)) { /* for each pair in table */ - if (lua_type(L, -2) == LUA_TSTRING) { /* ignore non-string keys */ - if (lua_rawequal(L, objidx, -1)) { /* found object? */ - lua_pop(L, 1); /* remove value (but keep name) */ - return 1; - } - else if (findfield(L, objidx, level - 1)) { /* try recursively */ - lua_remove(L, -2); /* remove table (but keep name) */ - lua_pushliteral(L, "."); - lua_insert(L, -2); /* place '.' between the two names */ - lua_concat(L, 3); - return 1; - } - } - lua_pop(L, 1); /* remove value */ - } - return 0; /* not found */ -} - - -static int pushglobalfuncname (lua_State *L, lua_Debug *ar) { - int top = lua_gettop(L); - lua_getinfo(L, "f", ar); /* push function */ - lua_pushglobaltable(L); - if (findfield(L, top + 1, 2)) { - lua_copy(L, -1, top + 1); /* move name to proper place */ - lua_pop(L, 2); /* remove pushed values */ - return 1; - } - else { - lua_settop(L, top); /* remove function and global table */ - return 0; - } -} - - -static void pushfuncname (lua_State *L, lua_Debug *ar) { - if (*ar->namewhat != '\0') /* is there a name? */ - lua_pushfstring(L, "function " LUA_QS, ar->name); - else if (*ar->what == 'm') /* main? */ - lua_pushliteral(L, "main chunk"); - else if (*ar->what == 'C') { - if (pushglobalfuncname(L, ar)) { - lua_pushfstring(L, "function " LUA_QS, lua_tostring(L, -1)); - lua_remove(L, -2); /* remove name */ - } - else - lua_pushliteral(L, "?"); - } - else - lua_pushfstring(L, "function <%s:%d>", ar->short_src, ar->linedefined); -} - - -static int countlevels (lua_State *L) { - lua_Debug ar; - int li = 1, le = 1; - /* find an upper bound */ - while (lua_getstack(L, le, &ar)) { li = le; le *= 2; } - /* do a binary search */ - while (li < le) { - int m = (li + le)/2; - if (lua_getstack(L, m, &ar)) li = m + 1; - else le = m; - } - return le - 1; -} - - -LUALIB_API void luaL_traceback (lua_State *L, lua_State *L1, - const char *msg, int level) { - lua_Debug ar; - int top = lua_gettop(L); - int numlevels = countlevels(L1); - int mark = (numlevels > LEVELS1 + LEVELS2) ? LEVELS1 : 0; - if (msg) lua_pushfstring(L, "%s\n", msg); - lua_pushliteral(L, "stack traceback:"); - while (lua_getstack(L1, level++, &ar)) { - if (level == mark) { /* too many levels? */ - lua_pushliteral(L, "\n\t..."); /* add a '...' */ - level = numlevels - LEVELS2; /* and skip to last ones */ - } - else { - lua_getinfo(L1, "Slnt", &ar); - lua_pushfstring(L, "\n\t%s:", ar.short_src); - if (ar.currentline > 0) - lua_pushfstring(L, "%d:", ar.currentline); - lua_pushliteral(L, " in "); - pushfuncname(L, &ar); - if (ar.istailcall) - lua_pushliteral(L, "\n\t(...tail calls...)"); - lua_concat(L, lua_gettop(L) - top); - } - } - lua_concat(L, lua_gettop(L) - top); -} - -/* }====================================================== */ - - -/* -** {====================================================== -** Error-report functions -** ======================================================= -*/ - -LUALIB_API int luaL_argerror (lua_State *L, int narg, const char *extramsg) { - lua_Debug ar; - if (!lua_getstack(L, 0, &ar)) /* no stack frame? */ - return luaL_error(L, "bad argument #%d (%s)", narg, extramsg); - lua_getinfo(L, "n", &ar); - if (strcmp(ar.namewhat, "method") == 0) { - narg--; /* do not count `self' */ - if (narg == 0) /* error is in the self argument itself? */ - return luaL_error(L, "calling " LUA_QS " on bad self (%s)", - ar.name, extramsg); - } - if (ar.name == NULL) - ar.name = (pushglobalfuncname(L, &ar)) ? lua_tostring(L, -1) : "?"; - return luaL_error(L, "bad argument #%d to " LUA_QS " (%s)", - narg, ar.name, extramsg); -} - - -static int typeerror (lua_State *L, int narg, const char *tname) { - const char *msg = lua_pushfstring(L, "%s expected, got %s", - tname, luaL_typename(L, narg)); - return luaL_argerror(L, narg, msg); -} - - -static void tag_error (lua_State *L, int narg, int tag) { - typeerror(L, narg, lua_typename(L, tag)); -} - - -LUALIB_API void luaL_where (lua_State *L, int level) { - lua_Debug ar; - if (lua_getstack(L, level, &ar)) { /* check function at level */ - lua_getinfo(L, "Sl", &ar); /* get info about it */ - if (ar.currentline > 0) { /* is there info? */ - lua_pushfstring(L, "%s:%d: ", ar.short_src, ar.currentline); - return; - } - } - lua_pushliteral(L, ""); /* else, no information available... */ -} - - -LUALIB_API int luaL_error (lua_State *L, const char *fmt, ...) { - va_list argp; - va_start(argp, fmt); - luaL_where(L, 1); - lua_pushvfstring(L, fmt, argp); - va_end(argp); - lua_concat(L, 2); - return lua_error(L); -} - - -LUALIB_API int luaL_fileresult (lua_State *L, int stat, const char *fname) { - int en = errno; /* calls to Lua API may change this value */ - if (stat) { - lua_pushboolean(L, 1); - return 1; - } - else { - lua_pushnil(L); - if (fname) - lua_pushfstring(L, "%s: %s", fname, strerror(en)); - else - lua_pushstring(L, strerror(en)); - lua_pushinteger(L, en); - return 3; - } -} - - -#if !defined(inspectstat) /* { */ - -#if defined(LUA_USE_POSIX) - -#include - -/* -** use appropriate macros to interpret 'pclose' return status -*/ -#define inspectstat(stat,what) \ - if (WIFEXITED(stat)) { stat = WEXITSTATUS(stat); } \ - else if (WIFSIGNALED(stat)) { stat = WTERMSIG(stat); what = "signal"; } - -#else - -#define inspectstat(stat,what) /* no op */ - -#endif - -#endif /* } */ - - -LUALIB_API int luaL_execresult (lua_State *L, int stat) { - const char *what = "exit"; /* type of termination */ - if (stat == -1) /* error? */ - return luaL_fileresult(L, 0, NULL); - else { - inspectstat(stat, what); /* interpret result */ - if (*what == 'e' && stat == 0) /* successful termination? */ - lua_pushboolean(L, 1); - else - lua_pushnil(L); - lua_pushstring(L, what); - lua_pushinteger(L, stat); - return 3; /* return true/nil,what,code */ - } -} - -/* }====================================================== */ - - -/* -** {====================================================== -** Userdata's metatable manipulation -** ======================================================= -*/ - -LUALIB_API int luaL_newmetatable (lua_State *L, const char *tname) { - luaL_getmetatable(L, tname); /* try to get metatable */ - if (!lua_isnil(L, -1)) /* name already in use? */ - return 0; /* leave previous value on top, but return 0 */ - lua_pop(L, 1); - lua_newtable(L); /* create metatable */ - lua_pushvalue(L, -1); - lua_setfield(L, LUA_REGISTRYINDEX, tname); /* registry.name = metatable */ - return 1; -} - - -LUALIB_API void luaL_setmetatable (lua_State *L, const char *tname) { - luaL_getmetatable(L, tname); - lua_setmetatable(L, -2); -} - - -LUALIB_API void *luaL_testudata (lua_State *L, int ud, const char *tname) { - void *p = lua_touserdata(L, ud); - if (p != NULL) { /* value is a userdata? */ - if (lua_getmetatable(L, ud)) { /* does it have a metatable? */ - luaL_getmetatable(L, tname); /* get correct metatable */ - if (!lua_rawequal(L, -1, -2)) /* not the same? */ - p = NULL; /* value is a userdata with wrong metatable */ - lua_pop(L, 2); /* remove both metatables */ - return p; - } - } - return NULL; /* value is not a userdata with a metatable */ -} - - -LUALIB_API void *luaL_checkudata (lua_State *L, int ud, const char *tname) { - void *p = luaL_testudata(L, ud, tname); - if (p == NULL) typeerror(L, ud, tname); - return p; -} - -/* }====================================================== */ - - -/* -** {====================================================== -** Argument check functions -** ======================================================= -*/ - -LUALIB_API int luaL_checkoption (lua_State *L, int narg, const char *def, - const char *const lst[]) { - const char *name = (def) ? luaL_optstring(L, narg, def) : - luaL_checkstring(L, narg); - int i; - for (i=0; lst[i]; i++) - if (strcmp(lst[i], name) == 0) - return i; - return luaL_argerror(L, narg, - lua_pushfstring(L, "invalid option " LUA_QS, name)); -} - - -LUALIB_API void luaL_checkstack (lua_State *L, int space, const char *msg) { - /* keep some extra space to run error routines, if needed */ - const int extra = LUA_MINSTACK; - if (!lua_checkstack(L, space + extra)) { - if (msg) - luaL_error(L, "stack overflow (%s)", msg); - else - luaL_error(L, "stack overflow"); - } -} - - -LUALIB_API void luaL_checktype (lua_State *L, int narg, int t) { - if (lua_type(L, narg) != t) - tag_error(L, narg, t); -} - - -LUALIB_API void luaL_checkany (lua_State *L, int narg) { - if (lua_type(L, narg) == LUA_TNONE) - luaL_argerror(L, narg, "value expected"); -} - - -LUALIB_API const char *luaL_checklstring (lua_State *L, int narg, size_t *len) { - const char *s = lua_tolstring(L, narg, len); - if (!s) tag_error(L, narg, LUA_TSTRING); - return s; -} - - -LUALIB_API const char *luaL_optlstring (lua_State *L, int narg, - const char *def, size_t *len) { - if (lua_isnoneornil(L, narg)) { - if (len) - *len = (def ? strlen(def) : 0); - return def; - } - else return luaL_checklstring(L, narg, len); -} - - -LUALIB_API lua_Number luaL_checknumber (lua_State *L, int narg) { - int isnum; - lua_Number d = lua_tonumberx(L, narg, &isnum); - if (!isnum) - tag_error(L, narg, LUA_TNUMBER); - return d; -} - - -LUALIB_API lua_Number luaL_optnumber (lua_State *L, int narg, lua_Number def) { - return luaL_opt(L, luaL_checknumber, narg, def); -} - - -LUALIB_API lua_Integer luaL_checkinteger (lua_State *L, int narg) { - int isnum; - lua_Integer d = lua_tointegerx(L, narg, &isnum); - if (!isnum) - tag_error(L, narg, LUA_TNUMBER); - return d; -} - - -LUALIB_API lua_Unsigned luaL_checkunsigned (lua_State *L, int narg) { - int isnum; - lua_Unsigned d = lua_tounsignedx(L, narg, &isnum); - if (!isnum) - tag_error(L, narg, LUA_TNUMBER); - return d; -} - - -LUALIB_API lua_Integer luaL_optinteger (lua_State *L, int narg, - lua_Integer def) { - return luaL_opt(L, luaL_checkinteger, narg, def); -} - - -LUALIB_API lua_Unsigned luaL_optunsigned (lua_State *L, int narg, - lua_Unsigned def) { - return luaL_opt(L, luaL_checkunsigned, narg, def); -} - -/* }====================================================== */ - - -/* -** {====================================================== -** Generic Buffer manipulation -** ======================================================= -*/ - -/* -** check whether buffer is using a userdata on the stack as a temporary -** buffer -*/ -#define buffonstack(B) ((B)->b != (B)->initb) - - -/* -** returns a pointer to a free area with at least 'sz' bytes -*/ -LUALIB_API char *luaL_prepbuffsize (luaL_Buffer *B, size_t sz) { - lua_State *L = B->L; - if (B->size - B->n < sz) { /* not enough space? */ - char *newbuff; - size_t newsize = B->size * 2; /* double buffer size */ - if (newsize - B->n < sz) /* not big enough? */ - newsize = B->n + sz; - if (newsize < B->n || newsize - B->n < sz) - luaL_error(L, "buffer too large"); - /* create larger buffer */ - newbuff = (char *)lua_newuserdata(L, newsize * sizeof(char)); - /* move content to new buffer */ - memcpy(newbuff, B->b, B->n * sizeof(char)); - if (buffonstack(B)) - lua_remove(L, -2); /* remove old buffer */ - B->b = newbuff; - B->size = newsize; - } - return &B->b[B->n]; -} - - -LUALIB_API void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l) { - char *b = luaL_prepbuffsize(B, l); - memcpy(b, s, l * sizeof(char)); - luaL_addsize(B, l); -} - - -LUALIB_API void luaL_addstring (luaL_Buffer *B, const char *s) { - luaL_addlstring(B, s, strlen(s)); -} - - -LUALIB_API void luaL_pushresult (luaL_Buffer *B) { - lua_State *L = B->L; - lua_pushlstring(L, B->b, B->n); - if (buffonstack(B)) - lua_remove(L, -2); /* remove old buffer */ -} - - -LUALIB_API void luaL_pushresultsize (luaL_Buffer *B, size_t sz) { - luaL_addsize(B, sz); - luaL_pushresult(B); -} - - -LUALIB_API void luaL_addvalue (luaL_Buffer *B) { - lua_State *L = B->L; - size_t l; - const char *s = lua_tolstring(L, -1, &l); - if (buffonstack(B)) - lua_insert(L, -2); /* put value below buffer */ - luaL_addlstring(B, s, l); - lua_remove(L, (buffonstack(B)) ? -2 : -1); /* remove value */ -} - - -LUALIB_API void luaL_buffinit (lua_State *L, luaL_Buffer *B) { - B->L = L; - B->b = B->initb; - B->n = 0; - B->size = LUAL_BUFFERSIZE; -} - - -LUALIB_API char *luaL_buffinitsize (lua_State *L, luaL_Buffer *B, size_t sz) { - luaL_buffinit(L, B); - return luaL_prepbuffsize(B, sz); -} - -/* }====================================================== */ - - -/* -** {====================================================== -** Reference system -** ======================================================= -*/ - -/* index of free-list header */ -#define freelist 0 - - -LUALIB_API int luaL_ref (lua_State *L, int t) { - int ref; - if (lua_isnil(L, -1)) { - lua_pop(L, 1); /* remove from stack */ - return LUA_REFNIL; /* `nil' has a unique fixed reference */ - } - t = lua_absindex(L, t); - lua_rawgeti(L, t, freelist); /* get first free element */ - ref = (int)lua_tointeger(L, -1); /* ref = t[freelist] */ - lua_pop(L, 1); /* remove it from stack */ - if (ref != 0) { /* any free element? */ - lua_rawgeti(L, t, ref); /* remove it from list */ - lua_rawseti(L, t, freelist); /* (t[freelist] = t[ref]) */ - } - else /* no free elements */ - ref = (int)lua_rawlen(L, t) + 1; /* get a new reference */ - lua_rawseti(L, t, ref); - return ref; -} - - -LUALIB_API void luaL_unref (lua_State *L, int t, int ref) { - if (ref >= 0) { - t = lua_absindex(L, t); - lua_rawgeti(L, t, freelist); - lua_rawseti(L, t, ref); /* t[ref] = t[freelist] */ - lua_pushinteger(L, ref); - lua_rawseti(L, t, freelist); /* t[freelist] = ref */ - } -} - -/* }====================================================== */ - - -/* -** {====================================================== -** Load functions -** ======================================================= -*/ - -typedef struct LoadF { - int n; /* number of pre-read characters */ -#if defined(USE_FATFS) - FIL f; -#else - FILE *f; /* file being read */ -#endif - char buff[LUAL_BUFFERSIZE]; /* area for reading file */ -} LoadF; - - -static const char *getF (lua_State *L, void *ud, size_t *size) { - LoadF *lf = (LoadF *)ud; - (void)L; /* not used */ - if (lf->n > 0) { /* are there pre-read characters to be read? */ - *size = lf->n; /* return them (chars already in buffer) */ - lf->n = 0; /* no more pre-read characters */ - } - else { /* read a block from file */ - /* 'fread' can return > 0 *and* set the EOF flag. If next call to - 'getF' called 'fread', it might still wait for user input. - The next check avoids this problem. */ -#if defined(USE_FATFS) - UINT f_read_size; - FRESULT result = f_read(&lf->f, lf->buff, sizeof(lf->buff), &f_read_size); - if (result != FR_OK || f_read_size == 0) return NULL; - *size = f_read_size; -#else - if (feof(lf->f)) return NULL; - *size = fread(lf->buff, 1, sizeof(lf->buff), lf->f); /* read block */ -#endif - } - return lf->buff; -} - - -static int errfile (lua_State *L, const char *what, int fnameindex) { - const char *serr = strerror(errno); - const char *filename = lua_tostring(L, fnameindex) + 1; - lua_pushfstring(L, "cannot %s %s: %s", what, filename, serr); - lua_remove(L, fnameindex); - return LUA_ERRFILE; -} - - -static int skipBOM (LoadF *lf) { - const char *p = "\xEF\xBB\xBF"; /* Utf8 BOM mark */ - int c; - lf->n = 0; - do { - c = lua_getc(lf->f); - if (c == EOF || c != *(const unsigned char *)p++) return c; - lf->buff[lf->n++] = c; /* to be read by the parser */ - } while (*p != '\0'); - lf->n = 0; /* prefix matched; discard it */ - return lua_getc(lf->f); /* return next character */ -} - - -/* -** reads the first character of file 'f' and skips an optional BOM mark -** in its beginning plus its first line if it starts with '#'. Returns -** true if it skipped the first line. In any case, '*cp' has the -** first "valid" character of the file (after the optional BOM and -** a first-line comment). -*/ -static int skipcomment (LoadF *lf, int *cp) { - int c = *cp = skipBOM(lf); - if (c == '#') { /* first line is a comment (Unix exec. file)? */ - do { /* skip first line */ - c = lua_getc(lf->f); - } while (c != EOF && c != '\n') ; - *cp = lua_getc(lf->f); /* skip end-of-line, if present */ - return 1; /* there was a comment */ - } - else return 0; /* no comment */ -} - - -LUALIB_API int luaL_loadfilex (lua_State *L, const char *filename, - const char *mode) { - LoadF lf; - int status, readstatus; - int c; - int fnameindex = lua_gettop(L) + 1; /* index of filename on the stack */ - if (filename == NULL) { -#if defined(USE_FATFS) - return errfile(L, "open", fnameindex); -#else - lua_pushliteral(L, "=stdin"); - lf.f = stdin; -#endif - } - else { - lua_pushfstring(L, "@%s", filename); -#if defined(USE_FATFS) - FRESULT result = f_open(&lf.f, filename, FA_OPEN_EXISTING | FA_READ); - if (result != FR_OK) return errfile(L, "open", fnameindex); -#else - lf.f = fopen(filename, "r"); - if (lf.f == NULL) return errfile(L, "open", fnameindex); -#endif - } - if (skipcomment(&lf, &c)) /* read initial portion */ - lf.buff[lf.n++] = '\n'; /* add line to correct line numbers */ -#if !defined(USE_FATFS) - if (c == LUA_SIGNATURE[0] && filename) { /* binary file? */ - lf.f = freopen(filename, "rb", lf.f); /* reopen in binary mode */ - if (lf.f == NULL) return errfile(L, "reopen", fnameindex); - skipcomment(&lf, &c); /* re-read initial portion */ - } -#endif - if (c != EOF) - lf.buff[lf.n++] = c; /* 'c' is the first character of the stream */ - status = lua_load(L, getF, &lf, lua_tostring(L, -1), mode); -#if defined(USE_FATFS) - readstatus = 0; - if (filename) f_close(&lf.f); -#else - readstatus = ferror(lf.f); - if (filename) fclose(lf.f); /* close file (even in case of errors) */ -#endif - if (readstatus) { - lua_settop(L, fnameindex); /* ignore results from `lua_load' */ - return errfile(L, "read", fnameindex); - } - lua_remove(L, fnameindex); - return status; -} - - -typedef struct LoadS { - const char *s; - size_t size; -} LoadS; - - -static const char *getS (lua_State *L, void *ud, size_t *size) { - LoadS *ls = (LoadS *)ud; - (void)L; /* not used */ - if (ls->size == 0) return NULL; - *size = ls->size; - ls->size = 0; - return ls->s; -} - - -LUALIB_API int luaL_loadbufferx (lua_State *L, const char *buff, size_t size, - const char *name, const char *mode) { - LoadS ls; - ls.s = buff; - ls.size = size; - return lua_load(L, getS, &ls, name, mode); -} - - -LUALIB_API int luaL_loadstring (lua_State *L, const char *s) { - return luaL_loadbuffer(L, s, strlen(s), s); -} - -/* }====================================================== */ - - - -LUALIB_API int luaL_getmetafield (lua_State *L, int obj, const char *event) { - if (!lua_getmetatable(L, obj)) /* no metatable? */ - return 0; - lua_pushstring(L, event); - lua_rawget(L, -2); - if (lua_isnil(L, -1)) { - lua_pop(L, 2); /* remove metatable and metafield */ - return 0; - } - else { - lua_remove(L, -2); /* remove only metatable */ - return 1; - } -} - - -LUALIB_API int luaL_callmeta (lua_State *L, int obj, const char *event) { - obj = lua_absindex(L, obj); - if (!luaL_getmetafield(L, obj, event)) /* no metafield? */ - return 0; - lua_pushvalue(L, obj); - lua_call(L, 1, 1); - return 1; -} - - -LUALIB_API int luaL_len (lua_State *L, int idx) { - int l; - int isnum; - lua_len(L, idx); - l = (int)lua_tointegerx(L, -1, &isnum); - if (!isnum) - luaL_error(L, "object length is not a number"); - lua_pop(L, 1); /* remove object */ - return l; -} - - -LUALIB_API const char *luaL_tolstring (lua_State *L, int idx, size_t *len) { - if (!luaL_callmeta(L, idx, "__tostring")) { /* no metafield? */ - switch (lua_type(L, idx)) { - case LUA_TNUMBER: - case LUA_TSTRING: - lua_pushvalue(L, idx); - break; - case LUA_TBOOLEAN: - lua_pushstring(L, (lua_toboolean(L, idx) ? "true" : "false")); - break; - case LUA_TNIL: - lua_pushliteral(L, "nil"); - break; - default: - lua_pushfstring(L, "%s: %p", luaL_typename(L, idx), - lua_topointer(L, idx)); - break; - } - } - return lua_tolstring(L, -1, len); -} - - -/* -** {====================================================== -** Compatibility with 5.1 module functions -** ======================================================= -*/ -#if defined(LUA_COMPAT_MODULE) - -static const char *luaL_findtable (lua_State *L, int idx, - const char *fname, int szhint) { - const char *e; - if (idx) lua_pushvalue(L, idx); - do { - e = strchr(fname, '.'); - if (e == NULL) e = fname + strlen(fname); - lua_pushlstring(L, fname, e - fname); - lua_rawget(L, -2); - if (lua_isnil(L, -1)) { /* no such field? */ - lua_pop(L, 1); /* remove this nil */ - lua_createtable(L, 0, (*e == '.' ? 1 : szhint)); /* new table for field */ - lua_pushlstring(L, fname, e - fname); - lua_pushvalue(L, -2); - lua_settable(L, -4); /* set new table into field */ - } - else if (!lua_istable(L, -1)) { /* field has a non-table value? */ - lua_pop(L, 2); /* remove table and value */ - return fname; /* return problematic part of the name */ - } - lua_remove(L, -2); /* remove previous table */ - fname = e + 1; - } while (*e == '.'); - return NULL; -} - - -/* -** Count number of elements in a luaL_Reg list. -*/ -static int libsize (const luaL_Reg *l) { - int size = 0; - for (; l && l->name; l++) size++; - return size; -} - - -/* -** Find or create a module table with a given name. The function -** first looks at the _LOADED table and, if that fails, try a -** global variable with that name. In any case, leaves on the stack -** the module table. -*/ -LUALIB_API void luaL_pushmodule (lua_State *L, const char *modname, - int sizehint) { - luaL_findtable(L, LUA_REGISTRYINDEX, "_LOADED", 1); /* get _LOADED table */ - lua_getfield(L, -1, modname); /* get _LOADED[modname] */ - if (!lua_istable(L, -1)) { /* not found? */ - lua_pop(L, 1); /* remove previous result */ - /* try global variable (and create one if it does not exist) */ - lua_pushglobaltable(L); - if (luaL_findtable(L, 0, modname, sizehint) != NULL) - luaL_error(L, "name conflict for module " LUA_QS, modname); - lua_pushvalue(L, -1); - lua_setfield(L, -3, modname); /* _LOADED[modname] = new table */ - } - lua_remove(L, -2); /* remove _LOADED table */ -} - - -LUALIB_API void luaL_openlib (lua_State *L, const char *libname, - const luaL_Reg *l, int nup) { - luaL_checkversion(L); - if (libname) { - luaL_pushmodule(L, libname, libsize(l)); /* get/create library table */ - lua_insert(L, -(nup + 1)); /* move library table to below upvalues */ - } - if (l) - luaL_setfuncs(L, l, nup); - else - lua_pop(L, nup); /* remove upvalues */ -} - -#endif -/* }====================================================== */ - -/* -** set functions from list 'l' into table at top - 'nup'; each -** function gets the 'nup' elements at the top as upvalues. -** Returns with only the table at the stack. -*/ -LUALIB_API void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) { - luaL_checkversion(L); - luaL_checkstack(L, nup, "too many upvalues"); - for (; l->name != NULL; l++) { /* fill the table with given functions */ - int i; - for (i = 0; i < nup; i++) /* copy upvalues to the top */ - lua_pushvalue(L, -nup); - lua_pushcclosure(L, l->func, nup); /* closure with those upvalues */ - lua_setfield(L, -(nup + 2), l->name); - } - lua_pop(L, nup); /* remove upvalues */ -} - - -/* -** ensure that stack[idx][fname] has a table and push that table -** into the stack -*/ -LUALIB_API int luaL_getsubtable (lua_State *L, int idx, const char *fname) { - lua_getfield(L, idx, fname); - if (lua_istable(L, -1)) return 1; /* table already there */ - else { - lua_pop(L, 1); /* remove previous result */ - idx = lua_absindex(L, idx); - lua_newtable(L); - lua_pushvalue(L, -1); /* copy to be left at top */ - lua_setfield(L, idx, fname); /* assign new table to field */ - return 0; /* false, because did not find table there */ - } -} - - -/* -** stripped-down 'require'. Calls 'openf' to open a module, -** registers the result in 'package.loaded' table and, if 'glb' -** is true, also registers the result in the global table. -** Leaves resulting module on the top. -*/ -LUALIB_API void luaL_requiref (lua_State *L, const char *modname, - lua_CFunction openf, int glb) { - lua_pushcfunction(L, openf); - lua_pushstring(L, modname); /* argument to open function */ - lua_call(L, 1, 1); /* open module */ - luaL_getsubtable(L, LUA_REGISTRYINDEX, "_LOADED"); - lua_pushvalue(L, -2); /* make copy of module (call result) */ - lua_setfield(L, -2, modname); /* _LOADED[modname] = module */ - lua_pop(L, 1); /* remove _LOADED table */ - if (glb) { - lua_pushvalue(L, -1); /* copy of 'mod' */ - lua_setglobal(L, modname); /* _G[modname] = module */ - } -} - - -LUALIB_API const char *luaL_gsub (lua_State *L, const char *s, const char *p, - const char *r) { - const char *wild; - size_t l = strlen(p); - luaL_Buffer b; - luaL_buffinit(L, &b); - while ((wild = strstr(s, p)) != NULL) { - luaL_addlstring(&b, s, wild - s); /* push prefix */ - luaL_addstring(&b, r); /* push replacement in place of pattern */ - s = wild + l; /* continue after `p' */ - } - luaL_addstring(&b, s); /* push last suffix */ - luaL_pushresult(&b); - return lua_tostring(L, -1); -} - - -static void *l_alloc (void *ud, void *ptr, size_t osize, size_t nsize) { - (void)ud; (void)osize; /* not used */ - if (nsize == 0) { - free(ptr); - return NULL; - } - else - return realloc(ptr, nsize); -} - - -static int panic (lua_State *L) { - luai_writestringerror("PANIC: unprotected error in call to Lua API (%s)\n", - lua_tostring(L, -1)); - return 0; /* return to Lua to abort */ -} - - -LUALIB_API lua_State *luaL_newstate (void) { - lua_State *L = lua_newstate(l_alloc, NULL); - if (L) lua_atpanic(L, &panic); - return L; -} - - -LUALIB_API void luaL_checkversion_ (lua_State *L, lua_Number ver) { - const lua_Number *v = lua_version(L); - if (v != lua_version(NULL)) - luaL_error(L, "multiple Lua VMs detected"); - else if (*v != ver) - luaL_error(L, "version mismatch: app. needs %f, Lua core provides %f", - ver, *v); - /* check conversions number -> integer types */ - lua_pushnumber(L, -(lua_Number)0x1234); - if (lua_tointeger(L, -1) != -0x1234 || - lua_tounsigned(L, -1) != (lua_Unsigned)-0x1234) - luaL_error(L, "bad conversion number->int;" - " must recompile Lua with proper settings"); - lua_pop(L, 1); -} - diff --git a/radio/src/lua/src/lauxlib.h b/radio/src/lua/src/lauxlib.h deleted file mode 100644 index d66471b0b..000000000 --- a/radio/src/lua/src/lauxlib.h +++ /dev/null @@ -1,215 +0,0 @@ -/* -** $Id: lauxlib.h,v 1.120 2011/11/29 15:55:08 roberto Exp $ -** Auxiliary functions for building Lua libraries -** See Copyright Notice in lua.h -*/ - - -#ifndef lauxlib_h -#define lauxlib_h - - -#include - -#include "lua.h" - - - -/* extra error code for `luaL_load' */ -#define LUA_ERRFILE (LUA_ERRERR+1) - - -typedef struct luaL_Reg { - const char *name; - lua_CFunction func; -} luaL_Reg; - - -LUALIB_API void (luaL_checkversion_) (lua_State *L, lua_Number ver); -#define luaL_checkversion(L) luaL_checkversion_(L, LUA_VERSION_NUM) - -LUALIB_API int (luaL_getmetafield) (lua_State *L, int obj, const char *e); -LUALIB_API int (luaL_callmeta) (lua_State *L, int obj, const char *e); -LUALIB_API const char *(luaL_tolstring) (lua_State *L, int idx, size_t *len); -LUALIB_API int (luaL_argerror) (lua_State *L, int numarg, const char *extramsg); -LUALIB_API const char *(luaL_checklstring) (lua_State *L, int numArg, - size_t *l); -LUALIB_API const char *(luaL_optlstring) (lua_State *L, int numArg, - const char *def, size_t *l); -LUALIB_API lua_Number (luaL_checknumber) (lua_State *L, int numArg); -LUALIB_API lua_Number (luaL_optnumber) (lua_State *L, int nArg, lua_Number def); - -LUALIB_API lua_Integer (luaL_checkinteger) (lua_State *L, int numArg); -LUALIB_API lua_Integer (luaL_optinteger) (lua_State *L, int nArg, - lua_Integer def); -LUALIB_API lua_Unsigned (luaL_checkunsigned) (lua_State *L, int numArg); -LUALIB_API lua_Unsigned (luaL_optunsigned) (lua_State *L, int numArg, - lua_Unsigned def); - -LUALIB_API void (luaL_checkstack) (lua_State *L, int sz, const char *msg); -LUALIB_API void (luaL_checktype) (lua_State *L, int narg, int t); -LUALIB_API void (luaL_checkany) (lua_State *L, int narg); - -LUALIB_API int (luaL_newmetatable) (lua_State *L, const char *tname); -LUALIB_API void (luaL_setmetatable) (lua_State *L, const char *tname); -LUALIB_API void *(luaL_testudata) (lua_State *L, int ud, const char *tname); -LUALIB_API void *(luaL_checkudata) (lua_State *L, int ud, const char *tname); - -LUALIB_API void (luaL_where) (lua_State *L, int lvl); -LUALIB_API int (luaL_error) (lua_State *L, const char *fmt, ...); - -LUALIB_API int (luaL_checkoption) (lua_State *L, int narg, const char *def, - const char *const lst[]); - -LUALIB_API int (luaL_fileresult) (lua_State *L, int stat, const char *fname); -LUALIB_API int (luaL_execresult) (lua_State *L, int stat); - -/* pre-defined references */ -#define LUA_NOREF (-2) -#define LUA_REFNIL (-1) - -LUALIB_API int (luaL_ref) (lua_State *L, int t); -LUALIB_API void (luaL_unref) (lua_State *L, int t, int ref); - -LUALIB_API int (luaL_loadfilex) (lua_State *L, const char *filename, - const char *mode); - -#define luaL_loadfile(L,f) luaL_loadfilex(L,f,NULL) - -LUALIB_API int (luaL_loadbufferx) (lua_State *L, const char *buff, size_t sz, - const char *name, const char *mode); -LUALIB_API int (luaL_loadstring) (lua_State *L, const char *s); - -LUALIB_API lua_State *(luaL_newstate) (void); - -LUALIB_API int (luaL_len) (lua_State *L, int idx); - -LUALIB_API const char *(luaL_gsub) (lua_State *L, const char *s, const char *p, - const char *r); - -LUALIB_API void (luaL_setfuncs) (lua_State *L, const luaL_Reg *l, int nup); - -LUALIB_API int (luaL_getsubtable) (lua_State *L, int idx, const char *fname); - -LUALIB_API void (luaL_traceback) (lua_State *L, lua_State *L1, - const char *msg, int level); - -LUALIB_API void (luaL_requiref) (lua_State *L, const char *modname, - lua_CFunction openf, int glb); - -/* -** =============================================================== -** some useful macros -** =============================================================== -*/ - - -#define luaL_newlibtable(L,l) \ - lua_createtable(L, 0, sizeof(l)/sizeof((l)[0]) - 1) - -#define luaL_newlib(L,l) (luaL_newlibtable(L,l), luaL_setfuncs(L,l,0)) - -#define luaL_argcheck(L, cond,numarg,extramsg) \ - ((void)((cond) || luaL_argerror(L, (numarg), (extramsg)))) -#define luaL_checkstring(L,n) (luaL_checklstring(L, (n), NULL)) -#define luaL_optstring(L,n,d) (luaL_optlstring(L, (n), (d), NULL)) -#define luaL_checkint(L,n) ((int)luaL_checkinteger(L, (n))) -#define luaL_optint(L,n,d) ((int)luaL_optinteger(L, (n), (d))) -#define luaL_checklong(L,n) ((long)luaL_checkinteger(L, (n))) -#define luaL_optlong(L,n,d) ((long)luaL_optinteger(L, (n), (d))) - -#define luaL_typename(L,i) lua_typename(L, lua_type(L,(i))) - -#define luaL_dofile(L, fn) \ - (luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0)) - -#define luaL_dostring(L, s) \ - (luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0)) - -#define luaL_getmetatable(L,n) (lua_getfield(L, LUA_REGISTRYINDEX, (n))) - -#define luaL_opt(L,f,n,d) (lua_isnoneornil(L,(n)) ? (d) : f(L,(n))) - -#define luaL_loadbuffer(L,s,sz,n) luaL_loadbufferx(L,s,sz,n,NULL) - - -/* -** {====================================================== -** Generic Buffer manipulation -** ======================================================= -*/ - -typedef struct luaL_Buffer { - char *b; /* buffer address */ - size_t size; /* buffer size */ - size_t n; /* number of characters in buffer */ - lua_State *L; - char initb[LUAL_BUFFERSIZE]; /* initial buffer */ -} luaL_Buffer; - - -#define luaL_addchar(B,c) \ - ((void)((B)->n < (B)->size || luaL_prepbuffsize((B), 1)), \ - ((B)->b[(B)->n++] = (c))) - -#define luaL_addsize(B,s) ((B)->n += (s)) - -LUALIB_API void (luaL_buffinit) (lua_State *L, luaL_Buffer *B); -LUALIB_API char *(luaL_prepbuffsize) (luaL_Buffer *B, size_t sz); -LUALIB_API void (luaL_addlstring) (luaL_Buffer *B, const char *s, size_t l); -LUALIB_API void (luaL_addstring) (luaL_Buffer *B, const char *s); -LUALIB_API void (luaL_addvalue) (luaL_Buffer *B); -LUALIB_API void (luaL_pushresult) (luaL_Buffer *B); -LUALIB_API void (luaL_pushresultsize) (luaL_Buffer *B, size_t sz); -LUALIB_API char *(luaL_buffinitsize) (lua_State *L, luaL_Buffer *B, size_t sz); - -#define luaL_prepbuffer(B) luaL_prepbuffsize(B, LUAL_BUFFERSIZE) - -/* }====================================================== */ - - - -/* -** {====================================================== -** File handles for IO library -** ======================================================= -*/ - -/* -** A file handle is a userdata with metatable 'LUA_FILEHANDLE' and -** initial structure 'luaL_Stream' (it may contain other fields -** after that initial structure). -*/ - -#define LUA_FILEHANDLE "FILE*" - - -typedef struct luaL_Stream { -#if defined(USE_FATFS) - FIL *f; /* stream (NULL for incompletely created streams) */ -#else - FILE *f; /* stream (NULL for incompletely created streams) */ -#endif - lua_CFunction closef; /* to close stream (NULL for closed streams) */ -} luaL_Stream; - -/* }====================================================== */ - - - -/* compatibility with old module system */ -#if defined(LUA_COMPAT_MODULE) - -LUALIB_API void (luaL_pushmodule) (lua_State *L, const char *modname, - int sizehint); -LUALIB_API void (luaL_openlib) (lua_State *L, const char *libname, - const luaL_Reg *l, int nup); - -#define luaL_register(L,n,l) (luaL_openlib(L,(n),(l),0)) - -#endif - - -#endif - - diff --git a/radio/src/lua/src/lbaselib.c b/radio/src/lua/src/lbaselib.c deleted file mode 100644 index a9521e536..000000000 --- a/radio/src/lua/src/lbaselib.c +++ /dev/null @@ -1,456 +0,0 @@ -/* -** $Id: lbaselib.c,v 1.276 2013/02/21 13:44:53 roberto Exp $ -** Basic library -** See Copyright Notice in lua.h -*/ - - - -#include -#include -#include - -#define lbaselib_c - -#include "lua.h" - -#include "lauxlib.h" -#include "lualib.h" - - -static int luaB_print (lua_State *L) { - int n = lua_gettop(L); /* number of arguments */ - int i; - lua_getglobal(L, "tostring"); - for (i=1; i<=n; i++) { - const char *s; - size_t l; - lua_pushvalue(L, -1); /* function to be called */ - lua_pushvalue(L, i); /* value to print */ - lua_call(L, 1, 1); - s = lua_tolstring(L, -1, &l); /* get result */ - if (s == NULL) - return luaL_error(L, - LUA_QL("tostring") " must return a string to " LUA_QL("print")); - if (i>1) luai_writestring("\t", 1); - luai_writestring(s, l); - lua_pop(L, 1); /* pop result */ - } - luai_writeline(); - return 0; -} - - -#define SPACECHARS " \f\n\r\t\v" - -static int luaB_tonumber (lua_State *L) { - if (lua_isnoneornil(L, 2)) { /* standard conversion */ - int isnum; - lua_Number n = lua_tonumberx(L, 1, &isnum); - if (isnum) { - lua_pushnumber(L, n); - return 1; - } /* else not a number; must be something */ - luaL_checkany(L, 1); - } - else { - size_t l; - const char *s = luaL_checklstring(L, 1, &l); - const char *e = s + l; /* end point for 's' */ - int base = luaL_checkint(L, 2); - int neg = 0; - luaL_argcheck(L, 2 <= base && base <= 36, 2, "base out of range"); - s += strspn(s, SPACECHARS); /* skip initial spaces */ - if (*s == '-') { s++; neg = 1; } /* handle signal */ - else if (*s == '+') s++; - if (isalnum((unsigned char)*s)) { - lua_Number n = 0; - do { - int digit = (isdigit((unsigned char)*s)) ? *s - '0' - : toupper((unsigned char)*s) - 'A' + 10; - if (digit >= base) break; /* invalid numeral; force a fail */ - n = n * (lua_Number)base + (lua_Number)digit; - s++; - } while (isalnum((unsigned char)*s)); - s += strspn(s, SPACECHARS); /* skip trailing spaces */ - if (s == e) { /* no invalid trailing characters? */ - lua_pushnumber(L, (neg) ? -n : n); - return 1; - } /* else not a number */ - } /* else not a number */ - } - lua_pushnil(L); /* not a number */ - return 1; -} - - -static int luaB_error (lua_State *L) { - int level = luaL_optint(L, 2, 1); - lua_settop(L, 1); - if (lua_isstring(L, 1) && level > 0) { /* add extra information? */ - luaL_where(L, level); - lua_pushvalue(L, 1); - lua_concat(L, 2); - } - return lua_error(L); -} - - -static int luaB_getmetatable (lua_State *L) { - luaL_checkany(L, 1); - if (!lua_getmetatable(L, 1)) { - lua_pushnil(L); - return 1; /* no metatable */ - } - luaL_getmetafield(L, 1, "__metatable"); - return 1; /* returns either __metatable field (if present) or metatable */ -} - - -static int luaB_setmetatable (lua_State *L) { - int t = lua_type(L, 2); - luaL_checktype(L, 1, LUA_TTABLE); - luaL_argcheck(L, t == LUA_TNIL || t == LUA_TTABLE, 2, - "nil or table expected"); - if (luaL_getmetafield(L, 1, "__metatable")) - return luaL_error(L, "cannot change a protected metatable"); - lua_settop(L, 2); - lua_setmetatable(L, 1); - return 1; -} - - -static int luaB_rawequal (lua_State *L) { - luaL_checkany(L, 1); - luaL_checkany(L, 2); - lua_pushboolean(L, lua_rawequal(L, 1, 2)); - return 1; -} - - -static int luaB_rawlen (lua_State *L) { - int t = lua_type(L, 1); - luaL_argcheck(L, t == LUA_TTABLE || t == LUA_TSTRING, 1, - "table or string expected"); - lua_pushinteger(L, lua_rawlen(L, 1)); - return 1; -} - - -static int luaB_rawget (lua_State *L) { - luaL_checktype(L, 1, LUA_TTABLE); - luaL_checkany(L, 2); - lua_settop(L, 2); - lua_rawget(L, 1); - return 1; -} - -static int luaB_rawset (lua_State *L) { - luaL_checktype(L, 1, LUA_TTABLE); - luaL_checkany(L, 2); - luaL_checkany(L, 3); - lua_settop(L, 3); - lua_rawset(L, 1); - return 1; -} - - -static int luaB_collectgarbage (lua_State *L) { - static const char *const opts[] = {"stop", "restart", "collect", - "count", "step", "setpause", "setstepmul", - "setmajorinc", "isrunning", "generational", "incremental", NULL}; - static const int optsnum[] = {LUA_GCSTOP, LUA_GCRESTART, LUA_GCCOLLECT, - LUA_GCCOUNT, LUA_GCSTEP, LUA_GCSETPAUSE, LUA_GCSETSTEPMUL, - LUA_GCSETMAJORINC, LUA_GCISRUNNING, LUA_GCGEN, LUA_GCINC}; - int o = optsnum[luaL_checkoption(L, 1, "collect", opts)]; - int ex = luaL_optint(L, 2, 0); - int res = lua_gc(L, o, ex); - switch (o) { - case LUA_GCCOUNT: { - int b = lua_gc(L, LUA_GCCOUNTB, 0); - lua_pushnumber(L, res + ((lua_Number)b/1024)); - lua_pushinteger(L, b); - return 2; - } - case LUA_GCSTEP: case LUA_GCISRUNNING: { - lua_pushboolean(L, res); - return 1; - } - default: { - lua_pushinteger(L, res); - return 1; - } - } -} - - -static int luaB_type (lua_State *L) { - luaL_checkany(L, 1); - lua_pushstring(L, luaL_typename(L, 1)); - return 1; -} - - -static int pairsmeta (lua_State *L, const char *method, int iszero, - lua_CFunction iter) { - if (!luaL_getmetafield(L, 1, method)) { /* no metamethod? */ - luaL_checktype(L, 1, LUA_TTABLE); /* argument must be a table */ - lua_pushcfunction(L, iter); /* will return generator, */ - lua_pushvalue(L, 1); /* state, */ - if (iszero) lua_pushinteger(L, 0); /* and initial value */ - else lua_pushnil(L); - } - else { - lua_pushvalue(L, 1); /* argument 'self' to metamethod */ - lua_call(L, 1, 3); /* get 3 values from metamethod */ - } - return 3; -} - - -static int luaB_next (lua_State *L) { - luaL_checktype(L, 1, LUA_TTABLE); - lua_settop(L, 2); /* create a 2nd argument if there isn't one */ - if (lua_next(L, 1)) - return 2; - else { - lua_pushnil(L); - return 1; - } -} - - -static int luaB_pairs (lua_State *L) { - return pairsmeta(L, "__pairs", 0, luaB_next); -} - - -static int ipairsaux (lua_State *L) { - int i = luaL_checkint(L, 2); - luaL_checktype(L, 1, LUA_TTABLE); - i++; /* next value */ - lua_pushinteger(L, i); - lua_rawgeti(L, 1, i); - return (lua_isnil(L, -1)) ? 1 : 2; -} - - -static int luaB_ipairs (lua_State *L) { - return pairsmeta(L, "__ipairs", 1, ipairsaux); -} - - -static int load_aux (lua_State *L, int status, int envidx) { - if (status == LUA_OK) { - if (envidx != 0) { /* 'env' parameter? */ - lua_pushvalue(L, envidx); /* environment for loaded function */ - if (!lua_setupvalue(L, -2, 1)) /* set it as 1st upvalue */ - lua_pop(L, 1); /* remove 'env' if not used by previous call */ - } - return 1; - } - else { /* error (message is on top of the stack) */ - lua_pushnil(L); - lua_insert(L, -2); /* put before error message */ - return 2; /* return nil plus error message */ - } -} - - -static int luaB_loadfile (lua_State *L) { - const char *fname = luaL_optstring(L, 1, NULL); - const char *mode = luaL_optstring(L, 2, NULL); - int env = (!lua_isnone(L, 3) ? 3 : 0); /* 'env' index or 0 if no 'env' */ - int status = luaL_loadfilex(L, fname, mode); - return load_aux(L, status, env); -} - - -/* -** {====================================================== -** Generic Read function -** ======================================================= -*/ - - -/* -** reserved slot, above all arguments, to hold a copy of the returned -** string to avoid it being collected while parsed. 'load' has four -** optional arguments (chunk, source name, mode, and environment). -*/ -#define RESERVEDSLOT 5 - - -/* -** Reader for generic `load' function: `lua_load' uses the -** stack for internal stuff, so the reader cannot change the -** stack top. Instead, it keeps its resulting string in a -** reserved slot inside the stack. -*/ -static const char *generic_reader (lua_State *L, void *ud, size_t *size) { - (void)(ud); /* not used */ - luaL_checkstack(L, 2, "too many nested functions"); - lua_pushvalue(L, 1); /* get function */ - lua_call(L, 0, 1); /* call it */ - if (lua_isnil(L, -1)) { - lua_pop(L, 1); /* pop result */ - *size = 0; - return NULL; - } - else if (!lua_isstring(L, -1)) - luaL_error(L, "reader function must return a string"); - lua_replace(L, RESERVEDSLOT); /* save string in reserved slot */ - return lua_tolstring(L, RESERVEDSLOT, size); -} - - -static int luaB_load (lua_State *L) { - int status; - size_t l; - const char *s = lua_tolstring(L, 1, &l); - const char *mode = luaL_optstring(L, 3, "bt"); - int env = (!lua_isnone(L, 4) ? 4 : 0); /* 'env' index or 0 if no 'env' */ - if (s != NULL) { /* loading a string? */ - const char *chunkname = luaL_optstring(L, 2, s); - status = luaL_loadbufferx(L, s, l, chunkname, mode); - } - else { /* loading from a reader function */ - const char *chunkname = luaL_optstring(L, 2, "=(load)"); - luaL_checktype(L, 1, LUA_TFUNCTION); - lua_settop(L, RESERVEDSLOT); /* create reserved slot */ - status = lua_load(L, generic_reader, NULL, chunkname, mode); - } - return load_aux(L, status, env); -} - -/* }====================================================== */ - - -static int dofilecont (lua_State *L) { - return lua_gettop(L) - 1; -} - - -static int luaB_dofile (lua_State *L) { - const char *fname = luaL_optstring(L, 1, NULL); - lua_settop(L, 1); - if (luaL_loadfile(L, fname) != LUA_OK) - return lua_error(L); - lua_callk(L, 0, LUA_MULTRET, 0, dofilecont); - return dofilecont(L); -} - - -static int luaB_assert (lua_State *L) { - if (!lua_toboolean(L, 1)) - return luaL_error(L, "%s", luaL_optstring(L, 2, "assertion failed!")); - return lua_gettop(L); -} - - -static int luaB_select (lua_State *L) { - int n = lua_gettop(L); - if (lua_type(L, 1) == LUA_TSTRING && *lua_tostring(L, 1) == '#') { - lua_pushinteger(L, n-1); - return 1; - } - else { - int i = luaL_checkint(L, 1); - if (i < 0) i = n + i; - else if (i > n) i = n; - luaL_argcheck(L, 1 <= i, 1, "index out of range"); - return n - i; - } -} - - -static int finishpcall (lua_State *L, int status) { - if (!lua_checkstack(L, 1)) { /* no space for extra boolean? */ - lua_settop(L, 0); /* create space for return values */ - lua_pushboolean(L, 0); - lua_pushstring(L, "stack overflow"); - return 2; /* return false, msg */ - } - lua_pushboolean(L, status); /* first result (status) */ - lua_replace(L, 1); /* put first result in first slot */ - return lua_gettop(L); -} - - -static int pcallcont (lua_State *L) { - int status = lua_getctx(L, NULL); - return finishpcall(L, (status == LUA_YIELD)); -} - - -static int luaB_pcall (lua_State *L) { - int status; - luaL_checkany(L, 1); - lua_pushnil(L); - lua_insert(L, 1); /* create space for status result */ - status = lua_pcallk(L, lua_gettop(L) - 2, LUA_MULTRET, 0, 0, pcallcont); - return finishpcall(L, (status == LUA_OK)); -} - - -static int luaB_xpcall (lua_State *L) { - int status; - int n = lua_gettop(L); - luaL_argcheck(L, n >= 2, 2, "value expected"); - lua_pushvalue(L, 1); /* exchange function... */ - lua_copy(L, 2, 1); /* ...and error handler */ - lua_replace(L, 2); - status = lua_pcallk(L, n - 2, LUA_MULTRET, 1, 0, pcallcont); - return finishpcall(L, (status == LUA_OK)); -} - - -static int luaB_tostring (lua_State *L) { - luaL_checkany(L, 1); - luaL_tolstring(L, 1, NULL); - return 1; -} - - -static const luaL_Reg base_funcs[] = { - {"assert", luaB_assert}, - {"collectgarbage", luaB_collectgarbage}, - {"dofile", luaB_dofile}, - {"error", luaB_error}, - {"getmetatable", luaB_getmetatable}, - {"ipairs", luaB_ipairs}, - {"loadfile", luaB_loadfile}, - {"load", luaB_load}, -#if defined(LUA_COMPAT_LOADSTRING) - {"loadstring", luaB_load}, -#endif - {"next", luaB_next}, - {"pairs", luaB_pairs}, - {"pcall", luaB_pcall}, - {"print", luaB_print}, - {"rawequal", luaB_rawequal}, - {"rawlen", luaB_rawlen}, - {"rawget", luaB_rawget}, - {"rawset", luaB_rawset}, - {"select", luaB_select}, - {"setmetatable", luaB_setmetatable}, - {"tonumber", luaB_tonumber}, - {"tostring", luaB_tostring}, - {"type", luaB_type}, - {"xpcall", luaB_xpcall}, - {NULL, NULL} -}; - - -LUAMOD_API int luaopen_base (lua_State *L) { - /* set global _G */ - lua_pushglobaltable(L); - lua_pushglobaltable(L); - lua_setfield(L, -2, "_G"); - /* open lib into global table */ - luaL_setfuncs(L, base_funcs, 0); - lua_pushliteral(L, LUA_VERSION); - lua_setfield(L, -2, "_VERSION"); /* set global _VERSION */ - return 1; -} - diff --git a/radio/src/lua/src/lbitlib.c b/radio/src/lua/src/lbitlib.c deleted file mode 100644 index 5910f135d..000000000 --- a/radio/src/lua/src/lbitlib.c +++ /dev/null @@ -1,210 +0,0 @@ -/* -** $Id: lbitlib.c,v 1.18 2013/03/19 13:19:12 roberto Exp $ -** Standard library for bitwise operations -** See Copyright Notice in lua.h -*/ - -#define lbitlib_c - -#include "lua.h" - -#include "lauxlib.h" -#include "lualib.h" - - -/* number of bits to consider in a number */ -#if !defined(LUA_NBITS) -#define LUA_NBITS 32 -#endif - - -#define ALLONES (~(((~(lua_Unsigned)0) << (LUA_NBITS - 1)) << 1)) - -/* macro to trim extra bits */ -#define trim(x) ((x) & ALLONES) - - -/* builds a number with 'n' ones (1 <= n <= LUA_NBITS) */ -#define mask(n) (~((ALLONES << 1) << ((n) - 1))) - - -typedef lua_Unsigned b_uint; - - - -static b_uint andaux (lua_State *L) { - int i, n = lua_gettop(L); - b_uint r = ~(b_uint)0; - for (i = 1; i <= n; i++) - r &= luaL_checkunsigned(L, i); - return trim(r); -} - - -static int b_and (lua_State *L) { - b_uint r = andaux(L); - lua_pushunsigned(L, r); - return 1; -} - - -static int b_test (lua_State *L) { - b_uint r = andaux(L); - lua_pushboolean(L, r != 0); - return 1; -} - - -static int b_or (lua_State *L) { - int i, n = lua_gettop(L); - b_uint r = 0; - for (i = 1; i <= n; i++) - r |= luaL_checkunsigned(L, i); - lua_pushunsigned(L, trim(r)); - return 1; -} - - -static int b_xor (lua_State *L) { - int i, n = lua_gettop(L); - b_uint r = 0; - for (i = 1; i <= n; i++) - r ^= luaL_checkunsigned(L, i); - lua_pushunsigned(L, trim(r)); - return 1; -} - - -static int b_not (lua_State *L) { - b_uint r = ~luaL_checkunsigned(L, 1); - lua_pushunsigned(L, trim(r)); - return 1; -} - - -static int b_shift (lua_State *L, b_uint r, int i) { - if (i < 0) { /* shift right? */ - i = -i; - r = trim(r); - if (i >= LUA_NBITS) r = 0; - else r >>= i; - } - else { /* shift left */ - if (i >= LUA_NBITS) r = 0; - else r <<= i; - r = trim(r); - } - lua_pushunsigned(L, r); - return 1; -} - - -static int b_lshift (lua_State *L) { - return b_shift(L, luaL_checkunsigned(L, 1), luaL_checkint(L, 2)); -} - - -static int b_rshift (lua_State *L) { - return b_shift(L, luaL_checkunsigned(L, 1), -luaL_checkint(L, 2)); -} - - -static int b_arshift (lua_State *L) { - b_uint r = luaL_checkunsigned(L, 1); - int i = luaL_checkint(L, 2); - if (i < 0 || !(r & ((b_uint)1 << (LUA_NBITS - 1)))) - return b_shift(L, r, -i); - else { /* arithmetic shift for 'negative' number */ - if (i >= LUA_NBITS) r = ALLONES; - else - r = trim((r >> i) | ~(~(b_uint)0 >> i)); /* add signal bit */ - lua_pushunsigned(L, r); - return 1; - } -} - - -static int b_rot (lua_State *L, int i) { - b_uint r = luaL_checkunsigned(L, 1); - i &= (LUA_NBITS - 1); /* i = i % NBITS */ - r = trim(r); - r = (r << i) | (r >> (LUA_NBITS - i)); - lua_pushunsigned(L, trim(r)); - return 1; -} - - -static int b_lrot (lua_State *L) { - return b_rot(L, luaL_checkint(L, 2)); -} - - -static int b_rrot (lua_State *L) { - return b_rot(L, -luaL_checkint(L, 2)); -} - - -/* -** get field and width arguments for field-manipulation functions, -** checking whether they are valid. -** ('luaL_error' called without 'return' to avoid later warnings about -** 'width' being used uninitialized.) -*/ -static int fieldargs (lua_State *L, int farg, int *width) { - int f = luaL_checkint(L, farg); - int w = luaL_optint(L, farg + 1, 1); - luaL_argcheck(L, 0 <= f, farg, "field cannot be negative"); - luaL_argcheck(L, 0 < w, farg + 1, "width must be positive"); - if (f + w > LUA_NBITS) - luaL_error(L, "trying to access non-existent bits"); - *width = w; - return f; -} - - -static int b_extract (lua_State *L) { - int w; - b_uint r = luaL_checkunsigned(L, 1); - int f = fieldargs(L, 2, &w); - r = (r >> f) & mask(w); - lua_pushunsigned(L, r); - return 1; -} - - -static int b_replace (lua_State *L) { - int w; - b_uint r = luaL_checkunsigned(L, 1); - b_uint v = luaL_checkunsigned(L, 2); - int f = fieldargs(L, 3, &w); - int m = mask(w); - v &= m; /* erase bits outside given width */ - r = (r & ~(m << f)) | (v << f); - lua_pushunsigned(L, r); - return 1; -} - - -static const luaL_Reg bitlib[] = { - {"arshift", b_arshift}, - {"band", b_and}, - {"bnot", b_not}, - {"bor", b_or}, - {"bxor", b_xor}, - {"btest", b_test}, - {"extract", b_extract}, - {"lrotate", b_lrot}, - {"lshift", b_lshift}, - {"replace", b_replace}, - {"rrotate", b_rrot}, - {"rshift", b_rshift}, - {NULL, NULL} -}; - - - -LUAMOD_API int luaopen_bit32 (lua_State *L) { - luaL_newlib(L, bitlib); - return 1; -} - diff --git a/radio/src/lua/src/lcode.c b/radio/src/lua/src/lcode.c deleted file mode 100644 index 56c26ac8a..000000000 --- a/radio/src/lua/src/lcode.c +++ /dev/null @@ -1,881 +0,0 @@ -/* -** $Id: lcode.c,v 2.62 2012/08/16 17:34:28 roberto Exp $ -** Code generator for Lua -** See Copyright Notice in lua.h -*/ - - -#include - -#define lcode_c -#define LUA_CORE - -#include "lua.h" - -#include "lcode.h" -#include "ldebug.h" -#include "ldo.h" -#include "lgc.h" -#include "llex.h" -#include "lmem.h" -#include "lobject.h" -#include "lopcodes.h" -#include "lparser.h" -#include "lstring.h" -#include "ltable.h" -#include "lvm.h" - - -#define hasjumps(e) ((e)->t != (e)->f) - - -static int isnumeral(expdesc *e) { - return (e->k == VKNUM && e->t == NO_JUMP && e->f == NO_JUMP); -} - - -void luaK_nil (FuncState *fs, int from, int n) { - Instruction *previous; - int l = from + n - 1; /* last register to set nil */ - if (fs->pc > fs->lasttarget) { /* no jumps to current position? */ - previous = &fs->f->code[fs->pc-1]; - if (GET_OPCODE(*previous) == OP_LOADNIL) { - int pfrom = GETARG_A(*previous); - int pl = pfrom + GETARG_B(*previous); - if ((pfrom <= from && from <= pl + 1) || - (from <= pfrom && pfrom <= l + 1)) { /* can connect both? */ - if (pfrom < from) from = pfrom; /* from = min(from, pfrom) */ - if (pl > l) l = pl; /* l = max(l, pl) */ - SETARG_A(*previous, from); - SETARG_B(*previous, l - from); - return; - } - } /* else go through */ - } - luaK_codeABC(fs, OP_LOADNIL, from, n - 1, 0); /* else no optimization */ -} - - -int luaK_jump (FuncState *fs) { - int jpc = fs->jpc; /* save list of jumps to here */ - int j; - fs->jpc = NO_JUMP; - j = luaK_codeAsBx(fs, OP_JMP, 0, NO_JUMP); - luaK_concat(fs, &j, jpc); /* keep them on hold */ - return j; -} - - -void luaK_ret (FuncState *fs, int first, int nret) { - luaK_codeABC(fs, OP_RETURN, first, nret+1, 0); -} - - -static int condjump (FuncState *fs, OpCode op, int A, int B, int C) { - luaK_codeABC(fs, op, A, B, C); - return luaK_jump(fs); -} - - -static void fixjump (FuncState *fs, int pc, int dest) { - Instruction *jmp = &fs->f->code[pc]; - int offset = dest-(pc+1); - lua_assert(dest != NO_JUMP); - if (abs(offset) > MAXARG_sBx) - luaX_syntaxerror(fs->ls, "control structure too long"); - SETARG_sBx(*jmp, offset); -} - - -/* -** returns current `pc' and marks it as a jump target (to avoid wrong -** optimizations with consecutive instructions not in the same basic block). -*/ -int luaK_getlabel (FuncState *fs) { - fs->lasttarget = fs->pc; - return fs->pc; -} - - -static int getjump (FuncState *fs, int pc) { - int offset = GETARG_sBx(fs->f->code[pc]); - if (offset == NO_JUMP) /* point to itself represents end of list */ - return NO_JUMP; /* end of list */ - else - return (pc+1)+offset; /* turn offset into absolute position */ -} - - -static Instruction *getjumpcontrol (FuncState *fs, int pc) { - Instruction *pi = &fs->f->code[pc]; - if (pc >= 1 && testTMode(GET_OPCODE(*(pi-1)))) - return pi-1; - else - return pi; -} - - -/* -** check whether list has any jump that do not produce a value -** (or produce an inverted value) -*/ -static int need_value (FuncState *fs, int list) { - for (; list != NO_JUMP; list = getjump(fs, list)) { - Instruction i = *getjumpcontrol(fs, list); - if (GET_OPCODE(i) != OP_TESTSET) return 1; - } - return 0; /* not found */ -} - - -static int patchtestreg (FuncState *fs, int node, int reg) { - Instruction *i = getjumpcontrol(fs, node); - if (GET_OPCODE(*i) != OP_TESTSET) - return 0; /* cannot patch other instructions */ - if (reg != NO_REG && reg != GETARG_B(*i)) - SETARG_A(*i, reg); - else /* no register to put value or register already has the value */ - *i = CREATE_ABC(OP_TEST, GETARG_B(*i), 0, GETARG_C(*i)); - - return 1; -} - - -static void removevalues (FuncState *fs, int list) { - for (; list != NO_JUMP; list = getjump(fs, list)) - patchtestreg(fs, list, NO_REG); -} - - -static void patchlistaux (FuncState *fs, int list, int vtarget, int reg, - int dtarget) { - while (list != NO_JUMP) { - int next = getjump(fs, list); - if (patchtestreg(fs, list, reg)) - fixjump(fs, list, vtarget); - else - fixjump(fs, list, dtarget); /* jump to default target */ - list = next; - } -} - - -static void dischargejpc (FuncState *fs) { - patchlistaux(fs, fs->jpc, fs->pc, NO_REG, fs->pc); - fs->jpc = NO_JUMP; -} - - -void luaK_patchlist (FuncState *fs, int list, int target) { - if (target == fs->pc) - luaK_patchtohere(fs, list); - else { - lua_assert(target < fs->pc); - patchlistaux(fs, list, target, NO_REG, target); - } -} - - -LUAI_FUNC void luaK_patchclose (FuncState *fs, int list, int level) { - level++; /* argument is +1 to reserve 0 as non-op */ - while (list != NO_JUMP) { - int next = getjump(fs, list); - lua_assert(GET_OPCODE(fs->f->code[list]) == OP_JMP && - (GETARG_A(fs->f->code[list]) == 0 || - GETARG_A(fs->f->code[list]) >= level)); - SETARG_A(fs->f->code[list], level); - list = next; - } -} - - -void luaK_patchtohere (FuncState *fs, int list) { - luaK_getlabel(fs); - luaK_concat(fs, &fs->jpc, list); -} - - -void luaK_concat (FuncState *fs, int *l1, int l2) { - if (l2 == NO_JUMP) return; - else if (*l1 == NO_JUMP) - *l1 = l2; - else { - int list = *l1; - int next; - while ((next = getjump(fs, list)) != NO_JUMP) /* find last element */ - list = next; - fixjump(fs, list, l2); - } -} - - -static int luaK_code (FuncState *fs, Instruction i) { - Proto *f = fs->f; - dischargejpc(fs); /* `pc' will change */ - /* put new instruction in code array */ - luaM_growvector(fs->ls->L, f->code, fs->pc, f->sizecode, Instruction, - MAX_INT, "opcodes"); - f->code[fs->pc] = i; - /* save corresponding line information */ - luaM_growvector(fs->ls->L, f->lineinfo, fs->pc, f->sizelineinfo, int, - MAX_INT, "opcodes"); - f->lineinfo[fs->pc] = fs->ls->lastline; - return fs->pc++; -} - - -int luaK_codeABC (FuncState *fs, OpCode o, int a, int b, int c) { - lua_assert(getOpMode(o) == iABC); - lua_assert(getBMode(o) != OpArgN || b == 0); - lua_assert(getCMode(o) != OpArgN || c == 0); - lua_assert(a <= MAXARG_A && b <= MAXARG_B && c <= MAXARG_C); - return luaK_code(fs, CREATE_ABC(o, a, b, c)); -} - - -int luaK_codeABx (FuncState *fs, OpCode o, int a, unsigned int bc) { - lua_assert(getOpMode(o) == iABx || getOpMode(o) == iAsBx); - lua_assert(getCMode(o) == OpArgN); - lua_assert(a <= MAXARG_A && bc <= MAXARG_Bx); - return luaK_code(fs, CREATE_ABx(o, a, bc)); -} - - -static int codeextraarg (FuncState *fs, int a) { - lua_assert(a <= MAXARG_Ax); - return luaK_code(fs, CREATE_Ax(OP_EXTRAARG, a)); -} - - -int luaK_codek (FuncState *fs, int reg, int k) { - if (k <= MAXARG_Bx) - return luaK_codeABx(fs, OP_LOADK, reg, k); - else { - int p = luaK_codeABx(fs, OP_LOADKX, reg, 0); - codeextraarg(fs, k); - return p; - } -} - - -void luaK_checkstack (FuncState *fs, int n) { - int newstack = fs->freereg + n; - if (newstack > fs->f->maxstacksize) { - if (newstack >= MAXSTACK) - luaX_syntaxerror(fs->ls, "function or expression too complex"); - fs->f->maxstacksize = cast_byte(newstack); - } -} - - -void luaK_reserveregs (FuncState *fs, int n) { - luaK_checkstack(fs, n); - fs->freereg += n; -} - - -static void freereg (FuncState *fs, int reg) { - if (!ISK(reg) && reg >= fs->nactvar) { - fs->freereg--; - lua_assert(reg == fs->freereg); - } -} - - -static void freeexp (FuncState *fs, expdesc *e) { - if (e->k == VNONRELOC) - freereg(fs, e->u.info); -} - - -static int addk (FuncState *fs, TValue *key, TValue *v) { - lua_State *L = fs->ls->L; - TValue *idx = luaH_set(L, fs->h, key); - Proto *f = fs->f; - int k, oldsize; - if (ttisnumber(idx)) { - lua_Number n = nvalue(idx); - lua_number2int(k, n); - if (luaV_rawequalobj(&f->k[k], v)) - return k; - /* else may be a collision (e.g., between 0.0 and "\0\0\0\0\0\0\0\0"); - go through and create a new entry for this value */ - } - /* constant not found; create a new entry */ - oldsize = f->sizek; - k = fs->nk; - /* numerical value does not need GC barrier; - table has no metatable, so it does not need to invalidate cache */ - setnvalue(idx, cast_num(k)); - luaM_growvector(L, f->k, k, f->sizek, TValue, MAXARG_Ax, "constants"); - while (oldsize < f->sizek) setnilvalue(&f->k[oldsize++]); - setobj(L, &f->k[k], v); - fs->nk++; - luaC_barrier(L, f, v); - return k; -} - - -int luaK_stringK (FuncState *fs, TString *s) { - TValue o; - setsvalue(fs->ls->L, &o, s); - return addk(fs, &o, &o); -} - - -int luaK_numberK (FuncState *fs, lua_Number r) { - int n; - lua_State *L = fs->ls->L; - TValue o; - setnvalue(&o, r); - if (r == 0 || luai_numisnan(NULL, r)) { /* handle -0 and NaN */ - /* use raw representation as key to avoid numeric problems */ - setsvalue(L, L->top++, luaS_newlstr(L, (char *)&r, sizeof(r))); - n = addk(fs, L->top - 1, &o); - L->top--; - } - else - n = addk(fs, &o, &o); /* regular case */ - return n; -} - - -static int boolK (FuncState *fs, int b) { - TValue o; - setbvalue(&o, b); - return addk(fs, &o, &o); -} - - -static int nilK (FuncState *fs) { - TValue k, v; - setnilvalue(&v); - /* cannot use nil as key; instead use table itself to represent nil */ - sethvalue(fs->ls->L, &k, fs->h); - return addk(fs, &k, &v); -} - - -void luaK_setreturns (FuncState *fs, expdesc *e, int nresults) { - if (e->k == VCALL) { /* expression is an open function call? */ - SETARG_C(getcode(fs, e), nresults+1); - } - else if (e->k == VVARARG) { - SETARG_B(getcode(fs, e), nresults+1); - SETARG_A(getcode(fs, e), fs->freereg); - luaK_reserveregs(fs, 1); - } -} - - -void luaK_setoneret (FuncState *fs, expdesc *e) { - if (e->k == VCALL) { /* expression is an open function call? */ - e->k = VNONRELOC; - e->u.info = GETARG_A(getcode(fs, e)); - } - else if (e->k == VVARARG) { - SETARG_B(getcode(fs, e), 2); - e->k = VRELOCABLE; /* can relocate its simple result */ - } -} - - -void luaK_dischargevars (FuncState *fs, expdesc *e) { - switch (e->k) { - case VLOCAL: { - e->k = VNONRELOC; - break; - } - case VUPVAL: { - e->u.info = luaK_codeABC(fs, OP_GETUPVAL, 0, e->u.info, 0); - e->k = VRELOCABLE; - break; - } - case VINDEXED: { - OpCode op = OP_GETTABUP; /* assume 't' is in an upvalue */ - freereg(fs, e->u.ind.idx); - if (e->u.ind.vt == VLOCAL) { /* 't' is in a register? */ - freereg(fs, e->u.ind.t); - op = OP_GETTABLE; - } - e->u.info = luaK_codeABC(fs, op, 0, e->u.ind.t, e->u.ind.idx); - e->k = VRELOCABLE; - break; - } - case VVARARG: - case VCALL: { - luaK_setoneret(fs, e); - break; - } - default: break; /* there is one value available (somewhere) */ - } -} - - -static int code_label (FuncState *fs, int A, int b, int jump) { - luaK_getlabel(fs); /* those instructions may be jump targets */ - return luaK_codeABC(fs, OP_LOADBOOL, A, b, jump); -} - - -static void discharge2reg (FuncState *fs, expdesc *e, int reg) { - luaK_dischargevars(fs, e); - switch (e->k) { - case VNIL: { - luaK_nil(fs, reg, 1); - break; - } - case VFALSE: case VTRUE: { - luaK_codeABC(fs, OP_LOADBOOL, reg, e->k == VTRUE, 0); - break; - } - case VK: { - luaK_codek(fs, reg, e->u.info); - break; - } - case VKNUM: { - luaK_codek(fs, reg, luaK_numberK(fs, e->u.nval)); - break; - } - case VRELOCABLE: { - Instruction *pc = &getcode(fs, e); - SETARG_A(*pc, reg); - break; - } - case VNONRELOC: { - if (reg != e->u.info) - luaK_codeABC(fs, OP_MOVE, reg, e->u.info, 0); - break; - } - default: { - lua_assert(e->k == VVOID || e->k == VJMP); - return; /* nothing to do... */ - } - } - e->u.info = reg; - e->k = VNONRELOC; -} - - -static void discharge2anyreg (FuncState *fs, expdesc *e) { - if (e->k != VNONRELOC) { - luaK_reserveregs(fs, 1); - discharge2reg(fs, e, fs->freereg-1); - } -} - - -static void exp2reg (FuncState *fs, expdesc *e, int reg) { - discharge2reg(fs, e, reg); - if (e->k == VJMP) - luaK_concat(fs, &e->t, e->u.info); /* put this jump in `t' list */ - if (hasjumps(e)) { - int final; /* position after whole expression */ - int p_f = NO_JUMP; /* position of an eventual LOAD false */ - int p_t = NO_JUMP; /* position of an eventual LOAD true */ - if (need_value(fs, e->t) || need_value(fs, e->f)) { - int fj = (e->k == VJMP) ? NO_JUMP : luaK_jump(fs); - p_f = code_label(fs, reg, 0, 1); - p_t = code_label(fs, reg, 1, 0); - luaK_patchtohere(fs, fj); - } - final = luaK_getlabel(fs); - patchlistaux(fs, e->f, final, reg, p_f); - patchlistaux(fs, e->t, final, reg, p_t); - } - e->f = e->t = NO_JUMP; - e->u.info = reg; - e->k = VNONRELOC; -} - - -void luaK_exp2nextreg (FuncState *fs, expdesc *e) { - luaK_dischargevars(fs, e); - freeexp(fs, e); - luaK_reserveregs(fs, 1); - exp2reg(fs, e, fs->freereg - 1); -} - - -int luaK_exp2anyreg (FuncState *fs, expdesc *e) { - luaK_dischargevars(fs, e); - if (e->k == VNONRELOC) { - if (!hasjumps(e)) return e->u.info; /* exp is already in a register */ - if (e->u.info >= fs->nactvar) { /* reg. is not a local? */ - exp2reg(fs, e, e->u.info); /* put value on it */ - return e->u.info; - } - } - luaK_exp2nextreg(fs, e); /* default */ - return e->u.info; -} - - -void luaK_exp2anyregup (FuncState *fs, expdesc *e) { - if (e->k != VUPVAL || hasjumps(e)) - luaK_exp2anyreg(fs, e); -} - - -void luaK_exp2val (FuncState *fs, expdesc *e) { - if (hasjumps(e)) - luaK_exp2anyreg(fs, e); - else - luaK_dischargevars(fs, e); -} - - -int luaK_exp2RK (FuncState *fs, expdesc *e) { - luaK_exp2val(fs, e); - switch (e->k) { - case VTRUE: - case VFALSE: - case VNIL: { - if (fs->nk <= MAXINDEXRK) { /* constant fits in RK operand? */ - e->u.info = (e->k == VNIL) ? nilK(fs) : boolK(fs, (e->k == VTRUE)); - e->k = VK; - return RKASK(e->u.info); - } - else break; - } - case VKNUM: { - e->u.info = luaK_numberK(fs, e->u.nval); - e->k = VK; - /* go through */ - } - case VK: { - if (e->u.info <= MAXINDEXRK) /* constant fits in argC? */ - return RKASK(e->u.info); - else break; - } - default: break; - } - /* not a constant in the right range: put it in a register */ - return luaK_exp2anyreg(fs, e); -} - - -void luaK_storevar (FuncState *fs, expdesc *var, expdesc *ex) { - switch (var->k) { - case VLOCAL: { - freeexp(fs, ex); - exp2reg(fs, ex, var->u.info); - return; - } - case VUPVAL: { - int e = luaK_exp2anyreg(fs, ex); - luaK_codeABC(fs, OP_SETUPVAL, e, var->u.info, 0); - break; - } - case VINDEXED: { - OpCode op = (var->u.ind.vt == VLOCAL) ? OP_SETTABLE : OP_SETTABUP; - int e = luaK_exp2RK(fs, ex); - luaK_codeABC(fs, op, var->u.ind.t, var->u.ind.idx, e); - break; - } - default: { - lua_assert(0); /* invalid var kind to store */ - break; - } - } - freeexp(fs, ex); -} - - -void luaK_self (FuncState *fs, expdesc *e, expdesc *key) { - int ereg; - luaK_exp2anyreg(fs, e); - ereg = e->u.info; /* register where 'e' was placed */ - freeexp(fs, e); - e->u.info = fs->freereg; /* base register for op_self */ - e->k = VNONRELOC; - luaK_reserveregs(fs, 2); /* function and 'self' produced by op_self */ - luaK_codeABC(fs, OP_SELF, e->u.info, ereg, luaK_exp2RK(fs, key)); - freeexp(fs, key); -} - - -static void invertjump (FuncState *fs, expdesc *e) { - Instruction *pc = getjumpcontrol(fs, e->u.info); - lua_assert(testTMode(GET_OPCODE(*pc)) && GET_OPCODE(*pc) != OP_TESTSET && - GET_OPCODE(*pc) != OP_TEST); - SETARG_A(*pc, !(GETARG_A(*pc))); -} - - -static int jumponcond (FuncState *fs, expdesc *e, int cond) { - if (e->k == VRELOCABLE) { - Instruction ie = getcode(fs, e); - if (GET_OPCODE(ie) == OP_NOT) { - fs->pc--; /* remove previous OP_NOT */ - return condjump(fs, OP_TEST, GETARG_B(ie), 0, !cond); - } - /* else go through */ - } - discharge2anyreg(fs, e); - freeexp(fs, e); - return condjump(fs, OP_TESTSET, NO_REG, e->u.info, cond); -} - - -void luaK_goiftrue (FuncState *fs, expdesc *e) { - int pc; /* pc of last jump */ - luaK_dischargevars(fs, e); - switch (e->k) { - case VJMP: { - invertjump(fs, e); - pc = e->u.info; - break; - } - case VK: case VKNUM: case VTRUE: { - pc = NO_JUMP; /* always true; do nothing */ - break; - } - default: { - pc = jumponcond(fs, e, 0); - break; - } - } - luaK_concat(fs, &e->f, pc); /* insert last jump in `f' list */ - luaK_patchtohere(fs, e->t); - e->t = NO_JUMP; -} - - -void luaK_goiffalse (FuncState *fs, expdesc *e) { - int pc; /* pc of last jump */ - luaK_dischargevars(fs, e); - switch (e->k) { - case VJMP: { - pc = e->u.info; - break; - } - case VNIL: case VFALSE: { - pc = NO_JUMP; /* always false; do nothing */ - break; - } - default: { - pc = jumponcond(fs, e, 1); - break; - } - } - luaK_concat(fs, &e->t, pc); /* insert last jump in `t' list */ - luaK_patchtohere(fs, e->f); - e->f = NO_JUMP; -} - - -static void codenot (FuncState *fs, expdesc *e) { - luaK_dischargevars(fs, e); - switch (e->k) { - case VNIL: case VFALSE: { - e->k = VTRUE; - break; - } - case VK: case VKNUM: case VTRUE: { - e->k = VFALSE; - break; - } - case VJMP: { - invertjump(fs, e); - break; - } - case VRELOCABLE: - case VNONRELOC: { - discharge2anyreg(fs, e); - freeexp(fs, e); - e->u.info = luaK_codeABC(fs, OP_NOT, 0, e->u.info, 0); - e->k = VRELOCABLE; - break; - } - default: { - lua_assert(0); /* cannot happen */ - break; - } - } - /* interchange true and false lists */ - { int temp = e->f; e->f = e->t; e->t = temp; } - removevalues(fs, e->f); - removevalues(fs, e->t); -} - - -void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k) { - lua_assert(!hasjumps(t)); - t->u.ind.t = t->u.info; - t->u.ind.idx = luaK_exp2RK(fs, k); - t->u.ind.vt = (t->k == VUPVAL) ? VUPVAL - : check_exp(vkisinreg(t->k), VLOCAL); - t->k = VINDEXED; -} - - -static int constfolding (OpCode op, expdesc *e1, expdesc *e2) { - lua_Number r; - if (!isnumeral(e1) || !isnumeral(e2)) return 0; - if ((op == OP_DIV || op == OP_MOD) && e2->u.nval == 0) - return 0; /* do not attempt to divide by 0 */ - r = luaO_arith(op - OP_ADD + LUA_OPADD, e1->u.nval, e2->u.nval); - e1->u.nval = r; - return 1; -} - - -static void codearith (FuncState *fs, OpCode op, - expdesc *e1, expdesc *e2, int line) { - if (constfolding(op, e1, e2)) - return; - else { - int o2 = (op != OP_UNM && op != OP_LEN) ? luaK_exp2RK(fs, e2) : 0; - int o1 = luaK_exp2RK(fs, e1); - if (o1 > o2) { - freeexp(fs, e1); - freeexp(fs, e2); - } - else { - freeexp(fs, e2); - freeexp(fs, e1); - } - e1->u.info = luaK_codeABC(fs, op, 0, o1, o2); - e1->k = VRELOCABLE; - luaK_fixline(fs, line); - } -} - - -static void codecomp (FuncState *fs, OpCode op, int cond, expdesc *e1, - expdesc *e2) { - int o1 = luaK_exp2RK(fs, e1); - int o2 = luaK_exp2RK(fs, e2); - freeexp(fs, e2); - freeexp(fs, e1); - if (cond == 0 && op != OP_EQ) { - int temp; /* exchange args to replace by `<' or `<=' */ - temp = o1; o1 = o2; o2 = temp; /* o1 <==> o2 */ - cond = 1; - } - e1->u.info = condjump(fs, op, cond, o1, o2); - e1->k = VJMP; -} - - -void luaK_prefix (FuncState *fs, UnOpr op, expdesc *e, int line) { - expdesc e2; - e2.t = e2.f = NO_JUMP; e2.k = VKNUM; e2.u.nval = 0; - switch (op) { - case OPR_MINUS: { - if (isnumeral(e)) /* minus constant? */ - e->u.nval = luai_numunm(NULL, e->u.nval); /* fold it */ - else { - luaK_exp2anyreg(fs, e); - codearith(fs, OP_UNM, e, &e2, line); - } - break; - } - case OPR_NOT: codenot(fs, e); break; - case OPR_LEN: { - luaK_exp2anyreg(fs, e); /* cannot operate on constants */ - codearith(fs, OP_LEN, e, &e2, line); - break; - } - default: lua_assert(0); - } -} - - -void luaK_infix (FuncState *fs, BinOpr op, expdesc *v) { - switch (op) { - case OPR_AND: { - luaK_goiftrue(fs, v); - break; - } - case OPR_OR: { - luaK_goiffalse(fs, v); - break; - } - case OPR_CONCAT: { - luaK_exp2nextreg(fs, v); /* operand must be on the `stack' */ - break; - } - case OPR_ADD: case OPR_SUB: case OPR_MUL: case OPR_DIV: - case OPR_MOD: case OPR_POW: { - if (!isnumeral(v)) luaK_exp2RK(fs, v); - break; - } - default: { - luaK_exp2RK(fs, v); - break; - } - } -} - - -void luaK_posfix (FuncState *fs, BinOpr op, - expdesc *e1, expdesc *e2, int line) { - switch (op) { - case OPR_AND: { - lua_assert(e1->t == NO_JUMP); /* list must be closed */ - luaK_dischargevars(fs, e2); - luaK_concat(fs, &e2->f, e1->f); - *e1 = *e2; - break; - } - case OPR_OR: { - lua_assert(e1->f == NO_JUMP); /* list must be closed */ - luaK_dischargevars(fs, e2); - luaK_concat(fs, &e2->t, e1->t); - *e1 = *e2; - break; - } - case OPR_CONCAT: { - luaK_exp2val(fs, e2); - if (e2->k == VRELOCABLE && GET_OPCODE(getcode(fs, e2)) == OP_CONCAT) { - lua_assert(e1->u.info == GETARG_B(getcode(fs, e2))-1); - freeexp(fs, e1); - SETARG_B(getcode(fs, e2), e1->u.info); - e1->k = VRELOCABLE; e1->u.info = e2->u.info; - } - else { - luaK_exp2nextreg(fs, e2); /* operand must be on the 'stack' */ - codearith(fs, OP_CONCAT, e1, e2, line); - } - break; - } - case OPR_ADD: case OPR_SUB: case OPR_MUL: case OPR_DIV: - case OPR_MOD: case OPR_POW: { - codearith(fs, cast(OpCode, op - OPR_ADD + OP_ADD), e1, e2, line); - break; - } - case OPR_EQ: case OPR_LT: case OPR_LE: { - codecomp(fs, cast(OpCode, op - OPR_EQ + OP_EQ), 1, e1, e2); - break; - } - case OPR_NE: case OPR_GT: case OPR_GE: { - codecomp(fs, cast(OpCode, op - OPR_NE + OP_EQ), 0, e1, e2); - break; - } - default: lua_assert(0); - } -} - - -void luaK_fixline (FuncState *fs, int line) { - fs->f->lineinfo[fs->pc - 1] = line; -} - - -void luaK_setlist (FuncState *fs, int base, int nelems, int tostore) { - int c = (nelems - 1)/LFIELDS_PER_FLUSH + 1; - int b = (tostore == LUA_MULTRET) ? 0 : tostore; - lua_assert(tostore != 0); - if (c <= MAXARG_C) - luaK_codeABC(fs, OP_SETLIST, base, b, c); - else if (c <= MAXARG_Ax) { - luaK_codeABC(fs, OP_SETLIST, base, b, 0); - codeextraarg(fs, c); - } - else - luaX_syntaxerror(fs->ls, "constructor too long"); - fs->freereg = base + 1; /* free registers with list values */ -} - diff --git a/radio/src/lua/src/lcode.h b/radio/src/lua/src/lcode.h deleted file mode 100644 index 5a1fa9fea..000000000 --- a/radio/src/lua/src/lcode.h +++ /dev/null @@ -1,83 +0,0 @@ -/* -** $Id: lcode.h,v 1.58 2011/08/30 16:26:41 roberto Exp $ -** Code generator for Lua -** See Copyright Notice in lua.h -*/ - -#ifndef lcode_h -#define lcode_h - -#include "llex.h" -#include "lobject.h" -#include "lopcodes.h" -#include "lparser.h" - - -/* -** Marks the end of a patch list. It is an invalid value both as an absolute -** address, and as a list link (would link an element to itself). -*/ -#define NO_JUMP (-1) - - -/* -** grep "ORDER OPR" if you change these enums (ORDER OP) -*/ -typedef enum BinOpr { - OPR_ADD, OPR_SUB, OPR_MUL, OPR_DIV, OPR_MOD, OPR_POW, - OPR_CONCAT, - OPR_EQ, OPR_LT, OPR_LE, - OPR_NE, OPR_GT, OPR_GE, - OPR_AND, OPR_OR, - OPR_NOBINOPR -} BinOpr; - - -typedef enum UnOpr { OPR_MINUS, OPR_NOT, OPR_LEN, OPR_NOUNOPR } UnOpr; - - -#define getcode(fs,e) ((fs)->f->code[(e)->u.info]) - -#define luaK_codeAsBx(fs,o,A,sBx) luaK_codeABx(fs,o,A,(sBx)+MAXARG_sBx) - -#define luaK_setmultret(fs,e) luaK_setreturns(fs, e, LUA_MULTRET) - -#define luaK_jumpto(fs,t) luaK_patchlist(fs, luaK_jump(fs), t) - -LUAI_FUNC int luaK_codeABx (FuncState *fs, OpCode o, int A, unsigned int Bx); -LUAI_FUNC int luaK_codeABC (FuncState *fs, OpCode o, int A, int B, int C); -LUAI_FUNC int luaK_codek (FuncState *fs, int reg, int k); -LUAI_FUNC void luaK_fixline (FuncState *fs, int line); -LUAI_FUNC void luaK_nil (FuncState *fs, int from, int n); -LUAI_FUNC void luaK_reserveregs (FuncState *fs, int n); -LUAI_FUNC void luaK_checkstack (FuncState *fs, int n); -LUAI_FUNC int luaK_stringK (FuncState *fs, TString *s); -LUAI_FUNC int luaK_numberK (FuncState *fs, lua_Number r); -LUAI_FUNC void luaK_dischargevars (FuncState *fs, expdesc *e); -LUAI_FUNC int luaK_exp2anyreg (FuncState *fs, expdesc *e); -LUAI_FUNC void luaK_exp2anyregup (FuncState *fs, expdesc *e); -LUAI_FUNC void luaK_exp2nextreg (FuncState *fs, expdesc *e); -LUAI_FUNC void luaK_exp2val (FuncState *fs, expdesc *e); -LUAI_FUNC int luaK_exp2RK (FuncState *fs, expdesc *e); -LUAI_FUNC void luaK_self (FuncState *fs, expdesc *e, expdesc *key); -LUAI_FUNC void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k); -LUAI_FUNC void luaK_goiftrue (FuncState *fs, expdesc *e); -LUAI_FUNC void luaK_goiffalse (FuncState *fs, expdesc *e); -LUAI_FUNC void luaK_storevar (FuncState *fs, expdesc *var, expdesc *e); -LUAI_FUNC void luaK_setreturns (FuncState *fs, expdesc *e, int nresults); -LUAI_FUNC void luaK_setoneret (FuncState *fs, expdesc *e); -LUAI_FUNC int luaK_jump (FuncState *fs); -LUAI_FUNC void luaK_ret (FuncState *fs, int first, int nret); -LUAI_FUNC void luaK_patchlist (FuncState *fs, int list, int target); -LUAI_FUNC void luaK_patchtohere (FuncState *fs, int list); -LUAI_FUNC void luaK_patchclose (FuncState *fs, int list, int level); -LUAI_FUNC void luaK_concat (FuncState *fs, int *l1, int l2); -LUAI_FUNC int luaK_getlabel (FuncState *fs); -LUAI_FUNC void luaK_prefix (FuncState *fs, UnOpr op, expdesc *v, int line); -LUAI_FUNC void luaK_infix (FuncState *fs, BinOpr op, expdesc *v); -LUAI_FUNC void luaK_posfix (FuncState *fs, BinOpr op, expdesc *v1, - expdesc *v2, int line); -LUAI_FUNC void luaK_setlist (FuncState *fs, int base, int nelems, int tostore); - - -#endif diff --git a/radio/src/lua/src/lcorolib.c b/radio/src/lua/src/lcorolib.c deleted file mode 100644 index e2f601eb6..000000000 --- a/radio/src/lua/src/lcorolib.c +++ /dev/null @@ -1,154 +0,0 @@ -/* -** $Id: lcorolib.c,v 1.5 2013/02/21 13:44:53 roberto Exp $ -** Coroutine Library -** See Copyright Notice in lua.h -*/ - - -#include - - -#define lcorolib_c - -#include "lua.h" - -#include "lauxlib.h" -#include "lualib.h" - - -static int auxresume (lua_State *L, lua_State *co, int narg) { - int status; - if (!lua_checkstack(co, narg)) { - lua_pushliteral(L, "too many arguments to resume"); - return -1; /* error flag */ - } - if (lua_status(co) == LUA_OK && lua_gettop(co) == 0) { - lua_pushliteral(L, "cannot resume dead coroutine"); - return -1; /* error flag */ - } - lua_xmove(L, co, narg); - status = lua_resume(co, L, narg); - if (status == LUA_OK || status == LUA_YIELD) { - int nres = lua_gettop(co); - if (!lua_checkstack(L, nres + 1)) { - lua_pop(co, nres); /* remove results anyway */ - lua_pushliteral(L, "too many results to resume"); - return -1; /* error flag */ - } - lua_xmove(co, L, nres); /* move yielded values */ - return nres; - } - else { - lua_xmove(co, L, 1); /* move error message */ - return -1; /* error flag */ - } -} - - -static int luaB_coresume (lua_State *L) { - lua_State *co = lua_tothread(L, 1); - int r; - luaL_argcheck(L, co, 1, "coroutine expected"); - r = auxresume(L, co, lua_gettop(L) - 1); - if (r < 0) { - lua_pushboolean(L, 0); - lua_insert(L, -2); - return 2; /* return false + error message */ - } - else { - lua_pushboolean(L, 1); - lua_insert(L, -(r + 1)); - return r + 1; /* return true + `resume' returns */ - } -} - - -static int luaB_auxwrap (lua_State *L) { - lua_State *co = lua_tothread(L, lua_upvalueindex(1)); - int r = auxresume(L, co, lua_gettop(L)); - if (r < 0) { - if (lua_isstring(L, -1)) { /* error object is a string? */ - luaL_where(L, 1); /* add extra info */ - lua_insert(L, -2); - lua_concat(L, 2); - } - return lua_error(L); /* propagate error */ - } - return r; -} - - -static int luaB_cocreate (lua_State *L) { - lua_State *NL; - luaL_checktype(L, 1, LUA_TFUNCTION); - NL = lua_newthread(L); - lua_pushvalue(L, 1); /* move function to top */ - lua_xmove(L, NL, 1); /* move function from L to NL */ - return 1; -} - - -static int luaB_cowrap (lua_State *L) { - luaB_cocreate(L); - lua_pushcclosure(L, luaB_auxwrap, 1); - return 1; -} - - -static int luaB_yield (lua_State *L) { - return lua_yield(L, lua_gettop(L)); -} - - -static int luaB_costatus (lua_State *L) { - lua_State *co = lua_tothread(L, 1); - luaL_argcheck(L, co, 1, "coroutine expected"); - if (L == co) lua_pushliteral(L, "running"); - else { - switch (lua_status(co)) { - case LUA_YIELD: - lua_pushliteral(L, "suspended"); - break; - case LUA_OK: { - lua_Debug ar; - if (lua_getstack(co, 0, &ar) > 0) /* does it have frames? */ - lua_pushliteral(L, "normal"); /* it is running */ - else if (lua_gettop(co) == 0) - lua_pushliteral(L, "dead"); - else - lua_pushliteral(L, "suspended"); /* initial state */ - break; - } - default: /* some error occurred */ - lua_pushliteral(L, "dead"); - break; - } - } - return 1; -} - - -static int luaB_corunning (lua_State *L) { - int ismain = lua_pushthread(L); - lua_pushboolean(L, ismain); - return 2; -} - - -static const luaL_Reg co_funcs[] = { - {"create", luaB_cocreate}, - {"resume", luaB_coresume}, - {"running", luaB_corunning}, - {"status", luaB_costatus}, - {"wrap", luaB_cowrap}, - {"yield", luaB_yield}, - {NULL, NULL} -}; - - - -LUAMOD_API int luaopen_coroutine (lua_State *L) { - luaL_newlib(L, co_funcs); - return 1; -} - diff --git a/radio/src/lua/src/lctype.c b/radio/src/lua/src/lctype.c deleted file mode 100644 index 55e433a5d..000000000 --- a/radio/src/lua/src/lctype.c +++ /dev/null @@ -1,52 +0,0 @@ -/* -** $Id: lctype.c,v 1.11 2011/10/03 16:19:23 roberto Exp $ -** 'ctype' functions for Lua -** See Copyright Notice in lua.h -*/ - -#define lctype_c -#define LUA_CORE - -#include "lctype.h" - -#if !LUA_USE_CTYPE /* { */ - -#include - -LUAI_DDEF const lu_byte luai_ctype_[UCHAR_MAX + 2] = { - 0x00, /* EOZ */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0. */ - 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 1. */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0c, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, /* 2. */ - 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, - 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, /* 3. */ - 0x16, 0x16, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, - 0x04, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x05, /* 4. */ - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, /* 5. */ - 0x05, 0x05, 0x05, 0x04, 0x04, 0x04, 0x04, 0x05, - 0x04, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x05, /* 6. */ - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, /* 7. */ - 0x05, 0x05, 0x05, 0x04, 0x04, 0x04, 0x04, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 8. */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 9. */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* a. */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* b. */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* c. */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* d. */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* e. */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* f. */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -#endif /* } */ diff --git a/radio/src/lua/src/lctype.h b/radio/src/lua/src/lctype.h deleted file mode 100644 index 99c7d1223..000000000 --- a/radio/src/lua/src/lctype.h +++ /dev/null @@ -1,95 +0,0 @@ -/* -** $Id: lctype.h,v 1.12 2011/07/15 12:50:29 roberto Exp $ -** 'ctype' functions for Lua -** See Copyright Notice in lua.h -*/ - -#ifndef lctype_h -#define lctype_h - -#include "lua.h" - - -/* -** WARNING: the functions defined here do not necessarily correspond -** to the similar functions in the standard C ctype.h. They are -** optimized for the specific needs of Lua -*/ - -#if !defined(LUA_USE_CTYPE) - -#if 'A' == 65 && '0' == 48 -/* ASCII case: can use its own tables; faster and fixed */ -#define LUA_USE_CTYPE 0 -#else -/* must use standard C ctype */ -#define LUA_USE_CTYPE 1 -#endif - -#endif - - -#if !LUA_USE_CTYPE /* { */ - -#include - -#include "llimits.h" - - -#define ALPHABIT 0 -#define DIGITBIT 1 -#define PRINTBIT 2 -#define SPACEBIT 3 -#define XDIGITBIT 4 - - -#define MASK(B) (1 << (B)) - - -/* -** add 1 to char to allow index -1 (EOZ) -*/ -#define testprop(c,p) (luai_ctype_[(c)+1] & (p)) - -/* -** 'lalpha' (Lua alphabetic) and 'lalnum' (Lua alphanumeric) both include '_' -*/ -#define lislalpha(c) testprop(c, MASK(ALPHABIT)) -#define lislalnum(c) testprop(c, (MASK(ALPHABIT) | MASK(DIGITBIT))) -#define lisdigit(c) testprop(c, MASK(DIGITBIT)) -#define lisspace(c) testprop(c, MASK(SPACEBIT)) -#define lisprint(c) testprop(c, MASK(PRINTBIT)) -#define lisxdigit(c) testprop(c, MASK(XDIGITBIT)) - -/* -** this 'ltolower' only works for alphabetic characters -*/ -#define ltolower(c) ((c) | ('A' ^ 'a')) - - -/* two more entries for 0 and -1 (EOZ) */ -LUAI_DDEC const lu_byte luai_ctype_[UCHAR_MAX + 2]; - - -#else /* }{ */ - -/* -** use standard C ctypes -*/ - -#include - - -#define lislalpha(c) (isalpha(c) || (c) == '_') -#define lislalnum(c) (isalnum(c) || (c) == '_') -#define lisdigit(c) (isdigit(c)) -#define lisspace(c) (isspace(c)) -#define lisprint(c) (isprint(c)) -#define lisxdigit(c) (isxdigit(c)) - -#define ltolower(c) (tolower(c)) - -#endif /* } */ - -#endif - diff --git a/radio/src/lua/src/ldblib.c b/radio/src/lua/src/ldblib.c deleted file mode 100644 index 596d10d30..000000000 --- a/radio/src/lua/src/ldblib.c +++ /dev/null @@ -1,396 +0,0 @@ -/* -** $Id: ldblib.c,v 1.132 2012/01/19 20:14:44 roberto Exp $ -** Interface from Lua to its debug API -** See Copyright Notice in lua.h -*/ - - -#include -#include - -#define ldblib_c - -#include "lua.h" - -#include "lauxlib.h" -#include "lualib.h" - - -#define HOOKKEY "_HKEY" - - - -static int db_getregistry (lua_State *L) { - lua_pushvalue(L, LUA_REGISTRYINDEX); - return 1; -} - - -static int db_getmetatable (lua_State *L) { - luaL_checkany(L, 1); - if (!lua_getmetatable(L, 1)) { - lua_pushnil(L); /* no metatable */ - } - return 1; -} - - -static int db_setmetatable (lua_State *L) { - int t = lua_type(L, 2); - luaL_argcheck(L, t == LUA_TNIL || t == LUA_TTABLE, 2, - "nil or table expected"); - lua_settop(L, 2); - lua_setmetatable(L, 1); - return 1; /* return 1st argument */ -} - - -static int db_getuservalue (lua_State *L) { - if (lua_type(L, 1) != LUA_TUSERDATA) - lua_pushnil(L); - else - lua_getuservalue(L, 1); - return 1; -} - - -static int db_setuservalue (lua_State *L) { - if (lua_type(L, 1) == LUA_TLIGHTUSERDATA) - luaL_argerror(L, 1, "full userdata expected, got light userdata"); - luaL_checktype(L, 1, LUA_TUSERDATA); - if (!lua_isnoneornil(L, 2)) - luaL_checktype(L, 2, LUA_TTABLE); - lua_settop(L, 2); - lua_setuservalue(L, 1); - return 1; -} - - -static void settabss (lua_State *L, const char *i, const char *v) { - lua_pushstring(L, v); - lua_setfield(L, -2, i); -} - - -static void settabsi (lua_State *L, const char *i, int v) { - lua_pushinteger(L, v); - lua_setfield(L, -2, i); -} - - -static void settabsb (lua_State *L, const char *i, int v) { - lua_pushboolean(L, v); - lua_setfield(L, -2, i); -} - - -static lua_State *getthread (lua_State *L, int *arg) { - if (lua_isthread(L, 1)) { - *arg = 1; - return lua_tothread(L, 1); - } - else { - *arg = 0; - return L; - } -} - - -static void treatstackoption (lua_State *L, lua_State *L1, const char *fname) { - if (L == L1) { - lua_pushvalue(L, -2); - lua_remove(L, -3); - } - else - lua_xmove(L1, L, 1); - lua_setfield(L, -2, fname); -} - - -static int db_getinfo (lua_State *L) { - lua_Debug ar; - int arg; - lua_State *L1 = getthread(L, &arg); - const char *options = luaL_optstring(L, arg+2, "flnStu"); - if (lua_isnumber(L, arg+1)) { - if (!lua_getstack(L1, (int)lua_tointeger(L, arg+1), &ar)) { - lua_pushnil(L); /* level out of range */ - return 1; - } - } - else if (lua_isfunction(L, arg+1)) { - lua_pushfstring(L, ">%s", options); - options = lua_tostring(L, -1); - lua_pushvalue(L, arg+1); - lua_xmove(L, L1, 1); - } - else - return luaL_argerror(L, arg+1, "function or level expected"); - if (!lua_getinfo(L1, options, &ar)) - return luaL_argerror(L, arg+2, "invalid option"); - lua_createtable(L, 0, 2); - if (strchr(options, 'S')) { - settabss(L, "source", ar.source); - settabss(L, "short_src", ar.short_src); - settabsi(L, "linedefined", ar.linedefined); - settabsi(L, "lastlinedefined", ar.lastlinedefined); - settabss(L, "what", ar.what); - } - if (strchr(options, 'l')) - settabsi(L, "currentline", ar.currentline); - if (strchr(options, 'u')) { - settabsi(L, "nups", ar.nups); - settabsi(L, "nparams", ar.nparams); - settabsb(L, "isvararg", ar.isvararg); - } - if (strchr(options, 'n')) { - settabss(L, "name", ar.name); - settabss(L, "namewhat", ar.namewhat); - } - if (strchr(options, 't')) - settabsb(L, "istailcall", ar.istailcall); - if (strchr(options, 'L')) - treatstackoption(L, L1, "activelines"); - if (strchr(options, 'f')) - treatstackoption(L, L1, "func"); - return 1; /* return table */ -} - - -static int db_getlocal (lua_State *L) { - int arg; - lua_State *L1 = getthread(L, &arg); - lua_Debug ar; - const char *name; - int nvar = luaL_checkint(L, arg+2); /* local-variable index */ - if (lua_isfunction(L, arg + 1)) { /* function argument? */ - lua_pushvalue(L, arg + 1); /* push function */ - lua_pushstring(L, lua_getlocal(L, NULL, nvar)); /* push local name */ - return 1; - } - else { /* stack-level argument */ - if (!lua_getstack(L1, luaL_checkint(L, arg+1), &ar)) /* out of range? */ - return luaL_argerror(L, arg+1, "level out of range"); - name = lua_getlocal(L1, &ar, nvar); - if (name) { - lua_xmove(L1, L, 1); /* push local value */ - lua_pushstring(L, name); /* push name */ - lua_pushvalue(L, -2); /* re-order */ - return 2; - } - else { - lua_pushnil(L); /* no name (nor value) */ - return 1; - } - } -} - - -static int db_setlocal (lua_State *L) { - int arg; - lua_State *L1 = getthread(L, &arg); - lua_Debug ar; - if (!lua_getstack(L1, luaL_checkint(L, arg+1), &ar)) /* out of range? */ - return luaL_argerror(L, arg+1, "level out of range"); - luaL_checkany(L, arg+3); - lua_settop(L, arg+3); - lua_xmove(L, L1, 1); - lua_pushstring(L, lua_setlocal(L1, &ar, luaL_checkint(L, arg+2))); - return 1; -} - - -static int auxupvalue (lua_State *L, int get) { - const char *name; - int n = luaL_checkint(L, 2); - luaL_checktype(L, 1, LUA_TFUNCTION); - name = get ? lua_getupvalue(L, 1, n) : lua_setupvalue(L, 1, n); - if (name == NULL) return 0; - lua_pushstring(L, name); - lua_insert(L, -(get+1)); - return get + 1; -} - - -static int db_getupvalue (lua_State *L) { - return auxupvalue(L, 1); -} - - -static int db_setupvalue (lua_State *L) { - luaL_checkany(L, 3); - return auxupvalue(L, 0); -} - - -static int checkupval (lua_State *L, int argf, int argnup) { - lua_Debug ar; - int nup = luaL_checkint(L, argnup); - luaL_checktype(L, argf, LUA_TFUNCTION); - lua_pushvalue(L, argf); - lua_getinfo(L, ">u", &ar); - luaL_argcheck(L, 1 <= nup && nup <= ar.nups, argnup, "invalid upvalue index"); - return nup; -} - - -static int db_upvalueid (lua_State *L) { - int n = checkupval(L, 1, 2); - lua_pushlightuserdata(L, lua_upvalueid(L, 1, n)); - return 1; -} - - -static int db_upvaluejoin (lua_State *L) { - int n1 = checkupval(L, 1, 2); - int n2 = checkupval(L, 3, 4); - luaL_argcheck(L, !lua_iscfunction(L, 1), 1, "Lua function expected"); - luaL_argcheck(L, !lua_iscfunction(L, 3), 3, "Lua function expected"); - lua_upvaluejoin(L, 1, n1, 3, n2); - return 0; -} - - -#define gethooktable(L) luaL_getsubtable(L, LUA_REGISTRYINDEX, HOOKKEY) - - -static void hookf (lua_State *L, lua_Debug *ar) { - static const char *const hooknames[] = - {"call", "return", "line", "count", "tail call"}; - gethooktable(L); - lua_pushthread(L); - lua_rawget(L, -2); - if (lua_isfunction(L, -1)) { - lua_pushstring(L, hooknames[(int)ar->event]); - if (ar->currentline >= 0) - lua_pushinteger(L, ar->currentline); - else lua_pushnil(L); - lua_assert(lua_getinfo(L, "lS", ar)); - lua_call(L, 2, 0); - } -} - - -static int makemask (const char *smask, int count) { - int mask = 0; - if (strchr(smask, 'c')) mask |= LUA_MASKCALL; - if (strchr(smask, 'r')) mask |= LUA_MASKRET; - if (strchr(smask, 'l')) mask |= LUA_MASKLINE; - if (count > 0) mask |= LUA_MASKCOUNT; - return mask; -} - - -static char *unmakemask (int mask, char *smask) { - int i = 0; - if (mask & LUA_MASKCALL) smask[i++] = 'c'; - if (mask & LUA_MASKRET) smask[i++] = 'r'; - if (mask & LUA_MASKLINE) smask[i++] = 'l'; - smask[i] = '\0'; - return smask; -} - - -static int db_sethook (lua_State *L) { - int arg, mask, count; - lua_Hook func; - lua_State *L1 = getthread(L, &arg); - if (lua_isnoneornil(L, arg+1)) { - lua_settop(L, arg+1); - func = NULL; mask = 0; count = 0; /* turn off hooks */ - } - else { - const char *smask = luaL_checkstring(L, arg+2); - luaL_checktype(L, arg+1, LUA_TFUNCTION); - count = luaL_optint(L, arg+3, 0); - func = hookf; mask = makemask(smask, count); - } - if (gethooktable(L) == 0) { /* creating hook table? */ - lua_pushstring(L, "k"); - lua_setfield(L, -2, "__mode"); /** hooktable.__mode = "k" */ - lua_pushvalue(L, -1); - lua_setmetatable(L, -2); /* setmetatable(hooktable) = hooktable */ - } - lua_pushthread(L1); lua_xmove(L1, L, 1); - lua_pushvalue(L, arg+1); - lua_rawset(L, -3); /* set new hook */ - lua_sethook(L1, func, mask, count); /* set hooks */ - return 0; -} - - -static int db_gethook (lua_State *L) { - int arg; - lua_State *L1 = getthread(L, &arg); - char buff[5]; - int mask = lua_gethookmask(L1); - lua_Hook hook = lua_gethook(L1); - if (hook != NULL && hook != hookf) /* external hook? */ - lua_pushliteral(L, "external hook"); - else { - gethooktable(L); - lua_pushthread(L1); lua_xmove(L1, L, 1); - lua_rawget(L, -2); /* get hook */ - lua_remove(L, -2); /* remove hook table */ - } - lua_pushstring(L, unmakemask(mask, buff)); - lua_pushinteger(L, lua_gethookcount(L1)); - return 3; -} - - -static int db_debug (lua_State *L) { - for (;;) { - char buffer[250]; - luai_writestringerror("%s", "lua_debug> "); - if (fgets(buffer, sizeof(buffer), stdin) == 0 || - strcmp(buffer, "cont\n") == 0) - return 0; - if (luaL_loadbuffer(L, buffer, strlen(buffer), "=(debug command)") || - lua_pcall(L, 0, 0, 0)) - luai_writestringerror("%s\n", lua_tostring(L, -1)); - lua_settop(L, 0); /* remove eventual returns */ - } -} - - -static int db_traceback (lua_State *L) { - int arg; - lua_State *L1 = getthread(L, &arg); - const char *msg = lua_tostring(L, arg + 1); - if (msg == NULL && !lua_isnoneornil(L, arg + 1)) /* non-string 'msg'? */ - lua_pushvalue(L, arg + 1); /* return it untouched */ - else { - int level = luaL_optint(L, arg + 2, (L == L1) ? 1 : 0); - luaL_traceback(L, L1, msg, level); - } - return 1; -} - - -static const luaL_Reg dblib[] = { - {"debug", db_debug}, - {"getuservalue", db_getuservalue}, - {"gethook", db_gethook}, - {"getinfo", db_getinfo}, - {"getlocal", db_getlocal}, - {"getregistry", db_getregistry}, - {"getmetatable", db_getmetatable}, - {"getupvalue", db_getupvalue}, - {"upvaluejoin", db_upvaluejoin}, - {"upvalueid", db_upvalueid}, - {"setuservalue", db_setuservalue}, - {"sethook", db_sethook}, - {"setlocal", db_setlocal}, - {"setmetatable", db_setmetatable}, - {"setupvalue", db_setupvalue}, - {"traceback", db_traceback}, - {NULL, NULL} -}; - - -LUAMOD_API int luaopen_debug (lua_State *L) { - luaL_newlib(L, dblib); - return 1; -} - diff --git a/radio/src/lua/src/ldebug.c b/radio/src/lua/src/ldebug.c deleted file mode 100644 index 7e04f9d09..000000000 --- a/radio/src/lua/src/ldebug.c +++ /dev/null @@ -1,580 +0,0 @@ -/* -** $Id: ldebug.c,v 2.90 2012/08/16 17:34:28 roberto Exp $ -** Debug Interface -** See Copyright Notice in lua.h -*/ - - -#include -#include -#include - - -#define ldebug_c -#define LUA_CORE - -#include "lua.h" - -#include "lapi.h" -#include "lcode.h" -#include "ldebug.h" -#include "ldo.h" -#include "lfunc.h" -#include "lobject.h" -#include "lopcodes.h" -#include "lstate.h" -#include "lstring.h" -#include "ltable.h" -#include "ltm.h" -#include "lvm.h" - - - -#define noLuaClosure(f) ((f) == NULL || (f)->c.tt == LUA_TCCL) - - -static const char *getfuncname (lua_State *L, CallInfo *ci, const char **name); - - -static int currentpc (CallInfo *ci) { - lua_assert(isLua(ci)); - return pcRel(ci->u.l.savedpc, ci_func(ci)->p); -} - - -static int currentline (CallInfo *ci) { - return getfuncline(ci_func(ci)->p, currentpc(ci)); -} - - -/* -** this function can be called asynchronous (e.g. during a signal) -*/ -LUA_API int lua_sethook (lua_State *L, lua_Hook func, int mask, int count) { - if (func == NULL || mask == 0) { /* turn off hooks? */ - mask = 0; - func = NULL; - } - if (isLua(L->ci)) - L->oldpc = L->ci->u.l.savedpc; - L->hook = func; - L->basehookcount = count; - resethookcount(L); - L->hookmask = cast_byte(mask); - return 1; -} - - -LUA_API lua_Hook lua_gethook (lua_State *L) { - return L->hook; -} - - -LUA_API int lua_gethookmask (lua_State *L) { - return L->hookmask; -} - - -LUA_API int lua_gethookcount (lua_State *L) { - return L->basehookcount; -} - - -LUA_API int lua_getstack (lua_State *L, int level, lua_Debug *ar) { - int status; - CallInfo *ci; - if (level < 0) return 0; /* invalid (negative) level */ - lua_lock(L); - for (ci = L->ci; level > 0 && ci != &L->base_ci; ci = ci->previous) - level--; - if (level == 0 && ci != &L->base_ci) { /* level found? */ - status = 1; - ar->i_ci = ci; - } - else status = 0; /* no such level */ - lua_unlock(L); - return status; -} - - -static const char *upvalname (Proto *p, int uv) { - TString *s = check_exp(uv < p->sizeupvalues, p->upvalues[uv].name); - if (s == NULL) return "?"; - else return getstr(s); -} - - -static const char *findvararg (CallInfo *ci, int n, StkId *pos) { - int nparams = clLvalue(ci->func)->p->numparams; - if (n >= ci->u.l.base - ci->func - nparams) - return NULL; /* no such vararg */ - else { - *pos = ci->func + nparams + n; - return "(*vararg)"; /* generic name for any vararg */ - } -} - - -static const char *findlocal (lua_State *L, CallInfo *ci, int n, - StkId *pos) { - const char *name = NULL; - StkId base; - if (isLua(ci)) { - if (n < 0) /* access to vararg values? */ - return findvararg(ci, -n, pos); - else { - base = ci->u.l.base; - name = luaF_getlocalname(ci_func(ci)->p, n, currentpc(ci)); - } - } - else - base = ci->func + 1; - if (name == NULL) { /* no 'standard' name? */ - StkId limit = (ci == L->ci) ? L->top : ci->next->func; - if (limit - base >= n && n > 0) /* is 'n' inside 'ci' stack? */ - name = "(*temporary)"; /* generic name for any valid slot */ - else - return NULL; /* no name */ - } - *pos = base + (n - 1); - return name; -} - - -LUA_API const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n) { - const char *name; - lua_lock(L); - if (ar == NULL) { /* information about non-active function? */ - if (!isLfunction(L->top - 1)) /* not a Lua function? */ - name = NULL; - else /* consider live variables at function start (parameters) */ - name = luaF_getlocalname(clLvalue(L->top - 1)->p, n, 0); - } - else { /* active function; get information through 'ar' */ - StkId pos = 0; /* to avoid warnings */ - name = findlocal(L, ar->i_ci, n, &pos); - if (name) { - setobj2s(L, L->top, pos); - api_incr_top(L); - } - } - lua_unlock(L); - return name; -} - - -LUA_API const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n) { - StkId pos = 0; /* to avoid warnings */ - const char *name = findlocal(L, ar->i_ci, n, &pos); - lua_lock(L); - if (name) - setobjs2s(L, pos, L->top - 1); - L->top--; /* pop value */ - lua_unlock(L); - return name; -} - - -static void funcinfo (lua_Debug *ar, Closure *cl) { - if (noLuaClosure(cl)) { - ar->source = "=[C]"; - ar->linedefined = -1; - ar->lastlinedefined = -1; - ar->what = "C"; - } - else { - Proto *p = cl->l.p; - ar->source = p->source ? getstr(p->source) : "=?"; - ar->linedefined = p->linedefined; - ar->lastlinedefined = p->lastlinedefined; - ar->what = (ar->linedefined == 0) ? "main" : "Lua"; - } - luaO_chunkid(ar->short_src, ar->source, LUA_IDSIZE); -} - - -static void collectvalidlines (lua_State *L, Closure *f) { - if (noLuaClosure(f)) { - setnilvalue(L->top); - api_incr_top(L); - } - else { - int i; - TValue v; - int *lineinfo = f->l.p->lineinfo; - Table *t = luaH_new(L); /* new table to store active lines */ - sethvalue(L, L->top, t); /* push it on stack */ - api_incr_top(L); - setbvalue(&v, 1); /* boolean 'true' to be the value of all indices */ - for (i = 0; i < f->l.p->sizelineinfo; i++) /* for all lines with code */ - luaH_setint(L, t, lineinfo[i], &v); /* table[line] = true */ - } -} - - -static int auxgetinfo (lua_State *L, const char *what, lua_Debug *ar, - Closure *f, CallInfo *ci) { - int status = 1; - for (; *what; what++) { - switch (*what) { - case 'S': { - funcinfo(ar, f); - break; - } - case 'l': { - ar->currentline = (ci && isLua(ci)) ? currentline(ci) : -1; - break; - } - case 'u': { - ar->nups = (f == NULL) ? 0 : f->c.nupvalues; - if (noLuaClosure(f)) { - ar->isvararg = 1; - ar->nparams = 0; - } - else { - ar->isvararg = f->l.p->is_vararg; - ar->nparams = f->l.p->numparams; - } - break; - } - case 't': { - ar->istailcall = (ci) ? ci->callstatus & CIST_TAIL : 0; - break; - } - case 'n': { - /* calling function is a known Lua function? */ - if (ci && !(ci->callstatus & CIST_TAIL) && isLua(ci->previous)) - ar->namewhat = getfuncname(L, ci->previous, &ar->name); - else - ar->namewhat = NULL; - if (ar->namewhat == NULL) { - ar->namewhat = ""; /* not found */ - ar->name = NULL; - } - break; - } - case 'L': - case 'f': /* handled by lua_getinfo */ - break; - default: status = 0; /* invalid option */ - } - } - return status; -} - - -LUA_API int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar) { - int status; - Closure *cl; - CallInfo *ci; - StkId func; - lua_lock(L); - if (*what == '>') { - ci = NULL; - func = L->top - 1; - api_check(L, ttisfunction(func), "function expected"); - what++; /* skip the '>' */ - L->top--; /* pop function */ - } - else { - ci = ar->i_ci; - func = ci->func; - lua_assert(ttisfunction(ci->func)); - } - cl = ttisclosure(func) ? clvalue(func) : NULL; - status = auxgetinfo(L, what, ar, cl, ci); - if (strchr(what, 'f')) { - setobjs2s(L, L->top, func); - api_incr_top(L); - } - if (strchr(what, 'L')) - collectvalidlines(L, cl); - lua_unlock(L); - return status; -} - - -/* -** {====================================================== -** Symbolic Execution -** ======================================================= -*/ - -static const char *getobjname (Proto *p, int lastpc, int reg, - const char **name); - - -/* -** find a "name" for the RK value 'c' -*/ -static void kname (Proto *p, int pc, int c, const char **name) { - if (ISK(c)) { /* is 'c' a constant? */ - TValue *kvalue = &p->k[INDEXK(c)]; - if (ttisstring(kvalue)) { /* literal constant? */ - *name = svalue(kvalue); /* it is its own name */ - return; - } - /* else no reasonable name found */ - } - else { /* 'c' is a register */ - const char *what = getobjname(p, pc, c, name); /* search for 'c' */ - if (what && *what == 'c') { /* found a constant name? */ - return; /* 'name' already filled */ - } - /* else no reasonable name found */ - } - *name = "?"; /* no reasonable name found */ -} - - -/* -** try to find last instruction before 'lastpc' that modified register 'reg' -*/ -static int findsetreg (Proto *p, int lastpc, int reg) { - int pc; - int setreg = -1; /* keep last instruction that changed 'reg' */ - for (pc = 0; pc < lastpc; pc++) { - Instruction i = p->code[pc]; - OpCode op = GET_OPCODE(i); - int a = GETARG_A(i); - switch (op) { - case OP_LOADNIL: { - int b = GETARG_B(i); - if (a <= reg && reg <= a + b) /* set registers from 'a' to 'a+b' */ - setreg = pc; - break; - } - case OP_TFORCALL: { - if (reg >= a + 2) setreg = pc; /* affect all regs above its base */ - break; - } - case OP_CALL: - case OP_TAILCALL: { - if (reg >= a) setreg = pc; /* affect all registers above base */ - break; - } - case OP_JMP: { - int b = GETARG_sBx(i); - int dest = pc + 1 + b; - /* jump is forward and do not skip `lastpc'? */ - if (pc < dest && dest <= lastpc) - pc += b; /* do the jump */ - break; - } - case OP_TEST: { - if (reg == a) setreg = pc; /* jumped code can change 'a' */ - break; - } - default: - if (testAMode(op) && reg == a) /* any instruction that set A */ - setreg = pc; - break; - } - } - return setreg; -} - - -static const char *getobjname (Proto *p, int lastpc, int reg, - const char **name) { - int pc; - *name = luaF_getlocalname(p, reg + 1, lastpc); - if (*name) /* is a local? */ - return "local"; - /* else try symbolic execution */ - pc = findsetreg(p, lastpc, reg); - if (pc != -1) { /* could find instruction? */ - Instruction i = p->code[pc]; - OpCode op = GET_OPCODE(i); - switch (op) { - case OP_MOVE: { - int b = GETARG_B(i); /* move from 'b' to 'a' */ - if (b < GETARG_A(i)) - return getobjname(p, pc, b, name); /* get name for 'b' */ - break; - } - case OP_GETTABUP: - case OP_GETTABLE: { - int k = GETARG_C(i); /* key index */ - int t = GETARG_B(i); /* table index */ - const char *vn = (op == OP_GETTABLE) /* name of indexed variable */ - ? luaF_getlocalname(p, t + 1, pc) - : upvalname(p, t); - kname(p, pc, k, name); - return (vn && strcmp(vn, LUA_ENV) == 0) ? "global" : "field"; - } - case OP_GETUPVAL: { - *name = upvalname(p, GETARG_B(i)); - return "upvalue"; - } - case OP_LOADK: - case OP_LOADKX: { - int b = (op == OP_LOADK) ? GETARG_Bx(i) - : GETARG_Ax(p->code[pc + 1]); - if (ttisstring(&p->k[b])) { - *name = svalue(&p->k[b]); - return "constant"; - } - break; - } - case OP_SELF: { - int k = GETARG_C(i); /* key index */ - kname(p, pc, k, name); - return "method"; - } - default: break; /* go through to return NULL */ - } - } - return NULL; /* could not find reasonable name */ -} - - -static const char *getfuncname (lua_State *L, CallInfo *ci, const char **name) { - TMS tm; - Proto *p = ci_func(ci)->p; /* calling function */ - int pc = currentpc(ci); /* calling instruction index */ - Instruction i = p->code[pc]; /* calling instruction */ - switch (GET_OPCODE(i)) { - case OP_CALL: - case OP_TAILCALL: /* get function name */ - return getobjname(p, pc, GETARG_A(i), name); - case OP_TFORCALL: { /* for iterator */ - *name = "for iterator"; - return "for iterator"; - } - /* all other instructions can call only through metamethods */ - case OP_SELF: - case OP_GETTABUP: - case OP_GETTABLE: tm = TM_INDEX; break; - case OP_SETTABUP: - case OP_SETTABLE: tm = TM_NEWINDEX; break; - case OP_EQ: tm = TM_EQ; break; - case OP_ADD: tm = TM_ADD; break; - case OP_SUB: tm = TM_SUB; break; - case OP_MUL: tm = TM_MUL; break; - case OP_DIV: tm = TM_DIV; break; - case OP_MOD: tm = TM_MOD; break; - case OP_POW: tm = TM_POW; break; - case OP_UNM: tm = TM_UNM; break; - case OP_LEN: tm = TM_LEN; break; - case OP_LT: tm = TM_LT; break; - case OP_LE: tm = TM_LE; break; - case OP_CONCAT: tm = TM_CONCAT; break; - default: - return NULL; /* else no useful name can be found */ - } - *name = getstr(G(L)->tmname[tm]); - return "metamethod"; -} - -/* }====================================================== */ - - - -/* -** only ANSI way to check whether a pointer points to an array -** (used only for error messages, so efficiency is not a big concern) -*/ -static int isinstack (CallInfo *ci, const TValue *o) { - StkId p; - for (p = ci->u.l.base; p < ci->top; p++) - if (o == p) return 1; - return 0; -} - - -static const char *getupvalname (CallInfo *ci, const TValue *o, - const char **name) { - LClosure *c = ci_func(ci); - int i; - for (i = 0; i < c->nupvalues; i++) { - if (c->upvals[i]->v == o) { - *name = upvalname(c->p, i); - return "upvalue"; - } - } - return NULL; -} - - -l_noret luaG_typeerror (lua_State *L, const TValue *o, const char *op) { - CallInfo *ci = L->ci; - const char *name = NULL; - const char *t = objtypename(o); - const char *kind = NULL; - if (isLua(ci)) { - kind = getupvalname(ci, o, &name); /* check whether 'o' is an upvalue */ - if (!kind && isinstack(ci, o)) /* no? try a register */ - kind = getobjname(ci_func(ci)->p, currentpc(ci), - cast_int(o - ci->u.l.base), &name); - } - if (kind) - luaG_runerror(L, "attempt to %s %s " LUA_QS " (a %s value)", - op, kind, name, t); - else - luaG_runerror(L, "attempt to %s a %s value", op, t); -} - - -l_noret luaG_concaterror (lua_State *L, StkId p1, StkId p2) { - if (ttisstring(p1) || ttisnumber(p1)) p1 = p2; - lua_assert(!ttisstring(p1) && !ttisnumber(p2)); - luaG_typeerror(L, p1, "concatenate"); -} - - -l_noret luaG_aritherror (lua_State *L, const TValue *p1, const TValue *p2) { - TValue temp; - if (luaV_tonumber(p1, &temp) == NULL) - p2 = p1; /* first operand is wrong */ - luaG_typeerror(L, p2, "perform arithmetic on"); -} - - -l_noret luaG_ordererror (lua_State *L, const TValue *p1, const TValue *p2) { - const char *t1 = objtypename(p1); - const char *t2 = objtypename(p2); - if (t1 == t2) - luaG_runerror(L, "attempt to compare two %s values", t1); - else - luaG_runerror(L, "attempt to compare %s with %s", t1, t2); -} - - -static void addinfo (lua_State *L, const char *msg) { - CallInfo *ci = L->ci; - if (isLua(ci)) { /* is Lua code? */ - char buff[LUA_IDSIZE]; /* add file:line information */ - int line = currentline(ci); - TString *src = ci_func(ci)->p->source; - if (src) - luaO_chunkid(buff, getstr(src), LUA_IDSIZE); - else { /* no source available; use "?" instead */ - buff[0] = '?'; buff[1] = '\0'; - } - luaO_pushfstring(L, "%s:%d: %s", buff, line, msg); - } -} - - -l_noret luaG_errormsg (lua_State *L) { - if (L->errfunc != 0) { /* is there an error handling function? */ - StkId errfunc = restorestack(L, L->errfunc); - if (!ttisfunction(errfunc)) luaD_throw(L, LUA_ERRERR); - setobjs2s(L, L->top, L->top - 1); /* move argument */ - setobjs2s(L, L->top - 1, errfunc); /* push function */ - L->top++; - luaD_call(L, L->top - 2, 1, 0); /* call it */ - } - luaD_throw(L, LUA_ERRRUN); -} - - -l_noret luaG_runerror (lua_State *L, const char *fmt, ...) { - va_list argp; - va_start(argp, fmt); - addinfo(L, luaO_pushvfstring(L, fmt, argp)); - va_end(argp); - luaG_errormsg(L); -} - diff --git a/radio/src/lua/src/ldebug.h b/radio/src/lua/src/ldebug.h deleted file mode 100644 index fe39556b0..000000000 --- a/radio/src/lua/src/ldebug.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -** $Id: ldebug.h,v 2.7 2011/10/07 20:45:19 roberto Exp $ -** Auxiliary functions from Debug Interface module -** See Copyright Notice in lua.h -*/ - -#ifndef ldebug_h -#define ldebug_h - - -#include "lstate.h" - - -#define pcRel(pc, p) (cast(int, (pc) - (p)->code) - 1) - -#define getfuncline(f,pc) (((f)->lineinfo) ? (f)->lineinfo[pc] : 0) - -#define resethookcount(L) (L->hookcount = L->basehookcount) - -/* Active Lua function (given call info) */ -#define ci_func(ci) (clLvalue((ci)->func)) - - -LUAI_FUNC l_noret luaG_typeerror (lua_State *L, const TValue *o, - const char *opname); -LUAI_FUNC l_noret luaG_concaterror (lua_State *L, StkId p1, StkId p2); -LUAI_FUNC l_noret luaG_aritherror (lua_State *L, const TValue *p1, - const TValue *p2); -LUAI_FUNC l_noret luaG_ordererror (lua_State *L, const TValue *p1, - const TValue *p2); -LUAI_FUNC l_noret luaG_runerror (lua_State *L, const char *fmt, ...); -LUAI_FUNC l_noret luaG_errormsg (lua_State *L); - -#endif diff --git a/radio/src/lua/src/ldo.c b/radio/src/lua/src/ldo.c deleted file mode 100644 index aafa3dca2..000000000 --- a/radio/src/lua/src/ldo.c +++ /dev/null @@ -1,673 +0,0 @@ -/* -** $Id: ldo.c,v 2.108 2012/10/01 14:05:04 roberto Exp $ -** Stack and Call structure of Lua -** See Copyright Notice in lua.h -*/ - - -#include -#include -#include - -#define ldo_c -#define LUA_CORE - -#include "lua.h" - -#include "lapi.h" -#include "ldebug.h" -#include "ldo.h" -#include "lfunc.h" -#include "lgc.h" -#include "lmem.h" -#include "lobject.h" -#include "lopcodes.h" -#include "lparser.h" -#include "lstate.h" -#include "lstring.h" -#include "ltable.h" -#include "ltm.h" -#include "lundump.h" -#include "lvm.h" -#include "lzio.h" - - - - -/* -** {====================================================== -** Error-recovery functions -** ======================================================= -*/ - -/* -** LUAI_THROW/LUAI_TRY define how Lua does exception handling. By -** default, Lua handles errors with exceptions when compiling as -** C++ code, with _longjmp/_setjmp when asked to use them, and with -** longjmp/setjmp otherwise. -*/ -#if !defined(LUAI_THROW) - -#if defined(__cplusplus) && !defined(LUA_USE_LONGJMP) -/* C++ exceptions */ -#define LUAI_THROW(L,c) throw(c) -#define LUAI_TRY(L,c,a) \ - try { a } catch(...) { if ((c)->status == 0) (c)->status = -1; } -#define luai_jmpbuf int /* dummy variable */ - -#elif defined(LUA_USE_ULONGJMP) -/* in Unix, try _longjmp/_setjmp (more efficient) */ -#define LUAI_THROW(L,c) _longjmp((c)->b, 1) -#define LUAI_TRY(L,c,a) if (_setjmp((c)->b) == 0) { a } -#define luai_jmpbuf jmp_buf - -#else -/* default handling with long jumps */ -#define LUAI_THROW(L,c) longjmp((c)->b, 1) -#define LUAI_TRY(L,c,a) if (setjmp((c)->b) == 0) { a } -#define luai_jmpbuf jmp_buf - -#endif - -#endif - - - -/* chain list of long jump buffers */ -struct lua_longjmp { - struct lua_longjmp *previous; - luai_jmpbuf b; - volatile int status; /* error code */ -}; - - -static void seterrorobj (lua_State *L, int errcode, StkId oldtop) { - switch (errcode) { - case LUA_ERRMEM: { /* memory error? */ - setsvalue2s(L, oldtop, G(L)->memerrmsg); /* reuse preregistered msg. */ - break; - } - case LUA_ERRERR: { - setsvalue2s(L, oldtop, luaS_newliteral(L, "error in error handling")); - break; - } - default: { - setobjs2s(L, oldtop, L->top - 1); /* error message on current top */ - break; - } - } - L->top = oldtop + 1; -} - - -l_noret luaD_throw (lua_State *L, int errcode) { - if (L->errorJmp) { /* thread has an error handler? */ - L->errorJmp->status = errcode; /* set status */ - LUAI_THROW(L, L->errorJmp); /* jump to it */ - } - else { /* thread has no error handler */ - L->status = cast_byte(errcode); /* mark it as dead */ - if (G(L)->mainthread->errorJmp) { /* main thread has a handler? */ - setobjs2s(L, G(L)->mainthread->top++, L->top - 1); /* copy error obj. */ - luaD_throw(G(L)->mainthread, errcode); /* re-throw in main thread */ - } - else { /* no handler at all; abort */ - if (G(L)->panic) { /* panic function? */ - lua_unlock(L); - G(L)->panic(L); /* call it (last chance to jump out) */ - } - abort(); - } - } -} - - -int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud) { - unsigned short oldnCcalls = L->nCcalls; - struct lua_longjmp lj; - lj.status = LUA_OK; - lj.previous = L->errorJmp; /* chain new error handler */ - L->errorJmp = &lj; - LUAI_TRY(L, &lj, - (*f)(L, ud); - ); - L->errorJmp = lj.previous; /* restore old error handler */ - L->nCcalls = oldnCcalls; - return lj.status; -} - -/* }====================================================== */ - - -static void correctstack (lua_State *L, TValue *oldstack) { - CallInfo *ci; - GCObject *up; - L->top = (L->top - oldstack) + L->stack; - for (up = L->openupval; up != NULL; up = up->gch.next) - gco2uv(up)->v = (gco2uv(up)->v - oldstack) + L->stack; - for (ci = L->ci; ci != NULL; ci = ci->previous) { - ci->top = (ci->top - oldstack) + L->stack; - ci->func = (ci->func - oldstack) + L->stack; - if (isLua(ci)) - ci->u.l.base = (ci->u.l.base - oldstack) + L->stack; - } -} - - -/* some space for error handling */ -#define ERRORSTACKSIZE (LUAI_MAXSTACK + 200) - - -void luaD_reallocstack (lua_State *L, int newsize) { - TValue *oldstack = L->stack; - int lim = L->stacksize; - lua_assert(newsize <= LUAI_MAXSTACK || newsize == ERRORSTACKSIZE); - lua_assert(L->stack_last - L->stack == L->stacksize - EXTRA_STACK); - luaM_reallocvector(L, L->stack, L->stacksize, newsize, TValue); - for (; lim < newsize; lim++) - setnilvalue(L->stack + lim); /* erase new segment */ - L->stacksize = newsize; - L->stack_last = L->stack + newsize - EXTRA_STACK; - correctstack(L, oldstack); -} - - -void luaD_growstack (lua_State *L, int n) { - int size = L->stacksize; - if (size > LUAI_MAXSTACK) /* error after extra size? */ - luaD_throw(L, LUA_ERRERR); - else { - int needed = cast_int(L->top - L->stack) + n + EXTRA_STACK; - int newsize = 2 * size; - if (newsize > LUAI_MAXSTACK) newsize = LUAI_MAXSTACK; - if (newsize < needed) newsize = needed; - if (newsize > LUAI_MAXSTACK) { /* stack overflow? */ - luaD_reallocstack(L, ERRORSTACKSIZE); - luaG_runerror(L, "stack overflow"); - } - else - luaD_reallocstack(L, newsize); - } -} - - -static int stackinuse (lua_State *L) { - CallInfo *ci; - StkId lim = L->top; - for (ci = L->ci; ci != NULL; ci = ci->previous) { - lua_assert(ci->top <= L->stack_last); - if (lim < ci->top) lim = ci->top; - } - return cast_int(lim - L->stack) + 1; /* part of stack in use */ -} - - -void luaD_shrinkstack (lua_State *L) { - int inuse = stackinuse(L); - int goodsize = inuse + (inuse / 8) + 2*EXTRA_STACK; - if (goodsize > LUAI_MAXSTACK) goodsize = LUAI_MAXSTACK; - if (inuse > LUAI_MAXSTACK || /* handling stack overflow? */ - goodsize >= L->stacksize) /* would grow instead of shrink? */ - condmovestack(L); /* don't change stack (change only for debugging) */ - else - luaD_reallocstack(L, goodsize); /* shrink it */ -} - - -void luaD_hook (lua_State *L, int event, int line) { - lua_Hook hook = L->hook; - if (hook && L->allowhook) { - CallInfo *ci = L->ci; - ptrdiff_t top = savestack(L, L->top); - ptrdiff_t ci_top = savestack(L, ci->top); - lua_Debug ar; - ar.event = event; - ar.currentline = line; - ar.i_ci = ci; - luaD_checkstack(L, LUA_MINSTACK); /* ensure minimum stack size */ - ci->top = L->top + LUA_MINSTACK; - lua_assert(ci->top <= L->stack_last); - L->allowhook = 0; /* cannot call hooks inside a hook */ - ci->callstatus |= CIST_HOOKED; - lua_unlock(L); - (*hook)(L, &ar); - lua_lock(L); - lua_assert(!L->allowhook); - L->allowhook = 1; - ci->top = restorestack(L, ci_top); - L->top = restorestack(L, top); - ci->callstatus &= ~CIST_HOOKED; - } -} - - -static void callhook (lua_State *L, CallInfo *ci) { - int hook = LUA_HOOKCALL; - ci->u.l.savedpc++; /* hooks assume 'pc' is already incremented */ - if (isLua(ci->previous) && - GET_OPCODE(*(ci->previous->u.l.savedpc - 1)) == OP_TAILCALL) { - ci->callstatus |= CIST_TAIL; - hook = LUA_HOOKTAILCALL; - } - luaD_hook(L, hook, -1); - ci->u.l.savedpc--; /* correct 'pc' */ -} - - -static StkId adjust_varargs (lua_State *L, Proto *p, int actual) { - int i; - int nfixargs = p->numparams; - StkId base, fixed; - lua_assert(actual >= nfixargs); - /* move fixed parameters to final position */ - fixed = L->top - actual; /* first fixed argument */ - base = L->top; /* final position of first argument */ - for (i=0; itop++, fixed + i); - setnilvalue(fixed + i); - } - return base; -} - - -static StkId tryfuncTM (lua_State *L, StkId func) { - const TValue *tm = luaT_gettmbyobj(L, func, TM_CALL); - StkId p; - ptrdiff_t funcr = savestack(L, func); - if (!ttisfunction(tm)) - luaG_typeerror(L, func, "call"); - /* Open a hole inside the stack at `func' */ - for (p = L->top; p > func; p--) setobjs2s(L, p, p-1); - incr_top(L); - func = restorestack(L, funcr); /* previous call may change stack */ - setobj2s(L, func, tm); /* tag method is the new function to be called */ - return func; -} - - - -#define next_ci(L) (L->ci = (L->ci->next ? L->ci->next : luaE_extendCI(L))) - - -/* -** returns true if function has been executed (C function) -*/ -int luaD_precall (lua_State *L, StkId func, int nresults) { - lua_CFunction f; - CallInfo *ci; - int n; /* number of arguments (Lua) or returns (C) */ - ptrdiff_t funcr = savestack(L, func); - switch (ttype(func)) { - case LUA_TLCF: /* light C function */ - f = fvalue(func); - goto Cfunc; - case LUA_TCCL: { /* C closure */ - f = clCvalue(func)->f; - Cfunc: - luaD_checkstack(L, LUA_MINSTACK); /* ensure minimum stack size */ - ci = next_ci(L); /* now 'enter' new function */ - ci->nresults = nresults; - ci->func = restorestack(L, funcr); - ci->top = L->top + LUA_MINSTACK; - lua_assert(ci->top <= L->stack_last); - ci->callstatus = 0; - luaC_checkGC(L); /* stack grow uses memory */ - if (L->hookmask & LUA_MASKCALL) - luaD_hook(L, LUA_HOOKCALL, -1); - lua_unlock(L); - n = (*f)(L); /* do the actual call */ - lua_lock(L); - api_checknelems(L, n); - luaD_poscall(L, L->top - n); - return 1; - } - case LUA_TLCL: { /* Lua function: prepare its call */ - StkId base; - Proto *p = clLvalue(func)->p; - luaD_checkstack(L, p->maxstacksize); - func = restorestack(L, funcr); - n = cast_int(L->top - func) - 1; /* number of real arguments */ - for (; n < p->numparams; n++) - setnilvalue(L->top++); /* complete missing arguments */ - base = (!p->is_vararg) ? func + 1 : adjust_varargs(L, p, n); - ci = next_ci(L); /* now 'enter' new function */ - ci->nresults = nresults; - ci->func = func; - ci->u.l.base = base; - ci->top = base + p->maxstacksize; - lua_assert(ci->top <= L->stack_last); - ci->u.l.savedpc = p->code; /* starting point */ - ci->callstatus = CIST_LUA; - L->top = ci->top; - luaC_checkGC(L); /* stack grow uses memory */ - if (L->hookmask & LUA_MASKCALL) - callhook(L, ci); - return 0; - } - default: { /* not a function */ - func = tryfuncTM(L, func); /* retry with 'function' tag method */ - return luaD_precall(L, func, nresults); /* now it must be a function */ - } - } -} - - -int luaD_poscall (lua_State *L, StkId firstResult) { - StkId res; - int wanted, i; - CallInfo *ci = L->ci; - if (L->hookmask & (LUA_MASKRET | LUA_MASKLINE)) { - if (L->hookmask & LUA_MASKRET) { - ptrdiff_t fr = savestack(L, firstResult); /* hook may change stack */ - luaD_hook(L, LUA_HOOKRET, -1); - firstResult = restorestack(L, fr); - } - L->oldpc = ci->previous->u.l.savedpc; /* 'oldpc' for caller function */ - } - res = ci->func; /* res == final position of 1st result */ - wanted = ci->nresults; - L->ci = ci = ci->previous; /* back to caller */ - /* move results to correct place */ - for (i = wanted; i != 0 && firstResult < L->top; i--) - setobjs2s(L, res++, firstResult++); - while (i-- > 0) - setnilvalue(res++); - L->top = res; - return (wanted - LUA_MULTRET); /* 0 iff wanted == LUA_MULTRET */ -} - - -/* -** Call a function (C or Lua). The function to be called is at *func. -** The arguments are on the stack, right after the function. -** When returns, all the results are on the stack, starting at the original -** function position. -*/ -void luaD_call (lua_State *L, StkId func, int nResults, int allowyield) { - if (++L->nCcalls >= LUAI_MAXCCALLS) { - if (L->nCcalls == LUAI_MAXCCALLS) - luaG_runerror(L, "C stack overflow"); - else if (L->nCcalls >= (LUAI_MAXCCALLS + (LUAI_MAXCCALLS>>3))) - luaD_throw(L, LUA_ERRERR); /* error while handing stack error */ - } - if (!allowyield) L->nny++; - if (!luaD_precall(L, func, nResults)) /* is a Lua function? */ - luaV_execute(L); /* call it */ - if (!allowyield) L->nny--; - L->nCcalls--; -} - - -static void finishCcall (lua_State *L) { - CallInfo *ci = L->ci; - int n; - lua_assert(ci->u.c.k != NULL); /* must have a continuation */ - lua_assert(L->nny == 0); - if (ci->callstatus & CIST_YPCALL) { /* was inside a pcall? */ - ci->callstatus &= ~CIST_YPCALL; /* finish 'lua_pcall' */ - L->errfunc = ci->u.c.old_errfunc; - } - /* finish 'lua_callk'/'lua_pcall' */ - adjustresults(L, ci->nresults); - /* call continuation function */ - if (!(ci->callstatus & CIST_STAT)) /* no call status? */ - ci->u.c.status = LUA_YIELD; /* 'default' status */ - lua_assert(ci->u.c.status != LUA_OK); - ci->callstatus = (ci->callstatus & ~(CIST_YPCALL | CIST_STAT)) | CIST_YIELDED; - lua_unlock(L); - n = (*ci->u.c.k)(L); - lua_lock(L); - api_checknelems(L, n); - /* finish 'luaD_precall' */ - luaD_poscall(L, L->top - n); -} - - -static void unroll (lua_State *L, void *ud) { - UNUSED(ud); - for (;;) { - if (L->ci == &L->base_ci) /* stack is empty? */ - return; /* coroutine finished normally */ - if (!isLua(L->ci)) /* C function? */ - finishCcall(L); - else { /* Lua function */ - luaV_finishOp(L); /* finish interrupted instruction */ - luaV_execute(L); /* execute down to higher C 'boundary' */ - } - } -} - - -/* -** check whether thread has a suspended protected call -*/ -static CallInfo *findpcall (lua_State *L) { - CallInfo *ci; - for (ci = L->ci; ci != NULL; ci = ci->previous) { /* search for a pcall */ - if (ci->callstatus & CIST_YPCALL) - return ci; - } - return NULL; /* no pending pcall */ -} - - -static int recover (lua_State *L, int status) { - StkId oldtop; - CallInfo *ci = findpcall(L); - if (ci == NULL) return 0; /* no recovery point */ - /* "finish" luaD_pcall */ - oldtop = restorestack(L, ci->extra); - luaF_close(L, oldtop); - seterrorobj(L, status, oldtop); - L->ci = ci; - L->allowhook = ci->u.c.old_allowhook; - L->nny = 0; /* should be zero to be yieldable */ - luaD_shrinkstack(L); - L->errfunc = ci->u.c.old_errfunc; - ci->callstatus |= CIST_STAT; /* call has error status */ - ci->u.c.status = status; /* (here it is) */ - return 1; /* continue running the coroutine */ -} - - -/* -** signal an error in the call to 'resume', not in the execution of the -** coroutine itself. (Such errors should not be handled by any coroutine -** error handler and should not kill the coroutine.) -*/ -static l_noret resume_error (lua_State *L, const char *msg, StkId firstArg) { - L->top = firstArg; /* remove args from the stack */ - setsvalue2s(L, L->top, luaS_new(L, msg)); /* push error message */ - api_incr_top(L); - luaD_throw(L, -1); /* jump back to 'lua_resume' */ -} - - -/* -** do the work for 'lua_resume' in protected mode -*/ -static void resume (lua_State *L, void *ud) { - int nCcalls = L->nCcalls; - StkId firstArg = cast(StkId, ud); - CallInfo *ci = L->ci; - if (nCcalls >= LUAI_MAXCCALLS) - resume_error(L, "C stack overflow", firstArg); - if (L->status == LUA_OK) { /* may be starting a coroutine */ - if (ci != &L->base_ci) /* not in base level? */ - resume_error(L, "cannot resume non-suspended coroutine", firstArg); - /* coroutine is in base level; start running it */ - if (!luaD_precall(L, firstArg - 1, LUA_MULTRET)) /* Lua function? */ - luaV_execute(L); /* call it */ - } - else if (L->status != LUA_YIELD) - resume_error(L, "cannot resume dead coroutine", firstArg); - else { /* resuming from previous yield */ - L->status = LUA_OK; - ci->func = restorestack(L, ci->extra); - if (isLua(ci)) /* yielded inside a hook? */ - luaV_execute(L); /* just continue running Lua code */ - else { /* 'common' yield */ - if (ci->u.c.k != NULL) { /* does it have a continuation? */ - int n; - ci->u.c.status = LUA_YIELD; /* 'default' status */ - ci->callstatus |= CIST_YIELDED; - lua_unlock(L); - n = (*ci->u.c.k)(L); /* call continuation */ - lua_lock(L); - api_checknelems(L, n); - firstArg = L->top - n; /* yield results come from continuation */ - } - luaD_poscall(L, firstArg); /* finish 'luaD_precall' */ - } - unroll(L, NULL); - } - lua_assert(nCcalls == L->nCcalls); -} - - -LUA_API int lua_resume (lua_State *L, lua_State *from, int nargs) { - int status; - lua_lock(L); - luai_userstateresume(L, nargs); - L->nCcalls = (from) ? from->nCcalls + 1 : 1; - L->nny = 0; /* allow yields */ - api_checknelems(L, (L->status == LUA_OK) ? nargs + 1 : nargs); - status = luaD_rawrunprotected(L, resume, L->top - nargs); - if (status == -1) /* error calling 'lua_resume'? */ - status = LUA_ERRRUN; - else { /* yield or regular error */ - while (status != LUA_OK && status != LUA_YIELD) { /* error? */ - if (recover(L, status)) /* recover point? */ - status = luaD_rawrunprotected(L, unroll, NULL); /* run continuation */ - else { /* unrecoverable error */ - L->status = cast_byte(status); /* mark thread as `dead' */ - seterrorobj(L, status, L->top); - L->ci->top = L->top; - break; - } - } - lua_assert(status == L->status); - } - L->nny = 1; /* do not allow yields */ - L->nCcalls--; - lua_assert(L->nCcalls == ((from) ? from->nCcalls : 0)); - lua_unlock(L); - return status; -} - - -LUA_API int lua_yieldk (lua_State *L, int nresults, int ctx, lua_CFunction k) { - CallInfo *ci = L->ci; - luai_userstateyield(L, nresults); - lua_lock(L); - api_checknelems(L, nresults); - if (L->nny > 0) { - if (L != G(L)->mainthread) - luaG_runerror(L, "attempt to yield across a C-call boundary"); - else - luaG_runerror(L, "attempt to yield from outside a coroutine"); - } - L->status = LUA_YIELD; - ci->extra = savestack(L, ci->func); /* save current 'func' */ - if (isLua(ci)) { /* inside a hook? */ - api_check(L, k == NULL, "hooks cannot continue after yielding"); - } - else { - if ((ci->u.c.k = k) != NULL) /* is there a continuation? */ - ci->u.c.ctx = ctx; /* save context */ - ci->func = L->top - nresults - 1; /* protect stack below results */ - luaD_throw(L, LUA_YIELD); - } - lua_assert(ci->callstatus & CIST_HOOKED); /* must be inside a hook */ - lua_unlock(L); - return 0; /* return to 'luaD_hook' */ -} - - -int luaD_pcall (lua_State *L, Pfunc func, void *u, - ptrdiff_t old_top, ptrdiff_t ef) { - int status; - CallInfo *old_ci = L->ci; - lu_byte old_allowhooks = L->allowhook; - unsigned short old_nny = L->nny; - ptrdiff_t old_errfunc = L->errfunc; - L->errfunc = ef; - status = luaD_rawrunprotected(L, func, u); - if (status != LUA_OK) { /* an error occurred? */ - StkId oldtop = restorestack(L, old_top); - luaF_close(L, oldtop); /* close possible pending closures */ - seterrorobj(L, status, oldtop); - L->ci = old_ci; - L->allowhook = old_allowhooks; - L->nny = old_nny; - luaD_shrinkstack(L); - } - L->errfunc = old_errfunc; - return status; -} - - - -/* -** Execute a protected parser. -*/ -struct SParser { /* data to `f_parser' */ - ZIO *z; - Mbuffer buff; /* dynamic structure used by the scanner */ - Dyndata dyd; /* dynamic structures used by the parser */ - const char *mode; - const char *name; -}; - - -static void checkmode (lua_State *L, const char *mode, const char *x) { - if (mode && strchr(mode, x[0]) == NULL) { - luaO_pushfstring(L, - "attempt to load a %s chunk (mode is " LUA_QS ")", x, mode); - luaD_throw(L, LUA_ERRSYNTAX); - } -} - - -static void f_parser (lua_State *L, void *ud) { - int i; - Closure *cl; - struct SParser *p = cast(struct SParser *, ud); - int c = zgetc(p->z); /* read first character */ - if (c == LUA_SIGNATURE[0]) { - checkmode(L, p->mode, "binary"); - cl = luaU_undump(L, p->z, &p->buff, p->name); - } - else { - checkmode(L, p->mode, "text"); - cl = luaY_parser(L, p->z, &p->buff, &p->dyd, p->name, c); - } - lua_assert(cl->l.nupvalues == cl->l.p->sizeupvalues); - for (i = 0; i < cl->l.nupvalues; i++) { /* initialize upvalues */ - UpVal *up = luaF_newupval(L); - cl->l.upvals[i] = up; - luaC_objbarrier(L, cl, up); - } -} - - -int luaD_protectedparser (lua_State *L, ZIO *z, const char *name, - const char *mode) { - struct SParser p; - int status; - L->nny++; /* cannot yield during parsing */ - p.z = z; p.name = name; p.mode = mode; - p.dyd.actvar.arr = NULL; p.dyd.actvar.size = 0; - p.dyd.gt.arr = NULL; p.dyd.gt.size = 0; - p.dyd.label.arr = NULL; p.dyd.label.size = 0; - luaZ_initbuffer(L, &p.buff); - status = luaD_pcall(L, f_parser, &p, savestack(L, L->top), L->errfunc); - luaZ_freebuffer(L, &p.buff); - luaM_freearray(L, p.dyd.actvar.arr, p.dyd.actvar.size); - luaM_freearray(L, p.dyd.gt.arr, p.dyd.gt.size); - luaM_freearray(L, p.dyd.label.arr, p.dyd.label.size); - L->nny--; - return status; -} - - diff --git a/radio/src/lua/src/ldo.h b/radio/src/lua/src/ldo.h deleted file mode 100644 index 27b837d99..000000000 --- a/radio/src/lua/src/ldo.h +++ /dev/null @@ -1,46 +0,0 @@ -/* -** $Id: ldo.h,v 2.20 2011/11/29 15:55:08 roberto Exp $ -** Stack and Call structure of Lua -** See Copyright Notice in lua.h -*/ - -#ifndef ldo_h -#define ldo_h - - -#include "lobject.h" -#include "lstate.h" -#include "lzio.h" - - -#define luaD_checkstack(L,n) if (L->stack_last - L->top <= (n)) \ - luaD_growstack(L, n); else condmovestack(L); - - -#define incr_top(L) {L->top++; luaD_checkstack(L,0);} - -#define savestack(L,p) ((char *)(p) - (char *)L->stack) -#define restorestack(L,n) ((TValue *)((char *)L->stack + (n))) - - -/* type of protected functions, to be ran by `runprotected' */ -typedef void (*Pfunc) (lua_State *L, void *ud); - -LUAI_FUNC int luaD_protectedparser (lua_State *L, ZIO *z, const char *name, - const char *mode); -LUAI_FUNC void luaD_hook (lua_State *L, int event, int line); -LUAI_FUNC int luaD_precall (lua_State *L, StkId func, int nresults); -LUAI_FUNC void luaD_call (lua_State *L, StkId func, int nResults, - int allowyield); -LUAI_FUNC int luaD_pcall (lua_State *L, Pfunc func, void *u, - ptrdiff_t oldtop, ptrdiff_t ef); -LUAI_FUNC int luaD_poscall (lua_State *L, StkId firstResult); -LUAI_FUNC void luaD_reallocstack (lua_State *L, int newsize); -LUAI_FUNC void luaD_growstack (lua_State *L, int n); -LUAI_FUNC void luaD_shrinkstack (lua_State *L); - -LUAI_FUNC l_noret luaD_throw (lua_State *L, int errcode); -LUAI_FUNC int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud); - -#endif - diff --git a/radio/src/lua/src/ldump.c b/radio/src/lua/src/ldump.c deleted file mode 100644 index d5e6a47cb..000000000 --- a/radio/src/lua/src/ldump.c +++ /dev/null @@ -1,173 +0,0 @@ -/* -** $Id: ldump.c,v 2.17 2012/01/23 23:02:10 roberto Exp $ -** save precompiled Lua chunks -** See Copyright Notice in lua.h -*/ - -#include - -#define ldump_c -#define LUA_CORE - -#include "lua.h" - -#include "lobject.h" -#include "lstate.h" -#include "lundump.h" - -typedef struct { - lua_State* L; - lua_Writer writer; - void* data; - int strip; - int status; -} DumpState; - -#define DumpMem(b,n,size,D) DumpBlock(b,(n)*(size),D) -#define DumpVar(x,D) DumpMem(&x,1,sizeof(x),D) - -static void DumpBlock(const void* b, size_t size, DumpState* D) -{ - if (D->status==0) - { - lua_unlock(D->L); - D->status=(*D->writer)(D->L,b,size,D->data); - lua_lock(D->L); - } -} - -static void DumpChar(int y, DumpState* D) -{ - char x=(char)y; - DumpVar(x,D); -} - -static void DumpInt(int x, DumpState* D) -{ - DumpVar(x,D); -} - -static void DumpNumber(lua_Number x, DumpState* D) -{ - DumpVar(x,D); -} - -static void DumpVector(const void* b, int n, size_t size, DumpState* D) -{ - DumpInt(n,D); - DumpMem(b,n,size,D); -} - -static void DumpString(const TString* s, DumpState* D) -{ - if (s==NULL) - { - size_t size=0; - DumpVar(size,D); - } - else - { - size_t size=s->tsv.len+1; /* include trailing '\0' */ - DumpVar(size,D); - DumpBlock(getstr(s),size*sizeof(char),D); - } -} - -#define DumpCode(f,D) DumpVector(f->code,f->sizecode,sizeof(Instruction),D) - -static void DumpFunction(const Proto* f, DumpState* D); - -static void DumpConstants(const Proto* f, DumpState* D) -{ - int i,n=f->sizek; - DumpInt(n,D); - for (i=0; ik[i]; - DumpChar(ttypenv(o),D); - switch (ttypenv(o)) - { - case LUA_TNIL: - break; - case LUA_TBOOLEAN: - DumpChar(bvalue(o),D); - break; - case LUA_TNUMBER: - DumpNumber(nvalue(o),D); - break; - case LUA_TSTRING: - DumpString(rawtsvalue(o),D); - break; - default: lua_assert(0); - } - } - n=f->sizep; - DumpInt(n,D); - for (i=0; ip[i],D); -} - -static void DumpUpvalues(const Proto* f, DumpState* D) -{ - int i,n=f->sizeupvalues; - DumpInt(n,D); - for (i=0; iupvalues[i].instack,D); - DumpChar(f->upvalues[i].idx,D); - } -} - -static void DumpDebug(const Proto* f, DumpState* D) -{ - int i,n; - DumpString((D->strip) ? NULL : f->source,D); - n= (D->strip) ? 0 : f->sizelineinfo; - DumpVector(f->lineinfo,n,sizeof(int),D); - n= (D->strip) ? 0 : f->sizelocvars; - DumpInt(n,D); - for (i=0; ilocvars[i].varname,D); - DumpInt(f->locvars[i].startpc,D); - DumpInt(f->locvars[i].endpc,D); - } - n= (D->strip) ? 0 : f->sizeupvalues; - DumpInt(n,D); - for (i=0; iupvalues[i].name,D); -} - -static void DumpFunction(const Proto* f, DumpState* D) -{ - DumpInt(f->linedefined,D); - DumpInt(f->lastlinedefined,D); - DumpChar(f->numparams,D); - DumpChar(f->is_vararg,D); - DumpChar(f->maxstacksize,D); - DumpCode(f,D); - DumpConstants(f,D); - DumpUpvalues(f,D); - DumpDebug(f,D); -} - -static void DumpHeader(DumpState* D) -{ - lu_byte h[LUAC_HEADERSIZE]; - luaU_header(h); - DumpBlock(h,LUAC_HEADERSIZE,D); -} - -/* -** dump Lua function as precompiled chunk -*/ -int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip) -{ - DumpState D; - D.L=L; - D.writer=w; - D.data=data; - D.strip=strip; - D.status=0; - DumpHeader(&D); - DumpFunction(f,&D); - return D.status; -} diff --git a/radio/src/lua/src/lfunc.c b/radio/src/lua/src/lfunc.c deleted file mode 100644 index c2128405b..000000000 --- a/radio/src/lua/src/lfunc.c +++ /dev/null @@ -1,161 +0,0 @@ -/* -** $Id: lfunc.c,v 2.30 2012/10/03 12:36:46 roberto Exp $ -** Auxiliary functions to manipulate prototypes and closures -** See Copyright Notice in lua.h -*/ - - -#include - -#define lfunc_c -#define LUA_CORE - -#include "lua.h" - -#include "lfunc.h" -#include "lgc.h" -#include "lmem.h" -#include "lobject.h" -#include "lstate.h" - - - -Closure *luaF_newCclosure (lua_State *L, int n) { - Closure *c = &luaC_newobj(L, LUA_TCCL, sizeCclosure(n), NULL, 0)->cl; - c->c.nupvalues = cast_byte(n); - return c; -} - - -Closure *luaF_newLclosure (lua_State *L, int n) { - Closure *c = &luaC_newobj(L, LUA_TLCL, sizeLclosure(n), NULL, 0)->cl; - c->l.p = NULL; - c->l.nupvalues = cast_byte(n); - while (n--) c->l.upvals[n] = NULL; - return c; -} - - -UpVal *luaF_newupval (lua_State *L) { - UpVal *uv = &luaC_newobj(L, LUA_TUPVAL, sizeof(UpVal), NULL, 0)->uv; - uv->v = &uv->u.value; - setnilvalue(uv->v); - return uv; -} - - -UpVal *luaF_findupval (lua_State *L, StkId level) { - global_State *g = G(L); - GCObject **pp = &L->openupval; - UpVal *p; - UpVal *uv; - while (*pp != NULL && (p = gco2uv(*pp))->v >= level) { - GCObject *o = obj2gco(p); - lua_assert(p->v != &p->u.value); - lua_assert(!isold(o) || isold(obj2gco(L))); - if (p->v == level) { /* found a corresponding upvalue? */ - if (isdead(g, o)) /* is it dead? */ - changewhite(o); /* resurrect it */ - return p; - } - pp = &p->next; - } - /* not found: create a new one */ - uv = &luaC_newobj(L, LUA_TUPVAL, sizeof(UpVal), pp, 0)->uv; - uv->v = level; /* current value lives in the stack */ - uv->u.l.prev = &g->uvhead; /* double link it in `uvhead' list */ - uv->u.l.next = g->uvhead.u.l.next; - uv->u.l.next->u.l.prev = uv; - g->uvhead.u.l.next = uv; - lua_assert(uv->u.l.next->u.l.prev == uv && uv->u.l.prev->u.l.next == uv); - return uv; -} - - -static void unlinkupval (UpVal *uv) { - lua_assert(uv->u.l.next->u.l.prev == uv && uv->u.l.prev->u.l.next == uv); - uv->u.l.next->u.l.prev = uv->u.l.prev; /* remove from `uvhead' list */ - uv->u.l.prev->u.l.next = uv->u.l.next; -} - - -void luaF_freeupval (lua_State *L, UpVal *uv) { - if (uv->v != &uv->u.value) /* is it open? */ - unlinkupval(uv); /* remove from open list */ - luaM_free(L, uv); /* free upvalue */ -} - - -void luaF_close (lua_State *L, StkId level) { - UpVal *uv; - global_State *g = G(L); - while (L->openupval != NULL && (uv = gco2uv(L->openupval))->v >= level) { - GCObject *o = obj2gco(uv); - lua_assert(!isblack(o) && uv->v != &uv->u.value); - L->openupval = uv->next; /* remove from `open' list */ - if (isdead(g, o)) - luaF_freeupval(L, uv); /* free upvalue */ - else { - unlinkupval(uv); /* remove upvalue from 'uvhead' list */ - setobj(L, &uv->u.value, uv->v); /* move value to upvalue slot */ - uv->v = &uv->u.value; /* now current value lives here */ - gch(o)->next = g->allgc; /* link upvalue into 'allgc' list */ - g->allgc = o; - luaC_checkupvalcolor(g, uv); - } - } -} - - -Proto *luaF_newproto (lua_State *L) { - Proto *f = &luaC_newobj(L, LUA_TPROTO, sizeof(Proto), NULL, 0)->p; - f->k = NULL; - f->sizek = 0; - f->p = NULL; - f->sizep = 0; - f->code = NULL; - f->cache = NULL; - f->sizecode = 0; - f->lineinfo = NULL; - f->sizelineinfo = 0; - f->upvalues = NULL; - f->sizeupvalues = 0; - f->numparams = 0; - f->is_vararg = 0; - f->maxstacksize = 0; - f->locvars = NULL; - f->sizelocvars = 0; - f->linedefined = 0; - f->lastlinedefined = 0; - f->source = NULL; - return f; -} - - -void luaF_freeproto (lua_State *L, Proto *f) { - luaM_freearray(L, f->code, f->sizecode); - luaM_freearray(L, f->p, f->sizep); - luaM_freearray(L, f->k, f->sizek); - luaM_freearray(L, f->lineinfo, f->sizelineinfo); - luaM_freearray(L, f->locvars, f->sizelocvars); - luaM_freearray(L, f->upvalues, f->sizeupvalues); - luaM_free(L, f); -} - - -/* -** Look for n-th local variable at line `line' in function `func'. -** Returns NULL if not found. -*/ -const char *luaF_getlocalname (const Proto *f, int local_number, int pc) { - int i; - for (i = 0; isizelocvars && f->locvars[i].startpc <= pc; i++) { - if (pc < f->locvars[i].endpc) { /* is variable active? */ - local_number--; - if (local_number == 0) - return getstr(f->locvars[i].varname); - } - } - return NULL; /* not found */ -} - diff --git a/radio/src/lua/src/lfunc.h b/radio/src/lua/src/lfunc.h deleted file mode 100644 index e236a717c..000000000 --- a/radio/src/lua/src/lfunc.h +++ /dev/null @@ -1,33 +0,0 @@ -/* -** $Id: lfunc.h,v 2.8 2012/05/08 13:53:33 roberto Exp $ -** Auxiliary functions to manipulate prototypes and closures -** See Copyright Notice in lua.h -*/ - -#ifndef lfunc_h -#define lfunc_h - - -#include "lobject.h" - - -#define sizeCclosure(n) (cast(int, sizeof(CClosure)) + \ - cast(int, sizeof(TValue)*((n)-1))) - -#define sizeLclosure(n) (cast(int, sizeof(LClosure)) + \ - cast(int, sizeof(TValue *)*((n)-1))) - - -LUAI_FUNC Proto *luaF_newproto (lua_State *L); -LUAI_FUNC Closure *luaF_newCclosure (lua_State *L, int nelems); -LUAI_FUNC Closure *luaF_newLclosure (lua_State *L, int nelems); -LUAI_FUNC UpVal *luaF_newupval (lua_State *L); -LUAI_FUNC UpVal *luaF_findupval (lua_State *L, StkId level); -LUAI_FUNC void luaF_close (lua_State *L, StkId level); -LUAI_FUNC void luaF_freeproto (lua_State *L, Proto *f); -LUAI_FUNC void luaF_freeupval (lua_State *L, UpVal *uv); -LUAI_FUNC const char *luaF_getlocalname (const Proto *func, int local_number, - int pc); - - -#endif diff --git a/radio/src/lua/src/lgc.c b/radio/src/lua/src/lgc.c deleted file mode 100644 index 535e988ae..000000000 --- a/radio/src/lua/src/lgc.c +++ /dev/null @@ -1,1213 +0,0 @@ -/* -** $Id: lgc.c,v 2.140 2013/03/16 21:10:18 roberto Exp $ -** Garbage Collector -** See Copyright Notice in lua.h -*/ - -#include - -#define lgc_c -#define LUA_CORE - -#include "lua.h" - -#include "ldebug.h" -#include "ldo.h" -#include "lfunc.h" -#include "lgc.h" -#include "lmem.h" -#include "lobject.h" -#include "lstate.h" -#include "lstring.h" -#include "ltable.h" -#include "ltm.h" - - - -/* -** cost of sweeping one element (the size of a small object divided -** by some adjust for the sweep speed) -*/ -#define GCSWEEPCOST ((sizeof(TString) + 4) / 4) - -/* maximum number of elements to sweep in each single step */ -#define GCSWEEPMAX (cast_int((GCSTEPSIZE / GCSWEEPCOST) / 4)) - -/* maximum number of finalizers to call in each GC step */ -#define GCFINALIZENUM 4 - - -/* -** macro to adjust 'stepmul': 'stepmul' is actually used like -** 'stepmul / STEPMULADJ' (value chosen by tests) -*/ -#define STEPMULADJ 200 - - -/* -** macro to adjust 'pause': 'pause' is actually used like -** 'pause / PAUSEADJ' (value chosen by tests) -*/ -#define PAUSEADJ 100 - - -/* -** 'makewhite' erases all color bits plus the old bit and then -** sets only the current white bit -*/ -#define maskcolors (~(bit2mask(BLACKBIT, OLDBIT) | WHITEBITS)) -#define makewhite(g,x) \ - (gch(x)->marked = cast_byte((gch(x)->marked & maskcolors) | luaC_white(g))) - -#define white2gray(x) resetbits(gch(x)->marked, WHITEBITS) -#define black2gray(x) resetbit(gch(x)->marked, BLACKBIT) - - -#define isfinalized(x) testbit(gch(x)->marked, FINALIZEDBIT) - -#define checkdeadkey(n) lua_assert(!ttisdeadkey(gkey(n)) || ttisnil(gval(n))) - - -#define checkconsistency(obj) \ - lua_longassert(!iscollectable(obj) || righttt(obj)) - - -#define markvalue(g,o) { checkconsistency(o); \ - if (valiswhite(o)) reallymarkobject(g,gcvalue(o)); } - -#define markobject(g,t) { if ((t) && iswhite(obj2gco(t))) \ - reallymarkobject(g, obj2gco(t)); } - -static void reallymarkobject (global_State *g, GCObject *o); - - -/* -** {====================================================== -** Generic functions -** ======================================================= -*/ - - -/* -** one after last element in a hash array -*/ -#define gnodelast(h) gnode(h, cast(size_t, sizenode(h))) - - -/* -** link table 'h' into list pointed by 'p' -*/ -#define linktable(h,p) ((h)->gclist = *(p), *(p) = obj2gco(h)) - - -/* -** if key is not marked, mark its entry as dead (therefore removing it -** from the table) -*/ -static void removeentry (Node *n) { - lua_assert(ttisnil(gval(n))); - if (valiswhite(gkey(n))) - setdeadvalue(gkey(n)); /* unused and unmarked key; remove it */ -} - - -/* -** tells whether a key or value can be cleared from a weak -** table. Non-collectable objects are never removed from weak -** tables. Strings behave as `values', so are never removed too. for -** other objects: if really collected, cannot keep them; for objects -** being finalized, keep them in keys, but not in values -*/ -static int iscleared (global_State *g, const TValue *o) { - if (!iscollectable(o)) return 0; - else if (ttisstring(o)) { - markobject(g, rawtsvalue(o)); /* strings are `values', so are never weak */ - return 0; - } - else return iswhite(gcvalue(o)); -} - - -/* -** barrier that moves collector forward, that is, mark the white object -** being pointed by a black object. -*/ -void luaC_barrier_ (lua_State *L, GCObject *o, GCObject *v) { - global_State *g = G(L); - lua_assert(isblack(o) && iswhite(v) && !isdead(g, v) && !isdead(g, o)); - lua_assert(g->gcstate != GCSpause); - lua_assert(gch(o)->tt != LUA_TTABLE); - if (keepinvariantout(g)) /* must keep invariant? */ - reallymarkobject(g, v); /* restore invariant */ - else { /* sweep phase */ - lua_assert(issweepphase(g)); - makewhite(g, o); /* mark main obj. as white to avoid other barriers */ - } -} - - -/* -** barrier that moves collector backward, that is, mark the black object -** pointing to a white object as gray again. (Current implementation -** only works for tables; access to 'gclist' is not uniform across -** different types.) -*/ -void luaC_barrierback_ (lua_State *L, GCObject *o) { - global_State *g = G(L); - lua_assert(isblack(o) && !isdead(g, o) && gch(o)->tt == LUA_TTABLE); - black2gray(o); /* make object gray (again) */ - gco2t(o)->gclist = g->grayagain; - g->grayagain = o; -} - - -/* -** barrier for prototypes. When creating first closure (cache is -** NULL), use a forward barrier; this may be the only closure of the -** prototype (if it is a "regular" function, with a single instance) -** and the prototype may be big, so it is better to avoid traversing -** it again. Otherwise, use a backward barrier, to avoid marking all -** possible instances. -*/ -LUAI_FUNC void luaC_barrierproto_ (lua_State *L, Proto *p, Closure *c) { - global_State *g = G(L); - lua_assert(isblack(obj2gco(p))); - if (p->cache == NULL) { /* first time? */ - luaC_objbarrier(L, p, c); - } - else { /* use a backward barrier */ - black2gray(obj2gco(p)); /* make prototype gray (again) */ - p->gclist = g->grayagain; - g->grayagain = obj2gco(p); - } -} - - -/* -** check color (and invariants) for an upvalue that was closed, -** i.e., moved into the 'allgc' list -*/ -void luaC_checkupvalcolor (global_State *g, UpVal *uv) { - GCObject *o = obj2gco(uv); - lua_assert(!isblack(o)); /* open upvalues are never black */ - if (isgray(o)) { - if (keepinvariant(g)) { - resetoldbit(o); /* see MOVE OLD rule */ - gray2black(o); /* it is being visited now */ - markvalue(g, uv->v); - } - else { - lua_assert(issweepphase(g)); - makewhite(g, o); - } - } -} - - -/* -** create a new collectable object (with given type and size) and link -** it to '*list'. 'offset' tells how many bytes to allocate before the -** object itself (used only by states). -*/ -GCObject *luaC_newobj (lua_State *L, int tt, size_t sz, GCObject **list, - int offset) { - global_State *g = G(L); - char *raw = cast(char *, luaM_newobject(L, novariant(tt), sz)); - GCObject *o = obj2gco(raw + offset); - if (list == NULL) - list = &g->allgc; /* standard list for collectable objects */ - gch(o)->marked = luaC_white(g); - gch(o)->tt = tt; - gch(o)->next = *list; - *list = o; - return o; -} - -/* }====================================================== */ - - - -/* -** {====================================================== -** Mark functions -** ======================================================= -*/ - - -/* -** mark an object. Userdata, strings, and closed upvalues are visited -** and turned black here. Other objects are marked gray and added -** to appropriate list to be visited (and turned black) later. (Open -** upvalues are already linked in 'headuv' list.) -*/ -static void reallymarkobject (global_State *g, GCObject *o) { - lu_mem size; - white2gray(o); - switch (gch(o)->tt) { - case LUA_TSHRSTR: - case LUA_TLNGSTR: { - size = sizestring(gco2ts(o)); - break; /* nothing else to mark; make it black */ - } - case LUA_TUSERDATA: { - Table *mt = gco2u(o)->metatable; - markobject(g, mt); - markobject(g, gco2u(o)->env); - size = sizeudata(gco2u(o)); - break; - } - case LUA_TUPVAL: { - UpVal *uv = gco2uv(o); - markvalue(g, uv->v); - if (uv->v != &uv->u.value) /* open? */ - return; /* open upvalues remain gray */ - size = sizeof(UpVal); - break; - } - case LUA_TLCL: { - gco2lcl(o)->gclist = g->gray; - g->gray = o; - return; - } - case LUA_TCCL: { - gco2ccl(o)->gclist = g->gray; - g->gray = o; - return; - } - case LUA_TTABLE: { - linktable(gco2t(o), &g->gray); - return; - } - case LUA_TTHREAD: { - gco2th(o)->gclist = g->gray; - g->gray = o; - return; - } - case LUA_TPROTO: { - gco2p(o)->gclist = g->gray; - g->gray = o; - return; - } - default: lua_assert(0); return; - } - gray2black(o); - g->GCmemtrav += size; -} - - -/* -** mark metamethods for basic types -*/ -static void markmt (global_State *g) { - int i; - for (i=0; i < LUA_NUMTAGS; i++) - markobject(g, g->mt[i]); -} - - -/* -** mark all objects in list of being-finalized -*/ -static void markbeingfnz (global_State *g) { - GCObject *o; - for (o = g->tobefnz; o != NULL; o = gch(o)->next) { - makewhite(g, o); - reallymarkobject(g, o); - } -} - - -/* -** mark all values stored in marked open upvalues. (See comment in -** 'lstate.h'.) -*/ -static void remarkupvals (global_State *g) { - UpVal *uv; - for (uv = g->uvhead.u.l.next; uv != &g->uvhead; uv = uv->u.l.next) { - if (isgray(obj2gco(uv))) - markvalue(g, uv->v); - } -} - - -/* -** mark root set and reset all gray lists, to start a new -** incremental (or full) collection -*/ -static void restartcollection (global_State *g) { - g->gray = g->grayagain = NULL; - g->weak = g->allweak = g->ephemeron = NULL; - markobject(g, g->mainthread); - markvalue(g, &g->l_registry); - markmt(g); - markbeingfnz(g); /* mark any finalizing object left from previous cycle */ -} - -/* }====================================================== */ - - -/* -** {====================================================== -** Traverse functions -** ======================================================= -*/ - -static void traverseweakvalue (global_State *g, Table *h) { - Node *n, *limit = gnodelast(h); - /* if there is array part, assume it may have white values (do not - traverse it just to check) */ - int hasclears = (h->sizearray > 0); - for (n = gnode(h, 0); n < limit; n++) { - checkdeadkey(n); - if (ttisnil(gval(n))) /* entry is empty? */ - removeentry(n); /* remove it */ - else { - lua_assert(!ttisnil(gkey(n))); - markvalue(g, gkey(n)); /* mark key */ - if (!hasclears && iscleared(g, gval(n))) /* is there a white value? */ - hasclears = 1; /* table will have to be cleared */ - } - } - if (hasclears) - linktable(h, &g->weak); /* has to be cleared later */ - else /* no white values */ - linktable(h, &g->grayagain); /* no need to clean */ -} - - -static int traverseephemeron (global_State *g, Table *h) { - int marked = 0; /* true if an object is marked in this traversal */ - int hasclears = 0; /* true if table has white keys */ - int prop = 0; /* true if table has entry "white-key -> white-value" */ - Node *n, *limit = gnodelast(h); - int i; - /* traverse array part (numeric keys are 'strong') */ - for (i = 0; i < h->sizearray; i++) { - if (valiswhite(&h->array[i])) { - marked = 1; - reallymarkobject(g, gcvalue(&h->array[i])); - } - } - /* traverse hash part */ - for (n = gnode(h, 0); n < limit; n++) { - checkdeadkey(n); - if (ttisnil(gval(n))) /* entry is empty? */ - removeentry(n); /* remove it */ - else if (iscleared(g, gkey(n))) { /* key is not marked (yet)? */ - hasclears = 1; /* table must be cleared */ - if (valiswhite(gval(n))) /* value not marked yet? */ - prop = 1; /* must propagate again */ - } - else if (valiswhite(gval(n))) { /* value not marked yet? */ - marked = 1; - reallymarkobject(g, gcvalue(gval(n))); /* mark it now */ - } - } - if (prop) - linktable(h, &g->ephemeron); /* have to propagate again */ - else if (hasclears) /* does table have white keys? */ - linktable(h, &g->allweak); /* may have to clean white keys */ - else /* no white keys */ - linktable(h, &g->grayagain); /* no need to clean */ - return marked; -} - - -static void traversestrongtable (global_State *g, Table *h) { - Node *n, *limit = gnodelast(h); - int i; - for (i = 0; i < h->sizearray; i++) /* traverse array part */ - markvalue(g, &h->array[i]); - for (n = gnode(h, 0); n < limit; n++) { /* traverse hash part */ - checkdeadkey(n); - if (ttisnil(gval(n))) /* entry is empty? */ - removeentry(n); /* remove it */ - else { - lua_assert(!ttisnil(gkey(n))); - markvalue(g, gkey(n)); /* mark key */ - markvalue(g, gval(n)); /* mark value */ - } - } -} - - -static lu_mem traversetable (global_State *g, Table *h) { - const char *weakkey, *weakvalue; - const TValue *mode = gfasttm(g, h->metatable, TM_MODE); - markobject(g, h->metatable); - if (mode && ttisstring(mode) && /* is there a weak mode? */ - ((weakkey = strchr(svalue(mode), 'k')), - (weakvalue = strchr(svalue(mode), 'v')), - (weakkey || weakvalue))) { /* is really weak? */ - black2gray(obj2gco(h)); /* keep table gray */ - if (!weakkey) /* strong keys? */ - traverseweakvalue(g, h); - else if (!weakvalue) /* strong values? */ - traverseephemeron(g, h); - else /* all weak */ - linktable(h, &g->allweak); /* nothing to traverse now */ - } - else /* not weak */ - traversestrongtable(g, h); - return sizeof(Table) + sizeof(TValue) * h->sizearray + - sizeof(Node) * cast(size_t, sizenode(h)); -} - - -static int traverseproto (global_State *g, Proto *f) { - int i; - if (f->cache && iswhite(obj2gco(f->cache))) - f->cache = NULL; /* allow cache to be collected */ - markobject(g, f->source); - for (i = 0; i < f->sizek; i++) /* mark literals */ - markvalue(g, &f->k[i]); - for (i = 0; i < f->sizeupvalues; i++) /* mark upvalue names */ - markobject(g, f->upvalues[i].name); - for (i = 0; i < f->sizep; i++) /* mark nested protos */ - markobject(g, f->p[i]); - for (i = 0; i < f->sizelocvars; i++) /* mark local-variable names */ - markobject(g, f->locvars[i].varname); - return sizeof(Proto) + sizeof(Instruction) * f->sizecode + - sizeof(Proto *) * f->sizep + - sizeof(TValue) * f->sizek + - sizeof(int) * f->sizelineinfo + - sizeof(LocVar) * f->sizelocvars + - sizeof(Upvaldesc) * f->sizeupvalues; -} - - -static lu_mem traverseCclosure (global_State *g, CClosure *cl) { - int i; - for (i = 0; i < cl->nupvalues; i++) /* mark its upvalues */ - markvalue(g, &cl->upvalue[i]); - return sizeCclosure(cl->nupvalues); -} - -static lu_mem traverseLclosure (global_State *g, LClosure *cl) { - int i; - markobject(g, cl->p); /* mark its prototype */ - for (i = 0; i < cl->nupvalues; i++) /* mark its upvalues */ - markobject(g, cl->upvals[i]); - return sizeLclosure(cl->nupvalues); -} - - -static lu_mem traversestack (global_State *g, lua_State *th) { - StkId o = th->stack; - if (o == NULL) - return 1; /* stack not completely built yet */ - for (; o < th->top; o++) - markvalue(g, o); - if (g->gcstate == GCSatomic) { /* final traversal? */ - StkId lim = th->stack + th->stacksize; /* real end of stack */ - for (; o < lim; o++) /* clear not-marked stack slice */ - setnilvalue(o); - } - return sizeof(lua_State) + sizeof(TValue) * th->stacksize; -} - - -/* -** traverse one gray object, turning it to black (except for threads, -** which are always gray). -*/ -static void propagatemark (global_State *g) { - lu_mem size; - GCObject *o = g->gray; - lua_assert(isgray(o)); - gray2black(o); - switch (gch(o)->tt) { - case LUA_TTABLE: { - Table *h = gco2t(o); - g->gray = h->gclist; /* remove from 'gray' list */ - size = traversetable(g, h); - break; - } - case LUA_TLCL: { - LClosure *cl = gco2lcl(o); - g->gray = cl->gclist; /* remove from 'gray' list */ - size = traverseLclosure(g, cl); - break; - } - case LUA_TCCL: { - CClosure *cl = gco2ccl(o); - g->gray = cl->gclist; /* remove from 'gray' list */ - size = traverseCclosure(g, cl); - break; - } - case LUA_TTHREAD: { - lua_State *th = gco2th(o); - g->gray = th->gclist; /* remove from 'gray' list */ - th->gclist = g->grayagain; - g->grayagain = o; /* insert into 'grayagain' list */ - black2gray(o); - size = traversestack(g, th); - break; - } - case LUA_TPROTO: { - Proto *p = gco2p(o); - g->gray = p->gclist; /* remove from 'gray' list */ - size = traverseproto(g, p); - break; - } - default: lua_assert(0); return; - } - g->GCmemtrav += size; -} - - -static void propagateall (global_State *g) { - while (g->gray) propagatemark(g); -} - - -static void propagatelist (global_State *g, GCObject *l) { - lua_assert(g->gray == NULL); /* no grays left */ - g->gray = l; - propagateall(g); /* traverse all elements from 'l' */ -} - -/* -** retraverse all gray lists. Because tables may be reinserted in other -** lists when traversed, traverse the original lists to avoid traversing -** twice the same table (which is not wrong, but inefficient) -*/ -static void retraversegrays (global_State *g) { - GCObject *weak = g->weak; /* save original lists */ - GCObject *grayagain = g->grayagain; - GCObject *ephemeron = g->ephemeron; - g->weak = g->grayagain = g->ephemeron = NULL; - propagateall(g); /* traverse main gray list */ - propagatelist(g, grayagain); - propagatelist(g, weak); - propagatelist(g, ephemeron); -} - - -static void convergeephemerons (global_State *g) { - int changed; - do { - GCObject *w; - GCObject *next = g->ephemeron; /* get ephemeron list */ - g->ephemeron = NULL; /* tables will return to this list when traversed */ - changed = 0; - while ((w = next) != NULL) { - next = gco2t(w)->gclist; - if (traverseephemeron(g, gco2t(w))) { /* traverse marked some value? */ - propagateall(g); /* propagate changes */ - changed = 1; /* will have to revisit all ephemeron tables */ - } - } - } while (changed); -} - -/* }====================================================== */ - - -/* -** {====================================================== -** Sweep Functions -** ======================================================= -*/ - - -/* -** clear entries with unmarked keys from all weaktables in list 'l' up -** to element 'f' -*/ -static void clearkeys (global_State *g, GCObject *l, GCObject *f) { - for (; l != f; l = gco2t(l)->gclist) { - Table *h = gco2t(l); - Node *n, *limit = gnodelast(h); - for (n = gnode(h, 0); n < limit; n++) { - if (!ttisnil(gval(n)) && (iscleared(g, gkey(n)))) { - setnilvalue(gval(n)); /* remove value ... */ - removeentry(n); /* and remove entry from table */ - } - } - } -} - - -/* -** clear entries with unmarked values from all weaktables in list 'l' up -** to element 'f' -*/ -static void clearvalues (global_State *g, GCObject *l, GCObject *f) { - for (; l != f; l = gco2t(l)->gclist) { - Table *h = gco2t(l); - Node *n, *limit = gnodelast(h); - int i; - for (i = 0; i < h->sizearray; i++) { - TValue *o = &h->array[i]; - if (iscleared(g, o)) /* value was collected? */ - setnilvalue(o); /* remove value */ - } - for (n = gnode(h, 0); n < limit; n++) { - if (!ttisnil(gval(n)) && iscleared(g, gval(n))) { - setnilvalue(gval(n)); /* remove value ... */ - removeentry(n); /* and remove entry from table */ - } - } - } -} - - -static void freeobj (lua_State *L, GCObject *o) { - switch (gch(o)->tt) { - case LUA_TPROTO: luaF_freeproto(L, gco2p(o)); break; - case LUA_TLCL: { - luaM_freemem(L, o, sizeLclosure(gco2lcl(o)->nupvalues)); - break; - } - case LUA_TCCL: { - luaM_freemem(L, o, sizeCclosure(gco2ccl(o)->nupvalues)); - break; - } - case LUA_TUPVAL: luaF_freeupval(L, gco2uv(o)); break; - case LUA_TTABLE: luaH_free(L, gco2t(o)); break; - case LUA_TTHREAD: luaE_freethread(L, gco2th(o)); break; - case LUA_TUSERDATA: luaM_freemem(L, o, sizeudata(gco2u(o))); break; - case LUA_TSHRSTR: - G(L)->strt.nuse--; - /* go through */ - case LUA_TLNGSTR: { - luaM_freemem(L, o, sizestring(gco2ts(o))); - break; - } - default: lua_assert(0); - } -} - - -#define sweepwholelist(L,p) sweeplist(L,p,MAX_LUMEM) -static GCObject **sweeplist (lua_State *L, GCObject **p, lu_mem count); - - -/* -** sweep the (open) upvalues of a thread and resize its stack and -** list of call-info structures. -*/ -static void sweepthread (lua_State *L, lua_State *L1) { - if (L1->stack == NULL) return; /* stack not completely built yet */ - sweepwholelist(L, &L1->openupval); /* sweep open upvalues */ - luaE_freeCI(L1); /* free extra CallInfo slots */ - /* should not change the stack during an emergency gc cycle */ - if (G(L)->gckind != KGC_EMERGENCY) - luaD_shrinkstack(L1); -} - - -/* -** sweep at most 'count' elements from a list of GCObjects erasing dead -** objects, where a dead (not alive) object is one marked with the "old" -** (non current) white and not fixed. -** In non-generational mode, change all non-dead objects back to white, -** preparing for next collection cycle. -** In generational mode, keep black objects black, and also mark them as -** old; stop when hitting an old object, as all objects after that -** one will be old too. -** When object is a thread, sweep its list of open upvalues too. -*/ -static GCObject **sweeplist (lua_State *L, GCObject **p, lu_mem count) { - global_State *g = G(L); - int ow = otherwhite(g); - int toclear, toset; /* bits to clear and to set in all live objects */ - int tostop; /* stop sweep when this is true */ - if (isgenerational(g)) { /* generational mode? */ - toclear = ~0; /* clear nothing */ - toset = bitmask(OLDBIT); /* set the old bit of all surviving objects */ - tostop = bitmask(OLDBIT); /* do not sweep old generation */ - } - else { /* normal mode */ - toclear = maskcolors; /* clear all color bits + old bit */ - toset = luaC_white(g); /* make object white */ - tostop = 0; /* do not stop */ - } - while (*p != NULL && count-- > 0) { - GCObject *curr = *p; - int marked = gch(curr)->marked; - if (isdeadm(ow, marked)) { /* is 'curr' dead? */ - *p = gch(curr)->next; /* remove 'curr' from list */ - freeobj(L, curr); /* erase 'curr' */ - } - else { - if (testbits(marked, tostop)) - return NULL; /* stop sweeping this list */ - if (gch(curr)->tt == LUA_TTHREAD) - sweepthread(L, gco2th(curr)); /* sweep thread's upvalues */ - /* update marks */ - gch(curr)->marked = cast_byte((marked & toclear) | toset); - p = &gch(curr)->next; /* go to next element */ - } - } - return (*p == NULL) ? NULL : p; -} - - -/* -** sweep a list until a live object (or end of list) -*/ -static GCObject **sweeptolive (lua_State *L, GCObject **p, int *n) { - GCObject ** old = p; - int i = 0; - do { - i++; - p = sweeplist(L, p, 1); - } while (p == old); - if (n) *n += i; - return p; -} - -/* }====================================================== */ - - -/* -** {====================================================== -** Finalization -** ======================================================= -*/ - -static void checkSizes (lua_State *L) { - global_State *g = G(L); - if (g->gckind != KGC_EMERGENCY) { /* do not change sizes in emergency */ - int hs = g->strt.size / 2; /* half the size of the string table */ - if (g->strt.nuse < cast(lu_int32, hs)) /* using less than that half? */ - luaS_resize(L, hs); /* halve its size */ - luaZ_freebuffer(L, &g->buff); /* free concatenation buffer */ - } -} - - -static GCObject *udata2finalize (global_State *g) { - GCObject *o = g->tobefnz; /* get first element */ - lua_assert(isfinalized(o)); - g->tobefnz = gch(o)->next; /* remove it from 'tobefnz' list */ - gch(o)->next = g->allgc; /* return it to 'allgc' list */ - g->allgc = o; - resetbit(gch(o)->marked, SEPARATED); /* mark that it is not in 'tobefnz' */ - lua_assert(!isold(o)); /* see MOVE OLD rule */ - if (!keepinvariantout(g)) /* not keeping invariant? */ - makewhite(g, o); /* "sweep" object */ - return o; -} - - -static void dothecall (lua_State *L, void *ud) { - UNUSED(ud); - luaD_call(L, L->top - 2, 0, 0); -} - - -static void GCTM (lua_State *L, int propagateerrors) { - global_State *g = G(L); - const TValue *tm; - TValue v; - setgcovalue(L, &v, udata2finalize(g)); - tm = luaT_gettmbyobj(L, &v, TM_GC); - if (tm != NULL && ttisfunction(tm)) { /* is there a finalizer? */ - int status; - lu_byte oldah = L->allowhook; - int running = g->gcrunning; - L->allowhook = 0; /* stop debug hooks during GC metamethod */ - g->gcrunning = 0; /* avoid GC steps */ - setobj2s(L, L->top, tm); /* push finalizer... */ - setobj2s(L, L->top + 1, &v); /* ... and its argument */ - L->top += 2; /* and (next line) call the finalizer */ - status = luaD_pcall(L, dothecall, NULL, savestack(L, L->top - 2), 0); - L->allowhook = oldah; /* restore hooks */ - g->gcrunning = running; /* restore state */ - if (status != LUA_OK && propagateerrors) { /* error while running __gc? */ - if (status == LUA_ERRRUN) { /* is there an error object? */ - const char *msg = (ttisstring(L->top - 1)) - ? svalue(L->top - 1) - : "no message"; - luaO_pushfstring(L, "error in __gc metamethod (%s)", msg); - status = LUA_ERRGCMM; /* error in __gc metamethod */ - } - luaD_throw(L, status); /* re-throw error */ - } - } -} - - -/* -** move all unreachable objects (or 'all' objects) that need -** finalization from list 'finobj' to list 'tobefnz' (to be finalized) -*/ -static void separatetobefnz (lua_State *L, int all) { - global_State *g = G(L); - GCObject **p = &g->finobj; - GCObject *curr; - GCObject **lastnext = &g->tobefnz; - /* find last 'next' field in 'tobefnz' list (to add elements in its end) */ - while (*lastnext != NULL) - lastnext = &gch(*lastnext)->next; - while ((curr = *p) != NULL) { /* traverse all finalizable objects */ - lua_assert(!isfinalized(curr)); - lua_assert(testbit(gch(curr)->marked, SEPARATED)); - if (!(iswhite(curr) || all)) /* not being collected? */ - p = &gch(curr)->next; /* don't bother with it */ - else { - l_setbit(gch(curr)->marked, FINALIZEDBIT); /* won't be finalized again */ - *p = gch(curr)->next; /* remove 'curr' from 'finobj' list */ - gch(curr)->next = *lastnext; /* link at the end of 'tobefnz' list */ - *lastnext = curr; - lastnext = &gch(curr)->next; - } - } -} - - -/* -** if object 'o' has a finalizer, remove it from 'allgc' list (must -** search the list to find it) and link it in 'finobj' list. -*/ -void luaC_checkfinalizer (lua_State *L, GCObject *o, Table *mt) { - global_State *g = G(L); - if (testbit(gch(o)->marked, SEPARATED) || /* obj. is already separated... */ - isfinalized(o) || /* ... or is finalized... */ - gfasttm(g, mt, TM_GC) == NULL) /* or has no finalizer? */ - return; /* nothing to be done */ - else { /* move 'o' to 'finobj' list */ - GCObject **p; - GCheader *ho = gch(o); - if (g->sweepgc == &ho->next) { /* avoid removing current sweep object */ - lua_assert(issweepphase(g)); - g->sweepgc = sweeptolive(L, g->sweepgc, NULL); - } - /* search for pointer pointing to 'o' */ - for (p = &g->allgc; *p != o; p = &gch(*p)->next) { /* empty */ } - *p = ho->next; /* remove 'o' from root list */ - ho->next = g->finobj; /* link it in list 'finobj' */ - g->finobj = o; - l_setbit(ho->marked, SEPARATED); /* mark it as such */ - if (!keepinvariantout(g)) /* not keeping invariant? */ - makewhite(g, o); /* "sweep" object */ - else - resetoldbit(o); /* see MOVE OLD rule */ - } -} - -/* }====================================================== */ - - -/* -** {====================================================== -** GC control -** ======================================================= -*/ - - -/* -** set a reasonable "time" to wait before starting a new GC cycle; -** cycle will start when memory use hits threshold -*/ -static void setpause (global_State *g, l_mem estimate) { - l_mem debt, threshold; - estimate = estimate / PAUSEADJ; /* adjust 'estimate' */ - threshold = (g->gcpause < MAX_LMEM / estimate) /* overflow? */ - ? estimate * g->gcpause /* no overflow */ - : MAX_LMEM; /* overflow; truncate to maximum */ - debt = -cast(l_mem, threshold - gettotalbytes(g)); - luaE_setdebt(g, debt); -} - - -#define sweepphases \ - (bitmask(GCSsweepstring) | bitmask(GCSsweepudata) | bitmask(GCSsweep)) - - -/* -** enter first sweep phase (strings) and prepare pointers for other -** sweep phases. The calls to 'sweeptolive' make pointers point to an -** object inside the list (instead of to the header), so that the real -** sweep do not need to skip objects created between "now" and the start -** of the real sweep. -** Returns how many objects it swept. -*/ -static int entersweep (lua_State *L) { - global_State *g = G(L); - int n = 0; - g->gcstate = GCSsweepstring; - lua_assert(g->sweepgc == NULL && g->sweepfin == NULL); - /* prepare to sweep strings, finalizable objects, and regular objects */ - g->sweepstrgc = 0; - g->sweepfin = sweeptolive(L, &g->finobj, &n); - g->sweepgc = sweeptolive(L, &g->allgc, &n); - return n; -} - - -/* -** change GC mode -*/ -void luaC_changemode (lua_State *L, int mode) { - global_State *g = G(L); - if (mode == g->gckind) return; /* nothing to change */ - if (mode == KGC_GEN) { /* change to generational mode */ - /* make sure gray lists are consistent */ - luaC_runtilstate(L, bitmask(GCSpropagate)); - g->GCestimate = gettotalbytes(g); - g->gckind = KGC_GEN; - } - else { /* change to incremental mode */ - /* sweep all objects to turn them back to white - (as white has not changed, nothing extra will be collected) */ - g->gckind = KGC_NORMAL; - entersweep(L); - luaC_runtilstate(L, ~sweepphases); - } -} - - -/* -** call all pending finalizers -*/ -static void callallpendingfinalizers (lua_State *L, int propagateerrors) { - global_State *g = G(L); - while (g->tobefnz) { - resetoldbit(g->tobefnz); - GCTM(L, propagateerrors); - } -} - - -void luaC_freeallobjects (lua_State *L) { - global_State *g = G(L); - int i; - separatetobefnz(L, 1); /* separate all objects with finalizers */ - lua_assert(g->finobj == NULL); - callallpendingfinalizers(L, 0); - g->currentwhite = WHITEBITS; /* this "white" makes all objects look dead */ - g->gckind = KGC_NORMAL; - sweepwholelist(L, &g->finobj); /* finalizers can create objs. in 'finobj' */ - sweepwholelist(L, &g->allgc); - for (i = 0; i < g->strt.size; i++) /* free all string lists */ - sweepwholelist(L, &g->strt.hash[i]); - lua_assert(g->strt.nuse == 0); -} - - -static l_mem atomic (lua_State *L) { - global_State *g = G(L); - l_mem work = -cast(l_mem, g->GCmemtrav); /* start counting work */ - GCObject *origweak, *origall; - lua_assert(!iswhite(obj2gco(g->mainthread))); - markobject(g, L); /* mark running thread */ - /* registry and global metatables may be changed by API */ - markvalue(g, &g->l_registry); - markmt(g); /* mark basic metatables */ - /* remark occasional upvalues of (maybe) dead threads */ - remarkupvals(g); - propagateall(g); /* propagate changes */ - work += g->GCmemtrav; /* stop counting (do not (re)count grays) */ - /* traverse objects caught by write barrier and by 'remarkupvals' */ - retraversegrays(g); - work -= g->GCmemtrav; /* restart counting */ - convergeephemerons(g); - /* at this point, all strongly accessible objects are marked. */ - /* clear values from weak tables, before checking finalizers */ - clearvalues(g, g->weak, NULL); - clearvalues(g, g->allweak, NULL); - origweak = g->weak; origall = g->allweak; - work += g->GCmemtrav; /* stop counting (objects being finalized) */ - separatetobefnz(L, 0); /* separate objects to be finalized */ - markbeingfnz(g); /* mark objects that will be finalized */ - propagateall(g); /* remark, to propagate `preserveness' */ - work -= g->GCmemtrav; /* restart counting */ - convergeephemerons(g); - /* at this point, all resurrected objects are marked. */ - /* remove dead objects from weak tables */ - clearkeys(g, g->ephemeron, NULL); /* clear keys from all ephemeron tables */ - clearkeys(g, g->allweak, NULL); /* clear keys from all allweak tables */ - /* clear values from resurrected weak tables */ - clearvalues(g, g->weak, origweak); - clearvalues(g, g->allweak, origall); - g->currentwhite = cast_byte(otherwhite(g)); /* flip current white */ - work += g->GCmemtrav; /* complete counting */ - return work; /* estimate of memory marked by 'atomic' */ -} - - -static lu_mem singlestep (lua_State *L) { - global_State *g = G(L); - switch (g->gcstate) { - case GCSpause: { - /* start to count memory traversed */ - g->GCmemtrav = g->strt.size * sizeof(GCObject*); - lua_assert(!isgenerational(g)); - restartcollection(g); - g->gcstate = GCSpropagate; - return g->GCmemtrav; - } - case GCSpropagate: { - if (g->gray) { - lu_mem oldtrav = g->GCmemtrav; - propagatemark(g); - return g->GCmemtrav - oldtrav; /* memory traversed in this step */ - } - else { /* no more `gray' objects */ - lu_mem work; - int sw; - g->gcstate = GCSatomic; /* finish mark phase */ - g->GCestimate = g->GCmemtrav; /* save what was counted */; - work = atomic(L); /* add what was traversed by 'atomic' */ - g->GCestimate += work; /* estimate of total memory traversed */ - sw = entersweep(L); - return work + sw * GCSWEEPCOST; - } - } - case GCSsweepstring: { - int i; - for (i = 0; i < GCSWEEPMAX && g->sweepstrgc + i < g->strt.size; i++) - sweepwholelist(L, &g->strt.hash[g->sweepstrgc + i]); - g->sweepstrgc += i; - if (g->sweepstrgc >= g->strt.size) /* no more strings to sweep? */ - g->gcstate = GCSsweepudata; - return i * GCSWEEPCOST; - } - case GCSsweepudata: { - if (g->sweepfin) { - g->sweepfin = sweeplist(L, g->sweepfin, GCSWEEPMAX); - return GCSWEEPMAX*GCSWEEPCOST; - } - else { - g->gcstate = GCSsweep; - return 0; - } - } - case GCSsweep: { - if (g->sweepgc) { - g->sweepgc = sweeplist(L, g->sweepgc, GCSWEEPMAX); - return GCSWEEPMAX*GCSWEEPCOST; - } - else { - /* sweep main thread */ - GCObject *mt = obj2gco(g->mainthread); - sweeplist(L, &mt, 1); - checkSizes(L); - g->gcstate = GCSpause; /* finish collection */ - return GCSWEEPCOST; - } - } - default: lua_assert(0); return 0; - } -} - - -/* -** advances the garbage collector until it reaches a state allowed -** by 'statemask' -*/ -void luaC_runtilstate (lua_State *L, int statesmask) { - global_State *g = G(L); - while (!testbit(statesmask, g->gcstate)) - singlestep(L); -} - - -static void generationalcollection (lua_State *L) { - global_State *g = G(L); - lua_assert(g->gcstate == GCSpropagate); - if (g->GCestimate == 0) { /* signal for another major collection? */ - luaC_fullgc(L, 0); /* perform a full regular collection */ - g->GCestimate = gettotalbytes(g); /* update control */ - } - else { - lu_mem estimate = g->GCestimate; - luaC_runtilstate(L, bitmask(GCSpause)); /* run complete (minor) cycle */ - g->gcstate = GCSpropagate; /* skip restart */ - if (gettotalbytes(g) > (estimate / 100) * g->gcmajorinc) - g->GCestimate = 0; /* signal for a major collection */ - else - g->GCestimate = estimate; /* keep estimate from last major coll. */ - - } - setpause(g, gettotalbytes(g)); - lua_assert(g->gcstate == GCSpropagate); -} - - -static void incstep (lua_State *L) { - global_State *g = G(L); - l_mem debt = g->GCdebt; - int stepmul = g->gcstepmul; - if (stepmul < 40) stepmul = 40; /* avoid ridiculous low values (and 0) */ - /* convert debt from Kb to 'work units' (avoid zero debt and overflows) */ - debt = (debt / STEPMULADJ) + 1; - debt = (debt < MAX_LMEM / stepmul) ? debt * stepmul : MAX_LMEM; - do { /* always perform at least one single step */ - lu_mem work = singlestep(L); /* do some work */ - debt -= work; - } while (debt > -GCSTEPSIZE && g->gcstate != GCSpause); - if (g->gcstate == GCSpause) - setpause(g, g->GCestimate); /* pause until next cycle */ - else { - debt = (debt / stepmul) * STEPMULADJ; /* convert 'work units' to Kb */ - luaE_setdebt(g, debt); - } -} - - -/* -** performs a basic GC step -*/ -void luaC_forcestep (lua_State *L) { - global_State *g = G(L); - int i; - if (isgenerational(g)) generationalcollection(L); - else incstep(L); - /* run a few finalizers (or all of them at the end of a collect cycle) */ - for (i = 0; g->tobefnz && (i < GCFINALIZENUM || g->gcstate == GCSpause); i++) - GCTM(L, 1); /* call one finalizer */ -} - - -/* -** performs a basic GC step only if collector is running -*/ -void luaC_step (lua_State *L) { - global_State *g = G(L); - if (g->gcrunning) luaC_forcestep(L); - else luaE_setdebt(g, -GCSTEPSIZE); /* avoid being called too often */ -} - - - -/* -** performs a full GC cycle; if "isemergency", does not call -** finalizers (which could change stack positions) -*/ -void luaC_fullgc (lua_State *L, int isemergency) { - global_State *g = G(L); - int origkind = g->gckind; - lua_assert(origkind != KGC_EMERGENCY); - if (isemergency) /* do not run finalizers during emergency GC */ - g->gckind = KGC_EMERGENCY; - else { - g->gckind = KGC_NORMAL; - callallpendingfinalizers(L, 1); - } - if (keepinvariant(g)) { /* may there be some black objects? */ - /* must sweep all objects to turn them back to white - (as white has not changed, nothing will be collected) */ - entersweep(L); - } - /* finish any pending sweep phase to start a new cycle */ - luaC_runtilstate(L, bitmask(GCSpause)); - luaC_runtilstate(L, ~bitmask(GCSpause)); /* start new collection */ - luaC_runtilstate(L, bitmask(GCSpause)); /* run entire collection */ - if (origkind == KGC_GEN) { /* generational mode? */ - /* generational mode must be kept in propagate phase */ - luaC_runtilstate(L, bitmask(GCSpropagate)); - } - g->gckind = origkind; - setpause(g, gettotalbytes(g)); - if (!isemergency) /* do not run finalizers during emergency GC */ - callallpendingfinalizers(L, 1); -} - -/* }====================================================== */ - - diff --git a/radio/src/lua/src/lgc.h b/radio/src/lua/src/lgc.h deleted file mode 100644 index dee270b4d..000000000 --- a/radio/src/lua/src/lgc.h +++ /dev/null @@ -1,157 +0,0 @@ -/* -** $Id: lgc.h,v 2.58 2012/09/11 12:53:08 roberto Exp $ -** Garbage Collector -** See Copyright Notice in lua.h -*/ - -#ifndef lgc_h -#define lgc_h - - -#include "lobject.h" -#include "lstate.h" - -/* -** Collectable objects may have one of three colors: white, which -** means the object is not marked; gray, which means the -** object is marked, but its references may be not marked; and -** black, which means that the object and all its references are marked. -** The main invariant of the garbage collector, while marking objects, -** is that a black object can never point to a white one. Moreover, -** any gray object must be in a "gray list" (gray, grayagain, weak, -** allweak, ephemeron) so that it can be visited again before finishing -** the collection cycle. These lists have no meaning when the invariant -** is not being enforced (e.g., sweep phase). -*/ - - - -/* how much to allocate before next GC step */ -#if !defined(GCSTEPSIZE) -/* ~100 small strings */ -#define GCSTEPSIZE (cast_int(100 * sizeof(TString))) -#endif - - -/* -** Possible states of the Garbage Collector -*/ -#define GCSpropagate 0 -#define GCSatomic 1 -#define GCSsweepstring 2 -#define GCSsweepudata 3 -#define GCSsweep 4 -#define GCSpause 5 - - -#define issweepphase(g) \ - (GCSsweepstring <= (g)->gcstate && (g)->gcstate <= GCSsweep) - -#define isgenerational(g) ((g)->gckind == KGC_GEN) - -/* -** macros to tell when main invariant (white objects cannot point to black -** ones) must be kept. During a non-generational collection, the sweep -** phase may break the invariant, as objects turned white may point to -** still-black objects. The invariant is restored when sweep ends and -** all objects are white again. During a generational collection, the -** invariant must be kept all times. -*/ - -#define keepinvariant(g) (isgenerational(g) || g->gcstate <= GCSatomic) - - -/* -** Outside the collector, the state in generational mode is kept in -** 'propagate', so 'keepinvariant' is always true. -*/ -#define keepinvariantout(g) \ - check_exp(g->gcstate == GCSpropagate || !isgenerational(g), \ - g->gcstate <= GCSatomic) - - -/* -** some useful bit tricks -*/ -#define resetbits(x,m) ((x) &= cast(lu_byte, ~(m))) -#define setbits(x,m) ((x) |= (m)) -#define testbits(x,m) ((x) & (m)) -#define bitmask(b) (1<<(b)) -#define bit2mask(b1,b2) (bitmask(b1) | bitmask(b2)) -#define l_setbit(x,b) setbits(x, bitmask(b)) -#define resetbit(x,b) resetbits(x, bitmask(b)) -#define testbit(x,b) testbits(x, bitmask(b)) - - -/* Layout for bit use in `marked' field: */ -#define WHITE0BIT 0 /* object is white (type 0) */ -#define WHITE1BIT 1 /* object is white (type 1) */ -#define BLACKBIT 2 /* object is black */ -#define FINALIZEDBIT 3 /* object has been separated for finalization */ -#define SEPARATED 4 /* object is in 'finobj' list or in 'tobefnz' */ -#define FIXEDBIT 5 /* object is fixed (should not be collected) */ -#define OLDBIT 6 /* object is old (only in generational mode) */ -/* bit 7 is currently used by tests (luaL_checkmemory) */ - -#define WHITEBITS bit2mask(WHITE0BIT, WHITE1BIT) - - -#define iswhite(x) testbits((x)->gch.marked, WHITEBITS) -#define isblack(x) testbit((x)->gch.marked, BLACKBIT) -#define isgray(x) /* neither white nor black */ \ - (!testbits((x)->gch.marked, WHITEBITS | bitmask(BLACKBIT))) - -#define isold(x) testbit((x)->gch.marked, OLDBIT) - -/* MOVE OLD rule: whenever an object is moved to the beginning of - a GC list, its old bit must be cleared */ -#define resetoldbit(o) resetbit((o)->gch.marked, OLDBIT) - -#define otherwhite(g) (g->currentwhite ^ WHITEBITS) -#define isdeadm(ow,m) (!(((m) ^ WHITEBITS) & (ow))) -#define isdead(g,v) isdeadm(otherwhite(g), (v)->gch.marked) - -#define changewhite(x) ((x)->gch.marked ^= WHITEBITS) -#define gray2black(x) l_setbit((x)->gch.marked, BLACKBIT) - -#define valiswhite(x) (iscollectable(x) && iswhite(gcvalue(x))) - -#define luaC_white(g) cast(lu_byte, (g)->currentwhite & WHITEBITS) - - -#define luaC_condGC(L,c) \ - {if (G(L)->GCdebt > 0) {c;}; condchangemem(L);} -#define luaC_checkGC(L) luaC_condGC(L, luaC_step(L);) - - -#define luaC_barrier(L,p,v) { if (valiswhite(v) && isblack(obj2gco(p))) \ - luaC_barrier_(L,obj2gco(p),gcvalue(v)); } - -#define luaC_barrierback(L,p,v) { if (valiswhite(v) && isblack(obj2gco(p))) \ - luaC_barrierback_(L,p); } - -#define luaC_objbarrier(L,p,o) \ - { if (iswhite(obj2gco(o)) && isblack(obj2gco(p))) \ - luaC_barrier_(L,obj2gco(p),obj2gco(o)); } - -#define luaC_objbarrierback(L,p,o) \ - { if (iswhite(obj2gco(o)) && isblack(obj2gco(p))) luaC_barrierback_(L,p); } - -#define luaC_barrierproto(L,p,c) \ - { if (isblack(obj2gco(p))) luaC_barrierproto_(L,p,c); } - -LUAI_FUNC void luaC_freeallobjects (lua_State *L); -LUAI_FUNC void luaC_step (lua_State *L); -LUAI_FUNC void luaC_forcestep (lua_State *L); -LUAI_FUNC void luaC_runtilstate (lua_State *L, int statesmask); -LUAI_FUNC void luaC_fullgc (lua_State *L, int isemergency); -LUAI_FUNC GCObject *luaC_newobj (lua_State *L, int tt, size_t sz, - GCObject **list, int offset); -LUAI_FUNC void luaC_barrier_ (lua_State *L, GCObject *o, GCObject *v); -LUAI_FUNC void luaC_barrierback_ (lua_State *L, GCObject *o); -LUAI_FUNC void luaC_barrierproto_ (lua_State *L, Proto *p, Closure *c); -LUAI_FUNC void luaC_checkfinalizer (lua_State *L, GCObject *o, Table *mt); -LUAI_FUNC void luaC_checkupvalcolor (global_State *g, UpVal *uv); -LUAI_FUNC void luaC_changemode (lua_State *L, int mode); - -#endif diff --git a/radio/src/lua/src/linit.c b/radio/src/lua/src/linit.c deleted file mode 100644 index 58e8c1dd9..000000000 --- a/radio/src/lua/src/linit.c +++ /dev/null @@ -1,66 +0,0 @@ -/* -** $Id: linit.c,v 1.32 2011/04/08 19:17:36 roberto Exp $ -** Initialization of libraries for lua.c and other clients -** See Copyright Notice in lua.h -*/ - - -/* -** If you embed Lua in your program and need to open the standard -** libraries, call luaL_openlibs in your program. If you need a -** different set of libraries, copy this file to your project and edit -** it to suit your needs. -*/ - - -#define linit_c - -#include "lua.h" - -#include "lualib.h" -#include "lauxlib.h" - - -/* -** these libs are loaded by lua.c and are readily available to any Lua -** program -*/ -static const luaL_Reg loadedlibs[] = { - {"_G", luaopen_base}, - // {LUA_LOADLIBNAME, luaopen_package}, - // {LUA_COLIBNAME, luaopen_coroutine}, - {LUA_TABLIBNAME, luaopen_table}, - // {LUA_IOLIBNAME, luaopen_io}, - // {LUA_OSLIBNAME, luaopen_os}, - // {LUA_STRLIBNAME, luaopen_string}, - // {LUA_BITLIBNAME, luaopen_bit32}, - {LUA_MATHLIBNAME, luaopen_math}, - // {LUA_DBLIBNAME, luaopen_debug}, - {NULL, NULL} -}; - - -/* -** these libs are preloaded and must be required before used -*/ -static const luaL_Reg preloadedlibs[] = { - {NULL, NULL} -}; - - -LUALIB_API void luaL_openlibs (lua_State *L) { - const luaL_Reg *lib; - /* call open functions from 'loadedlibs' and set results to global table */ - for (lib = loadedlibs; lib->func; lib++) { - luaL_requiref(L, lib->name, lib->func, 1); - lua_pop(L, 1); /* remove lib */ - } - /* add open functions from 'preloadedlibs' into 'package.preload' table */ - luaL_getsubtable(L, LUA_REGISTRYINDEX, "_PRELOAD"); - for (lib = preloadedlibs; lib->func; lib++) { - lua_pushcfunction(L, lib->func); - lua_setfield(L, -2, lib->name); - } - lua_pop(L, 1); /* remove _PRELOAD table */ -} - diff --git a/radio/src/lua/src/liolib.c b/radio/src/lua/src/liolib.c deleted file mode 100644 index 8d61394da..000000000 --- a/radio/src/lua/src/liolib.c +++ /dev/null @@ -1,663 +0,0 @@ -/* -** $Id: liolib.c,v 2.111 2013/03/21 13:57:27 roberto Exp $ -** Standard I/O (and system) library -** See Copyright Notice in lua.h -*/ - - -/* -** POSIX idiosyncrasy! -** This definition must come before the inclusion of 'stdio.h'; it -** should not affect non-POSIX systems -*/ -#if !defined(_FILE_OFFSET_BITS) -#define _FILE_OFFSET_BITS 64 -#endif - - -#include -#include -#include - -#define liolib_c - -#include "lua.h" - -#include "lauxlib.h" -#include "lualib.h" - - -#if !defined(lua_checkmode) - -/* -** Check whether 'mode' matches '[rwa]%+?b?'. -** Change this macro to accept other modes for 'fopen' besides -** the standard ones. -*/ -#define lua_checkmode(mode) \ - (*mode != '\0' && strchr("rwa", *(mode++)) != NULL && \ - (*mode != '+' || ++mode) && /* skip if char is '+' */ \ - (*mode != 'b' || ++mode) && /* skip if char is 'b' */ \ - (*mode == '\0')) - -#endif - -/* -** {====================================================== -** lua_popen spawns a new process connected to the current -** one through the file streams. -** ======================================================= -*/ - -#if !defined(lua_popen) /* { */ - -#if defined(LUA_USE_POPEN) /* { */ - -#define lua_popen(L,c,m) ((void)L, fflush(NULL), popen(c,m)) -#define lua_pclose(L,file) ((void)L, pclose(file)) - -#elif defined(LUA_WIN) /* }{ */ - -#define lua_popen(L,c,m) ((void)L, _popen(c,m)) -#define lua_pclose(L,file) ((void)L, _pclose(file)) - - -#else /* }{ */ - -#define lua_popen(L,c,m) ((void)((void)c, m), \ - luaL_error(L, LUA_QL("popen") " not supported"), (FILE*)0) -#define lua_pclose(L,file) ((void)((void)L, file), -1) - - -#endif /* } */ - -#endif /* } */ - -/* }====================================================== */ - - -/* -** {====================================================== -** lua_fseek/lua_ftell: configuration for longer offsets -** ======================================================= -*/ - -#if !defined(lua_fseek) /* { */ - -#if defined(LUA_USE_POSIX) - -#define l_fseek(f,o,w) fseeko(f,o,w) -#define l_ftell(f) ftello(f) -#define l_seeknum off_t - -#elif defined(LUA_WIN) && !defined(_CRTIMP_TYPEINFO) \ - && defined(_MSC_VER) && (_MSC_VER >= 1400) -/* Windows (but not DDK) and Visual C++ 2005 or higher */ - -#define l_fseek(f,o,w) _fseeki64(f,o,w) -#define l_ftell(f) _ftelli64(f) -#define l_seeknum __int64 - -#else - -#define l_fseek(f,o,w) fseek(f,o,w) -#define l_ftell(f) ftell(f) -#define l_seeknum long - -#endif - -#endif /* } */ - -/* }====================================================== */ - - -#define IO_PREFIX "_IO_" -#define IO_INPUT (IO_PREFIX "input") -#define IO_OUTPUT (IO_PREFIX "output") - - -typedef luaL_Stream LStream; - - -#define tolstream(L) ((LStream *)luaL_checkudata(L, 1, LUA_FILEHANDLE)) - -#define isclosed(p) ((p)->closef == NULL) - - -static int io_type (lua_State *L) { - LStream *p; - luaL_checkany(L, 1); - p = (LStream *)luaL_testudata(L, 1, LUA_FILEHANDLE); - if (p == NULL) - lua_pushnil(L); /* not a file */ - else if (isclosed(p)) - lua_pushliteral(L, "closed file"); - else - lua_pushliteral(L, "file"); - return 1; -} - - -static int f_tostring (lua_State *L) { - LStream *p = tolstream(L); - if (isclosed(p)) - lua_pushliteral(L, "file (closed)"); - else - lua_pushfstring(L, "file (%p)", p->f); - return 1; -} - - -static FILE *tofile (lua_State *L) { - LStream *p = tolstream(L); - if (isclosed(p)) - luaL_error(L, "attempt to use a closed file"); - lua_assert(p->f); - return p->f; -} - - -/* -** When creating file handles, always creates a `closed' file handle -** before opening the actual file; so, if there is a memory error, the -** file is not left opened. -*/ -static LStream *newprefile (lua_State *L) { - LStream *p = (LStream *)lua_newuserdata(L, sizeof(LStream)); - p->closef = NULL; /* mark file handle as 'closed' */ - luaL_setmetatable(L, LUA_FILEHANDLE); - return p; -} - - -static int aux_close (lua_State *L) { - LStream *p = tolstream(L); - lua_CFunction cf = p->closef; - p->closef = NULL; /* mark stream as closed */ - return (*cf)(L); /* close it */ -} - - -static int io_close (lua_State *L) { - if (lua_isnone(L, 1)) /* no argument? */ - lua_getfield(L, LUA_REGISTRYINDEX, IO_OUTPUT); /* use standard output */ - tofile(L); /* make sure argument is an open stream */ - return aux_close(L); -} - - -static int f_gc (lua_State *L) { - LStream *p = tolstream(L); - if (!isclosed(p) && p->f != NULL) - aux_close(L); /* ignore closed and incompletely open files */ - return 0; -} - - -/* -** function to close regular files -*/ -static int io_fclose (lua_State *L) { - LStream *p = tolstream(L); - int res = fclose(p->f); - return luaL_fileresult(L, (res == 0), NULL); -} - - -static LStream *newfile (lua_State *L) { - LStream *p = newprefile(L); - p->f = NULL; - p->closef = &io_fclose; - return p; -} - - -static void opencheck (lua_State *L, const char *fname, const char *mode) { - LStream *p = newfile(L); - p->f = fopen(fname, mode); - if (p->f == NULL) - luaL_error(L, "cannot open file " LUA_QS " (%s)", fname, strerror(errno)); -} - - -static int io_open (lua_State *L) { - const char *filename = luaL_checkstring(L, 1); - const char *mode = luaL_optstring(L, 2, "r"); - LStream *p = newfile(L); - const char *md = mode; /* to traverse/check mode */ - luaL_argcheck(L, lua_checkmode(md), 2, "invalid mode"); - p->f = fopen(filename, mode); - return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1; -} - - -/* -** function to close 'popen' files -*/ -static int io_pclose (lua_State *L) { - LStream *p = tolstream(L); - return luaL_execresult(L, lua_pclose(L, p->f)); -} - - -static int io_popen (lua_State *L) { - const char *filename = luaL_checkstring(L, 1); - const char *mode = luaL_optstring(L, 2, "r"); - LStream *p = newprefile(L); - p->f = lua_popen(L, filename, mode); - p->closef = &io_pclose; - return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1; -} - - -static int io_tmpfile (lua_State *L) { - LStream *p = newfile(L); - p->f = tmpfile(); - return (p->f == NULL) ? luaL_fileresult(L, 0, NULL) : 1; -} - - -static FILE *getiofile (lua_State *L, const char *findex) { - LStream *p; - lua_getfield(L, LUA_REGISTRYINDEX, findex); - p = (LStream *)lua_touserdata(L, -1); - if (isclosed(p)) - luaL_error(L, "standard %s file is closed", findex + strlen(IO_PREFIX)); - return p->f; -} - - -static int g_iofile (lua_State *L, const char *f, const char *mode) { - if (!lua_isnoneornil(L, 1)) { - const char *filename = lua_tostring(L, 1); - if (filename) - opencheck(L, filename, mode); - else { - tofile(L); /* check that it's a valid file handle */ - lua_pushvalue(L, 1); - } - lua_setfield(L, LUA_REGISTRYINDEX, f); - } - /* return current value */ - lua_getfield(L, LUA_REGISTRYINDEX, f); - return 1; -} - - -static int io_input (lua_State *L) { - return g_iofile(L, IO_INPUT, "r"); -} - - -static int io_output (lua_State *L) { - return g_iofile(L, IO_OUTPUT, "w"); -} - - -static int io_readline (lua_State *L); - - -static void aux_lines (lua_State *L, int toclose) { - int i; - int n = lua_gettop(L) - 1; /* number of arguments to read */ - /* ensure that arguments will fit here and into 'io_readline' stack */ - luaL_argcheck(L, n <= LUA_MINSTACK - 3, LUA_MINSTACK - 3, "too many options"); - lua_pushvalue(L, 1); /* file handle */ - lua_pushinteger(L, n); /* number of arguments to read */ - lua_pushboolean(L, toclose); /* close/not close file when finished */ - for (i = 1; i <= n; i++) lua_pushvalue(L, i + 1); /* copy arguments */ - lua_pushcclosure(L, io_readline, 3 + n); -} - - -static int f_lines (lua_State *L) { - tofile(L); /* check that it's a valid file handle */ - aux_lines(L, 0); - return 1; -} - - -static int io_lines (lua_State *L) { - int toclose; - if (lua_isnone(L, 1)) lua_pushnil(L); /* at least one argument */ - if (lua_isnil(L, 1)) { /* no file name? */ - lua_getfield(L, LUA_REGISTRYINDEX, IO_INPUT); /* get default input */ - lua_replace(L, 1); /* put it at index 1 */ - tofile(L); /* check that it's a valid file handle */ - toclose = 0; /* do not close it after iteration */ - } - else { /* open a new file */ - const char *filename = luaL_checkstring(L, 1); - opencheck(L, filename, "r"); - lua_replace(L, 1); /* put file at index 1 */ - toclose = 1; /* close it after iteration */ - } - aux_lines(L, toclose); - return 1; -} - - -/* -** {====================================================== -** READ -** ======================================================= -*/ - - -static int read_number (lua_State *L, FILE *f) { - lua_Number d; - if (fscanf(f, LUA_NUMBER_SCAN, &d) == 1) { - lua_pushnumber(L, d); - return 1; - } - else { - lua_pushnil(L); /* "result" to be removed */ - return 0; /* read fails */ - } -} - - -static int test_eof (lua_State *L, FILE *f) { - int c = lua_getc(f); - ungetc(c, f); - lua_pushlstring(L, NULL, 0); - return (c != EOF); -} - - -static int read_line (lua_State *L, FILE *f, int chop) { - luaL_Buffer b; - luaL_buffinit(L, &b); - for (;;) { - size_t l; - char *p = luaL_prepbuffer(&b); - if (fgets(p, LUAL_BUFFERSIZE, f) == NULL) { /* eof? */ - luaL_pushresult(&b); /* close buffer */ - return (lua_rawlen(L, -1) > 0); /* check whether read something */ - } - l = strlen(p); - if (l == 0 || p[l-1] != '\n') - luaL_addsize(&b, l); - else { - luaL_addsize(&b, l - chop); /* chop 'eol' if needed */ - luaL_pushresult(&b); /* close buffer */ - return 1; /* read at least an `eol' */ - } - } -} - - -#define MAX_SIZE_T (~(size_t)0) - -static void read_all (lua_State *L, FILE *f) { - size_t rlen = LUAL_BUFFERSIZE; /* how much to read in each cycle */ - luaL_Buffer b; - luaL_buffinit(L, &b); - for (;;) { - char *p = luaL_prepbuffsize(&b, rlen); - size_t nr = fread(p, sizeof(char), rlen, f); - luaL_addsize(&b, nr); - if (nr < rlen) break; /* eof? */ - else if (rlen <= (MAX_SIZE_T / 4)) /* avoid buffers too large */ - rlen *= 2; /* double buffer size at each iteration */ - } - luaL_pushresult(&b); /* close buffer */ -} - - -static int read_chars (lua_State *L, FILE *f, size_t n) { - size_t nr; /* number of chars actually read */ - char *p; - luaL_Buffer b; - luaL_buffinit(L, &b); - p = luaL_prepbuffsize(&b, n); /* prepare buffer to read whole block */ - nr = fread(p, sizeof(char), n, f); /* try to read 'n' chars */ - luaL_addsize(&b, nr); - luaL_pushresult(&b); /* close buffer */ - return (nr > 0); /* true iff read something */ -} - - -static int g_read (lua_State *L, FILE *f, int first) { - int nargs = lua_gettop(L) - 1; - int success; - int n; - clearerr(f); - if (nargs == 0) { /* no arguments? */ - success = read_line(L, f, 1); - n = first+1; /* to return 1 result */ - } - else { /* ensure stack space for all results and for auxlib's buffer */ - luaL_checkstack(L, nargs+LUA_MINSTACK, "too many arguments"); - success = 1; - for (n = first; nargs-- && success; n++) { - if (lua_type(L, n) == LUA_TNUMBER) { - size_t l = (size_t)lua_tointeger(L, n); - success = (l == 0) ? test_eof(L, f) : read_chars(L, f, l); - } - else { - const char *p = lua_tostring(L, n); - luaL_argcheck(L, p && p[0] == '*', n, "invalid option"); - switch (p[1]) { - case 'n': /* number */ - success = read_number(L, f); - break; - case 'l': /* line */ - success = read_line(L, f, 1); - break; - case 'L': /* line with end-of-line */ - success = read_line(L, f, 0); - break; - case 'a': /* file */ - read_all(L, f); /* read entire file */ - success = 1; /* always success */ - break; - default: - return luaL_argerror(L, n, "invalid format"); - } - } - } - } - if (ferror(f)) - return luaL_fileresult(L, 0, NULL); - if (!success) { - lua_pop(L, 1); /* remove last result */ - lua_pushnil(L); /* push nil instead */ - } - return n - first; -} - - -static int io_read (lua_State *L) { - return g_read(L, getiofile(L, IO_INPUT), 1); -} - - -static int f_read (lua_State *L) { - return g_read(L, tofile(L), 2); -} - - -static int io_readline (lua_State *L) { - LStream *p = (LStream *)lua_touserdata(L, lua_upvalueindex(1)); - int i; - int n = (int)lua_tointeger(L, lua_upvalueindex(2)); - if (isclosed(p)) /* file is already closed? */ - return luaL_error(L, "file is already closed"); - lua_settop(L , 1); - for (i = 1; i <= n; i++) /* push arguments to 'g_read' */ - lua_pushvalue(L, lua_upvalueindex(3 + i)); - n = g_read(L, p->f, 2); /* 'n' is number of results */ - lua_assert(n > 0); /* should return at least a nil */ - if (!lua_isnil(L, -n)) /* read at least one value? */ - return n; /* return them */ - else { /* first result is nil: EOF or error */ - if (n > 1) { /* is there error information? */ - /* 2nd result is error message */ - return luaL_error(L, "%s", lua_tostring(L, -n + 1)); - } - if (lua_toboolean(L, lua_upvalueindex(3))) { /* generator created file? */ - lua_settop(L, 0); - lua_pushvalue(L, lua_upvalueindex(1)); - aux_close(L); /* close it */ - } - return 0; - } -} - -/* }====================================================== */ - - -static int g_write (lua_State *L, FILE *f, int arg) { - int nargs = lua_gettop(L) - arg; - int status = 1; - for (; nargs--; arg++) { - if (lua_type(L, arg) == LUA_TNUMBER) { - /* optimization: could be done exactly as for strings */ - status = status && - fprintf(f, LUA_NUMBER_FMT, lua_tonumber(L, arg)) > 0; - } - else { - size_t l; - const char *s = luaL_checklstring(L, arg, &l); - status = status && (fwrite(s, sizeof(char), l, f) == l); - } - } - if (status) return 1; /* file handle already on stack top */ - else return luaL_fileresult(L, status, NULL); -} - - -static int io_write (lua_State *L) { - return g_write(L, getiofile(L, IO_OUTPUT), 1); -} - - -static int f_write (lua_State *L) { - FILE *f = tofile(L); - lua_pushvalue(L, 1); /* push file at the stack top (to be returned) */ - return g_write(L, f, 2); -} - - -static int f_seek (lua_State *L) { - static const int mode[] = {SEEK_SET, SEEK_CUR, SEEK_END}; - static const char *const modenames[] = {"set", "cur", "end", NULL}; - FILE *f = tofile(L); - int op = luaL_checkoption(L, 2, "cur", modenames); - lua_Number p3 = luaL_optnumber(L, 3, 0); - l_seeknum offset = (l_seeknum)p3; - luaL_argcheck(L, (lua_Number)offset == p3, 3, - "not an integer in proper range"); - op = l_fseek(f, offset, mode[op]); - if (op) - return luaL_fileresult(L, 0, NULL); /* error */ - else { - lua_pushnumber(L, (lua_Number)l_ftell(f)); - return 1; - } -} - - -static int f_setvbuf (lua_State *L) { - static const int mode[] = {_IONBF, _IOFBF, _IOLBF}; - static const char *const modenames[] = {"no", "full", "line", NULL}; - FILE *f = tofile(L); - int op = luaL_checkoption(L, 2, NULL, modenames); - lua_Integer sz = luaL_optinteger(L, 3, LUAL_BUFFERSIZE); - int res = setvbuf(f, NULL, mode[op], sz); - return luaL_fileresult(L, res == 0, NULL); -} - - - -static int io_flush (lua_State *L) { - return luaL_fileresult(L, fflush(getiofile(L, IO_OUTPUT)) == 0, NULL); -} - - -static int f_flush (lua_State *L) { - return luaL_fileresult(L, fflush(tofile(L)) == 0, NULL); -} - - -/* -** functions for 'io' library -*/ -static const luaL_Reg iolib[] = { - {"close", io_close}, - {"flush", io_flush}, - {"input", io_input}, - {"lines", io_lines}, - {"open", io_open}, - {"output", io_output}, - {"popen", io_popen}, - {"read", io_read}, - {"tmpfile", io_tmpfile}, - {"type", io_type}, - {"write", io_write}, - {NULL, NULL} -}; - - -/* -** methods for file handles -*/ -static const luaL_Reg flib[] = { - {"close", io_close}, - {"flush", f_flush}, - {"lines", f_lines}, - {"read", f_read}, - {"seek", f_seek}, - {"setvbuf", f_setvbuf}, - {"write", f_write}, - {"__gc", f_gc}, - {"__tostring", f_tostring}, - {NULL, NULL} -}; - - -static void createmeta (lua_State *L) { - luaL_newmetatable(L, LUA_FILEHANDLE); /* create metatable for file handles */ - lua_pushvalue(L, -1); /* push metatable */ - lua_setfield(L, -2, "__index"); /* metatable.__index = metatable */ - luaL_setfuncs(L, flib, 0); /* add file methods to new metatable */ - lua_pop(L, 1); /* pop new metatable */ -} - - -/* -** function to (not) close the standard files stdin, stdout, and stderr -*/ -static int io_noclose (lua_State *L) { - LStream *p = tolstream(L); - p->closef = &io_noclose; /* keep file opened */ - lua_pushnil(L); - lua_pushliteral(L, "cannot close standard file"); - return 2; -} - - -static void createstdfile (lua_State *L, FILE *f, const char *k, - const char *fname) { - LStream *p = newprefile(L); - p->f = f; - p->closef = &io_noclose; - if (k != NULL) { - lua_pushvalue(L, -1); - lua_setfield(L, LUA_REGISTRYINDEX, k); /* add file to registry */ - } - lua_setfield(L, -2, fname); /* add file to module */ -} - - -LUAMOD_API int luaopen_io (lua_State *L) { - luaL_newlib(L, iolib); /* new module */ - createmeta(L); - /* create (and set) default files */ - createstdfile(L, stdin, IO_INPUT, "stdin"); - createstdfile(L, stdout, IO_OUTPUT, "stdout"); - createstdfile(L, stderr, NULL, "stderr"); - return 1; -} - diff --git a/radio/src/lua/src/llex.c b/radio/src/lua/src/llex.c deleted file mode 100644 index 1a32e348b..000000000 --- a/radio/src/lua/src/llex.c +++ /dev/null @@ -1,527 +0,0 @@ -/* -** $Id: llex.c,v 2.63 2013/03/16 21:10:18 roberto Exp $ -** Lexical Analyzer -** See Copyright Notice in lua.h -*/ - - -#include -#include - -#define llex_c -#define LUA_CORE - -#include "lua.h" - -#include "lctype.h" -#include "ldo.h" -#include "llex.h" -#include "lobject.h" -#include "lparser.h" -#include "lstate.h" -#include "lstring.h" -#include "ltable.h" -#include "lzio.h" - - - -#define next(ls) (ls->current = zgetc(ls->z)) - - - -#define currIsNewline(ls) (ls->current == '\n' || ls->current == '\r') - - -/* ORDER RESERVED */ -static const char *const luaX_tokens [] = { - "and", "break", "do", "else", "elseif", - "end", "false", "for", "function", "goto", "if", - "in", "local", "nil", "not", "or", "repeat", - "return", "then", "true", "until", "while", - "..", "...", "==", ">=", "<=", "~=", "::", "", - "", "", "" -}; - - -#define save_and_next(ls) (save(ls, ls->current), next(ls)) - - -static l_noret lexerror (LexState *ls, const char *msg, int token); - - -static void save (LexState *ls, int c) { - Mbuffer *b = ls->buff; - if (luaZ_bufflen(b) + 1 > luaZ_sizebuffer(b)) { - size_t newsize; - if (luaZ_sizebuffer(b) >= MAX_SIZET/2) - lexerror(ls, "lexical element too long", 0); - newsize = luaZ_sizebuffer(b) * 2; - luaZ_resizebuffer(ls->L, b, newsize); - } - b->buffer[luaZ_bufflen(b)++] = cast(char, c); -} - - -void luaX_init (lua_State *L) { - int i; - for (i=0; itsv.extra = cast_byte(i+1); /* reserved word */ - } -} - - -const char *luaX_token2str (LexState *ls, int token) { - if (token < FIRST_RESERVED) { /* single-byte symbols? */ - lua_assert(token == cast(unsigned char, token)); - return (lisprint(token)) ? luaO_pushfstring(ls->L, LUA_QL("%c"), token) : - luaO_pushfstring(ls->L, "char(%d)", token); - } - else { - const char *s = luaX_tokens[token - FIRST_RESERVED]; - if (token < TK_EOS) /* fixed format (symbols and reserved words)? */ - return luaO_pushfstring(ls->L, LUA_QS, s); - else /* names, strings, and numerals */ - return s; - } -} - - -static const char *txtToken (LexState *ls, int token) { - switch (token) { - case TK_NAME: - case TK_STRING: - case TK_NUMBER: - save(ls, '\0'); - return luaO_pushfstring(ls->L, LUA_QS, luaZ_buffer(ls->buff)); - default: - return luaX_token2str(ls, token); - } -} - - -static l_noret lexerror (LexState *ls, const char *msg, int token) { - char buff[LUA_IDSIZE]; - luaO_chunkid(buff, getstr(ls->source), LUA_IDSIZE); - msg = luaO_pushfstring(ls->L, "%s:%d: %s", buff, ls->linenumber, msg); - if (token) - luaO_pushfstring(ls->L, "%s near %s", msg, txtToken(ls, token)); - luaD_throw(ls->L, LUA_ERRSYNTAX); -} - - -l_noret luaX_syntaxerror (LexState *ls, const char *msg) { - lexerror(ls, msg, ls->t.token); -} - - -/* -** creates a new string and anchors it in function's table so that -** it will not be collected until the end of the function's compilation -** (by that time it should be anchored in function's prototype) -*/ -TString *luaX_newstring (LexState *ls, const char *str, size_t l) { - lua_State *L = ls->L; - TValue *o; /* entry for `str' */ - TString *ts = luaS_newlstr(L, str, l); /* create new string */ - setsvalue2s(L, L->top++, ts); /* temporarily anchor it in stack */ - o = luaH_set(L, ls->fs->h, L->top - 1); - if (ttisnil(o)) { /* not in use yet? (see 'addK') */ - /* boolean value does not need GC barrier; - table has no metatable, so it does not need to invalidate cache */ - setbvalue(o, 1); /* t[string] = true */ - luaC_checkGC(L); - } - L->top--; /* remove string from stack */ - return ts; -} - - -/* -** increment line number and skips newline sequence (any of -** \n, \r, \n\r, or \r\n) -*/ -static void inclinenumber (LexState *ls) { - int old = ls->current; - lua_assert(currIsNewline(ls)); - next(ls); /* skip `\n' or `\r' */ - if (currIsNewline(ls) && ls->current != old) - next(ls); /* skip `\n\r' or `\r\n' */ - if (++ls->linenumber >= MAX_INT) - luaX_syntaxerror(ls, "chunk has too many lines"); -} - - -void luaX_setinput (lua_State *L, LexState *ls, ZIO *z, TString *source, - int firstchar) { - ls->decpoint = '.'; - ls->L = L; - ls->current = firstchar; - ls->lookahead.token = TK_EOS; /* no look-ahead token */ - ls->z = z; - ls->fs = NULL; - ls->linenumber = 1; - ls->lastline = 1; - ls->source = source; - ls->envn = luaS_new(L, LUA_ENV); /* create env name */ - luaS_fix(ls->envn); /* never collect this name */ - luaZ_resizebuffer(ls->L, ls->buff, LUA_MINBUFFER); /* initialize buffer */ -} - - - -/* -** ======================================================= -** LEXICAL ANALYZER -** ======================================================= -*/ - - - -static int check_next (LexState *ls, const char *set) { - if (ls->current == '\0' || !strchr(set, ls->current)) - return 0; - save_and_next(ls); - return 1; -} - - -/* -** change all characters 'from' in buffer to 'to' -*/ -static void buffreplace (LexState *ls, char from, char to) { - size_t n = luaZ_bufflen(ls->buff); - char *p = luaZ_buffer(ls->buff); - while (n--) - if (p[n] == from) p[n] = to; -} - - -#if !defined(getlocaledecpoint) -#define getlocaledecpoint() (localeconv()->decimal_point[0]) -#endif - - -#define buff2d(b,e) luaO_str2d(luaZ_buffer(b), luaZ_bufflen(b) - 1, e) - -/* -** in case of format error, try to change decimal point separator to -** the one defined in the current locale and check again -*/ -static void trydecpoint (LexState *ls, SemInfo *seminfo) { - char old = ls->decpoint; - ls->decpoint = getlocaledecpoint(); - buffreplace(ls, old, ls->decpoint); /* try new decimal separator */ - if (!buff2d(ls->buff, &seminfo->r)) { - /* format error with correct decimal point: no more options */ - buffreplace(ls, ls->decpoint, '.'); /* undo change (for error message) */ - lexerror(ls, "malformed number", TK_NUMBER); - } -} - - -/* LUA_NUMBER */ -/* -** this function is quite liberal in what it accepts, as 'luaO_str2d' -** will reject ill-formed numerals. -*/ -static void read_numeral (LexState *ls, SemInfo *seminfo) { - const char *expo = "Ee"; - int first = ls->current; - lua_assert(lisdigit(ls->current)); - save_and_next(ls); - if (first == '0' && check_next(ls, "Xx")) /* hexadecimal? */ - expo = "Pp"; - for (;;) { - if (check_next(ls, expo)) /* exponent part? */ - check_next(ls, "+-"); /* optional exponent sign */ - if (lisxdigit(ls->current) || ls->current == '.') - save_and_next(ls); - else break; - } - save(ls, '\0'); - buffreplace(ls, '.', ls->decpoint); /* follow locale for decimal point */ - if (!buff2d(ls->buff, &seminfo->r)) /* format error? */ - trydecpoint(ls, seminfo); /* try to update decimal point separator */ -} - - -/* -** skip a sequence '[=*[' or ']=*]' and return its number of '='s or -** -1 if sequence is malformed -*/ -static int skip_sep (LexState *ls) { - int count = 0; - int s = ls->current; - lua_assert(s == '[' || s == ']'); - save_and_next(ls); - while (ls->current == '=') { - save_and_next(ls); - count++; - } - return (ls->current == s) ? count : (-count) - 1; -} - - -static void read_long_string (LexState *ls, SemInfo *seminfo, int sep) { - save_and_next(ls); /* skip 2nd `[' */ - if (currIsNewline(ls)) /* string starts with a newline? */ - inclinenumber(ls); /* skip it */ - for (;;) { - switch (ls->current) { - case EOZ: - lexerror(ls, (seminfo) ? "unfinished long string" : - "unfinished long comment", TK_EOS); - break; /* to avoid warnings */ - case ']': { - if (skip_sep(ls) == sep) { - save_and_next(ls); /* skip 2nd `]' */ - goto endloop; - } - break; - } - case '\n': case '\r': { - save(ls, '\n'); - inclinenumber(ls); - if (!seminfo) luaZ_resetbuffer(ls->buff); /* avoid wasting space */ - break; - } - default: { - if (seminfo) save_and_next(ls); - else next(ls); - } - } - } endloop: - if (seminfo) - seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + (2 + sep), - luaZ_bufflen(ls->buff) - 2*(2 + sep)); -} - - -static void escerror (LexState *ls, int *c, int n, const char *msg) { - int i; - luaZ_resetbuffer(ls->buff); /* prepare error message */ - save(ls, '\\'); - for (i = 0; i < n && c[i] != EOZ; i++) - save(ls, c[i]); - lexerror(ls, msg, TK_STRING); -} - - -static int readhexaesc (LexState *ls) { - int c[3], i; /* keep input for error message */ - int r = 0; /* result accumulator */ - c[0] = 'x'; /* for error message */ - for (i = 1; i < 3; i++) { /* read two hexadecimal digits */ - c[i] = next(ls); - if (!lisxdigit(c[i])) - escerror(ls, c, i + 1, "hexadecimal digit expected"); - r = (r << 4) + luaO_hexavalue(c[i]); - } - return r; -} - - -static int readdecesc (LexState *ls) { - int c[3], i; - int r = 0; /* result accumulator */ - for (i = 0; i < 3 && lisdigit(ls->current); i++) { /* read up to 3 digits */ - c[i] = ls->current; - r = 10*r + c[i] - '0'; - next(ls); - } - if (r > UCHAR_MAX) - escerror(ls, c, i, "decimal escape too large"); - return r; -} - - -static void read_string (LexState *ls, int del, SemInfo *seminfo) { - save_and_next(ls); /* keep delimiter (for error messages) */ - while (ls->current != del) { - switch (ls->current) { - case EOZ: - lexerror(ls, "unfinished string", TK_EOS); - break; /* to avoid warnings */ - case '\n': - case '\r': - lexerror(ls, "unfinished string", TK_STRING); - break; /* to avoid warnings */ - case '\\': { /* escape sequences */ - int c; /* final character to be saved */ - next(ls); /* do not save the `\' */ - switch (ls->current) { - case 'a': c = '\a'; goto read_save; - case 'b': c = '\b'; goto read_save; - case 'f': c = '\f'; goto read_save; - case 'n': c = '\n'; goto read_save; - case 'r': c = '\r'; goto read_save; - case 't': c = '\t'; goto read_save; - case 'v': c = '\v'; goto read_save; - case 'x': c = readhexaesc(ls); goto read_save; - case '\n': case '\r': - inclinenumber(ls); c = '\n'; goto only_save; - case '\\': case '\"': case '\'': - c = ls->current; goto read_save; - case EOZ: goto no_save; /* will raise an error next loop */ - case 'z': { /* zap following span of spaces */ - next(ls); /* skip the 'z' */ - while (lisspace(ls->current)) { - if (currIsNewline(ls)) inclinenumber(ls); - else next(ls); - } - goto no_save; - } - default: { - if (!lisdigit(ls->current)) - escerror(ls, &ls->current, 1, "invalid escape sequence"); - /* digital escape \ddd */ - c = readdecesc(ls); - goto only_save; - } - } - read_save: next(ls); /* read next character */ - only_save: save(ls, c); /* save 'c' */ - no_save: break; - } - default: - save_and_next(ls); - } - } - save_and_next(ls); /* skip delimiter */ - seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + 1, - luaZ_bufflen(ls->buff) - 2); -} - - -static int llex (LexState *ls, SemInfo *seminfo) { - luaZ_resetbuffer(ls->buff); - for (;;) { - switch (ls->current) { - case '\n': case '\r': { /* line breaks */ - inclinenumber(ls); - break; - } - case ' ': case '\f': case '\t': case '\v': { /* spaces */ - next(ls); - break; - } - case '-': { /* '-' or '--' (comment) */ - next(ls); - if (ls->current != '-') return '-'; - /* else is a comment */ - next(ls); - if (ls->current == '[') { /* long comment? */ - int sep = skip_sep(ls); - luaZ_resetbuffer(ls->buff); /* `skip_sep' may dirty the buffer */ - if (sep >= 0) { - read_long_string(ls, NULL, sep); /* skip long comment */ - luaZ_resetbuffer(ls->buff); /* previous call may dirty the buff. */ - break; - } - } - /* else short comment */ - while (!currIsNewline(ls) && ls->current != EOZ) - next(ls); /* skip until end of line (or end of file) */ - break; - } - case '[': { /* long string or simply '[' */ - int sep = skip_sep(ls); - if (sep >= 0) { - read_long_string(ls, seminfo, sep); - return TK_STRING; - } - else if (sep == -1) return '['; - else lexerror(ls, "invalid long string delimiter", TK_STRING); - } - case '=': { - next(ls); - if (ls->current != '=') return '='; - else { next(ls); return TK_EQ; } - } - case '<': { - next(ls); - if (ls->current != '=') return '<'; - else { next(ls); return TK_LE; } - } - case '>': { - next(ls); - if (ls->current != '=') return '>'; - else { next(ls); return TK_GE; } - } - case '~': { - next(ls); - if (ls->current != '=') return '~'; - else { next(ls); return TK_NE; } - } - case ':': { - next(ls); - if (ls->current != ':') return ':'; - else { next(ls); return TK_DBCOLON; } - } - case '"': case '\'': { /* short literal strings */ - read_string(ls, ls->current, seminfo); - return TK_STRING; - } - case '.': { /* '.', '..', '...', or number */ - save_and_next(ls); - if (check_next(ls, ".")) { - if (check_next(ls, ".")) - return TK_DOTS; /* '...' */ - else return TK_CONCAT; /* '..' */ - } - else if (!lisdigit(ls->current)) return '.'; - /* else go through */ - } - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': { - read_numeral(ls, seminfo); - return TK_NUMBER; - } - case EOZ: { - return TK_EOS; - } - default: { - if (lislalpha(ls->current)) { /* identifier or reserved word? */ - TString *ts; - do { - save_and_next(ls); - } while (lislalnum(ls->current)); - ts = luaX_newstring(ls, luaZ_buffer(ls->buff), - luaZ_bufflen(ls->buff)); - seminfo->ts = ts; - if (isreserved(ts)) /* reserved word? */ - return ts->tsv.extra - 1 + FIRST_RESERVED; - else { - return TK_NAME; - } - } - else { /* single-char tokens (+ - / ...) */ - int c = ls->current; - next(ls); - return c; - } - } - } - } -} - - -void luaX_next (LexState *ls) { - ls->lastline = ls->linenumber; - if (ls->lookahead.token != TK_EOS) { /* is there a look-ahead token? */ - ls->t = ls->lookahead; /* use this one */ - ls->lookahead.token = TK_EOS; /* and discharge it */ - } - else - ls->t.token = llex(ls, &ls->t.seminfo); /* read next token */ -} - - -int luaX_lookahead (LexState *ls) { - lua_assert(ls->lookahead.token == TK_EOS); - ls->lookahead.token = llex(ls, &ls->lookahead.seminfo); - return ls->lookahead.token; -} - diff --git a/radio/src/lua/src/llex.h b/radio/src/lua/src/llex.h deleted file mode 100644 index 9ca8a2994..000000000 --- a/radio/src/lua/src/llex.h +++ /dev/null @@ -1,78 +0,0 @@ -/* -** $Id: llex.h,v 1.72 2011/11/30 12:43:51 roberto Exp $ -** Lexical Analyzer -** See Copyright Notice in lua.h -*/ - -#ifndef llex_h -#define llex_h - -#include "lobject.h" -#include "lzio.h" - - -#define FIRST_RESERVED 257 - - - -/* -* WARNING: if you change the order of this enumeration, -* grep "ORDER RESERVED" -*/ -enum RESERVED { - /* terminal symbols denoted by reserved words */ - TK_AND = FIRST_RESERVED, TK_BREAK, - TK_DO, TK_ELSE, TK_ELSEIF, TK_END, TK_FALSE, TK_FOR, TK_FUNCTION, - TK_GOTO, TK_IF, TK_IN, TK_LOCAL, TK_NIL, TK_NOT, TK_OR, TK_REPEAT, - TK_RETURN, TK_THEN, TK_TRUE, TK_UNTIL, TK_WHILE, - /* other terminal symbols */ - TK_CONCAT, TK_DOTS, TK_EQ, TK_GE, TK_LE, TK_NE, TK_DBCOLON, TK_EOS, - TK_NUMBER, TK_NAME, TK_STRING -}; - -/* number of reserved words */ -#define NUM_RESERVED (cast(int, TK_WHILE-FIRST_RESERVED+1)) - - -typedef union { - lua_Number r; - TString *ts; -} SemInfo; /* semantics information */ - - -typedef struct Token { - int token; - SemInfo seminfo; -} Token; - - -/* state of the lexer plus state of the parser when shared by all - functions */ -typedef struct LexState { - int current; /* current character (charint) */ - int linenumber; /* input line counter */ - int lastline; /* line of last token `consumed' */ - Token t; /* current token */ - Token lookahead; /* look ahead token */ - struct FuncState *fs; /* current function (parser) */ - struct lua_State *L; - ZIO *z; /* input stream */ - Mbuffer *buff; /* buffer for tokens */ - struct Dyndata *dyd; /* dynamic structures used by the parser */ - TString *source; /* current source name */ - TString *envn; /* environment variable name */ - char decpoint; /* locale decimal point */ -} LexState; - - -LUAI_FUNC void luaX_init (lua_State *L); -LUAI_FUNC void luaX_setinput (lua_State *L, LexState *ls, ZIO *z, - TString *source, int firstchar); -LUAI_FUNC TString *luaX_newstring (LexState *ls, const char *str, size_t l); -LUAI_FUNC void luaX_next (LexState *ls); -LUAI_FUNC int luaX_lookahead (LexState *ls); -LUAI_FUNC l_noret luaX_syntaxerror (LexState *ls, const char *s); -LUAI_FUNC const char *luaX_token2str (LexState *ls, int token); - - -#endif diff --git a/radio/src/lua/src/llimits.h b/radio/src/lua/src/llimits.h deleted file mode 100644 index b278d4880..000000000 --- a/radio/src/lua/src/llimits.h +++ /dev/null @@ -1,309 +0,0 @@ -/* -** $Id: llimits.h,v 1.103 2013/02/20 14:08:56 roberto Exp $ -** Limits, basic types, and some other `installation-dependent' definitions -** See Copyright Notice in lua.h -*/ - -#ifndef llimits_h -#define llimits_h - - -#include -#include - - -#include "lua.h" - - -typedef unsigned LUA_INT32 lu_int32; - -typedef LUAI_UMEM lu_mem; - -typedef LUAI_MEM l_mem; - - - -/* chars used as small naturals (so that `char' is reserved for characters) */ -typedef unsigned char lu_byte; - - -#define MAX_SIZET ((size_t)(~(size_t)0)-2) - -#define MAX_LUMEM ((lu_mem)(~(lu_mem)0)-2) - -#define MAX_LMEM ((l_mem) ((MAX_LUMEM >> 1) - 2)) - - -#define MAX_INT (INT_MAX-2) /* maximum value of an int (-2 for safety) */ - -/* -** conversion of pointer to integer -** this is for hashing only; there is no problem if the integer -** cannot hold the whole pointer value -*/ -#define IntPoint(p) ((unsigned int)(lu_mem)(p)) - - - -/* type to ensure maximum alignment */ -#if !defined(LUAI_USER_ALIGNMENT_T) -#define LUAI_USER_ALIGNMENT_T union { double u; void *s; long l; } -#endif - -typedef LUAI_USER_ALIGNMENT_T L_Umaxalign; - - -/* result of a `usual argument conversion' over lua_Number */ -typedef LUAI_UACNUMBER l_uacNumber; - - -/* internal assertions for in-house debugging */ -#if defined(lua_assert) -#define check_exp(c,e) (lua_assert(c), (e)) -/* to avoid problems with conditions too long */ -#define lua_longassert(c) { if (!(c)) lua_assert(0); } -#else -#define lua_assert(c) ((void)0) -#define check_exp(c,e) (e) -#define lua_longassert(c) ((void)0) -#endif - -/* -** assertion for checking API calls -*/ -#if !defined(luai_apicheck) - -#if defined(LUA_USE_APICHECK) -#include -#define luai_apicheck(L,e) assert(e) -#else -#define luai_apicheck(L,e) lua_assert(e) -#endif - -#endif - -#define api_check(l,e,msg) luai_apicheck(l,(e) && msg) - - -#if !defined(UNUSED) -#define UNUSED(x) ((void)(x)) /* to avoid warnings */ -#endif - - -#define cast(t, exp) ((t)(exp)) - -#define cast_byte(i) cast(lu_byte, (i)) -#define cast_num(i) cast(lua_Number, (i)) -#define cast_int(i) cast(int, (i)) -#define cast_uchar(i) cast(unsigned char, (i)) - - -/* -** non-return type -*/ -#if defined(__GNUC__) -#define l_noret void __attribute__((noreturn)) -#elif defined(_MSC_VER) -#define l_noret void __declspec(noreturn) -#else -#define l_noret void -#endif - - - -/* -** maximum depth for nested C calls and syntactical nested non-terminals -** in a program. (Value must fit in an unsigned short int.) -*/ -#if !defined(LUAI_MAXCCALLS) -#define LUAI_MAXCCALLS 200 -#endif - -/* -** maximum number of upvalues in a closure (both C and Lua). (Value -** must fit in an unsigned char.) -*/ -#define MAXUPVAL UCHAR_MAX - - -/* -** type for virtual-machine instructions -** must be an unsigned with (at least) 4 bytes (see details in lopcodes.h) -*/ -typedef lu_int32 Instruction; - - - -/* maximum stack for a Lua function */ -#define MAXSTACK 250 - - - -/* minimum size for the string table (must be power of 2) */ -#if !defined(MINSTRTABSIZE) -#define MINSTRTABSIZE 32 -#endif - - -/* minimum size for string buffer */ -#if !defined(LUA_MINBUFFER) -#define LUA_MINBUFFER 32 -#endif - - -#if !defined(lua_lock) -#define lua_lock(L) ((void) 0) -#define lua_unlock(L) ((void) 0) -#endif - -#if !defined(luai_threadyield) -#define luai_threadyield(L) {lua_unlock(L); lua_lock(L);} -#endif - - -/* -** these macros allow user-specific actions on threads when you defined -** LUAI_EXTRASPACE and need to do something extra when a thread is -** created/deleted/resumed/yielded. -*/ -#if !defined(luai_userstateopen) -#define luai_userstateopen(L) ((void)L) -#endif - -#if !defined(luai_userstateclose) -#define luai_userstateclose(L) ((void)L) -#endif - -#if !defined(luai_userstatethread) -#define luai_userstatethread(L,L1) ((void)L) -#endif - -#if !defined(luai_userstatefree) -#define luai_userstatefree(L,L1) ((void)L) -#endif - -#if !defined(luai_userstateresume) -#define luai_userstateresume(L,n) ((void)L) -#endif - -#if !defined(luai_userstateyield) -#define luai_userstateyield(L,n) ((void)L) -#endif - -/* -** lua_number2int is a macro to convert lua_Number to int. -** lua_number2integer is a macro to convert lua_Number to lua_Integer. -** lua_number2unsigned is a macro to convert a lua_Number to a lua_Unsigned. -** lua_unsigned2number is a macro to convert a lua_Unsigned to a lua_Number. -** luai_hashnum is a macro to hash a lua_Number value into an integer. -** The hash must be deterministic and give reasonable values for -** both small and large values (outside the range of integers). -*/ - -#if defined(MS_ASMTRICK) || defined(LUA_MSASMTRICK) /* { */ -/* trick with Microsoft assembler for X86 */ - -#define lua_number2int(i,n) __asm {__asm fld n __asm fistp i} -#define lua_number2integer(i,n) lua_number2int(i, n) -#define lua_number2unsigned(i,n) \ - {__int64 l; __asm {__asm fld n __asm fistp l} i = (unsigned int)l;} - - -#elif defined(LUA_IEEE754TRICK) /* }{ */ -/* the next trick should work on any machine using IEEE754 with - a 32-bit int type */ - -union luai_Cast { double l_d; LUA_INT32 l_p[2]; }; - -#if !defined(LUA_IEEEENDIAN) /* { */ -#define LUAI_EXTRAIEEE \ - static const union luai_Cast ieeeendian = {-(33.0 + 6755399441055744.0)}; -#define LUA_IEEEENDIANLOC (ieeeendian.l_p[1] == 33) -#else -#define LUA_IEEEENDIANLOC LUA_IEEEENDIAN -#define LUAI_EXTRAIEEE /* empty */ -#endif /* } */ - -#define lua_number2int32(i,n,t) \ - { LUAI_EXTRAIEEE \ - volatile union luai_Cast u; u.l_d = (n) + 6755399441055744.0; \ - (i) = (t)u.l_p[LUA_IEEEENDIANLOC]; } - -#define luai_hashnum(i,n) \ - { volatile union luai_Cast u; u.l_d = (n) + 1.0; /* avoid -0 */ \ - (i) = u.l_p[0]; (i) += u.l_p[1]; } /* add double bits for his hash */ - -#define lua_number2int(i,n) lua_number2int32(i, n, int) -#define lua_number2unsigned(i,n) lua_number2int32(i, n, lua_Unsigned) - -/* the trick can be expanded to lua_Integer when it is a 32-bit value */ -#if defined(LUA_IEEELL) -#define lua_number2integer(i,n) lua_number2int32(i, n, lua_Integer) -#endif - -#endif /* } */ - - -/* the following definitions always work, but may be slow */ - -#if !defined(lua_number2int) -#define lua_number2int(i,n) ((i)=(int)(n)) -#endif - -#if !defined(lua_number2integer) -#define lua_number2integer(i,n) ((i)=(lua_Integer)(n)) -#endif - -#if !defined(lua_number2unsigned) /* { */ -/* the following definition assures proper modulo behavior */ -#if defined(LUA_NUMBER_DOUBLE) || defined(LUA_NUMBER_FLOAT) -#include -#define SUPUNSIGNED ((lua_Number)(~(lua_Unsigned)0) + 1) -#define lua_number2unsigned(i,n) \ - ((i)=(lua_Unsigned)((n) - floor((n)/SUPUNSIGNED)*SUPUNSIGNED)) -#else -#define lua_number2unsigned(i,n) ((i)=(lua_Unsigned)(n)) -#endif -#endif /* } */ - - -#if !defined(lua_unsigned2number) -/* on several machines, coercion from unsigned to double is slow, - so it may be worth to avoid */ -#define lua_unsigned2number(u) \ - (((u) <= (lua_Unsigned)INT_MAX) ? (lua_Number)(int)(u) : (lua_Number)(u)) -#endif - - - -#if !defined(luai_hashnum) - -#include -#include - -#define luai_hashnum(i,n) { int e; \ - n = l_mathop(frexp)(n, &e) * (lua_Number)(INT_MAX - DBL_MAX_EXP); \ - lua_number2int(i, n); i += e; } - -#endif - - - -/* -** macro to control inclusion of some hard tests on stack reallocation -*/ -#if !defined(HARDSTACKTESTS) -#define condmovestack(L) ((void)0) -#else -/* realloc stack keeping its size */ -#define condmovestack(L) luaD_reallocstack((L), (L)->stacksize) -#endif - -#if !defined(HARDMEMTESTS) -#define condchangemem(L) condmovestack(L) -#else -#define condchangemem(L) \ - ((void)(!(G(L)->gcrunning) || (luaC_fullgc(L, 0), 1))) -#endif - -#endif diff --git a/radio/src/lua/src/lmathlib.c b/radio/src/lua/src/lmathlib.c deleted file mode 100644 index 20292d720..000000000 --- a/radio/src/lua/src/lmathlib.c +++ /dev/null @@ -1,278 +0,0 @@ -/* -** $Id: lmathlib.c,v 1.83 2013/03/07 18:21:32 roberto Exp $ -** Standard mathematical library -** See Copyright Notice in lua.h -*/ - - -#include -#include - -#define lmathlib_c - -#include "lua.h" - -#include "lauxlib.h" -#include "lualib.h" - - -#undef PI -#define PI ((lua_Number)(3.1415926535897932384626433832795)) -#define RADIANS_PER_DEGREE ((lua_Number)(PI/180.0)) - - - -static int math_abs (lua_State *L) { - lua_pushnumber(L, l_mathop(fabs)(luaL_checknumber(L, 1))); - return 1; -} - -static int math_sin (lua_State *L) { - lua_pushnumber(L, l_mathop(sin)(luaL_checknumber(L, 1))); - return 1; -} - -static int math_sinh (lua_State *L) { - lua_pushnumber(L, l_mathop(sinh)(luaL_checknumber(L, 1))); - return 1; -} - -static int math_cos (lua_State *L) { - lua_pushnumber(L, l_mathop(cos)(luaL_checknumber(L, 1))); - return 1; -} - -static int math_cosh (lua_State *L) { - lua_pushnumber(L, l_mathop(cosh)(luaL_checknumber(L, 1))); - return 1; -} - -static int math_tan (lua_State *L) { - lua_pushnumber(L, l_mathop(tan)(luaL_checknumber(L, 1))); - return 1; -} - -static int math_tanh (lua_State *L) { - lua_pushnumber(L, l_mathop(tanh)(luaL_checknumber(L, 1))); - return 1; -} - -static int math_asin (lua_State *L) { - lua_pushnumber(L, l_mathop(asin)(luaL_checknumber(L, 1))); - return 1; -} - -static int math_acos (lua_State *L) { - lua_pushnumber(L, l_mathop(acos)(luaL_checknumber(L, 1))); - return 1; -} - -static int math_atan (lua_State *L) { - lua_pushnumber(L, l_mathop(atan)(luaL_checknumber(L, 1))); - return 1; -} - -static int math_atan2 (lua_State *L) { - lua_pushnumber(L, l_mathop(atan2)(luaL_checknumber(L, 1), - luaL_checknumber(L, 2))); - return 1; -} - -static int math_ceil (lua_State *L) { - lua_pushnumber(L, l_mathop(ceil)(luaL_checknumber(L, 1))); - return 1; -} - -static int math_floor (lua_State *L) { - lua_pushnumber(L, l_mathop(floor)(luaL_checknumber(L, 1))); - return 1; -} - -static int math_fmod (lua_State *L) { - lua_pushnumber(L, l_mathop(fmod)(luaL_checknumber(L, 1), - luaL_checknumber(L, 2))); - return 1; -} - -static int math_modf (lua_State *L) { - lua_Number ip; - lua_Number fp = l_mathop(modf)(luaL_checknumber(L, 1), &ip); - lua_pushnumber(L, ip); - lua_pushnumber(L, fp); - return 2; -} - -static int math_sqrt (lua_State *L) { - lua_pushnumber(L, l_mathop(sqrt)(luaL_checknumber(L, 1))); - return 1; -} - -static int math_pow (lua_State *L) { - lua_Number x = luaL_checknumber(L, 1); - lua_Number y = luaL_checknumber(L, 2); - lua_pushnumber(L, l_mathop(pow)(x, y)); - return 1; -} - -static int math_log (lua_State *L) { - lua_Number x = luaL_checknumber(L, 1); - lua_Number res; - if (lua_isnoneornil(L, 2)) - res = l_mathop(log)(x); - else { - lua_Number base = luaL_checknumber(L, 2); - if (base == (lua_Number)10.0) res = l_mathop(log10)(x); - else res = l_mathop(log)(x)/l_mathop(log)(base); - } - lua_pushnumber(L, res); - return 1; -} - -#if defined(LUA_COMPAT_LOG10) -static int math_log10 (lua_State *L) { - lua_pushnumber(L, l_mathop(log10)(luaL_checknumber(L, 1))); - return 1; -} -#endif - -static int math_exp (lua_State *L) { - lua_pushnumber(L, l_mathop(exp)(luaL_checknumber(L, 1))); - return 1; -} - -static int math_deg (lua_State *L) { - lua_pushnumber(L, luaL_checknumber(L, 1)/RADIANS_PER_DEGREE); - return 1; -} - -static int math_rad (lua_State *L) { - lua_pushnumber(L, luaL_checknumber(L, 1)*RADIANS_PER_DEGREE); - return 1; -} - -static int math_frexp (lua_State *L) { - int e; - lua_pushnumber(L, l_mathop(frexp)(luaL_checknumber(L, 1), &e)); - lua_pushinteger(L, e); - return 2; -} - -static int math_ldexp (lua_State *L) { - lua_Number x = luaL_checknumber(L, 1); - int ep = luaL_checkint(L, 2); - lua_pushnumber(L, l_mathop(ldexp)(x, ep)); - return 1; -} - - - -static int math_min (lua_State *L) { - int n = lua_gettop(L); /* number of arguments */ - lua_Number dmin = luaL_checknumber(L, 1); - int i; - for (i=2; i<=n; i++) { - lua_Number d = luaL_checknumber(L, i); - if (d < dmin) - dmin = d; - } - lua_pushnumber(L, dmin); - return 1; -} - - -static int math_max (lua_State *L) { - int n = lua_gettop(L); /* number of arguments */ - lua_Number dmax = luaL_checknumber(L, 1); - int i; - for (i=2; i<=n; i++) { - lua_Number d = luaL_checknumber(L, i); - if (d > dmax) - dmax = d; - } - lua_pushnumber(L, dmax); - return 1; -} - - -static int math_random (lua_State *L) { - /* the `%' avoids the (rare) case of r==1, and is needed also because on - some systems (SunOS!) `rand()' may return a value larger than RAND_MAX */ - lua_Number r = (lua_Number)(rand()%RAND_MAX) / (lua_Number)RAND_MAX; - switch (lua_gettop(L)) { /* check number of arguments */ - case 0: { /* no arguments */ - lua_pushnumber(L, r); /* Number between 0 and 1 */ - break; - } - case 1: { /* only upper limit */ - lua_Number u = luaL_checknumber(L, 1); - luaL_argcheck(L, (lua_Number)1.0 <= u, 1, "interval is empty"); - lua_pushnumber(L, l_mathop(floor)(r*u) + (lua_Number)(1.0)); /* [1, u] */ - break; - } - case 2: { /* lower and upper limits */ - lua_Number l = luaL_checknumber(L, 1); - lua_Number u = luaL_checknumber(L, 2); - luaL_argcheck(L, l <= u, 2, "interval is empty"); - lua_pushnumber(L, l_mathop(floor)(r*(u-l+1)) + l); /* [l, u] */ - break; - } - default: return luaL_error(L, "wrong number of arguments"); - } - return 1; -} - - -static int math_randomseed (lua_State *L) { - srand(luaL_checkunsigned(L, 1)); - (void)rand(); /* discard first value to avoid undesirable correlations */ - return 0; -} - - -static const luaL_Reg mathlib[] = { - {"abs", math_abs}, - {"acos", math_acos}, - {"asin", math_asin}, - {"atan2", math_atan2}, - {"atan", math_atan}, - {"ceil", math_ceil}, - {"cosh", math_cosh}, - {"cos", math_cos}, - {"deg", math_deg}, - {"exp", math_exp}, - {"floor", math_floor}, - {"fmod", math_fmod}, - {"frexp", math_frexp}, - {"ldexp", math_ldexp}, -#if defined(LUA_COMPAT_LOG10) - {"log10", math_log10}, -#endif - {"log", math_log}, - {"max", math_max}, - {"min", math_min}, - {"modf", math_modf}, - {"pow", math_pow}, - {"rad", math_rad}, - {"random", math_random}, - {"randomseed", math_randomseed}, - {"sinh", math_sinh}, - {"sin", math_sin}, - {"sqrt", math_sqrt}, - {"tanh", math_tanh}, - {"tan", math_tan}, - {NULL, NULL} -}; - - -/* -** Open math library -*/ -LUAMOD_API int luaopen_math (lua_State *L) { - luaL_newlib(L, mathlib); - lua_pushnumber(L, PI); - lua_setfield(L, -2, "pi"); - lua_pushnumber(L, HUGE_VAL); - lua_setfield(L, -2, "huge"); - return 1; -} - diff --git a/radio/src/lua/src/lmem.c b/radio/src/lua/src/lmem.c deleted file mode 100644 index 83d2349ee..000000000 --- a/radio/src/lua/src/lmem.c +++ /dev/null @@ -1,98 +0,0 @@ -/* -** $Id: lmem.c,v 1.84 2012/05/23 15:41:53 roberto Exp $ -** Interface to Memory Manager -** See Copyright Notice in lua.h -*/ - - -#include - -#define lmem_c -#define LUA_CORE - -#include "lua.h" - -#include "ldebug.h" -#include "ldo.h" -#include "lgc.h" -#include "lmem.h" -#include "lobject.h" -#include "lstate.h" - - - -/* -** About the realloc function: -** void * frealloc (void *ud, void *ptr, size_t osize, size_t nsize); -** (`osize' is the old size, `nsize' is the new size) -** -** * frealloc(ud, NULL, x, s) creates a new block of size `s' (no -** matter 'x'). -** -** * frealloc(ud, p, x, 0) frees the block `p' -** (in this specific case, frealloc must return NULL); -** particularly, frealloc(ud, NULL, 0, 0) does nothing -** (which is equivalent to free(NULL) in ANSI C) -** -** frealloc returns NULL if it cannot create or reallocate the area -** (any reallocation to an equal or smaller size cannot fail!) -*/ - - - -#define MINSIZEARRAY 4 - -void *luaM_growaux_ (lua_State *L, void *block, int *size, size_t size_elems, - int limit, const char *what) { - void *newblock; - int newsize; - if (*size >= limit/2) { /* cannot double it? */ - if (*size >= limit) /* cannot grow even a little? */ - luaG_runerror(L, "too many %s (limit is %d)", what, limit); - newsize = limit; /* still have at least one free place */ - } - else { - newsize = (*size)*2; - if (newsize < MINSIZEARRAY) - newsize = MINSIZEARRAY; /* minimum size */ - } - newblock = luaM_reallocv(L, block, *size, newsize, size_elems); - *size = newsize; /* update only when everything else is OK */ - return newblock; -} - - -l_noret luaM_toobig (lua_State *L) { - luaG_runerror(L, "memory allocation error: block too big"); -} - - - -/* -** generic allocation routine. -*/ -void *luaM_realloc_ (lua_State *L, void *block, size_t osize, size_t nsize) { - void *newblock; - global_State *g = G(L); - size_t realosize = (block) ? osize : 0; - lua_assert((realosize == 0) == (block == NULL)); -#if defined(HARDMEMTESTS) - if (nsize > realosize && g->gcrunning) - luaC_fullgc(L, 1); /* force a GC whenever possible */ -#endif - newblock = (*g->frealloc)(g->ud, block, osize, nsize); - if (newblock == NULL && nsize > 0) { - api_check(L, nsize > realosize, - "realloc cannot fail when shrinking a block"); - if (g->gcrunning) { - luaC_fullgc(L, 1); /* try to free some memory... */ - newblock = (*g->frealloc)(g->ud, block, osize, nsize); /* try again */ - } - if (newblock == NULL) - luaD_throw(L, LUA_ERRMEM); - } - lua_assert((nsize == 0) == (newblock == NULL)); - g->GCdebt = (g->GCdebt + nsize) - realosize; - return newblock; -} - diff --git a/radio/src/lua/src/lmem.h b/radio/src/lua/src/lmem.h deleted file mode 100644 index 5f850999a..000000000 --- a/radio/src/lua/src/lmem.h +++ /dev/null @@ -1,57 +0,0 @@ -/* -** $Id: lmem.h,v 1.40 2013/02/20 14:08:21 roberto Exp $ -** Interface to Memory Manager -** See Copyright Notice in lua.h -*/ - -#ifndef lmem_h -#define lmem_h - - -#include - -#include "llimits.h" -#include "lua.h" - - -/* -** This macro avoids the runtime division MAX_SIZET/(e), as 'e' is -** always constant. -** The macro is somewhat complex to avoid warnings: -** +1 avoids warnings of "comparison has constant result"; -** cast to 'void' avoids warnings of "value unused". -*/ -#define luaM_reallocv(L,b,on,n,e) \ - (cast(void, \ - (cast(size_t, (n)+1) > MAX_SIZET/(e)) ? (luaM_toobig(L), 0) : 0), \ - luaM_realloc_(L, (b), (on)*(e), (n)*(e))) - -#define luaM_freemem(L, b, s) luaM_realloc_(L, (b), (s), 0) -#define luaM_free(L, b) luaM_realloc_(L, (b), sizeof(*(b)), 0) -#define luaM_freearray(L, b, n) luaM_reallocv(L, (b), n, 0, sizeof((b)[0])) - -#define luaM_malloc(L,s) luaM_realloc_(L, NULL, 0, (s)) -#define luaM_new(L,t) cast(t *, luaM_malloc(L, sizeof(t))) -#define luaM_newvector(L,n,t) \ - cast(t *, luaM_reallocv(L, NULL, 0, n, sizeof(t))) - -#define luaM_newobject(L,tag,s) luaM_realloc_(L, NULL, tag, (s)) - -#define luaM_growvector(L,v,nelems,size,t,limit,e) \ - if ((nelems)+1 > (size)) \ - ((v)=cast(t *, luaM_growaux_(L,v,&(size),sizeof(t),limit,e))) - -#define luaM_reallocvector(L, v,oldn,n,t) \ - ((v)=cast(t *, luaM_reallocv(L, v, oldn, n, sizeof(t)))) - -LUAI_FUNC l_noret luaM_toobig (lua_State *L); - -/* not to be called directly */ -LUAI_FUNC void *luaM_realloc_ (lua_State *L, void *block, size_t oldsize, - size_t size); -LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int *size, - size_t size_elem, int limit, - const char *what); - -#endif - diff --git a/radio/src/lua/src/loadlib.c b/radio/src/lua/src/loadlib.c deleted file mode 100644 index 3849a7859..000000000 --- a/radio/src/lua/src/loadlib.c +++ /dev/null @@ -1,731 +0,0 @@ -/* -** $Id: loadlib.c,v 1.111 2012/05/30 12:33:44 roberto Exp $ -** Dynamic library loader for Lua -** See Copyright Notice in lua.h -** -** This module contains an implementation of loadlib for Unix systems -** that have dlfcn, an implementation for Windows, and a stub for other -** systems. -*/ - - -/* -** if needed, includes windows header before everything else -*/ -#if defined(_WIN32) -#include -#endif - - -#include -#include - - -#define loadlib_c - -#include "lua.h" - -#include "lauxlib.h" -#include "lualib.h" - - -/* -** LUA_PATH and LUA_CPATH are the names of the environment -** variables that Lua check to set its paths. -*/ -#if !defined(LUA_PATH) -#define LUA_PATH "LUA_PATH" -#endif - -#if !defined(LUA_CPATH) -#define LUA_CPATH "LUA_CPATH" -#endif - -#define LUA_PATHSUFFIX "_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR - -#define LUA_PATHVERSION LUA_PATH LUA_PATHSUFFIX -#define LUA_CPATHVERSION LUA_CPATH LUA_PATHSUFFIX - -/* -** LUA_PATH_SEP is the character that separates templates in a path. -** LUA_PATH_MARK is the string that marks the substitution points in a -** template. -** LUA_EXEC_DIR in a Windows path is replaced by the executable's -** directory. -** LUA_IGMARK is a mark to ignore all before it when building the -** luaopen_ function name. -*/ -#if !defined (LUA_PATH_SEP) -#define LUA_PATH_SEP ";" -#endif -#if !defined (LUA_PATH_MARK) -#define LUA_PATH_MARK "?" -#endif -#if !defined (LUA_EXEC_DIR) -#define LUA_EXEC_DIR "!" -#endif -#if !defined (LUA_IGMARK) -#define LUA_IGMARK "-" -#endif - - -/* -** LUA_CSUBSEP is the character that replaces dots in submodule names -** when searching for a C loader. -** LUA_LSUBSEP is the character that replaces dots in submodule names -** when searching for a Lua loader. -*/ -#if !defined(LUA_CSUBSEP) -#define LUA_CSUBSEP LUA_DIRSEP -#endif - -#if !defined(LUA_LSUBSEP) -#define LUA_LSUBSEP LUA_DIRSEP -#endif - - -/* prefix for open functions in C libraries */ -#define LUA_POF "luaopen_" - -/* separator for open functions in C libraries */ -#define LUA_OFSEP "_" - - -/* table (in the registry) that keeps handles for all loaded C libraries */ -#define CLIBS "_CLIBS" - -#define LIB_FAIL "open" - - -/* error codes for ll_loadfunc */ -#define ERRLIB 1 -#define ERRFUNC 2 - -#define setprogdir(L) ((void)0) - - -/* -** system-dependent functions -*/ -static void ll_unloadlib (void *lib); -static void *ll_load (lua_State *L, const char *path, int seeglb); -static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym); - - - -#if defined(LUA_USE_DLOPEN) -/* -** {======================================================================== -** This is an implementation of loadlib based on the dlfcn interface. -** The dlfcn interface is available in Linux, SunOS, Solaris, IRIX, FreeBSD, -** NetBSD, AIX 4.2, HPUX 11, and probably most other Unix flavors, at least -** as an emulation layer on top of native functions. -** ========================================================================= -*/ - -#include - -static void ll_unloadlib (void *lib) { - dlclose(lib); -} - - -static void *ll_load (lua_State *L, const char *path, int seeglb) { - void *lib = dlopen(path, RTLD_NOW | (seeglb ? RTLD_GLOBAL : RTLD_LOCAL)); - if (lib == NULL) lua_pushstring(L, dlerror()); - return lib; -} - - -static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) { - lua_CFunction f = (lua_CFunction)dlsym(lib, sym); - if (f == NULL) lua_pushstring(L, dlerror()); - return f; -} - -/* }====================================================== */ - - - -#elif defined(LUA_DL_DLL) -/* -** {====================================================================== -** This is an implementation of loadlib for Windows using native functions. -** ======================================================================= -*/ - -#undef setprogdir - -/* -** optional flags for LoadLibraryEx -*/ -#if !defined(LUA_LLE_FLAGS) -#define LUA_LLE_FLAGS 0 -#endif - - -static void setprogdir (lua_State *L) { - char buff[MAX_PATH + 1]; - char *lb; - DWORD nsize = sizeof(buff)/sizeof(char); - DWORD n = GetModuleFileNameA(NULL, buff, nsize); - if (n == 0 || n == nsize || (lb = strrchr(buff, '\\')) == NULL) - luaL_error(L, "unable to get ModuleFileName"); - else { - *lb = '\0'; - luaL_gsub(L, lua_tostring(L, -1), LUA_EXEC_DIR, buff); - lua_remove(L, -2); /* remove original string */ - } -} - - -static void pusherror (lua_State *L) { - int error = GetLastError(); - char buffer[128]; - if (FormatMessageA(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, error, 0, buffer, sizeof(buffer)/sizeof(char), NULL)) - lua_pushstring(L, buffer); - else - lua_pushfstring(L, "system error %d\n", error); -} - -static void ll_unloadlib (void *lib) { - FreeLibrary((HMODULE)lib); -} - - -static void *ll_load (lua_State *L, const char *path, int seeglb) { - HMODULE lib = LoadLibraryExA(path, NULL, LUA_LLE_FLAGS); - (void)(seeglb); /* not used: symbols are 'global' by default */ - if (lib == NULL) pusherror(L); - return lib; -} - - -static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) { - lua_CFunction f = (lua_CFunction)GetProcAddress((HMODULE)lib, sym); - if (f == NULL) pusherror(L); - return f; -} - -/* }====================================================== */ - - -#else -/* -** {====================================================== -** Fallback for other systems -** ======================================================= -*/ - -#undef LIB_FAIL -#define LIB_FAIL "absent" - - -#define DLMSG "dynamic libraries not enabled; check your Lua installation" - - -static void ll_unloadlib (void *lib) { - (void)(lib); /* not used */ -} - - -static void *ll_load (lua_State *L, const char *path, int seeglb) { - (void)(path); (void)(seeglb); /* not used */ - lua_pushliteral(L, DLMSG); - return NULL; -} - - -static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) { - (void)(lib); (void)(sym); /* not used */ - lua_pushliteral(L, DLMSG); - return NULL; -} - -/* }====================================================== */ -#endif - - -static void *ll_checkclib (lua_State *L, const char *path) { - void *plib; - lua_getfield(L, LUA_REGISTRYINDEX, CLIBS); - lua_getfield(L, -1, path); - plib = lua_touserdata(L, -1); /* plib = CLIBS[path] */ - lua_pop(L, 2); /* pop CLIBS table and 'plib' */ - return plib; -} - - -static void ll_addtoclib (lua_State *L, const char *path, void *plib) { - lua_getfield(L, LUA_REGISTRYINDEX, CLIBS); - lua_pushlightuserdata(L, plib); - lua_pushvalue(L, -1); - lua_setfield(L, -3, path); /* CLIBS[path] = plib */ - lua_rawseti(L, -2, luaL_len(L, -2) + 1); /* CLIBS[#CLIBS + 1] = plib */ - lua_pop(L, 1); /* pop CLIBS table */ -} - - -/* -** __gc tag method for CLIBS table: calls 'll_unloadlib' for all lib -** handles in list CLIBS -*/ -static int gctm (lua_State *L) { - int n = luaL_len(L, 1); - for (; n >= 1; n--) { /* for each handle, in reverse order */ - lua_rawgeti(L, 1, n); /* get handle CLIBS[n] */ - ll_unloadlib(lua_touserdata(L, -1)); - lua_pop(L, 1); /* pop handle */ - } - return 0; -} - - -static int ll_loadfunc (lua_State *L, const char *path, const char *sym) { - void *reg = ll_checkclib(L, path); /* check loaded C libraries */ - if (reg == NULL) { /* must load library? */ - reg = ll_load(L, path, *sym == '*'); - if (reg == NULL) return ERRLIB; /* unable to load library */ - ll_addtoclib(L, path, reg); - } - if (*sym == '*') { /* loading only library (no function)? */ - lua_pushboolean(L, 1); /* return 'true' */ - return 0; /* no errors */ - } - else { - lua_CFunction f = ll_sym(L, reg, sym); - if (f == NULL) - return ERRFUNC; /* unable to find function */ - lua_pushcfunction(L, f); /* else create new function */ - return 0; /* no errors */ - } -} - - -static int ll_loadlib (lua_State *L) { - const char *path = luaL_checkstring(L, 1); - const char *init = luaL_checkstring(L, 2); - int stat = ll_loadfunc(L, path, init); - if (stat == 0) /* no errors? */ - return 1; /* return the loaded function */ - else { /* error; error message is on stack top */ - lua_pushnil(L); - lua_insert(L, -2); - lua_pushstring(L, (stat == ERRLIB) ? LIB_FAIL : "init"); - return 3; /* return nil, error message, and where */ - } -} - - - -/* -** {====================================================== -** 'require' function -** ======================================================= -*/ - - -static int readable (const char *filename) { -#if defined(USE_FATFS) - FIL f; - FRESULT result = f_open(&f, filename, FA_OPEN_EXISTING | FA_READ); - if (result != FR_OK) return 0; - f_close(&f); -#else - FILE *f = fopen(filename, "r"); /* try to open file */ - if (f == NULL) return 0; /* open failed */ - fclose(f); -#endif - return 1; -} - - -static const char *pushnexttemplate (lua_State *L, const char *path) { - const char *l; - while (*path == *LUA_PATH_SEP) path++; /* skip separators */ - if (*path == '\0') return NULL; /* no more templates */ - l = strchr(path, *LUA_PATH_SEP); /* find next separator */ - if (l == NULL) l = path + strlen(path); - lua_pushlstring(L, path, l - path); /* template */ - return l; -} - - -static const char *searchpath (lua_State *L, const char *name, - const char *path, - const char *sep, - const char *dirsep) { - luaL_Buffer msg; /* to build error message */ - luaL_buffinit(L, &msg); - if (*sep != '\0') /* non-empty separator? */ - name = luaL_gsub(L, name, sep, dirsep); /* replace it by 'dirsep' */ - while ((path = pushnexttemplate(L, path)) != NULL) { - const char *filename = luaL_gsub(L, lua_tostring(L, -1), - LUA_PATH_MARK, name); - lua_remove(L, -2); /* remove path template */ - if (readable(filename)) /* does file exist and is readable? */ - return filename; /* return that file name */ - lua_pushfstring(L, "\n\tno file " LUA_QS, filename); - lua_remove(L, -2); /* remove file name */ - luaL_addvalue(&msg); /* concatenate error msg. entry */ - } - luaL_pushresult(&msg); /* create error message */ - return NULL; /* not found */ -} - - -static int ll_searchpath (lua_State *L) { - const char *f = searchpath(L, luaL_checkstring(L, 1), - luaL_checkstring(L, 2), - luaL_optstring(L, 3, "."), - luaL_optstring(L, 4, LUA_DIRSEP)); - if (f != NULL) return 1; - else { /* error message is on top of the stack */ - lua_pushnil(L); - lua_insert(L, -2); - return 2; /* return nil + error message */ - } -} - - -static const char *findfile (lua_State *L, const char *name, - const char *pname, - const char *dirsep) { - const char *path; - lua_getfield(L, lua_upvalueindex(1), pname); - path = lua_tostring(L, -1); - if (path == NULL) - luaL_error(L, LUA_QL("package.%s") " must be a string", pname); - return searchpath(L, name, path, ".", dirsep); -} - - -static int checkload (lua_State *L, int stat, const char *filename) { - if (stat) { /* module loaded successfully? */ - lua_pushstring(L, filename); /* will be 2nd argument to module */ - return 2; /* return open function and file name */ - } - else - return luaL_error(L, "error loading module " LUA_QS - " from file " LUA_QS ":\n\t%s", - lua_tostring(L, 1), filename, lua_tostring(L, -1)); -} - - -static int searcher_Lua (lua_State *L) { - const char *filename; - const char *name = luaL_checkstring(L, 1); - filename = findfile(L, name, "path", LUA_LSUBSEP); - if (filename == NULL) return 1; /* module not found in this path */ - return checkload(L, (luaL_loadfile(L, filename) == LUA_OK), filename); -} - - -static int loadfunc (lua_State *L, const char *filename, const char *modname) { - const char *funcname; - const char *mark; - modname = luaL_gsub(L, modname, ".", LUA_OFSEP); - mark = strchr(modname, *LUA_IGMARK); - if (mark) { - int stat; - funcname = lua_pushlstring(L, modname, mark - modname); - funcname = lua_pushfstring(L, LUA_POF"%s", funcname); - stat = ll_loadfunc(L, filename, funcname); - if (stat != ERRFUNC) return stat; - modname = mark + 1; /* else go ahead and try old-style name */ - } - funcname = lua_pushfstring(L, LUA_POF"%s", modname); - return ll_loadfunc(L, filename, funcname); -} - - -static int searcher_C (lua_State *L) { - const char *name = luaL_checkstring(L, 1); - const char *filename = findfile(L, name, "cpath", LUA_CSUBSEP); - if (filename == NULL) return 1; /* module not found in this path */ - return checkload(L, (loadfunc(L, filename, name) == 0), filename); -} - - -static int searcher_Croot (lua_State *L) { - const char *filename; - const char *name = luaL_checkstring(L, 1); - const char *p = strchr(name, '.'); - int stat; - if (p == NULL) return 0; /* is root */ - lua_pushlstring(L, name, p - name); - filename = findfile(L, lua_tostring(L, -1), "cpath", LUA_CSUBSEP); - if (filename == NULL) return 1; /* root not found */ - if ((stat = loadfunc(L, filename, name)) != 0) { - if (stat != ERRFUNC) - return checkload(L, 0, filename); /* real error */ - else { /* open function not found */ - lua_pushfstring(L, "\n\tno module " LUA_QS " in file " LUA_QS, - name, filename); - return 1; - } - } - lua_pushstring(L, filename); /* will be 2nd argument to module */ - return 2; -} - - -static int searcher_preload (lua_State *L) { - const char *name = luaL_checkstring(L, 1); - lua_getfield(L, LUA_REGISTRYINDEX, "_PRELOAD"); - lua_getfield(L, -1, name); - if (lua_isnil(L, -1)) /* not found? */ - lua_pushfstring(L, "\n\tno field package.preload['%s']", name); - return 1; -} - - -static void findloader (lua_State *L, const char *name) { - int i; - luaL_Buffer msg; /* to build error message */ - luaL_buffinit(L, &msg); - lua_getfield(L, lua_upvalueindex(1), "searchers"); /* will be at index 3 */ - if (!lua_istable(L, 3)) - luaL_error(L, LUA_QL("package.searchers") " must be a table"); - /* iterate over available searchers to find a loader */ - for (i = 1; ; i++) { - lua_rawgeti(L, 3, i); /* get a searcher */ - if (lua_isnil(L, -1)) { /* no more searchers? */ - lua_pop(L, 1); /* remove nil */ - luaL_pushresult(&msg); /* create error message */ - luaL_error(L, "module " LUA_QS " not found:%s", - name, lua_tostring(L, -1)); - } - lua_pushstring(L, name); - lua_call(L, 1, 2); /* call it */ - if (lua_isfunction(L, -2)) /* did it find a loader? */ - return; /* module loader found */ - else if (lua_isstring(L, -2)) { /* searcher returned error message? */ - lua_pop(L, 1); /* remove extra return */ - luaL_addvalue(&msg); /* concatenate error message */ - } - else - lua_pop(L, 2); /* remove both returns */ - } -} - - -static int ll_require (lua_State *L) { - const char *name = luaL_checkstring(L, 1); - lua_settop(L, 1); /* _LOADED table will be at index 2 */ - lua_getfield(L, LUA_REGISTRYINDEX, "_LOADED"); - lua_getfield(L, 2, name); /* _LOADED[name] */ - if (lua_toboolean(L, -1)) /* is it there? */ - return 1; /* package is already loaded */ - /* else must load package */ - lua_pop(L, 1); /* remove 'getfield' result */ - findloader(L, name); - lua_pushstring(L, name); /* pass name as argument to module loader */ - lua_insert(L, -2); /* name is 1st argument (before search data) */ - lua_call(L, 2, 1); /* run loader to load module */ - if (!lua_isnil(L, -1)) /* non-nil return? */ - lua_setfield(L, 2, name); /* _LOADED[name] = returned value */ - lua_getfield(L, 2, name); - if (lua_isnil(L, -1)) { /* module did not set a value? */ - lua_pushboolean(L, 1); /* use true as result */ - lua_pushvalue(L, -1); /* extra copy to be returned */ - lua_setfield(L, 2, name); /* _LOADED[name] = true */ - } - return 1; -} - -/* }====================================================== */ - - - -/* -** {====================================================== -** 'module' function -** ======================================================= -*/ -#if defined(LUA_COMPAT_MODULE) - -/* -** changes the environment variable of calling function -*/ -static void set_env (lua_State *L) { - lua_Debug ar; - if (lua_getstack(L, 1, &ar) == 0 || - lua_getinfo(L, "f", &ar) == 0 || /* get calling function */ - lua_iscfunction(L, -1)) - luaL_error(L, LUA_QL("module") " not called from a Lua function"); - lua_pushvalue(L, -2); /* copy new environment table to top */ - lua_setupvalue(L, -2, 1); - lua_pop(L, 1); /* remove function */ -} - - -static void dooptions (lua_State *L, int n) { - int i; - for (i = 2; i <= n; i++) { - if (lua_isfunction(L, i)) { /* avoid 'calling' extra info. */ - lua_pushvalue(L, i); /* get option (a function) */ - lua_pushvalue(L, -2); /* module */ - lua_call(L, 1, 0); - } - } -} - - -static void modinit (lua_State *L, const char *modname) { - const char *dot; - lua_pushvalue(L, -1); - lua_setfield(L, -2, "_M"); /* module._M = module */ - lua_pushstring(L, modname); - lua_setfield(L, -2, "_NAME"); - dot = strrchr(modname, '.'); /* look for last dot in module name */ - if (dot == NULL) dot = modname; - else dot++; - /* set _PACKAGE as package name (full module name minus last part) */ - lua_pushlstring(L, modname, dot - modname); - lua_setfield(L, -2, "_PACKAGE"); -} - - -static int ll_module (lua_State *L) { - const char *modname = luaL_checkstring(L, 1); - int lastarg = lua_gettop(L); /* last parameter */ - luaL_pushmodule(L, modname, 1); /* get/create module table */ - /* check whether table already has a _NAME field */ - lua_getfield(L, -1, "_NAME"); - if (!lua_isnil(L, -1)) /* is table an initialized module? */ - lua_pop(L, 1); - else { /* no; initialize it */ - lua_pop(L, 1); - modinit(L, modname); - } - lua_pushvalue(L, -1); - set_env(L); - dooptions(L, lastarg); - return 1; -} - - -static int ll_seeall (lua_State *L) { - luaL_checktype(L, 1, LUA_TTABLE); - if (!lua_getmetatable(L, 1)) { - lua_createtable(L, 0, 1); /* create new metatable */ - lua_pushvalue(L, -1); - lua_setmetatable(L, 1); - } - lua_pushglobaltable(L); - lua_setfield(L, -2, "__index"); /* mt.__index = _G */ - return 0; -} - -#endif -/* }====================================================== */ - - - -/* auxiliary mark (for internal use) */ -#define AUXMARK "\1" - - -/* -** return registry.LUA_NOENV as a boolean -*/ -static int noenv (lua_State *L) { - int b; - lua_getfield(L, LUA_REGISTRYINDEX, "LUA_NOENV"); - b = lua_toboolean(L, -1); - lua_pop(L, 1); /* remove value */ - return b; -} - - -static void setpath (lua_State *L, const char *fieldname, const char *envname1, - const char *envname2, const char *def) { - const char *path = getenv(envname1); - if (path == NULL) /* no environment variable? */ - path = getenv(envname2); /* try alternative name */ - if (path == NULL || noenv(L)) /* no environment variable? */ - lua_pushstring(L, def); /* use default */ - else { - /* replace ";;" by ";AUXMARK;" and then AUXMARK by default path */ - path = luaL_gsub(L, path, LUA_PATH_SEP LUA_PATH_SEP, - LUA_PATH_SEP AUXMARK LUA_PATH_SEP); - luaL_gsub(L, path, AUXMARK, def); - lua_remove(L, -2); - } - setprogdir(L); - lua_setfield(L, -2, fieldname); -} - - -static const luaL_Reg pk_funcs[] = { - {"loadlib", ll_loadlib}, - {"searchpath", ll_searchpath}, -#if defined(LUA_COMPAT_MODULE) - {"seeall", ll_seeall}, -#endif - {NULL, NULL} -}; - - -static const luaL_Reg ll_funcs[] = { -#if defined(LUA_COMPAT_MODULE) - {"module", ll_module}, -#endif - {"require", ll_require}, - {NULL, NULL} -}; - - -static void createsearcherstable (lua_State *L) { - static const lua_CFunction searchers[] = - {searcher_preload, searcher_Lua, searcher_C, searcher_Croot, NULL}; - int i; - /* create 'searchers' table */ - lua_createtable(L, sizeof(searchers)/sizeof(searchers[0]) - 1, 0); - /* fill it with pre-defined searchers */ - for (i=0; searchers[i] != NULL; i++) { - lua_pushvalue(L, -2); /* set 'package' as upvalue for all searchers */ - lua_pushcclosure(L, searchers[i], 1); - lua_rawseti(L, -2, i+1); - } -} - - -LUAMOD_API int luaopen_package (lua_State *L) { - /* create table CLIBS to keep track of loaded C libraries */ - luaL_getsubtable(L, LUA_REGISTRYINDEX, CLIBS); - lua_createtable(L, 0, 1); /* metatable for CLIBS */ - lua_pushcfunction(L, gctm); - lua_setfield(L, -2, "__gc"); /* set finalizer for CLIBS table */ - lua_setmetatable(L, -2); - /* create `package' table */ - luaL_newlib(L, pk_funcs); - createsearcherstable(L); -#if defined(LUA_COMPAT_LOADERS) - lua_pushvalue(L, -1); /* make a copy of 'searchers' table */ - lua_setfield(L, -3, "loaders"); /* put it in field `loaders' */ -#endif - lua_setfield(L, -2, "searchers"); /* put it in field 'searchers' */ - /* set field 'path' */ - setpath(L, "path", LUA_PATHVERSION, LUA_PATH, LUA_PATH_DEFAULT); - /* set field 'cpath' */ - setpath(L, "cpath", LUA_CPATHVERSION, LUA_CPATH, LUA_CPATH_DEFAULT); - /* store config information */ - lua_pushliteral(L, LUA_DIRSEP "\n" LUA_PATH_SEP "\n" LUA_PATH_MARK "\n" - LUA_EXEC_DIR "\n" LUA_IGMARK "\n"); - lua_setfield(L, -2, "config"); - /* set field `loaded' */ - luaL_getsubtable(L, LUA_REGISTRYINDEX, "_LOADED"); - lua_setfield(L, -2, "loaded"); - /* set field `preload' */ - luaL_getsubtable(L, LUA_REGISTRYINDEX, "_PRELOAD"); - lua_setfield(L, -2, "preload"); - lua_pushglobaltable(L); - lua_pushvalue(L, -2); /* set 'package' as upvalue for next lib */ - luaL_setfuncs(L, ll_funcs, 1); /* open lib into global table */ - lua_pop(L, 1); /* pop global table */ - return 1; /* return 'package' table */ -} - diff --git a/radio/src/lua/src/lobject.c b/radio/src/lua/src/lobject.c deleted file mode 100644 index 51eb7f0b9..000000000 --- a/radio/src/lua/src/lobject.c +++ /dev/null @@ -1,287 +0,0 @@ -/* -** $Id: lobject.c,v 2.58 2013/02/20 14:08:56 roberto Exp $ -** Some generic functions over Lua objects -** See Copyright Notice in lua.h -*/ - -#include -#include -#include -#include - -#define lobject_c -#define LUA_CORE - -#include "lua.h" - -#include "lctype.h" -#include "ldebug.h" -#include "ldo.h" -#include "lmem.h" -#include "lobject.h" -#include "lstate.h" -#include "lstring.h" -#include "lvm.h" - - - -LUAI_DDEF const TValue luaO_nilobject_ = {NILCONSTANT}; - - -/* -** converts an integer to a "floating point byte", represented as -** (eeeeexxx), where the real value is (1xxx) * 2^(eeeee - 1) if -** eeeee != 0 and (xxx) otherwise. -*/ -int luaO_int2fb (unsigned int x) { - int e = 0; /* exponent */ - if (x < 8) return x; - while (x >= 0x10) { - x = (x+1) >> 1; - e++; - } - return ((e+1) << 3) | (cast_int(x) - 8); -} - - -/* converts back */ -int luaO_fb2int (int x) { - int e = (x >> 3) & 0x1f; - if (e == 0) return x; - else return ((x & 7) + 8) << (e - 1); -} - - -int luaO_ceillog2 (unsigned int x) { - static const lu_byte log_2[256] = { - 0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, - 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, - 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, - 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, - 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8 - }; - int l = 0; - x--; - while (x >= 256) { l += 8; x >>= 8; } - return l + log_2[x]; -} - - -lua_Number luaO_arith (int op, lua_Number v1, lua_Number v2) { - switch (op) { - case LUA_OPADD: return luai_numadd(NULL, v1, v2); - case LUA_OPSUB: return luai_numsub(NULL, v1, v2); - case LUA_OPMUL: return luai_nummul(NULL, v1, v2); - case LUA_OPDIV: return luai_numdiv(NULL, v1, v2); - case LUA_OPMOD: return luai_nummod(NULL, v1, v2); - case LUA_OPPOW: return luai_numpow(NULL, v1, v2); - case LUA_OPUNM: return luai_numunm(NULL, v1); - default: lua_assert(0); return 0; - } -} - - -int luaO_hexavalue (int c) { - if (lisdigit(c)) return c - '0'; - else return ltolower(c) - 'a' + 10; -} - - -#if !defined(lua_strx2number) - -#include - - -static int isneg (const char **s) { - if (**s == '-') { (*s)++; return 1; } - else if (**s == '+') (*s)++; - return 0; -} - - -static lua_Number readhexa (const char **s, lua_Number r, int *count) { - for (; lisxdigit(cast_uchar(**s)); (*s)++) { /* read integer part */ - r = (r * cast_num(16.0)) + cast_num(luaO_hexavalue(cast_uchar(**s))); - (*count)++; - } - return r; -} - - -/* -** convert an hexadecimal numeric string to a number, following -** C99 specification for 'strtod' -*/ -static lua_Number lua_strx2number (const char *s, char **endptr) { - lua_Number r = 0.0; - int e = 0, i = 0; - int neg = 0; /* 1 if number is negative */ - *endptr = cast(char *, s); /* nothing is valid yet */ - while (lisspace(cast_uchar(*s))) s++; /* skip initial spaces */ - neg = isneg(&s); /* check signal */ - if (!(*s == '0' && (*(s + 1) == 'x' || *(s + 1) == 'X'))) /* check '0x' */ - return 0.0; /* invalid format (no '0x') */ - s += 2; /* skip '0x' */ - r = readhexa(&s, r, &i); /* read integer part */ - if (*s == '.') { - s++; /* skip dot */ - r = readhexa(&s, r, &e); /* read fractional part */ - } - if (i == 0 && e == 0) - return 0.0; /* invalid format (no digit) */ - e *= -4; /* each fractional digit divides value by 2^-4 */ - *endptr = cast(char *, s); /* valid up to here */ - if (*s == 'p' || *s == 'P') { /* exponent part? */ - int exp1 = 0; - int neg1; - s++; /* skip 'p' */ - neg1 = isneg(&s); /* signal */ - if (!lisdigit(cast_uchar(*s))) - goto ret; /* must have at least one digit */ - while (lisdigit(cast_uchar(*s))) /* read exponent */ - exp1 = exp1 * 10 + *(s++) - '0'; - if (neg1) exp1 = -exp1; - e += exp1; - } - *endptr = cast(char *, s); /* valid up to here */ - ret: - if (neg) r = -r; - return l_mathop(ldexp)(r, e); -} - -#endif - - -int luaO_str2d (const char *s, size_t len, lua_Number *result) { - char *endptr; - if (strpbrk(s, "nN")) /* reject 'inf' and 'nan' */ - return 0; - else if (strpbrk(s, "xX")) /* hexa? */ - *result = lua_strx2number(s, &endptr); - else - *result = lua_str2number(s, &endptr); - if (endptr == s) return 0; /* nothing recognized */ - while (lisspace(cast_uchar(*endptr))) endptr++; - return (endptr == s + len); /* OK if no trailing characters */ -} - - - -static void pushstr (lua_State *L, const char *str, size_t l) { - setsvalue2s(L, L->top++, luaS_newlstr(L, str, l)); -} - - -/* this function handles only `%d', `%c', %f, %p, and `%s' formats */ -const char *luaO_pushvfstring (lua_State *L, const char *fmt, va_list argp) { - int n = 0; - for (;;) { - const char *e = strchr(fmt, '%'); - if (e == NULL) break; - luaD_checkstack(L, 2); /* fmt + item */ - pushstr(L, fmt, e - fmt); - switch (*(e+1)) { - case 's': { - const char *s = va_arg(argp, char *); - if (s == NULL) s = "(null)"; - pushstr(L, s, strlen(s)); - break; - } - case 'c': { - char buff; - buff = cast(char, va_arg(argp, int)); - pushstr(L, &buff, 1); - break; - } - case 'd': { - setnvalue(L->top++, cast_num(va_arg(argp, int))); - break; - } - case 'f': { - setnvalue(L->top++, cast_num(va_arg(argp, l_uacNumber))); - break; - } - case 'p': { - char buff[4*sizeof(void *) + 8]; /* should be enough space for a `%p' */ - int l = sprintf(buff, "%p", va_arg(argp, void *)); - pushstr(L, buff, l); - break; - } - case '%': { - pushstr(L, "%", 1); - break; - } - default: { - luaG_runerror(L, - "invalid option " LUA_QL("%%%c") " to " LUA_QL("lua_pushfstring"), - *(e + 1)); - } - } - n += 2; - fmt = e+2; - } - luaD_checkstack(L, 1); - pushstr(L, fmt, strlen(fmt)); - if (n > 0) luaV_concat(L, n + 1); - return svalue(L->top - 1); -} - - -const char *luaO_pushfstring (lua_State *L, const char *fmt, ...) { - const char *msg; - va_list argp; - va_start(argp, fmt); - msg = luaO_pushvfstring(L, fmt, argp); - va_end(argp); - return msg; -} - - -/* number of chars of a literal string without the ending \0 */ -#define LL(x) (sizeof(x)/sizeof(char) - 1) - -#define RETS "..." -#define PRE "[string \"" -#define POS "\"]" - -#define addstr(a,b,l) ( memcpy(a,b,(l) * sizeof(char)), a += (l) ) - -void luaO_chunkid (char *out, const char *source, size_t bufflen) { - size_t l = strlen(source); - if (*source == '=') { /* 'literal' source */ - if (l <= bufflen) /* small enough? */ - memcpy(out, source + 1, l * sizeof(char)); - else { /* truncate it */ - addstr(out, source + 1, bufflen - 1); - *out = '\0'; - } - } - else if (*source == '@') { /* file name */ - if (l <= bufflen) /* small enough? */ - memcpy(out, source + 1, l * sizeof(char)); - else { /* add '...' before rest of name */ - addstr(out, RETS, LL(RETS)); - bufflen -= LL(RETS); - memcpy(out, source + 1 + l - bufflen, bufflen * sizeof(char)); - } - } - else { /* string; format as [string "source"] */ - const char *nl = strchr(source, '\n'); /* find first new line (if any) */ - addstr(out, PRE, LL(PRE)); /* add prefix */ - bufflen -= LL(PRE RETS POS) + 1; /* save space for prefix+suffix+'\0' */ - if (l < bufflen && nl == NULL) { /* small one-line source? */ - addstr(out, source, l); /* keep it */ - } - else { - if (nl != NULL) l = nl - source; /* stop at first newline */ - if (l > bufflen) l = bufflen; - addstr(out, source, l); - addstr(out, RETS, LL(RETS)); - } - memcpy(out, POS, (LL(POS) + 1) * sizeof(char)); - } -} - diff --git a/radio/src/lua/src/lobject.h b/radio/src/lua/src/lobject.h deleted file mode 100644 index dd23b9143..000000000 --- a/radio/src/lua/src/lobject.h +++ /dev/null @@ -1,607 +0,0 @@ -/* -** $Id: lobject.h,v 2.71 2012/09/11 18:21:44 roberto Exp $ -** Type definitions for Lua objects -** See Copyright Notice in lua.h -*/ - - -#ifndef lobject_h -#define lobject_h - - -#include - - -#include "llimits.h" -#include "lua.h" - - -/* -** Extra tags for non-values -*/ -#define LUA_TPROTO LUA_NUMTAGS -#define LUA_TUPVAL (LUA_NUMTAGS+1) -#define LUA_TDEADKEY (LUA_NUMTAGS+2) - -/* -** number of all possible tags (including LUA_TNONE but excluding DEADKEY) -*/ -#define LUA_TOTALTAGS (LUA_TUPVAL+2) - - -/* -** tags for Tagged Values have the following use of bits: -** bits 0-3: actual tag (a LUA_T* value) -** bits 4-5: variant bits -** bit 6: whether value is collectable -*/ - -#define VARBITS (3 << 4) - - -/* -** LUA_TFUNCTION variants: -** 0 - Lua function -** 1 - light C function -** 2 - regular C function (closure) -*/ - -/* Variant tags for functions */ -#define LUA_TLCL (LUA_TFUNCTION | (0 << 4)) /* Lua closure */ -#define LUA_TLCF (LUA_TFUNCTION | (1 << 4)) /* light C function */ -#define LUA_TCCL (LUA_TFUNCTION | (2 << 4)) /* C closure */ - - -/* Variant tags for strings */ -#define LUA_TSHRSTR (LUA_TSTRING | (0 << 4)) /* short strings */ -#define LUA_TLNGSTR (LUA_TSTRING | (1 << 4)) /* long strings */ - - -/* Bit mark for collectable types */ -#define BIT_ISCOLLECTABLE (1 << 6) - -/* mark a tag as collectable */ -#define ctb(t) ((t) | BIT_ISCOLLECTABLE) - - -/* -** Union of all collectable objects -*/ -typedef union GCObject GCObject; - - -/* -** Common Header for all collectable objects (in macro form, to be -** included in other objects) -*/ -#define CommonHeader GCObject *next; lu_byte tt; lu_byte marked - - -/* -** Common header in struct form -*/ -typedef struct GCheader { - CommonHeader; -} GCheader; - - - -/* -** Union of all Lua values -*/ -typedef union Value Value; - - -#define numfield lua_Number n; /* numbers */ - - - -/* -** Tagged Values. This is the basic representation of values in Lua, -** an actual value plus a tag with its type. -*/ - -#define TValuefields Value value_; int tt_ - -typedef struct lua_TValue TValue; - - -/* macro defining a nil value */ -#define NILCONSTANT {NULL}, LUA_TNIL - - -#define val_(o) ((o)->value_) -#define num_(o) (val_(o).n) - - -/* raw type tag of a TValue */ -#define rttype(o) ((o)->tt_) - -/* tag with no variants (bits 0-3) */ -#define novariant(x) ((x) & 0x0F) - -/* type tag of a TValue (bits 0-3 for tags + variant bits 4-5) */ -#define ttype(o) (rttype(o) & 0x3F) - -/* type tag of a TValue with no variants (bits 0-3) */ -#define ttypenv(o) (novariant(rttype(o))) - - -/* Macros to test type */ -#define checktag(o,t) (rttype(o) == (t)) -#define checktype(o,t) (ttypenv(o) == (t)) -#define ttisnumber(o) checktag((o), LUA_TNUMBER) -#define ttisnil(o) checktag((o), LUA_TNIL) -#define ttisboolean(o) checktag((o), LUA_TBOOLEAN) -#define ttislightuserdata(o) checktag((o), LUA_TLIGHTUSERDATA) -#define ttisstring(o) checktype((o), LUA_TSTRING) -#define ttisshrstring(o) checktag((o), ctb(LUA_TSHRSTR)) -#define ttislngstring(o) checktag((o), ctb(LUA_TLNGSTR)) -#define ttistable(o) checktag((o), ctb(LUA_TTABLE)) -#define ttisfunction(o) checktype(o, LUA_TFUNCTION) -#define ttisclosure(o) ((rttype(o) & 0x1F) == LUA_TFUNCTION) -#define ttisCclosure(o) checktag((o), ctb(LUA_TCCL)) -#define ttisLclosure(o) checktag((o), ctb(LUA_TLCL)) -#define ttislcf(o) checktag((o), LUA_TLCF) -#define ttisuserdata(o) checktag((o), ctb(LUA_TUSERDATA)) -#define ttisthread(o) checktag((o), ctb(LUA_TTHREAD)) -#define ttisdeadkey(o) checktag((o), LUA_TDEADKEY) - -#define ttisequal(o1,o2) (rttype(o1) == rttype(o2)) - -/* Macros to access values */ -#define nvalue(o) check_exp(ttisnumber(o), num_(o)) -#define gcvalue(o) check_exp(iscollectable(o), val_(o).gc) -#define pvalue(o) check_exp(ttislightuserdata(o), val_(o).p) -#define rawtsvalue(o) check_exp(ttisstring(o), &val_(o).gc->ts) -#define tsvalue(o) (&rawtsvalue(o)->tsv) -#define rawuvalue(o) check_exp(ttisuserdata(o), &val_(o).gc->u) -#define uvalue(o) (&rawuvalue(o)->uv) -#define clvalue(o) check_exp(ttisclosure(o), &val_(o).gc->cl) -#define clLvalue(o) check_exp(ttisLclosure(o), &val_(o).gc->cl.l) -#define clCvalue(o) check_exp(ttisCclosure(o), &val_(o).gc->cl.c) -#define fvalue(o) check_exp(ttislcf(o), val_(o).f) -#define hvalue(o) check_exp(ttistable(o), &val_(o).gc->h) -#define bvalue(o) check_exp(ttisboolean(o), val_(o).b) -#define thvalue(o) check_exp(ttisthread(o), &val_(o).gc->th) -/* a dead value may get the 'gc' field, but cannot access its contents */ -#define deadvalue(o) check_exp(ttisdeadkey(o), cast(void *, val_(o).gc)) - -#define l_isfalse(o) (ttisnil(o) || (ttisboolean(o) && bvalue(o) == 0)) - - -#define iscollectable(o) (rttype(o) & BIT_ISCOLLECTABLE) - - -/* Macros for internal tests */ -#define righttt(obj) (ttype(obj) == gcvalue(obj)->gch.tt) - -#define checkliveness(g,obj) \ - lua_longassert(!iscollectable(obj) || \ - (righttt(obj) && !isdead(g,gcvalue(obj)))) - - -/* Macros to set values */ -#define settt_(o,t) ((o)->tt_=(t)) - -#define setnvalue(obj,x) \ - { TValue *io=(obj); num_(io)=(x); settt_(io, LUA_TNUMBER); } - -#define setnilvalue(obj) settt_(obj, LUA_TNIL) - -#define setfvalue(obj,x) \ - { TValue *io=(obj); val_(io).f=(x); settt_(io, LUA_TLCF); } - -#define setpvalue(obj,x) \ - { TValue *io=(obj); val_(io).p=(x); settt_(io, LUA_TLIGHTUSERDATA); } - -#define setbvalue(obj,x) \ - { TValue *io=(obj); val_(io).b=(x); settt_(io, LUA_TBOOLEAN); } - -#define setgcovalue(L,obj,x) \ - { TValue *io=(obj); GCObject *i_g=(x); \ - val_(io).gc=i_g; settt_(io, ctb(gch(i_g)->tt)); } - -#define setsvalue(L,obj,x) \ - { TValue *io=(obj); \ - TString *x_ = (x); \ - val_(io).gc=cast(GCObject *, x_); settt_(io, ctb(x_->tsv.tt)); \ - checkliveness(G(L),io); } - -#define setuvalue(L,obj,x) \ - { TValue *io=(obj); \ - val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TUSERDATA)); \ - checkliveness(G(L),io); } - -#define setthvalue(L,obj,x) \ - { TValue *io=(obj); \ - val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TTHREAD)); \ - checkliveness(G(L),io); } - -#define setclLvalue(L,obj,x) \ - { TValue *io=(obj); \ - val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TLCL)); \ - checkliveness(G(L),io); } - -#define setclCvalue(L,obj,x) \ - { TValue *io=(obj); \ - val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TCCL)); \ - checkliveness(G(L),io); } - -#define sethvalue(L,obj,x) \ - { TValue *io=(obj); \ - val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TTABLE)); \ - checkliveness(G(L),io); } - -#define setdeadvalue(obj) settt_(obj, LUA_TDEADKEY) - - - -#define setobj(L,obj1,obj2) \ - { const TValue *io2=(obj2); TValue *io1=(obj1); \ - io1->value_ = io2->value_; io1->tt_ = io2->tt_; \ - checkliveness(G(L),io1); } - - -/* -** different types of assignments, according to destination -*/ - -/* from stack to (same) stack */ -#define setobjs2s setobj -/* to stack (not from same stack) */ -#define setobj2s setobj -#define setsvalue2s setsvalue -#define sethvalue2s sethvalue -#define setptvalue2s setptvalue -/* from table to same table */ -#define setobjt2t setobj -/* to table */ -#define setobj2t setobj -/* to new object */ -#define setobj2n setobj -#define setsvalue2n setsvalue - - -/* check whether a number is valid (useful only for NaN trick) */ -#define luai_checknum(L,o,c) { /* empty */ } - - -/* -** {====================================================== -** NaN Trick -** ======================================================= -*/ -#if defined(LUA_NANTRICK) - -/* -** numbers are represented in the 'd_' field. All other values have the -** value (NNMARK | tag) in 'tt__'. A number with such pattern would be -** a "signaled NaN", which is never generated by regular operations by -** the CPU (nor by 'strtod') -*/ - -/* allows for external implementation for part of the trick */ -#if !defined(NNMARK) /* { */ - - -#if !defined(LUA_IEEEENDIAN) -#error option 'LUA_NANTRICK' needs 'LUA_IEEEENDIAN' -#endif - - -#define NNMARK 0x7FF7A500 -#define NNMASK 0x7FFFFF00 - -#undef TValuefields -#undef NILCONSTANT - -#if (LUA_IEEEENDIAN == 0) /* { */ - -/* little endian */ -#define TValuefields \ - union { struct { Value v__; int tt__; } i; double d__; } u -#define NILCONSTANT {{{NULL}, tag2tt(LUA_TNIL)}} -/* field-access macros */ -#define v_(o) ((o)->u.i.v__) -#define d_(o) ((o)->u.d__) -#define tt_(o) ((o)->u.i.tt__) - -#else /* }{ */ - -/* big endian */ -#define TValuefields \ - union { struct { int tt__; Value v__; } i; double d__; } u -#define NILCONSTANT {{tag2tt(LUA_TNIL), {NULL}}} -/* field-access macros */ -#define v_(o) ((o)->u.i.v__) -#define d_(o) ((o)->u.d__) -#define tt_(o) ((o)->u.i.tt__) - -#endif /* } */ - -#endif /* } */ - - -/* correspondence with standard representation */ -#undef val_ -#define val_(o) v_(o) -#undef num_ -#define num_(o) d_(o) - - -#undef numfield -#define numfield /* no such field; numbers are the entire struct */ - -/* basic check to distinguish numbers from non-numbers */ -#undef ttisnumber -#define ttisnumber(o) ((tt_(o) & NNMASK) != NNMARK) - -#define tag2tt(t) (NNMARK | (t)) - -#undef rttype -#define rttype(o) (ttisnumber(o) ? LUA_TNUMBER : tt_(o) & 0xff) - -#undef settt_ -#define settt_(o,t) (tt_(o) = tag2tt(t)) - -#undef setnvalue -#define setnvalue(obj,x) \ - { TValue *io_=(obj); num_(io_)=(x); lua_assert(ttisnumber(io_)); } - -#undef setobj -#define setobj(L,obj1,obj2) \ - { const TValue *o2_=(obj2); TValue *o1_=(obj1); \ - o1_->u = o2_->u; \ - checkliveness(G(L),o1_); } - - -/* -** these redefinitions are not mandatory, but these forms are more efficient -*/ - -#undef checktag -#undef checktype -#define checktag(o,t) (tt_(o) == tag2tt(t)) -#define checktype(o,t) (ctb(tt_(o) | VARBITS) == ctb(tag2tt(t) | VARBITS)) - -#undef ttisequal -#define ttisequal(o1,o2) \ - (ttisnumber(o1) ? ttisnumber(o2) : (tt_(o1) == tt_(o2))) - - -#undef luai_checknum -#define luai_checknum(L,o,c) { if (!ttisnumber(o)) c; } - -#endif -/* }====================================================== */ - - - -/* -** {====================================================== -** types and prototypes -** ======================================================= -*/ - - -union Value { - GCObject *gc; /* collectable objects */ - void *p; /* light userdata */ - int b; /* booleans */ - lua_CFunction f; /* light C functions */ - numfield /* numbers */ -}; - - -struct lua_TValue { - TValuefields; -}; - - -typedef TValue *StkId; /* index to stack elements */ - - - - -/* -** Header for string value; string bytes follow the end of this structure -*/ -typedef union TString { - L_Umaxalign dummy; /* ensures maximum alignment for strings */ - struct { - CommonHeader; - lu_byte extra; /* reserved words for short strings; "has hash" for longs */ - unsigned int hash; - size_t len; /* number of characters in string */ - } tsv; -} TString; - - -/* get the actual string (array of bytes) from a TString */ -#define getstr(ts) cast(const char *, (ts) + 1) - -/* get the actual string (array of bytes) from a Lua value */ -#define svalue(o) getstr(rawtsvalue(o)) - - -/* -** Header for userdata; memory area follows the end of this structure -*/ -typedef union Udata { - L_Umaxalign dummy; /* ensures maximum alignment for `local' udata */ - struct { - CommonHeader; - struct Table *metatable; - struct Table *env; - size_t len; /* number of bytes */ - } uv; -} Udata; - - - -/* -** Description of an upvalue for function prototypes -*/ -typedef struct Upvaldesc { - TString *name; /* upvalue name (for debug information) */ - lu_byte instack; /* whether it is in stack */ - lu_byte idx; /* index of upvalue (in stack or in outer function's list) */ -} Upvaldesc; - - -/* -** Description of a local variable for function prototypes -** (used for debug information) -*/ -typedef struct LocVar { - TString *varname; - int startpc; /* first point where variable is active */ - int endpc; /* first point where variable is dead */ -} LocVar; - - -/* -** Function Prototypes -*/ -typedef struct Proto { - CommonHeader; - TValue *k; /* constants used by the function */ - Instruction *code; - struct Proto **p; /* functions defined inside the function */ - int *lineinfo; /* map from opcodes to source lines (debug information) */ - LocVar *locvars; /* information about local variables (debug information) */ - Upvaldesc *upvalues; /* upvalue information */ - union Closure *cache; /* last created closure with this prototype */ - TString *source; /* used for debug information */ - int sizeupvalues; /* size of 'upvalues' */ - int sizek; /* size of `k' */ - int sizecode; - int sizelineinfo; - int sizep; /* size of `p' */ - int sizelocvars; - int linedefined; - int lastlinedefined; - GCObject *gclist; - lu_byte numparams; /* number of fixed parameters */ - lu_byte is_vararg; - lu_byte maxstacksize; /* maximum stack used by this function */ -} Proto; - - - -/* -** Lua Upvalues -*/ -typedef struct UpVal { - CommonHeader; - TValue *v; /* points to stack or to its own value */ - union { - TValue value; /* the value (when closed) */ - struct { /* double linked list (when open) */ - struct UpVal *prev; - struct UpVal *next; - } l; - } u; -} UpVal; - - -/* -** Closures -*/ - -#define ClosureHeader \ - CommonHeader; lu_byte nupvalues; GCObject *gclist - -typedef struct CClosure { - ClosureHeader; - lua_CFunction f; - TValue upvalue[1]; /* list of upvalues */ -} CClosure; - - -typedef struct LClosure { - ClosureHeader; - struct Proto *p; - UpVal *upvals[1]; /* list of upvalues */ -} LClosure; - - -typedef union Closure { - CClosure c; - LClosure l; -} Closure; - - -#define isLfunction(o) ttisLclosure(o) - -#define getproto(o) (clLvalue(o)->p) - - -/* -** Tables -*/ - -typedef union TKey { - struct { - TValuefields; - struct Node *next; /* for chaining */ - } nk; - TValue tvk; -} TKey; - - -typedef struct Node { - TValue i_val; - TKey i_key; -} Node; - - -typedef struct Table { - CommonHeader; - lu_byte flags; /* 1<

lsizenode)) - - -/* -** (address of) a fixed nil value -*/ -#define luaO_nilobject (&luaO_nilobject_) - - -LUAI_DDEC const TValue luaO_nilobject_; - - -LUAI_FUNC int luaO_int2fb (unsigned int x); -LUAI_FUNC int luaO_fb2int (int x); -LUAI_FUNC int luaO_ceillog2 (unsigned int x); -LUAI_FUNC lua_Number luaO_arith (int op, lua_Number v1, lua_Number v2); -LUAI_FUNC int luaO_str2d (const char *s, size_t len, lua_Number *result); -LUAI_FUNC int luaO_hexavalue (int c); -LUAI_FUNC const char *luaO_pushvfstring (lua_State *L, const char *fmt, - va_list argp); -LUAI_FUNC const char *luaO_pushfstring (lua_State *L, const char *fmt, ...); -LUAI_FUNC void luaO_chunkid (char *out, const char *source, size_t len); - - -#endif - diff --git a/radio/src/lua/src/lopcodes.c b/radio/src/lua/src/lopcodes.c deleted file mode 100644 index ef7369275..000000000 --- a/radio/src/lua/src/lopcodes.c +++ /dev/null @@ -1,107 +0,0 @@ -/* -** $Id: lopcodes.c,v 1.49 2012/05/14 13:34:18 roberto Exp $ -** Opcodes for Lua virtual machine -** See Copyright Notice in lua.h -*/ - - -#define lopcodes_c -#define LUA_CORE - - -#include "lopcodes.h" - - -/* ORDER OP */ - -LUAI_DDEF const char *const luaP_opnames[NUM_OPCODES+1] = { - "MOVE", - "LOADK", - "LOADKX", - "LOADBOOL", - "LOADNIL", - "GETUPVAL", - "GETTABUP", - "GETTABLE", - "SETTABUP", - "SETUPVAL", - "SETTABLE", - "NEWTABLE", - "SELF", - "ADD", - "SUB", - "MUL", - "DIV", - "MOD", - "POW", - "UNM", - "NOT", - "LEN", - "CONCAT", - "JMP", - "EQ", - "LT", - "LE", - "TEST", - "TESTSET", - "CALL", - "TAILCALL", - "RETURN", - "FORLOOP", - "FORPREP", - "TFORCALL", - "TFORLOOP", - "SETLIST", - "CLOSURE", - "VARARG", - "EXTRAARG", - NULL -}; - - -#define opmode(t,a,b,c,m) (((t)<<7) | ((a)<<6) | ((b)<<4) | ((c)<<2) | (m)) - -LUAI_DDEF const lu_byte luaP_opmodes[NUM_OPCODES] = { -/* T A B C mode opcode */ - opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_MOVE */ - ,opmode(0, 1, OpArgK, OpArgN, iABx) /* OP_LOADK */ - ,opmode(0, 1, OpArgN, OpArgN, iABx) /* OP_LOADKX */ - ,opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_LOADBOOL */ - ,opmode(0, 1, OpArgU, OpArgN, iABC) /* OP_LOADNIL */ - ,opmode(0, 1, OpArgU, OpArgN, iABC) /* OP_GETUPVAL */ - ,opmode(0, 1, OpArgU, OpArgK, iABC) /* OP_GETTABUP */ - ,opmode(0, 1, OpArgR, OpArgK, iABC) /* OP_GETTABLE */ - ,opmode(0, 0, OpArgK, OpArgK, iABC) /* OP_SETTABUP */ - ,opmode(0, 0, OpArgU, OpArgN, iABC) /* OP_SETUPVAL */ - ,opmode(0, 0, OpArgK, OpArgK, iABC) /* OP_SETTABLE */ - ,opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_NEWTABLE */ - ,opmode(0, 1, OpArgR, OpArgK, iABC) /* OP_SELF */ - ,opmode(0, 1, OpArgK, OpArgK, iABC) /* OP_ADD */ - ,opmode(0, 1, OpArgK, OpArgK, iABC) /* OP_SUB */ - ,opmode(0, 1, OpArgK, OpArgK, iABC) /* OP_MUL */ - ,opmode(0, 1, OpArgK, OpArgK, iABC) /* OP_DIV */ - ,opmode(0, 1, OpArgK, OpArgK, iABC) /* OP_MOD */ - ,opmode(0, 1, OpArgK, OpArgK, iABC) /* OP_POW */ - ,opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_UNM */ - ,opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_NOT */ - ,opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_LEN */ - ,opmode(0, 1, OpArgR, OpArgR, iABC) /* OP_CONCAT */ - ,opmode(0, 0, OpArgR, OpArgN, iAsBx) /* OP_JMP */ - ,opmode(1, 0, OpArgK, OpArgK, iABC) /* OP_EQ */ - ,opmode(1, 0, OpArgK, OpArgK, iABC) /* OP_LT */ - ,opmode(1, 0, OpArgK, OpArgK, iABC) /* OP_LE */ - ,opmode(1, 0, OpArgN, OpArgU, iABC) /* OP_TEST */ - ,opmode(1, 1, OpArgR, OpArgU, iABC) /* OP_TESTSET */ - ,opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_CALL */ - ,opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_TAILCALL */ - ,opmode(0, 0, OpArgU, OpArgN, iABC) /* OP_RETURN */ - ,opmode(0, 1, OpArgR, OpArgN, iAsBx) /* OP_FORLOOP */ - ,opmode(0, 1, OpArgR, OpArgN, iAsBx) /* OP_FORPREP */ - ,opmode(0, 0, OpArgN, OpArgU, iABC) /* OP_TFORCALL */ - ,opmode(0, 1, OpArgR, OpArgN, iAsBx) /* OP_TFORLOOP */ - ,opmode(0, 0, OpArgU, OpArgU, iABC) /* OP_SETLIST */ - ,opmode(0, 1, OpArgU, OpArgN, iABx) /* OP_CLOSURE */ - ,opmode(0, 1, OpArgU, OpArgN, iABC) /* OP_VARARG */ - ,opmode(0, 0, OpArgU, OpArgU, iAx) /* OP_EXTRAARG */ -}; - diff --git a/radio/src/lua/src/lopcodes.h b/radio/src/lua/src/lopcodes.h deleted file mode 100644 index 07d2b3f39..000000000 --- a/radio/src/lua/src/lopcodes.h +++ /dev/null @@ -1,288 +0,0 @@ -/* -** $Id: lopcodes.h,v 1.142 2011/07/15 12:50:29 roberto Exp $ -** Opcodes for Lua virtual machine -** See Copyright Notice in lua.h -*/ - -#ifndef lopcodes_h -#define lopcodes_h - -#include "llimits.h" - - -/*=========================================================================== - We assume that instructions are unsigned numbers. - All instructions have an opcode in the first 6 bits. - Instructions can have the following fields: - `A' : 8 bits - `B' : 9 bits - `C' : 9 bits - 'Ax' : 26 bits ('A', 'B', and 'C' together) - `Bx' : 18 bits (`B' and `C' together) - `sBx' : signed Bx - - A signed argument is represented in excess K; that is, the number - value is the unsigned value minus K. K is exactly the maximum value - for that argument (so that -max is represented by 0, and +max is - represented by 2*max), which is half the maximum for the corresponding - unsigned argument. -===========================================================================*/ - - -enum OpMode {iABC, iABx, iAsBx, iAx}; /* basic instruction format */ - - -/* -** size and position of opcode arguments. -*/ -#define SIZE_C 9 -#define SIZE_B 9 -#define SIZE_Bx (SIZE_C + SIZE_B) -#define SIZE_A 8 -#define SIZE_Ax (SIZE_C + SIZE_B + SIZE_A) - -#define SIZE_OP 6 - -#define POS_OP 0 -#define POS_A (POS_OP + SIZE_OP) -#define POS_C (POS_A + SIZE_A) -#define POS_B (POS_C + SIZE_C) -#define POS_Bx POS_C -#define POS_Ax POS_A - - -/* -** limits for opcode arguments. -** we use (signed) int to manipulate most arguments, -** so they must fit in LUAI_BITSINT-1 bits (-1 for sign) -*/ -#if SIZE_Bx < LUAI_BITSINT-1 -#define MAXARG_Bx ((1<>1) /* `sBx' is signed */ -#else -#define MAXARG_Bx MAX_INT -#define MAXARG_sBx MAX_INT -#endif - -#if SIZE_Ax < LUAI_BITSINT-1 -#define MAXARG_Ax ((1<>POS_OP) & MASK1(SIZE_OP,0))) -#define SET_OPCODE(i,o) ((i) = (((i)&MASK0(SIZE_OP,POS_OP)) | \ - ((cast(Instruction, o)<>pos) & MASK1(size,0))) -#define setarg(i,v,pos,size) ((i) = (((i)&MASK0(size,pos)) | \ - ((cast(Instruction, v)<= R(A) + 1 */ -OP_EQ,/* A B C if ((RK(B) == RK(C)) ~= A) then pc++ */ -OP_LT,/* A B C if ((RK(B) < RK(C)) ~= A) then pc++ */ -OP_LE,/* A B C if ((RK(B) <= RK(C)) ~= A) then pc++ */ - -OP_TEST,/* A C if not (R(A) <=> C) then pc++ */ -OP_TESTSET,/* A B C if (R(B) <=> C) then R(A) := R(B) else pc++ */ - -OP_CALL,/* A B C R(A), ... ,R(A+C-2) := R(A)(R(A+1), ... ,R(A+B-1)) */ -OP_TAILCALL,/* A B C return R(A)(R(A+1), ... ,R(A+B-1)) */ -OP_RETURN,/* A B return R(A), ... ,R(A+B-2) (see note) */ - -OP_FORLOOP,/* A sBx R(A)+=R(A+2); - if R(A) > 4) & 3)) -#define getCMode(m) (cast(enum OpArgMask, (luaP_opmodes[m] >> 2) & 3)) -#define testAMode(m) (luaP_opmodes[m] & (1 << 6)) -#define testTMode(m) (luaP_opmodes[m] & (1 << 7)) - - -LUAI_DDEC const char *const luaP_opnames[NUM_OPCODES+1]; /* opcode names */ - - -/* number of list items to accumulate before a SETLIST instruction */ -#define LFIELDS_PER_FLUSH 50 - - -#endif diff --git a/radio/src/lua/src/loslib.c b/radio/src/lua/src/loslib.c deleted file mode 100644 index d991b9deb..000000000 --- a/radio/src/lua/src/loslib.c +++ /dev/null @@ -1,322 +0,0 @@ -/* -** $Id: loslib.c,v 1.40 2012/10/19 15:54:02 roberto Exp $ -** Standard Operating System library -** See Copyright Notice in lua.h -*/ - - -#include -#include -#include -#include -#include - -#define loslib_c - -#include "lua.h" - -#include "lauxlib.h" -#include "lualib.h" - - -/* -** list of valid conversion specifiers for the 'strftime' function -*/ -#if !defined(LUA_STRFTIMEOPTIONS) - -#if !defined(LUA_USE_POSIX) -#define LUA_STRFTIMEOPTIONS { "aAbBcdHIjmMpSUwWxXyYz%", "" } -#else -#define LUA_STRFTIMEOPTIONS \ - { "aAbBcCdDeFgGhHIjmMnprRStTuUVwWxXyYzZ%", "" \ - "", "E", "cCxXyY", \ - "O", "deHImMSuUVwWy" } -#endif - -#endif - - - -/* -** By default, Lua uses tmpnam except when POSIX is available, where it -** uses mkstemp. -*/ -#if defined(LUA_USE_MKSTEMP) -#include -#define LUA_TMPNAMBUFSIZE 32 -#define lua_tmpnam(b,e) { \ - strcpy(b, "/tmp/lua_XXXXXX"); \ - e = mkstemp(b); \ - if (e != -1) close(e); \ - e = (e == -1); } - -#elif !defined(lua_tmpnam) - -#define LUA_TMPNAMBUFSIZE L_tmpnam -#define lua_tmpnam(b,e) { e = (tmpnam(b) == NULL); } - -#endif - - -/* -** By default, Lua uses gmtime/localtime, except when POSIX is available, -** where it uses gmtime_r/localtime_r -*/ -#if defined(LUA_USE_GMTIME_R) - -#define l_gmtime(t,r) gmtime_r(t,r) -#define l_localtime(t,r) localtime_r(t,r) - -#elif !defined(l_gmtime) - -#define l_gmtime(t,r) ((void)r, gmtime(t)) -#define l_localtime(t,r) ((void)r, localtime(t)) - -#endif - - - -static int os_execute (lua_State *L) { - const char *cmd = luaL_optstring(L, 1, NULL); - int stat = system(cmd); - if (cmd != NULL) - return luaL_execresult(L, stat); - else { - lua_pushboolean(L, stat); /* true if there is a shell */ - return 1; - } -} - - -static int os_remove (lua_State *L) { - const char *filename = luaL_checkstring(L, 1); - return luaL_fileresult(L, remove(filename) == 0, filename); -} - - -static int os_rename (lua_State *L) { - const char *fromname = luaL_checkstring(L, 1); - const char *toname = luaL_checkstring(L, 2); - return luaL_fileresult(L, rename(fromname, toname) == 0, NULL); -} - - -static int os_tmpname (lua_State *L) { - char buff[LUA_TMPNAMBUFSIZE]; - int err; - lua_tmpnam(buff, err); - if (err) - return luaL_error(L, "unable to generate a unique filename"); - lua_pushstring(L, buff); - return 1; -} - - -static int os_getenv (lua_State *L) { - lua_pushstring(L, getenv(luaL_checkstring(L, 1))); /* if NULL push nil */ - return 1; -} - - -static int os_clock (lua_State *L) { - lua_pushnumber(L, ((lua_Number)clock())/(lua_Number)CLOCKS_PER_SEC); - return 1; -} - - -/* -** {====================================================== -** Time/Date operations -** { year=%Y, month=%m, day=%d, hour=%H, min=%M, sec=%S, -** wday=%w+1, yday=%j, isdst=? } -** ======================================================= -*/ - -static void setfield (lua_State *L, const char *key, int value) { - lua_pushinteger(L, value); - lua_setfield(L, -2, key); -} - -static void setboolfield (lua_State *L, const char *key, int value) { - if (value < 0) /* undefined? */ - return; /* does not set field */ - lua_pushboolean(L, value); - lua_setfield(L, -2, key); -} - -static int getboolfield (lua_State *L, const char *key) { - int res; - lua_getfield(L, -1, key); - res = lua_isnil(L, -1) ? -1 : lua_toboolean(L, -1); - lua_pop(L, 1); - return res; -} - - -static int getfield (lua_State *L, const char *key, int d) { - int res, isnum; - lua_getfield(L, -1, key); - res = (int)lua_tointegerx(L, -1, &isnum); - if (!isnum) { - if (d < 0) - return luaL_error(L, "field " LUA_QS " missing in date table", key); - res = d; - } - lua_pop(L, 1); - return res; -} - - -static const char *checkoption (lua_State *L, const char *conv, char *buff) { - static const char *const options[] = LUA_STRFTIMEOPTIONS; - unsigned int i; - for (i = 0; i < sizeof(options)/sizeof(options[0]); i += 2) { - if (*conv != '\0' && strchr(options[i], *conv) != NULL) { - buff[1] = *conv; - if (*options[i + 1] == '\0') { /* one-char conversion specifier? */ - buff[2] = '\0'; /* end buffer */ - return conv + 1; - } - else if (*(conv + 1) != '\0' && - strchr(options[i + 1], *(conv + 1)) != NULL) { - buff[2] = *(conv + 1); /* valid two-char conversion specifier */ - buff[3] = '\0'; /* end buffer */ - return conv + 2; - } - } - } - luaL_argerror(L, 1, - lua_pushfstring(L, "invalid conversion specifier '%%%s'", conv)); - return conv; /* to avoid warnings */ -} - - -static int os_date (lua_State *L) { - const char *s = luaL_optstring(L, 1, "%c"); - time_t t = luaL_opt(L, (time_t)luaL_checknumber, 2, time(NULL)); - struct tm tmr, *stm; - if (*s == '!') { /* UTC? */ - stm = l_gmtime(&t, &tmr); - s++; /* skip `!' */ - } - else - stm = l_localtime(&t, &tmr); - if (stm == NULL) /* invalid date? */ - lua_pushnil(L); - else if (strcmp(s, "*t") == 0) { - lua_createtable(L, 0, 9); /* 9 = number of fields */ - setfield(L, "sec", stm->tm_sec); - setfield(L, "min", stm->tm_min); - setfield(L, "hour", stm->tm_hour); - setfield(L, "day", stm->tm_mday); - setfield(L, "month", stm->tm_mon+1); - setfield(L, "year", stm->tm_year+1900); - setfield(L, "wday", stm->tm_wday+1); - setfield(L, "yday", stm->tm_yday+1); - setboolfield(L, "isdst", stm->tm_isdst); - } - else { - char cc[4]; - luaL_Buffer b; - cc[0] = '%'; - luaL_buffinit(L, &b); - while (*s) { - if (*s != '%') /* no conversion specifier? */ - luaL_addchar(&b, *s++); - else { - size_t reslen; - char buff[200]; /* should be big enough for any conversion result */ - s = checkoption(L, s + 1, cc); - reslen = strftime(buff, sizeof(buff), cc, stm); - luaL_addlstring(&b, buff, reslen); - } - } - luaL_pushresult(&b); - } - return 1; -} - - -static int os_time (lua_State *L) { - time_t t; - if (lua_isnoneornil(L, 1)) /* called without args? */ - t = time(NULL); /* get current time */ - else { - struct tm ts; - luaL_checktype(L, 1, LUA_TTABLE); - lua_settop(L, 1); /* make sure table is at the top */ - ts.tm_sec = getfield(L, "sec", 0); - ts.tm_min = getfield(L, "min", 0); - ts.tm_hour = getfield(L, "hour", 12); - ts.tm_mday = getfield(L, "day", -1); - ts.tm_mon = getfield(L, "month", -1) - 1; - ts.tm_year = getfield(L, "year", -1) - 1900; - ts.tm_isdst = getboolfield(L, "isdst"); - t = mktime(&ts); - } - if (t == (time_t)(-1)) - lua_pushnil(L); - else - lua_pushnumber(L, (lua_Number)t); - return 1; -} - - -static int os_difftime (lua_State *L) { - lua_pushnumber(L, difftime((time_t)(luaL_checknumber(L, 1)), - (time_t)(luaL_optnumber(L, 2, 0)))); - return 1; -} - -/* }====================================================== */ - - -static int os_setlocale (lua_State *L) { - static const int cat[] = {LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY, - LC_NUMERIC, LC_TIME}; - static const char *const catnames[] = {"all", "collate", "ctype", "monetary", - "numeric", "time", NULL}; - const char *l = luaL_optstring(L, 1, NULL); - int op = luaL_checkoption(L, 2, "all", catnames); - lua_pushstring(L, setlocale(cat[op], l)); - return 1; -} - - -static int os_exit (lua_State *L) { - int status; - if (lua_isboolean(L, 1)) - status = (lua_toboolean(L, 1) ? EXIT_SUCCESS : EXIT_FAILURE); - else - status = luaL_optint(L, 1, EXIT_SUCCESS); - if (lua_toboolean(L, 2)) - lua_close(L); - if (L) exit(status); /* 'if' to avoid warnings for unreachable 'return' */ - return 0; -} - - -static const luaL_Reg syslib[] = { - {"clock", os_clock}, - {"date", os_date}, - {"difftime", os_difftime}, - {"execute", os_execute}, - {"exit", os_exit}, - {"getenv", os_getenv}, - {"remove", os_remove}, - {"rename", os_rename}, - {"setlocale", os_setlocale}, - {"time", os_time}, - {"tmpname", os_tmpname}, - {NULL, NULL} -}; - -/* }====================================================== */ - - - -LUAMOD_API int luaopen_os (lua_State *L) { - luaL_newlib(L, syslib); - return 1; -} - diff --git a/radio/src/lua/src/lparser.c b/radio/src/lua/src/lparser.c deleted file mode 100644 index d8f5b4ffc..000000000 --- a/radio/src/lua/src/lparser.c +++ /dev/null @@ -1,1638 +0,0 @@ -/* -** $Id: lparser.c,v 2.130 2013/02/06 13:37:39 roberto Exp $ -** Lua Parser -** See Copyright Notice in lua.h -*/ - - -#include - -#define lparser_c -#define LUA_CORE - -#include "lua.h" - -#include "lcode.h" -#include "ldebug.h" -#include "ldo.h" -#include "lfunc.h" -#include "llex.h" -#include "lmem.h" -#include "lobject.h" -#include "lopcodes.h" -#include "lparser.h" -#include "lstate.h" -#include "lstring.h" -#include "ltable.h" - - - -/* maximum number of local variables per function (must be smaller - than 250, due to the bytecode format) */ -#define MAXVARS 200 - - -#define hasmultret(k) ((k) == VCALL || (k) == VVARARG) - - - -/* -** nodes for block list (list of active blocks) -*/ -typedef struct BlockCnt { - struct BlockCnt *previous; /* chain */ - short firstlabel; /* index of first label in this block */ - short firstgoto; /* index of first pending goto in this block */ - lu_byte nactvar; /* # active locals outside the block */ - lu_byte upval; /* true if some variable in the block is an upvalue */ - lu_byte isloop; /* true if `block' is a loop */ -} BlockCnt; - - - -/* -** prototypes for recursive non-terminal functions -*/ -static void statement (LexState *ls); -static void expr (LexState *ls, expdesc *v); - - -static void anchor_token (LexState *ls) { - /* last token from outer function must be EOS */ - lua_assert(ls->fs != NULL || ls->t.token == TK_EOS); - if (ls->t.token == TK_NAME || ls->t.token == TK_STRING) { - TString *ts = ls->t.seminfo.ts; - luaX_newstring(ls, getstr(ts), ts->tsv.len); - } -} - - -/* semantic error */ -static l_noret semerror (LexState *ls, const char *msg) { - ls->t.token = 0; /* remove 'near to' from final message */ - luaX_syntaxerror(ls, msg); -} - - -static l_noret error_expected (LexState *ls, int token) { - luaX_syntaxerror(ls, - luaO_pushfstring(ls->L, "%s expected", luaX_token2str(ls, token))); -} - - -static l_noret errorlimit (FuncState *fs, int limit, const char *what) { - lua_State *L = fs->ls->L; - const char *msg; - int line = fs->f->linedefined; - const char *where = (line == 0) - ? "main function" - : luaO_pushfstring(L, "function at line %d", line); - msg = luaO_pushfstring(L, "too many %s (limit is %d) in %s", - what, limit, where); - luaX_syntaxerror(fs->ls, msg); -} - - -static void checklimit (FuncState *fs, int v, int l, const char *what) { - if (v > l) errorlimit(fs, l, what); -} - - -static int testnext (LexState *ls, int c) { - if (ls->t.token == c) { - luaX_next(ls); - return 1; - } - else return 0; -} - - -static void check (LexState *ls, int c) { - if (ls->t.token != c) - error_expected(ls, c); -} - - -static void checknext (LexState *ls, int c) { - check(ls, c); - luaX_next(ls); -} - - -#define check_condition(ls,c,msg) { if (!(c)) luaX_syntaxerror(ls, msg); } - - - -static void check_match (LexState *ls, int what, int who, int where) { - if (!testnext(ls, what)) { - if (where == ls->linenumber) - error_expected(ls, what); - else { - luaX_syntaxerror(ls, luaO_pushfstring(ls->L, - "%s expected (to close %s at line %d)", - luaX_token2str(ls, what), luaX_token2str(ls, who), where)); - } - } -} - - -static TString *str_checkname (LexState *ls) { - TString *ts; - check(ls, TK_NAME); - ts = ls->t.seminfo.ts; - luaX_next(ls); - return ts; -} - - -static void init_exp (expdesc *e, expkind k, int i) { - e->f = e->t = NO_JUMP; - e->k = k; - e->u.info = i; -} - - -static void codestring (LexState *ls, expdesc *e, TString *s) { - init_exp(e, VK, luaK_stringK(ls->fs, s)); -} - - -static void checkname (LexState *ls, expdesc *e) { - codestring(ls, e, str_checkname(ls)); -} - - -static int registerlocalvar (LexState *ls, TString *varname) { - FuncState *fs = ls->fs; - Proto *f = fs->f; - int oldsize = f->sizelocvars; - luaM_growvector(ls->L, f->locvars, fs->nlocvars, f->sizelocvars, - LocVar, SHRT_MAX, "local variables"); - while (oldsize < f->sizelocvars) f->locvars[oldsize++].varname = NULL; - f->locvars[fs->nlocvars].varname = varname; - luaC_objbarrier(ls->L, f, varname); - return fs->nlocvars++; -} - - -static void new_localvar (LexState *ls, TString *name) { - FuncState *fs = ls->fs; - Dyndata *dyd = ls->dyd; - int reg = registerlocalvar(ls, name); - checklimit(fs, dyd->actvar.n + 1 - fs->firstlocal, - MAXVARS, "local variables"); - luaM_growvector(ls->L, dyd->actvar.arr, dyd->actvar.n + 1, - dyd->actvar.size, Vardesc, MAX_INT, "local variables"); - dyd->actvar.arr[dyd->actvar.n++].idx = cast(short, reg); -} - - -static void new_localvarliteral_ (LexState *ls, const char *name, size_t sz) { - new_localvar(ls, luaX_newstring(ls, name, sz)); -} - -#define new_localvarliteral(ls,v) \ - new_localvarliteral_(ls, "" v, (sizeof(v)/sizeof(char))-1) - - -static LocVar *getlocvar (FuncState *fs, int i) { - int idx = fs->ls->dyd->actvar.arr[fs->firstlocal + i].idx; - lua_assert(idx < fs->nlocvars); - return &fs->f->locvars[idx]; -} - - -static void adjustlocalvars (LexState *ls, int nvars) { - FuncState *fs = ls->fs; - fs->nactvar = cast_byte(fs->nactvar + nvars); - for (; nvars; nvars--) { - getlocvar(fs, fs->nactvar - nvars)->startpc = fs->pc; - } -} - - -static void removevars (FuncState *fs, int tolevel) { - fs->ls->dyd->actvar.n -= (fs->nactvar - tolevel); - while (fs->nactvar > tolevel) - getlocvar(fs, --fs->nactvar)->endpc = fs->pc; -} - - -static int searchupvalue (FuncState *fs, TString *name) { - int i; - Upvaldesc *up = fs->f->upvalues; - for (i = 0; i < fs->nups; i++) { - if (luaS_eqstr(up[i].name, name)) return i; - } - return -1; /* not found */ -} - - -static int newupvalue (FuncState *fs, TString *name, expdesc *v) { - Proto *f = fs->f; - int oldsize = f->sizeupvalues; - checklimit(fs, fs->nups + 1, MAXUPVAL, "upvalues"); - luaM_growvector(fs->ls->L, f->upvalues, fs->nups, f->sizeupvalues, - Upvaldesc, MAXUPVAL, "upvalues"); - while (oldsize < f->sizeupvalues) f->upvalues[oldsize++].name = NULL; - f->upvalues[fs->nups].instack = (v->k == VLOCAL); - f->upvalues[fs->nups].idx = cast_byte(v->u.info); - f->upvalues[fs->nups].name = name; - luaC_objbarrier(fs->ls->L, f, name); - return fs->nups++; -} - - -static int searchvar (FuncState *fs, TString *n) { - int i; - for (i = cast_int(fs->nactvar) - 1; i >= 0; i--) { - if (luaS_eqstr(n, getlocvar(fs, i)->varname)) - return i; - } - return -1; /* not found */ -} - - -/* - Mark block where variable at given level was defined - (to emit close instructions later). -*/ -static void markupval (FuncState *fs, int level) { - BlockCnt *bl = fs->bl; - while (bl->nactvar > level) bl = bl->previous; - bl->upval = 1; -} - - -/* - Find variable with given name 'n'. If it is an upvalue, add this - upvalue into all intermediate functions. -*/ -static int singlevaraux (FuncState *fs, TString *n, expdesc *var, int base) { - if (fs == NULL) /* no more levels? */ - return VVOID; /* default is global */ - else { - int v = searchvar(fs, n); /* look up locals at current level */ - if (v >= 0) { /* found? */ - init_exp(var, VLOCAL, v); /* variable is local */ - if (!base) - markupval(fs, v); /* local will be used as an upval */ - return VLOCAL; - } - else { /* not found as local at current level; try upvalues */ - int idx = searchupvalue(fs, n); /* try existing upvalues */ - if (idx < 0) { /* not found? */ - if (singlevaraux(fs->prev, n, var, 0) == VVOID) /* try upper levels */ - return VVOID; /* not found; is a global */ - /* else was LOCAL or UPVAL */ - idx = newupvalue(fs, n, var); /* will be a new upvalue */ - } - init_exp(var, VUPVAL, idx); - return VUPVAL; - } - } -} - - -static void singlevar (LexState *ls, expdesc *var) { - TString *varname = str_checkname(ls); - FuncState *fs = ls->fs; - if (singlevaraux(fs, varname, var, 1) == VVOID) { /* global name? */ - expdesc key; - singlevaraux(fs, ls->envn, var, 1); /* get environment variable */ - lua_assert(var->k == VLOCAL || var->k == VUPVAL); - codestring(ls, &key, varname); /* key is variable name */ - luaK_indexed(fs, var, &key); /* env[varname] */ - } -} - - -static void adjust_assign (LexState *ls, int nvars, int nexps, expdesc *e) { - FuncState *fs = ls->fs; - int extra = nvars - nexps; - if (hasmultret(e->k)) { - extra++; /* includes call itself */ - if (extra < 0) extra = 0; - luaK_setreturns(fs, e, extra); /* last exp. provides the difference */ - if (extra > 1) luaK_reserveregs(fs, extra-1); - } - else { - if (e->k != VVOID) luaK_exp2nextreg(fs, e); /* close last expression */ - if (extra > 0) { - int reg = fs->freereg; - luaK_reserveregs(fs, extra); - luaK_nil(fs, reg, extra); - } - } -} - - -static void enterlevel (LexState *ls) { - lua_State *L = ls->L; - ++L->nCcalls; - checklimit(ls->fs, L->nCcalls, LUAI_MAXCCALLS, "C levels"); -} - - -#define leavelevel(ls) ((ls)->L->nCcalls--) - - -static void closegoto (LexState *ls, int g, Labeldesc *label) { - int i; - FuncState *fs = ls->fs; - Labellist *gl = &ls->dyd->gt; - Labeldesc *gt = &gl->arr[g]; - lua_assert(luaS_eqstr(gt->name, label->name)); - if (gt->nactvar < label->nactvar) { - TString *vname = getlocvar(fs, gt->nactvar)->varname; - const char *msg = luaO_pushfstring(ls->L, - " at line %d jumps into the scope of local " LUA_QS, - getstr(gt->name), gt->line, getstr(vname)); - semerror(ls, msg); - } - luaK_patchlist(fs, gt->pc, label->pc); - /* remove goto from pending list */ - for (i = g; i < gl->n - 1; i++) - gl->arr[i] = gl->arr[i + 1]; - gl->n--; -} - - -/* -** try to close a goto with existing labels; this solves backward jumps -*/ -static int findlabel (LexState *ls, int g) { - int i; - BlockCnt *bl = ls->fs->bl; - Dyndata *dyd = ls->dyd; - Labeldesc *gt = &dyd->gt.arr[g]; - /* check labels in current block for a match */ - for (i = bl->firstlabel; i < dyd->label.n; i++) { - Labeldesc *lb = &dyd->label.arr[i]; - if (luaS_eqstr(lb->name, gt->name)) { /* correct label? */ - if (gt->nactvar > lb->nactvar && - (bl->upval || dyd->label.n > bl->firstlabel)) - luaK_patchclose(ls->fs, gt->pc, lb->nactvar); - closegoto(ls, g, lb); /* close it */ - return 1; - } - } - return 0; /* label not found; cannot close goto */ -} - - -static int newlabelentry (LexState *ls, Labellist *l, TString *name, - int line, int pc) { - int n = l->n; - luaM_growvector(ls->L, l->arr, n, l->size, - Labeldesc, SHRT_MAX, "labels/gotos"); - l->arr[n].name = name; - l->arr[n].line = line; - l->arr[n].nactvar = ls->fs->nactvar; - l->arr[n].pc = pc; - l->n++; - return n; -} - - -/* -** check whether new label 'lb' matches any pending gotos in current -** block; solves forward jumps -*/ -static void findgotos (LexState *ls, Labeldesc *lb) { - Labellist *gl = &ls->dyd->gt; - int i = ls->fs->bl->firstgoto; - while (i < gl->n) { - if (luaS_eqstr(gl->arr[i].name, lb->name)) - closegoto(ls, i, lb); - else - i++; - } -} - - -/* -** "export" pending gotos to outer level, to check them against -** outer labels; if the block being exited has upvalues, and -** the goto exits the scope of any variable (which can be the -** upvalue), close those variables being exited. -*/ -static void movegotosout (FuncState *fs, BlockCnt *bl) { - int i = bl->firstgoto; - Labellist *gl = &fs->ls->dyd->gt; - /* correct pending gotos to current block and try to close it - with visible labels */ - while (i < gl->n) { - Labeldesc *gt = &gl->arr[i]; - if (gt->nactvar > bl->nactvar) { - if (bl->upval) - luaK_patchclose(fs, gt->pc, bl->nactvar); - gt->nactvar = bl->nactvar; - } - if (!findlabel(fs->ls, i)) - i++; /* move to next one */ - } -} - - -static void enterblock (FuncState *fs, BlockCnt *bl, lu_byte isloop) { - bl->isloop = isloop; - bl->nactvar = fs->nactvar; - bl->firstlabel = fs->ls->dyd->label.n; - bl->firstgoto = fs->ls->dyd->gt.n; - bl->upval = 0; - bl->previous = fs->bl; - fs->bl = bl; - lua_assert(fs->freereg == fs->nactvar); -} - - -/* -** create a label named "break" to resolve break statements -*/ -static void breaklabel (LexState *ls) { - TString *n = luaS_new(ls->L, "break"); - int l = newlabelentry(ls, &ls->dyd->label, n, 0, ls->fs->pc); - findgotos(ls, &ls->dyd->label.arr[l]); -} - -/* -** generates an error for an undefined 'goto'; choose appropriate -** message when label name is a reserved word (which can only be 'break') -*/ -static l_noret undefgoto (LexState *ls, Labeldesc *gt) { - const char *msg = isreserved(gt->name) - ? "<%s> at line %d not inside a loop" - : "no visible label " LUA_QS " for at line %d"; - msg = luaO_pushfstring(ls->L, msg, getstr(gt->name), gt->line); - semerror(ls, msg); -} - - -static void leaveblock (FuncState *fs) { - BlockCnt *bl = fs->bl; - LexState *ls = fs->ls; - if (bl->previous && bl->upval) { - /* create a 'jump to here' to close upvalues */ - int j = luaK_jump(fs); - luaK_patchclose(fs, j, bl->nactvar); - luaK_patchtohere(fs, j); - } - if (bl->isloop) - breaklabel(ls); /* close pending breaks */ - fs->bl = bl->previous; - removevars(fs, bl->nactvar); - lua_assert(bl->nactvar == fs->nactvar); - fs->freereg = fs->nactvar; /* free registers */ - ls->dyd->label.n = bl->firstlabel; /* remove local labels */ - if (bl->previous) /* inner block? */ - movegotosout(fs, bl); /* update pending gotos to outer block */ - else if (bl->firstgoto < ls->dyd->gt.n) /* pending gotos in outer block? */ - undefgoto(ls, &ls->dyd->gt.arr[bl->firstgoto]); /* error */ -} - - -/* -** adds a new prototype into list of prototypes -*/ -static Proto *addprototype (LexState *ls) { - Proto *clp; - lua_State *L = ls->L; - FuncState *fs = ls->fs; - Proto *f = fs->f; /* prototype of current function */ - if (fs->np >= f->sizep) { - int oldsize = f->sizep; - luaM_growvector(L, f->p, fs->np, f->sizep, Proto *, MAXARG_Bx, "functions"); - while (oldsize < f->sizep) f->p[oldsize++] = NULL; - } - f->p[fs->np++] = clp = luaF_newproto(L); - luaC_objbarrier(L, f, clp); - return clp; -} - - -/* -** codes instruction to create new closure in parent function. -** The OP_CLOSURE instruction must use the last available register, -** so that, if it invokes the GC, the GC knows which registers -** are in use at that time. -*/ -static void codeclosure (LexState *ls, expdesc *v) { - FuncState *fs = ls->fs->prev; - init_exp(v, VRELOCABLE, luaK_codeABx(fs, OP_CLOSURE, 0, fs->np - 1)); - luaK_exp2nextreg(fs, v); /* fix it at the last register */ -} - - -static void open_func (LexState *ls, FuncState *fs, BlockCnt *bl) { - lua_State *L = ls->L; - Proto *f; - fs->prev = ls->fs; /* linked list of funcstates */ - fs->ls = ls; - ls->fs = fs; - fs->pc = 0; - fs->lasttarget = 0; - fs->jpc = NO_JUMP; - fs->freereg = 0; - fs->nk = 0; - fs->np = 0; - fs->nups = 0; - fs->nlocvars = 0; - fs->nactvar = 0; - fs->firstlocal = ls->dyd->actvar.n; - fs->bl = NULL; - f = fs->f; - f->source = ls->source; - f->maxstacksize = 2; /* registers 0/1 are always valid */ - fs->h = luaH_new(L); - /* anchor table of constants (to avoid being collected) */ - sethvalue2s(L, L->top, fs->h); - incr_top(L); - enterblock(fs, bl, 0); -} - - -static void close_func (LexState *ls) { - lua_State *L = ls->L; - FuncState *fs = ls->fs; - Proto *f = fs->f; - luaK_ret(fs, 0, 0); /* final return */ - leaveblock(fs); - luaM_reallocvector(L, f->code, f->sizecode, fs->pc, Instruction); - f->sizecode = fs->pc; - luaM_reallocvector(L, f->lineinfo, f->sizelineinfo, fs->pc, int); - f->sizelineinfo = fs->pc; - luaM_reallocvector(L, f->k, f->sizek, fs->nk, TValue); - f->sizek = fs->nk; - luaM_reallocvector(L, f->p, f->sizep, fs->np, Proto *); - f->sizep = fs->np; - luaM_reallocvector(L, f->locvars, f->sizelocvars, fs->nlocvars, LocVar); - f->sizelocvars = fs->nlocvars; - luaM_reallocvector(L, f->upvalues, f->sizeupvalues, fs->nups, Upvaldesc); - f->sizeupvalues = fs->nups; - lua_assert(fs->bl == NULL); - ls->fs = fs->prev; - /* last token read was anchored in defunct function; must re-anchor it */ - anchor_token(ls); - L->top--; /* pop table of constants */ - luaC_checkGC(L); -} - - - -/*============================================================*/ -/* GRAMMAR RULES */ -/*============================================================*/ - - -/* -** check whether current token is in the follow set of a block. -** 'until' closes syntactical blocks, but do not close scope, -** so it handled in separate. -*/ -static int block_follow (LexState *ls, int withuntil) { - switch (ls->t.token) { - case TK_ELSE: case TK_ELSEIF: - case TK_END: case TK_EOS: - return 1; - case TK_UNTIL: return withuntil; - default: return 0; - } -} - - -static void statlist (LexState *ls) { - /* statlist -> { stat [`;'] } */ - while (!block_follow(ls, 1)) { - if (ls->t.token == TK_RETURN) { - statement(ls); - return; /* 'return' must be last statement */ - } - statement(ls); - } -} - - -static void fieldsel (LexState *ls, expdesc *v) { - /* fieldsel -> ['.' | ':'] NAME */ - FuncState *fs = ls->fs; - expdesc key; - luaK_exp2anyregup(fs, v); - luaX_next(ls); /* skip the dot or colon */ - checkname(ls, &key); - luaK_indexed(fs, v, &key); -} - - -static void yindex (LexState *ls, expdesc *v) { - /* index -> '[' expr ']' */ - luaX_next(ls); /* skip the '[' */ - expr(ls, v); - luaK_exp2val(ls->fs, v); - checknext(ls, ']'); -} - - -/* -** {====================================================================== -** Rules for Constructors -** ======================================================================= -*/ - - -struct ConsControl { - expdesc v; /* last list item read */ - expdesc *t; /* table descriptor */ - int nh; /* total number of `record' elements */ - int na; /* total number of array elements */ - int tostore; /* number of array elements pending to be stored */ -}; - - -static void recfield (LexState *ls, struct ConsControl *cc) { - /* recfield -> (NAME | `['exp1`]') = exp1 */ - FuncState *fs = ls->fs; - int reg = ls->fs->freereg; - expdesc key, val; - int rkkey; - if (ls->t.token == TK_NAME) { - checklimit(fs, cc->nh, MAX_INT, "items in a constructor"); - checkname(ls, &key); - } - else /* ls->t.token == '[' */ - yindex(ls, &key); - cc->nh++; - checknext(ls, '='); - rkkey = luaK_exp2RK(fs, &key); - expr(ls, &val); - luaK_codeABC(fs, OP_SETTABLE, cc->t->u.info, rkkey, luaK_exp2RK(fs, &val)); - fs->freereg = reg; /* free registers */ -} - - -static void closelistfield (FuncState *fs, struct ConsControl *cc) { - if (cc->v.k == VVOID) return; /* there is no list item */ - luaK_exp2nextreg(fs, &cc->v); - cc->v.k = VVOID; - if (cc->tostore == LFIELDS_PER_FLUSH) { - luaK_setlist(fs, cc->t->u.info, cc->na, cc->tostore); /* flush */ - cc->tostore = 0; /* no more items pending */ - } -} - - -static void lastlistfield (FuncState *fs, struct ConsControl *cc) { - if (cc->tostore == 0) return; - if (hasmultret(cc->v.k)) { - luaK_setmultret(fs, &cc->v); - luaK_setlist(fs, cc->t->u.info, cc->na, LUA_MULTRET); - cc->na--; /* do not count last expression (unknown number of elements) */ - } - else { - if (cc->v.k != VVOID) - luaK_exp2nextreg(fs, &cc->v); - luaK_setlist(fs, cc->t->u.info, cc->na, cc->tostore); - } -} - - -static void listfield (LexState *ls, struct ConsControl *cc) { - /* listfield -> exp */ - expr(ls, &cc->v); - checklimit(ls->fs, cc->na, MAX_INT, "items in a constructor"); - cc->na++; - cc->tostore++; -} - - -static void field (LexState *ls, struct ConsControl *cc) { - /* field -> listfield | recfield */ - switch(ls->t.token) { - case TK_NAME: { /* may be 'listfield' or 'recfield' */ - if (luaX_lookahead(ls) != '=') /* expression? */ - listfield(ls, cc); - else - recfield(ls, cc); - break; - } - case '[': { - recfield(ls, cc); - break; - } - default: { - listfield(ls, cc); - break; - } - } -} - - -static void constructor (LexState *ls, expdesc *t) { - /* constructor -> '{' [ field { sep field } [sep] ] '}' - sep -> ',' | ';' */ - FuncState *fs = ls->fs; - int line = ls->linenumber; - int pc = luaK_codeABC(fs, OP_NEWTABLE, 0, 0, 0); - struct ConsControl cc; - cc.na = cc.nh = cc.tostore = 0; - cc.t = t; - init_exp(t, VRELOCABLE, pc); - init_exp(&cc.v, VVOID, 0); /* no value (yet) */ - luaK_exp2nextreg(ls->fs, t); /* fix it at stack top */ - checknext(ls, '{'); - do { - lua_assert(cc.v.k == VVOID || cc.tostore > 0); - if (ls->t.token == '}') break; - closelistfield(fs, &cc); - field(ls, &cc); - } while (testnext(ls, ',') || testnext(ls, ';')); - check_match(ls, '}', '{', line); - lastlistfield(fs, &cc); - SETARG_B(fs->f->code[pc], luaO_int2fb(cc.na)); /* set initial array size */ - SETARG_C(fs->f->code[pc], luaO_int2fb(cc.nh)); /* set initial table size */ -} - -/* }====================================================================== */ - - - -static void parlist (LexState *ls) { - /* parlist -> [ param { `,' param } ] */ - FuncState *fs = ls->fs; - Proto *f = fs->f; - int nparams = 0; - f->is_vararg = 0; - if (ls->t.token != ')') { /* is `parlist' not empty? */ - do { - switch (ls->t.token) { - case TK_NAME: { /* param -> NAME */ - new_localvar(ls, str_checkname(ls)); - nparams++; - break; - } - case TK_DOTS: { /* param -> `...' */ - luaX_next(ls); - f->is_vararg = 1; - break; - } - default: luaX_syntaxerror(ls, " or " LUA_QL("...") " expected"); - } - } while (!f->is_vararg && testnext(ls, ',')); - } - adjustlocalvars(ls, nparams); - f->numparams = cast_byte(fs->nactvar); - luaK_reserveregs(fs, fs->nactvar); /* reserve register for parameters */ -} - - -static void body (LexState *ls, expdesc *e, int ismethod, int line) { - /* body -> `(' parlist `)' block END */ - FuncState new_fs; - BlockCnt bl; - new_fs.f = addprototype(ls); - new_fs.f->linedefined = line; - open_func(ls, &new_fs, &bl); - checknext(ls, '('); - if (ismethod) { - new_localvarliteral(ls, "self"); /* create 'self' parameter */ - adjustlocalvars(ls, 1); - } - parlist(ls); - checknext(ls, ')'); - statlist(ls); - new_fs.f->lastlinedefined = ls->linenumber; - check_match(ls, TK_END, TK_FUNCTION, line); - codeclosure(ls, e); - close_func(ls); -} - - -static int explist (LexState *ls, expdesc *v) { - /* explist -> expr { `,' expr } */ - int n = 1; /* at least one expression */ - expr(ls, v); - while (testnext(ls, ',')) { - luaK_exp2nextreg(ls->fs, v); - expr(ls, v); - n++; - } - return n; -} - - -static void funcargs (LexState *ls, expdesc *f, int line) { - FuncState *fs = ls->fs; - expdesc args; - int base, nparams; - switch (ls->t.token) { - case '(': { /* funcargs -> `(' [ explist ] `)' */ - luaX_next(ls); - if (ls->t.token == ')') /* arg list is empty? */ - args.k = VVOID; - else { - explist(ls, &args); - luaK_setmultret(fs, &args); - } - check_match(ls, ')', '(', line); - break; - } - case '{': { /* funcargs -> constructor */ - constructor(ls, &args); - break; - } - case TK_STRING: { /* funcargs -> STRING */ - codestring(ls, &args, ls->t.seminfo.ts); - luaX_next(ls); /* must use `seminfo' before `next' */ - break; - } - default: { - luaX_syntaxerror(ls, "function arguments expected"); - } - } - lua_assert(f->k == VNONRELOC); - base = f->u.info; /* base register for call */ - if (hasmultret(args.k)) - nparams = LUA_MULTRET; /* open call */ - else { - if (args.k != VVOID) - luaK_exp2nextreg(fs, &args); /* close last argument */ - nparams = fs->freereg - (base+1); - } - init_exp(f, VCALL, luaK_codeABC(fs, OP_CALL, base, nparams+1, 2)); - luaK_fixline(fs, line); - fs->freereg = base+1; /* call remove function and arguments and leaves - (unless changed) one result */ -} - - - - -/* -** {====================================================================== -** Expression parsing -** ======================================================================= -*/ - - -static void primaryexp (LexState *ls, expdesc *v) { - /* primaryexp -> NAME | '(' expr ')' */ - switch (ls->t.token) { - case '(': { - int line = ls->linenumber; - luaX_next(ls); - expr(ls, v); - check_match(ls, ')', '(', line); - luaK_dischargevars(ls->fs, v); - return; - } - case TK_NAME: { - singlevar(ls, v); - return; - } - default: { - luaX_syntaxerror(ls, "unexpected symbol"); - } - } -} - - -static void suffixedexp (LexState *ls, expdesc *v) { - /* suffixedexp -> - primaryexp { '.' NAME | '[' exp ']' | ':' NAME funcargs | funcargs } */ - FuncState *fs = ls->fs; - int line = ls->linenumber; - primaryexp(ls, v); - for (;;) { - switch (ls->t.token) { - case '.': { /* fieldsel */ - fieldsel(ls, v); - break; - } - case '[': { /* `[' exp1 `]' */ - expdesc key; - luaK_exp2anyregup(fs, v); - yindex(ls, &key); - luaK_indexed(fs, v, &key); - break; - } - case ':': { /* `:' NAME funcargs */ - expdesc key; - luaX_next(ls); - checkname(ls, &key); - luaK_self(fs, v, &key); - funcargs(ls, v, line); - break; - } - case '(': case TK_STRING: case '{': { /* funcargs */ - luaK_exp2nextreg(fs, v); - funcargs(ls, v, line); - break; - } - default: return; - } - } -} - - -static void simpleexp (LexState *ls, expdesc *v) { - /* simpleexp -> NUMBER | STRING | NIL | TRUE | FALSE | ... | - constructor | FUNCTION body | suffixedexp */ - switch (ls->t.token) { - case TK_NUMBER: { - init_exp(v, VKNUM, 0); - v->u.nval = ls->t.seminfo.r; - break; - } - case TK_STRING: { - codestring(ls, v, ls->t.seminfo.ts); - break; - } - case TK_NIL: { - init_exp(v, VNIL, 0); - break; - } - case TK_TRUE: { - init_exp(v, VTRUE, 0); - break; - } - case TK_FALSE: { - init_exp(v, VFALSE, 0); - break; - } - case TK_DOTS: { /* vararg */ - FuncState *fs = ls->fs; - check_condition(ls, fs->f->is_vararg, - "cannot use " LUA_QL("...") " outside a vararg function"); - init_exp(v, VVARARG, luaK_codeABC(fs, OP_VARARG, 0, 1, 0)); - break; - } - case '{': { /* constructor */ - constructor(ls, v); - return; - } - case TK_FUNCTION: { - luaX_next(ls); - body(ls, v, 0, ls->linenumber); - return; - } - default: { - suffixedexp(ls, v); - return; - } - } - luaX_next(ls); -} - - -static UnOpr getunopr (int op) { - switch (op) { - case TK_NOT: return OPR_NOT; - case '-': return OPR_MINUS; - case '#': return OPR_LEN; - default: return OPR_NOUNOPR; - } -} - - -static BinOpr getbinopr (int op) { - switch (op) { - case '+': return OPR_ADD; - case '-': return OPR_SUB; - case '*': return OPR_MUL; - case '/': return OPR_DIV; - case '%': return OPR_MOD; - case '^': return OPR_POW; - case TK_CONCAT: return OPR_CONCAT; - case TK_NE: return OPR_NE; - case TK_EQ: return OPR_EQ; - case '<': return OPR_LT; - case TK_LE: return OPR_LE; - case '>': return OPR_GT; - case TK_GE: return OPR_GE; - case TK_AND: return OPR_AND; - case TK_OR: return OPR_OR; - default: return OPR_NOBINOPR; - } -} - - -static const struct { - lu_byte left; /* left priority for each binary operator */ - lu_byte right; /* right priority */ -} priority[] = { /* ORDER OPR */ - {6, 6}, {6, 6}, {7, 7}, {7, 7}, {7, 7}, /* `+' `-' `*' `/' `%' */ - {10, 9}, {5, 4}, /* ^, .. (right associative) */ - {3, 3}, {3, 3}, {3, 3}, /* ==, <, <= */ - {3, 3}, {3, 3}, {3, 3}, /* ~=, >, >= */ - {2, 2}, {1, 1} /* and, or */ -}; - -#define UNARY_PRIORITY 8 /* priority for unary operators */ - - -/* -** subexpr -> (simpleexp | unop subexpr) { binop subexpr } -** where `binop' is any binary operator with a priority higher than `limit' -*/ -static BinOpr subexpr (LexState *ls, expdesc *v, int limit) { - BinOpr op; - UnOpr uop; - enterlevel(ls); - uop = getunopr(ls->t.token); - if (uop != OPR_NOUNOPR) { - int line = ls->linenumber; - luaX_next(ls); - subexpr(ls, v, UNARY_PRIORITY); - luaK_prefix(ls->fs, uop, v, line); - } - else simpleexp(ls, v); - /* expand while operators have priorities higher than `limit' */ - op = getbinopr(ls->t.token); - while (op != OPR_NOBINOPR && priority[op].left > limit) { - expdesc v2; - BinOpr nextop; - int line = ls->linenumber; - luaX_next(ls); - luaK_infix(ls->fs, op, v); - /* read sub-expression with higher priority */ - nextop = subexpr(ls, &v2, priority[op].right); - luaK_posfix(ls->fs, op, v, &v2, line); - op = nextop; - } - leavelevel(ls); - return op; /* return first untreated operator */ -} - - -static void expr (LexState *ls, expdesc *v) { - subexpr(ls, v, 0); -} - -/* }==================================================================== */ - - - -/* -** {====================================================================== -** Rules for Statements -** ======================================================================= -*/ - - -static void block (LexState *ls) { - /* block -> statlist */ - FuncState *fs = ls->fs; - BlockCnt bl; - enterblock(fs, &bl, 0); - statlist(ls); - leaveblock(fs); -} - - -/* -** structure to chain all variables in the left-hand side of an -** assignment -*/ -struct LHS_assign { - struct LHS_assign *prev; - expdesc v; /* variable (global, local, upvalue, or indexed) */ -}; - - -/* -** check whether, in an assignment to an upvalue/local variable, the -** upvalue/local variable is begin used in a previous assignment to a -** table. If so, save original upvalue/local value in a safe place and -** use this safe copy in the previous assignment. -*/ -static void check_conflict (LexState *ls, struct LHS_assign *lh, expdesc *v) { - FuncState *fs = ls->fs; - int extra = fs->freereg; /* eventual position to save local variable */ - int conflict = 0; - for (; lh; lh = lh->prev) { /* check all previous assignments */ - if (lh->v.k == VINDEXED) { /* assigning to a table? */ - /* table is the upvalue/local being assigned now? */ - if (lh->v.u.ind.vt == v->k && lh->v.u.ind.t == v->u.info) { - conflict = 1; - lh->v.u.ind.vt = VLOCAL; - lh->v.u.ind.t = extra; /* previous assignment will use safe copy */ - } - /* index is the local being assigned? (index cannot be upvalue) */ - if (v->k == VLOCAL && lh->v.u.ind.idx == v->u.info) { - conflict = 1; - lh->v.u.ind.idx = extra; /* previous assignment will use safe copy */ - } - } - } - if (conflict) { - /* copy upvalue/local value to a temporary (in position 'extra') */ - OpCode op = (v->k == VLOCAL) ? OP_MOVE : OP_GETUPVAL; - luaK_codeABC(fs, op, extra, v->u.info, 0); - luaK_reserveregs(fs, 1); - } -} - - -static void assignment (LexState *ls, struct LHS_assign *lh, int nvars) { - expdesc e; - check_condition(ls, vkisvar(lh->v.k), "syntax error"); - if (testnext(ls, ',')) { /* assignment -> ',' suffixedexp assignment */ - struct LHS_assign nv; - nv.prev = lh; - suffixedexp(ls, &nv.v); - if (nv.v.k != VINDEXED) - check_conflict(ls, lh, &nv.v); - checklimit(ls->fs, nvars + ls->L->nCcalls, LUAI_MAXCCALLS, - "C levels"); - assignment(ls, &nv, nvars+1); - } - else { /* assignment -> `=' explist */ - int nexps; - checknext(ls, '='); - nexps = explist(ls, &e); - if (nexps != nvars) { - adjust_assign(ls, nvars, nexps, &e); - if (nexps > nvars) - ls->fs->freereg -= nexps - nvars; /* remove extra values */ - } - else { - luaK_setoneret(ls->fs, &e); /* close last expression */ - luaK_storevar(ls->fs, &lh->v, &e); - return; /* avoid default */ - } - } - init_exp(&e, VNONRELOC, ls->fs->freereg-1); /* default assignment */ - luaK_storevar(ls->fs, &lh->v, &e); -} - - -static int cond (LexState *ls) { - /* cond -> exp */ - expdesc v; - expr(ls, &v); /* read condition */ - if (v.k == VNIL) v.k = VFALSE; /* `falses' are all equal here */ - luaK_goiftrue(ls->fs, &v); - return v.f; -} - - -static void gotostat (LexState *ls, int pc) { - int line = ls->linenumber; - TString *label; - int g; - if (testnext(ls, TK_GOTO)) - label = str_checkname(ls); - else { - luaX_next(ls); /* skip break */ - label = luaS_new(ls->L, "break"); - } - g = newlabelentry(ls, &ls->dyd->gt, label, line, pc); - findlabel(ls, g); /* close it if label already defined */ -} - - -/* check for repeated labels on the same block */ -static void checkrepeated (FuncState *fs, Labellist *ll, TString *label) { - int i; - for (i = fs->bl->firstlabel; i < ll->n; i++) { - if (luaS_eqstr(label, ll->arr[i].name)) { - const char *msg = luaO_pushfstring(fs->ls->L, - "label " LUA_QS " already defined on line %d", - getstr(label), ll->arr[i].line); - semerror(fs->ls, msg); - } - } -} - - -/* skip no-op statements */ -static void skipnoopstat (LexState *ls) { - while (ls->t.token == ';' || ls->t.token == TK_DBCOLON) - statement(ls); -} - - -static void labelstat (LexState *ls, TString *label, int line) { - /* label -> '::' NAME '::' */ - FuncState *fs = ls->fs; - Labellist *ll = &ls->dyd->label; - int l; /* index of new label being created */ - checkrepeated(fs, ll, label); /* check for repeated labels */ - checknext(ls, TK_DBCOLON); /* skip double colon */ - /* create new entry for this label */ - l = newlabelentry(ls, ll, label, line, fs->pc); - skipnoopstat(ls); /* skip other no-op statements */ - if (block_follow(ls, 0)) { /* label is last no-op statement in the block? */ - /* assume that locals are already out of scope */ - ll->arr[l].nactvar = fs->bl->nactvar; - } - findgotos(ls, &ll->arr[l]); -} - - -static void whilestat (LexState *ls, int line) { - /* whilestat -> WHILE cond DO block END */ - FuncState *fs = ls->fs; - int whileinit; - int condexit; - BlockCnt bl; - luaX_next(ls); /* skip WHILE */ - whileinit = luaK_getlabel(fs); - condexit = cond(ls); - enterblock(fs, &bl, 1); - checknext(ls, TK_DO); - block(ls); - luaK_jumpto(fs, whileinit); - check_match(ls, TK_END, TK_WHILE, line); - leaveblock(fs); - luaK_patchtohere(fs, condexit); /* false conditions finish the loop */ -} - - -static void repeatstat (LexState *ls, int line) { - /* repeatstat -> REPEAT block UNTIL cond */ - int condexit; - FuncState *fs = ls->fs; - int repeat_init = luaK_getlabel(fs); - BlockCnt bl1, bl2; - enterblock(fs, &bl1, 1); /* loop block */ - enterblock(fs, &bl2, 0); /* scope block */ - luaX_next(ls); /* skip REPEAT */ - statlist(ls); - check_match(ls, TK_UNTIL, TK_REPEAT, line); - condexit = cond(ls); /* read condition (inside scope block) */ - if (bl2.upval) /* upvalues? */ - luaK_patchclose(fs, condexit, bl2.nactvar); - leaveblock(fs); /* finish scope */ - luaK_patchlist(fs, condexit, repeat_init); /* close the loop */ - leaveblock(fs); /* finish loop */ -} - - -static int exp1 (LexState *ls) { - expdesc e; - int reg; - expr(ls, &e); - luaK_exp2nextreg(ls->fs, &e); - lua_assert(e.k == VNONRELOC); - reg = e.u.info; - return reg; -} - - -static void forbody (LexState *ls, int base, int line, int nvars, int isnum) { - /* forbody -> DO block */ - BlockCnt bl; - FuncState *fs = ls->fs; - int prep, endfor; - adjustlocalvars(ls, 3); /* control variables */ - checknext(ls, TK_DO); - prep = isnum ? luaK_codeAsBx(fs, OP_FORPREP, base, NO_JUMP) : luaK_jump(fs); - enterblock(fs, &bl, 0); /* scope for declared variables */ - adjustlocalvars(ls, nvars); - luaK_reserveregs(fs, nvars); - block(ls); - leaveblock(fs); /* end of scope for declared variables */ - luaK_patchtohere(fs, prep); - if (isnum) /* numeric for? */ - endfor = luaK_codeAsBx(fs, OP_FORLOOP, base, NO_JUMP); - else { /* generic for */ - luaK_codeABC(fs, OP_TFORCALL, base, 0, nvars); - luaK_fixline(fs, line); - endfor = luaK_codeAsBx(fs, OP_TFORLOOP, base + 2, NO_JUMP); - } - luaK_patchlist(fs, endfor, prep + 1); - luaK_fixline(fs, line); -} - - -static void fornum (LexState *ls, TString *varname, int line) { - /* fornum -> NAME = exp1,exp1[,exp1] forbody */ - FuncState *fs = ls->fs; - int base = fs->freereg; - new_localvarliteral(ls, "(for index)"); - new_localvarliteral(ls, "(for limit)"); - new_localvarliteral(ls, "(for step)"); - new_localvar(ls, varname); - checknext(ls, '='); - exp1(ls); /* initial value */ - checknext(ls, ','); - exp1(ls); /* limit */ - if (testnext(ls, ',')) - exp1(ls); /* optional step */ - else { /* default step = 1 */ - luaK_codek(fs, fs->freereg, luaK_numberK(fs, 1)); - luaK_reserveregs(fs, 1); - } - forbody(ls, base, line, 1, 1); -} - - -static void forlist (LexState *ls, TString *indexname) { - /* forlist -> NAME {,NAME} IN explist forbody */ - FuncState *fs = ls->fs; - expdesc e; - int nvars = 4; /* gen, state, control, plus at least one declared var */ - int line; - int base = fs->freereg; - /* create control variables */ - new_localvarliteral(ls, "(for generator)"); - new_localvarliteral(ls, "(for state)"); - new_localvarliteral(ls, "(for control)"); - /* create declared variables */ - new_localvar(ls, indexname); - while (testnext(ls, ',')) { - new_localvar(ls, str_checkname(ls)); - nvars++; - } - checknext(ls, TK_IN); - line = ls->linenumber; - adjust_assign(ls, 3, explist(ls, &e), &e); - luaK_checkstack(fs, 3); /* extra space to call generator */ - forbody(ls, base, line, nvars - 3, 0); -} - - -static void forstat (LexState *ls, int line) { - /* forstat -> FOR (fornum | forlist) END */ - FuncState *fs = ls->fs; - TString *varname; - BlockCnt bl; - enterblock(fs, &bl, 1); /* scope for loop and control variables */ - luaX_next(ls); /* skip `for' */ - varname = str_checkname(ls); /* first variable name */ - switch (ls->t.token) { - case '=': fornum(ls, varname, line); break; - case ',': case TK_IN: forlist(ls, varname); break; - default: luaX_syntaxerror(ls, LUA_QL("=") " or " LUA_QL("in") " expected"); - } - check_match(ls, TK_END, TK_FOR, line); - leaveblock(fs); /* loop scope (`break' jumps to this point) */ -} - - -static void test_then_block (LexState *ls, int *escapelist) { - /* test_then_block -> [IF | ELSEIF] cond THEN block */ - BlockCnt bl; - FuncState *fs = ls->fs; - expdesc v; - int jf; /* instruction to skip 'then' code (if condition is false) */ - luaX_next(ls); /* skip IF or ELSEIF */ - expr(ls, &v); /* read condition */ - checknext(ls, TK_THEN); - if (ls->t.token == TK_GOTO || ls->t.token == TK_BREAK) { - luaK_goiffalse(ls->fs, &v); /* will jump to label if condition is true */ - enterblock(fs, &bl, 0); /* must enter block before 'goto' */ - gotostat(ls, v.t); /* handle goto/break */ - skipnoopstat(ls); /* skip other no-op statements */ - if (block_follow(ls, 0)) { /* 'goto' is the entire block? */ - leaveblock(fs); - return; /* and that is it */ - } - else /* must skip over 'then' part if condition is false */ - jf = luaK_jump(fs); - } - else { /* regular case (not goto/break) */ - luaK_goiftrue(ls->fs, &v); /* skip over block if condition is false */ - enterblock(fs, &bl, 0); - jf = v.f; - } - statlist(ls); /* `then' part */ - leaveblock(fs); - if (ls->t.token == TK_ELSE || - ls->t.token == TK_ELSEIF) /* followed by 'else'/'elseif'? */ - luaK_concat(fs, escapelist, luaK_jump(fs)); /* must jump over it */ - luaK_patchtohere(fs, jf); -} - - -static void ifstat (LexState *ls, int line) { - /* ifstat -> IF cond THEN block {ELSEIF cond THEN block} [ELSE block] END */ - FuncState *fs = ls->fs; - int escapelist = NO_JUMP; /* exit list for finished parts */ - test_then_block(ls, &escapelist); /* IF cond THEN block */ - while (ls->t.token == TK_ELSEIF) - test_then_block(ls, &escapelist); /* ELSEIF cond THEN block */ - if (testnext(ls, TK_ELSE)) - block(ls); /* `else' part */ - check_match(ls, TK_END, TK_IF, line); - luaK_patchtohere(fs, escapelist); /* patch escape list to 'if' end */ -} - - -static void localfunc (LexState *ls) { - expdesc b; - FuncState *fs = ls->fs; - new_localvar(ls, str_checkname(ls)); /* new local variable */ - adjustlocalvars(ls, 1); /* enter its scope */ - body(ls, &b, 0, ls->linenumber); /* function created in next register */ - /* debug information will only see the variable after this point! */ - getlocvar(fs, b.u.info)->startpc = fs->pc; -} - - -static void localstat (LexState *ls) { - /* stat -> LOCAL NAME {`,' NAME} [`=' explist] */ - int nvars = 0; - int nexps; - expdesc e; - do { - new_localvar(ls, str_checkname(ls)); - nvars++; - } while (testnext(ls, ',')); - if (testnext(ls, '=')) - nexps = explist(ls, &e); - else { - e.k = VVOID; - nexps = 0; - } - adjust_assign(ls, nvars, nexps, &e); - adjustlocalvars(ls, nvars); -} - - -static int funcname (LexState *ls, expdesc *v) { - /* funcname -> NAME {fieldsel} [`:' NAME] */ - int ismethod = 0; - singlevar(ls, v); - while (ls->t.token == '.') - fieldsel(ls, v); - if (ls->t.token == ':') { - ismethod = 1; - fieldsel(ls, v); - } - return ismethod; -} - - -static void funcstat (LexState *ls, int line) { - /* funcstat -> FUNCTION funcname body */ - int ismethod; - expdesc v, b; - luaX_next(ls); /* skip FUNCTION */ - ismethod = funcname(ls, &v); - body(ls, &b, ismethod, line); - luaK_storevar(ls->fs, &v, &b); - luaK_fixline(ls->fs, line); /* definition `happens' in the first line */ -} - - -static void exprstat (LexState *ls) { - /* stat -> func | assignment */ - FuncState *fs = ls->fs; - struct LHS_assign v; - suffixedexp(ls, &v.v); - if (ls->t.token == '=' || ls->t.token == ',') { /* stat -> assignment ? */ - v.prev = NULL; - assignment(ls, &v, 1); - } - else { /* stat -> func */ - check_condition(ls, v.v.k == VCALL, "syntax error"); - SETARG_C(getcode(fs, &v.v), 1); /* call statement uses no results */ - } -} - - -static void retstat (LexState *ls) { - /* stat -> RETURN [explist] [';'] */ - FuncState *fs = ls->fs; - expdesc e; - int first, nret; /* registers with returned values */ - if (block_follow(ls, 1) || ls->t.token == ';') - first = nret = 0; /* return no values */ - else { - nret = explist(ls, &e); /* optional return values */ - if (hasmultret(e.k)) { - luaK_setmultret(fs, &e); - if (e.k == VCALL && nret == 1) { /* tail call? */ - SET_OPCODE(getcode(fs,&e), OP_TAILCALL); - lua_assert(GETARG_A(getcode(fs,&e)) == fs->nactvar); - } - first = fs->nactvar; - nret = LUA_MULTRET; /* return all values */ - } - else { - if (nret == 1) /* only one single value? */ - first = luaK_exp2anyreg(fs, &e); - else { - luaK_exp2nextreg(fs, &e); /* values must go to the `stack' */ - first = fs->nactvar; /* return all `active' values */ - lua_assert(nret == fs->freereg - first); - } - } - } - luaK_ret(fs, first, nret); - testnext(ls, ';'); /* skip optional semicolon */ -} - - -static void statement (LexState *ls) { - int line = ls->linenumber; /* may be needed for error messages */ - enterlevel(ls); - switch (ls->t.token) { - case ';': { /* stat -> ';' (empty statement) */ - luaX_next(ls); /* skip ';' */ - break; - } - case TK_IF: { /* stat -> ifstat */ - ifstat(ls, line); - break; - } - case TK_WHILE: { /* stat -> whilestat */ - whilestat(ls, line); - break; - } - case TK_DO: { /* stat -> DO block END */ - luaX_next(ls); /* skip DO */ - block(ls); - check_match(ls, TK_END, TK_DO, line); - break; - } - case TK_FOR: { /* stat -> forstat */ - forstat(ls, line); - break; - } - case TK_REPEAT: { /* stat -> repeatstat */ - repeatstat(ls, line); - break; - } - case TK_FUNCTION: { /* stat -> funcstat */ - funcstat(ls, line); - break; - } - case TK_LOCAL: { /* stat -> localstat */ - luaX_next(ls); /* skip LOCAL */ - if (testnext(ls, TK_FUNCTION)) /* local function? */ - localfunc(ls); - else - localstat(ls); - break; - } - case TK_DBCOLON: { /* stat -> label */ - luaX_next(ls); /* skip double colon */ - labelstat(ls, str_checkname(ls), line); - break; - } - case TK_RETURN: { /* stat -> retstat */ - luaX_next(ls); /* skip RETURN */ - retstat(ls); - break; - } - case TK_BREAK: /* stat -> breakstat */ - case TK_GOTO: { /* stat -> 'goto' NAME */ - gotostat(ls, luaK_jump(ls->fs)); - break; - } - default: { /* stat -> func | assignment */ - exprstat(ls); - break; - } - } - lua_assert(ls->fs->f->maxstacksize >= ls->fs->freereg && - ls->fs->freereg >= ls->fs->nactvar); - ls->fs->freereg = ls->fs->nactvar; /* free registers */ - leavelevel(ls); -} - -/* }====================================================================== */ - - -/* -** compiles the main function, which is a regular vararg function with an -** upvalue named LUA_ENV -*/ -static void mainfunc (LexState *ls, FuncState *fs) { - BlockCnt bl; - expdesc v; - open_func(ls, fs, &bl); - fs->f->is_vararg = 1; /* main function is always vararg */ - init_exp(&v, VLOCAL, 0); /* create and... */ - newupvalue(fs, ls->envn, &v); /* ...set environment upvalue */ - luaX_next(ls); /* read first token */ - statlist(ls); /* parse main body */ - check(ls, TK_EOS); - close_func(ls); -} - - -Closure *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff, - Dyndata *dyd, const char *name, int firstchar) { - LexState lexstate; - FuncState funcstate; - Closure *cl = luaF_newLclosure(L, 1); /* create main closure */ - /* anchor closure (to avoid being collected) */ - setclLvalue(L, L->top, cl); - incr_top(L); - funcstate.f = cl->l.p = luaF_newproto(L); - funcstate.f->source = luaS_new(L, name); /* create and anchor TString */ - lexstate.buff = buff; - lexstate.dyd = dyd; - dyd->actvar.n = dyd->gt.n = dyd->label.n = 0; - luaX_setinput(L, &lexstate, z, funcstate.f->source, firstchar); - mainfunc(&lexstate, &funcstate); - lua_assert(!funcstate.prev && funcstate.nups == 1 && !lexstate.fs); - /* all scopes should be correctly finished */ - lua_assert(dyd->actvar.n == 0 && dyd->gt.n == 0 && dyd->label.n == 0); - return cl; /* it's on the stack too */ -} - diff --git a/radio/src/lua/src/lparser.h b/radio/src/lua/src/lparser.h deleted file mode 100644 index 301167d4f..000000000 --- a/radio/src/lua/src/lparser.h +++ /dev/null @@ -1,119 +0,0 @@ -/* -** $Id: lparser.h,v 1.70 2012/05/08 13:53:33 roberto Exp $ -** Lua Parser -** See Copyright Notice in lua.h -*/ - -#ifndef lparser_h -#define lparser_h - -#include "llimits.h" -#include "lobject.h" -#include "lzio.h" - - -/* -** Expression descriptor -*/ - -typedef enum { - VVOID, /* no value */ - VNIL, - VTRUE, - VFALSE, - VK, /* info = index of constant in `k' */ - VKNUM, /* nval = numerical value */ - VNONRELOC, /* info = result register */ - VLOCAL, /* info = local register */ - VUPVAL, /* info = index of upvalue in 'upvalues' */ - VINDEXED, /* t = table register/upvalue; idx = index R/K */ - VJMP, /* info = instruction pc */ - VRELOCABLE, /* info = instruction pc */ - VCALL, /* info = instruction pc */ - VVARARG /* info = instruction pc */ -} expkind; - - -#define vkisvar(k) (VLOCAL <= (k) && (k) <= VINDEXED) -#define vkisinreg(k) ((k) == VNONRELOC || (k) == VLOCAL) - -typedef struct expdesc { - expkind k; - union { - struct { /* for indexed variables (VINDEXED) */ - short idx; /* index (R/K) */ - lu_byte t; /* table (register or upvalue) */ - lu_byte vt; /* whether 't' is register (VLOCAL) or upvalue (VUPVAL) */ - } ind; - int info; /* for generic use */ - lua_Number nval; /* for VKNUM */ - } u; - int t; /* patch list of `exit when true' */ - int f; /* patch list of `exit when false' */ -} expdesc; - - -/* description of active local variable */ -typedef struct Vardesc { - short idx; /* variable index in stack */ -} Vardesc; - - -/* description of pending goto statements and label statements */ -typedef struct Labeldesc { - TString *name; /* label identifier */ - int pc; /* position in code */ - int line; /* line where it appeared */ - lu_byte nactvar; /* local level where it appears in current block */ -} Labeldesc; - - -/* list of labels or gotos */ -typedef struct Labellist { - Labeldesc *arr; /* array */ - int n; /* number of entries in use */ - int size; /* array size */ -} Labellist; - - -/* dynamic structures used by the parser */ -typedef struct Dyndata { - struct { /* list of active local variables */ - Vardesc *arr; - int n; - int size; - } actvar; - Labellist gt; /* list of pending gotos */ - Labellist label; /* list of active labels */ -} Dyndata; - - -/* control of blocks */ -struct BlockCnt; /* defined in lparser.c */ - - -/* state needed to generate code for a given function */ -typedef struct FuncState { - Proto *f; /* current function header */ - Table *h; /* table to find (and reuse) elements in `k' */ - struct FuncState *prev; /* enclosing function */ - struct LexState *ls; /* lexical state */ - struct BlockCnt *bl; /* chain of current blocks */ - int pc; /* next position to code (equivalent to `ncode') */ - int lasttarget; /* 'label' of last 'jump label' */ - int jpc; /* list of pending jumps to `pc' */ - int nk; /* number of elements in `k' */ - int np; /* number of elements in `p' */ - int firstlocal; /* index of first local var (in Dyndata array) */ - short nlocvars; /* number of elements in 'f->locvars' */ - lu_byte nactvar; /* number of active local variables */ - lu_byte nups; /* number of upvalues */ - lu_byte freereg; /* first free register */ -} FuncState; - - -LUAI_FUNC Closure *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff, - Dyndata *dyd, const char *name, int firstchar); - - -#endif diff --git a/radio/src/lua/src/lstate.c b/radio/src/lua/src/lstate.c deleted file mode 100644 index 207a106d5..000000000 --- a/radio/src/lua/src/lstate.c +++ /dev/null @@ -1,322 +0,0 @@ -/* -** $Id: lstate.c,v 2.99 2012/10/02 17:40:53 roberto Exp $ -** Global State -** See Copyright Notice in lua.h -*/ - - -#include -#include - -#define lstate_c -#define LUA_CORE - -#include "lua.h" - -#include "lapi.h" -#include "ldebug.h" -#include "ldo.h" -#include "lfunc.h" -#include "lgc.h" -#include "llex.h" -#include "lmem.h" -#include "lstate.h" -#include "lstring.h" -#include "ltable.h" -#include "ltm.h" - - -#if !defined(LUAI_GCPAUSE) -#define LUAI_GCPAUSE 200 /* 200% */ -#endif - -#if !defined(LUAI_GCMAJOR) -#define LUAI_GCMAJOR 200 /* 200% */ -#endif - -#if !defined(LUAI_GCMUL) -#define LUAI_GCMUL 200 /* GC runs 'twice the speed' of memory allocation */ -#endif - - -#define MEMERRMSG "not enough memory" - - -/* -** a macro to help the creation of a unique random seed when a state is -** created; the seed is used to randomize hashes. -*/ -#if !defined(luai_makeseed) -#include -#define luai_makeseed() cast(unsigned int, time(NULL)) -#endif - - - -/* -** thread state + extra space -*/ -typedef struct LX { -#if defined(LUAI_EXTRASPACE) - char buff[LUAI_EXTRASPACE]; -#endif - lua_State l; -} LX; - - -/* -** Main thread combines a thread state and the global state -*/ -typedef struct LG { - LX l; - global_State g; -} LG; - - - -#define fromstate(L) (cast(LX *, cast(lu_byte *, (L)) - offsetof(LX, l))) - - -/* -** Compute an initial seed as random as possible. In ANSI, rely on -** Address Space Layout Randomization (if present) to increase -** randomness.. -*/ -#define addbuff(b,p,e) \ - { size_t t = cast(size_t, e); \ - memcpy(buff + p, &t, sizeof(t)); p += sizeof(t); } - -static unsigned int makeseed (lua_State *L) { - char buff[4 * sizeof(size_t)]; - unsigned int h = luai_makeseed(); - int p = 0; - addbuff(buff, p, L); /* heap variable */ - addbuff(buff, p, &h); /* local variable */ - addbuff(buff, p, luaO_nilobject); /* global variable */ - addbuff(buff, p, &lua_newstate); /* public function */ - lua_assert(p == sizeof(buff)); - return luaS_hash(buff, p, h); -} - - -/* -** set GCdebt to a new value keeping the value (totalbytes + GCdebt) -** invariant -*/ -void luaE_setdebt (global_State *g, l_mem debt) { - g->totalbytes -= (debt - g->GCdebt); - g->GCdebt = debt; -} - - -CallInfo *luaE_extendCI (lua_State *L) { - CallInfo *ci = luaM_new(L, CallInfo); - lua_assert(L->ci->next == NULL); - L->ci->next = ci; - ci->previous = L->ci; - ci->next = NULL; - return ci; -} - - -void luaE_freeCI (lua_State *L) { - CallInfo *ci = L->ci; - CallInfo *next = ci->next; - ci->next = NULL; - while ((ci = next) != NULL) { - next = ci->next; - luaM_free(L, ci); - } -} - - -static void stack_init (lua_State *L1, lua_State *L) { - int i; CallInfo *ci; - /* initialize stack array */ - L1->stack = luaM_newvector(L, BASIC_STACK_SIZE, TValue); - L1->stacksize = BASIC_STACK_SIZE; - for (i = 0; i < BASIC_STACK_SIZE; i++) - setnilvalue(L1->stack + i); /* erase new stack */ - L1->top = L1->stack; - L1->stack_last = L1->stack + L1->stacksize - EXTRA_STACK; - /* initialize first ci */ - ci = &L1->base_ci; - ci->next = ci->previous = NULL; - ci->callstatus = 0; - ci->func = L1->top; - setnilvalue(L1->top++); /* 'function' entry for this 'ci' */ - ci->top = L1->top + LUA_MINSTACK; - L1->ci = ci; -} - - -static void freestack (lua_State *L) { - if (L->stack == NULL) - return; /* stack not completely built yet */ - L->ci = &L->base_ci; /* free the entire 'ci' list */ - luaE_freeCI(L); - luaM_freearray(L, L->stack, L->stacksize); /* free stack array */ -} - - -/* -** Create registry table and its predefined values -*/ -static void init_registry (lua_State *L, global_State *g) { - TValue mt; - /* create registry */ - Table *registry = luaH_new(L); - sethvalue(L, &g->l_registry, registry); - luaH_resize(L, registry, LUA_RIDX_LAST, 0); - /* registry[LUA_RIDX_MAINTHREAD] = L */ - setthvalue(L, &mt, L); - luaH_setint(L, registry, LUA_RIDX_MAINTHREAD, &mt); - /* registry[LUA_RIDX_GLOBALS] = table of globals */ - sethvalue(L, &mt, luaH_new(L)); - luaH_setint(L, registry, LUA_RIDX_GLOBALS, &mt); -} - - -/* -** open parts of the state that may cause memory-allocation errors -*/ -static void f_luaopen (lua_State *L, void *ud) { - global_State *g = G(L); - UNUSED(ud); - stack_init(L, L); /* init stack */ - init_registry(L, g); - luaS_resize(L, MINSTRTABSIZE); /* initial size of string table */ - luaT_init(L); - luaX_init(L); - /* pre-create memory-error message */ - g->memerrmsg = luaS_newliteral(L, MEMERRMSG); - luaS_fix(g->memerrmsg); /* it should never be collected */ - g->gcrunning = 1; /* allow gc */ -} - - -/* -** preinitialize a state with consistent values without allocating -** any memory (to avoid errors) -*/ -static void preinit_state (lua_State *L, global_State *g) { - G(L) = g; - L->stack = NULL; - L->ci = NULL; - L->stacksize = 0; - L->errorJmp = NULL; - L->nCcalls = 0; - L->hook = NULL; - L->hookmask = 0; - L->basehookcount = 0; - L->allowhook = 1; - resethookcount(L); - L->openupval = NULL; - L->nny = 1; - L->status = LUA_OK; - L->errfunc = 0; -} - - -static void close_state (lua_State *L) { - global_State *g = G(L); - luaF_close(L, L->stack); /* close all upvalues for this thread */ - luaC_freeallobjects(L); /* collect all objects */ - luaM_freearray(L, G(L)->strt.hash, G(L)->strt.size); - luaZ_freebuffer(L, &g->buff); - freestack(L); - lua_assert(gettotalbytes(g) == sizeof(LG)); - (*g->frealloc)(g->ud, fromstate(L), sizeof(LG), 0); /* free main block */ -} - - -LUA_API lua_State *lua_newthread (lua_State *L) { - lua_State *L1; - lua_lock(L); - luaC_checkGC(L); - L1 = &luaC_newobj(L, LUA_TTHREAD, sizeof(LX), NULL, offsetof(LX, l))->th; - setthvalue(L, L->top, L1); - api_incr_top(L); - preinit_state(L1, G(L)); - L1->hookmask = L->hookmask; - L1->basehookcount = L->basehookcount; - L1->hook = L->hook; - resethookcount(L1); - luai_userstatethread(L, L1); - stack_init(L1, L); /* init stack */ - lua_unlock(L); - return L1; -} - - -void luaE_freethread (lua_State *L, lua_State *L1) { - LX *l = fromstate(L1); - luaF_close(L1, L1->stack); /* close all upvalues for this thread */ - lua_assert(L1->openupval == NULL); - luai_userstatefree(L, L1); - freestack(L1); - luaM_free(L, l); -} - - -LUA_API lua_State *lua_newstate (lua_Alloc f, void *ud) { - int i; - lua_State *L; - global_State *g; - LG *l = cast(LG *, (*f)(ud, NULL, LUA_TTHREAD, sizeof(LG))); - if (l == NULL) return NULL; - L = &l->l.l; - g = &l->g; - L->next = NULL; - L->tt = LUA_TTHREAD; - g->currentwhite = bit2mask(WHITE0BIT, FIXEDBIT); - L->marked = luaC_white(g); - g->gckind = KGC_NORMAL; - preinit_state(L, g); - g->frealloc = f; - g->ud = ud; - g->mainthread = L; - g->seed = makeseed(L); - g->uvhead.u.l.prev = &g->uvhead; - g->uvhead.u.l.next = &g->uvhead; - g->gcrunning = 0; /* no GC while building state */ - g->GCestimate = 0; - g->strt.size = 0; - g->strt.nuse = 0; - g->strt.hash = NULL; - setnilvalue(&g->l_registry); - luaZ_initbuffer(L, &g->buff); - g->panic = NULL; - g->version = lua_version(NULL); - g->gcstate = GCSpause; - g->allgc = NULL; - g->finobj = NULL; - g->tobefnz = NULL; - g->sweepgc = g->sweepfin = NULL; - g->gray = g->grayagain = NULL; - g->weak = g->ephemeron = g->allweak = NULL; - g->totalbytes = sizeof(LG); - g->GCdebt = 0; - g->gcpause = LUAI_GCPAUSE; - g->gcmajorinc = LUAI_GCMAJOR; - g->gcstepmul = LUAI_GCMUL; - for (i=0; i < LUA_NUMTAGS; i++) g->mt[i] = NULL; - if (luaD_rawrunprotected(L, f_luaopen, NULL) != LUA_OK) { - /* memory allocation error: free partial state */ - close_state(L); - L = NULL; - } - else - luai_userstateopen(L); - return L; -} - - -LUA_API void lua_close (lua_State *L) { - L = G(L)->mainthread; /* only the main thread can be closed */ - lua_lock(L); - luai_userstateclose(L); - close_state(L); -} - - diff --git a/radio/src/lua/src/lstate.h b/radio/src/lua/src/lstate.h deleted file mode 100644 index c8a31f5c0..000000000 --- a/radio/src/lua/src/lstate.h +++ /dev/null @@ -1,228 +0,0 @@ -/* -** $Id: lstate.h,v 2.82 2012/07/02 13:37:04 roberto Exp $ -** Global State -** See Copyright Notice in lua.h -*/ - -#ifndef lstate_h -#define lstate_h - -#include "lua.h" - -#include "lobject.h" -#include "ltm.h" -#include "lzio.h" - - -/* - -** Some notes about garbage-collected objects: All objects in Lua must -** be kept somehow accessible until being freed. -** -** Lua keeps most objects linked in list g->allgc. The link uses field -** 'next' of the CommonHeader. -** -** Strings are kept in several lists headed by the array g->strt.hash. -** -** Open upvalues are not subject to independent garbage collection. They -** are collected together with their respective threads. Lua keeps a -** double-linked list with all open upvalues (g->uvhead) so that it can -** mark objects referred by them. (They are always gray, so they must -** be remarked in the atomic step. Usually their contents would be marked -** when traversing the respective threads, but the thread may already be -** dead, while the upvalue is still accessible through closures.) -** -** Objects with finalizers are kept in the list g->finobj. -** -** The list g->tobefnz links all objects being finalized. - -*/ - - -struct lua_longjmp; /* defined in ldo.c */ - - - -/* extra stack space to handle TM calls and some other extras */ -#define EXTRA_STACK 5 - - -#define BASIC_STACK_SIZE (2*LUA_MINSTACK) - - -/* kinds of Garbage Collection */ -#define KGC_NORMAL 0 -#define KGC_EMERGENCY 1 /* gc was forced by an allocation failure */ -#define KGC_GEN 2 /* generational collection */ - - -typedef struct stringtable { - GCObject **hash; - lu_int32 nuse; /* number of elements */ - int size; -} stringtable; - - -/* -** information about a call -*/ -typedef struct CallInfo { - StkId func; /* function index in the stack */ - StkId top; /* top for this function */ - struct CallInfo *previous, *next; /* dynamic call link */ - short nresults; /* expected number of results from this function */ - lu_byte callstatus; - ptrdiff_t extra; - union { - struct { /* only for Lua functions */ - StkId base; /* base for this function */ - const Instruction *savedpc; - } l; - struct { /* only for C functions */ - int ctx; /* context info. in case of yields */ - lua_CFunction k; /* continuation in case of yields */ - ptrdiff_t old_errfunc; - lu_byte old_allowhook; - lu_byte status; - } c; - } u; -} CallInfo; - - -/* -** Bits in CallInfo status -*/ -#define CIST_LUA (1<<0) /* call is running a Lua function */ -#define CIST_HOOKED (1<<1) /* call is running a debug hook */ -#define CIST_REENTRY (1<<2) /* call is running on same invocation of - luaV_execute of previous call */ -#define CIST_YIELDED (1<<3) /* call reentered after suspension */ -#define CIST_YPCALL (1<<4) /* call is a yieldable protected call */ -#define CIST_STAT (1<<5) /* call has an error status (pcall) */ -#define CIST_TAIL (1<<6) /* call was tail called */ -#define CIST_HOOKYIELD (1<<7) /* last hook called yielded */ - - -#define isLua(ci) ((ci)->callstatus & CIST_LUA) - - -/* -** `global state', shared by all threads of this state -*/ -typedef struct global_State { - lua_Alloc frealloc; /* function to reallocate memory */ - void *ud; /* auxiliary data to `frealloc' */ - lu_mem totalbytes; /* number of bytes currently allocated - GCdebt */ - l_mem GCdebt; /* bytes allocated not yet compensated by the collector */ - lu_mem GCmemtrav; /* memory traversed by the GC */ - lu_mem GCestimate; /* an estimate of the non-garbage memory in use */ - stringtable strt; /* hash table for strings */ - TValue l_registry; - unsigned int seed; /* randomized seed for hashes */ - lu_byte currentwhite; - lu_byte gcstate; /* state of garbage collector */ - lu_byte gckind; /* kind of GC running */ - lu_byte gcrunning; /* true if GC is running */ - int sweepstrgc; /* position of sweep in `strt' */ - GCObject *allgc; /* list of all collectable objects */ - GCObject *finobj; /* list of collectable objects with finalizers */ - GCObject **sweepgc; /* current position of sweep in list 'allgc' */ - GCObject **sweepfin; /* current position of sweep in list 'finobj' */ - GCObject *gray; /* list of gray objects */ - GCObject *grayagain; /* list of objects to be traversed atomically */ - GCObject *weak; /* list of tables with weak values */ - GCObject *ephemeron; /* list of ephemeron tables (weak keys) */ - GCObject *allweak; /* list of all-weak tables */ - GCObject *tobefnz; /* list of userdata to be GC */ - UpVal uvhead; /* head of double-linked list of all open upvalues */ - Mbuffer buff; /* temporary buffer for string concatenation */ - int gcpause; /* size of pause between successive GCs */ - int gcmajorinc; /* pause between major collections (only in gen. mode) */ - int gcstepmul; /* GC `granularity' */ - lua_CFunction panic; /* to be called in unprotected errors */ - struct lua_State *mainthread; - const lua_Number *version; /* pointer to version number */ - TString *memerrmsg; /* memory-error message */ - TString *tmname[TM_N]; /* array with tag-method names */ - struct Table *mt[LUA_NUMTAGS]; /* metatables for basic types */ -} global_State; - - -/* -** `per thread' state -*/ -struct lua_State { - CommonHeader; - lu_byte status; - StkId top; /* first free slot in the stack */ - global_State *l_G; - CallInfo *ci; /* call info for current function */ - const Instruction *oldpc; /* last pc traced */ - StkId stack_last; /* last free slot in the stack */ - StkId stack; /* stack base */ - int stacksize; - unsigned short nny; /* number of non-yieldable calls in stack */ - unsigned short nCcalls; /* number of nested C calls */ - lu_byte hookmask; - lu_byte allowhook; - int basehookcount; - int hookcount; - lua_Hook hook; - GCObject *openupval; /* list of open upvalues in this stack */ - GCObject *gclist; - struct lua_longjmp *errorJmp; /* current error recover point */ - ptrdiff_t errfunc; /* current error handling function (stack index) */ - CallInfo base_ci; /* CallInfo for first level (C calling Lua) */ -}; - - -#define G(L) (L->l_G) - - -/* -** Union of all collectable objects -*/ -union GCObject { - GCheader gch; /* common header */ - union TString ts; - union Udata u; - union Closure cl; - struct Table h; - struct Proto p; - struct UpVal uv; - struct lua_State th; /* thread */ -}; - - -#define gch(o) (&(o)->gch) - -/* macros to convert a GCObject into a specific value */ -#define rawgco2ts(o) \ - check_exp(novariant((o)->gch.tt) == LUA_TSTRING, &((o)->ts)) -#define gco2ts(o) (&rawgco2ts(o)->tsv) -#define rawgco2u(o) check_exp((o)->gch.tt == LUA_TUSERDATA, &((o)->u)) -#define gco2u(o) (&rawgco2u(o)->uv) -#define gco2lcl(o) check_exp((o)->gch.tt == LUA_TLCL, &((o)->cl.l)) -#define gco2ccl(o) check_exp((o)->gch.tt == LUA_TCCL, &((o)->cl.c)) -#define gco2cl(o) \ - check_exp(novariant((o)->gch.tt) == LUA_TFUNCTION, &((o)->cl)) -#define gco2t(o) check_exp((o)->gch.tt == LUA_TTABLE, &((o)->h)) -#define gco2p(o) check_exp((o)->gch.tt == LUA_TPROTO, &((o)->p)) -#define gco2uv(o) check_exp((o)->gch.tt == LUA_TUPVAL, &((o)->uv)) -#define gco2th(o) check_exp((o)->gch.tt == LUA_TTHREAD, &((o)->th)) - -/* macro to convert any Lua object into a GCObject */ -#define obj2gco(v) (cast(GCObject *, (v))) - - -/* actual number of total bytes allocated */ -#define gettotalbytes(g) ((g)->totalbytes + (g)->GCdebt) - -LUAI_FUNC void luaE_setdebt (global_State *g, l_mem debt); -LUAI_FUNC void luaE_freethread (lua_State *L, lua_State *L1); -LUAI_FUNC CallInfo *luaE_extendCI (lua_State *L); -LUAI_FUNC void luaE_freeCI (lua_State *L); - - -#endif - diff --git a/radio/src/lua/src/lstring.c b/radio/src/lua/src/lstring.c deleted file mode 100644 index 8b5af0b2e..000000000 --- a/radio/src/lua/src/lstring.c +++ /dev/null @@ -1,185 +0,0 @@ -/* -** $Id: lstring.c,v 2.26 2013/01/08 13:50:10 roberto Exp $ -** String table (keeps all strings handled by Lua) -** See Copyright Notice in lua.h -*/ - - -#include - -#define lstring_c -#define LUA_CORE - -#include "lua.h" - -#include "lmem.h" -#include "lobject.h" -#include "lstate.h" -#include "lstring.h" - - -/* -** Lua will use at most ~(2^LUAI_HASHLIMIT) bytes from a string to -** compute its hash -*/ -#if !defined(LUAI_HASHLIMIT) -#define LUAI_HASHLIMIT 5 -#endif - - -/* -** equality for long strings -*/ -int luaS_eqlngstr (TString *a, TString *b) { - size_t len = a->tsv.len; - lua_assert(a->tsv.tt == LUA_TLNGSTR && b->tsv.tt == LUA_TLNGSTR); - return (a == b) || /* same instance or... */ - ((len == b->tsv.len) && /* equal length and ... */ - (memcmp(getstr(a), getstr(b), len) == 0)); /* equal contents */ -} - - -/* -** equality for strings -*/ -int luaS_eqstr (TString *a, TString *b) { - return (a->tsv.tt == b->tsv.tt) && - (a->tsv.tt == LUA_TSHRSTR ? eqshrstr(a, b) : luaS_eqlngstr(a, b)); -} - - -unsigned int luaS_hash (const char *str, size_t l, unsigned int seed) { - unsigned int h = seed ^ cast(unsigned int, l); - size_t l1; - size_t step = (l >> LUAI_HASHLIMIT) + 1; - for (l1 = l; l1 >= step; l1 -= step) - h = h ^ ((h<<5) + (h>>2) + cast_byte(str[l1 - 1])); - return h; -} - - -/* -** resizes the string table -*/ -void luaS_resize (lua_State *L, int newsize) { - int i; - stringtable *tb = &G(L)->strt; - /* cannot resize while GC is traversing strings */ - luaC_runtilstate(L, ~bitmask(GCSsweepstring)); - if (newsize > tb->size) { - luaM_reallocvector(L, tb->hash, tb->size, newsize, GCObject *); - for (i = tb->size; i < newsize; i++) tb->hash[i] = NULL; - } - /* rehash */ - for (i=0; isize; i++) { - GCObject *p = tb->hash[i]; - tb->hash[i] = NULL; - while (p) { /* for each node in the list */ - GCObject *next = gch(p)->next; /* save next */ - unsigned int h = lmod(gco2ts(p)->hash, newsize); /* new position */ - gch(p)->next = tb->hash[h]; /* chain it */ - tb->hash[h] = p; - resetoldbit(p); /* see MOVE OLD rule */ - p = next; - } - } - if (newsize < tb->size) { - /* shrinking slice must be empty */ - lua_assert(tb->hash[newsize] == NULL && tb->hash[tb->size - 1] == NULL); - luaM_reallocvector(L, tb->hash, tb->size, newsize, GCObject *); - } - tb->size = newsize; -} - - -/* -** creates a new string object -*/ -static TString *createstrobj (lua_State *L, const char *str, size_t l, - int tag, unsigned int h, GCObject **list) { - TString *ts; - size_t totalsize; /* total size of TString object */ - totalsize = sizeof(TString) + ((l + 1) * sizeof(char)); - ts = &luaC_newobj(L, tag, totalsize, list, 0)->ts; - ts->tsv.len = l; - ts->tsv.hash = h; - ts->tsv.extra = 0; - memcpy(ts+1, str, l*sizeof(char)); - ((char *)(ts+1))[l] = '\0'; /* ending 0 */ - return ts; -} - - -/* -** creates a new short string, inserting it into string table -*/ -static TString *newshrstr (lua_State *L, const char *str, size_t l, - unsigned int h) { - GCObject **list; /* (pointer to) list where it will be inserted */ - stringtable *tb = &G(L)->strt; - TString *s; - if (tb->nuse >= cast(lu_int32, tb->size) && tb->size <= MAX_INT/2) - luaS_resize(L, tb->size*2); /* too crowded */ - list = &tb->hash[lmod(h, tb->size)]; - s = createstrobj(L, str, l, LUA_TSHRSTR, h, list); - tb->nuse++; - return s; -} - - -/* -** checks whether short string exists and reuses it or creates a new one -*/ -static TString *internshrstr (lua_State *L, const char *str, size_t l) { - GCObject *o; - global_State *g = G(L); - unsigned int h = luaS_hash(str, l, g->seed); - for (o = g->strt.hash[lmod(h, g->strt.size)]; - o != NULL; - o = gch(o)->next) { - TString *ts = rawgco2ts(o); - if (h == ts->tsv.hash && - l == ts->tsv.len && - (memcmp(str, getstr(ts), l * sizeof(char)) == 0)) { - if (isdead(G(L), o)) /* string is dead (but was not collected yet)? */ - changewhite(o); /* resurrect it */ - return ts; - } - } - return newshrstr(L, str, l, h); /* not found; create a new string */ -} - - -/* -** new string (with explicit length) -*/ -TString *luaS_newlstr (lua_State *L, const char *str, size_t l) { - if (l <= LUAI_MAXSHORTLEN) /* short string? */ - return internshrstr(L, str, l); - else { - if (l + 1 > (MAX_SIZET - sizeof(TString))/sizeof(char)) - luaM_toobig(L); - return createstrobj(L, str, l, LUA_TLNGSTR, G(L)->seed, NULL); - } -} - - -/* -** new zero-terminated string -*/ -TString *luaS_new (lua_State *L, const char *str) { - return luaS_newlstr(L, str, strlen(str)); -} - - -Udata *luaS_newudata (lua_State *L, size_t s, Table *e) { - Udata *u; - if (s > MAX_SIZET - sizeof(Udata)) - luaM_toobig(L); - u = &luaC_newobj(L, LUA_TUSERDATA, sizeof(Udata) + s, NULL, 0)->u; - u->uv.len = s; - u->uv.metatable = NULL; - u->uv.env = e; - return u; -} - diff --git a/radio/src/lua/src/lstring.h b/radio/src/lua/src/lstring.h deleted file mode 100644 index d312ff3d2..000000000 --- a/radio/src/lua/src/lstring.h +++ /dev/null @@ -1,46 +0,0 @@ -/* -** $Id: lstring.h,v 1.49 2012/02/01 21:57:15 roberto Exp $ -** String table (keep all strings handled by Lua) -** See Copyright Notice in lua.h -*/ - -#ifndef lstring_h -#define lstring_h - -#include "lgc.h" -#include "lobject.h" -#include "lstate.h" - - -#define sizestring(s) (sizeof(union TString)+((s)->len+1)*sizeof(char)) - -#define sizeudata(u) (sizeof(union Udata)+(u)->len) - -#define luaS_newliteral(L, s) (luaS_newlstr(L, "" s, \ - (sizeof(s)/sizeof(char))-1)) - -#define luaS_fix(s) l_setbit((s)->tsv.marked, FIXEDBIT) - - -/* -** test whether a string is a reserved word -*/ -#define isreserved(s) ((s)->tsv.tt == LUA_TSHRSTR && (s)->tsv.extra > 0) - - -/* -** equality for short strings, which are always internalized -*/ -#define eqshrstr(a,b) check_exp((a)->tsv.tt == LUA_TSHRSTR, (a) == (b)) - - -LUAI_FUNC unsigned int luaS_hash (const char *str, size_t l, unsigned int seed); -LUAI_FUNC int luaS_eqlngstr (TString *a, TString *b); -LUAI_FUNC int luaS_eqstr (TString *a, TString *b); -LUAI_FUNC void luaS_resize (lua_State *L, int newsize); -LUAI_FUNC Udata *luaS_newudata (lua_State *L, size_t s, Table *e); -LUAI_FUNC TString *luaS_newlstr (lua_State *L, const char *str, size_t l); -LUAI_FUNC TString *luaS_new (lua_State *L, const char *str); - - -#endif diff --git a/radio/src/lua/src/lstrlib.c b/radio/src/lua/src/lstrlib.c deleted file mode 100644 index e60d2ba29..000000000 --- a/radio/src/lua/src/lstrlib.c +++ /dev/null @@ -1,1017 +0,0 @@ -/* -** $Id: lstrlib.c,v 1.178 2012/08/14 18:12:34 roberto Exp $ -** Standard library for string operations and pattern-matching -** See Copyright Notice in lua.h -*/ - - -#include -#include -#include -#include - -#define lstrlib_c - -#include "lua.h" - -#include "lauxlib.h" -#include "lualib.h" - - -/* -** maximum number of captures that a pattern can do during -** pattern-matching. This limit is arbitrary. -*/ -#if !defined(LUA_MAXCAPTURES) -#define LUA_MAXCAPTURES 32 -#endif - - -/* macro to `unsign' a character */ -#define uchar(c) ((unsigned char)(c)) - - - -static int str_len (lua_State *L) { - size_t l; - luaL_checklstring(L, 1, &l); - lua_pushinteger(L, (lua_Integer)l); - return 1; -} - - -/* translate a relative string position: negative means back from end */ -static size_t posrelat (ptrdiff_t pos, size_t len) { - if (pos >= 0) return (size_t)pos; - else if (0u - (size_t)pos > len) return 0; - else return len - ((size_t)-pos) + 1; -} - - -static int str_sub (lua_State *L) { - size_t l; - const char *s = luaL_checklstring(L, 1, &l); - size_t start = posrelat(luaL_checkinteger(L, 2), l); - size_t end = posrelat(luaL_optinteger(L, 3, -1), l); - if (start < 1) start = 1; - if (end > l) end = l; - if (start <= end) - lua_pushlstring(L, s + start - 1, end - start + 1); - else lua_pushliteral(L, ""); - return 1; -} - - -static int str_reverse (lua_State *L) { - size_t l, i; - luaL_Buffer b; - const char *s = luaL_checklstring(L, 1, &l); - char *p = luaL_buffinitsize(L, &b, l); - for (i = 0; i < l; i++) - p[i] = s[l - i - 1]; - luaL_pushresultsize(&b, l); - return 1; -} - - -static int str_lower (lua_State *L) { - size_t l; - size_t i; - luaL_Buffer b; - const char *s = luaL_checklstring(L, 1, &l); - char *p = luaL_buffinitsize(L, &b, l); - for (i=0; i> 1) - -static int str_rep (lua_State *L) { - size_t l, lsep; - const char *s = luaL_checklstring(L, 1, &l); - int n = luaL_checkint(L, 2); - const char *sep = luaL_optlstring(L, 3, "", &lsep); - if (n <= 0) lua_pushliteral(L, ""); - else if (l + lsep < l || l + lsep >= MAXSIZE / n) /* may overflow? */ - return luaL_error(L, "resulting string too large"); - else { - size_t totallen = n * l + (n - 1) * lsep; - luaL_Buffer b; - char *p = luaL_buffinitsize(L, &b, totallen); - while (n-- > 1) { /* first n-1 copies (followed by separator) */ - memcpy(p, s, l * sizeof(char)); p += l; - if (lsep > 0) { /* avoid empty 'memcpy' (may be expensive) */ - memcpy(p, sep, lsep * sizeof(char)); p += lsep; - } - } - memcpy(p, s, l * sizeof(char)); /* last copy (not followed by separator) */ - luaL_pushresultsize(&b, totallen); - } - return 1; -} - - -static int str_byte (lua_State *L) { - size_t l; - const char *s = luaL_checklstring(L, 1, &l); - size_t posi = posrelat(luaL_optinteger(L, 2, 1), l); - size_t pose = posrelat(luaL_optinteger(L, 3, posi), l); - int n, i; - if (posi < 1) posi = 1; - if (pose > l) pose = l; - if (posi > pose) return 0; /* empty interval; return no values */ - n = (int)(pose - posi + 1); - if (posi + n <= pose) /* (size_t -> int) overflow? */ - return luaL_error(L, "string slice too long"); - luaL_checkstack(L, n, "string slice too long"); - for (i=0; i= ms->level || ms->capture[l].len == CAP_UNFINISHED) - return luaL_error(ms->L, "invalid capture index %%%d", l + 1); - return l; -} - - -static int capture_to_close (MatchState *ms) { - int level = ms->level; - for (level--; level>=0; level--) - if (ms->capture[level].len == CAP_UNFINISHED) return level; - return luaL_error(ms->L, "invalid pattern capture"); -} - - -static const char *classend (MatchState *ms, const char *p) { - switch (*p++) { - case L_ESC: { - if (p == ms->p_end) - luaL_error(ms->L, "malformed pattern (ends with " LUA_QL("%%") ")"); - return p+1; - } - case '[': { - if (*p == '^') p++; - do { /* look for a `]' */ - if (p == ms->p_end) - luaL_error(ms->L, "malformed pattern (missing " LUA_QL("]") ")"); - if (*(p++) == L_ESC && p < ms->p_end) - p++; /* skip escapes (e.g. `%]') */ - } while (*p != ']'); - return p+1; - } - default: { - return p; - } - } -} - - -static int match_class (int c, int cl) { - int res; - switch (tolower(cl)) { - case 'a' : res = isalpha(c); break; - case 'c' : res = iscntrl(c); break; - case 'd' : res = isdigit(c); break; - case 'g' : res = isgraph(c); break; - case 'l' : res = islower(c); break; - case 'p' : res = ispunct(c); break; - case 's' : res = isspace(c); break; - case 'u' : res = isupper(c); break; - case 'w' : res = isalnum(c); break; - case 'x' : res = isxdigit(c); break; - case 'z' : res = (c == 0); break; /* deprecated option */ - default: return (cl == c); - } - return (islower(cl) ? res : !res); -} - - -static int matchbracketclass (int c, const char *p, const char *ec) { - int sig = 1; - if (*(p+1) == '^') { - sig = 0; - p++; /* skip the `^' */ - } - while (++p < ec) { - if (*p == L_ESC) { - p++; - if (match_class(c, uchar(*p))) - return sig; - } - else if ((*(p+1) == '-') && (p+2 < ec)) { - p+=2; - if (uchar(*(p-2)) <= c && c <= uchar(*p)) - return sig; - } - else if (uchar(*p) == c) return sig; - } - return !sig; -} - - -static int singlematch (MatchState *ms, const char *s, const char *p, - const char *ep) { - if (s >= ms->src_end) - return 0; - else { - int c = uchar(*s); - switch (*p) { - case '.': return 1; /* matches any char */ - case L_ESC: return match_class(c, uchar(*(p+1))); - case '[': return matchbracketclass(c, p, ep-1); - default: return (uchar(*p) == c); - } - } -} - - -static const char *matchbalance (MatchState *ms, const char *s, - const char *p) { - if (p >= ms->p_end - 1) - luaL_error(ms->L, "malformed pattern " - "(missing arguments to " LUA_QL("%%b") ")"); - if (*s != *p) return NULL; - else { - int b = *p; - int e = *(p+1); - int cont = 1; - while (++s < ms->src_end) { - if (*s == e) { - if (--cont == 0) return s+1; - } - else if (*s == b) cont++; - } - } - return NULL; /* string ends out of balance */ -} - - -static const char *max_expand (MatchState *ms, const char *s, - const char *p, const char *ep) { - ptrdiff_t i = 0; /* counts maximum expand for item */ - while (singlematch(ms, s + i, p, ep)) - i++; - /* keeps trying to match with the maximum repetitions */ - while (i>=0) { - const char *res = match(ms, (s+i), ep+1); - if (res) return res; - i--; /* else didn't match; reduce 1 repetition to try again */ - } - return NULL; -} - - -static const char *min_expand (MatchState *ms, const char *s, - const char *p, const char *ep) { - for (;;) { - const char *res = match(ms, s, ep+1); - if (res != NULL) - return res; - else if (singlematch(ms, s, p, ep)) - s++; /* try with one more repetition */ - else return NULL; - } -} - - -static const char *start_capture (MatchState *ms, const char *s, - const char *p, int what) { - const char *res; - int level = ms->level; - if (level >= LUA_MAXCAPTURES) luaL_error(ms->L, "too many captures"); - ms->capture[level].init = s; - ms->capture[level].len = what; - ms->level = level+1; - if ((res=match(ms, s, p)) == NULL) /* match failed? */ - ms->level--; /* undo capture */ - return res; -} - - -static const char *end_capture (MatchState *ms, const char *s, - const char *p) { - int l = capture_to_close(ms); - const char *res; - ms->capture[l].len = s - ms->capture[l].init; /* close capture */ - if ((res = match(ms, s, p)) == NULL) /* match failed? */ - ms->capture[l].len = CAP_UNFINISHED; /* undo capture */ - return res; -} - - -static const char *match_capture (MatchState *ms, const char *s, int l) { - size_t len; - l = check_capture(ms, l); - len = ms->capture[l].len; - if ((size_t)(ms->src_end-s) >= len && - memcmp(ms->capture[l].init, s, len) == 0) - return s+len; - else return NULL; -} - - -static const char *match (MatchState *ms, const char *s, const char *p) { - if (ms->matchdepth-- == 0) - luaL_error(ms->L, "pattern too complex"); - init: /* using goto's to optimize tail recursion */ - if (p != ms->p_end) { /* end of pattern? */ - switch (*p) { - case '(': { /* start capture */ - if (*(p + 1) == ')') /* position capture? */ - s = start_capture(ms, s, p + 2, CAP_POSITION); - else - s = start_capture(ms, s, p + 1, CAP_UNFINISHED); - break; - } - case ')': { /* end capture */ - s = end_capture(ms, s, p + 1); - break; - } - case '$': { - if ((p + 1) != ms->p_end) /* is the `$' the last char in pattern? */ - goto dflt; /* no; go to default */ - s = (s == ms->src_end) ? s : NULL; /* check end of string */ - break; - } - case L_ESC: { /* escaped sequences not in the format class[*+?-]? */ - switch (*(p + 1)) { - case 'b': { /* balanced string? */ - s = matchbalance(ms, s, p + 2); - if (s != NULL) { - p += 4; goto init; /* return match(ms, s, p + 4); */ - } /* else fail (s == NULL) */ - break; - } - case 'f': { /* frontier? */ - const char *ep; char previous; - p += 2; - if (*p != '[') - luaL_error(ms->L, "missing " LUA_QL("[") " after " - LUA_QL("%%f") " in pattern"); - ep = classend(ms, p); /* points to what is next */ - previous = (s == ms->src_init) ? '\0' : *(s - 1); - if (!matchbracketclass(uchar(previous), p, ep - 1) && - matchbracketclass(uchar(*s), p, ep - 1)) { - p = ep; goto init; /* return match(ms, s, ep); */ - } - s = NULL; /* match failed */ - break; - } - case '0': case '1': case '2': case '3': - case '4': case '5': case '6': case '7': - case '8': case '9': { /* capture results (%0-%9)? */ - s = match_capture(ms, s, uchar(*(p + 1))); - if (s != NULL) { - p += 2; goto init; /* return match(ms, s, p + 2) */ - } - break; - } - default: goto dflt; - } - break; - } - default: dflt: { /* pattern class plus optional suffix */ - const char *ep = classend(ms, p); /* points to optional suffix */ - /* does not match at least once? */ - if (!singlematch(ms, s, p, ep)) { - if (*ep == '*' || *ep == '?' || *ep == '-') { /* accept empty? */ - p = ep + 1; goto init; /* return match(ms, s, ep + 1); */ - } - else /* '+' or no suffix */ - s = NULL; /* fail */ - } - else { /* matched once */ - switch (*ep) { /* handle optional suffix */ - case '?': { /* optional */ - const char *res; - if ((res = match(ms, s + 1, ep + 1)) != NULL) - s = res; - else { - p = ep + 1; goto init; /* else return match(ms, s, ep + 1); */ - } - break; - } - case '+': /* 1 or more repetitions */ - s++; /* 1 match already done */ - /* go through */ - case '*': /* 0 or more repetitions */ - s = max_expand(ms, s, p, ep); - break; - case '-': /* 0 or more repetitions (minimum) */ - s = min_expand(ms, s, p, ep); - break; - default: /* no suffix */ - s++; p = ep; goto init; /* return match(ms, s + 1, ep); */ - } - } - break; - } - } - } - ms->matchdepth++; - return s; -} - - - -static const char *lmemfind (const char *s1, size_t l1, - const char *s2, size_t l2) { - if (l2 == 0) return s1; /* empty strings are everywhere */ - else if (l2 > l1) return NULL; /* avoids a negative `l1' */ - else { - const char *init; /* to search for a `*s2' inside `s1' */ - l2--; /* 1st char will be checked by `memchr' */ - l1 = l1-l2; /* `s2' cannot be found after that */ - while (l1 > 0 && (init = (const char *)memchr(s1, *s2, l1)) != NULL) { - init++; /* 1st char is already checked */ - if (memcmp(init, s2+1, l2) == 0) - return init-1; - else { /* correct `l1' and `s1' to try again */ - l1 -= init-s1; - s1 = init; - } - } - return NULL; /* not found */ - } -} - - -static void push_onecapture (MatchState *ms, int i, const char *s, - const char *e) { - if (i >= ms->level) { - if (i == 0) /* ms->level == 0, too */ - lua_pushlstring(ms->L, s, e - s); /* add whole match */ - else - luaL_error(ms->L, "invalid capture index"); - } - else { - ptrdiff_t l = ms->capture[i].len; - if (l == CAP_UNFINISHED) luaL_error(ms->L, "unfinished capture"); - if (l == CAP_POSITION) - lua_pushinteger(ms->L, ms->capture[i].init - ms->src_init + 1); - else - lua_pushlstring(ms->L, ms->capture[i].init, l); - } -} - - -static int push_captures (MatchState *ms, const char *s, const char *e) { - int i; - int nlevels = (ms->level == 0 && s) ? 1 : ms->level; - luaL_checkstack(ms->L, nlevels, "too many captures"); - for (i = 0; i < nlevels; i++) - push_onecapture(ms, i, s, e); - return nlevels; /* number of strings pushed */ -} - - -/* check whether pattern has no special characters */ -static int nospecials (const char *p, size_t l) { - size_t upto = 0; - do { - if (strpbrk(p + upto, SPECIALS)) - return 0; /* pattern has a special character */ - upto += strlen(p + upto) + 1; /* may have more after \0 */ - } while (upto <= l); - return 1; /* no special chars found */ -} - - -static int str_find_aux (lua_State *L, int find) { - size_t ls, lp; - const char *s = luaL_checklstring(L, 1, &ls); - const char *p = luaL_checklstring(L, 2, &lp); - size_t init = posrelat(luaL_optinteger(L, 3, 1), ls); - if (init < 1) init = 1; - else if (init > ls + 1) { /* start after string's end? */ - lua_pushnil(L); /* cannot find anything */ - return 1; - } - /* explicit request or no special characters? */ - if (find && (lua_toboolean(L, 4) || nospecials(p, lp))) { - /* do a plain search */ - const char *s2 = lmemfind(s + init - 1, ls - init + 1, p, lp); - if (s2) { - lua_pushinteger(L, s2 - s + 1); - lua_pushinteger(L, s2 - s + lp); - return 2; - } - } - else { - MatchState ms; - const char *s1 = s + init - 1; - int anchor = (*p == '^'); - if (anchor) { - p++; lp--; /* skip anchor character */ - } - ms.L = L; - ms.matchdepth = MAXCCALLS; - ms.src_init = s; - ms.src_end = s + ls; - ms.p_end = p + lp; - do { - const char *res; - ms.level = 0; - lua_assert(ms.matchdepth == MAXCCALLS); - if ((res=match(&ms, s1, p)) != NULL) { - if (find) { - lua_pushinteger(L, s1 - s + 1); /* start */ - lua_pushinteger(L, res - s); /* end */ - return push_captures(&ms, NULL, 0) + 2; - } - else - return push_captures(&ms, s1, res); - } - } while (s1++ < ms.src_end && !anchor); - } - lua_pushnil(L); /* not found */ - return 1; -} - - -static int str_find (lua_State *L) { - return str_find_aux(L, 1); -} - - -static int str_match (lua_State *L) { - return str_find_aux(L, 0); -} - - -static int gmatch_aux (lua_State *L) { - MatchState ms; - size_t ls, lp; - const char *s = lua_tolstring(L, lua_upvalueindex(1), &ls); - const char *p = lua_tolstring(L, lua_upvalueindex(2), &lp); - const char *src; - ms.L = L; - ms.matchdepth = MAXCCALLS; - ms.src_init = s; - ms.src_end = s+ls; - ms.p_end = p + lp; - for (src = s + (size_t)lua_tointeger(L, lua_upvalueindex(3)); - src <= ms.src_end; - src++) { - const char *e; - ms.level = 0; - lua_assert(ms.matchdepth == MAXCCALLS); - if ((e = match(&ms, src, p)) != NULL) { - lua_Integer newstart = e-s; - if (e == src) newstart++; /* empty match? go at least one position */ - lua_pushinteger(L, newstart); - lua_replace(L, lua_upvalueindex(3)); - return push_captures(&ms, src, e); - } - } - return 0; /* not found */ -} - - -static int gmatch (lua_State *L) { - luaL_checkstring(L, 1); - luaL_checkstring(L, 2); - lua_settop(L, 2); - lua_pushinteger(L, 0); - lua_pushcclosure(L, gmatch_aux, 3); - return 1; -} - - -static void add_s (MatchState *ms, luaL_Buffer *b, const char *s, - const char *e) { - size_t l, i; - const char *news = lua_tolstring(ms->L, 3, &l); - for (i = 0; i < l; i++) { - if (news[i] != L_ESC) - luaL_addchar(b, news[i]); - else { - i++; /* skip ESC */ - if (!isdigit(uchar(news[i]))) { - if (news[i] != L_ESC) - luaL_error(ms->L, "invalid use of " LUA_QL("%c") - " in replacement string", L_ESC); - luaL_addchar(b, news[i]); - } - else if (news[i] == '0') - luaL_addlstring(b, s, e - s); - else { - push_onecapture(ms, news[i] - '1', s, e); - luaL_addvalue(b); /* add capture to accumulated result */ - } - } - } -} - - -static void add_value (MatchState *ms, luaL_Buffer *b, const char *s, - const char *e, int tr) { - lua_State *L = ms->L; - switch (tr) { - case LUA_TFUNCTION: { - int n; - lua_pushvalue(L, 3); - n = push_captures(ms, s, e); - lua_call(L, n, 1); - break; - } - case LUA_TTABLE: { - push_onecapture(ms, 0, s, e); - lua_gettable(L, 3); - break; - } - default: { /* LUA_TNUMBER or LUA_TSTRING */ - add_s(ms, b, s, e); - return; - } - } - if (!lua_toboolean(L, -1)) { /* nil or false? */ - lua_pop(L, 1); - lua_pushlstring(L, s, e - s); /* keep original text */ - } - else if (!lua_isstring(L, -1)) - luaL_error(L, "invalid replacement value (a %s)", luaL_typename(L, -1)); - luaL_addvalue(b); /* add result to accumulator */ -} - - -static int str_gsub (lua_State *L) { - size_t srcl, lp; - const char *src = luaL_checklstring(L, 1, &srcl); - const char *p = luaL_checklstring(L, 2, &lp); - int tr = lua_type(L, 3); - size_t max_s = luaL_optinteger(L, 4, srcl+1); - int anchor = (*p == '^'); - size_t n = 0; - MatchState ms; - luaL_Buffer b; - luaL_argcheck(L, tr == LUA_TNUMBER || tr == LUA_TSTRING || - tr == LUA_TFUNCTION || tr == LUA_TTABLE, 3, - "string/function/table expected"); - luaL_buffinit(L, &b); - if (anchor) { - p++; lp--; /* skip anchor character */ - } - ms.L = L; - ms.matchdepth = MAXCCALLS; - ms.src_init = src; - ms.src_end = src+srcl; - ms.p_end = p + lp; - while (n < max_s) { - const char *e; - ms.level = 0; - lua_assert(ms.matchdepth == MAXCCALLS); - e = match(&ms, src, p); - if (e) { - n++; - add_value(&ms, &b, src, e, tr); - } - if (e && e>src) /* non empty match? */ - src = e; /* skip it */ - else if (src < ms.src_end) - luaL_addchar(&b, *src++); - else break; - if (anchor) break; - } - luaL_addlstring(&b, src, ms.src_end-src); - luaL_pushresult(&b); - lua_pushinteger(L, n); /* number of substitutions */ - return 2; -} - -/* }====================================================== */ - - - -/* -** {====================================================== -** STRING FORMAT -** ======================================================= -*/ - -/* -** LUA_INTFRMLEN is the length modifier for integer conversions in -** 'string.format'; LUA_INTFRM_T is the integer type corresponding to -** the previous length -*/ -#if !defined(LUA_INTFRMLEN) /* { */ -#if defined(LUA_USE_LONGLONG) - -#define LUA_INTFRMLEN "ll" -#define LUA_INTFRM_T long long - -#else - -#define LUA_INTFRMLEN "l" -#define LUA_INTFRM_T long - -#endif -#endif /* } */ - - -/* -** LUA_FLTFRMLEN is the length modifier for float conversions in -** 'string.format'; LUA_FLTFRM_T is the float type corresponding to -** the previous length -*/ -#if !defined(LUA_FLTFRMLEN) - -#define LUA_FLTFRMLEN "" -#define LUA_FLTFRM_T double - -#endif - - -/* maximum size of each formatted item (> len(format('%99.99f', -1e308))) */ -#define MAX_ITEM 512 -/* valid flags in a format specification */ -#define FLAGS "-+ #0" -/* -** maximum size of each format specification (such as '%-099.99d') -** (+10 accounts for %99.99x plus margin of error) -*/ -#define MAX_FORMAT (sizeof(FLAGS) + sizeof(LUA_INTFRMLEN) + 10) - - -static void addquoted (lua_State *L, luaL_Buffer *b, int arg) { - size_t l; - const char *s = luaL_checklstring(L, arg, &l); - luaL_addchar(b, '"'); - while (l--) { - if (*s == '"' || *s == '\\' || *s == '\n') { - luaL_addchar(b, '\\'); - luaL_addchar(b, *s); - } - else if (*s == '\0' || iscntrl(uchar(*s))) { - char buff[10]; - if (!isdigit(uchar(*(s+1)))) - sprintf(buff, "\\%d", (int)uchar(*s)); - else - sprintf(buff, "\\%03d", (int)uchar(*s)); - luaL_addstring(b, buff); - } - else - luaL_addchar(b, *s); - s++; - } - luaL_addchar(b, '"'); -} - -static const char *scanformat (lua_State *L, const char *strfrmt, char *form) { - const char *p = strfrmt; - while (*p != '\0' && strchr(FLAGS, *p) != NULL) p++; /* skip flags */ - if ((size_t)(p - strfrmt) >= sizeof(FLAGS)/sizeof(char)) - luaL_error(L, "invalid format (repeated flags)"); - if (isdigit(uchar(*p))) p++; /* skip width */ - if (isdigit(uchar(*p))) p++; /* (2 digits at most) */ - if (*p == '.') { - p++; - if (isdigit(uchar(*p))) p++; /* skip precision */ - if (isdigit(uchar(*p))) p++; /* (2 digits at most) */ - } - if (isdigit(uchar(*p))) - luaL_error(L, "invalid format (width or precision too long)"); - *(form++) = '%'; - memcpy(form, strfrmt, (p - strfrmt + 1) * sizeof(char)); - form += p - strfrmt + 1; - *form = '\0'; - return p; -} - - -/* -** add length modifier into formats -*/ -static void addlenmod (char *form, const char *lenmod) { - size_t l = strlen(form); - size_t lm = strlen(lenmod); - char spec = form[l - 1]; - strcpy(form + l - 1, lenmod); - form[l + lm - 1] = spec; - form[l + lm] = '\0'; -} - - -static int str_format (lua_State *L) { - int top = lua_gettop(L); - int arg = 1; - size_t sfl; - const char *strfrmt = luaL_checklstring(L, arg, &sfl); - const char *strfrmt_end = strfrmt+sfl; - luaL_Buffer b; - luaL_buffinit(L, &b); - while (strfrmt < strfrmt_end) { - if (*strfrmt != L_ESC) - luaL_addchar(&b, *strfrmt++); - else if (*++strfrmt == L_ESC) - luaL_addchar(&b, *strfrmt++); /* %% */ - else { /* format item */ - char form[MAX_FORMAT]; /* to store the format (`%...') */ - char *buff = luaL_prepbuffsize(&b, MAX_ITEM); /* to put formatted item */ - int nb = 0; /* number of bytes in added item */ - if (++arg > top) - luaL_argerror(L, arg, "no value"); - strfrmt = scanformat(L, strfrmt, form); - switch (*strfrmt++) { - case 'c': { - nb = sprintf(buff, form, luaL_checkint(L, arg)); - break; - } - case 'd': case 'i': { - lua_Number n = luaL_checknumber(L, arg); - LUA_INTFRM_T ni = (LUA_INTFRM_T)n; - lua_Number diff = n - (lua_Number)ni; - luaL_argcheck(L, -1 < diff && diff < 1, arg, - "not a number in proper range"); - addlenmod(form, LUA_INTFRMLEN); - nb = sprintf(buff, form, ni); - break; - } - case 'o': case 'u': case 'x': case 'X': { - lua_Number n = luaL_checknumber(L, arg); - unsigned LUA_INTFRM_T ni = (unsigned LUA_INTFRM_T)n; - lua_Number diff = n - (lua_Number)ni; - luaL_argcheck(L, -1 < diff && diff < 1, arg, - "not a non-negative number in proper range"); - addlenmod(form, LUA_INTFRMLEN); - nb = sprintf(buff, form, ni); - break; - } - case 'e': case 'E': case 'f': -#if defined(LUA_USE_AFORMAT) - case 'a': case 'A': -#endif - case 'g': case 'G': { - addlenmod(form, LUA_FLTFRMLEN); - nb = sprintf(buff, form, (LUA_FLTFRM_T)luaL_checknumber(L, arg)); - break; - } - case 'q': { - addquoted(L, &b, arg); - break; - } - case 's': { - size_t l; - const char *s = luaL_tolstring(L, arg, &l); - if (!strchr(form, '.') && l >= 100) { - /* no precision and string is too long to be formatted; - keep original string */ - luaL_addvalue(&b); - break; - } - else { - nb = sprintf(buff, form, s); - lua_pop(L, 1); /* remove result from 'luaL_tolstring' */ - break; - } - } - default: { /* also treat cases `pnLlh' */ - return luaL_error(L, "invalid option " LUA_QL("%%%c") " to " - LUA_QL("format"), *(strfrmt - 1)); - } - } - luaL_addsize(&b, nb); - } - } - luaL_pushresult(&b); - return 1; -} - -/* }====================================================== */ - - -static const luaL_Reg strlib[] = { - {"byte", str_byte}, - {"char", str_char}, - {"dump", str_dump}, - {"find", str_find}, - {"format", str_format}, - {"gmatch", gmatch}, - {"gsub", str_gsub}, - {"len", str_len}, - {"lower", str_lower}, - {"match", str_match}, - {"rep", str_rep}, - {"reverse", str_reverse}, - {"sub", str_sub}, - {"upper", str_upper}, - {NULL, NULL} -}; - - -static void createmetatable (lua_State *L) { - lua_createtable(L, 0, 1); /* table to be metatable for strings */ - lua_pushliteral(L, ""); /* dummy string */ - lua_pushvalue(L, -2); /* copy table */ - lua_setmetatable(L, -2); /* set table as metatable for strings */ - lua_pop(L, 1); /* pop dummy string */ - lua_pushvalue(L, -2); /* get string library */ - lua_setfield(L, -2, "__index"); /* metatable.__index = string */ - lua_pop(L, 1); /* pop metatable */ -} - - -/* -** Open string library -*/ -LUAMOD_API int luaopen_string (lua_State *L) { - luaL_newlib(L, strlib); - createmetatable(L); - return 1; -} - diff --git a/radio/src/lua/src/ltable.c b/radio/src/lua/src/ltable.c deleted file mode 100644 index 305149d6b..000000000 --- a/radio/src/lua/src/ltable.c +++ /dev/null @@ -1,589 +0,0 @@ -/* -** $Id: ltable.c,v 2.72 2012/09/11 19:37:16 roberto Exp $ -** Lua tables (hash) -** See Copyright Notice in lua.h -*/ - - -/* -** Implementation of tables (aka arrays, objects, or hash tables). -** Tables keep its elements in two parts: an array part and a hash part. -** Non-negative integer keys are all candidates to be kept in the array -** part. The actual size of the array is the largest `n' such that at -** least half the slots between 0 and n are in use. -** Hash uses a mix of chained scatter table with Brent's variation. -** A main invariant of these tables is that, if an element is not -** in its main position (i.e. the `original' position that its hash gives -** to it), then the colliding element is in its own main position. -** Hence even when the load factor reaches 100%, performance remains good. -*/ - -#include - -#define ltable_c -#define LUA_CORE - -#include "lua.h" - -#include "ldebug.h" -#include "ldo.h" -#include "lgc.h" -#include "lmem.h" -#include "lobject.h" -#include "lstate.h" -#include "lstring.h" -#include "ltable.h" -#include "lvm.h" - - -/* -** max size of array part is 2^MAXBITS -*/ -#if LUAI_BITSINT >= 32 -#define MAXBITS 30 -#else -#define MAXBITS (LUAI_BITSINT-2) -#endif - -#define MAXASIZE (1 << MAXBITS) - - -#define hashpow2(t,n) (gnode(t, lmod((n), sizenode(t)))) - -#define hashstr(t,str) hashpow2(t, (str)->tsv.hash) -#define hashboolean(t,p) hashpow2(t, p) - - -/* -** for some types, it is better to avoid modulus by power of 2, as -** they tend to have many 2 factors. -*/ -#define hashmod(t,n) (gnode(t, ((n) % ((sizenode(t)-1)|1)))) - - -#define hashpointer(t,p) hashmod(t, IntPoint(p)) - - -#define dummynode (&dummynode_) - -#define isdummy(n) ((n) == dummynode) - -static const Node dummynode_ = { - {NILCONSTANT}, /* value */ - {{NILCONSTANT, NULL}} /* key */ -}; - - -/* -** hash for lua_Numbers -*/ -static Node *hashnum (const Table *t, lua_Number n) { - int i; - luai_hashnum(i, n); - if (i < 0) { - if (cast(unsigned int, i) == 0u - i) /* use unsigned to avoid overflows */ - i = 0; /* handle INT_MIN */ - i = -i; /* must be a positive value */ - } - return hashmod(t, i); -} - - - -/* -** returns the `main' position of an element in a table (that is, the index -** of its hash value) -*/ -static Node *mainposition (const Table *t, const TValue *key) { - switch (ttype(key)) { - case LUA_TNUMBER: - return hashnum(t, nvalue(key)); - case LUA_TLNGSTR: { - TString *s = rawtsvalue(key); - if (s->tsv.extra == 0) { /* no hash? */ - s->tsv.hash = luaS_hash(getstr(s), s->tsv.len, s->tsv.hash); - s->tsv.extra = 1; /* now it has its hash */ - } - return hashstr(t, rawtsvalue(key)); - } - case LUA_TSHRSTR: - return hashstr(t, rawtsvalue(key)); - case LUA_TBOOLEAN: - return hashboolean(t, bvalue(key)); - case LUA_TLIGHTUSERDATA: - return hashpointer(t, pvalue(key)); - case LUA_TLCF: - return hashpointer(t, fvalue(key)); - default: - return hashpointer(t, gcvalue(key)); - } -} - - -/* -** returns the index for `key' if `key' is an appropriate key to live in -** the array part of the table, -1 otherwise. -*/ -static int arrayindex (const TValue *key) { - if (ttisnumber(key)) { - lua_Number n = nvalue(key); - int k; - lua_number2int(k, n); - if (luai_numeq(cast_num(k), n)) - return k; - } - return -1; /* `key' did not match some condition */ -} - - -/* -** returns the index of a `key' for table traversals. First goes all -** elements in the array part, then elements in the hash part. The -** beginning of a traversal is signaled by -1. -*/ -static int findindex (lua_State *L, Table *t, StkId key) { - int i; - if (ttisnil(key)) return -1; /* first iteration */ - i = arrayindex(key); - if (0 < i && i <= t->sizearray) /* is `key' inside array part? */ - return i-1; /* yes; that's the index (corrected to C) */ - else { - Node *n = mainposition(t, key); - for (;;) { /* check whether `key' is somewhere in the chain */ - /* key may be dead already, but it is ok to use it in `next' */ - if (luaV_rawequalobj(gkey(n), key) || - (ttisdeadkey(gkey(n)) && iscollectable(key) && - deadvalue(gkey(n)) == gcvalue(key))) { - i = cast_int(n - gnode(t, 0)); /* key index in hash table */ - /* hash elements are numbered after array ones */ - return i + t->sizearray; - } - else n = gnext(n); - if (n == NULL) - luaG_runerror(L, "invalid key to " LUA_QL("next")); /* key not found */ - } - } -} - - -int luaH_next (lua_State *L, Table *t, StkId key) { - int i = findindex(L, t, key); /* find original element */ - for (i++; i < t->sizearray; i++) { /* try first array part */ - if (!ttisnil(&t->array[i])) { /* a non-nil value? */ - setnvalue(key, cast_num(i+1)); - setobj2s(L, key+1, &t->array[i]); - return 1; - } - } - for (i -= t->sizearray; i < sizenode(t); i++) { /* then hash part */ - if (!ttisnil(gval(gnode(t, i)))) { /* a non-nil value? */ - setobj2s(L, key, gkey(gnode(t, i))); - setobj2s(L, key+1, gval(gnode(t, i))); - return 1; - } - } - return 0; /* no more elements */ -} - - -/* -** {============================================================= -** Rehash -** ============================================================== -*/ - - -static int computesizes (int nums[], int *narray) { - int i; - int twotoi; /* 2^i */ - int a = 0; /* number of elements smaller than 2^i */ - int na = 0; /* number of elements to go to array part */ - int n = 0; /* optimal size for array part */ - for (i = 0, twotoi = 1; twotoi/2 < *narray; i++, twotoi *= 2) { - if (nums[i] > 0) { - a += nums[i]; - if (a > twotoi/2) { /* more than half elements present? */ - n = twotoi; /* optimal size (till now) */ - na = a; /* all elements smaller than n will go to array part */ - } - } - if (a == *narray) break; /* all elements already counted */ - } - if (n - *narray > 1024) - *narray += 1024; - else - *narray = n; - lua_assert(*narray/2 <= na && na <= *narray); - return na; -} - - -static int countint (const TValue *key, int *nums) { - int k = arrayindex(key); - if (0 < k && k <= MAXASIZE) { /* is `key' an appropriate array index? */ - nums[luaO_ceillog2(k)]++; /* count as such */ - return 1; - } - else - return 0; -} - - -static int numusearray (const Table *t, int *nums) { - int lg; - int ttlg; /* 2^lg */ - int ause = 0; /* summation of `nums' */ - int i = 1; /* count to traverse all array keys */ - for (lg=0, ttlg=1; lg<=MAXBITS; lg++, ttlg*=2) { /* for each slice */ - int lc = 0; /* counter */ - int lim = ttlg; - if (lim > t->sizearray) { - lim = t->sizearray; /* adjust upper limit */ - if (i > lim) - break; /* no more elements to count */ - } - /* count elements in range (2^(lg-1), 2^lg] */ - for (; i <= lim; i++) { - if (!ttisnil(&t->array[i-1])) - lc++; - } - nums[lg] += lc; - ause += lc; - } - return ause; -} - - -static int numusehash (const Table *t, int *nums, int *pnasize) { - int totaluse = 0; /* total number of elements */ - int ause = 0; /* summation of `nums' */ - int i = sizenode(t); - while (i--) { - Node *n = &t->node[i]; - if (!ttisnil(gval(n))) { - ause += countint(gkey(n), nums); - totaluse++; - } - } - *pnasize += ause; - return totaluse; -} - - -static void setarrayvector (lua_State *L, Table *t, int size) { - int i; - luaM_reallocvector(L, t->array, t->sizearray, size, TValue); - for (i=t->sizearray; iarray[i]); - t->sizearray = size; -} - -static void setnodevector (lua_State *L, Table *t, int size) { - int lsize; - if (size == 0) { /* no elements to hash part? */ - t->node = cast(Node *, dummynode); /* use common `dummynode' */ - lsize = 0; - } - else { - int i; - lsize = luaO_ceillog2(size); - if (lsize > MAXBITS) - luaG_runerror(L, "table overflow"); - size = twoto(lsize); - t->node = luaM_newvector(L, size, Node); - for (i=0; ilsizenode = cast_byte(lsize); - t->lastfree = gnode(t, size); /* all positions are free */ -} - -void luaH_resize (lua_State *L, Table *t, int nasize, int nhsize) { - int i; - int oldasize = t->sizearray; - int oldhsize = t->lsizenode; - Node *nold = t->node; /* save old hash ... */ - if (nasize > oldasize) /* array part must grow? */ - setarrayvector(L, t, nasize); - /* create new hash part with appropriate size */ - setnodevector(L, t, nhsize); - if (nasize < oldasize) { /* array part must shrink? */ - t->sizearray = nasize; - /* re-insert elements from vanishing slice */ - for (i=nasize; iarray[i])) - luaH_setint(L, t, i + 1, &t->array[i]); - } - /* shrink array */ - luaM_reallocvector(L, t->array, oldasize, nasize, TValue); - } - /* re-insert elements from hash part */ - for (i = twoto(oldhsize) - 1; i >= 0; i--) { - Node *old = nold+i; - if (!ttisnil(gval(old))) { - /* doesn't need barrier/invalidate cache, as entry was - already present in the table */ - setobjt2t(L, luaH_set(L, t, gkey(old)), gval(old)); - } - } - if (!isdummy(nold)) - luaM_freearray(L, nold, cast(size_t, twoto(oldhsize))); /* free old array */ -} - - -void luaH_resizearray (lua_State *L, Table *t, int nasize) { - int nsize = isdummy(t->node) ? 0 : sizenode(t); - luaH_resize(L, t, nasize, nsize); -} - - -static void rehash (lua_State *L, Table *t, const TValue *ek) { - int nasize, na; - int nums[MAXBITS+1]; /* nums[i] = number of keys with 2^(i-1) < k <= 2^i */ - int i; - int totaluse; - for (i=0; i<=MAXBITS; i++) nums[i] = 0; /* reset counts */ - nasize = numusearray(t, nums); /* count keys in array part */ - totaluse = nasize; /* all those keys are integer keys */ - totaluse += numusehash(t, nums, &nasize); /* count keys in hash part */ - /* count extra key */ - nasize += countint(ek, nums); - totaluse++; - /* compute new size for array part */ - na = computesizes(nums, &nasize); - /* resize the table to new computed sizes */ - luaH_resize(L, t, nasize, totaluse - na); -} - - - -/* -** }============================================================= -*/ - - -Table *luaH_new (lua_State *L) { - Table *t = &luaC_newobj(L, LUA_TTABLE, sizeof(Table), NULL, 0)->h; - t->metatable = NULL; - t->flags = cast_byte(~0); - t->array = NULL; - t->sizearray = 0; - setnodevector(L, t, 0); - return t; -} - - -void luaH_free (lua_State *L, Table *t) { - if (!isdummy(t->node)) - luaM_freearray(L, t->node, cast(size_t, sizenode(t))); - luaM_freearray(L, t->array, t->sizearray); - luaM_free(L, t); -} - - -static Node *getfreepos (Table *t) { - while (t->lastfree > t->node) { - t->lastfree--; - if (ttisnil(gkey(t->lastfree))) - return t->lastfree; - } - return NULL; /* could not find a free place */ -} - - - -/* -** inserts a new key into a hash table; first, check whether key's main -** position is free. If not, check whether colliding node is in its main -** position or not: if it is not, move colliding node to an empty place and -** put new key in its main position; otherwise (colliding node is in its main -** position), new key goes to an empty position. -*/ -TValue *luaH_newkey (lua_State *L, Table *t, const TValue *key) { - Node *mp; - if (ttisnil(key)) luaG_runerror(L, "table index is nil"); - else if (ttisnumber(key) && luai_numisnan(L, nvalue(key))) - luaG_runerror(L, "table index is NaN"); - mp = mainposition(t, key); - if (!ttisnil(gval(mp)) || isdummy(mp)) { /* main position is taken? */ - Node *othern; - Node *n = getfreepos(t); /* get a free place */ - if (n == NULL) { /* cannot find a free place? */ - rehash(L, t, key); /* grow table */ - /* whatever called 'newkey' take care of TM cache and GC barrier */ - return luaH_set(L, t, key); /* insert key into grown table */ - } - lua_assert(!isdummy(n)); - othern = mainposition(t, gkey(mp)); - if (othern != mp) { /* is colliding node out of its main position? */ - /* yes; move colliding node into free position */ - while (gnext(othern) != mp) othern = gnext(othern); /* find previous */ - gnext(othern) = n; /* redo the chain with `n' in place of `mp' */ - *n = *mp; /* copy colliding node into free pos. (mp->next also goes) */ - gnext(mp) = NULL; /* now `mp' is free */ - setnilvalue(gval(mp)); - } - else { /* colliding node is in its own main position */ - /* new node will go into free position */ - gnext(n) = gnext(mp); /* chain new position */ - gnext(mp) = n; - mp = n; - } - } - setobj2t(L, gkey(mp), key); - luaC_barrierback(L, obj2gco(t), key); - lua_assert(ttisnil(gval(mp))); - return gval(mp); -} - - -/* -** search function for integers -*/ -const TValue *luaH_getint (Table *t, int key) { - /* (1 <= key && key <= t->sizearray) */ - if (cast(unsigned int, key-1) < cast(unsigned int, t->sizearray)) - return &t->array[key-1]; - else { - lua_Number nk = cast_num(key); - Node *n = hashnum(t, nk); - do { /* check whether `key' is somewhere in the chain */ - if (ttisnumber(gkey(n)) && luai_numeq(nvalue(gkey(n)), nk)) - return gval(n); /* that's it */ - else n = gnext(n); - } while (n); - return luaO_nilobject; - } -} - - -/* -** search function for short strings -*/ -const TValue *luaH_getstr (Table *t, TString *key) { - Node *n = hashstr(t, key); - lua_assert(key->tsv.tt == LUA_TSHRSTR); - do { /* check whether `key' is somewhere in the chain */ - if (ttisshrstring(gkey(n)) && eqshrstr(rawtsvalue(gkey(n)), key)) - return gval(n); /* that's it */ - else n = gnext(n); - } while (n); - return luaO_nilobject; -} - - -/* -** main search function -*/ -const TValue *luaH_get (Table *t, const TValue *key) { - switch (ttype(key)) { - case LUA_TSHRSTR: return luaH_getstr(t, rawtsvalue(key)); - case LUA_TNIL: return luaO_nilobject; - case LUA_TNUMBER: { - int k; - lua_Number n = nvalue(key); - lua_number2int(k, n); - if (luai_numeq(cast_num(k), n)) /* index is int? */ - return luaH_getint(t, k); /* use specialized version */ - /* else go through */ - } - default: { - Node *n = mainposition(t, key); - do { /* check whether `key' is somewhere in the chain */ - if (luaV_rawequalobj(gkey(n), key)) - return gval(n); /* that's it */ - else n = gnext(n); - } while (n); - return luaO_nilobject; - } - } -} - - -/* -** beware: when using this function you probably need to check a GC -** barrier and invalidate the TM cache. -*/ -TValue *luaH_set (lua_State *L, Table *t, const TValue *key) { - const TValue *p = luaH_get(t, key); - if (p != luaO_nilobject) - return cast(TValue *, p); - else return luaH_newkey(L, t, key); -} - - -void luaH_setint (lua_State *L, Table *t, int key, TValue *value) { - const TValue *p = luaH_getint(t, key); - TValue *cell; - if (p != luaO_nilobject) - cell = cast(TValue *, p); - else { - TValue k; - setnvalue(&k, cast_num(key)); - cell = luaH_newkey(L, t, &k); - } - setobj2t(L, cell, value); -} - - -static int unbound_search (Table *t, unsigned int j) { - unsigned int i = j; /* i is zero or a present index */ - j++; - /* find `i' and `j' such that i is present and j is not */ - while (!ttisnil(luaH_getint(t, j))) { - i = j; - j *= 2; - if (j > cast(unsigned int, MAX_INT)) { /* overflow? */ - /* table was built with bad purposes: resort to linear search */ - i = 1; - while (!ttisnil(luaH_getint(t, i))) i++; - return i - 1; - } - } - /* now do a binary search between them */ - while (j - i > 1) { - unsigned int m = (i+j)/2; - if (ttisnil(luaH_getint(t, m))) j = m; - else i = m; - } - return i; -} - - -/* -** Try to find a boundary in table `t'. A `boundary' is an integer index -** such that t[i] is non-nil and t[i+1] is nil (and 0 if t[1] is nil). -*/ -int luaH_getn (Table *t) { - unsigned int j = t->sizearray; - if (j > 0 && ttisnil(&t->array[j - 1])) { - /* there is a boundary in the array part: (binary) search for it */ - unsigned int i = 0; - while (j - i > 1) { - unsigned int m = (i+j)/2; - if (ttisnil(&t->array[m - 1])) j = m; - else i = m; - } - return i; - } - /* else must find a boundary in hash part */ - else if (isdummy(t->node)) /* hash part is empty? */ - return j; /* that is easy... */ - else return unbound_search(t, j); -} - - - -#if defined(LUA_DEBUG) - -Node *luaH_mainposition (const Table *t, const TValue *key) { - return mainposition(t, key); -} - -int luaH_isdummy (Node *n) { return isdummy(n); } - -#endif diff --git a/radio/src/lua/src/ltable.h b/radio/src/lua/src/ltable.h deleted file mode 100644 index 2f6f5c2dc..000000000 --- a/radio/src/lua/src/ltable.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -** $Id: ltable.h,v 2.16 2011/08/17 20:26:47 roberto Exp $ -** Lua tables (hash) -** See Copyright Notice in lua.h -*/ - -#ifndef ltable_h -#define ltable_h - -#include "lobject.h" - - -#define gnode(t,i) (&(t)->node[i]) -#define gkey(n) (&(n)->i_key.tvk) -#define gval(n) (&(n)->i_val) -#define gnext(n) ((n)->i_key.nk.next) - -#define invalidateTMcache(t) ((t)->flags = 0) - - -LUAI_FUNC const TValue *luaH_getint (Table *t, int key); -LUAI_FUNC void luaH_setint (lua_State *L, Table *t, int key, TValue *value); -LUAI_FUNC const TValue *luaH_getstr (Table *t, TString *key); -LUAI_FUNC const TValue *luaH_get (Table *t, const TValue *key); -LUAI_FUNC TValue *luaH_newkey (lua_State *L, Table *t, const TValue *key); -LUAI_FUNC TValue *luaH_set (lua_State *L, Table *t, const TValue *key); -LUAI_FUNC Table *luaH_new (lua_State *L); -LUAI_FUNC void luaH_resize (lua_State *L, Table *t, int nasize, int nhsize); -LUAI_FUNC void luaH_resizearray (lua_State *L, Table *t, int nasize); -LUAI_FUNC void luaH_free (lua_State *L, Table *t); -LUAI_FUNC int luaH_next (lua_State *L, Table *t, StkId key); -LUAI_FUNC int luaH_getn (Table *t); - - -#if defined(LUA_DEBUG) -LUAI_FUNC Node *luaH_mainposition (const Table *t, const TValue *key); -LUAI_FUNC int luaH_isdummy (Node *n); -#endif - - -#endif diff --git a/radio/src/lua/src/ltablib.c b/radio/src/lua/src/ltablib.c deleted file mode 100644 index c61903b08..000000000 --- a/radio/src/lua/src/ltablib.c +++ /dev/null @@ -1,282 +0,0 @@ -/* -** $Id: ltablib.c,v 1.65 2013/03/07 18:17:24 roberto Exp $ -** Library for Table Manipulation -** See Copyright Notice in lua.h -*/ - - -#include - -#define ltablib_c - -#include "lua.h" - -#include "lauxlib.h" -#include "lualib.h" - - -#define aux_getn(L,n) (luaL_checktype(L, n, LUA_TTABLE), luaL_len(L, n)) - - - -#if defined(LUA_COMPAT_MAXN) -static int maxn (lua_State *L) { - lua_Number max = 0; - luaL_checktype(L, 1, LUA_TTABLE); - lua_pushnil(L); /* first key */ - while (lua_next(L, 1)) { - lua_pop(L, 1); /* remove value */ - if (lua_type(L, -1) == LUA_TNUMBER) { - lua_Number v = lua_tonumber(L, -1); - if (v > max) max = v; - } - } - lua_pushnumber(L, max); - return 1; -} -#endif - - -static int tinsert (lua_State *L) { - int e = aux_getn(L, 1) + 1; /* first empty element */ - int pos; /* where to insert new element */ - switch (lua_gettop(L)) { - case 2: { /* called with only 2 arguments */ - pos = e; /* insert new element at the end */ - break; - } - case 3: { - int i; - pos = luaL_checkint(L, 2); /* 2nd argument is the position */ - luaL_argcheck(L, 1 <= pos && pos <= e, 2, "position out of bounds"); - for (i = e; i > pos; i--) { /* move up elements */ - lua_rawgeti(L, 1, i-1); - lua_rawseti(L, 1, i); /* t[i] = t[i-1] */ - } - break; - } - default: { - return luaL_error(L, "wrong number of arguments to " LUA_QL("insert")); - } - } - lua_rawseti(L, 1, pos); /* t[pos] = v */ - return 0; -} - - -static int tremove (lua_State *L) { - int size = aux_getn(L, 1); - int pos = luaL_optint(L, 2, size); - if (pos != size) /* validate 'pos' if given */ - luaL_argcheck(L, 1 <= pos && pos <= size + 1, 1, "position out of bounds"); - lua_rawgeti(L, 1, pos); /* result = t[pos] */ - for ( ; pos < size; pos++) { - lua_rawgeti(L, 1, pos+1); - lua_rawseti(L, 1, pos); /* t[pos] = t[pos+1] */ - } - lua_pushnil(L); - lua_rawseti(L, 1, pos); /* t[pos] = nil */ - return 1; -} - - -static void addfield (lua_State *L, luaL_Buffer *b, int i) { - lua_rawgeti(L, 1, i); - if (!lua_isstring(L, -1)) - luaL_error(L, "invalid value (%s) at index %d in table for " - LUA_QL("concat"), luaL_typename(L, -1), i); - luaL_addvalue(b); -} - - -static int tconcat (lua_State *L) { - luaL_Buffer b; - size_t lsep; - int i, last; - const char *sep = luaL_optlstring(L, 2, "", &lsep); - luaL_checktype(L, 1, LUA_TTABLE); - i = luaL_optint(L, 3, 1); - last = luaL_opt(L, luaL_checkint, 4, luaL_len(L, 1)); - luaL_buffinit(L, &b); - for (; i < last; i++) { - addfield(L, &b, i); - luaL_addlstring(&b, sep, lsep); - } - if (i == last) /* add last value (if interval was not empty) */ - addfield(L, &b, i); - luaL_pushresult(&b); - return 1; -} - - -/* -** {====================================================== -** Pack/unpack -** ======================================================= -*/ - -static int pack (lua_State *L) { - int n = lua_gettop(L); /* number of elements to pack */ - lua_createtable(L, n, 1); /* create result table */ - lua_pushinteger(L, n); - lua_setfield(L, -2, "n"); /* t.n = number of elements */ - if (n > 0) { /* at least one element? */ - int i; - lua_pushvalue(L, 1); - lua_rawseti(L, -2, 1); /* insert first element */ - lua_replace(L, 1); /* move table into index 1 */ - for (i = n; i >= 2; i--) /* assign other elements */ - lua_rawseti(L, 1, i); - } - return 1; /* return table */ -} - - -static int unpack (lua_State *L) { - int i, e, n; - luaL_checktype(L, 1, LUA_TTABLE); - i = luaL_optint(L, 2, 1); - e = luaL_opt(L, luaL_checkint, 3, luaL_len(L, 1)); - if (i > e) return 0; /* empty range */ - n = e - i + 1; /* number of elements */ - if (n <= 0 || !lua_checkstack(L, n)) /* n <= 0 means arith. overflow */ - return luaL_error(L, "too many results to unpack"); - lua_rawgeti(L, 1, i); /* push arg[i] (avoiding overflow problems) */ - while (i++ < e) /* push arg[i + 1...e] */ - lua_rawgeti(L, 1, i); - return n; -} - -/* }====================================================== */ - - - -/* -** {====================================================== -** Quicksort -** (based on `Algorithms in MODULA-3', Robert Sedgewick; -** Addison-Wesley, 1993.) -** ======================================================= -*/ - - -static void set2 (lua_State *L, int i, int j) { - lua_rawseti(L, 1, i); - lua_rawseti(L, 1, j); -} - -static int sort_comp (lua_State *L, int a, int b) { - if (!lua_isnil(L, 2)) { /* function? */ - int res; - lua_pushvalue(L, 2); - lua_pushvalue(L, a-1); /* -1 to compensate function */ - lua_pushvalue(L, b-2); /* -2 to compensate function and `a' */ - lua_call(L, 2, 1); - res = lua_toboolean(L, -1); - lua_pop(L, 1); - return res; - } - else /* a < b? */ - return lua_compare(L, a, b, LUA_OPLT); -} - -static void auxsort (lua_State *L, int l, int u) { - while (l < u) { /* for tail recursion */ - int i, j; - /* sort elements a[l], a[(l+u)/2] and a[u] */ - lua_rawgeti(L, 1, l); - lua_rawgeti(L, 1, u); - if (sort_comp(L, -1, -2)) /* a[u] < a[l]? */ - set2(L, l, u); /* swap a[l] - a[u] */ - else - lua_pop(L, 2); - if (u-l == 1) break; /* only 2 elements */ - i = (l+u)/2; - lua_rawgeti(L, 1, i); - lua_rawgeti(L, 1, l); - if (sort_comp(L, -2, -1)) /* a[i]= P */ - while (lua_rawgeti(L, 1, ++i), sort_comp(L, -1, -2)) { - if (i>=u) luaL_error(L, "invalid order function for sorting"); - lua_pop(L, 1); /* remove a[i] */ - } - /* repeat --j until a[j] <= P */ - while (lua_rawgeti(L, 1, --j), sort_comp(L, -3, -1)) { - if (j<=l) luaL_error(L, "invalid order function for sorting"); - lua_pop(L, 1); /* remove a[j] */ - } - if (j - -#define ltm_c -#define LUA_CORE - -#include "lua.h" - -#include "lobject.h" -#include "lstate.h" -#include "lstring.h" -#include "ltable.h" -#include "ltm.h" - - -static const char udatatypename[] = "userdata"; - -LUAI_DDEF const char *const luaT_typenames_[LUA_TOTALTAGS] = { - "no value", - "nil", "boolean", udatatypename, "number", - "string", "table", "function", udatatypename, "thread", - "proto", "upval" /* these last two cases are used for tests only */ -}; - - -void luaT_init (lua_State *L) { - static const char *const luaT_eventname[] = { /* ORDER TM */ - "__index", "__newindex", - "__gc", "__mode", "__len", "__eq", - "__add", "__sub", "__mul", "__div", "__mod", - "__pow", "__unm", "__lt", "__le", - "__concat", "__call" - }; - int i; - for (i=0; itmname[i] = luaS_new(L, luaT_eventname[i]); - luaS_fix(G(L)->tmname[i]); /* never collect these names */ - } -} - - -/* -** function to be used with macro "fasttm": optimized for absence of -** tag methods -*/ -const TValue *luaT_gettm (Table *events, TMS event, TString *ename) { - const TValue *tm = luaH_getstr(events, ename); - lua_assert(event <= TM_EQ); - if (ttisnil(tm)) { /* no tag method? */ - events->flags |= cast_byte(1u<metatable; - break; - case LUA_TUSERDATA: - mt = uvalue(o)->metatable; - break; - default: - mt = G(L)->mt[ttypenv(o)]; - } - return (mt ? luaH_getstr(mt, G(L)->tmname[event]) : luaO_nilobject); -} - diff --git a/radio/src/lua/src/ltm.h b/radio/src/lua/src/ltm.h deleted file mode 100644 index 89bdc19a1..000000000 --- a/radio/src/lua/src/ltm.h +++ /dev/null @@ -1,57 +0,0 @@ -/* -** $Id: ltm.h,v 2.11 2011/02/28 17:32:10 roberto Exp $ -** Tag methods -** See Copyright Notice in lua.h -*/ - -#ifndef ltm_h -#define ltm_h - - -#include "lobject.h" - - -/* -* WARNING: if you change the order of this enumeration, -* grep "ORDER TM" -*/ -typedef enum { - TM_INDEX, - TM_NEWINDEX, - TM_GC, - TM_MODE, - TM_LEN, - TM_EQ, /* last tag method with `fast' access */ - TM_ADD, - TM_SUB, - TM_MUL, - TM_DIV, - TM_MOD, - TM_POW, - TM_UNM, - TM_LT, - TM_LE, - TM_CONCAT, - TM_CALL, - TM_N /* number of elements in the enum */ -} TMS; - - - -#define gfasttm(g,et,e) ((et) == NULL ? NULL : \ - ((et)->flags & (1u<<(e))) ? NULL : luaT_gettm(et, e, (g)->tmname[e])) - -#define fasttm(l,et,e) gfasttm(G(l), et, e) - -#define ttypename(x) luaT_typenames_[(x) + 1] -#define objtypename(x) ttypename(ttypenv(x)) - -LUAI_DDEC const char *const luaT_typenames_[LUA_TOTALTAGS]; - - -LUAI_FUNC const TValue *luaT_gettm (Table *events, TMS event, TString *ename); -LUAI_FUNC const TValue *luaT_gettmbyobj (lua_State *L, const TValue *o, - TMS event); -LUAI_FUNC void luaT_init (lua_State *L); - -#endif diff --git a/radio/src/lua/src/lua.c b/radio/src/lua/src/lua.c deleted file mode 100644 index c2c1e547d..000000000 --- a/radio/src/lua/src/lua.c +++ /dev/null @@ -1,496 +0,0 @@ -/* -** $Id: lua.c,v 1.206 2012/09/29 20:07:06 roberto Exp $ -** Lua stand-alone interpreter -** See Copyright Notice in lua.h -*/ - - -#include -#include -#include - -#define lua_c - -#include "lua.h" - -#include "lauxlib.h" -#include "lualib.h" - - -#if !defined(LUA_PROMPT) -#define LUA_PROMPT "> " -#define LUA_PROMPT2 ">> " -#endif - -#if !defined(LUA_PROGNAME) -#define LUA_PROGNAME "lua" -#endif - -#if !defined(LUA_MAXINPUT) -#define LUA_MAXINPUT 512 -#endif - -#if !defined(LUA_INIT) -#define LUA_INIT "LUA_INIT" -#endif - -#define LUA_INITVERSION \ - LUA_INIT "_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR - - -/* -** lua_stdin_is_tty detects whether the standard input is a 'tty' (that -** is, whether we're running lua interactively). -*/ -#if defined(LUA_USE_ISATTY) -#include -#define lua_stdin_is_tty() isatty(0) -#elif defined(LUA_WIN) -#include -#include -#define lua_stdin_is_tty() _isatty(_fileno(stdin)) -#else -#define lua_stdin_is_tty() 1 /* assume stdin is a tty */ -#endif - - -/* -** lua_readline defines how to show a prompt and then read a line from -** the standard input. -** lua_saveline defines how to "save" a read line in a "history". -** lua_freeline defines how to free a line read by lua_readline. -*/ -#if defined(LUA_USE_READLINE) - -#include -#include -#include -#define lua_readline(L,b,p) ((void)L, ((b)=readline(p)) != NULL) -#define lua_saveline(L,idx) \ - if (lua_rawlen(L,idx) > 0) /* non-empty line? */ \ - add_history(lua_tostring(L, idx)); /* add it to history */ -#define lua_freeline(L,b) ((void)L, free(b)) - -#elif !defined(lua_readline) - -#define lua_readline(L,b,p) \ - ((void)L, fputs(p, stdout), fflush(stdout), /* show prompt */ \ - fgets(b, LUA_MAXINPUT, stdin) != NULL) /* get line */ -#define lua_saveline(L,idx) { (void)L; (void)idx; } -#define lua_freeline(L,b) { (void)L; (void)b; } - -#endif - - - - -static lua_State *globalL = NULL; - -static const char *progname = LUA_PROGNAME; - - - -static void lstop (lua_State *L, lua_Debug *ar) { - (void)ar; /* unused arg. */ - lua_sethook(L, NULL, 0, 0); - luaL_error(L, "interrupted!"); -} - - -static void laction (int i) { - signal(i, SIG_DFL); /* if another SIGINT happens before lstop, - terminate process (default action) */ - lua_sethook(globalL, lstop, LUA_MASKCALL | LUA_MASKRET | LUA_MASKCOUNT, 1); -} - - -static void print_usage (const char *badoption) { - luai_writestringerror("%s: ", progname); - if (badoption[1] == 'e' || badoption[1] == 'l') - luai_writestringerror("'%s' needs argument\n", badoption); - else - luai_writestringerror("unrecognized option '%s'\n", badoption); - luai_writestringerror( - "usage: %s [options] [script [args]]\n" - "Available options are:\n" - " -e stat execute string " LUA_QL("stat") "\n" - " -i enter interactive mode after executing " LUA_QL("script") "\n" - " -l name require library " LUA_QL("name") "\n" - " -v show version information\n" - " -E ignore environment variables\n" - " -- stop handling options\n" - " - stop handling options and execute stdin\n" - , - progname); -} - - -static void l_message (const char *pname, const char *msg) { - if (pname) luai_writestringerror("%s: ", pname); - luai_writestringerror("%s\n", msg); -} - - -static int report (lua_State *L, int status) { - if (status != LUA_OK && !lua_isnil(L, -1)) { - const char *msg = lua_tostring(L, -1); - if (msg == NULL) msg = "(error object is not a string)"; - l_message(progname, msg); - lua_pop(L, 1); - /* force a complete garbage collection in case of errors */ - lua_gc(L, LUA_GCCOLLECT, 0); - } - return status; -} - - -/* the next function is called unprotected, so it must avoid errors */ -static void finalreport (lua_State *L, int status) { - if (status != LUA_OK) { - const char *msg = (lua_type(L, -1) == LUA_TSTRING) ? lua_tostring(L, -1) - : NULL; - if (msg == NULL) msg = "(error object is not a string)"; - l_message(progname, msg); - lua_pop(L, 1); - } -} - - -static int traceback (lua_State *L) { - const char *msg = lua_tostring(L, 1); - if (msg) - luaL_traceback(L, L, msg, 1); - else if (!lua_isnoneornil(L, 1)) { /* is there an error object? */ - if (!luaL_callmeta(L, 1, "__tostring")) /* try its 'tostring' metamethod */ - lua_pushliteral(L, "(no error message)"); - } - return 1; -} - - -static int docall (lua_State *L, int narg, int nres) { - int status; - int base = lua_gettop(L) - narg; /* function index */ - lua_pushcfunction(L, traceback); /* push traceback function */ - lua_insert(L, base); /* put it under chunk and args */ - globalL = L; /* to be available to 'laction' */ - signal(SIGINT, laction); - status = lua_pcall(L, narg, nres, base); - signal(SIGINT, SIG_DFL); - lua_remove(L, base); /* remove traceback function */ - return status; -} - - -static void print_version (void) { - luai_writestring(LUA_COPYRIGHT, strlen(LUA_COPYRIGHT)); - luai_writeline(); -} - - -static int getargs (lua_State *L, char **argv, int n) { - int narg; - int i; - int argc = 0; - while (argv[argc]) argc++; /* count total number of arguments */ - narg = argc - (n + 1); /* number of arguments to the script */ - luaL_checkstack(L, narg + 3, "too many arguments to script"); - for (i=n+1; i < argc; i++) - lua_pushstring(L, argv[i]); - lua_createtable(L, narg, n + 1); - for (i=0; i < argc; i++) { - lua_pushstring(L, argv[i]); - lua_rawseti(L, -2, i - n); - } - return narg; -} - - -static int dofile (lua_State *L, const char *name) { - int status = luaL_loadfile(L, name); - if (status == LUA_OK) status = docall(L, 0, 0); - return report(L, status); -} - - -static int dostring (lua_State *L, const char *s, const char *name) { - int status = luaL_loadbuffer(L, s, strlen(s), name); - if (status == LUA_OK) status = docall(L, 0, 0); - return report(L, status); -} - - -static int dolibrary (lua_State *L, const char *name) { - int status; - lua_getglobal(L, "require"); - lua_pushstring(L, name); - status = docall(L, 1, 1); /* call 'require(name)' */ - if (status == LUA_OK) - lua_setglobal(L, name); /* global[name] = require return */ - return report(L, status); -} - - -static const char *get_prompt (lua_State *L, int firstline) { - const char *p; - lua_getglobal(L, firstline ? "_PROMPT" : "_PROMPT2"); - p = lua_tostring(L, -1); - if (p == NULL) p = (firstline ? LUA_PROMPT : LUA_PROMPT2); - return p; -} - -/* mark in error messages for incomplete statements */ -#define EOFMARK "" -#define marklen (sizeof(EOFMARK)/sizeof(char) - 1) - -static int incomplete (lua_State *L, int status) { - if (status == LUA_ERRSYNTAX) { - size_t lmsg; - const char *msg = lua_tolstring(L, -1, &lmsg); - if (lmsg >= marklen && strcmp(msg + lmsg - marklen, EOFMARK) == 0) { - lua_pop(L, 1); - return 1; - } - } - return 0; /* else... */ -} - - -static int pushline (lua_State *L, int firstline) { - char buffer[LUA_MAXINPUT]; - char *b = buffer; - size_t l; - const char *prmt = get_prompt(L, firstline); - int readstatus = lua_readline(L, b, prmt); - lua_pop(L, 1); /* remove result from 'get_prompt' */ - if (readstatus == 0) - return 0; /* no input */ - l = strlen(b); - if (l > 0 && b[l-1] == '\n') /* line ends with newline? */ - b[l-1] = '\0'; /* remove it */ - if (firstline && b[0] == '=') /* first line starts with `=' ? */ - lua_pushfstring(L, "return %s", b+1); /* change it to `return' */ - else - lua_pushstring(L, b); - lua_freeline(L, b); - return 1; -} - - -static int loadline (lua_State *L) { - int status; - lua_settop(L, 0); - if (!pushline(L, 1)) - return -1; /* no input */ - for (;;) { /* repeat until gets a complete line */ - size_t l; - const char *line = lua_tolstring(L, 1, &l); - status = luaL_loadbuffer(L, line, l, "=stdin"); - if (!incomplete(L, status)) break; /* cannot try to add lines? */ - if (!pushline(L, 0)) /* no more input? */ - return -1; - lua_pushliteral(L, "\n"); /* add a new line... */ - lua_insert(L, -2); /* ...between the two lines */ - lua_concat(L, 3); /* join them */ - } - lua_saveline(L, 1); - lua_remove(L, 1); /* remove line */ - return status; -} - - -static void dotty (lua_State *L) { - int status; - const char *oldprogname = progname; - progname = NULL; - while ((status = loadline(L)) != -1) { - if (status == LUA_OK) status = docall(L, 0, LUA_MULTRET); - report(L, status); - if (status == LUA_OK && lua_gettop(L) > 0) { /* any result to print? */ - luaL_checkstack(L, LUA_MINSTACK, "too many results to print"); - lua_getglobal(L, "print"); - lua_insert(L, 1); - if (lua_pcall(L, lua_gettop(L)-1, 0, 0) != LUA_OK) - l_message(progname, lua_pushfstring(L, - "error calling " LUA_QL("print") " (%s)", - lua_tostring(L, -1))); - } - } - lua_settop(L, 0); /* clear stack */ - luai_writeline(); - progname = oldprogname; -} - - -static int handle_script (lua_State *L, char **argv, int n) { - int status; - const char *fname; - int narg = getargs(L, argv, n); /* collect arguments */ - lua_setglobal(L, "arg"); - fname = argv[n]; - if (strcmp(fname, "-") == 0 && strcmp(argv[n-1], "--") != 0) - fname = NULL; /* stdin */ - status = luaL_loadfile(L, fname); - lua_insert(L, -(narg+1)); - if (status == LUA_OK) - status = docall(L, narg, LUA_MULTRET); - else - lua_pop(L, narg); - return report(L, status); -} - - -/* check that argument has no extra characters at the end */ -#define noextrachars(x) {if ((x)[2] != '\0') return -1;} - - -/* indices of various argument indicators in array args */ -#define has_i 0 /* -i */ -#define has_v 1 /* -v */ -#define has_e 2 /* -e */ -#define has_E 3 /* -E */ - -#define num_has 4 /* number of 'has_*' */ - - -static int collectargs (char **argv, int *args) { - int i; - for (i = 1; argv[i] != NULL; i++) { - if (argv[i][0] != '-') /* not an option? */ - return i; - switch (argv[i][1]) { /* option */ - case '-': - noextrachars(argv[i]); - return (argv[i+1] != NULL ? i+1 : 0); - case '\0': - return i; - case 'E': - args[has_E] = 1; - break; - case 'i': - noextrachars(argv[i]); - args[has_i] = 1; /* go through */ - case 'v': - noextrachars(argv[i]); - args[has_v] = 1; - break; - case 'e': - args[has_e] = 1; /* go through */ - case 'l': /* both options need an argument */ - if (argv[i][2] == '\0') { /* no concatenated argument? */ - i++; /* try next 'argv' */ - if (argv[i] == NULL || argv[i][0] == '-') - return -(i - 1); /* no next argument or it is another option */ - } - break; - default: /* invalid option; return its index... */ - return -i; /* ...as a negative value */ - } - } - return 0; -} - - -static int runargs (lua_State *L, char **argv, int n) { - int i; - for (i = 1; i < n; i++) { - lua_assert(argv[i][0] == '-'); - switch (argv[i][1]) { /* option */ - case 'e': { - const char *chunk = argv[i] + 2; - if (*chunk == '\0') chunk = argv[++i]; - lua_assert(chunk != NULL); - if (dostring(L, chunk, "=(command line)") != LUA_OK) - return 0; - break; - } - case 'l': { - const char *filename = argv[i] + 2; - if (*filename == '\0') filename = argv[++i]; - lua_assert(filename != NULL); - if (dolibrary(L, filename) != LUA_OK) - return 0; /* stop if file fails */ - break; - } - default: break; - } - } - return 1; -} - - -static int handle_luainit (lua_State *L) { - const char *name = "=" LUA_INITVERSION; - const char *init = getenv(name + 1); - if (init == NULL) { - name = "=" LUA_INIT; - init = getenv(name + 1); /* try alternative name */ - } - if (init == NULL) return LUA_OK; - else if (init[0] == '@') - return dofile(L, init+1); - else - return dostring(L, init, name); -} - - -static int pmain (lua_State *L) { - int argc = (int)lua_tointeger(L, 1); - char **argv = (char **)lua_touserdata(L, 2); - int script; - int args[num_has]; - args[has_i] = args[has_v] = args[has_e] = args[has_E] = 0; - if (argv[0] && argv[0][0]) progname = argv[0]; - script = collectargs(argv, args); - if (script < 0) { /* invalid arg? */ - print_usage(argv[-script]); - return 0; - } - if (args[has_v]) print_version(); - if (args[has_E]) { /* option '-E'? */ - lua_pushboolean(L, 1); /* signal for libraries to ignore env. vars. */ - lua_setfield(L, LUA_REGISTRYINDEX, "LUA_NOENV"); - } - /* open standard libraries */ - luaL_checkversion(L); - lua_gc(L, LUA_GCSTOP, 0); /* stop collector during initialization */ - luaL_openlibs(L); /* open libraries */ - lua_gc(L, LUA_GCRESTART, 0); - if (!args[has_E] && handle_luainit(L) != LUA_OK) - return 0; /* error running LUA_INIT */ - /* execute arguments -e and -l */ - if (!runargs(L, argv, (script > 0) ? script : argc)) return 0; - /* execute main script (if there is one) */ - if (script && handle_script(L, argv, script) != LUA_OK) return 0; - if (args[has_i]) /* -i option? */ - dotty(L); - else if (script == 0 && !args[has_e] && !args[has_v]) { /* no arguments? */ - if (lua_stdin_is_tty()) { - print_version(); - dotty(L); - } - else dofile(L, NULL); /* executes stdin as a file */ - } - lua_pushboolean(L, 1); /* signal no errors */ - return 1; -} - - -int main (int argc, char **argv) { - int status, result; - lua_State *L = luaL_newstate(); /* create state */ - if (L == NULL) { - l_message(argv[0], "cannot create state: not enough memory"); - return EXIT_FAILURE; - } - /* call 'pmain' in protected mode */ - lua_pushcfunction(L, &pmain); - lua_pushinteger(L, argc); /* 1st argument */ - lua_pushlightuserdata(L, argv); /* 2nd argument */ - status = lua_pcall(L, 2, 1, 0); - result = lua_toboolean(L, -1); /* get result */ - finalreport(L, status); - lua_close(L); - return (result && status == LUA_OK) ? EXIT_SUCCESS : EXIT_FAILURE; -} - diff --git a/radio/src/lua/src/lua.h b/radio/src/lua/src/lua.h deleted file mode 100644 index d9ae5c9ea..000000000 --- a/radio/src/lua/src/lua.h +++ /dev/null @@ -1,455 +0,0 @@ -/* -** $Id: lua.h,v 1.285 2013/03/15 13:04:22 roberto Exp $ -** Lua - A Scripting Language -** Lua.org, PUC-Rio, Brazil (http://www.lua.org) -** See Copyright Notice at the end of this file -*/ - - -#ifndef lua_h -#define lua_h - -#include -#include - - -#include "luaconf.h" - - -#define LUA_VERSION_MAJOR "5" -#define LUA_VERSION_MINOR "2" -#define LUA_VERSION_NUM 502 -#define LUA_VERSION_RELEASE "2" - -#define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR -#define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE -#define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2013 Lua.org, PUC-Rio" -#define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo, W. Celes" - - -/* mark for precompiled code ('Lua') */ -#define LUA_SIGNATURE "\033Lua" - -/* option for multiple returns in 'lua_pcall' and 'lua_call' */ -#define LUA_MULTRET (-1) - - -/* -** pseudo-indices -*/ -#define LUA_REGISTRYINDEX LUAI_FIRSTPSEUDOIDX -#define lua_upvalueindex(i) (LUA_REGISTRYINDEX - (i)) - - -/* thread status */ -#define LUA_OK 0 -#define LUA_YIELD 1 -#define LUA_ERRRUN 2 -#define LUA_ERRSYNTAX 3 -#define LUA_ERRMEM 4 -#define LUA_ERRGCMM 5 -#define LUA_ERRERR 6 - - -typedef struct lua_State lua_State; - -typedef int (*lua_CFunction) (lua_State *L); - - -/* -** functions that read/write blocks when loading/dumping Lua chunks -*/ -typedef const char * (*lua_Reader) (lua_State *L, void *ud, size_t *sz); - -typedef int (*lua_Writer) (lua_State *L, const void* p, size_t sz, void* ud); - - -/* -** prototype for memory-allocation functions -*/ -typedef void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize); - - -/* -** basic types -*/ -#define LUA_TNONE (-1) - -#define LUA_TNIL 0 -#define LUA_TBOOLEAN 1 -#define LUA_TLIGHTUSERDATA 2 -#define LUA_TNUMBER 3 -#define LUA_TSTRING 4 -#define LUA_TTABLE 5 -#define LUA_TFUNCTION 6 -#define LUA_TUSERDATA 7 -#define LUA_TTHREAD 8 - -#define LUA_NUMTAGS 9 - - - -/* minimum Lua stack available to a C function */ -#define LUA_MINSTACK 20 - - -/* predefined values in the registry */ -#define LUA_RIDX_MAINTHREAD 1 -#define LUA_RIDX_GLOBALS 2 -#define LUA_RIDX_LAST LUA_RIDX_GLOBALS - - -/* type of numbers in Lua */ -typedef LUA_NUMBER lua_Number; - - -/* type for integer functions */ -typedef LUA_INTEGER lua_Integer; - -/* unsigned integer type */ -typedef LUA_UNSIGNED lua_Unsigned; - - - -/* -** generic extra include file -*/ -#if defined(LUA_USER_H) -#include LUA_USER_H -#endif - - -/* -** RCS ident string -*/ -extern const char lua_ident[]; - - -/* -** state manipulation -*/ -LUA_API lua_State *(lua_newstate) (lua_Alloc f, void *ud); -LUA_API void (lua_close) (lua_State *L); -LUA_API lua_State *(lua_newthread) (lua_State *L); - -LUA_API lua_CFunction (lua_atpanic) (lua_State *L, lua_CFunction panicf); - - -LUA_API const lua_Number *(lua_version) (lua_State *L); - - -/* -** basic stack manipulation -*/ -LUA_API int (lua_absindex) (lua_State *L, int idx); -LUA_API int (lua_gettop) (lua_State *L); -LUA_API void (lua_settop) (lua_State *L, int idx); -LUA_API void (lua_pushvalue) (lua_State *L, int idx); -LUA_API void (lua_remove) (lua_State *L, int idx); -LUA_API void (lua_insert) (lua_State *L, int idx); -LUA_API void (lua_replace) (lua_State *L, int idx); -LUA_API void (lua_copy) (lua_State *L, int fromidx, int toidx); -LUA_API int (lua_checkstack) (lua_State *L, int sz); - -LUA_API void (lua_xmove) (lua_State *from, lua_State *to, int n); - - -/* -** access functions (stack -> C) -*/ - -LUA_API int (lua_isnumber) (lua_State *L, int idx); -LUA_API int (lua_isstring) (lua_State *L, int idx); -LUA_API int (lua_iscfunction) (lua_State *L, int idx); -LUA_API int (lua_isuserdata) (lua_State *L, int idx); -LUA_API int (lua_type) (lua_State *L, int idx); -LUA_API const char *(lua_typename) (lua_State *L, int tp); - -LUA_API lua_Number (lua_tonumberx) (lua_State *L, int idx, int *isnum); -LUA_API lua_Integer (lua_tointegerx) (lua_State *L, int idx, int *isnum); -LUA_API lua_Unsigned (lua_tounsignedx) (lua_State *L, int idx, int *isnum); -LUA_API int (lua_toboolean) (lua_State *L, int idx); -LUA_API const char *(lua_tolstring) (lua_State *L, int idx, size_t *len); -LUA_API size_t (lua_rawlen) (lua_State *L, int idx); -LUA_API lua_CFunction (lua_tocfunction) (lua_State *L, int idx); -LUA_API void *(lua_touserdata) (lua_State *L, int idx); -LUA_API lua_State *(lua_tothread) (lua_State *L, int idx); -LUA_API const void *(lua_topointer) (lua_State *L, int idx); - - -/* -** Comparison and arithmetic functions -*/ - -#define LUA_OPADD 0 /* ORDER TM */ -#define LUA_OPSUB 1 -#define LUA_OPMUL 2 -#define LUA_OPDIV 3 -#define LUA_OPMOD 4 -#define LUA_OPPOW 5 -#define LUA_OPUNM 6 - -LUA_API void (lua_arith) (lua_State *L, int op); - -#define LUA_OPEQ 0 -#define LUA_OPLT 1 -#define LUA_OPLE 2 - -LUA_API int (lua_rawequal) (lua_State *L, int idx1, int idx2); -LUA_API int (lua_compare) (lua_State *L, int idx1, int idx2, int op); - - -/* -** push functions (C -> stack) -*/ -LUA_API void (lua_pushnil) (lua_State *L); -LUA_API void (lua_pushnumber) (lua_State *L, lua_Number n); -LUA_API void (lua_pushinteger) (lua_State *L, lua_Integer n); -LUA_API void (lua_pushunsigned) (lua_State *L, lua_Unsigned n); -LUA_API const char *(lua_pushlstring) (lua_State *L, const char *s, size_t l); -LUA_API const char *(lua_pushstring) (lua_State *L, const char *s); -LUA_API const char *(lua_pushvfstring) (lua_State *L, const char *fmt, - va_list argp); -LUA_API const char *(lua_pushfstring) (lua_State *L, const char *fmt, ...); -LUA_API void (lua_pushcclosure) (lua_State *L, lua_CFunction fn, int n); -LUA_API void (lua_pushboolean) (lua_State *L, int b); -LUA_API void (lua_pushlightuserdata) (lua_State *L, void *p); -LUA_API int (lua_pushthread) (lua_State *L); - - -/* -** get functions (Lua -> stack) -*/ -LUA_API void (lua_getglobal) (lua_State *L, const char *var); -LUA_API void (lua_gettable) (lua_State *L, int idx); -LUA_API void (lua_getfield) (lua_State *L, int idx, const char *k); -LUA_API void (lua_rawget) (lua_State *L, int idx); -LUA_API void (lua_rawgeti) (lua_State *L, int idx, int n); -LUA_API void (lua_rawgetp) (lua_State *L, int idx, const void *p); -LUA_API void (lua_createtable) (lua_State *L, int narr, int nrec); -LUA_API void *(lua_newuserdata) (lua_State *L, size_t sz); -LUA_API int (lua_getmetatable) (lua_State *L, int objindex); -LUA_API void (lua_getuservalue) (lua_State *L, int idx); - - -/* -** set functions (stack -> Lua) -*/ -LUA_API void (lua_setglobal) (lua_State *L, const char *var); -LUA_API void (lua_settable) (lua_State *L, int idx); -LUA_API void (lua_setfield) (lua_State *L, int idx, const char *k); -LUA_API void (lua_rawset) (lua_State *L, int idx); -LUA_API void (lua_rawseti) (lua_State *L, int idx, int n); -LUA_API void (lua_rawsetp) (lua_State *L, int idx, const void *p); -LUA_API int (lua_setmetatable) (lua_State *L, int objindex); -LUA_API void (lua_setuservalue) (lua_State *L, int idx); - - -/* -** 'load' and 'call' functions (load and run Lua code) -*/ -LUA_API void (lua_callk) (lua_State *L, int nargs, int nresults, int ctx, - lua_CFunction k); -#define lua_call(L,n,r) lua_callk(L, (n), (r), 0, NULL) - -LUA_API int (lua_getctx) (lua_State *L, int *ctx); - -LUA_API int (lua_pcallk) (lua_State *L, int nargs, int nresults, int errfunc, - int ctx, lua_CFunction k); -#define lua_pcall(L,n,r,f) lua_pcallk(L, (n), (r), (f), 0, NULL) - -LUA_API int (lua_load) (lua_State *L, lua_Reader reader, void *dt, - const char *chunkname, - const char *mode); - -LUA_API int (lua_dump) (lua_State *L, lua_Writer writer, void *data); - - -/* -** coroutine functions -*/ -LUA_API int (lua_yieldk) (lua_State *L, int nresults, int ctx, - lua_CFunction k); -#define lua_yield(L,n) lua_yieldk(L, (n), 0, NULL) -LUA_API int (lua_resume) (lua_State *L, lua_State *from, int narg); -LUA_API int (lua_status) (lua_State *L); - -/* -** garbage-collection function and options -*/ - -#define LUA_GCSTOP 0 -#define LUA_GCRESTART 1 -#define LUA_GCCOLLECT 2 -#define LUA_GCCOUNT 3 -#define LUA_GCCOUNTB 4 -#define LUA_GCSTEP 5 -#define LUA_GCSETPAUSE 6 -#define LUA_GCSETSTEPMUL 7 -#define LUA_GCSETMAJORINC 8 -#define LUA_GCISRUNNING 9 -#define LUA_GCGEN 10 -#define LUA_GCINC 11 - -LUA_API int (lua_gc) (lua_State *L, int what, int data); - - -/* -** miscellaneous functions -*/ - -LUA_API int (lua_error) (lua_State *L); - -LUA_API int (lua_next) (lua_State *L, int idx); - -LUA_API void (lua_concat) (lua_State *L, int n); -LUA_API void (lua_len) (lua_State *L, int idx); - -LUA_API lua_Alloc (lua_getallocf) (lua_State *L, void **ud); -LUA_API void (lua_setallocf) (lua_State *L, lua_Alloc f, void *ud); - - - -/* -** =============================================================== -** some useful macros -** =============================================================== -*/ - -#define lua_tonumber(L,i) lua_tonumberx(L,i,NULL) -#define lua_tointeger(L,i) lua_tointegerx(L,i,NULL) -#define lua_tounsigned(L,i) lua_tounsignedx(L,i,NULL) - -#define lua_pop(L,n) lua_settop(L, -(n)-1) - -#define lua_newtable(L) lua_createtable(L, 0, 0) - -#define lua_register(L,n,f) (lua_pushcfunction(L, (f)), lua_setglobal(L, (n))) - -#define lua_pushcfunction(L,f) lua_pushcclosure(L, (f), 0) - -#define lua_isfunction(L,n) (lua_type(L, (n)) == LUA_TFUNCTION) -#define lua_istable(L,n) (lua_type(L, (n)) == LUA_TTABLE) -#define lua_islightuserdata(L,n) (lua_type(L, (n)) == LUA_TLIGHTUSERDATA) -#define lua_isnil(L,n) (lua_type(L, (n)) == LUA_TNIL) -#define lua_isboolean(L,n) (lua_type(L, (n)) == LUA_TBOOLEAN) -#define lua_isthread(L,n) (lua_type(L, (n)) == LUA_TTHREAD) -#define lua_isnone(L,n) (lua_type(L, (n)) == LUA_TNONE) -#define lua_isnoneornil(L, n) (lua_type(L, (n)) <= 0) - -#define lua_pushliteral(L, s) \ - lua_pushlstring(L, "" s, (sizeof(s)/sizeof(char))-1) - -#define lua_pushglobaltable(L) \ - lua_rawgeti(L, LUA_REGISTRYINDEX, LUA_RIDX_GLOBALS) - -#define lua_tostring(L,i) lua_tolstring(L, (i), NULL) - - - -/* -** {====================================================================== -** Debug API -** ======================================================================= -*/ - - -/* -** Event codes -*/ -#define LUA_HOOKCALL 0 -#define LUA_HOOKRET 1 -#define LUA_HOOKLINE 2 -#define LUA_HOOKCOUNT 3 -#define LUA_HOOKTAILCALL 4 - - -/* -** Event masks -*/ -#define LUA_MASKCALL (1 << LUA_HOOKCALL) -#define LUA_MASKRET (1 << LUA_HOOKRET) -#define LUA_MASKLINE (1 << LUA_HOOKLINE) -#define LUA_MASKCOUNT (1 << LUA_HOOKCOUNT) - -typedef struct lua_Debug lua_Debug; /* activation record */ - - -/* Functions to be called by the debugger in specific events */ -typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar); - - -LUA_API int (lua_getstack) (lua_State *L, int level, lua_Debug *ar); -LUA_API int (lua_getinfo) (lua_State *L, const char *what, lua_Debug *ar); -LUA_API const char *(lua_getlocal) (lua_State *L, const lua_Debug *ar, int n); -LUA_API const char *(lua_setlocal) (lua_State *L, const lua_Debug *ar, int n); -LUA_API const char *(lua_getupvalue) (lua_State *L, int funcindex, int n); -LUA_API const char *(lua_setupvalue) (lua_State *L, int funcindex, int n); - -LUA_API void *(lua_upvalueid) (lua_State *L, int fidx, int n); -LUA_API void (lua_upvaluejoin) (lua_State *L, int fidx1, int n1, - int fidx2, int n2); - -LUA_API int (lua_sethook) (lua_State *L, lua_Hook func, int mask, int count); -LUA_API lua_Hook (lua_gethook) (lua_State *L); -LUA_API int (lua_gethookmask) (lua_State *L); -LUA_API int (lua_gethookcount) (lua_State *L); - - -struct lua_Debug { - int event; - const char *name; /* (n) */ - const char *namewhat; /* (n) 'global', 'local', 'field', 'method' */ - const char *what; /* (S) 'Lua', 'C', 'main', 'tail' */ - const char *source; /* (S) */ - int currentline; /* (l) */ - int linedefined; /* (S) */ - int lastlinedefined; /* (S) */ - unsigned char nups; /* (u) number of upvalues */ - unsigned char nparams;/* (u) number of parameters */ - char isvararg; /* (u) */ - char istailcall; /* (t) */ - char short_src[LUA_IDSIZE]; /* (S) */ - /* private part */ - struct CallInfo *i_ci; /* active function */ -}; - -#if defined(USE_FATFS) - #include "FatFs/ff.h" - int lua__getc(FIL *f); - #define lua_getc(f) lua__getc(&f) - #define lua_fclose f_close -#else - #include - #define lua_getc getc - #define lua_fclose fclose -#endif - -/* }====================================================================== */ - - -/****************************************************************************** -* Copyright (C) 1994-2013 Lua.org, PUC-Rio. -* -* Permission is hereby granted, free of charge, to any person obtaining -* a copy of this software and associated documentation files (the -* "Software"), to deal in the Software without restriction, including -* without limitation the rights to use, copy, modify, merge, publish, -* distribute, sublicense, and/or sell copies of the Software, and to -* permit persons to whom the Software is furnished to do so, subject to -* the following conditions: -* -* The above copyright notice and this permission notice shall be -* included in all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -******************************************************************************/ - - -#endif diff --git a/radio/src/lua/src/lua.hpp b/radio/src/lua/src/lua.hpp deleted file mode 100644 index ec417f594..000000000 --- a/radio/src/lua/src/lua.hpp +++ /dev/null @@ -1,9 +0,0 @@ -// lua.hpp -// Lua header files for C++ -// <> not supplied automatically because Lua also compiles as C++ - -extern "C" { -#include "lua.h" -#include "lualib.h" -#include "lauxlib.h" -} diff --git a/radio/src/lua/src/luac.c b/radio/src/lua/src/luac.c deleted file mode 100644 index b8e179381..000000000 --- a/radio/src/lua/src/luac.c +++ /dev/null @@ -1,431 +0,0 @@ -/* -** $Id: luac.c,v 1.69 2011/11/29 17:46:33 lhf Exp $ -** Lua compiler (saves bytecodes to files; also list bytecodes) -** See Copyright Notice in lua.h -*/ - -#include -#include -#include - -#define luac_c -#define LUA_CORE - -#include "lua.h" -#include "lauxlib.h" - -#include "lobject.h" -#include "lstate.h" -#include "lundump.h" - -static void PrintFunction(const Proto* f, int full); -#define luaU_print PrintFunction - -#define PROGNAME "luac" /* default program name */ -#define OUTPUT PROGNAME ".out" /* default output file */ - -static int listing=0; /* list bytecodes? */ -static int dumping=1; /* dump bytecodes? */ -static int stripping=0; /* strip debug information? */ -static char Output[]={ OUTPUT }; /* default output file name */ -static const char* output=Output; /* actual output file name */ -static const char* progname=PROGNAME; /* actual program name */ - -static void fatal(const char* message) -{ - fprintf(stderr,"%s: %s\n",progname,message); - exit(EXIT_FAILURE); -} - -static void cannot(const char* what) -{ - fprintf(stderr,"%s: cannot %s %s: %s\n",progname,what,output,strerror(errno)); - exit(EXIT_FAILURE); -} - -static void usage(const char* message) -{ - if (*message=='-') - fprintf(stderr,"%s: unrecognized option " LUA_QS "\n",progname,message); - else - fprintf(stderr,"%s: %s\n",progname,message); - fprintf(stderr, - "usage: %s [options] [filenames]\n" - "Available options are:\n" - " -l list (use -l -l for full listing)\n" - " -o name output to file " LUA_QL("name") " (default is \"%s\")\n" - " -p parse only\n" - " -s strip debug information\n" - " -v show version information\n" - " -- stop handling options\n" - " - stop handling options and process stdin\n" - ,progname,Output); - exit(EXIT_FAILURE); -} - -#define IS(s) (strcmp(argv[i],s)==0) - -static int doargs(int argc, char* argv[]) -{ - int i; - int version=0; - if (argv[0]!=NULL && *argv[0]!=0) progname=argv[0]; - for (i=1; itop+(i)) - -static const Proto* combine(lua_State* L, int n) -{ - if (n==1) - return toproto(L,-1); - else - { - Proto* f; - int i=n; - if (lua_load(L,reader,&i,"=(" PROGNAME ")",NULL)!=LUA_OK) fatal(lua_tostring(L,-1)); - f=toproto(L,-1); - for (i=0; ip[i]=toproto(L,i-n-1); - if (f->p[i]->sizeupvalues>0) f->p[i]->upvalues[0].instack=0; - } - f->sizelineinfo=0; - return f; - } -} - -static int writer(lua_State* L, const void* p, size_t size, void* u) -{ - UNUSED(L); - return (fwrite(p,size,1,(FILE*)u)!=1) && (size!=0); -} - -static int pmain(lua_State* L) -{ - int argc=(int)lua_tointeger(L,1); - char** argv=(char**)lua_touserdata(L,2); - const Proto* f; - int i; - if (!lua_checkstack(L,argc)) fatal("too many input files"); - for (i=0; i1); - if (dumping) - { - FILE* D= (output==NULL) ? stdout : fopen(output,"wb"); - if (D==NULL) cannot("open"); - lua_lock(L); - luaU_dump(L,f,writer,D,stripping); - lua_unlock(L); - if (ferror(D)) cannot("write"); - if (fclose(D)) cannot("close"); - } - return 0; -} - -int main(int argc, char* argv[]) -{ - lua_State* L; - int i=doargs(argc,argv); - argc-=i; argv+=i; - if (argc<=0) usage("no input files given"); - L=luaL_newstate(); - if (L==NULL) fatal("cannot create state: not enough memory"); - lua_pushcfunction(L,&pmain); - lua_pushinteger(L,argc); - lua_pushlightuserdata(L,argv); - if (lua_pcall(L,2,0,0)!=LUA_OK) fatal(lua_tostring(L,-1)); - lua_close(L); - return EXIT_SUCCESS; -} - -/* -** $Id: print.c,v 1.68 2011/09/30 10:21:20 lhf Exp $ -** print bytecodes -** See Copyright Notice in lua.h -*/ - -#include -#include - -#define luac_c -#define LUA_CORE - -#include "ldebug.h" -#include "lobject.h" -#include "lopcodes.h" - -#define VOID(p) ((const void*)(p)) - -static void PrintString(const TString* ts) -{ - const char* s=getstr(ts); - size_t i,n=ts->tsv.len; - printf("%c",'"'); - for (i=0; ik[i]; - switch (ttype(o)) - { - case LUA_TNIL: - printf("nil"); - break; - case LUA_TBOOLEAN: - printf(bvalue(o) ? "true" : "false"); - break; - case LUA_TNUMBER: - printf(LUA_NUMBER_FMT,nvalue(o)); - break; - case LUA_TSTRING: - PrintString(rawtsvalue(o)); - break; - default: /* cannot happen */ - printf("? type=%d",ttype(o)); - break; - } -} - -#define UPVALNAME(x) ((f->upvalues[x].name) ? getstr(f->upvalues[x].name) : "-") -#define MYK(x) (-1-(x)) - -static void PrintCode(const Proto* f) -{ - const Instruction* code=f->code; - int pc,n=f->sizecode; - for (pc=0; pc0) printf("[%d]\t",line); else printf("[-]\t"); - printf("%-9s\t",luaP_opnames[o]); - switch (getOpMode(o)) - { - case iABC: - printf("%d",a); - if (getBMode(o)!=OpArgN) printf(" %d",ISK(b) ? (MYK(INDEXK(b))) : b); - if (getCMode(o)!=OpArgN) printf(" %d",ISK(c) ? (MYK(INDEXK(c))) : c); - break; - case iABx: - printf("%d",a); - if (getBMode(o)==OpArgK) printf(" %d",MYK(bx)); - if (getBMode(o)==OpArgU) printf(" %d",bx); - break; - case iAsBx: - printf("%d %d",a,sbx); - break; - case iAx: - printf("%d",MYK(ax)); - break; - } - switch (o) - { - case OP_LOADK: - printf("\t; "); PrintConstant(f,bx); - break; - case OP_GETUPVAL: - case OP_SETUPVAL: - printf("\t; %s",UPVALNAME(b)); - break; - case OP_GETTABUP: - printf("\t; %s",UPVALNAME(b)); - if (ISK(c)) { printf(" "); PrintConstant(f,INDEXK(c)); } - break; - case OP_SETTABUP: - printf("\t; %s",UPVALNAME(a)); - if (ISK(b)) { printf(" "); PrintConstant(f,INDEXK(b)); } - if (ISK(c)) { printf(" "); PrintConstant(f,INDEXK(c)); } - break; - case OP_GETTABLE: - case OP_SELF: - if (ISK(c)) { printf("\t; "); PrintConstant(f,INDEXK(c)); } - break; - case OP_SETTABLE: - case OP_ADD: - case OP_SUB: - case OP_MUL: - case OP_DIV: - case OP_POW: - case OP_EQ: - case OP_LT: - case OP_LE: - if (ISK(b) || ISK(c)) - { - printf("\t; "); - if (ISK(b)) PrintConstant(f,INDEXK(b)); else printf("-"); - printf(" "); - if (ISK(c)) PrintConstant(f,INDEXK(c)); else printf("-"); - } - break; - case OP_JMP: - case OP_FORLOOP: - case OP_FORPREP: - case OP_TFORLOOP: - printf("\t; to %d",sbx+pc+2); - break; - case OP_CLOSURE: - printf("\t; %p",VOID(f->p[bx])); - break; - case OP_SETLIST: - if (c==0) printf("\t; %d",(int)code[++pc]); else printf("\t; %d",c); - break; - case OP_EXTRAARG: - printf("\t; "); PrintConstant(f,ax); - break; - default: - break; - } - printf("\n"); - } -} - -#define SS(x) ((x==1)?"":"s") -#define S(x) (int)(x),SS(x) - -static void PrintHeader(const Proto* f) -{ - const char* s=f->source ? getstr(f->source) : "=?"; - if (*s=='@' || *s=='=') - s++; - else if (*s==LUA_SIGNATURE[0]) - s="(bstring)"; - else - s="(string)"; - printf("\n%s <%s:%d,%d> (%d instruction%s at %p)\n", - (f->linedefined==0)?"main":"function",s, - f->linedefined,f->lastlinedefined, - S(f->sizecode),VOID(f)); - printf("%d%s param%s, %d slot%s, %d upvalue%s, ", - (int)(f->numparams),f->is_vararg?"+":"",SS(f->numparams), - S(f->maxstacksize),S(f->sizeupvalues)); - printf("%d local%s, %d constant%s, %d function%s\n", - S(f->sizelocvars),S(f->sizek),S(f->sizep)); -} - -static void PrintDebug(const Proto* f) -{ - int i,n; - n=f->sizek; - printf("constants (%d) for %p:\n",n,VOID(f)); - for (i=0; isizelocvars; - printf("locals (%d) for %p:\n",n,VOID(f)); - for (i=0; ilocvars[i].varname),f->locvars[i].startpc+1,f->locvars[i].endpc+1); - } - n=f->sizeupvalues; - printf("upvalues (%d) for %p:\n",n,VOID(f)); - for (i=0; iupvalues[i].instack,f->upvalues[i].idx); - } -} - -static void PrintFunction(const Proto* f, int full) -{ - int i,n=f->sizep; - PrintHeader(f); - PrintCode(f); - if (full) PrintDebug(f); - for (i=0; ip[i],full); -} diff --git a/radio/src/lua/src/luaconf.h b/radio/src/lua/src/luaconf.h deleted file mode 100644 index 2459e6933..000000000 --- a/radio/src/lua/src/luaconf.h +++ /dev/null @@ -1,562 +0,0 @@ -/* -** $Id: luaconf.h,v 1.176 2013/03/16 21:10:18 roberto Exp $ -** Configuration file for Lua -** See Copyright Notice in lua.h -*/ - - -#ifndef lconfig_h -#define lconfig_h - -#include -#include - -#define USE_FATFS - -/* -** ================================================================== -** Search for "@@" to find all configurable definitions. -** =================================================================== -*/ - - -/* -@@ LUA_ANSI controls the use of non-ansi features. -** CHANGE it (define it) if you want Lua to avoid the use of any -** non-ansi feature or library. -*/ -#if !defined(LUA_ANSI) && defined(__STRICT_ANSI__) -#define LUA_ANSI -#endif - - -#if !defined(LUA_ANSI) && defined(_WIN32) && !defined(_WIN32_WCE) -#define LUA_WIN /* enable goodies for regular Windows platforms */ -#endif - -#if defined(LUA_WIN) -#define LUA_DL_DLL -#define LUA_USE_AFORMAT /* assume 'printf' handles 'aA' specifiers */ -#endif - - - -#if defined(LUA_USE_LINUX) -#define LUA_USE_POSIX -#define LUA_USE_DLOPEN /* needs an extra library: -ldl */ -#define LUA_USE_READLINE /* needs some extra libraries */ -#define LUA_USE_STRTODHEX /* assume 'strtod' handles hex formats */ -#define LUA_USE_AFORMAT /* assume 'printf' handles 'aA' specifiers */ -#define LUA_USE_LONGLONG /* assume support for long long */ -#endif - -#if defined(LUA_USE_MACOSX) -#define LUA_USE_POSIX -#define LUA_USE_DLOPEN /* does not need -ldl */ -#define LUA_USE_READLINE /* needs an extra library: -lreadline */ -#define LUA_USE_STRTODHEX /* assume 'strtod' handles hex formats */ -#define LUA_USE_AFORMAT /* assume 'printf' handles 'aA' specifiers */ -#define LUA_USE_LONGLONG /* assume support for long long */ -#endif - - - -/* -@@ LUA_USE_POSIX includes all functionality listed as X/Open System -@* Interfaces Extension (XSI). -** CHANGE it (define it) if your system is XSI compatible. -*/ -#if defined(LUA_USE_POSIX) -#define LUA_USE_MKSTEMP -#define LUA_USE_ISATTY -#define LUA_USE_POPEN -#define LUA_USE_ULONGJMP -#define LUA_USE_GMTIME_R -#endif - - - -/* -@@ LUA_PATH_DEFAULT is the default path that Lua uses to look for -@* Lua libraries. -@@ LUA_CPATH_DEFAULT is the default path that Lua uses to look for -@* C libraries. -** CHANGE them if your machine has a non-conventional directory -** hierarchy or if you want to install your libraries in -** non-conventional directories. -*/ -#if defined(_WIN32) /* { */ -/* -** In Windows, any exclamation mark ('!') in the path is replaced by the -** path of the directory of the executable file of the current process. -*/ -#define LUA_LDIR "!\\lua\\" -#define LUA_CDIR "!\\" -#define LUA_PATH_DEFAULT \ - LUA_LDIR"?.lua;" LUA_LDIR"?\\init.lua;" \ - LUA_CDIR"?.lua;" LUA_CDIR"?\\init.lua;" ".\\?.lua" -#define LUA_CPATH_DEFAULT \ - LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll;" ".\\?.dll" - -#else /* }{ */ - -#define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/" -#define LUA_ROOT "/usr/local/" -#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR -#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR -#define LUA_PATH_DEFAULT \ - LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \ - LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" "./?.lua" -#define LUA_CPATH_DEFAULT \ - LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so" -#endif /* } */ - - -/* -@@ LUA_DIRSEP is the directory separator (for submodules). -** CHANGE it if your machine does not use "/" as the directory separator -** and is not Windows. (On Windows Lua automatically uses "\".) -*/ -#if defined(_WIN32) -#define LUA_DIRSEP "\\" -#else -#define LUA_DIRSEP "/" -#endif - - -/* -@@ LUA_ENV is the name of the variable that holds the current -@@ environment, used to access global names. -** CHANGE it if you do not like this name. -*/ -#define LUA_ENV "_ENV" - - -/* -@@ LUA_API is a mark for all core API functions. -@@ LUALIB_API is a mark for all auxiliary library functions. -@@ LUAMOD_API is a mark for all standard library opening functions. -** CHANGE them if you need to define those functions in some special way. -** For instance, if you want to create one Windows DLL with the core and -** the libraries, you may want to use the following definition (define -** LUA_BUILD_AS_DLL to get it). -*/ -#if defined(LUA_BUILD_AS_DLL) /* { */ - -#if defined(LUA_CORE) || defined(LUA_LIB) /* { */ -#define LUA_API __declspec(dllexport) -#else /* }{ */ -#define LUA_API __declspec(dllimport) -#endif /* } */ - -#else /* }{ */ - -#define LUA_API extern - -#endif /* } */ - - -/* more often than not the libs go together with the core */ -#define LUALIB_API LUA_API -#define LUAMOD_API LUALIB_API - - -/* -@@ LUAI_FUNC is a mark for all extern functions that are not to be -@* exported to outside modules. -@@ LUAI_DDEF and LUAI_DDEC are marks for all extern (const) variables -@* that are not to be exported to outside modules (LUAI_DDEF for -@* definitions and LUAI_DDEC for declarations). -** CHANGE them if you need to mark them in some special way. Elf/gcc -** (versions 3.2 and later) mark them as "hidden" to optimize access -** when Lua is compiled as a shared library. Not all elf targets support -** this attribute. Unfortunately, gcc does not offer a way to check -** whether the target offers that support, and those without support -** give a warning about it. To avoid these warnings, change to the -** default definition. -*/ -#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \ - defined(__ELF__) /* { */ -#define LUAI_FUNC __attribute__((visibility("hidden"))) extern -#define LUAI_DDEC LUAI_FUNC -#define LUAI_DDEF /* empty */ - -#else /* }{ */ -#define LUAI_FUNC extern -#define LUAI_DDEC extern -#define LUAI_DDEF /* empty */ -#endif /* } */ - - - -/* -@@ LUA_QL describes how error messages quote program elements. -** CHANGE it if you want a different appearance. -*/ -#define LUA_QL(x) "'" x "'" -#define LUA_QS LUA_QL("%s") - - -/* -@@ LUA_IDSIZE gives the maximum size for the description of the source -@* of a function in debug information. -** CHANGE it if you want a different size. -*/ -#define LUA_IDSIZE 60 - - -/* -@@ luai_writestring/luai_writeline define how 'print' prints its results. -** They are only used in libraries and the stand-alone program. (The #if -** avoids including 'stdio.h' everywhere.) -*/ - -/* -@@ luai_writestringerror defines how to print error messages. -** (A format string with one argument is enough for Lua...) -*/ - -#if defined(LUA_LIB) || defined(lua_c) -#include -#define luai_writestring(s,l) fwrite((s), sizeof(char), (l), stdout) -#define luai_writeline() (luai_writestring("\n", 1), fflush(stdout)) -#define luai_writestringerror(s,p) \ - (fprintf(stderr, (s), (p)), fflush(stderr)) -#else -#define luai_writestring(s,l) -#define luai_writeline() -#define luai_writestringerror(s,p) -#endif - - - -/* -@@ LUAI_MAXSHORTLEN is the maximum length for short strings, that is, -** strings that are internalized. (Cannot be smaller than reserved words -** or tags for metamethods, as these strings must be internalized; -** #("function") = 8, #("__newindex") = 10.) -*/ -#define LUAI_MAXSHORTLEN 40 - - - -/* -** {================================================================== -** Compatibility with previous versions -** =================================================================== -*/ - -/* -@@ LUA_COMPAT_ALL controls all compatibility options. -** You can define it to get all options, or change specific options -** to fit your specific needs. -*/ -#if defined(LUA_COMPAT_ALL) /* { */ - -/* -@@ LUA_COMPAT_UNPACK controls the presence of global 'unpack'. -** You can replace it with 'table.unpack'. -*/ -#define LUA_COMPAT_UNPACK - -/* -@@ LUA_COMPAT_LOADERS controls the presence of table 'package.loaders'. -** You can replace it with 'package.searchers'. -*/ -#define LUA_COMPAT_LOADERS - -/* -@@ macro 'lua_cpcall' emulates deprecated function lua_cpcall. -** You can call your C function directly (with light C functions). -*/ -#define lua_cpcall(L,f,u) \ - (lua_pushcfunction(L, (f)), \ - lua_pushlightuserdata(L,(u)), \ - lua_pcall(L,1,0,0)) - - -/* -@@ LUA_COMPAT_LOG10 defines the function 'log10' in the math library. -** You can rewrite 'log10(x)' as 'log(x, 10)'. -*/ -#define LUA_COMPAT_LOG10 - -/* -@@ LUA_COMPAT_LOADSTRING defines the function 'loadstring' in the base -** library. You can rewrite 'loadstring(s)' as 'load(s)'. -*/ -#define LUA_COMPAT_LOADSTRING - -/* -@@ LUA_COMPAT_MAXN defines the function 'maxn' in the table library. -*/ -#define LUA_COMPAT_MAXN - -/* -@@ The following macros supply trivial compatibility for some -** changes in the API. The macros themselves document how to -** change your code to avoid using them. -*/ -#define lua_strlen(L,i) lua_rawlen(L, (i)) - -#define lua_objlen(L,i) lua_rawlen(L, (i)) - -#define lua_equal(L,idx1,idx2) lua_compare(L,(idx1),(idx2),LUA_OPEQ) -#define lua_lessthan(L,idx1,idx2) lua_compare(L,(idx1),(idx2),LUA_OPLT) - -/* -@@ LUA_COMPAT_MODULE controls compatibility with previous -** module functions 'module' (Lua) and 'luaL_register' (C). -*/ -#define LUA_COMPAT_MODULE - -#endif /* } */ - -/* }================================================================== */ - - - -/* -@@ LUAI_BITSINT defines the number of bits in an int. -** CHANGE here if Lua cannot automatically detect the number of bits of -** your machine. Probably you do not need to change this. -*/ -/* avoid overflows in comparison */ -#if INT_MAX-20 < 32760 /* { */ -#define LUAI_BITSINT 16 -#elif INT_MAX > 2147483640L /* }{ */ -/* int has at least 32 bits */ -#define LUAI_BITSINT 32 -#else /* }{ */ -#error "you must define LUA_BITSINT with number of bits in an integer" -#endif /* } */ - - -/* -@@ LUA_INT32 is an signed integer with exactly 32 bits. -@@ LUAI_UMEM is an unsigned integer big enough to count the total -@* memory used by Lua. -@@ LUAI_MEM is a signed integer big enough to count the total memory -@* used by Lua. -** CHANGE here if for some weird reason the default definitions are not -** good enough for your machine. Probably you do not need to change -** this. -*/ -#if LUAI_BITSINT >= 32 /* { */ -#define LUA_INT32 int -#define LUAI_UMEM size_t -#define LUAI_MEM ptrdiff_t -#else /* }{ */ -/* 16-bit ints */ -#define LUA_INT32 long -#define LUAI_UMEM unsigned long -#define LUAI_MEM long -#endif /* } */ - - -/* -@@ LUAI_MAXSTACK limits the size of the Lua stack. -** CHANGE it if you need a different limit. This limit is arbitrary; -** its only purpose is to stop Lua to consume unlimited stack -** space (and to reserve some numbers for pseudo-indices). -*/ -#if LUAI_BITSINT >= 32 -#define LUAI_MAXSTACK 1000000 -#else -#define LUAI_MAXSTACK 15000 -#endif - -/* reserve some space for error handling */ -#define LUAI_FIRSTPSEUDOIDX (-LUAI_MAXSTACK - 1000) - - - - -/* -@@ LUAL_BUFFERSIZE is the buffer size used by the lauxlib buffer system. -** CHANGE it if it uses too much C-stack space. -*/ -#if defined(USE_FATFS) -#define LUAL_BUFFERSIZE 512 -#else -#define LUAL_BUFFERSIZE BUFSIZ -#endif - - - - -/* -** {================================================================== -@@ LUA_NUMBER is the type of numbers in Lua. -** CHANGE the following definitions only if you want to build Lua -** with a number type different from double. You may also need to -** change lua_number2int & lua_number2integer. -** =================================================================== -*/ - -#define LUA_NUMBER_DOUBLE -#define LUA_NUMBER double - -/* -@@ LUAI_UACNUMBER is the result of an 'usual argument conversion' -@* over a number. -*/ -#define LUAI_UACNUMBER double - - -/* -@@ LUA_NUMBER_SCAN is the format for reading numbers. -@@ LUA_NUMBER_FMT is the format for writing numbers. -@@ lua_number2str converts a number to a string. -@@ LUAI_MAXNUMBER2STR is maximum size of previous conversion. -*/ -#define LUA_NUMBER_SCAN "%lf" -#define LUA_NUMBER_FMT "%.14g" -#define lua_number2str(s,n) sprintf((s), LUA_NUMBER_FMT, (n)) -#define LUAI_MAXNUMBER2STR 32 /* 16 digits, sign, point, and \0 */ - - -/* -@@ l_mathop allows the addition of an 'l' or 'f' to all math operations -*/ -#define l_mathop(x) (x) - - -/* -@@ lua_str2number converts a decimal numeric string to a number. -@@ lua_strx2number converts an hexadecimal numeric string to a number. -** In C99, 'strtod' does both conversions. C89, however, has no function -** to convert floating hexadecimal strings to numbers. For these -** systems, you can leave 'lua_strx2number' undefined and Lua will -** provide its own implementation. -*/ -#define lua_str2number(s,p) strtod((s), (p)) - -#if defined(LUA_USE_STRTODHEX) -#define lua_strx2number(s,p) strtod((s), (p)) -#endif - - -/* -@@ The luai_num* macros define the primitive operations over numbers. -*/ - -/* the following operations need the math library */ -//#if defined(lobject_c) || defined(lvm_c) -#include -#define luai_nummod(L,a,b) ((a) - l_mathop(floor)((a)/(b))*(b)) -#define luai_numpow(L,a,b) (l_mathop(pow)(a,b)) -//#endif - -/* these are quite standard operations */ -// #if defined(LUA_CORE) -#define luai_numadd(L,a,b) ((a)+(b)) -#define luai_numsub(L,a,b) ((a)-(b)) -#define luai_nummul(L,a,b) ((a)*(b)) -#define luai_numdiv(L,a,b) ((a)/(b)) -#define luai_numunm(L,a) (-(a)) -#define luai_numeq(a,b) ((a)==(b)) -#define luai_numlt(L,a,b) ((a)<(b)) -#define luai_numle(L,a,b) ((a)<=(b)) -#define luai_numisnan(L,a) (!luai_numeq((a), (a))) -// #endif - - - -/* -@@ LUA_INTEGER is the integral type used by lua_pushinteger/lua_tointeger. -** CHANGE that if ptrdiff_t is not adequate on your machine. (On most -** machines, ptrdiff_t gives a good choice between int or long.) -*/ -#define LUA_INTEGER int - -/* -@@ LUA_UNSIGNED is the integral type used by lua_pushunsigned/lua_tounsigned. -** It must have at least 32 bits. -*/ -#define LUA_UNSIGNED unsigned LUA_INT32 - - - -/* -** Some tricks with doubles -*/ - -#if defined(LUA_NUMBER_DOUBLE) && !defined(LUA_ANSI) /* { */ -/* -** The next definitions activate some tricks to speed up the -** conversion from doubles to integer types, mainly to LUA_UNSIGNED. -** -@@ LUA_MSASMTRICK uses Microsoft assembler to avoid clashes with a -** DirectX idiosyncrasy. -** -@@ LUA_IEEE754TRICK uses a trick that should work on any machine -** using IEEE754 with a 32-bit integer type. -** -@@ LUA_IEEELL extends the trick to LUA_INTEGER; should only be -** defined when LUA_INTEGER is a 32-bit integer. -** -@@ LUA_IEEEENDIAN is the endianness of doubles in your machine -** (0 for little endian, 1 for big endian); if not defined, Lua will -** check it dynamically for LUA_IEEE754TRICK (but not for LUA_NANTRICK). -** -@@ LUA_NANTRICK controls the use of a trick to pack all types into -** a single double value, using NaN values to represent non-number -** values. The trick only works on 32-bit machines (ints and pointers -** are 32-bit values) with numbers represented as IEEE 754-2008 doubles -** with conventional endianess (12345678 or 87654321), in CPUs that do -** not produce signaling NaN values (all NaNs are quiet). -*/ - -/* Microsoft compiler on a Pentium (32 bit) ? */ -#if defined(LUA_WIN) && defined(_MSC_VER) && defined(_M_IX86) /* { */ - -#define LUA_MSASMTRICK -#define LUA_IEEEENDIAN 0 -#define LUA_NANTRICK - - -/* pentium 32 bits? */ -#elif defined(__i386__) || defined(__i386) || defined(__X86__) /* }{ */ - -#define LUA_IEEE754TRICK -#define LUA_IEEELL -#define LUA_IEEEENDIAN 0 -#define LUA_NANTRICK - -/* pentium 64 bits? */ -#elif defined(__x86_64) /* }{ */ - -#define LUA_IEEE754TRICK -#define LUA_IEEEENDIAN 0 - -#elif defined(__POWERPC__) || defined(__ppc__) /* }{ */ - -#define LUA_IEEE754TRICK -#define LUA_IEEEENDIAN 1 - -#else /* }{ */ - -/* assume IEEE754 and a 32-bit integer type */ -#define LUA_IEEE754TRICK - -#endif /* } */ - -#endif /* } */ - -/* }================================================================== */ - - - - -/* =================================================================== */ - -/* -** Local configuration. You can use this space to add your redefinitions -** without modifying the main part of the file. -*/ - - - -#endif - diff --git a/radio/src/lua/src/lualib.h b/radio/src/lua/src/lualib.h deleted file mode 100644 index 9fd126bf7..000000000 --- a/radio/src/lua/src/lualib.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -** $Id: lualib.h,v 1.43 2011/12/08 12:11:37 roberto Exp $ -** Lua standard libraries -** See Copyright Notice in lua.h -*/ - - -#ifndef lualib_h -#define lualib_h - -#include "lua.h" - - - -LUAMOD_API int (luaopen_base) (lua_State *L); - -#define LUA_COLIBNAME "coroutine" -LUAMOD_API int (luaopen_coroutine) (lua_State *L); - -#define LUA_TABLIBNAME "table" -LUAMOD_API int (luaopen_table) (lua_State *L); - -#define LUA_IOLIBNAME "io" -LUAMOD_API int (luaopen_io) (lua_State *L); - -#define LUA_OSLIBNAME "os" -LUAMOD_API int (luaopen_os) (lua_State *L); - -#define LUA_STRLIBNAME "string" -LUAMOD_API int (luaopen_string) (lua_State *L); - -#define LUA_BITLIBNAME "bit32" -LUAMOD_API int (luaopen_bit32) (lua_State *L); - -#define LUA_MATHLIBNAME "math" -LUAMOD_API int (luaopen_math) (lua_State *L); - -#define LUA_DBLIBNAME "debug" -LUAMOD_API int (luaopen_debug) (lua_State *L); - -#define LUA_LOADLIBNAME "package" -LUAMOD_API int (luaopen_package) (lua_State *L); - - -/* open all previous libraries */ -LUALIB_API void (luaL_openlibs) (lua_State *L); - - - -#if !defined(lua_assert) -#define lua_assert(x) ((void)0) -#endif - - -#endif diff --git a/radio/src/lua/src/lundump.c b/radio/src/lua/src/lundump.c deleted file mode 100644 index 54de011a4..000000000 --- a/radio/src/lua/src/lundump.c +++ /dev/null @@ -1,258 +0,0 @@ -/* -** $Id: lundump.c,v 2.22 2012/05/08 13:53:33 roberto Exp $ -** load precompiled Lua chunks -** See Copyright Notice in lua.h -*/ - -#include - -#define lundump_c -#define LUA_CORE - -#include "lua.h" - -#include "ldebug.h" -#include "ldo.h" -#include "lfunc.h" -#include "lmem.h" -#include "lobject.h" -#include "lstring.h" -#include "lundump.h" -#include "lzio.h" - -typedef struct { - lua_State* L; - ZIO* Z; - Mbuffer* b; - const char* name; -} LoadState; - -static l_noret error(LoadState* S, const char* why) -{ - luaO_pushfstring(S->L,"%s: %s precompiled chunk",S->name,why); - luaD_throw(S->L,LUA_ERRSYNTAX); -} - -#define LoadMem(S,b,n,size) LoadBlock(S,b,(n)*(size)) -#define LoadByte(S) (lu_byte)LoadChar(S) -#define LoadVar(S,x) LoadMem(S,&x,1,sizeof(x)) -#define LoadVector(S,b,n,size) LoadMem(S,b,n,size) - -#if !defined(luai_verifycode) -#define luai_verifycode(L,b,f) /* empty */ -#endif - -static void LoadBlock(LoadState* S, void* b, size_t size) -{ - if (luaZ_read(S->Z,b,size)!=0) error(S,"truncated"); -} - -static int LoadChar(LoadState* S) -{ - char x; - LoadVar(S,x); - return x; -} - -static int LoadInt(LoadState* S) -{ - int x; - LoadVar(S,x); - if (x<0) error(S,"corrupted"); - return x; -} - -static lua_Number LoadNumber(LoadState* S) -{ - lua_Number x; - LoadVar(S,x); - return x; -} - -static TString* LoadString(LoadState* S) -{ - size_t size; - LoadVar(S,size); - if (size==0) - return NULL; - else - { - char* s=luaZ_openspace(S->L,S->b,size); - LoadBlock(S,s,size*sizeof(char)); - return luaS_newlstr(S->L,s,size-1); /* remove trailing '\0' */ - } -} - -static void LoadCode(LoadState* S, Proto* f) -{ - int n=LoadInt(S); - f->code=luaM_newvector(S->L,n,Instruction); - f->sizecode=n; - LoadVector(S,f->code,n,sizeof(Instruction)); -} - -static void LoadFunction(LoadState* S, Proto* f); - -static void LoadConstants(LoadState* S, Proto* f) -{ - int i,n; - n=LoadInt(S); - f->k=luaM_newvector(S->L,n,TValue); - f->sizek=n; - for (i=0; ik[i]); - for (i=0; ik[i]; - int t=LoadChar(S); - switch (t) - { - case LUA_TNIL: - setnilvalue(o); - break; - case LUA_TBOOLEAN: - setbvalue(o,LoadChar(S)); - break; - case LUA_TNUMBER: - setnvalue(o,LoadNumber(S)); - break; - case LUA_TSTRING: - setsvalue2n(S->L,o,LoadString(S)); - break; - default: lua_assert(0); - } - } - n=LoadInt(S); - f->p=luaM_newvector(S->L,n,Proto*); - f->sizep=n; - for (i=0; ip[i]=NULL; - for (i=0; ip[i]=luaF_newproto(S->L); - LoadFunction(S,f->p[i]); - } -} - -static void LoadUpvalues(LoadState* S, Proto* f) -{ - int i,n; - n=LoadInt(S); - f->upvalues=luaM_newvector(S->L,n,Upvaldesc); - f->sizeupvalues=n; - for (i=0; iupvalues[i].name=NULL; - for (i=0; iupvalues[i].instack=LoadByte(S); - f->upvalues[i].idx=LoadByte(S); - } -} - -static void LoadDebug(LoadState* S, Proto* f) -{ - int i,n; - f->source=LoadString(S); - n=LoadInt(S); - f->lineinfo=luaM_newvector(S->L,n,int); - f->sizelineinfo=n; - LoadVector(S,f->lineinfo,n,sizeof(int)); - n=LoadInt(S); - f->locvars=luaM_newvector(S->L,n,LocVar); - f->sizelocvars=n; - for (i=0; ilocvars[i].varname=NULL; - for (i=0; ilocvars[i].varname=LoadString(S); - f->locvars[i].startpc=LoadInt(S); - f->locvars[i].endpc=LoadInt(S); - } - n=LoadInt(S); - for (i=0; iupvalues[i].name=LoadString(S); -} - -static void LoadFunction(LoadState* S, Proto* f) -{ - f->linedefined=LoadInt(S); - f->lastlinedefined=LoadInt(S); - f->numparams=LoadByte(S); - f->is_vararg=LoadByte(S); - f->maxstacksize=LoadByte(S); - LoadCode(S,f); - LoadConstants(S,f); - LoadUpvalues(S,f); - LoadDebug(S,f); -} - -/* the code below must be consistent with the code in luaU_header */ -#define N0 LUAC_HEADERSIZE -#define N1 (sizeof(LUA_SIGNATURE)-sizeof(char)) -#define N2 N1+2 -#define N3 N2+6 - -static void LoadHeader(LoadState* S) -{ - lu_byte h[LUAC_HEADERSIZE]; - lu_byte s[LUAC_HEADERSIZE]; - luaU_header(h); - memcpy(s,h,sizeof(char)); /* first char already read */ - LoadBlock(S,s+sizeof(char),LUAC_HEADERSIZE-sizeof(char)); - if (memcmp(h,s,N0)==0) return; - if (memcmp(h,s,N1)!=0) error(S,"not a"); - if (memcmp(h,s,N2)!=0) error(S,"version mismatch in"); - if (memcmp(h,s,N3)!=0) error(S,"incompatible"); else error(S,"corrupted"); -} - -/* -** load precompiled chunk -*/ -Closure* luaU_undump (lua_State* L, ZIO* Z, Mbuffer* buff, const char* name) -{ - LoadState S; - Closure* cl; - if (*name=='@' || *name=='=') - S.name=name+1; - else if (*name==LUA_SIGNATURE[0]) - S.name="binary string"; - else - S.name=name; - S.L=L; - S.Z=Z; - S.b=buff; - LoadHeader(&S); - cl=luaF_newLclosure(L,1); - setclLvalue(L,L->top,cl); incr_top(L); - cl->l.p=luaF_newproto(L); - LoadFunction(&S,cl->l.p); - if (cl->l.p->sizeupvalues != 1) - { - Proto* p=cl->l.p; - cl=luaF_newLclosure(L,cl->l.p->sizeupvalues); - cl->l.p=p; - setclLvalue(L,L->top-1,cl); - } - luai_verifycode(L,buff,cl->l.p); - return cl; -} - -#define MYINT(s) (s[0]-'0') -#define VERSION MYINT(LUA_VERSION_MAJOR)*16+MYINT(LUA_VERSION_MINOR) -#define FORMAT 0 /* this is the official format */ - -/* -* make header for precompiled chunks -* if you change the code below be sure to update LoadHeader and FORMAT above -* and LUAC_HEADERSIZE in lundump.h -*/ -void luaU_header (lu_byte* h) -{ - int x=1; - memcpy(h,LUA_SIGNATURE,sizeof(LUA_SIGNATURE)-sizeof(char)); - h+=sizeof(LUA_SIGNATURE)-sizeof(char); - *h++=cast_byte(VERSION); - *h++=cast_byte(FORMAT); - *h++=cast_byte(*(char*)&x); /* endianness */ - *h++=cast_byte(sizeof(int)); - *h++=cast_byte(sizeof(size_t)); - *h++=cast_byte(sizeof(Instruction)); - *h++=cast_byte(sizeof(lua_Number)); - *h++=cast_byte(((lua_Number)0.5)==0); /* is lua_Number integral? */ - memcpy(h,LUAC_TAIL,sizeof(LUAC_TAIL)-sizeof(char)); -} diff --git a/radio/src/lua/src/lundump.h b/radio/src/lua/src/lundump.h deleted file mode 100644 index 2b8accecb..000000000 --- a/radio/src/lua/src/lundump.h +++ /dev/null @@ -1,28 +0,0 @@ -/* -** $Id: lundump.h,v 1.39 2012/05/08 13:53:33 roberto Exp $ -** load precompiled Lua chunks -** See Copyright Notice in lua.h -*/ - -#ifndef lundump_h -#define lundump_h - -#include "lobject.h" -#include "lzio.h" - -/* load one chunk; from lundump.c */ -LUAI_FUNC Closure* luaU_undump (lua_State* L, ZIO* Z, Mbuffer* buff, const char* name); - -/* make header; from lundump.c */ -LUAI_FUNC void luaU_header (lu_byte* h); - -/* dump one chunk; from ldump.c */ -LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip); - -/* data to catch conversion errors */ -#define LUAC_TAIL "\x19\x93\r\n\x1a\n" - -/* size in bytes of header of binary files */ -#define LUAC_HEADERSIZE (sizeof(LUA_SIGNATURE)-sizeof(char)+2+6+sizeof(LUAC_TAIL)-sizeof(char)) - -#endif diff --git a/radio/src/lua/src/lvm.c b/radio/src/lua/src/lvm.c deleted file mode 100644 index 657d5c456..000000000 --- a/radio/src/lua/src/lvm.c +++ /dev/null @@ -1,867 +0,0 @@ -/* -** $Id: lvm.c,v 2.155 2013/03/16 21:10:18 roberto Exp $ -** Lua virtual machine -** See Copyright Notice in lua.h -*/ - - -#include -#include -#include - -#define lvm_c -#define LUA_CORE - -#include "lua.h" - -#include "ldebug.h" -#include "ldo.h" -#include "lfunc.h" -#include "lgc.h" -#include "lobject.h" -#include "lopcodes.h" -#include "lstate.h" -#include "lstring.h" -#include "ltable.h" -#include "ltm.h" -#include "lvm.h" - - - -/* limit for table tag-method chains (to avoid loops) */ -#define MAXTAGLOOP 100 - - -const TValue *luaV_tonumber (const TValue *obj, TValue *n) { - lua_Number num; - if (ttisnumber(obj)) return obj; - if (ttisstring(obj) && luaO_str2d(svalue(obj), tsvalue(obj)->len, &num)) { - setnvalue(n, num); - return n; - } - else - return NULL; -} - - -int luaV_tostring (lua_State *L, StkId obj) { - if (!ttisnumber(obj)) - return 0; - else { - char s[LUAI_MAXNUMBER2STR]; - lua_Number n = nvalue(obj); - int l = lua_number2str(s, n); - setsvalue2s(L, obj, luaS_newlstr(L, s, l)); - return 1; - } -} - - -static void traceexec (lua_State *L) { - CallInfo *ci = L->ci; - lu_byte mask = L->hookmask; - int counthook = ((mask & LUA_MASKCOUNT) && L->hookcount == 0); - if (counthook) - resethookcount(L); /* reset count */ - if (ci->callstatus & CIST_HOOKYIELD) { /* called hook last time? */ - ci->callstatus &= ~CIST_HOOKYIELD; /* erase mark */ - return; /* do not call hook again (VM yielded, so it did not move) */ - } - if (counthook) - luaD_hook(L, LUA_HOOKCOUNT, -1); /* call count hook */ - if (mask & LUA_MASKLINE) { - Proto *p = ci_func(ci)->p; - int npc = pcRel(ci->u.l.savedpc, p); - int newline = getfuncline(p, npc); - if (npc == 0 || /* call linehook when enter a new function, */ - ci->u.l.savedpc <= L->oldpc || /* when jump back (loop), or when */ - newline != getfuncline(p, pcRel(L->oldpc, p))) /* enter a new line */ - luaD_hook(L, LUA_HOOKLINE, newline); /* call line hook */ - } - L->oldpc = ci->u.l.savedpc; - if (L->status == LUA_YIELD) { /* did hook yield? */ - if (counthook) - L->hookcount = 1; /* undo decrement to zero */ - ci->u.l.savedpc--; /* undo increment (resume will increment it again) */ - ci->callstatus |= CIST_HOOKYIELD; /* mark that it yielded */ - ci->func = L->top - 1; /* protect stack below results */ - luaD_throw(L, LUA_YIELD); - } -} - - -static void callTM (lua_State *L, const TValue *f, const TValue *p1, - const TValue *p2, TValue *p3, int hasres) { - ptrdiff_t result = savestack(L, p3); - setobj2s(L, L->top++, f); /* push function */ - setobj2s(L, L->top++, p1); /* 1st argument */ - setobj2s(L, L->top++, p2); /* 2nd argument */ - if (!hasres) /* no result? 'p3' is third argument */ - setobj2s(L, L->top++, p3); /* 3rd argument */ - /* metamethod may yield only when called from Lua code */ - luaD_call(L, L->top - (4 - hasres), hasres, isLua(L->ci)); - if (hasres) { /* if has result, move it to its place */ - p3 = restorestack(L, result); - setobjs2s(L, p3, --L->top); - } -} - - -void luaV_gettable (lua_State *L, const TValue *t, TValue *key, StkId val) { - int loop; - for (loop = 0; loop < MAXTAGLOOP; loop++) { - const TValue *tm; - if (ttistable(t)) { /* `t' is a table? */ - Table *h = hvalue(t); - const TValue *res = luaH_get(h, key); /* do a primitive get */ - if (!ttisnil(res) || /* result is not nil? */ - (tm = fasttm(L, h->metatable, TM_INDEX)) == NULL) { /* or no TM? */ - setobj2s(L, val, res); - return; - } - /* else will try the tag method */ - } - else if (ttisnil(tm = luaT_gettmbyobj(L, t, TM_INDEX))) - luaG_typeerror(L, t, "index"); - if (ttisfunction(tm)) { - callTM(L, tm, t, key, val, 1); - return; - } - t = tm; /* else repeat with 'tm' */ - } - luaG_runerror(L, "loop in gettable"); -} - - -void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) { - int loop; - for (loop = 0; loop < MAXTAGLOOP; loop++) { - const TValue *tm; - if (ttistable(t)) { /* `t' is a table? */ - Table *h = hvalue(t); - TValue *oldval = cast(TValue *, luaH_get(h, key)); - /* if previous value is not nil, there must be a previous entry - in the table; moreover, a metamethod has no relevance */ - if (!ttisnil(oldval) || - /* previous value is nil; must check the metamethod */ - ((tm = fasttm(L, h->metatable, TM_NEWINDEX)) == NULL && - /* no metamethod; is there a previous entry in the table? */ - (oldval != luaO_nilobject || - /* no previous entry; must create one. (The next test is - always true; we only need the assignment.) */ - (oldval = luaH_newkey(L, h, key), 1)))) { - /* no metamethod and (now) there is an entry with given key */ - setobj2t(L, oldval, val); /* assign new value to that entry */ - invalidateTMcache(h); - luaC_barrierback(L, obj2gco(h), val); - return; - } - /* else will try the metamethod */ - } - else /* not a table; check metamethod */ - if (ttisnil(tm = luaT_gettmbyobj(L, t, TM_NEWINDEX))) - luaG_typeerror(L, t, "index"); - /* there is a metamethod */ - if (ttisfunction(tm)) { - callTM(L, tm, t, key, val, 0); - return; - } - t = tm; /* else repeat with 'tm' */ - } - luaG_runerror(L, "loop in settable"); -} - - -static int call_binTM (lua_State *L, const TValue *p1, const TValue *p2, - StkId res, TMS event) { - const TValue *tm = luaT_gettmbyobj(L, p1, event); /* try first operand */ - if (ttisnil(tm)) - tm = luaT_gettmbyobj(L, p2, event); /* try second operand */ - if (ttisnil(tm)) return 0; - callTM(L, tm, p1, p2, res, 1); - return 1; -} - - -static const TValue *get_equalTM (lua_State *L, Table *mt1, Table *mt2, - TMS event) { - const TValue *tm1 = fasttm(L, mt1, event); - const TValue *tm2; - if (tm1 == NULL) return NULL; /* no metamethod */ - if (mt1 == mt2) return tm1; /* same metatables => same metamethods */ - tm2 = fasttm(L, mt2, event); - if (tm2 == NULL) return NULL; /* no metamethod */ - if (luaV_rawequalobj(tm1, tm2)) /* same metamethods? */ - return tm1; - return NULL; -} - - -static int call_orderTM (lua_State *L, const TValue *p1, const TValue *p2, - TMS event) { - if (!call_binTM(L, p1, p2, L->top, event)) - return -1; /* no metamethod */ - else - return !l_isfalse(L->top); -} - - -static int l_strcmp (const TString *ls, const TString *rs) { - const char *l = getstr(ls); - size_t ll = ls->tsv.len; - const char *r = getstr(rs); - size_t lr = rs->tsv.len; - for (;;) { - int temp = strcoll(l, r); - if (temp != 0) return temp; - else { /* strings are equal up to a `\0' */ - size_t len = strlen(l); /* index of first `\0' in both strings */ - if (len == lr) /* r is finished? */ - return (len == ll) ? 0 : 1; - else if (len == ll) /* l is finished? */ - return -1; /* l is smaller than r (because r is not finished) */ - /* both strings longer than `len'; go on comparing (after the `\0') */ - len++; - l += len; ll -= len; r += len; lr -= len; - } - } -} - - -int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r) { - int res; - if (ttisnumber(l) && ttisnumber(r)) - return luai_numlt(L, nvalue(l), nvalue(r)); - else if (ttisstring(l) && ttisstring(r)) - return l_strcmp(rawtsvalue(l), rawtsvalue(r)) < 0; - else if ((res = call_orderTM(L, l, r, TM_LT)) < 0) - luaG_ordererror(L, l, r); - return res; -} - - -int luaV_lessequal (lua_State *L, const TValue *l, const TValue *r) { - int res; - if (ttisnumber(l) && ttisnumber(r)) - return luai_numle(L, nvalue(l), nvalue(r)); - else if (ttisstring(l) && ttisstring(r)) - return l_strcmp(rawtsvalue(l), rawtsvalue(r)) <= 0; - else if ((res = call_orderTM(L, l, r, TM_LE)) >= 0) /* first try `le' */ - return res; - else if ((res = call_orderTM(L, r, l, TM_LT)) < 0) /* else try `lt' */ - luaG_ordererror(L, l, r); - return !res; -} - - -/* -** equality of Lua values. L == NULL means raw equality (no metamethods) -*/ -int luaV_equalobj_ (lua_State *L, const TValue *t1, const TValue *t2) { - const TValue *tm; - lua_assert(ttisequal(t1, t2)); - switch (ttype(t1)) { - case LUA_TNIL: return 1; - case LUA_TNUMBER: return luai_numeq(nvalue(t1), nvalue(t2)); - case LUA_TBOOLEAN: return bvalue(t1) == bvalue(t2); /* true must be 1 !! */ - case LUA_TLIGHTUSERDATA: return pvalue(t1) == pvalue(t2); - case LUA_TLCF: return fvalue(t1) == fvalue(t2); - case LUA_TSHRSTR: return eqshrstr(rawtsvalue(t1), rawtsvalue(t2)); - case LUA_TLNGSTR: return luaS_eqlngstr(rawtsvalue(t1), rawtsvalue(t2)); - case LUA_TUSERDATA: { - if (uvalue(t1) == uvalue(t2)) return 1; - else if (L == NULL) return 0; - tm = get_equalTM(L, uvalue(t1)->metatable, uvalue(t2)->metatable, TM_EQ); - break; /* will try TM */ - } - case LUA_TTABLE: { - if (hvalue(t1) == hvalue(t2)) return 1; - else if (L == NULL) return 0; - tm = get_equalTM(L, hvalue(t1)->metatable, hvalue(t2)->metatable, TM_EQ); - break; /* will try TM */ - } - default: - lua_assert(iscollectable(t1)); - return gcvalue(t1) == gcvalue(t2); - } - if (tm == NULL) return 0; /* no TM? */ - callTM(L, tm, t1, t2, L->top, 1); /* call TM */ - return !l_isfalse(L->top); -} - - -void luaV_concat (lua_State *L, int total) { - lua_assert(total >= 2); - do { - StkId top = L->top; - int n = 2; /* number of elements handled in this pass (at least 2) */ - if (!(ttisstring(top-2) || ttisnumber(top-2)) || !tostring(L, top-1)) { - if (!call_binTM(L, top-2, top-1, top-2, TM_CONCAT)) - luaG_concaterror(L, top-2, top-1); - } - else if (tsvalue(top-1)->len == 0) /* second operand is empty? */ - (void)tostring(L, top - 2); /* result is first operand */ - else if (ttisstring(top-2) && tsvalue(top-2)->len == 0) { - setobjs2s(L, top - 2, top - 1); /* result is second op. */ - } - else { - /* at least two non-empty string values; get as many as possible */ - size_t tl = tsvalue(top-1)->len; - char *buffer; - int i; - /* collect total length */ - for (i = 1; i < total && tostring(L, top-i-1); i++) { - size_t l = tsvalue(top-i-1)->len; - if (l >= (MAX_SIZET/sizeof(char)) - tl) - luaG_runerror(L, "string length overflow"); - tl += l; - } - buffer = luaZ_openspace(L, &G(L)->buff, tl); - tl = 0; - n = i; - do { /* concat all strings */ - size_t l = tsvalue(top-i)->len; - memcpy(buffer+tl, svalue(top-i), l * sizeof(char)); - tl += l; - } while (--i > 0); - setsvalue2s(L, top-n, luaS_newlstr(L, buffer, tl)); - } - total -= n-1; /* got 'n' strings to create 1 new */ - L->top -= n-1; /* popped 'n' strings and pushed one */ - } while (total > 1); /* repeat until only 1 result left */ -} - - -void luaV_objlen (lua_State *L, StkId ra, const TValue *rb) { - const TValue *tm; - switch (ttypenv(rb)) { - case LUA_TTABLE: { - Table *h = hvalue(rb); - tm = fasttm(L, h->metatable, TM_LEN); - if (tm) break; /* metamethod? break switch to call it */ - setnvalue(ra, cast_num(luaH_getn(h))); /* else primitive len */ - return; - } - case LUA_TSTRING: { - setnvalue(ra, cast_num(tsvalue(rb)->len)); - return; - } - default: { /* try metamethod */ - tm = luaT_gettmbyobj(L, rb, TM_LEN); - if (ttisnil(tm)) /* no metamethod? */ - luaG_typeerror(L, rb, "get length of"); - break; - } - } - callTM(L, tm, rb, rb, ra, 1); -} - - -void luaV_arith (lua_State *L, StkId ra, const TValue *rb, - const TValue *rc, TMS op) { - TValue tempb, tempc; - const TValue *b, *c; - if ((b = luaV_tonumber(rb, &tempb)) != NULL && - (c = luaV_tonumber(rc, &tempc)) != NULL) { - lua_Number res = luaO_arith(op - TM_ADD + LUA_OPADD, nvalue(b), nvalue(c)); - setnvalue(ra, res); - } - else if (!call_binTM(L, rb, rc, ra, op)) - luaG_aritherror(L, rb, rc); -} - - -/* -** check whether cached closure in prototype 'p' may be reused, that is, -** whether there is a cached closure with the same upvalues needed by -** new closure to be created. -*/ -static Closure *getcached (Proto *p, UpVal **encup, StkId base) { - Closure *c = p->cache; - if (c != NULL) { /* is there a cached closure? */ - int nup = p->sizeupvalues; - Upvaldesc *uv = p->upvalues; - int i; - for (i = 0; i < nup; i++) { /* check whether it has right upvalues */ - TValue *v = uv[i].instack ? base + uv[i].idx : encup[uv[i].idx]->v; - if (c->l.upvals[i]->v != v) - return NULL; /* wrong upvalue; cannot reuse closure */ - } - } - return c; /* return cached closure (or NULL if no cached closure) */ -} - - -/* -** create a new Lua closure, push it in the stack, and initialize -** its upvalues. Note that the call to 'luaC_barrierproto' must come -** before the assignment to 'p->cache', as the function needs the -** original value of that field. -*/ -static void pushclosure (lua_State *L, Proto *p, UpVal **encup, StkId base, - StkId ra) { - int nup = p->sizeupvalues; - Upvaldesc *uv = p->upvalues; - int i; - Closure *ncl = luaF_newLclosure(L, nup); - ncl->l.p = p; - setclLvalue(L, ra, ncl); /* anchor new closure in stack */ - for (i = 0; i < nup; i++) { /* fill in its upvalues */ - if (uv[i].instack) /* upvalue refers to local variable? */ - ncl->l.upvals[i] = luaF_findupval(L, base + uv[i].idx); - else /* get upvalue from enclosing function */ - ncl->l.upvals[i] = encup[uv[i].idx]; - } - luaC_barrierproto(L, p, ncl); - p->cache = ncl; /* save it on cache for reuse */ -} - - -/* -** finish execution of an opcode interrupted by an yield -*/ -void luaV_finishOp (lua_State *L) { - CallInfo *ci = L->ci; - StkId base = ci->u.l.base; - Instruction inst = *(ci->u.l.savedpc - 1); /* interrupted instruction */ - OpCode op = GET_OPCODE(inst); - switch (op) { /* finish its execution */ - case OP_ADD: case OP_SUB: case OP_MUL: case OP_DIV: - case OP_MOD: case OP_POW: case OP_UNM: case OP_LEN: - case OP_GETTABUP: case OP_GETTABLE: case OP_SELF: { - setobjs2s(L, base + GETARG_A(inst), --L->top); - break; - } - case OP_LE: case OP_LT: case OP_EQ: { - int res = !l_isfalse(L->top - 1); - L->top--; - /* metamethod should not be called when operand is K */ - lua_assert(!ISK(GETARG_B(inst))); - if (op == OP_LE && /* "<=" using "<" instead? */ - ttisnil(luaT_gettmbyobj(L, base + GETARG_B(inst), TM_LE))) - res = !res; /* invert result */ - lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_JMP); - if (res != GETARG_A(inst)) /* condition failed? */ - ci->u.l.savedpc++; /* skip jump instruction */ - break; - } - case OP_CONCAT: { - StkId top = L->top - 1; /* top when 'call_binTM' was called */ - int b = GETARG_B(inst); /* first element to concatenate */ - int total = cast_int(top - 1 - (base + b)); /* yet to concatenate */ - setobj2s(L, top - 2, top); /* put TM result in proper position */ - if (total > 1) { /* are there elements to concat? */ - L->top = top - 1; /* top is one after last element (at top-2) */ - luaV_concat(L, total); /* concat them (may yield again) */ - } - /* move final result to final position */ - setobj2s(L, ci->u.l.base + GETARG_A(inst), L->top - 1); - L->top = ci->top; /* restore top */ - break; - } - case OP_TFORCALL: { - lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_TFORLOOP); - L->top = ci->top; /* correct top */ - break; - } - case OP_CALL: { - if (GETARG_C(inst) - 1 >= 0) /* nresults >= 0? */ - L->top = ci->top; /* adjust results */ - break; - } - case OP_TAILCALL: case OP_SETTABUP: case OP_SETTABLE: - break; - default: lua_assert(0); - } -} - - - -/* -** some macros for common tasks in `luaV_execute' -*/ - -#if !defined luai_runtimecheck -#define luai_runtimecheck(L, c) /* void */ -#endif - - -#define RA(i) (base+GETARG_A(i)) -/* to be used after possible stack reallocation */ -#define RB(i) check_exp(getBMode(GET_OPCODE(i)) == OpArgR, base+GETARG_B(i)) -#define RC(i) check_exp(getCMode(GET_OPCODE(i)) == OpArgR, base+GETARG_C(i)) -#define RKB(i) check_exp(getBMode(GET_OPCODE(i)) == OpArgK, \ - ISK(GETARG_B(i)) ? k+INDEXK(GETARG_B(i)) : base+GETARG_B(i)) -#define RKC(i) check_exp(getCMode(GET_OPCODE(i)) == OpArgK, \ - ISK(GETARG_C(i)) ? k+INDEXK(GETARG_C(i)) : base+GETARG_C(i)) -#define KBx(i) \ - (k + (GETARG_Bx(i) != 0 ? GETARG_Bx(i) - 1 : GETARG_Ax(*ci->u.l.savedpc++))) - - -/* execute a jump instruction */ -#define dojump(ci,i,e) \ - { int a = GETARG_A(i); \ - if (a > 0) luaF_close(L, ci->u.l.base + a - 1); \ - ci->u.l.savedpc += GETARG_sBx(i) + e; } - -/* for test instructions, execute the jump instruction that follows it */ -#define donextjump(ci) { i = *ci->u.l.savedpc; dojump(ci, i, 1); } - - -#define Protect(x) { {x;}; base = ci->u.l.base; } - -#define checkGC(L,c) \ - Protect( luaC_condGC(L,{L->top = (c); /* limit of live values */ \ - luaC_step(L); \ - L->top = ci->top;}) /* restore top */ \ - luai_threadyield(L); ) - - -#define arith_op(op,tm) { \ - TValue *rb = RKB(i); \ - TValue *rc = RKC(i); \ - if (ttisnumber(rb) && ttisnumber(rc)) { \ - lua_Number nb = nvalue(rb), nc = nvalue(rc); \ - setnvalue(ra, op(L, nb, nc)); \ - } \ - else { Protect(luaV_arith(L, ra, rb, rc, tm)); } } - - -#define vmdispatch(o) switch(o) -#define vmcase(l,b) case l: {b} break; -#define vmcasenb(l,b) case l: {b} /* nb = no break */ - -void luaV_execute (lua_State *L) { - CallInfo *ci = L->ci; - LClosure *cl; - TValue *k; - StkId base; - newframe: /* reentry point when frame changes (call/return) */ - lua_assert(ci == L->ci); - cl = clLvalue(ci->func); - k = cl->p->k; - base = ci->u.l.base; - /* main loop of interpreter */ - for (;;) { - Instruction i = *(ci->u.l.savedpc++); - StkId ra; - if ((L->hookmask & (LUA_MASKLINE | LUA_MASKCOUNT)) && - (--L->hookcount == 0 || L->hookmask & LUA_MASKLINE)) { - Protect(traceexec(L)); - } - /* WARNING: several calls may realloc the stack and invalidate `ra' */ - ra = RA(i); - lua_assert(base == ci->u.l.base); - lua_assert(base <= L->top && L->top < L->stack + L->stacksize); - vmdispatch (GET_OPCODE(i)) { - vmcase(OP_MOVE, - setobjs2s(L, ra, RB(i)); - ) - vmcase(OP_LOADK, - TValue *rb = k + GETARG_Bx(i); - setobj2s(L, ra, rb); - ) - vmcase(OP_LOADKX, - TValue *rb; - lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_EXTRAARG); - rb = k + GETARG_Ax(*ci->u.l.savedpc++); - setobj2s(L, ra, rb); - ) - vmcase(OP_LOADBOOL, - setbvalue(ra, GETARG_B(i)); - if (GETARG_C(i)) ci->u.l.savedpc++; /* skip next instruction (if C) */ - ) - vmcase(OP_LOADNIL, - int b = GETARG_B(i); - do { - setnilvalue(ra++); - } while (b--); - ) - vmcase(OP_GETUPVAL, - int b = GETARG_B(i); - setobj2s(L, ra, cl->upvals[b]->v); - ) - vmcase(OP_GETTABUP, - int b = GETARG_B(i); - Protect(luaV_gettable(L, cl->upvals[b]->v, RKC(i), ra)); - ) - vmcase(OP_GETTABLE, - Protect(luaV_gettable(L, RB(i), RKC(i), ra)); - ) - vmcase(OP_SETTABUP, - int a = GETARG_A(i); - Protect(luaV_settable(L, cl->upvals[a]->v, RKB(i), RKC(i))); - ) - vmcase(OP_SETUPVAL, - UpVal *uv = cl->upvals[GETARG_B(i)]; - setobj(L, uv->v, ra); - luaC_barrier(L, uv, ra); - ) - vmcase(OP_SETTABLE, - Protect(luaV_settable(L, ra, RKB(i), RKC(i))); - ) - vmcase(OP_NEWTABLE, - int b = GETARG_B(i); - int c = GETARG_C(i); - Table *t = luaH_new(L); - sethvalue(L, ra, t); - if (b != 0 || c != 0) - luaH_resize(L, t, luaO_fb2int(b), luaO_fb2int(c)); - checkGC(L, ra + 1); - ) - vmcase(OP_SELF, - StkId rb = RB(i); - setobjs2s(L, ra+1, rb); - Protect(luaV_gettable(L, rb, RKC(i), ra)); - ) - vmcase(OP_ADD, - arith_op(luai_numadd, TM_ADD); - ) - vmcase(OP_SUB, - arith_op(luai_numsub, TM_SUB); - ) - vmcase(OP_MUL, - arith_op(luai_nummul, TM_MUL); - ) - vmcase(OP_DIV, - arith_op(luai_numdiv, TM_DIV); - ) - vmcase(OP_MOD, - arith_op(luai_nummod, TM_MOD); - ) - vmcase(OP_POW, - arith_op(luai_numpow, TM_POW); - ) - vmcase(OP_UNM, - TValue *rb = RB(i); - if (ttisnumber(rb)) { - lua_Number nb = nvalue(rb); - setnvalue(ra, luai_numunm(L, nb)); - } - else { - Protect(luaV_arith(L, ra, rb, rb, TM_UNM)); - } - ) - vmcase(OP_NOT, - TValue *rb = RB(i); - int res = l_isfalse(rb); /* next assignment may change this value */ - setbvalue(ra, res); - ) - vmcase(OP_LEN, - Protect(luaV_objlen(L, ra, RB(i))); - ) - vmcase(OP_CONCAT, - int b = GETARG_B(i); - int c = GETARG_C(i); - StkId rb; - L->top = base + c + 1; /* mark the end of concat operands */ - Protect(luaV_concat(L, c - b + 1)); - ra = RA(i); /* 'luav_concat' may invoke TMs and move the stack */ - rb = b + base; - setobjs2s(L, ra, rb); - checkGC(L, (ra >= rb ? ra + 1 : rb)); - L->top = ci->top; /* restore top */ - ) - vmcase(OP_JMP, - dojump(ci, i, 0); - ) - vmcase(OP_EQ, - TValue *rb = RKB(i); - TValue *rc = RKC(i); - Protect( - if (cast_int(equalobj(L, rb, rc)) != GETARG_A(i)) - ci->u.l.savedpc++; - else - donextjump(ci); - ) - ) - vmcase(OP_LT, - Protect( - if (luaV_lessthan(L, RKB(i), RKC(i)) != GETARG_A(i)) - ci->u.l.savedpc++; - else - donextjump(ci); - ) - ) - vmcase(OP_LE, - Protect( - if (luaV_lessequal(L, RKB(i), RKC(i)) != GETARG_A(i)) - ci->u.l.savedpc++; - else - donextjump(ci); - ) - ) - vmcase(OP_TEST, - if (GETARG_C(i) ? l_isfalse(ra) : !l_isfalse(ra)) - ci->u.l.savedpc++; - else - donextjump(ci); - ) - vmcase(OP_TESTSET, - TValue *rb = RB(i); - if (GETARG_C(i) ? l_isfalse(rb) : !l_isfalse(rb)) - ci->u.l.savedpc++; - else { - setobjs2s(L, ra, rb); - donextjump(ci); - } - ) - vmcase(OP_CALL, - int b = GETARG_B(i); - int nresults = GETARG_C(i) - 1; - if (b != 0) L->top = ra+b; /* else previous instruction set top */ - if (luaD_precall(L, ra, nresults)) { /* C function? */ - if (nresults >= 0) L->top = ci->top; /* adjust results */ - base = ci->u.l.base; - } - else { /* Lua function */ - ci = L->ci; - ci->callstatus |= CIST_REENTRY; - goto newframe; /* restart luaV_execute over new Lua function */ - } - ) - vmcase(OP_TAILCALL, - int b = GETARG_B(i); - if (b != 0) L->top = ra+b; /* else previous instruction set top */ - lua_assert(GETARG_C(i) - 1 == LUA_MULTRET); - if (luaD_precall(L, ra, LUA_MULTRET)) /* C function? */ - base = ci->u.l.base; - else { - /* tail call: put called frame (n) in place of caller one (o) */ - CallInfo *nci = L->ci; /* called frame */ - CallInfo *oci = nci->previous; /* caller frame */ - StkId nfunc = nci->func; /* called function */ - StkId ofunc = oci->func; /* caller function */ - /* last stack slot filled by 'precall' */ - StkId lim = nci->u.l.base + getproto(nfunc)->numparams; - int aux; - /* close all upvalues from previous call */ - if (cl->p->sizep > 0) luaF_close(L, oci->u.l.base); - /* move new frame into old one */ - for (aux = 0; nfunc + aux < lim; aux++) - setobjs2s(L, ofunc + aux, nfunc + aux); - oci->u.l.base = ofunc + (nci->u.l.base - nfunc); /* correct base */ - oci->top = L->top = ofunc + (L->top - nfunc); /* correct top */ - oci->u.l.savedpc = nci->u.l.savedpc; - oci->callstatus |= CIST_TAIL; /* function was tail called */ - ci = L->ci = oci; /* remove new frame */ - lua_assert(L->top == oci->u.l.base + getproto(ofunc)->maxstacksize); - goto newframe; /* restart luaV_execute over new Lua function */ - } - ) - vmcasenb(OP_RETURN, - int b = GETARG_B(i); - if (b != 0) L->top = ra+b-1; - if (cl->p->sizep > 0) luaF_close(L, base); - b = luaD_poscall(L, ra); - if (!(ci->callstatus & CIST_REENTRY)) /* 'ci' still the called one */ - return; /* external invocation: return */ - else { /* invocation via reentry: continue execution */ - ci = L->ci; - if (b) L->top = ci->top; - lua_assert(isLua(ci)); - lua_assert(GET_OPCODE(*((ci)->u.l.savedpc - 1)) == OP_CALL); - goto newframe; /* restart luaV_execute over new Lua function */ - } - ) - vmcase(OP_FORLOOP, - lua_Number step = nvalue(ra+2); - lua_Number idx = luai_numadd(L, nvalue(ra), step); /* increment index */ - lua_Number limit = nvalue(ra+1); - if (luai_numlt(L, 0, step) ? luai_numle(L, idx, limit) - : luai_numle(L, limit, idx)) { - ci->u.l.savedpc += GETARG_sBx(i); /* jump back */ - setnvalue(ra, idx); /* update internal index... */ - setnvalue(ra+3, idx); /* ...and external index */ - } - ) - vmcase(OP_FORPREP, - const TValue *init = ra; - const TValue *plimit = ra+1; - const TValue *pstep = ra+2; - if (!tonumber(init, ra)) - luaG_runerror(L, LUA_QL("for") " initial value must be a number"); - else if (!tonumber(plimit, ra+1)) - luaG_runerror(L, LUA_QL("for") " limit must be a number"); - else if (!tonumber(pstep, ra+2)) - luaG_runerror(L, LUA_QL("for") " step must be a number"); - setnvalue(ra, luai_numsub(L, nvalue(ra), nvalue(pstep))); - ci->u.l.savedpc += GETARG_sBx(i); - ) - vmcasenb(OP_TFORCALL, - StkId cb = ra + 3; /* call base */ - setobjs2s(L, cb+2, ra+2); - setobjs2s(L, cb+1, ra+1); - setobjs2s(L, cb, ra); - L->top = cb + 3; /* func. + 2 args (state and index) */ - Protect(luaD_call(L, cb, GETARG_C(i), 1)); - L->top = ci->top; - i = *(ci->u.l.savedpc++); /* go to next instruction */ - ra = RA(i); - lua_assert(GET_OPCODE(i) == OP_TFORLOOP); - goto l_tforloop; - ) - vmcase(OP_TFORLOOP, - l_tforloop: - if (!ttisnil(ra + 1)) { /* continue loop? */ - setobjs2s(L, ra, ra + 1); /* save control variable */ - ci->u.l.savedpc += GETARG_sBx(i); /* jump back */ - } - ) - vmcase(OP_SETLIST, - int n = GETARG_B(i); - int c = GETARG_C(i); - int last; - Table *h; - if (n == 0) n = cast_int(L->top - ra) - 1; - if (c == 0) { - lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_EXTRAARG); - c = GETARG_Ax(*ci->u.l.savedpc++); - } - luai_runtimecheck(L, ttistable(ra)); - h = hvalue(ra); - last = ((c-1)*LFIELDS_PER_FLUSH) + n; - if (last > h->sizearray) /* needs more space? */ - luaH_resizearray(L, h, last); /* pre-allocate it at once */ - for (; n > 0; n--) { - TValue *val = ra+n; - luaH_setint(L, h, last--, val); - luaC_barrierback(L, obj2gco(h), val); - } - L->top = ci->top; /* correct top (in case of previous open call) */ - ) - vmcase(OP_CLOSURE, - Proto *p = cl->p->p[GETARG_Bx(i)]; - Closure *ncl = getcached(p, cl->upvals, base); /* cached closure */ - if (ncl == NULL) /* no match? */ - pushclosure(L, p, cl->upvals, base, ra); /* create a new one */ - else - setclLvalue(L, ra, ncl); /* push cashed closure */ - checkGC(L, ra + 1); - ) - vmcase(OP_VARARG, - int b = GETARG_B(i) - 1; - int j; - int n = cast_int(base - ci->func) - cl->p->numparams - 1; - if (b < 0) { /* B == 0? */ - b = n; /* get all var. arguments */ - Protect(luaD_checkstack(L, n)); - ra = RA(i); /* previous call may change the stack */ - L->top = ra + n; - } - for (j = 0; j < b; j++) { - if (j < n) { - setobjs2s(L, ra + j, base - n + j); - } - else { - setnilvalue(ra + j); - } - } - ) - vmcase(OP_EXTRAARG, - lua_assert(0); - ) - } - } -} - diff --git a/radio/src/lua/src/lvm.h b/radio/src/lua/src/lvm.h deleted file mode 100644 index 07e25f9c6..000000000 --- a/radio/src/lua/src/lvm.h +++ /dev/null @@ -1,44 +0,0 @@ -/* -** $Id: lvm.h,v 2.18 2013/01/08 14:06:55 roberto Exp $ -** Lua virtual machine -** See Copyright Notice in lua.h -*/ - -#ifndef lvm_h -#define lvm_h - - -#include "ldo.h" -#include "lobject.h" -#include "ltm.h" - - -#define tostring(L,o) (ttisstring(o) || (luaV_tostring(L, o))) - -#define tonumber(o,n) (ttisnumber(o) || (((o) = luaV_tonumber(o,n)) != NULL)) - -#define equalobj(L,o1,o2) (ttisequal(o1, o2) && luaV_equalobj_(L, o1, o2)) - -#define luaV_rawequalobj(o1,o2) equalobj(NULL,o1,o2) - - -/* not to called directly */ -LUAI_FUNC int luaV_equalobj_ (lua_State *L, const TValue *t1, const TValue *t2); - - -LUAI_FUNC int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r); -LUAI_FUNC int luaV_lessequal (lua_State *L, const TValue *l, const TValue *r); -LUAI_FUNC const TValue *luaV_tonumber (const TValue *obj, TValue *n); -LUAI_FUNC int luaV_tostring (lua_State *L, StkId obj); -LUAI_FUNC void luaV_gettable (lua_State *L, const TValue *t, TValue *key, - StkId val); -LUAI_FUNC void luaV_settable (lua_State *L, const TValue *t, TValue *key, - StkId val); -LUAI_FUNC void luaV_finishOp (lua_State *L); -LUAI_FUNC void luaV_execute (lua_State *L); -LUAI_FUNC void luaV_concat (lua_State *L, int total); -LUAI_FUNC void luaV_arith (lua_State *L, StkId ra, const TValue *rb, - const TValue *rc, TMS op); -LUAI_FUNC void luaV_objlen (lua_State *L, StkId ra, const TValue *rb); - -#endif diff --git a/radio/src/lua/src/lzio.c b/radio/src/lua/src/lzio.c deleted file mode 100644 index 8b77054e0..000000000 --- a/radio/src/lua/src/lzio.c +++ /dev/null @@ -1,76 +0,0 @@ -/* -** $Id: lzio.c,v 1.35 2012/05/14 13:34:18 roberto Exp $ -** Buffered streams -** See Copyright Notice in lua.h -*/ - - -#include - -#define lzio_c -#define LUA_CORE - -#include "lua.h" - -#include "llimits.h" -#include "lmem.h" -#include "lstate.h" -#include "lzio.h" - - -int luaZ_fill (ZIO *z) { - size_t size; - lua_State *L = z->L; - const char *buff; - lua_unlock(L); - buff = z->reader(L, z->data, &size); - lua_lock(L); - if (buff == NULL || size == 0) - return EOZ; - z->n = size - 1; /* discount char being returned */ - z->p = buff; - return cast_uchar(*(z->p++)); -} - - -void luaZ_init (lua_State *L, ZIO *z, lua_Reader reader, void *data) { - z->L = L; - z->reader = reader; - z->data = data; - z->n = 0; - z->p = NULL; -} - - -/* --------------------------------------------------------------- read --- */ -size_t luaZ_read (ZIO *z, void *b, size_t n) { - while (n) { - size_t m; - if (z->n == 0) { /* no bytes in buffer? */ - if (luaZ_fill(z) == EOZ) /* try to read more */ - return n; /* no more input; return number of missing bytes */ - else { - z->n++; /* luaZ_fill consumed first byte; put it back */ - z->p--; - } - } - m = (n <= z->n) ? n : z->n; /* min. between n and z->n */ - memcpy(b, z->p, m); - z->n -= m; - z->p += m; - b = (char *)b + m; - n -= m; - } - return 0; -} - -/* ------------------------------------------------------------------------ */ -char *luaZ_openspace (lua_State *L, Mbuffer *buff, size_t n) { - if (n > buff->buffsize) { - if (n < LUA_MINBUFFER) n = LUA_MINBUFFER; - luaZ_resizebuffer(L, buff, n); - } - return buff->buffer; -} - - diff --git a/radio/src/lua/src/lzio.h b/radio/src/lua/src/lzio.h deleted file mode 100644 index 08682301e..000000000 --- a/radio/src/lua/src/lzio.h +++ /dev/null @@ -1,65 +0,0 @@ -/* -** $Id: lzio.h,v 1.26 2011/07/15 12:48:03 roberto Exp $ -** Buffered streams -** See Copyright Notice in lua.h -*/ - - -#ifndef lzio_h -#define lzio_h - -#include "lua.h" - -#include "lmem.h" - - -#define EOZ (-1) /* end of stream */ - -typedef struct Zio ZIO; - -#define zgetc(z) (((z)->n--)>0 ? cast_uchar(*(z)->p++) : luaZ_fill(z)) - - -typedef struct Mbuffer { - char *buffer; - size_t n; - size_t buffsize; -} Mbuffer; - -#define luaZ_initbuffer(L, buff) ((buff)->buffer = NULL, (buff)->buffsize = 0) - -#define luaZ_buffer(buff) ((buff)->buffer) -#define luaZ_sizebuffer(buff) ((buff)->buffsize) -#define luaZ_bufflen(buff) ((buff)->n) - -#define luaZ_resetbuffer(buff) ((buff)->n = 0) - - -#define luaZ_resizebuffer(L, buff, size) \ - (luaM_reallocvector(L, (buff)->buffer, (buff)->buffsize, size, char), \ - (buff)->buffsize = size) - -#define luaZ_freebuffer(L, buff) luaZ_resizebuffer(L, buff, 0) - - -LUAI_FUNC char *luaZ_openspace (lua_State *L, Mbuffer *buff, size_t n); -LUAI_FUNC void luaZ_init (lua_State *L, ZIO *z, lua_Reader reader, - void *data); -LUAI_FUNC size_t luaZ_read (ZIO* z, void* b, size_t n); /* read next n bytes */ - - - -/* --------- Private Part ------------------ */ - -struct Zio { - size_t n; /* bytes still unread */ - const char *p; /* current position in buffer */ - lua_Reader reader; /* reader function */ - void* data; /* additional data */ - lua_State *L; /* Lua state (for reader) */ -}; - - -LUAI_FUNC int luaZ_fill (ZIO *z); - -#endif diff --git a/radio/src/maths.cpp b/radio/src/maths.cpp index 271aac8f3..93330af1c 100644 --- a/radio/src/maths.cpp +++ b/radio/src/maths.cpp @@ -167,7 +167,7 @@ void varioWakeup() int SoundVarioBeepTime; int SoundVarioBeepFreq; if (verticalSpeed > 0) { - SoundVarioBeepTime = max(5, 320 - (verticalSpeed >> 2)); + SoundVarioBeepTime = min(5, 320 - (verticalSpeed >> 2)); SoundVarioBeepFreq = 1000 + verticalSpeed; } else { diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index fed0158f4..be6e6e11e 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -954,8 +954,6 @@ enum TelemetrySource { TELEM_ACCz, TELEM_HDG, TELEM_VSPD, - TELEM_ASPD, - TELEM_DTE, TELEM_MIN_A1, TELEM_MIN_A2, TELEM_MIN_ALT, @@ -965,13 +963,13 @@ enum TelemetrySource { TELEM_MAX_T2, TELEM_MAX_SPEED, TELEM_MAX_DIST, - TELEM_MIN_CELL, - TELEM_MIN_VFAS, + // TODO TELEM_MIN_CELL, + // TODO TELEM_MIN_VFAS, TELEM_MAX_CURRENT, TELEM_MAX_POWER, TELEM_ACC, TELEM_GPS_TIME, - TELEM_CSW_MAX = TELEM_MAX_POWER, + TELEM_CSW_MAX = TELEM_POWER, TELEM_NOUSR_MAX = TELEM_A2, #if defined(FRSKY) TELEM_DISPLAY_MAX = TELEM_MAX_POWER, diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 358797f97..8a08ea51f 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -1296,11 +1296,9 @@ getvalue_t getValue(uint8_t i) else if (i==MIXSRC_FIRST_TELEM-1+TELEM_ACCz) return frskyData.hub.accelZ; else if (i==MIXSRC_FIRST_TELEM-1+TELEM_HDG) return frskyData.hub.gpsCourse_bp; else if (i==MIXSRC_FIRST_TELEM-1+TELEM_VSPD) return frskyData.hub.varioSpeed; - else if (i==MIXSRC_FIRST_TELEM-1+TELEM_ASPD) return frskyData.hub.airSpeed; - else if (i==MIXSRC_FIRST_TELEM-1+TELEM_DTE) return frskyData.hub.dTE; else if (i==MIXSRC_FIRST_TELEM-1+TELEM_MIN_A1) return frskyData.analog[0].min; else if (i==MIXSRC_FIRST_TELEM-1+TELEM_MIN_A2) return frskyData.analog[1].min; - else if (i<=MIXSRC_FIRST_TELEM-1+TELEM_CSW_MAX) return *(((int16_t*)(&frskyData.hub.minAltitude))+i-(MIXSRC_FIRST_TELEM-1+TELEM_MIN_ALT)); + else if (i==MIXSRC_FIRST_TELEM-1+TELEM_MAX_POWER) return *(((int16_t*)(&frskyData.hub.minAltitude))+i-(MIXSRC_FIRST_TELEM-1+TELEM_MIN_ALT)); #endif #endif else return 0; @@ -1506,18 +1504,17 @@ bool getSwitch(int8_t swtch) } } else { - uint8_t v1 = cs->v1; #if defined(FRSKY) // Telemetry - if (v1 >= MIXSRC_FIRST_TELEM) { - if ((!TELEMETRY_STREAMING() && v1 >= MIXSRC_FIRST_TELEM+TELEM_FIRST_STREAMED_VALUE-1) || IS_FAI_FORBIDDEN(v1-1)) + if (cs->v1 >= MIXSRC_FIRST_TELEM) { + if ((!TELEMETRY_STREAMING() && cs->v1 >= MIXSRC_FIRST_TELEM+TELEM_FIRST_STREAMED_VALUE-1) || IS_FAI_FORBIDDEN(cs->v1-1)) return swtch > 0 ? false : true; y = convertCswTelemValue(cs); #if defined(FRSKY_HUB) && defined(GAUGES) if (s == LS_FAMILY_OFS) { - uint8_t idx = v1-MIXSRC_FIRST_TELEM+1-TELEM_ALT; + uint8_t idx = cs->v1-MIXSRC_FIRST_TELEM+1-TELEM_ALT; if (idx < THLD_MAX) { // Fill the threshold array barsThresholds[idx] = 128 + cs->v2; @@ -1525,17 +1522,17 @@ bool getSwitch(int8_t swtch) } #endif } - else if (v1 >= MIXSRC_GVAR1) { + else if (cs->v1 >= MIXSRC_GVAR1) { y = cs->v2; } else { y = calc100toRESX(cs->v2); } #else - if (v1 >= MIXSRC_FIRST_TELEM) { + if (cs->v1 >= MIXSRC_FIRST_TELEM) { y = (int16_t)3 * (128+cs->v2); // it's a Timer } - else if (v1 >= MIXSRC_GVAR1) { + else if (cs->v1 >= MIXSRC_GVAR1) { y = cs->v2; // it's a GVAR } else { @@ -1546,7 +1543,7 @@ bool getSwitch(int8_t swtch) switch (cs->func) { case LS_FUNC_VEQUAL: #if defined(GVARS) - if (v1 >= MIXSRC_GVAR1 && v1 <= MIXSRC_LAST_GVAR) + if (cs->v1 >= MIXSRC_GVAR1 && cs->v1 <= MIXSRC_LAST_GVAR) result = (x==y); else #endif @@ -2042,7 +2039,7 @@ getvalue_t convert8bitsTelemValue(uint8_t channel, ls_telemetry_value_t value) switch (channel) { case TELEM_TM1: case TELEM_TM2: - result = value * 5; + result = value * 3; break; #if defined(FRSKY) case TELEM_ALT: @@ -3227,13 +3224,11 @@ PLAY_FUNCTION(playValue, uint8_t idx) } case MIXSRC_FIRST_TELEM+TELEM_CELL-1: - case MIXSRC_FIRST_TELEM+TELEM_MIN_CELL-1: PLAY_NUMBER(val/10, 1+UNIT_VOLTS, PREC1); break; case MIXSRC_FIRST_TELEM+TELEM_VFAS-1: case MIXSRC_FIRST_TELEM+TELEM_CELLS_SUM-1: - case MIXSRC_FIRST_TELEM+TELEM_MIN_VFAS-1: PLAY_NUMBER(val, 1+UNIT_VOLTS, PREC1); break; @@ -3249,7 +3244,6 @@ PLAY_FUNCTION(playValue, uint8_t idx) break; case MIXSRC_FIRST_TELEM+TELEM_VSPD-1: - case MIXSRC_FIRST_TELEM+TELEM_ASPD-1: PLAY_NUMBER(val/10, 1+UNIT_METERS_PER_SECOND, PREC1); break; diff --git a/radio/src/simpgmspace.cpp b/radio/src/simpgmspace.cpp index cd3fb4803..a502dd7f0 100644 --- a/radio/src/simpgmspace.cpp +++ b/radio/src/simpgmspace.cpp @@ -534,9 +534,7 @@ FRESULT f_chdir (const TCHAR *name) FRESULT f_opendir (DIR * rep, const TCHAR * name) { - char *path = convertSimuPath(name); - TRACE("f_opendir(%s)", path); - rep->fs = (FATFS *)simu::opendir(path); + rep->fs = (FATFS *)simu::opendir(convertSimuPath(name)); return FR_OK; } diff --git a/radio/src/telemetry/frsky.h b/radio/src/telemetry/frsky.h index 440e2b0e5..5446787f4 100644 --- a/radio/src/telemetry/frsky.h +++ b/radio/src/telemetry/frsky.h @@ -124,7 +124,7 @@ PACK(struct FrskySerialData { uint16_t currentConsumption; // 0x35 openXsensor only! Otherwise calculated by the Tx from current uint16_t currentPrescale; uint16_t power; // 0x37 openXsensor only! Otherwise calculated by the Tx from current and voltage - int16_t airSpeed; + int16_t spare2; uint16_t vfas; // 0x39 Added to FrSky protocol for home made sensors with a better precision uint16_t volts_bp; // 0x3A @@ -139,13 +139,9 @@ PACK(struct FrskySerialData { int16_t maxTemperature2; uint16_t maxGpsSpeed; uint16_t maxGpsDistance; - int16_t minCell; - int16_t minVfas; uint16_t maxCurrent; uint16_t maxPower; /* end */ - - int16_t dTE; }); #elif defined(WS_HOW_HIGH) PACK(struct FrskySerialData { diff --git a/radio/src/telemetry/frsky_sport.cpp b/radio/src/telemetry/frsky_sport.cpp index 1f0d53888..613f30daa 100644 --- a/radio/src/telemetry/frsky_sport.cpp +++ b/radio/src/telemetry/frsky_sport.cpp @@ -214,8 +214,8 @@ void processHubPacket(uint8_t id, uint16_t value) #else frskyData.hub.vfas = ((frskyData.hub.volts_bp * 100 + frskyData.hub.volts_ap * 10) * 21) / 110; #endif - if (!frskyData.hub.minVfas || frskyData.hub.vfas < frskyData.hub.minVfas) - frskyData.hub.minVfas = frskyData.hub.vfas; + /* TODO later if (!frskyData.hub.minVfas || frskyData.hub.minVfas > frskyData.hub.vfas) + frskyData.hub.minVfas = frskyData.hub.vfas; */ break; case BARO_ALT_AP_ID: @@ -268,8 +268,6 @@ void processHubPacket(uint8_t id, uint16_t value) if (!frskyData.hub.minCellVolts || cellVolts < frskyData.hub.minCellVolts || battnumber==frskyData.hub.minCellIdx) { frskyData.hub.minCellIdx = battnumber; frskyData.hub.minCellVolts = cellVolts; - if (!frskyData.hub.minCell || frskyData.hub.minCellVolts < frskyData.hub.minCell) - frskyData.hub.minCell = frskyData.hub.minCellVolts; } } break; @@ -763,8 +761,6 @@ void resetTelemetry() frskyData.rssi[1].value = 30; frskyData.hub.fuelLevel = 75; frskyData.hub.rpm = 12000; - frskyData.hub.vfas = 100; - frskyData.hub.minVfas = 90; frskyData.hub.gpsFix = 1; frskyData.hub.gpsLatitude_bp = 4401; diff --git a/radio/src/telemetry/frsky_sport.h b/radio/src/telemetry/frsky_sport.h index 489c6537f..ac1dd94d9 100644 --- a/radio/src/telemetry/frsky_sport.h +++ b/radio/src/telemetry/frsky_sport.h @@ -123,8 +123,6 @@ PACK(struct FrskySerialData { int16_t maxTemperature2; uint16_t maxGpsSpeed; uint16_t maxGpsDistance; - int16_t minCell; - int16_t minVfas; uint16_t maxCurrent; uint16_t maxPower; /* end */ @@ -143,8 +141,6 @@ PACK(struct FrskySerialData { uint16_t minCellVolts; bool varioHighPrecision; - int16_t airSpeed; - int16_t dTE; }); struct FrskyData { diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 074c45a14..786c0c059 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -585,8 +585,6 @@ const pm_uchar font_5x7[] PROGMEM = { #include "font_cz_05x07.lbm" #elif defined(TRANSLATIONS_ES) #include "font_es_05x07.lbm" -#elif defined(TRANSLATIONS_FI) -#include "font_fi_05x07.lbm" #elif defined(TRANSLATIONS_FR) #include "font_fr_05x07.lbm" #elif defined(TRANSLATIONS_IT) @@ -615,8 +613,6 @@ const pm_uchar font_10x14[] PROGMEM = { #include "font_cz_10x14.lbm" #elif defined(TRANSLATIONS_ES) #include "font_es_10x14.lbm" - #elif defined(TRANSLATIONS_FI) - #include "font_fi_10x14.lbm" #elif defined(TRANSLATIONS_FR) #include "font_fr_10x14.lbm" #elif defined(TRANSLATIONS_IT) @@ -644,8 +640,6 @@ const pm_uchar font_4x6[] PROGMEM = { #include "font_cz_04x06.lbm" #elif defined(TRANSLATIONS_ES) #include "font_es_04x06.lbm" -#elif defined(TRANSLATIONS_FI) -#include "font_fi_04x06.lbm" #elif defined(TRANSLATIONS_FR) #include "font_fr_04x06.lbm" #elif defined(TRANSLATIONS_IT) @@ -667,8 +661,6 @@ const pm_uchar font_8x10[] PROGMEM = { #include "font_cz_08x10.lbm" #elif defined(TRANSLATIONS_ES) #include "font_es_08x10.lbm" -#elif defined(TRANSLATIONS_FI) -#include "font_fi_08x10.lbm" #elif defined(TRANSLATIONS_FR) #include "font_fr_08x10.lbm" #elif defined(TRANSLATIONS_IT) diff --git a/radio/src/translations.h b/radio/src/translations.h index 88aa521ac..ceeda44b7 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -46,9 +46,6 @@ #elif defined(TRANSLATIONS_SE) #include "translations/se.h" #define LEN_SPECIAL_CHARS 6 -#elif defined(TRANSLATIONS_FI) -#include "translations/fi.h" -#define LEN_SPECIAL_CHARS 6 #elif defined(TRANSLATIONS_DE) #include "translations/de.h" #define LEN_SPECIAL_CHARS 6 diff --git a/radio/src/translations/.gitignore b/radio/src/translations/.gitignore index c87e4f22e..60fa00cb3 100644 --- a/radio/src/translations/.gitignore +++ b/radio/src/translations/.gitignore @@ -1,7 +1,6 @@ /cz.h /de.h /es.h -/fi.h /fr.h /it.h /pl.h diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 1fa49ad61..3d718ec79 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -261,7 +261,7 @@ #define TR_RSSI_0 "Tx\0 " #define TR_RSSI_1 "Rx\0 " #endif -#define TR_VTELEMCHNS "---\0""Bat\0""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cel-""Vfs-""Cur+""Pwr+""Acc\0""Time" +#define TR_VTELEMCHNS "---\0""Bat\0""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cur+""Pwr+""Acc\0""Time" #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 909c3ab62..8b0b2d5ec 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -261,7 +261,7 @@ #define TR_RSSI_0 "Tx\0 " #define TR_RSSI_1 "Rx\0 " #endif -#define TR_VTELEMCHNS "---\0""Batt""Uhr1""Uhr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""H\203he""Umdr""Fuel""T1\0 ""T2\0 ""Gesc""Dist""GH\203h""Zell""Zels""Vfas""Strm""Verb""Leis""BesX""BesY""BesZ""Rich""VGes""ASpd""dTE\0""A1-\0""A2-\0""H\203h-""H\203h+""Umd+""T1+\0""T2+\0""Ges+""Dst+""Cel-""Vfs-""Str+""Pwr+""Besc""Zeit" +#define TR_VTELEMCHNS "---\0""Batt""Uhr1""Uhr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""H\203he""Umdr""Fuel""T1\0 ""T2\0 ""Gesc""Dist""GH\203h""Zell""Zels""Vfas""Strm""Verb""Leis""BesX""BesY""BesZ""Rich""VGes""A1-\0""A2-\0""H\203h-""H\203h+""Umd+""T1+\0""T2+\0""Ges+""Dst+""Str+""Pwr+""Besc""Zeit" #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h index 5d8b9dedc..ed29c91a3 100644 --- a/radio/src/translations/en.h +++ b/radio/src/translations/en.h @@ -261,7 +261,7 @@ #define TR_RSSI_0 "Tx\0 " #define TR_RSSI_1 "Rx\0 " #endif -#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cel-""Vfs-""Cur+""Pwr+""Acc\0""Time" +#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cur+""Pwr+""Acc\0""Time" #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 6f250d2a3..6454a1c10 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -261,7 +261,7 @@ #define TR_RSSI_0 "Tx\0 " #define TR_RSSI_1 "Rx\0 " #endif -#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cel-""Vfs-""Cur+""Pwr+""Acc\0""Hora" +#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cur+""Pwr+""Acc\0""Hora" #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt deleted file mode 100644 index 41a84c5de..000000000 --- a/radio/src/translations/fi.h.txt +++ /dev/null @@ -1,800 +0,0 @@ -/* - * Authors (alphabetical order) - * - Bertrand Songis - * - Bernet Andre - * - Kjell Kernen - * - Martin Hotar - * - Romolo Manfredini - * - * opentx is based on code named - * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, - * er9x by Erez Raviv: http://code.google.com/p/er9x/, - * and the original (and ongoing) project by - * Thomas Husterer, th9x: http://code.google.com/p/th9x/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * - * - * - * !!!!! DO NOT EDIT fi.h - EDIT fi.h.txt INSTEAD !!!!!!! - * - * In order to make translations easier se.h.txt is parsed and national - * characters are replaced by bitmap codes. The result is se.h. - * - * See translate.py in the util catalog for the list of character codes - * - * !!!!! DO NOT EDIT fi.h - EDIT fi.h.txt INSTEAD !!!!!!! - */ - /* Formatting octal codes available in TR_ strings: - * \037\x -sets LCD x-coord (x value in octal) - * \036 -newline - * \001 to \035 -extended spacing (value * FW/2) - * \0 -ends actual string - */ - -// NON ZERO TERMINATED STRINGS -#define LEN_OFFON "\003" -#define TR_OFFON "OFF""ON\0" - -#define LEN_MMMINV "\003" -#define TR_MMMINV "---""INV" - -#define LEN_NCHANNELS "\004" -#define TR_NCHANNELS "\0014CH\0016CH\0018CH10CH12CH14CH16CH" - -#define LEN_VBEEPMODE "\005" -#define TR_VBEEPMODE "Quiet""Alarm""NoKey""All " - -#define LEN_VBEEPLEN "\005" -#define TR_VBEEPLEN "0====""=0===""==0==""===0=""====0" - -#define LEN_VRENAVIG "\003" -#define TR_VRENAVIG "No REaREb" - -#define LEN_VBLMODE TR("\004", "\010") -#define TR_VBLMODE TR("OFF\0""Keys""Ctrl""Both""ON\0 ", "OFF\0 ""Keys\0 ""Controls""Both\0 ""ON\0 ") - -#define LEN_TRNMODE "\003" -#define TR_TRNMODE "OFF"" +="" :=" - -#define LEN_TRNCHN "\003" -#define TR_TRNCHN "CH1CH2CH3CH4" - -#define LEN_UART3MODES "\017" -#define TR_UART3MODES "OFF\0 ""S-Port Mirror\0 ""Debug\0 " - -#define LEN_POTTYPES "\017" -#define TR_POTTYPES "Pot\0 ""Multipos Switch" - -#define LEN_DATETIME "\005" -#define TR_DATETIME "DATE:""TIME:" - -#define LEN_VLCD "\006" -#define TR_VLCD "NormalOptrex" - -#define LEN_COUNTRYCODES TR("\002", "\007") -#define TR_COUNTRYCODES TR("US""JP""EU", "America""Japan\0 ""Europe\0") - -#define LEN_VTRIMINC TR("\006", "\013") -#define TR_VTRIMINC TR("Expo\0 ""ExFine""Fine\0 ""Medium""Coarse", "Exponential""Extra Fine\0""Fine\0 ""Medium\0 ""Coarse\0 ") - -#define LEN_VBEEPCOUNTDOWN "\006" -#define TR_VBEEPCOUNTDOWN "SilentBeeps\0Voice\0" - -#define LEN_RETA123 "\001" - -#if defined(PCBGRUVIN9X) - #if ROTARY_ENCODERS > 2 - #define TR_RETA123 "RETA123abcd" - #else - #define TR_RETA123 "RETA123ab" - #endif -#elif defined(PCBTARANIS) - #define TR_RETA123 "RETA12LR" -#else - #define TR_RETA123 "RETA123" -#endif - -#define LEN_VPROTOS "\006" - -#if defined(PXX) - #define TR_PXX "PXX\0 " -#elif defined(DSM2) || defined(IRPROTOS) - #define TR_PXX "[PXX]\0" -#else - #define TR_PXX -#endif - -#if defined(DSM2) - #define TR_DSM2 "LP45\0 ""DSM2\0 ""DSMX\0 " -#elif defined(IRPROTOS) - #define TR_DSM2 "[LP45]""[DSM2]""[DSMX]" -#else - #define TR_DSM2 -#endif - -#if defined(IRPROTOS) - #define TR_IRPROTOS "SILV TRAC09PICZ SWIFT\0" -#else - #define TR_IRPROTOS -#endif - -#if defined(CPUARM) - #define TR_XPPM -#else - #define TR_XPPM "PPM16\0""PPMsim" -#endif - -#define TR_VPROTOS "PPM\0 " TR_XPPM TR_PXX TR_DSM2 TR_IRPROTOS - -#define LEN_POSNEG "\003" -#define TR_POSNEG "POS""NEG" - -#define LEN_VCURVEFUNC "\003" -#define TR_VCURVEFUNC "---""x>0""x<0""|x|""f>0""f<0""|f|" - -#define LEN_VMLTPX "\010" -#define TR_VMLTPX "Add\0 ""Multiply""Replace\0" - -#define LEN_VMLTPX2 "\002" -#define TR_VMLTPX2 "+=""*="":=" - -#define LEN_VMIXTRIMS "\003" -#define TR_VMIXTRIMS "OFF""ON\0""Rud""Ele""Thr""Ail" - -#if defined(PCBTARANIS) - #define TR_CSWTIMER "Timer" - #define TR_CSWSTICKY "Stcky" - #define TR_CSWRANGE "Range" - #define TR_CSWSTAY "Edge\0" -#else - #define TR_CSWTIMER "Tim\0 " - #define TR_CSWSTICKY "Glue\0" - #if defined(CPUARM) - #define TR_CSWRANGE "Rnge\0" - #define TR_CSWSTAY "Edge\0" - #else - #define TR_CSWRANGE - #define TR_CSWSTAY - #endif -#endif - -#define LEN_VCSWFUNC "\005" -#define TR_VCSWFUNC "---\0 ""a{x\0 ""a>x\0 ""ax""|a|b\0 ""a" - -#define LEN_VTELPROTO "\007" -#define TR_VTELPROTO "None\0 ""Hub\0 ""WSHHigh" - -#define LEN_VOLTSRC "\003" -#define TR_VOLTSRC "---""A1\0""A2\0""FAS""Cel" - -#define LEN_VARIOSRC "\005" -#if defined(FRSKY_SPORT) - #define TR_VARIOSRC "Vario""A1\0 ""A2\0" -#else - #define TR_VARIOSRC "Alti\0""Alti+""Vario""A1\0 ""A2\0" -#endif - -#define LEN_VSCREEN "\004" -#define TR_VSCREEN "Nums""Bars" - -#define LEN_GPSFORMAT "\004" -#define TR_GPSFORMAT "HMS NMEA" - -#define LEN2_VTEMPLATES 13 -#define LEN_VTEMPLATES "\015" -#define TR_VTEMPLATES "Clear Mixes\0\0""Simple 4-CH \0""Sticky-T-Cut\0""V-Tail \0""Elevon\\Delta\0""eCCPM \0""Heli Setup \0""Servo Test \0" - -#define LEN_VSWASHTYPE "\004" -#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0" - -#define LEN_VKEYS "\005" -#define TR_VKEYS TR("Menu\0""Exit\0""Down\0""Up\0 ""Right""Left\0", "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus") - -#define LEN_VRENCODERS "\003" -#define TR_VRENCODERS "REa""REb" - -#define LEN_VSWITCHES "\003" -#define LEN_VSRCRAW "\004" - -#if defined(PCBTARANIS) - #define TR_POTS_VSRCRAW "S1\0 ""S2\0 ""LS\0 ""RS\0 " - #define TR_SW_VSRCRAW "SA\0 ""SB\0 ""SC\0 ""SD\0 ""SE\0 ""SF\0 ""SG\0 ""SH\0 " -#elif defined(EXTRA_3POS) - #define TR_POTS_VSRCRAW "P1\0 ""P2\0 " - #define TR_SW_VSRCRAW "3P1\0""3P2\0" - #define TR_9X_3POS_SWITCHES "ID0""ID1""ID2""ID3""ID4""ID5" -#else - #define TR_POTS_VSRCRAW "P1\0 ""P2\0 ""P3\0 " - #define TR_SW_VSRCRAW "3POS" - #define TR_9X_3POS_SWITCHES "ID0""ID1""ID2" -#endif - -#if defined(CPUARM) - #define TR_CUSTOMSW "LS1""LS2""LS3""LS4""LS5""LS6""LS7""LS8""LS9""LSA""LSB""LSC""LSD""LSE""LSF""LSG""LSH""LSI""LSJ""LSK""LSL""LSM""LSN""LSO""LSP""LSQ""LSR""LSS""LST""LSU""LSV""LSW" -#elif defined(PCBGRUVIN9X) || defined(CPUM2561) || defined(CPUM128) - #define TR_CUSTOMSW "LS1""LS2""LS3""LS4""LS5""LS6""LS7""LS8""LS9""LSA""LSB""LSC""LSD""LSE""LSF" -#else - #define TR_CUSTOMSW "LS1""LS2""LS3""LS4""LS5""LS6""LS7""LS8""LS9""LSA""LSB""LSC" -#endif - -#define TR_TRIMS_SWITCHES "tRl""tRr""tEd""tEu""tTd""tTu""tAl""tAr" - -#if defined(PCBSKY9X) - #define TR_ROTARY_ENCODERS "REa\0" - #define TR_ROTENC_SWITCHES "REa" -#elif defined(PCBGRUVIN9X) || defined(PCBMEGA2560) - #define TR_ROTARY_ENCODERS "REa\0""REb\0" - #define TR_ROTENC_SWITCHES "REa""REb" -#else - #define TR_ROTARY_ENCODERS - #define TR_ROTENC_SWITCHES -#endif - -#if defined(PCBTARANIS) - #define TR_6POS_POTS "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26" - #define TR_VSWITCHES "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF\301""SG\300""SG-""SG\301""SH\300""SH\301" TR_6POS_POTS TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_CUSTOMSW -#elif defined(CPUARM) - #define TR_VSWITCHES TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_CUSTOMSW -#else - #define TR_VSWITCHES TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_CUSTOMSW -#endif - -#if defined(HELI) - #define TR_CYC_VSRCRAW "CYC1""CYC2""CYC3" -#else - #define TR_CYC_VSRCRAW "[C1]""[C2]""[C3]" -#endif - -#define TR_VSRCRAW "---\0""Rud\0""Ele\0""Thr\0""Ail\0" TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW "TrmR" "TrmE" "TrmT" "TrmA" TR_SW_VSRCRAW - -#define LEN_VTMRMODES "\003" -#define TR_VTMRMODES "OFF""ABS""THs""TH%""THt" - -#define LEN_VTRAINERMODES "\006" -#define TR_VTRAINERMODES "Master""Slave\0" - -#define LEN_VFAILSAFE "\011" -#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses" - -#if defined(MAVLINK) - #define LEN_MAVLINK_BAUDS "\006" - #define TR_MAVLINK_BAUDS "4800 ""9600 ""14400 ""19200 ""38400 ""57600 ""76800 ""115200" - #define LEN_MAVLINK_AC_MODES "\011" - #define TR_MAVLINK_AC_MODES "Stabilize""Acro ""Alt Hold ""Auto ""Guided ""Loiter ""RTL ""Circle ""Pos Hold ""Land ""OF Loiter""Toy A ""Toy M ""INVALID " - #define LEN_MAVLINK_AP_MODES "\015" - #define TR_MAVLINK_AP_MODES "Manual ""Circle ""Stabilize ""Training ""Fly by Wire A""Fly by Wire A""Auto ""RTL ""Loiter ""Guided ""Initialising ""INVALID " -#endif - -// ZERO TERMINATED STRINGS -#define INDENT "\001" -#define LEN_INDENT 1 -#define INDENT_WIDTH (FW/2) - -#if defined(PCBTARANIS) - #define TR_ENTER "[ENTER]" -#else - #define TR_ENTER "[MENU]" -#endif - -#define TR_POPUPS TR_ENTER "\010[EXIT]" -#define OFS_EXIT sizeof(TR_ENTER) - -#define TR_MENUWHENDONE CENTER "\006" TR_ENTER " WHEN DONE" -#define TR_FREE "free" -#define TR_DELETEMODEL "DELETE MODEL" -#define TR_COPYINGMODEL "Copying model..." -#define TR_MOVINGMODEL "Moving model..." -#define TR_LOADINGMODEL "Loading model..." -#define TR_NAME "Name" -#define TR_MODELNAME "Model Name" -#define TR_PHASENAME "Mode Name" -#define TR_MIXNAME "Mix Name" -#define TR_INPUTNAME "Input Name" -#if defined(PCBTARANIS) - #define TR_EXPONAME "Line Name" -#else - #define TR_EXPONAME "Expo Name" -#endif -#define TR_BITMAP "Model Image" -#define TR_TIMER TR("Timer", "Timer ") -#define TR_ELIMITS TR("E.Limits", "Extended Limits") -#define TR_ETRIMS TR("E.Trims", "Extended Trims") -#define TR_TRIMINC "Trim Step" -#define TR_TTRACE TR("T-Source", "Throttle Source") -#define TR_TTRIM TR("T-Trim", "Throttle Trim") -#define TR_BEEPCTR TR("Ctr Beep", "Center Beep") -#define TR_PROTO TR(INDENT "Proto", INDENT "Protocol") -#define TR_PPMFRAME TR("PPM frame", INDENT "PPM frame") -#define TR_MS "ms" -#define TR_SWITCH "Switch" -#define TR_TRIMS "Trims" -#define TR_FADEIN "Fade In" -#define TR_FADEOUT "Fade Out" -#define TR_DEFAULT "(default)" -#define TR_CHECKTRIMS CENTER "\006Check\012Trims" -#define OFS_CHECKTRIMS CENTER_OFS+(9*FW) -#define TR_SWASHTYPE "Swash Type" -#define TR_COLLECTIVE TR("Collective","Collective source") -#define TR_SWASHRING "Swash Ring" -#define TR_ELEDIRECTION TR("ELE Direction","Long. cyc. direction") -#define TR_AILDIRECTION TR("AIL Direction","Lateral cyc. direction") -#define TR_COLDIRECTION TR("PIT Direction","Coll. pitch direction") -#define TR_MODE INDENT"Mode" -#define TR_NOFREEEXPO "No free expo!" -#define TR_NOFREEMIXER "No free mixer!" -#define TR_INSERTMIX "INSERT MIX " -#define TR_EDITMIX "EDIT MIX " -#define TR_SOURCE INDENT"Source" -#define TR_WEIGHT "Weight" -#define TR_EXPO TR("Expo","Exponential") -#define TR_SIDE "Side" -#define TR_DIFFERENTIAL "Differ" -#define TR_OFFSET INDENT"Offset" -#define TR_TRIM "Trim" -#define TR_DREX "DRex" -#define TR_CURVE "Curve" -#define TR_FLMODE TR("Mode","Modes") -#define TR_MIXWARNING "Warning" -#define TR_OFF "OFF" -#define TR_MULTPX "Multpx" -#define TR_DELAYDOWN "Delay Dn" -#define TR_DELAYUP "Delay Up" -#define TR_SLOWDOWN "Slow Dn" -#define TR_SLOWUP "Slow Up" -#define TR_MIXER "MIXER" -#define TR_CV "CV" -#define TR_GV "GV" -#define TR_ACHANNEL "A\004channel" -#define TR_RANGE INDENT"Range" -#define TR_BAR "Bar" -#define TR_ALARM INDENT"Alarm" -#define TR_USRDATA "UsrData" -#define TR_BLADES INDENT"Blades" -#define TR_SCREEN "Screen " -#define TR_SOUND_LABEL "Sound" -#define TR_LENGTH INDENT"Length" -#define TR_SPKRPITCH INDENT"Pitch" -#define TR_HAPTIC_LABEL "Haptic" -#define TR_HAPTICSTRENGTH INDENT"Strength" -#define TR_CONTRAST "Contrast" -#define TR_ALARMS_LABEL "Alarms" -#define TR_BATTERY_RANGE TR("Battery range","Battery meter range") -#define TR_BATTERYWARNING INDENT"Battery Low" -#define TR_INACTIVITYALARM INDENT"Inactivity" -#define TR_MEMORYWARNING INDENT"Memory Low" -#define TR_ALARMWARNING INDENT"Sound Off" -#define TR_RENAVIG "RotEnc Navig" -#define TR_THROTTLEREVERSE TR("T-Reverse", "Throttle reverse") -#define TR_MINUTEBEEP TR(INDENT"Minute",INDENT"Minute call") -#define TR_BEEPCOUNTDOWN INDENT"Countdown" -#define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistent") -#define TR_BACKLIGHT_LABEL "Backlight" -#define TR_BLDELAY INDENT"Duration" -#define TR_BLONBRIGHTNESS INDENT"ON Brightness" -#define TR_BLOFFBRIGHTNESS INDENT"OFF Brightness" -#define TR_SPLASHSCREEN "Splash screen" -#define TR_THROTTLEWARNING TR("T-Warning","Throttle Warning") -#define TR_SWITCHWARNING TR("S-Warning","Switch Warning") -#define TR_POTWARNING TR("Pot Warn.","Pot Warning") -#define TR_TIMEZONE TR("Time Zone","GPS Time zone") -#define TR_RXCHANNELORD TR("Rx Channel Ord","Default channel order") -#define TR_SLAVE "Slave" -#define TR_MODESRC "Mode\006% Source" -#define TR_MULTIPLIER "Multiplier" -#define TR_CAL "Cal" -#define TR_VTRIM "Trim- +" -#define TR_BG "BG:" -#define TR_MENUTOSTART CENTER "\010" TR_ENTER " TO START" -#define TR_SETMIDPOINT TR(CENTER "\004SET STICKS MIDPOINT",CENTER "\004CENTER STICKS/SLIDERS") -#define TR_MOVESTICKSPOTS CENTER "\006MOVE STICKS/POTS" -#define TR_RXBATT "Rx Batt:" -#define TR_TXnRX "Tx:\0Rx:" -#define OFS_RX 4 -#define TR_ACCEL "Acc:" -#define TR_NODATA CENTER "NO DATA" -#define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%" -#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us" -#define STR_US (STR_TMR1LATMAXUS+13) -#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us" -#define TR_TMR1JITTERUS "Tmr1 Jitter\037\124us" - -#if defined(CPUARM) - #define TR_TMIXMAXMS "Tmix max" - #define TR_FREESTACKMINB "Free Stack" -#else - #define TR_TMIXMAXMS "Tmix max\037\124ms" - #define TR_FREESTACKMINB "Free Stack\037\124b" -#endif - -#define TR_MENUTORESET CENTER TR_ENTER " to reset" -#define TR_PPM "PPM" -#define TR_CH "CH" -#define TR_MODEL "MODEL" -#define TR_FP "FM" -#define TR_MIX "MIX" -#define TR_EEPROMLOWMEM "FINSKA low mem" -#define TR_ALERT "\016ALERT" -#define TR_PRESSANYKEYTOSKIP "Press any key to skip" -#define TR_THROTTLENOTIDLE "Throttle not idle" -#define TR_ALARMSDISABLED "Alarms Disabled" -#define TR_PRESSANYKEY TR("\010Press any Key", "Press any Key") -#define TR_BADEEPROMDATA "Bad FINSKA Data" -#define TR_EEPROMFORMATTING "Formatting FINSKA" -#define TR_EEPROMOVERFLOW "FINSKA overflow" -#define TR_MENURADIOSETUP "RADIO SETUP" -#define TR_MENUDATEANDTIME "DATE AND TIME" -#define TR_MENUTRAINER "TRAINER" -#define TR_MENUVERSION "VERSION" -#define TR_MENUDIAG TR("SWITCHES","SWITCH TEST") -#define TR_MENUANA TR("ANAS","ANALOG INPUTS") -#define TR_MENUCALIBRATION "CALIBRATION" -#define TR_TRIMS2OFFSETS "\006Trims => Offsets" -#define TR_MENUMODELSEL TR("MODELSEL","MODEL SELECTION") -#define TR_MENUSETUP TR("SETUP","MODEL SETUP") -#define TR_MENUFLIGHTPHASE "FLIGHT MODE" -#define TR_MENUFLIGHTPHASES "FLIGHT MODES" -#define TR_MENUHELISETUP "HELI SETUP" - -#if defined(PCBTARANIS) - #define TR_MENUINPUTS "INPUTS" - #define TR_MENULIMITS "SERVOS" -#elif defined(PPM_CENTER_ADJUSTABLE) || defined(PPM_LIMITS_SYMETRICAL) // The right menu titles for the gurus ... - #define TR_MENUINPUTS "STICKS" - #define TR_MENULIMITS "SERVOS" -#else - #define TR_MENUINPUTS "DR/EXPO" - #define TR_MENULIMITS "LIMITS" -#endif - -#define TR_MENUCURVES "CURVES" -#define TR_MENUCURVE "CURVE" -#define TR_MENUCUSTOMSWITCH "CUSTOM SWITCH" -#define TR_MENUCUSTOMSWITCHES "CUSTOM SWITCHES" -#define TR_MENUCUSTOMFUNC "CUSTOM FUNCTIONS" -#define TR_MENUTELEMETRY "TELEMETRY" -#define TR_MENUTEMPLATES "TEMPLATES" -#define TR_MENUSTAT "STATS" -#define TR_MENUDEBUG "DEBUG" -#define TR_RXNUM TR("RxNum", INDENT"Receiver No.") -#define TR_SYNCMENU "[Sync]" -#define TR_LIMIT INDENT"Limit" -#define TR_MINRSSI "Min Rssi" -#define TR_LATITUDE "Latitude" -#define TR_LONGITUDE "Longitude" -#define TR_GPSCOORD TR("GPS Coords", "GPS coordinate format") -#define TR_VARIO TR("Vario", "Variometer") -#define TR_SHUTDOWN "SHUTTING DOWN" -#define TR_BATT_CALIB "Battery Calib" -#define TR_CURRENT_CALIB "Current Calib" -#define TR_VOLTAGE INDENT"Voltage" -#define TR_CURRENT INDENT"Current" -#define TR_SELECT_MODEL "Select Model" -#define TR_CREATE_MODEL "Create Model" -#define TR_COPY_MODEL "Copy Model" -#define TR_MOVE_MODEL "Move Model" -#define TR_BACKUP_MODEL "Backup Model" -#define TR_DELETE_MODEL "Delete Model" -#define TR_RESTORE_MODEL "Restore Model" -#define TR_SDCARD_ERROR "SDCARD Error" -#define TR_NO_SDCARD "No SDCARD" -#define TR_INCOMPATIBLE "Incompatible" -#define TR_WARNING "WARNING" -#define TR_EEPROMWARN "FINSKA" -#define TR_THROTTLEWARN "THROTTLE" -#define TR_ALARMSWARN "ALARMS" -#define TR_SWITCHWARN TR("SWITCH","CONTROL") -#define TR_INVERT_THR TR("Invert Thr?","Invert Throttle?") -#define TR_SPEAKER_VOLUME INDENT "Volume" -#define TR_LCD "LCD" -#define TR_BRIGHTNESS INDENT "Brightness" -#define TR_CPU_TEMP "CPU Temp.\016>" -#define TR_CPU_CURRENT "Current\022>" -#define TR_CPU_MAH "Consumpt." -#define TR_COPROC "CoProc." -#define TR_COPROC_TEMP "MB Temp. \016>" -#define TR_CAPAWARNING INDENT "Capacity Low" -#define TR_TEMPWARNING INDENT "Overheat" -#define TR_FUNC "Func" -#define TR_V1 "V1" -#define TR_V2 "V2" -#define TR_DURATION "Duration" -#define TR_DELAY "Delay" -#define TR_SD_CARD "SD CARD" -#define TR_SDHC_CARD "SD-HC CARD" -#define TR_NO_SOUNDS_ON_SD "No Sounds on SD" -#define TR_NO_MODELS_ON_SD "No Models on SD" -#define TR_NO_BITMAPS_ON_SD "No Bitmaps on SD" -#define TR_PLAY_FILE "Play" -#define TR_DELETE_FILE "Delete" -#define TR_COPY_FILE "Copy" -#define TR_RENAME_FILE "Rename" -#define TR_ASSIGN_BITMAP "Assign Bitmap" -#define TR_REMOVED " removed" -#define TR_SD_INFO "Information" -#define TR_SD_FORMAT "Format" -#define TR_NA "N/A" -#define TR_HARDWARE "HARDWARE" -#define TR_FORMATTING "Formatting..." -#define TR_TEMP_CALIB "Temp. Calib" -#define TR_TIME "Time" -#define TR_BAUDRATE "BT Baudrate" -#define TR_SD_INFO_TITLE "SD INFO" -#define TR_SD_TYPE "Type:" -#define TR_SD_SPEED "Speed:" -#define TR_SD_SECTORS "Sectors:" -#define TR_SD_SIZE "Size:" -#define TR_TYPE "Type" -#define TR_GLOBAL_VARS "Global Variables" -#define TR_GLOBAL_VAR "Global Variable" -#define TR_MENUGLOBALVARS "GLOBAL VARIABLES" -#define TR_OWN "Own" -#define TR_DATE "Date" -#define TR_ROTARY_ENCODER "R.Encs" -#define TR_CHANNELS_MONITOR "CHANNEL MONITOR" -#define TR_INTERNALRF "Internal RF" -#define TR_EXTERNALRF "External RF" -#define TR_FAILSAFE INDENT "Failsafe mode" -#define TR_FAILSAFESET "FAILSAFE SETTINGS" -#define TR_COUNTRYCODE "Country Code" -#define TR_VOICELANG "Voice Language" -#define TR_UNITSSYSTEM "Units" -#define TR_EDIT "Edit" -#define TR_INSERT_BEFORE "Insert Before" -#define TR_INSERT_AFTER "Insert After" -#define TR_COPY "Copy" -#define TR_MOVE "Move" -#define TR_PASTE "Paste" -#define TR_DELETE "Delete" -#define TR_INSERT "Insert" -#define TR_RESET_FLIGHT "Reset Flight" -#define TR_RESET_TIMER1 "Reset Timer1" -#define TR_RESET_TIMER2 "Reset Timer2" -#define TR_RESET_TELEMETRY "Reset Telemetry" -#define TR_STATISTICS "Statistics" -#define TR_ABOUT_US "About" -#define TR_AND_SWITCH "AND Switch" -#define TR_CF "CF" -#define TR_SPEAKER INDENT"Speaker" -#define TR_BUZZER INDENT"Buzzer" -#define TR_BYTES "bytes" -#define TR_MODULE_BIND "[Bind]" -#define TR_MODULE_RANGE "[Range]" -#define TR_RESET_BTN "[Reset]" -#define TR_SET "[Set]" -#define TR_TRAINER "Trainer" -#define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!" -#define TR_MODELIDUSED TR("ID already used","Model ID already used") -#define TR_MODULE INDENT "Module" -#define TR_CHANNELRANGE INDENT "Channel Range" -#define TR_LOWALARM INDENT "Low Alarm" -#define TR_CRITICALALARM INDENT "Critical Alarm" -#define TR_PERSISTENT_MAH INDENT "Store mAh" -#define TR_CHECKLIST "Display Checklist" -#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") -#define TR_UART3MODE "Serial port" -#define TR_POT1TYPE "S1 Type" -#define TR_POT2TYPE "S2 Type" - -#if defined(MAVLINK) - #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" - #define TR_MAVLINK_PC_RSSI_EN_LABEL "PC RSSI EN" - #define TR_MAVMENUSETUP_TITLE "Mavlink Setup" - #define TR_MAVLINK_BAUD_LABEL "Baudrate" - #define TR_MAVLINK_INFOS "INFOS" - #define TR_MAVLINK_MODE "MODE" - #define TR_MAVLINK_CUR_MODE "Current Mode" - #define TR_MAVLINK_ARMED "Armed" - #define TR_MAVLINK_BAT_MENU_TITLE "BAT RSSI" - #define TR_MAVLINK_BATTERY_LABEL "Flight Battery status" - #define TR_MAVLINK_RC_RSSI_LABEL "RC RSSI" - #define TR_MAVLINK_PC_RSSI_LABEL "PC RSSI" - #define TR_MAVLINK_NAV_MENU_TITLE "NAV" - #define TR_MAVLINK_COURSE "Course" - #define TR_MAVLINK_HEADING "Heading" - #define TR_MAVLINK_BEARING "Bearing" - #define TR_MAVLINK_ALTITUDE "Altitude" - #define TR_MAVLINK_GPS "GPS" - #define TR_MAVLINK_NO_FIX "NO Fix" - #define TR_MAVLINK_SAT "SAT" - #define TR_MAVLINK_HDOP "HDOP" - #define TR_MAVLINK_LAT "LAT" - #define TR_MAVLINK_LON "LON" -#endif - -// Taranis column headers -#define TR_PHASES_HEADERS { " Name ", " Switch ", " Rudder Trim ", " Elevator Trim ", " Throttle Trim ", " Aileron Trim ", " Fade In ", " Fade Out " } -#define TR_LIMITS_HEADERS { " Name ", " Subtrim ", " Min ", " Max ", " Direction ", " Curve ", " PPM Center ", " Subtrim mode " } -#define TR_CSW_HEADERS { " Function ", " V1 ", " V2 ", " V2 ", " AND Switch ", " Duration ", " Delay " } - -// About screen -#define TR_ABOUTUS TR(" ABOUT ", "ABOUT") - -#define TR_ABOUT_OPENTX_1 TR("OpenTX\001is\001open\001source,\001non", "OpenTX is open source, non-") -#define TR_ABOUT_OPENTX_2 TR("commercial,\001wo\001warranties.", "commercial and comes with no") -#define TR_ABOUT_OPENTX_3 TR("It\001was\001developed\001for\001free.", "warranties. It was developed") -#define TR_ABOUT_OPENTX_4 TR("Support through donations", "for free. Support through") -#define TR_ABOUT_OPENTX_5 TR("is welcome!", "donations is welcome!") - -#define TR_ABOUT_BERTRAND_1 "Bertrand Songis" -#define TR_ABOUT_BERTRAND_2 "OpenTX main author" -#define TR_ABOUT_BERTRAND_3 "Companion9x co-author" - -#define TR_ABOUT_MIKE_1 "Mike Blandford" -#define TR_ABOUT_MIKE_2 "Code and drivers guru" -#define TR_ABOUT_MIKE_3 TR("Arguably,\001one\001of\001the\001best", "Arguably, one of the best") -#define TR_ABOUT_MIKE_4 "Inspirational" - -#define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" -#define TR_ABOUT_ROMOLO_2 "Companion9x co-author" -#define TR_ABOUT_ROMOLO_3 "" - -#define TR_ABOUT_ANDRE_1 "Andre Bernet" -#define TR_ABOUT_ANDRE_2 "Functionality, usability," -#define TR_ABOUT_ANDRE_3 "debugging, documentation" - -#define TR_ABOUT_ROB_1 "Rob Thomson" -#define TR_ABOUT_ROB_2 "openrcforums webmaster" - -#define TR_ABOUT_MARTIN_1 "Martin Hotar" -#define TR_ABOUT_MARTIN_2 "Graphics designer" - -#if defined(PCBTARANIS) - #define TR_ABOUT_HARDWARE_1 "FrSky" - #define TR_ABOUT_HARDWARE_2 "Hardware designer/producer" - #define TR_ABOUT_HARDWARE_3 "Firmware contributor" -#else - #define TR_ABOUT_HARDWARE_1 "Brent Nelson" - #define TR_ABOUT_HARDWARE_2 "Sky9x designer/producer" - #define TR_ABOUT_HARDWARE_3 "" -#endif - -#define TR_ABOUT_PARENTS_1 "Parent projects" -#define TR_ABOUT_PARENTS_2 TR("Ersky9x (Mike Blandford)", "Ersky9x (Mike Blandford)") -#define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)" -#define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)" - -#define TR_CHR_SHORT 's' -#define TR_CHR_LONG 'l' -#define TR_CHR_TOGGLE 't' -#define TR_CHR_HOUR 'h' -#define TR_CHR_INPUT 'I' // Values between A-I will work - -#define TR_BEEP_VOLUME "Beep Volume" -#define TR_WAV_VOLUME "Wav Volume" -#define TR_VARIO_VOLUME "Vario Volume" -#define TR_BG_VOLUME "Bg Volume" - -#define TR_TOP_BAR "Top Bar" -#define TR_ALTITUDE INDENT "Altitude" -#define TR_MODS_FORBIDDEN "Modifications forbidden!" -#define TR_UNLOCKED "Unlocked" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 5baae5672..d568e0ccb 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -261,7 +261,7 @@ #define TR_RSSI_0 "Tx\0 " #define TR_RSSI_1 "Rx\0 " #endif -#define TR_VTELEMCHNS "---\0""Batt""Chr1""Chr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vit\0""Dist""AltG""Elem""Velm""Vfas""Cour""Cnsm""Puis""AccX""AccY""AccZ""Cap\0""VitV""ASpd""dTE\0""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vit+""Dst+""Cel-""Vfs-""Cur+""Pwr+""Acc\0""Time" +#define TR_VTELEMCHNS "---\0""Batt""Chr1""Chr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vit\0""Dist""AltG""Elem""Velm""Vfas""Cour""Cnsm""Puis""AccX""AccY""AccZ""Cap\0""VitV""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vit+""Dst+""Cur+""Pwr+""Acc\0""Time" #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\012") diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 1a16a18b2..9a5571c86 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -261,7 +261,7 @@ #define TR_RSSI_0 "Tx\0 " #define TR_RSSI_1 "Rx\0 " #endif -#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vel\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsm""Powr""AccX""AccY""AccZ""Dir\0""VelV""ASpd""dTE\0""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vel+""Dst+""Cel-""Vfs-""Cur+""Pwr+""Acc\0""Time" +#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vel\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsm""Powr""AccX""AccY""AccZ""Dir\0""VelV""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vel+""Dst+""Cur+""Pwr+""Acc\0""Time" #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\011") diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index a06512468..fff5b7da2 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -45,7 +45,7 @@ #define TR_OFFON "WYŁ""ZAŁ" #define LEN_MMMINV "\003" -#define TR_MMMINV "---""REV" +#define TR_MMMINV "---""INV" #define LEN_NCHANNELS "\004" #define TR_NCHANNELS "\0014KN\0016KN\0018KN10KN12KN14KN16KN" @@ -148,7 +148,7 @@ #define TR_VMLTPX2 "+=""*="":=" #define LEN_VMIXTRIMS "\004" -#define TR_VMIXTRIMS "WYŁ\0""ZAŁ\0""SK\0 ""SW\0 ""GAZ\0""Lotk" +#define TR_VMIXTRIMS "WYł\0""ZAŁ\0""SK\0 ""SW\0 ""GAZ\0""Lotk" #if defined(PCBTARANIS) #define TR_CSWTIMER "Timer" @@ -212,10 +212,10 @@ #define TR_SDCLOGS "[Logować]\0 " #endif -#if defined(GVARS) - #define TR_ADJUST_GVAR "Ustaw \0 " +#ifdef GVARS + #define TR_CFN_ADJUST_GVAR "Ustaw \0 " #else - #define TR_ADJUST_GVAR "[UstawZG]\0" + #define TR_CFN_ADJUST_GVAR "[UstawZG]\0" #endif #ifdef DEBUG @@ -224,25 +224,14 @@ #define TR_CFN_TEST #endif -//#if defined(CPUARM) -// #define TR_VFSWFUNC "Bezp.\0 ""Trener \0 ""Inst-Trim ""Reset " TR_ADJUST_GVAR "Głośność\0 " TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Podświetl. " TR_CFN_TEST -//#elif defined(PCBGRUVIN9X) -// #define TR_VFSWFUNC "Bezp.\0 ""Trener \0 ""Inst-Trim ""Reset " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Podświetl. " TR_CFN_TEST -//#else -// #define TR_VFSWFUNC "Bezp.\0 ""Trener \0 ""Inst-Trim ""Reset " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "Podświetl. " TR_CFN_TEST -//#endif - - #if defined(CPUARM) - #define TR_VFSWFUNC "Safety\0 ""Trainer\0 ""Inst. Trim""Reset\0 ""Set \0 " TR_ADJUST_GVAR "Volume\0 " TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0" TR_CFN_TEST + #define TR_VFSWFUNC "Bezp.\0 ""Trener \0 ""Inst-Trim ""Reset " TR_ADJUST_GVAR "Głośność\0 " TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Podświetl. " TR_CFN_TEST #elif defined(PCBGRUVIN9X) - #define TR_VFSWFUNC "Safety\0 ""Trainer\0 ""Inst. Trim""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0" TR_CFN_TEST + #define TR_VFSWFUNC "Bezp.\0 ""Trener \0 ""Inst-Trim ""Reset " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Podświetl. " TR_CFN_TEST #else - #define TR_VFSWFUNC "Safety\0 ""Trainer\0 ""Inst. Trim""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "Backlight\0" TR_CFN_TEST + #define TR_VFSWFUNC "Bezp.\0 ""Trener \0 ""Inst-Trim ""Reset " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "Podświetl. " TR_CFN_TEST #endif - - #define LEN_VFSWRESET TR("\004", "\012") #if defined(FRSKY) @@ -272,7 +261,7 @@ #define TR_RSSI_0 "Tx\0 " #define TR_RSSI_1 "Rx\0 " #endif -#define TR_VTELEMCHNS "---\0""Bat\0""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Wys\0""Rpm\0""Pali""T1\0 ""T2\0 ""Spd\0""Dyst""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Moc\0""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0""A1-\0""A2-\0""Wys-""Wys+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cel-""Vfs-""Cur+""Moc+""Acc\0""Time" +#define TR_VTELEMCHNS "---\0""Bat\0""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Wys\0""Rpm\0""Pali""T1\0 ""T2\0 ""Spd\0""Dyst""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Moc\0""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Wys-""Wys+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cur+""Moc+""Acc\0""Time" #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\012") diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 68d0a8616..41ac94296 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -261,7 +261,7 @@ #define TR_RSSI_0 "Tx\0 " #define TR_RSSI_1 "Rx\0 " #endif -#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VVel""ASpd""dTE\0""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vel+""Dst+""Cel-""Vfs-""Cur+""Pwr+""Acc\0""Hora" +#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VVel""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vel+""Dst+""Cur+""Pwr+""Acc\0""Hora" #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index ef4d117be..5e117d67c 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -261,7 +261,7 @@ #define TR_RSSI_0 "Tx\0 " #define TR_RSSI_1 "Rx\0 " #endif -#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Höjd""Varv""Tank""T1\0 ""T2\0 ""Fart""Avst""GHjd""Batt""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VFrt""ASpd""dTE\0""A1-\0""A2-\0""Hjd-""Hjd+""Rpm+""T1+\0""T2+\0""Frt+""Avs+""Cur+""Pwr+""Acc\0""Tid\0" +#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Höjd""Varv""Tank""T1\0 ""T2\0 ""Fart""Avst""GHjd""Batt""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VFrt""A1-\0""A2-\0""Hjd-""Hjd+""Rpm+""T1+\0""T2+\0""Frt+""Avs+""Cur+""Pwr+""Acc\0""Tid\0" #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") diff --git a/radio/util/translate.py b/radio/util/translate.py index a5c32b52d..a0535537f 100644 --- a/radio/util/translate.py +++ b/radio/util/translate.py @@ -40,13 +40,6 @@ translations = {'cz': [('\\200', u'á'), 'es': [('\\200', u'Ñ'), ('\\201', u'ñ')], - 'fi': [('\\200', u'å'), - ('\\201', u'ä'), - ('\\202', u'ö'), - ('\\203', u'Å'), - ('\\204', u'Ä'), - ('\\205', u'Ö')], - 'fr': [('\\200', u'é'), ('\\201', u'è'), ('\\202', u'à'), From 76bda4f89adf5c5d608cc8df0d91d8253276254c Mon Sep 17 00:00:00 2001 From: openfsguruh Date: Mon, 17 Feb 2014 21:06:46 +0100 Subject: [PATCH 09/85] Revert "Revert "Merge branch 'next'"" This reverts commit a9f4d2185cd628a1fc55a3c1e441a7b15b7507f5. --- .gitignore | 2 + DONATIONS.txt | 1 + companion/src/CMakeLists.txt | 15 +- companion/src/burndialog.cpp | 4 +- companion/src/customizesplashdialog.cpp | 2 +- companion/src/eeprominterface.cpp | 10 +- companion/src/eeprominterface.h | 18 +- .../opentx/opentxTaranisSimulator.cpp | 33 +- .../src/firmwares/opentx/opentxeeprom.cpp | 22 +- companion/src/flashinterface.cpp | 2 +- companion/src/flashinterface.h | 2 +- companion/src/fwpreferencesdialog.ui | 2 +- companion/src/helpers.cpp | 4 +- companion/src/mainwindow.cpp | 584 +- companion/src/mainwindow.h | 80 +- companion/src/mdichild.cpp | 2 +- companion/src/mdichild.h | 2 +- companion/src/translations.qrc.in | 7 +- companion/src/translations/companion_fi.ts | 11084 ++++++++++++++++ companion/src/translations/companion_pl.ts | 948 +- companion/src/translations/companion_sv.ts | 660 +- radio/.gitignore | 1 + radio/src/.gitignore | 3 +- radio/src/Makefile | 35 +- radio/src/eeprom_conversions.cpp | 19 +- radio/src/fonts/sqt5/font_fi_04x06.png | Bin 0 -> 168 bytes radio/src/fonts/sqt5/font_fi_05x07.png | Bin 0 -> 174 bytes radio/src/fonts/sqt5/font_fi_08x10.png | Bin 0 -> 196 bytes radio/src/fonts/sqt5/font_fi_10x14.png | Bin 0 -> 214 bytes radio/src/fonts/std/font_fi_04x06.png | Bin 0 -> 169 bytes radio/src/fonts/std/font_fi_05x07.png | Bin 0 -> 160 bytes radio/src/fonts/std/font_fi_08x10.png | Bin 0 -> 208 bytes radio/src/fonts/std/font_fi_10x14.png | Bin 0 -> 233 bytes radio/src/lcd.cpp | 3 + radio/src/lua.cpp | 1124 ++ radio/src/lua/Makefile | 114 + radio/src/lua/README | 6 + radio/src/lua/doc/contents.html | 533 + radio/src/lua/doc/logo.gif | Bin 0 -> 4232 bytes radio/src/lua/doc/lua.1 | 116 + radio/src/lua/doc/lua.css | 83 + radio/src/lua/doc/luac.1 | 118 + radio/src/lua/doc/manual.css | 26 + radio/src/lua/doc/manual.html | 10507 +++++++++++++++ radio/src/lua/doc/osi-certified-72x60.png | Bin 0 -> 3774 bytes radio/src/lua/doc/readme.html | 412 + radio/src/lua/src/Makefile | 187 + radio/src/lua/src/lapi.c | 1284 ++ radio/src/lua/src/lapi.h | 24 + radio/src/lua/src/lauxlib.c | 997 ++ radio/src/lua/src/lauxlib.h | 215 + radio/src/lua/src/lbaselib.c | 456 + radio/src/lua/src/lbitlib.c | 210 + radio/src/lua/src/lcode.c | 881 ++ radio/src/lua/src/lcode.h | 83 + radio/src/lua/src/lcorolib.c | 154 + radio/src/lua/src/lctype.c | 52 + radio/src/lua/src/lctype.h | 95 + radio/src/lua/src/ldblib.c | 396 + radio/src/lua/src/ldebug.c | 580 + radio/src/lua/src/ldebug.h | 34 + radio/src/lua/src/ldo.c | 673 + radio/src/lua/src/ldo.h | 46 + radio/src/lua/src/ldump.c | 173 + radio/src/lua/src/lfunc.c | 161 + radio/src/lua/src/lfunc.h | 33 + radio/src/lua/src/lgc.c | 1213 ++ radio/src/lua/src/lgc.h | 157 + radio/src/lua/src/linit.c | 66 + radio/src/lua/src/liolib.c | 663 + radio/src/lua/src/llex.c | 527 + radio/src/lua/src/llex.h | 78 + radio/src/lua/src/llimits.h | 309 + radio/src/lua/src/lmathlib.c | 278 + radio/src/lua/src/lmem.c | 98 + radio/src/lua/src/lmem.h | 57 + radio/src/lua/src/loadlib.c | 731 + radio/src/lua/src/lobject.c | 287 + radio/src/lua/src/lobject.h | 607 + radio/src/lua/src/lopcodes.c | 107 + radio/src/lua/src/lopcodes.h | 288 + radio/src/lua/src/loslib.c | 322 + radio/src/lua/src/lparser.c | 1638 +++ radio/src/lua/src/lparser.h | 119 + radio/src/lua/src/lstate.c | 322 + radio/src/lua/src/lstate.h | 228 + radio/src/lua/src/lstring.c | 185 + radio/src/lua/src/lstring.h | 46 + radio/src/lua/src/lstrlib.c | 1017 ++ radio/src/lua/src/ltable.c | 589 + radio/src/lua/src/ltable.h | 41 + radio/src/lua/src/ltablib.c | 282 + radio/src/lua/src/ltm.c | 77 + radio/src/lua/src/ltm.h | 57 + radio/src/lua/src/lua.c | 496 + radio/src/lua/src/lua.h | 455 + radio/src/lua/src/lua.hpp | 9 + radio/src/lua/src/luac.c | 431 + radio/src/lua/src/luaconf.h | 562 + radio/src/lua/src/lualib.h | 55 + radio/src/lua/src/lundump.c | 258 + radio/src/lua/src/lundump.h | 28 + radio/src/lua/src/lvm.c | 867 ++ radio/src/lua/src/lvm.h | 44 + radio/src/lua/src/lzio.c | 76 + radio/src/lua/src/lzio.h | 65 + radio/src/maths.cpp | 2 +- radio/src/myeeprom.h | 8 +- radio/src/opentx.cpp | 24 +- radio/src/simpgmspace.cpp | 4 +- radio/src/telemetry/frsky.h | 6 +- radio/src/telemetry/frsky_sport.cpp | 8 +- radio/src/telemetry/frsky_sport.h | 4 + radio/src/translations.cpp | 8 + radio/src/translations.h | 3 + radio/src/translations/.gitignore | 1 + radio/src/translations/cz.h.txt | 2 +- radio/src/translations/de.h.txt | 2 +- radio/src/translations/en.h | 2 +- radio/src/translations/es.h.txt | 2 +- radio/src/translations/fi.h.txt | 800 ++ radio/src/translations/fr.h.txt | 2 +- radio/src/translations/it.h.txt | 2 +- radio/src/translations/pl.h.txt | 29 +- radio/src/translations/pt.h.txt | 2 +- radio/src/translations/se.h.txt | 2 +- radio/util/translate.py | 7 + 127 files changed, 46890 insertions(+), 1083 deletions(-) create mode 100644 .gitignore create mode 100644 companion/src/translations/companion_fi.ts create mode 100644 radio/.gitignore create mode 100644 radio/src/fonts/sqt5/font_fi_04x06.png create mode 100644 radio/src/fonts/sqt5/font_fi_05x07.png create mode 100644 radio/src/fonts/sqt5/font_fi_08x10.png create mode 100644 radio/src/fonts/sqt5/font_fi_10x14.png create mode 100644 radio/src/fonts/std/font_fi_04x06.png create mode 100644 radio/src/fonts/std/font_fi_05x07.png create mode 100644 radio/src/fonts/std/font_fi_08x10.png create mode 100644 radio/src/fonts/std/font_fi_10x14.png create mode 100644 radio/src/lua.cpp create mode 100644 radio/src/lua/Makefile create mode 100644 radio/src/lua/README create mode 100644 radio/src/lua/doc/contents.html create mode 100644 radio/src/lua/doc/logo.gif create mode 100644 radio/src/lua/doc/lua.1 create mode 100644 radio/src/lua/doc/lua.css create mode 100644 radio/src/lua/doc/luac.1 create mode 100644 radio/src/lua/doc/manual.css create mode 100644 radio/src/lua/doc/manual.html create mode 100644 radio/src/lua/doc/osi-certified-72x60.png create mode 100644 radio/src/lua/doc/readme.html create mode 100644 radio/src/lua/src/Makefile create mode 100644 radio/src/lua/src/lapi.c create mode 100644 radio/src/lua/src/lapi.h create mode 100644 radio/src/lua/src/lauxlib.c create mode 100644 radio/src/lua/src/lauxlib.h create mode 100644 radio/src/lua/src/lbaselib.c create mode 100644 radio/src/lua/src/lbitlib.c create mode 100644 radio/src/lua/src/lcode.c create mode 100644 radio/src/lua/src/lcode.h create mode 100644 radio/src/lua/src/lcorolib.c create mode 100644 radio/src/lua/src/lctype.c create mode 100644 radio/src/lua/src/lctype.h create mode 100644 radio/src/lua/src/ldblib.c create mode 100644 radio/src/lua/src/ldebug.c create mode 100644 radio/src/lua/src/ldebug.h create mode 100644 radio/src/lua/src/ldo.c create mode 100644 radio/src/lua/src/ldo.h create mode 100644 radio/src/lua/src/ldump.c create mode 100644 radio/src/lua/src/lfunc.c create mode 100644 radio/src/lua/src/lfunc.h create mode 100644 radio/src/lua/src/lgc.c create mode 100644 radio/src/lua/src/lgc.h create mode 100644 radio/src/lua/src/linit.c create mode 100644 radio/src/lua/src/liolib.c create mode 100644 radio/src/lua/src/llex.c create mode 100644 radio/src/lua/src/llex.h create mode 100644 radio/src/lua/src/llimits.h create mode 100644 radio/src/lua/src/lmathlib.c create mode 100644 radio/src/lua/src/lmem.c create mode 100644 radio/src/lua/src/lmem.h create mode 100644 radio/src/lua/src/loadlib.c create mode 100644 radio/src/lua/src/lobject.c create mode 100644 radio/src/lua/src/lobject.h create mode 100644 radio/src/lua/src/lopcodes.c create mode 100644 radio/src/lua/src/lopcodes.h create mode 100644 radio/src/lua/src/loslib.c create mode 100644 radio/src/lua/src/lparser.c create mode 100644 radio/src/lua/src/lparser.h create mode 100644 radio/src/lua/src/lstate.c create mode 100644 radio/src/lua/src/lstate.h create mode 100644 radio/src/lua/src/lstring.c create mode 100644 radio/src/lua/src/lstring.h create mode 100644 radio/src/lua/src/lstrlib.c create mode 100644 radio/src/lua/src/ltable.c create mode 100644 radio/src/lua/src/ltable.h create mode 100644 radio/src/lua/src/ltablib.c create mode 100644 radio/src/lua/src/ltm.c create mode 100644 radio/src/lua/src/ltm.h create mode 100644 radio/src/lua/src/lua.c create mode 100644 radio/src/lua/src/lua.h create mode 100644 radio/src/lua/src/lua.hpp create mode 100644 radio/src/lua/src/luac.c create mode 100644 radio/src/lua/src/luaconf.h create mode 100644 radio/src/lua/src/lualib.h create mode 100644 radio/src/lua/src/lundump.c create mode 100644 radio/src/lua/src/lundump.h create mode 100644 radio/src/lua/src/lvm.c create mode 100644 radio/src/lua/src/lvm.h create mode 100644 radio/src/lua/src/lzio.c create mode 100644 radio/src/lua/src/lzio.h create mode 100644 radio/src/translations/fi.h.txt diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..541e88799 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/.project +/.settings diff --git a/DONATIONS.txt b/DONATIONS.txt index ad2efa2db..327369f8f 100644 --- a/DONATIONS.txt +++ b/DONATIONS.txt @@ -318,3 +318,4 @@ Robert Miller Aviomotive - www.aviomotive.com Mark Gaskievicz Roland Müller +Frank Gewalt diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt index 20c86879c..6356ce744 100644 --- a/companion/src/CMakeLists.txt +++ b/companion/src/CMakeLists.txt @@ -80,7 +80,15 @@ IF( Subversion_FOUND ) # Subversion_WC_INFO( ${PROJECT_SOURCE_DIR} C9X ) ENDIF( ) -INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/../.. ${PROJECT_SOURCE_DIR}/../../radio/src/fonts/std ) +set(RADIO_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/../../radio/src) + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${RADIO_SRC_DIRECTORY}/../.. + ${RADIO_SRC_DIRECTORY} + ${RADIO_SRC_DIRECTORY}/fonts/std + ${RADIO_SRC_DIRECTORY}/lua/src +) set(TH9X_CHECKOUT_DIRECTORY ${PROJECT_BINARY_DIR}/firmwares/th9x) add_custom_command( @@ -109,8 +117,6 @@ add_custom_command( DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/firmwares/ersky9x/ersky9xsimulator.cpp ) -set(RADIO_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/../../radio/src) - add_custom_command( OUTPUT ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.lbm COMMAND make lbm @@ -298,8 +304,7 @@ ENDIF( ) INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ) INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ) - -SET( LANGUAGES he pl pt ru de fr it sv cs ) +SET( LANGUAGES he pl pt ru de fr it sv cs fi) FOREACH( language ${LANGUAGES} ) SET( companion_TS ${companion_TS} translations/companion_${language}.ts ) ENDFOREACH( language ) diff --git a/companion/src/burndialog.cpp b/companion/src/burndialog.cpp index f1d7f5482..bfdf0bc76 100644 --- a/companion/src/burndialog.cpp +++ b/companion/src/burndialog.cpp @@ -212,8 +212,8 @@ void burnDialog::checkFw(QString fileName) ui->SplashFrame->show(); ui->ImageLoadButton->setEnabled(true); ui->libraryButton->setEnabled(true); - ui->FwImage->setFixedSize(flash.getSplashWidth(),flash.getSplashHeight()); - ui->imageLabel->setFixedSize(flash.getSplashWidth(),flash.getSplashHeight()); + ui->FwImage->setFixedSize(flash.getSplashWidth(), flash.getSplashHeight()); + ui->imageLabel->setFixedSize(flash.getSplashWidth(), flash.getSplashHeight()); ui->FwImage->show(); ui->FwImage->setPixmap(QPixmap::fromImage(flash.getSplash())); QString ImageStr = settings.value("SplashImage", "").toString(); diff --git a/companion/src/customizesplashdialog.cpp b/companion/src/customizesplashdialog.cpp index 5e072e851..420266b7a 100644 --- a/companion/src/customizesplashdialog.cpp +++ b/companion/src/customizesplashdialog.cpp @@ -37,7 +37,7 @@ bool Side::displayImage( QString fileName, Source pictSource ) return false; else image = flash.getSplash(); - *format = flash.getSplashWidth()==WIDTH_TARANIS ? LCDTARANIS : LCD9X; + *format = (flash.getSplashWidth()==WIDTH_TARANIS ? LCDTARANIS : LCD9X); } else { image.load(fileName); diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp index 6a3806b21..bb2861cf8 100644 --- a/companion/src/eeprominterface.cpp +++ b/companion/src/eeprominterface.cpp @@ -57,8 +57,8 @@ RawSourceRange RawSource::getRange(bool singleprec) break; case TELEMETRY_SOURCE_TIMER1: case TELEMETRY_SOURCE_TIMER2: - result.step = singleprec ? 3 : 1; - result.max = singleprec ? 765 : 7200; + result.step = singleprec ? 5 : 1; + result.max = singleprec ? 255*5 : 7200; break; case TELEMETRY_SOURCE_RSSI_TX: case TELEMETRY_SOURCE_RSSI_RX: @@ -175,9 +175,9 @@ QString RawSource::toString() static const QString telemetry[] = { QObject::tr("Batt"), QObject::tr("Timer1"), QObject::tr("Timer2"), (IS_TARANIS(GetEepromInterface()->getBoard()) ? QObject::tr("SWR") : QObject::tr("Tx")), (IS_TARANIS(GetEepromInterface()->getBoard()) ? QObject::tr("RSSI") : QObject::tr("Rx")), QObject::tr("A1"), QObject::tr("A2"), QObject::tr("Alt"), QObject::tr("Rpm"), QObject::tr("Fuel"), QObject::tr("T1"), QObject::tr("T2"), QObject::tr("Speed"), QObject::tr("Dist"), QObject::tr("GPS Alt"), QObject::tr("Cell"), QObject::tr("Cels"), QObject::tr("Vfas"), QObject::tr("Curr"), - QObject::tr("Cnsp"), QObject::tr("Powr"), QObject::tr("AccX"), QObject::tr("AccY"), QObject::tr("AccZ"), QObject::tr("HDG "), QObject::tr("VSpd"), QObject::tr("A1-"), - QObject::tr("A2-"), QObject::tr("Alt-"), QObject::tr("Alt+"), QObject::tr("Rpm+"), QObject::tr("T1+"), QObject::tr("T2+"), QObject::tr("Spd+"), QObject::tr("Dst+"), - QObject::tr("Cur+"), QObject::tr("Pwr+"), QObject::tr("ACC "), QObject::tr("Time"), + QObject::tr("Cnsp"), QObject::tr("Powr"), QObject::tr("AccX"), QObject::tr("AccY"), QObject::tr("AccZ"), QObject::tr("HDG "), QObject::tr("VSpd"), QObject::tr("ASpd"), QObject::tr("dTE"), + QObject::tr("A1-"), QObject::tr("A2-"), QObject::tr("Alt-"), QObject::tr("Alt+"), QObject::tr("Rpm+"), QObject::tr("T1+"), QObject::tr("T2+"), QObject::tr("Spd+"), QObject::tr("Dst+"), QObject::tr("Cel-"), QObject::tr("Vfs-"), QObject::tr("Cur+"), QObject::tr("Pwr+"), + QObject::tr("ACC "), QObject::tr("Time"), }; static const QString virtualSwitches[] = { QObject::tr("LS1"), QObject::tr("LS2"), QObject::tr("LS3"), QObject::tr("LS4"), QObject::tr("LS5"), QObject::tr("LS6"), QObject::tr("LS7"), QObject::tr("LS8"), QObject::tr("LS9"), QObject::tr("LSA"), diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h index 4c5780b82..60f99b41a 100644 --- a/companion/src/eeprominterface.h +++ b/companion/src/eeprominterface.h @@ -198,6 +198,8 @@ enum TelemetrySource { TELEMETRY_SOURCE_ACCZ, TELEMETRY_SOURCE_HDG, TELEMETRY_SOURCE_VERTICAL_SPEED, + TELEMETRY_SOURCE_ASPD, + TELEMETRY_SOURCE_DTE, TELEMETRY_SOURCE_A1_MIN, TELEMETRY_SOURCE_A2_MIN, TELEMETRY_SOURCE_ALT_MIN, @@ -207,7 +209,8 @@ enum TelemetrySource { TELEMETRY_SOURCE_T2_MAX, TELEMETRY_SOURCE_SPEED_MAX, TELEMETRY_SOURCE_DIST_MAX, - TELEMETRY_SOURCE_CURRENT_MAX, + TELEMETRY_SOURCE_CELL_MIN, + TELEMETRY_SOURCE_VFAS_MIN, TELEMETRY_SOURCE_POWER_MAX, TELEMETRY_SOURCE_ACC, TELEMETRY_SOURCE_GPS_TIME, @@ -853,6 +856,17 @@ class ModuleData { void clear() { memset(this, 0, sizeof(ModuleData)); } }; +#define C9X_MAX_SCRIPTS 3 +#define C9X_MAX_SCRIPT_INPUTS 10 +class ScriptData { + public: + ScriptData() { clear(); } + char filename[10+1]; + char name[10+1]; + int inputs[C9X_MAX_SCRIPT_INPUTS]; + void clear() { memset(this, 0, sizeof(ScriptData)); } +}; + class ModelData { public: ModelData(); @@ -907,6 +921,8 @@ class ModelData { ModuleData moduleData[C9X_NUM_MODULES+1/*trainer*/]; + ScriptData scriptData[C9X_MAX_SCRIPTS]; + void clear(); bool isempty(); void setDefault(uint8_t id); diff --git a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp index fbd65c564..266dd8c7f 100644 --- a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp +++ b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp @@ -49,7 +49,8 @@ #define PPM_CENTER_ADJUSTABLE #define PPM_LIMITS_SYMETRICAL #define FAI_CHOICE - +#define LUA +#define LUA_MODEL_SCRIPTS #define EEPROM_VARIANT 3 #undef min @@ -115,6 +116,36 @@ inline int geteepromsize() { #include "radio/src/translations/tts_pt.cpp" #include "radio/src/translations/tts_sk.cpp" #include "radio/src/translations/tts_pl.cpp" + +#include "radio/src/lua.cpp" +#include "radio/src/lua/src/lapi.c" +#include "radio/src/lua/src/lcode.c" +#include "radio/src/lua/src/lctype.c" +#include "radio/src/lua/src/ldebug.c" +#include "radio/src/lua/src/ldo.c" +#include "radio/src/lua/src/ldump.c" +#include "radio/src/lua/src/lfunc.c" +#include "radio/src/lua/src/lgc.c" +#include "radio/src/lua/src/llex.c" +#include "radio/src/lua/src/lmem.c" +#include "radio/src/lua/src/lobject.c" +#include "radio/src/lua/src/lopcodes.c" +#include "radio/src/lua/src/lparser.c" +#include "radio/src/lua/src/lstate.c" +#include "radio/src/lua/src/lstring.c" +#include "radio/src/lua/src/ltable.c" +#include "radio/src/lua/src/ltm.c" +#include "radio/src/lua/src/lundump.c" +#include "radio/src/lua/src/lvm.c" +#include "radio/src/lua/src/lzio.c" +#include "radio/src/lua/src/lbaselib.c" +#include "radio/src/lua/src/linit.c" +#include "radio/src/lua/src/lmathlib.c" +#include "radio/src/lua/src/loadlib.c" +#include "radio/src/lua/src/lauxlib.c" +#include "radio/src/lua/src/ltablib.c" +#include "radio/src/lua/src/lcorolib.c" + int16_t g_anas[NUM_STICKS+BOARD_X9D_NUM_POTS]; diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp index 320378fc5..92b5c4b3e 100644 --- a/companion/src/firmwares/opentx/opentxeeprom.cpp +++ b/companion/src/firmwares/opentx/opentxeeprom.cpp @@ -235,8 +235,13 @@ class SourcesConversionTable: public ConversionTable { if (afterrelease21March2013) addConversion(RawSource(SOURCE_TYPE_TELEMETRY, 0), val++); - for (int i=1; i= 216) { - // TODO ScriptData scriptsData[MAX_SCRIPTS]; - internalField.Append(new SpareBitsField<720>()); - for (int i=0; i<32; i++) + for (int i=0; i<3; i++) { + ScriptData & script = modelData.scriptData[i]; + internalField.Append(new ZCharField<10>(script.filename)); + internalField.Append(new ZCharField<10>(script.name)); + for (int j=0; j<10; j++) { + internalField.Append(new SignedField<8>(script.inputs[j])); + } + } + for (int i=0; i<32; i++) { internalField.Append(new ZCharField<4>(modelData.inputNames[i])); + } internalField.Append(new UnsignedField<8>(modelData.nPotsToWarn)); for (int i=0; i < GetEepromInterface()->getCapability(Pots); i++) { internalField.Append(new SignedField<8>(modelData.potPosition[i])); - } + } } } diff --git a/companion/src/flashinterface.cpp b/companion/src/flashinterface.cpp index 86c677ef8..b72c39cbf 100644 --- a/companion/src/flashinterface.cpp +++ b/companion/src/flashinterface.cpp @@ -413,7 +413,7 @@ bool FlashInterface::setSplash(const QImage & newsplash) } } -uint FlashInterface::getSplashWidth() +int FlashInterface::getSplashWidth() { return splash_width; } diff --git a/companion/src/flashinterface.h b/companion/src/flashinterface.h index d7e6f0de9..402c2410d 100644 --- a/companion/src/flashinterface.h +++ b/companion/src/flashinterface.h @@ -59,7 +59,7 @@ public: QImage getSplash(); bool setSplash(const QImage & newsplash); bool hasSplash(); - uint getSplashWidth(); + int getSplashWidth(); uint getSplashHeight(); uint getSplashColors(); QImage::Format getSplashFormat(); diff --git a/companion/src/fwpreferencesdialog.ui b/companion/src/fwpreferencesdialog.ui index 7f4370fe7..28585c2ac 100644 --- a/companion/src/fwpreferencesdialog.ui +++ b/companion/src/fwpreferencesdialog.ui @@ -23,7 +23,7 @@ - Downloads and Profiles + Downloads diff --git a/companion/src/helpers.cpp b/companion/src/helpers.cpp index e3d98d9fa..9a9f2caf4 100644 --- a/companion/src/helpers.cpp +++ b/companion/src/helpers.cpp @@ -48,8 +48,8 @@ void populateGvSourceCB(QComboBox *b, int value) void populateVoiceLangCB(QComboBox *b, QString language) { - QString strings[] = { QObject::tr("English"), QObject::tr("French"), QObject::tr("Italian"), QObject::tr("German"), QObject::tr("Czech"), QObject::tr("Slovak"), QObject::tr("Spanish"), QObject::tr("Polish"), QObject::tr("Portuguese"), QObject::tr("Swedish"), NULL}; - QString langcode[] = { "en", "fr", "it", "de", "cz", "sk", "es", "pl", "pt", "se", NULL}; + QString strings[] = { QObject::tr("English"), QObject::tr("Finnish"), QObject::tr("French"), QObject::tr("Italian"), QObject::tr("German"), QObject::tr("Czech"), QObject::tr("Slovak"), QObject::tr("Spanish"), QObject::tr("Polish"), QObject::tr("Portuguese"), QObject::tr("Swedish"), NULL}; + QString langcode[] = { "en", "fi","fr", "it", "de", "cz", "sk", "es", "pl", "pt", "se", NULL}; b->clear(); for (int i=0; strings[i]!=NULL; i++) { diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index 5a9ec02ab..991861451 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -98,32 +98,16 @@ MainWindow::MainWindow(): MaxRecentFiles=MAX_RECENT; QSettings settings; - int icon_size=settings.value("icon_size", 1).toInt(); - switch (icon_size) { - case 0: - ISize="16"; - break; - case 1: - ISize="24"; - break; - case 2: - ISize="32"; - break; - case 3: - ISize="48"; - break; - default: - ISize="24"; - break; - } + restoreGeometry(settings.value("mainWindowGeometry").toByteArray()); createActions(); + createMenus(); createToolBars(); createStatusBar(); updateMenus(); - readSettings(); + setUnifiedTitleAndToolBarOnMac(true); this->setWindowIcon(QIcon(":/icon.png")); this->setIconSize(QSize(32,32)); @@ -161,7 +145,7 @@ MainWindow::MainWindow(): int fileType = getFileType(str); if(fileType==FILE_TYPE_HEX) { - burnToFlash(str); + writeFlash(str); } if(fileType==FILE_TYPE_EEPE || fileType==FILE_TYPE_EEPM || fileType==FILE_TYPE_BIN) { @@ -235,7 +219,7 @@ void MainWindow::checkForUpdates(bool ignoreSettings, QString & fwId) } } - if (checkCompanion9x || ignoreSettings) { + if (checkCompanion || ignoreSettings) { check2done = false; manager2 = new QNetworkAccessManager(this); connect(manager2, SIGNAL(finished(QNetworkReply*)),this, SLOT(checkForUpdateFinished(QNetworkReply*))); @@ -351,8 +335,6 @@ void MainWindow::reply1Accepted() { QString errormsg; QSettings settings; - bool autoflash=settings.value("burnFirmware", true).toBool(); - bool addversion=settings.value("rename_firmware_files", false).toBool(); settings.beginGroup("FwRevisions"); if (downloadedFWFilename.isEmpty()) { if (!(downloadedFW.isEmpty())) { @@ -437,7 +419,7 @@ void MainWindow::reply1Accepted() int pos=rev.lastIndexOf("-r"); if (pos>0) { currentFWrev=rev.mid(pos+2).toInt(); - if (addversion && needRename) { + if (settings.value("rename_firmware_files", false).toBool() && needRename) { QFileInfo fi(downloadedFWFilename); QString path=fi.path()+QDir::separator (); path.append(fi.completeBaseName()); @@ -450,10 +432,10 @@ void MainWindow::reply1Accepted() downloadedFWFilename=path; } settings.setValue(downloadedFW, currentFWrev); - if (autoflash) { + if (settings.value("burnFirmware", true).toBool()) { int ret = QMessageBox::question(this, "Companion", tr("Do you want to write the firmware to the transmitter now ?"), QMessageBox::Yes | QMessageBox::No); if (ret == QMessageBox::Yes) { - burnToFlash(downloadedFWFilename); + writeFlash(downloadedFWFilename); } } } @@ -681,7 +663,7 @@ void MainWindow::newFile() child->show(); } -void MainWindow::openDocumentURL() +void MainWindow::openDocURL() { QString link = "http://www.open-tx.org/documents.html"; QDesktopServices::openUrl(QUrl(link)); @@ -788,14 +770,14 @@ void MainWindow::loadProfile() } } -void MainWindow::appPreferences() +void MainWindow::appPrefs() { appPreferencesDialog *pd = new appPreferencesDialog(this); pd->exec(); updateMenus(); } -void MainWindow::fwPreferences() +void MainWindow::fwPrefs() { fwPreferencesDialog *pd = new fwPreferencesDialog(this); pd->exec(); @@ -858,10 +840,10 @@ void MainWindow::paste() activeMdiChild()->paste(); } -void MainWindow::burnTo() +void MainWindow::writeEeprom() { if (activeMdiChild()) - activeMdiChild()->burnTo(); + activeMdiChild()->writeEeprom(); } void MainWindow::simulate() @@ -1082,7 +1064,7 @@ QString MainWindow::FindTaranisPath() } -void MainWindow::burnFrom() +void MainWindow::readEeprom() { QString tempDir = QDir::tempPath(); QString tempFile; @@ -1123,7 +1105,7 @@ void MainWindow::burnFrom() } } -void MainWindow::burnExtenalToEEPROM() +void MainWindow::writeFileToEeprom() { QSettings settings; QString fileName; @@ -1377,7 +1359,7 @@ bool MainWindow::convertEEPROM(QString backupFile, QString restoreFile, QString return true; } -void MainWindow::burnToFlash(QString fileToFlash) +void MainWindow::writeFlash(QString fileToFlash) { QSettings settings; QString fileName; @@ -1476,7 +1458,7 @@ void MainWindow::burnToFlash(QString fileToFlash) } } -void MainWindow::burnExtenalFromEEPROM() +void MainWindow::readEepromToFile() { QSettings settings; QString fileName = QFileDialog::getSaveFileName(this, tr("Save transmitter Models and Settings to File"), settings.value("lastDir").toString(), tr(EXTERNAL_EEPROM_FILES_FILTER)); @@ -1508,7 +1490,7 @@ void MainWindow::burnExtenalFromEEPROM() } } -void MainWindow::burnFromFlash() +void MainWindow::readFlash() { QSettings settings; QString fileName = QFileDialog::getSaveFileName(this,tr("Read Tx Firmware to File"), settings.value("lastFlashDir").toString(),tr(FLASH_FILES_FILTER)); @@ -1580,11 +1562,10 @@ void MainWindow::updateMenus() saveAct->setEnabled(hasMdiChild); saveAsAct->setEnabled(hasMdiChild); pasteAct->setEnabled(hasMdiChild ? activeMdiChild()->hasPasteData() : false); - burnToAct->setEnabled(hasMdiChild); + writeEepromAct->setEnabled(hasMdiChild); separatorAct->setVisible(hasMdiChild); - bool hasSelection = (activeMdiChild() && - activeMdiChild()->hasSelection()); + bool hasSelection = (activeMdiChild() && activeMdiChild()->hasSelection()); cutAct->setEnabled(hasSelection); copyAct->setEnabled(hasSelection); simulateAct->setEnabled(hasSelection); @@ -1593,6 +1574,9 @@ void MainWindow::updateMenus() compareAct->setEnabled(activeMdiChild()); updateRecentFileActions(); updateProfilesActions(); + updateLanguageActions(); + updateIconSizeActions(); + updateIconThemeActions(); QSettings settings; setWindowTitle(tr("OpenTX Companion - FW: %1 - Profile: %2").arg(GetCurrentFirmware()->name).arg(settings.value("profileId").toString())); @@ -1613,152 +1597,39 @@ MdiChild *MainWindow::createMdiChild() return child; } +QAction * MainWindow::addAct(QString icon, QString sName, QString lName, QKeySequence::StandardKey shortcut, const char *slot) +{ + QAction * newAction = new QAction( this ); + if (!icon.isEmpty()) + newAction->setIcon(CompanionIcon(icon)); + if (!sName.isEmpty()) + newAction->setText(sName); + if (!lName.isEmpty()) + newAction->setStatusTip(lName); + if (shortcut != 0) + newAction->setShortcuts(shortcut); + connect(newAction, SIGNAL(triggered()), this, slot); + return newAction; +} + +QAction * MainWindow::addAct(QString icon, QString sName, QString lName, const char *slot) +{ + return addAct(icon, sName, lName, QKeySequence::UnknownKey, slot); +} + +QAction * MainWindow::addAct(QActionGroup *aGroup, QString sName, QString lName, const char *slot) +{ + QAction *action = addAct("", sName, lName, QKeySequence::UnknownKey, slot); + action->setCheckable(true); + aGroup->addAction(action); + return action; +} + void MainWindow::createActions() { - newAct = new QAction(CompanionIcon("new.png"), tr("&New"), this); - newAct->setShortcuts(QKeySequence::New); - newAct->setStatusTip(tr("Create a new file")); - connect(newAct, SIGNAL(triggered()), this, SLOT(newFile())); - - openAct = new QAction(CompanionIcon("open.png"), tr("&Open..."), this); - openAct->setShortcuts(QKeySequence::Open); - openAct->setStatusTip(tr("Open an existing file")); - connect(openAct, SIGNAL(triggered()), this, SLOT(openFile())); - - loadbackupAct = new QAction(CompanionIcon("open.png"), tr("&loadBackup..."), this); - loadbackupAct->setStatusTip(tr("Load backup from file")); - connect(loadbackupAct, SIGNAL(triggered()), this, SLOT(loadBackup())); - - saveAct = new QAction(CompanionIcon("save.png"), tr("&Save"), this); - saveAct->setShortcuts(QKeySequence::Save); - saveAct->setStatusTip(tr("Save the document to disk")); - connect(saveAct, SIGNAL(triggered()), this, SLOT(save())); - - saveAsAct = new QAction(CompanionIcon("saveas.png"), tr("Save &As..."), this); - saveAsAct->setShortcuts(QKeySequence::SaveAs); - saveAsAct->setStatusTip(tr("Save the document under a new name")); - connect(saveAsAct, SIGNAL(triggered()), this, SLOT(saveAs())); - - logsAct = new QAction(CompanionIcon("logs.png"), tr("Lo&gs"), this); - logsAct->setShortcut(tr("Ctrl+G")); - logsAct->setStatusTip(tr("Open log file")); - connect(logsAct, SIGNAL(triggered()), this, SLOT(logFile())); - - appPreferencesAct = new QAction(CompanionIcon("apppreferences.png"), tr("&Setting..."), this); - appPreferencesAct->setStatusTip(tr("Edit Settings")); - connect(appPreferencesAct, SIGNAL(triggered()), this, SLOT(appPreferences())); - - fwPreferencesAct = new QAction(CompanionIcon("fwpreferences.png"), tr("&Downloads..."), this); - fwPreferencesAct->setStatusTip(tr("Download firmware and voice files")); - connect(fwPreferencesAct, SIGNAL(triggered()), this, SLOT(fwPreferences())); - - checkForUpdatesAct = new QAction(CompanionIcon("update.png"), tr("&Check for updates..."), this); - checkForUpdatesAct->setStatusTip(tr("Check for new version of Companion")); - connect(checkForUpdatesAct, SIGNAL(triggered()), this, SLOT(doUpdates())); - - contributorsAct = new QAction(CompanionIcon("contributors.png"), tr("Contributors &List..."), this); - contributorsAct->setStatusTip(tr("Show Companion contributors list")); - connect(contributorsAct, SIGNAL(triggered()), this, SLOT(contributors())); - - changelogAct = new QAction(CompanionIcon("changelog.png"), tr("ChangeLog..."), this); - changelogAct->setStatusTip(tr("Show Companion changelog")); - connect(changelogAct, SIGNAL(triggered()), this, SLOT(changelog())); - - fwchangelogAct = new QAction(CompanionIcon("changelog.png"), tr("Firmware ChangeLog..."), this); - fwchangelogAct->setStatusTip(tr("Show firmware changelog")); - connect(fwchangelogAct, SIGNAL(triggered()), this, SLOT(fwchangelog())); - - compareAct = new QAction(CompanionIcon("compare.png"), tr("Compare..."), this); - compareAct->setStatusTip(tr("Compare models")); - compareAct->setEnabled(false); - connect(compareAct, SIGNAL(triggered()), this, SLOT(compare())); - - customizeSplashAct = new QAction(CompanionIcon("paintbrush.png"), tr("Configure transmitter start screen..."), this); - customizeSplashAct->setStatusTip(tr("Customize the splash screen of your TX")); - connect(customizeSplashAct, SIGNAL(triggered()), this, SLOT(customizeSplash())); - - exitAct = new QAction(CompanionIcon("exit.png"), tr("E&xit"), this); - exitAct->setShortcuts(QKeySequence::Quit); - exitAct->setStatusTip(tr("Exit the application")); - connect(exitAct, SIGNAL(triggered()), qApp, SLOT(closeAllWindows())); - - cutAct = new QAction(CompanionIcon("cut.png"), tr("Cu&t"), this); - cutAct->setShortcuts(QKeySequence::Cut); - cutAct->setStatusTip(tr("Cut the current selection's contents to the " - "clipboard")); - connect(cutAct, SIGNAL(triggered()), this, SLOT(cut())); - - copyAct = new QAction(CompanionIcon("copy.png"), tr("&Copy"), this); - copyAct->setShortcuts(QKeySequence::Copy); - copyAct->setStatusTip(tr("Copy the current selection's contents to the " - "clipboard")); - connect(copyAct, SIGNAL(triggered()), this, SLOT(copy())); - - pasteAct = new QAction(CompanionIcon("paste.png"), tr("&Paste"), this); - pasteAct->setShortcuts(QKeySequence::Paste); - pasteAct->setStatusTip(tr("Paste the clipboard's contents into the current " - "selection")); - connect(pasteAct, SIGNAL(triggered()), this, SLOT(paste())); - - burnToAct = new QAction(CompanionIcon("write_eeprom.png"), tr("&Write Models and Settings To Tx"), this); - burnToAct->setShortcut(tr("Ctrl+Alt+W")); - burnToAct->setStatusTip(tr("Write Models and Settings to transmitter")); - connect(burnToAct,SIGNAL(triggered()),this,SLOT(burnTo())); - - burnFromAct = new QAction(CompanionIcon("read_eeprom.png"), tr("&Read Models and Settings From Tx"), this); - burnFromAct->setShortcut(tr("Ctrl+Alt+R")); - burnFromAct->setStatusTip(tr("Read Models and Settings from transmitter")); - connect(burnFromAct,SIGNAL(triggered()),this,SLOT(burnFrom())); - - burnToFlashAct = new QAction(CompanionIcon("write_flash.png"), tr("Write Firmware"), this); - burnToFlashAct->setStatusTip(tr("Write firmware to transmitter")); - connect(burnToFlashAct,SIGNAL(triggered()),this,SLOT(burnToFlash())); - - burnExtenalToEEPROMAct = new QAction(CompanionIcon("write_eeprom_file.png"), tr("Write Models and Settings from file to Tx"), this); - burnExtenalToEEPROMAct->setStatusTip(tr("Write Models and Settings from file to transmitter")); - connect(burnExtenalToEEPROMAct,SIGNAL(triggered()),this,SLOT(burnExtenalToEEPROM())); - - burnExtenalFromEEPROMAct = new QAction(CompanionIcon("read_eeprom_file.png"), tr("Save transmitter Models and Settings to file"), this); - burnExtenalFromEEPROMAct->setStatusTip(tr("Save the Models and Settings from the transmitter to a file")); - connect(burnExtenalFromEEPROMAct,SIGNAL(triggered()),this,SLOT(burnExtenalFromEEPROM())); - - burnFromFlashAct = new QAction(CompanionIcon("read_flash.png"), tr("Read Firmware"), this); - burnFromFlashAct->setStatusTip(tr("Read firmware from transmitter")); - connect(burnFromFlashAct,SIGNAL(triggered()),this,SLOT(burnFromFlash())); - - burnConfigAct = new QAction(CompanionIcon("configure.png"), tr("&Configure connection software..."), this); - burnConfigAct->setStatusTip(tr("Configure software for reading from and writing to the transmitter")); - connect(burnConfigAct,SIGNAL(triggered()),this,SLOT(burnConfig())); - EEPROMInterface *eepromInterface = GetEepromInterface(); - if (!IS_ARM(eepromInterface->getBoard())) { - burnListAct = new QAction(CompanionIcon("list.png"), tr("&List programmers"), this); - burnListAct->setStatusTip(tr("List available programmers")); - connect(burnListAct,SIGNAL(triggered()),this,SLOT(burnList())); - - burnFusesAct = new QAction(CompanionIcon("fuses.png"), tr("&Fuses..."), this); - burnFusesAct->setStatusTip(tr("Show fuses dialog")); - connect(burnFusesAct,SIGNAL(triggered()),this,SLOT(burnFuses())); - } - - simulateAct = new QAction(CompanionIcon("simulate.png"), tr("&Simulate"), this); - simulateAct->setShortcut(tr("Alt+S")); - simulateAct->setStatusTip(tr("Simulate selected model.")); - simulateAct->setEnabled(false); - connect(simulateAct,SIGNAL(triggered()),this,SLOT(simulate())); - - printAct = new QAction(CompanionIcon("print.png"), tr("&Print"), this); - printAct->setShortcut(tr("Ctrl+P")); - printAct->setStatusTip(tr("Print current model.")); - printAct->setEnabled(false); - connect(printAct,SIGNAL(triggered()),this,SLOT(print())); - separatorAct = new QAction(this); separatorAct->setSeparator(true); - aboutAct = new QAction(CompanionIcon("information.png"), tr("&About"), this); - aboutAct->setStatusTip(tr("Show the application's About box")); - connect(aboutAct, SIGNAL(triggered()), this, SLOT(about())); - for (int i = 0; i < MaxRecentFiles; ++i) { recentFileActs[i] = new QAction(this); recentFileActs[i]->setVisible(false); @@ -1766,96 +1637,80 @@ void MainWindow::createActions() } updateRecentFileActions(); + QActionGroup *profilesAlignmentGroup = new QActionGroup(this); for (int i=0; isetVisible(false); + profileActs[i]->setCheckable(true); + profilesAlignmentGroup->addAction(profileActs[i]); connect(profileActs[i], SIGNAL(triggered()), this, SLOT(loadProfile())); } updateProfilesActions(); - createProfileAct = new QAction(tr("New Profile"), this); - createProfileAct->setStatusTip(tr("Create a new Radio Setting Profile")); - connect(createProfileAct, SIGNAL(triggered()), this, SLOT(createProfile())); - classicThemeAct = new QAction(tr("Classical"), this); - classicThemeAct->setStatusTip(tr("The classical Companion icon theme")); - connect(classicThemeAct, SIGNAL(triggered()), this, SLOT(setClassicTheme())); - newThemeAct = new QAction(tr("New"), this); - newThemeAct->setStatusTip(tr("The Companion 2.0 colored icon theme")); - connect(newThemeAct, SIGNAL(triggered()), this, SLOT(setNewTheme())); - monoThemeAct = new QAction("Monochrome",this); - monoThemeAct->setStatusTip(tr("A monochrome black icon theme")); - connect(monoThemeAct, SIGNAL(triggered()), this, SLOT(setMonochromeTheme())); - monoWhiteThemeAct = new QAction("MonoWhite",this); - monoWhiteThemeAct->setStatusTip(tr("A monochrome white icon theme")); - connect(monoWhiteThemeAct, SIGNAL(triggered()), this, SLOT(setMonoWhiteTheme())); - monoBlueThemeAct = new QAction("MonoBlue",this); - monoBlueThemeAct->setStatusTip(tr("A monochrome blue icon theme")); - connect(monoBlueThemeAct, SIGNAL(triggered()), this, SLOT(setMonoBlueTheme())); + newAct = addAct("new.png", tr("New"), tr("Create a new file"), QKeySequence::New, SLOT(newFile())); + openAct = addAct("open.png", tr("Open..."), tr("Open an existing file"), QKeySequence::Open, SLOT(openFile())); + saveAct = addAct("save.png", tr("Save..."), tr("Save the document to disk"), QKeySequence::Save, SLOT(save())); + saveAsAct = addAct("saveas.png", tr("Save As..."), tr("Save the document to disk"), QKeySequence::SaveAs, SLOT(saveAs())); + exitAct = addAct("exit.png", tr("Exit"), tr("Exit the application"), QKeySequence::Quit, SLOT(newFile())); + cutAct = addAct("cut.png", tr("Cut"), tr("Cut current selection to the clipboard"), QKeySequence::Cut, SLOT(cut())); + copyAct = addAct("copy.png", tr("Copy..."), tr("Copy current selection to the clipboard"), QKeySequence::Copy, SLOT(copy())); + pasteAct = addAct("paste.png", tr("Paste..."), tr("Paste clipboard into current selection"), QKeySequence::Paste, SLOT(paste())); + + QActionGroup *themeAlignGroup = new QActionGroup(this); + classicThemeAct = addAct( themeAlignGroup, tr("Classical"), tr("The classical Companion icon theme"), SLOT(setClassicTheme())); + newThemeAct = addAct( themeAlignGroup, tr("New"), tr("The new Companion 2 icon theme"), SLOT(setNewTheme())); + monoThemeAct = addAct( themeAlignGroup, tr("Monochrome"), tr("A monochrome black icon theme"), SLOT(setMonochromeTheme())); + monoWhiteAct = addAct( themeAlignGroup, tr("MonoWhite"), tr("A monochrome white icon theme"), SLOT(setMonoWhiteTheme())); + monoBlueAct = addAct( themeAlignGroup, tr("MonoBlue"), tr("A monochrome blue icon theme"), SLOT(setMonoBlueTheme())); - smallIconAct = new QAction(tr("Small"),this); - smallIconAct->setStatusTip(tr("Use small toolbar icons")); - connect(smallIconAct, SIGNAL(triggered()), this, SLOT(setSmallIconThemeSize())); - normalIconAct = new QAction(this); - normalIconAct->setStatusTip(tr("Use normal size toolbar icons")); - normalIconAct->setText(tr("Normal")); - connect(normalIconAct, SIGNAL(triggered()), this, SLOT(setNormalIconThemeSize())); - bigIconAct = new QAction(this); - bigIconAct->setStatusTip(tr("Use big toolbar icons")); - bigIconAct->setText(tr("Big")); - connect(bigIconAct, SIGNAL(triggered()), this, SLOT(setBigIconThemeSize())); - hugeIconAct = new QAction(this); - hugeIconAct->setStatusTip(tr("Use huge toolbar icons")); - hugeIconAct->setText(tr("Huge")); - connect(hugeIconAct, SIGNAL(triggered()), this, SLOT(setHugeIconThemeSize())); + QActionGroup *iconAlignGroup = new QActionGroup(this); + smallIconAct = addAct( iconAlignGroup, tr("Small"), tr("Use small toolbar icons"), SLOT(setSmallIconThemeSize())); + normalIconAct = addAct( iconAlignGroup, tr("Normal"), tr("Use normal size toolbar icons"), SLOT(setNormalIconThemeSize())); + bigIconAct = addAct( iconAlignGroup, tr("Big"), tr("Use big toolbar icons"), SLOT(setBigIconThemeSize())); + hugeIconAct = addAct( iconAlignGroup, tr("Huge"), tr("Use huge toolbar icons"), SLOT(setHugeIconThemeSize())); - defaultLanguageAct = new QAction(tr("System default language"),this); - defaultLanguageAct->setStatusTip(tr("Use system default language in menus")); - connect(defaultLanguageAct, SIGNAL(triggered()), this, SLOT(setDefaultLanguage())); - - czechLanguageAct = new QAction(tr("Czech"),this); - czechLanguageAct->setStatusTip(tr("Use Czech in menus")); - connect(czechLanguageAct, SIGNAL(triggered()), this, SLOT(setCZLanguage())); - - germanLanguageAct = new QAction(tr("German"),this); - germanLanguageAct->setStatusTip(tr("Use German in menus")); - connect(germanLanguageAct, SIGNAL(triggered()), this, SLOT(setDELanguage())); - - englishLanguageAct = new QAction(tr("English"),this); - englishLanguageAct->setStatusTip(tr("Use English in menus")); - connect(englishLanguageAct, SIGNAL(triggered()), this, SLOT(setENLanguage())); - - frenchLanguageAct = new QAction(tr("French"),this); - frenchLanguageAct->setStatusTip(tr("Use French in menus")); - connect(frenchLanguageAct, SIGNAL(triggered()), this, SLOT(setFRLanguage())); - - italianLanguageAct = new QAction(tr("Italian"),this); - italianLanguageAct->setStatusTip(tr("Use Italian in menus")); - connect(italianLanguageAct, SIGNAL(triggered()), this, SLOT(setITLanguage())); - - hebrewLanguageAct = new QAction(tr("Hebrew"),this); - hebrewLanguageAct->setStatusTip(tr("Use Hebrew in menus")); - connect(hebrewLanguageAct, SIGNAL(triggered()), this, SLOT(setHELanguage())); - - polishLanguageAct = new QAction(tr("Polish"),this); - polishLanguageAct->setStatusTip(tr("Use Polish in menus")); - connect(polishLanguageAct, SIGNAL(triggered()), this, SLOT(setPLLanguage())); - - portugueseLanguageAct = new QAction(tr("Portuguese"),this); - portugueseLanguageAct->setStatusTip(tr("Use Portuguese in menus")); - connect(portugueseLanguageAct, SIGNAL(triggered()), this, SLOT(setPTLanguage())); - - swedishLanguageAct = new QAction(tr("Swedish"),this); - swedishLanguageAct->setStatusTip(tr("Use Swedish in menus")); - connect(swedishLanguageAct, SIGNAL(triggered()), this, SLOT(setSELanguage())); - - russianLanguageAct = new QAction(tr("Russian"),this); - russianLanguageAct->setStatusTip(tr("Use Russian in menus")); - connect(russianLanguageAct, SIGNAL(triggered()), this, SLOT(setRULanguage())); - - openDocumentURLAct = new QAction(tr("Manuals and other Documents"),this); - openDocumentURLAct->setStatusTip(tr("Open the OpenTX document page in a web browser")); - connect(openDocumentURLAct, SIGNAL(triggered()), this, SLOT(openDocumentURL())); + QActionGroup *langAlignGroup = new QActionGroup(this); + sysLangAct = addAct( langAlignGroup, tr("System language"), tr("Use system language in menus"), SLOT(setSysLanguage())); + czechLangAct = addAct( langAlignGroup, tr("Czech"), tr("Use Czech in menus"), SLOT(setCZLanguage())); + germanLangAct = addAct( langAlignGroup, tr("German"), tr("Use German in menus"), SLOT(setDELanguage())); + englishLangAct = addAct( langAlignGroup, tr("English"), tr("Use English in menus"), SLOT(setENLanguage())); + finnishLangAct = addAct( langAlignGroup, tr("Finnish"), tr("Use Finnish in menus"), SLOT(setFILanguage())); + frenchLangAct = addAct( langAlignGroup, tr("French"), tr("Use French in menus"), SLOT(setFRLanguage())); + italianLangAct = addAct( langAlignGroup, tr("Italian"), tr("Use Italian in menus"), SLOT(setITLanguage())); + hebrewLangAct = addAct( langAlignGroup, tr("Hebrew"), tr("Use Hebrew in menus"), SLOT(setHELanguage())); + polishLangAct = addAct( langAlignGroup, tr("Polish"), tr("Use Polish in menus"), SLOT(setPLLanguage())); + portugueseLangAct = addAct( langAlignGroup, tr("Portuguese"), tr("Use Portuguese in menus"), SLOT(setPTLanguage())); + swedishLangAct = addAct( langAlignGroup, tr("Swedish"), tr("Use Swedish in menus"), SLOT(setSELanguage())); + russianLangAct = addAct( langAlignGroup, tr("Russian"), tr("Use Russian in menus"), SLOT(setRULanguage())); + aboutAct = addAct("information.png", tr("About"), tr("Show the application's About box"), SLOT(about())); + printAct = addAct("print.png", tr("Print"), tr("Print current model"), SLOT(print())); + simulateAct = addAct("simulate.png", tr("Simulate"), tr("Simulate selected model"), SLOT(simulate())); + loadbackupAct = addAct("open.png", tr("loadBackup..."), tr("Load backup from file"), SLOT(loadBackup())); + logsAct = addAct("logs.png", tr("Logs"), tr("Open log file"), SLOT(logFile())); + appPrefsAct = addAct("apppreferences.png",tr("Setting..."), tr("Edit Settings"), SLOT(appPrefs())); + fwPrefsAct = addAct("fwpreferences.png", tr("Downloads..."), tr("Download firmware and voice files"), SLOT(fwPrefs())); + checkForUpdatesAct = addAct("update.png", tr("Check for updates..."), tr("Check OpenTX and Companion updates"), SLOT(doUpdates())); + changelogAct = addAct("changelog.png", tr("ChangeLog..."), tr("Show Companion changelog"), SLOT(changelog())); + fwchangelogAct = addAct("changelog.png", tr("Firmware ChangeLog..."), tr("Show firmware changelog"), SLOT(fwchangelog())); + compareAct = addAct("compare.png", tr("Compare..."), tr("Compare models"), SLOT(compare())); + editSplashAct = addAct("paintbrush.png", tr("Edit Tx Splash Image..."),tr("edit the splash screen of your TX"), SLOT(customizeSplash())); + burnListAct = addAct("list.png", tr("List programmers"), tr("List available programmers"), SLOT(burnList())); + burnFusesAct = addAct("fuses.png", tr("Fuses..."), tr("Show fuses dialog"), SLOT(burnFuses())); + readFlashAct = addAct("read_flash.png", tr("Read Firmware"), tr("Read firmware from transmitter"), SLOT(readFlash())); + writeFlashAct = addAct("write_flash.png", tr("Write Firmware"), tr("Write firmware to transmitter"), SLOT(writeFlash())); + createProfileAct = addAct("", tr("New Profile"), tr("Create a new Radio Setting Profile"), SLOT(createProfile())); + openDocURLAct = addAct("", tr("Manuals and other Documents"), tr("Open the OpenTX document page in a web browser"), SLOT(openDocURL())); + writeEepromAct = addAct("write_eeprom.png", tr("Write Models and Settings To Tx"), tr("Write Models and Settings to transmitter"), SLOT(writeEeprom())); + readEepromAct = addAct("read_eeprom.png", tr("Read Models and Settings From Tx"), tr("Read Models and Settings from transmitter"), SLOT(readEeprom())); + burnConfigAct = addAct("configure.png", tr("Configure connection software..."), tr("Configure software for reading from and writing to the transmitter"), SLOT(burnConfig())); + writeFileToEepromAct = addAct("write_eeprom_file.png", tr("Write Models and Settings from file to Tx"), tr("Write Models and Settings from file to transmitter"), SLOT(writeFileToEeprom())); + readEepromToFileAct = addAct("read_eeprom_file.png", tr("Save Tx Models and Settings to file"), tr("Save the Models and Settings from the transmitter to a file"), SLOT(readEepromToFile())); + contributorsAct = addAct("contributors.png", tr("Contributors"), tr("A tribute to those who have contributed to OpenTX and Companion"), SLOT(contributors())); + + compareAct->setEnabled(false); + simulateAct->setEnabled(false); + printAct->setEnabled(false); } void MainWindow::createMenus() @@ -1865,8 +1720,8 @@ void MainWindow::createMenus() QMenu *languageMenu=new QMenu(tr("Set Menu Language")); QMenu *themeMenu=new QMenu(tr("Set Icon Theme")); QMenu *iconThemeSizeMenu=new QMenu(tr("Set Icon Size")); - - fileMenu = menuBar()->addMenu(tr("&File")); + + fileMenu = menuBar()->addMenu(tr("File")); fileMenu->addAction(newAct); fileMenu->addAction(openAct); fileMenu->addAction(saveAct); @@ -1882,53 +1737,55 @@ void MainWindow::createMenus() fileMenu->addAction(printAct); fileMenu->addAction(compareAct); fileMenu->addSeparator(); - fileMenu->addAction(fwPreferencesAct); + fileMenu->addAction(fwPrefsAct); fileMenu->addMenu(createProfilesMenu()); fileMenu->addAction(exitAct); - editMenu = menuBar()->addMenu(tr("&Edit")); + editMenu = menuBar()->addMenu(tr("Edit")); editMenu->addAction(cutAct); editMenu->addAction(copyAct); editMenu->addAction(pasteAct); - settingsMenu = menuBar()->addMenu(tr("&Settings")); + settingsMenu = menuBar()->addMenu(tr("Settings")); settingsMenu->addMenu(languageMenu); - languageMenu->addAction(defaultLanguageAct); - languageMenu->addAction(englishLanguageAct); - languageMenu->addAction(czechLanguageAct); - languageMenu->addAction(germanLanguageAct); - languageMenu->addAction(frenchLanguageAct); - languageMenu->addAction(hebrewLanguageAct); - languageMenu->addAction(italianLanguageAct); - languageMenu->addAction(polishLanguageAct); - languageMenu->addAction(portugueseLanguageAct); - languageMenu->addAction(swedishLanguageAct); - languageMenu->addAction(russianLanguageAct); + languageMenu->addAction(sysLangAct); + languageMenu->addAction(englishLangAct); + languageMenu->addAction(czechLangAct); + languageMenu->addAction(germanLangAct); + languageMenu->addAction(finnishLangAct); + languageMenu->addAction(frenchLangAct); + languageMenu->addAction(hebrewLangAct); + languageMenu->addAction(italianLangAct); + languageMenu->addAction(polishLangAct); + languageMenu->addAction(portugueseLangAct); + languageMenu->addAction(swedishLangAct); + languageMenu->addAction(russianLangAct); + settingsMenu->addMenu(themeMenu); themeMenu->addAction(classicThemeAct); themeMenu->addAction(newThemeAct); themeMenu->addAction(monoThemeAct); - themeMenu->addAction(monoBlueThemeAct); - themeMenu->addAction(monoWhiteThemeAct); + themeMenu->addAction(monoBlueAct); + themeMenu->addAction(monoWhiteAct); settingsMenu->addMenu(iconThemeSizeMenu); iconThemeSizeMenu->addAction(smallIconAct); iconThemeSizeMenu->addAction(normalIconAct); iconThemeSizeMenu->addAction(bigIconAct); iconThemeSizeMenu->addAction(hugeIconAct); settingsMenu->addSeparator(); - settingsMenu->addAction(appPreferencesAct); - settingsMenu->addAction(customizeSplashAct); + settingsMenu->addAction(appPrefsAct); + settingsMenu->addAction(editSplashAct); settingsMenu->addAction(burnConfigAct); - burnMenu = menuBar()->addMenu(tr("&Read/Write")); - burnMenu->addAction(burnToAct); - burnMenu->addAction(burnFromAct); + burnMenu = menuBar()->addMenu(tr("Read/Write")); + burnMenu->addAction(writeEepromAct); + burnMenu->addAction(readEepromAct); burnMenu->addSeparator(); - burnMenu->addAction(burnExtenalToEEPROMAct); - burnMenu->addAction(burnExtenalFromEEPROMAct); + burnMenu->addAction(writeFileToEepromAct); + burnMenu->addAction(readEepromToFileAct); burnMenu->addSeparator(); - burnMenu->addAction(burnToFlashAct); - burnMenu->addAction(burnFromFlashAct); + burnMenu->addAction(writeFlashAct); + burnMenu->addAction(readFlashAct); burnMenu->addSeparator(); burnMenu->addSeparator(); EEPROMInterface *eepromInterface = GetEepromInterface(); @@ -1937,13 +1794,12 @@ void MainWindow::createMenus() burnMenu->addAction(burnListAct); } menuBar()->addSeparator(); - - helpMenu = menuBar()->addMenu(tr("&Help")); + helpMenu = menuBar()->addMenu(tr("Help")); helpMenu->addSeparator(); helpMenu->addAction(checkForUpdatesAct); helpMenu->addSeparator(); helpMenu->addAction(aboutAct); - helpMenu->addAction(openDocumentURLAct); + helpMenu->addAction(openDocURLAct); helpMenu->addSeparator(); helpMenu->addAction(changelogAct); helpMenu->addAction(fwchangelogAct); @@ -2000,23 +1856,29 @@ void MainWindow::createToolBars() fileToolBar->setObjectName("File"); fileToolBar->addAction(newAct); fileToolBar->addAction(openAct); - QToolButton * recentToolButton = new QToolButton; - recentToolButton->setPopupMode(QToolButton::InstantPopup); - recentToolButton->setMenu(createRecentFileMenu()); - recentToolButton->setIcon(CompanionIcon("recentdocument.png")); - recentToolButton->setToolTip(tr("Recent Files")); + + QToolButton * recentToolButton = new QToolButton; + recentToolButton->setPopupMode(QToolButton::InstantPopup); + recentToolButton->setMenu(createRecentFileMenu()); + recentToolButton->setIcon(CompanionIcon("recentdocument.png")); + recentToolButton->setToolTip(tr("Recent Files")); + recentToolButton->setStatusTip(tr("Show a selection list of recent documents")); + fileToolBar->addWidget(recentToolButton); fileToolBar->addAction(saveAct); fileToolBar->addAction(logsAct); fileToolBar->addSeparator(); - fileToolBar->addAction(appPreferencesAct); - fileToolBar->addAction(fwPreferencesAct); - fileToolBar->addAction(customizeSplashAct); - profileButton = new QToolButton; - profileButton->setPopupMode(QToolButton::InstantPopup); - profileButton->setMenu(createProfilesMenu()); - profileButton->setIcon(CompanionIcon("profiles.png")); - profileButton->setToolTip(tr("Firmware Profiles")); + fileToolBar->addAction(appPrefsAct); + fileToolBar->addAction(fwPrefsAct); + fileToolBar->addAction(editSplashAct); + + QToolButton * profileButton = new QToolButton; + profileButton->setPopupMode(QToolButton::InstantPopup); + profileButton->setMenu(createProfilesMenu()); + profileButton->setIcon(CompanionIcon("profiles.png")); + profileButton->setToolTip(tr("Radio Profiles")); + profileButton->setStatusTip(tr("Show a selection list of radio settings profiles")); + fileToolBar->addWidget(profileButton); fileToolBar->addSeparator(); fileToolBar->addAction(simulateAct); @@ -2034,14 +1896,14 @@ void MainWindow::createToolBars() addToolBar( Qt::LeftToolBarArea, burnToolBar ); burnToolBar->setIconSize(size); burnToolBar->setObjectName("Write"); - burnToolBar->addAction(burnToAct); - burnToolBar->addAction(burnFromAct); + burnToolBar->addAction(writeEepromAct); + burnToolBar->addAction(readEepromAct); burnToolBar->addSeparator(); - burnToolBar->addAction(burnExtenalToEEPROMAct); - burnToolBar->addAction(burnExtenalFromEEPROMAct); + burnToolBar->addAction(writeFileToEepromAct); + burnToolBar->addAction(readEepromToFileAct); burnToolBar->addSeparator(); - burnToolBar->addAction(burnToFlashAct); - burnToolBar->addAction(burnFromFlashAct); + burnToolBar->addAction(writeFlashAct); + burnToolBar->addAction(readFlashAct); burnToolBar->addSeparator(); burnToolBar->addAction(burnConfigAct); @@ -2061,7 +1923,7 @@ void MainWindow::readSettings() { QSettings settings; restoreState(settings.value("mainWindowState").toByteArray()); - checkCompanion9x = settings.value("startup_check_companion", true).toBool(); + checkCompanion = settings.value("startup_check_companion", true).toBool(); checkFW = settings.value("startup_check_fw", true).toBool(); MaxRecentFiles =settings.value("history_size",10).toInt(); if (settings.value("profileId",0).toInt() == 0) @@ -2113,36 +1975,88 @@ void MainWindow::updateRecentFileActions() } for ( j = numRecentFiles; j < MaxRecentFiles; ++j) recentFileActs[j]->setVisible(false); - - // separatorAct->setVisible(numRecentFiles > 0); +} + +void MainWindow::updateIconSizeActions() +{ + QSettings settings; + int size = settings.value("icon_size","0").toInt(); + switch (size){ + case 0: smallIconAct->setChecked(true); break; + case 1: normalIconAct->setChecked(true); break; + case 2: bigIconAct->setChecked(true); break; + case 3: hugeIconAct->setChecked(true); break; + } +} + +void MainWindow::updateLanguageActions() +{ + QSettings settings; + QString langId = settings.value("locale","").toString(); + + if (langId=="") + sysLangAct->setChecked(true); + else if (langId=="cs_CZ") + czechLangAct->setChecked(true); + else if (langId=="de_DE") + germanLangAct->setChecked(true); + else if (langId=="en") + englishLangAct->setChecked(true); + else if (langId=="fi_FI") + finnishLangAct->setChecked(true); + else if (langId=="fr_FR") + frenchLangAct->setChecked(true); + else if (langId=="it_IT") + italianLangAct->setChecked(true); + else if (langId=="he_IL") + hebrewLangAct->setChecked(true); + else if (langId=="pl_PL") + polishLangAct->setChecked(true); + else if (langId=="pt_PT") + portugueseLangAct->setChecked(true); + else if (langId=="ru_RU") + russianLangAct->setChecked(true); + else if (langId=="sv_SE") + swedishLangAct->setChecked(true); +} + +void MainWindow::updateIconThemeActions() +{ + QSettings settings; + int size = settings.value("theme","1").toInt(); + switch (size){ + case 0: classicThemeAct->setChecked(true); break; + case 1: newThemeAct->setChecked(true); break; + case 2: monoWhiteAct->setChecked(true); break; + case 3: monoThemeAct->setChecked(true); break; + case 4: monoBlueAct->setChecked(true); break; + } } void MainWindow::updateProfilesActions() - { - int i; - QSettings settings; - int activeProfile = settings.value("profileId").toInt(); +{ + int i; + QSettings settings; + int activeProfile = settings.value("profileId").toInt(); - settings.beginGroup("Profiles"); - for (i=0; isetText(text); - profileActs[i]->setData(i+1); - profileActs[i]->setVisible(true); - if ((i+1) == activeProfile) - profileActs[i]->setIcon(CompanionIcon("arrow-right.png")); - else - profileActs[i]->setIcon(CompanionIcon("")); - - } else { - profileActs[i]->setVisible(false); - } - settings.endGroup(); + settings.beginGroup("Profiles"); + for (i=0; isetText(text); + profileActs[i]->setData(i+1); + profileActs[i]->setVisible(true); + if ((i+1) == activeProfile) + profileActs[i]->setChecked(true); + } + else { + profileActs[i]->setVisible(false); } + settings.endGroup(); + } } void MainWindow::createProfile() diff --git a/companion/src/mainwindow.h b/companion/src/mainwindow.h index 2881d70d0..505878ef2 100644 --- a/companion/src/mainwindow.h +++ b/companion/src/mainwindow.h @@ -81,13 +81,14 @@ public slots: void downloadLatestFW(FirmwareInfo *firmware, const QString & firmwareId); private slots: - void openDocumentURL(); + void openDocURL(); void setLanguage(QString langString); - void setDefaultLanguage() {setLanguage("");}; + void setSysLanguage() {setLanguage("");}; void setCZLanguage() {setLanguage("cs_CZ");}; void setDELanguage() {setLanguage("de_DE");}; void setENLanguage() {setLanguage("en");}; + void setFILanguage() {setLanguage("fi_FI");}; void setFRLanguage() {setLanguage("fr_FR");}; void setITLanguage() {setLanguage("it_IT");}; void setHELanguage() {setLanguage("he_IL");}; @@ -127,12 +128,12 @@ private slots: void logFile(); void copy(); void paste(); - void burnTo(); - void burnFrom(); - void burnToFlash(QString fileToFlash=""); - void burnFromFlash(); - void burnExtenalToEEPROM(); - void burnExtenalFromEEPROM(); + void writeEeprom(); + void readEeprom(); + void writeFlash(QString fileToFlash=""); + void readFlash(); + void writeFileToEeprom(); + void readEepromToFile(); void burnConfig(); void burnList(); void burnFuses(); @@ -145,8 +146,8 @@ private slots: void compare(); void print(); void loadBackup(); - void appPreferences(); - void fwPreferences(); + void appPrefs(); + void fwPrefs(); void updateMenus(); void createProfile(); MdiChild *createMdiChild(); @@ -157,12 +158,20 @@ private slots: private: void createActions(); + QAction * addAct(QString, QString, QString, QKeySequence::StandardKey, const char *); + QAction * addAct(QActionGroup *, QString, QString, const char *); + QAction * addAct(QString, QString, QString, const char *); + void createMenus(); void createToolBars(); void createStatusBar(); void readSettings(); void updateRecentFileActions(); void updateProfilesActions(); + void updateIconSizeActions(); + void updateLanguageActions(); + void updateIconThemeActions(); + int getFileType(const QString &fullFileName); QString FindTaranisPath(); QString Theme; @@ -192,12 +201,11 @@ private: QString downloadedFWFilename; downloadDialog * downloadDialog_forWait; - bool checkCompanion9x; + bool checkCompanion; bool checkFW; bool needRename; bool showcheckForUpdatesResult; int MaxRecentFiles; -// int ActiveProfile; int currentFWrev; int currentFWrev_temp; int NewFwRev; @@ -222,26 +230,26 @@ private: QAction *saveAct; QAction *saveAsAct; QAction *exitAct; - QAction *appPreferencesAct; - QAction *fwPreferencesAct; + QAction *appPrefsAct; + QAction *fwPrefsAct; QAction *checkForUpdatesAct; QAction *contributorsAct; QAction *changelogAct; QAction *fwchangelogAct; QAction *compareAct; - QAction *customizeSplashAct; + QAction *editSplashAct; QAction *cutAct; QAction *copyAct; QAction *pasteAct; - QAction *burnToAct; - QAction *burnFromAct; + QAction *writeEepromAct; + QAction *readEepromAct; QAction *burnConfigAct; QAction *burnListAct; QAction *burnFusesAct; - QAction *burnToFlashAct; - QAction *burnFromFlashAct; - QAction *burnExtenalToEEPROMAct; - QAction *burnExtenalFromEEPROMAct; + QAction *writeFlashAct; + QAction *readFlashAct; + QAction *writeFileToEepromAct; + QAction *readEepromToFileAct; QAction *simulateAct; QAction *separatorAct; QAction *aboutAct; @@ -254,26 +262,26 @@ private: QAction *classicThemeAct; QAction *newThemeAct; QAction *monoThemeAct; - QAction *monoBlueThemeAct; - QAction *monoWhiteThemeAct; + QAction *monoBlueAct; + QAction *monoWhiteAct; QAction *smallIconAct; QAction *normalIconAct; QAction *bigIconAct; QAction *hugeIconAct; - QAction *defaultLanguageAct; - QAction *englishLanguageAct; - QAction *czechLanguageAct; - QAction *germanLanguageAct; - QAction *frenchLanguageAct; - QAction *italianLanguageAct; - QAction *hebrewLanguageAct; - QAction *polishLanguageAct; - QAction *portugueseLanguageAct; - QAction *swedishLanguageAct; - QAction *russianLanguageAct; - QAction *openDocumentURLAct; + QAction *sysLangAct; + QAction *englishLangAct; + QAction *czechLangAct; + QAction *germanLangAct; + QAction *frenchLangAct; + QAction *finnishLangAct; + QAction *italianLangAct; + QAction *hebrewLangAct; + QAction *polishLangAct; + QAction *portugueseLangAct; + QAction *swedishLangAct; + QAction *russianLangAct; + QAction *openDocURLAct; QString fwToUpdate; - QToolButton * profileButton; }; #endif diff --git a/companion/src/mdichild.cpp b/companion/src/mdichild.cpp index 498e342af..97d737d09 100644 --- a/companion/src/mdichild.cpp +++ b/companion/src/mdichild.cpp @@ -506,7 +506,7 @@ QString MdiChild::strippedName(const QString &fullFileName) return QFileInfo(fullFileName).fileName(); } -void MdiChild::burnTo() // write to Tx +void MdiChild::writeEeprom() // write to Tx { QSettings settings; bool backupEnable=settings.value("backupEnable", true).toBool(); diff --git a/companion/src/mdichild.h b/companion/src/mdichild.h index ae7bbfbf4..7a18491eb 100644 --- a/companion/src/mdichild.h +++ b/companion/src/mdichild.h @@ -94,7 +94,7 @@ public slots: void cut(); void copy(); void paste(); - void burnTo(); + void writeEeprom(); void simulate(); void print(int model=-1, QString filename=""); void setModified(); diff --git a/companion/src/translations.qrc.in b/companion/src/translations.qrc.in index 792ed43c9..a23b017ea 100644 --- a/companion/src/translations.qrc.in +++ b/companion/src/translations.qrc.in @@ -1,13 +1,14 @@ - companion_fr.qm + companion_cs.qm companion_de.qm + companion_fi.qm + companion_fr.qm companion_he.qm companion_it.qm companion_pl.qm companion_pt.qm - companion_ru.qm companion_sv.qm - companion_cs.qm + companion_ru.qm diff --git a/companion/src/translations/companion_fi.ts b/companion/src/translations/companion_fi.ts new file mode 100644 index 000000000..96023cc65 --- /dev/null +++ b/companion/src/translations/companion_fi.ts @@ -0,0 +1,11084 @@ + + + + + Channels + + + Name + + + + + Offset + + + + + Min + + + + + Max + + + + + Invert + + + + + Center + + + + + Sym + + + + + Channel %1 + + + + + --- + + + + + INV + + + + + CurveGroup + + + Diff + + + + + Expo + + + + + Func + + + + + Curve + + + + + Curves + + + Form + + + + + Standard + + + + + Custom + + + + + Lines + + + + + Smooth + + + + + Curve type + + + + + Curve name + + + + + Curve %1 + + + + + %1 points + + + + + Are you sure you want to reset curve %1 ? + + + + + Editing curve %1 + + + + + Not enough free points in EEPROM to store the curve. + + + + + CustomFunctionsPanel + + + Switch + + + + + Action + + + + + Parameters + + + + + Enable + + + + + CF%1 + + + + + ON + + + + + Error + + + + + Unable to find sound file %1! + + + + + &Delete + + + + + Delete + + + + + &Copy + + + + + Ctrl+C + + + + + &Cut + + + + + Ctrl+X + + + + + &Paste + + + + + Ctrl+V + + + + + Dialog + + + Dialog + + + + + Curve type + + + + + Coefficient + + + + + Both + + + + + x>0 + + + + + x<0 + + + + + Y at X=0 + + + + + Side + + + + + Y at X=-100 + + + + + Y at X=100 + + + + + Linear + + + + + Single Expo + + + + + Symmetrical f(x)=-f(-x) + + + + + Symmetrical f(x)=f(-x) + + + + + ExpoDialog + + + The source for the mixer + + + + + Input name + + + + + Weight + + + + + + GV + + + + + Phase used by the input. + + + + + Flight modes + + + + + 0 + + + + + 1 + + + + + 2 + + + + + 3 + + + + + 4 + + + + + 5 + + + + + 6 + + + + + 7 + + + + + 8 + + + + + Switch + + + + + Switch used by the input. +If blank then the input is considered to be "ON" all the time. + + + + + Stick Side + + + + + NEG + + + + + POS + + + + + ALL + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; text-decoration: underline;">Delay ans Slow</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These values control the speed and delay of the output of the mix. </p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Delay is not zero the actuation of the mix will be delayed by the specified amount of seconds.</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Slow is not zero then the speed of the mix will be set by the value specified -&gt; the value states the number of seconds it takes to transit from -100 to 100.</p></body></html> + + + + + Scale + + + + + Include Trim + + + + + No + + + + + Yes + + + + + Curve + + + + + The curve used by the input + + + + + Source + + + + + Line name + + + + + Edit %1 + + + + + Rud + + + + + Ele + + + + + Thr + + + + + Ail + + + + + FlightMode + + + Form + + + + + Fade In + + + + + Fade Out + + + + + Name + + + + + Switch + + + + + trim1 + + + + + trim2 + + + + + trim4 + + + + + trim3 + + + + + Rud + + + + + Ele + + + + + Thr + + + + + Ail + + + + + Rotary Encoder %1 + + + + + GVAR%1 + + + + + FlightModes + + + Flight Mode %1 + + + + + (%1) + + + + + (default) + + + + + GeneralEdit + + + General Edit + + + + + Retrieve calib. and hw settings from profile + + + + + Store calib. and hw settings in selected profile + + + + + General settings used throught the transmitter. +These will be relevant for all models in the same EEPROM. + + + + + Setup + + + + + Country Code + + + + + America + + + + + Japan + + + + + Europe + + + + + MAVLink Baud Rate + + + + + Voice Language + + + + + Measurement Units + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Single Beep Every whole Minute</span></p></body></html> + + + + + Every Minute + + + + + Beeps at 30, 15, 10, and down from5 seconds + + + + + Count Down to Zero + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Flash backlight on timer beep</span></p></body></html> + + + + + Flash on beep + + + + + Beep volume + + + + + Wav volume + + + + + Vario volume + + + + + Background volume + + + + + PPMSim + + + + + 4800 Baud + + + + + 9600 Baud + + + + + 14400 Baud + + + + + 19200 Baud + + + + + 38400 Baud + + + + + 57600 Baud + + + + + 76800 Baud + + + + + 115200 Baud + + + + + Beeper Length + + + + + Pot Scrolling Enable + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">LCD Screen Contrast</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Values can be 20-45</span></p></body></html> + + + + + Haptic Length + + + + + Mode selection: + +Mode 1: + Left stick: Elevator, Rudder + Right stick: Throttle, Aileron + +Mode 2: + Left stick: Throttle, Rudder + Right stick: Elevator, Aileron + +Mode 3: + Left stick: Elevator, Aileron + Right stick: Throttle, Rudder + +Mode 4: + Left stick: Throttle, Aileron + Right stick: Elevator, Rudder + + + + + + + Mode 1 (RUD ELE THR AIL) + + + + + Mode 2 (RUD THR ELE AIL) + + + + + Mode 3 (AIL ELE THR RUD) + + + + + Mode 4 (AIL THR ELE RUD) + + + + + LCD Display Type + + + + + BackLight On Stick Move + + + + + + sec + + + + + Beeper Mode + + + + + Timeshift from UTC + + + + + RotEnc Navigation + + + + + FrSky Internal Alarm + + + + + THR + + + + + RUD + + + + + ELE + + + + + AIL + + + + + GEA + + + + + ID0 + + + + + ID1 + + + + + ID2 + + + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" text-decoration: underline;">Warnings</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These will define startup warnings.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Throttle warning - will alert if the throttle is not at idle during startup</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Switch warning - will alert if switches are not in their defaul position</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Memory warning - will alert if there's not a lot of memory left</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Silent mode warning - will alert you if the beeper is set to quiet (0)</p></body></html> + + + + + GPS Coordinates + + + + + hh° (N/S) mm' ss''.dd + + + + + NMEA + + + + + If you enable FAI, you loose the vario, the play functions, the telemetry screen. This function cannot be disabled by the radio. + + + + + Channel order + +This is used by the templated to determine which channel goes to what number output. + + + + + R E T A + + + + + R E A T + + + + + R T E A + + + + + R T A E + + + + + R A E T + + + + + R A T E + + + + + E R T A + + + + + E R A T + + + + + E T R A + + + + + E T A R + + + + + E A R T + + + + + E A T R + + + + + T R E A + + + + + T R A E + + + + + T E R A + + + + + T E A R + + + + + T A R E + + + + + T A E R + + + + + A R E T + + + + + A R T E + + + + + A E R T + + + + + A E T R + + + + + A T R E + + + + + A T E R + + + + + Show Owner Name on Splash + + + + + Speaker Pitch (spkr only) + + + + + + X-Short + + + + + + Short + + + + + + Normal + + + + + + Long + + + + + + X-Long + + + + + StickScroll + + + + + FAI Mode + + + + + Haptic Strength + + + + + Beeper + + + + + Speaker + + + + + BeeperVoice + + + + + SpeakerVoice + + + + + Show Splash Screen on Startup + + + + + Metric + + + + + Imperial + + + + + Channel Order (For Templates) + + + + + Stick Mode + + + + + Haptic Mode + + + + + Owner Name + + + + + BackLight Invert + + + + + Standard + + + + + Optrex + + + + + + Show splash screen on startup + + + + + + Quiet + + + + + Only Alarms + + + + + + No Keys + + + + + + All + + + + + + + + + + + + + + + Beeper volume + +0 - Quiet. No beeps at all. +1 - No Keys. Normal beeps but menu keys do not beep. +2 - Normal. +3 - Loud. +4 - Extra loud. + + + + + Alarms Only + + + + + If this value is not 0, any keypress will turn on the backlight and turn it off after the specified number of seconds. + + + + + Timer Beeps + + + + + BackLight Brightness + + + + + Contrast + + + + + BackLight Auto OFF after + + + + + Single + + + + + Oversample + + + + + Filter + + + + + This is the switch selectrion for turning on the backlight (if installed). + + + + + + + Bandgap Measuring Enable + + + + + Input Filter + + + + + CrossTrim + + + + + Sound Mode + + + + + BackLight Switch + + + + + Battery calibration: +This value will be added to the measured battery voltage. Use this value to calibrate the meter with an external meter. + + + + + Battery Calibration + + + + + Battery Warning + + + + + Battery warning voltage. +This is the threashhold where the battery warning sounds. + +Acceptable values are 5v..10v + + + + + Telemetry NO DATA Alarm + + + + + Readonly Unlock + + + + + Speaker Volume + + + + + If not zero will sound beeps if the transmitter has been left without inputs for the specified number of minutes. + + + + + min + + + + + Inactivity Timer + + + + + SC + + + + + SE + + + + + SA + + + + + SF + + + + + SH + + + + + SD + + + + + SB + + + + + SG + + + + + Alarm Warning + + + + + Memory Startup Warning + + + + + Trainer + + + + + Mode + + + + + Input + + + + + Weight + + + + + Switch + + + + + + PPM 1 + + + + + + + + Off + + + + + + + + += (Sum) + + + + + + + + := (Replace) + + + + + + + + chn1 + + + + + + + + chn2 + + + + + + + + chn3 + + + + + + + + chn4 + + + + + + PPM 2 + + + + + + PPM 3 + + + + + + PPM 4 + + + + + Telemetry + + + + + RSSI Alarm 1 + + + + + + ---- + + + + + + Yellow + + + + + + Orange + + + + + + Red + + + + + RSSI Alarm 2 + + + + + NO DATA Alarm + + + + + Calibration + + + + + POT 4 + + + + + POT 3 + + + + + POT 2 + + + + + POT 1 + + + + + STICK 3 + + + + + + Negative span + + + + + + Mid value + + + + + + Positive span + + + + + STICK 1 + + + + + STICK 2 + + + + + STICK 4 + + + + + Battery + + + + + v + + + + + PPM Multiplier + + + + + Current + + + + + + Pot (normal) + + + + + + Multipos Switch + + + + + S1 Type + + + + + S2 Type + + + + + If you enable FAI, you loose the vario, the play functions, the telemetry screen. +This function cannot be disabled by the radio. +Are you sure ? + + + + + + Warning + + + + + Wrong data in profile, radio calibration was not retrieved + + + + + Wrong data in profile, hw related parameters were not retrieved + + + + + Do you want to store calibration in %1 profile<br>overwriting existing calibration? + + + + + Calibration and HW parameters saved. + + + + + Heli + + + Form + + + + + Invert Elevator + + + + + Invert Aileron + + + + + Invert Collective + + + + + Invert + + + + + Off + + + + + 120 + + + + + 120X + + + + + 140 + + + + + 90 + + + + + Collective + + + + + Swash Type + + + + + Swash Ring + + + + + InputsPanel + + + + Move Up + + + + + + Ctrl+Up + + + + + + Move Down + + + + + + Ctrl+Down + + + + + Clear All Settings + + + + + Source(%1) + + + + + No Trim + + + + + Weight(%1) + + + + + Switch(%1) + + + + + Not enough available inputs! + + + + + Delete Selected Inputs? + + + + + &Add + + + + + Ctrl+A + + + + + &Edit + + + + + Enter + + + + + &Delete + + + + + Delete + + + + + &Copy + + + + + Ctrl+C + + + + + &Cut + + + + + Ctrl+X + + + + + &Paste + + + + + Ctrl+V + + + + + Du&plicate + + + + + Ctrl+U + + + + + Clear Inputs? + + + + + Really clear all the inputs? + + + + + LogicalSwitchesPanel + + + Condition + + + + + V1 + + + + + V2 + + + + + AND + + + + + Duration + + + + + Delay + + + + + + LS%1 + + + + + &Delete + + + + + Delete + + + + + &Copy + + + + + Ctrl+C + + + + + &Cut + + + + + Ctrl+X + + + + + &Paste + + + + + Ctrl+V + + + + + MainWindow + + + + + + File loaded + + + + + Display previous warning again at startup ? + + + + + Display previous message again at startup ? + + + + + Checking for updates + + + + + + + + + Unable to check for updates. + + + + + A new version of Companion is available (version %1)<br>Would you like to download it? + + + + + + + + + Save As + + + + + Executable (*.exe) + + + + + New release available + + + + + A new release of Companion is available please check the OpenTX website! + + + + + + No updates available at this time. + + + + + Would you like to launch the installer? + + + + + + + + + + + + + + + + + Error + + + + + + + + + Error opening file %1: +%2. + + + + + Firmware does not longer fit in the Tx, due to selected firmware options + + + + + Compilation server temporary failure, try later + + + + + + Compilation server too busy, try later + + + + + + Compilation server requires registration, please check OpenTX web site + + + + + + Unknown server failure, try later + + + + + Firmware does not fit in the Tx, due to selected firmware options + + + + + Compilation server termporary failure, try later + + + + + Do you want to write the firmware to the transmitter now ? + + + + + Firmware %1 does not seem to have ever been downloaded. +Version %2 is available. +Do you want to download it now ? + + + + + + Yes + + + + + + No + + + + + + Release Notes + + + + + + Do you want to download release %1 now ? + + + + + A new version of %1 firmware is available (current %2 - newer %3). +Do you want to download it now ? + + + + + Ignore this version (r%1)? + + + + + Release notes contain very important informations. Do you want to see them now ? + + + + + The selected language will be used the next time you start Companion. + + + + + + + OK + + + + + The new theme will be loaded the next time you start Companion. + + + + + The icon size will be used the next time you start Companion. + + + + + Open + + + + + + File saved + + + + + Firmware updates + + + + + Current firmware does not provide release notes informations. + + + + + Cannot write file %1: +%2. + + + + + + + + + Taranis radio not found + + + + + + + + Impossible to identify the radio on your system, please verify the eeprom disk is connected. + + + + + + + + + Read Models and Settings From Tx + + + + + Write Models and settings from %1 to the Tx? + + + + + The file %1 +has not been recognized as a valid Models and Settings file +Write anyway ? + + + + + + + Backup is impossible + + + + + + + The backup dir set in preferences does not exist + + + + + + + + + + Backup Models and Settings From Tx + + + + + Cannot check Models and Settings compatibility! Continue anyway? + + + + + + Warning + + + + + The transmitter firmware belongs to another product family, check file and preferences! + + + + + The transmitter firmware is outdated, please upgrade! + + + + + + Write Models and Settings To Tx + + + + + + Write Firmware To Tx + + + + + Conversion failed + + + + + Cannot convert Models and Settings for use with this firmware, original data will be used + + + + + Restore Models and Settings To Tx + + + + + Restore failed + + + + + Could not restore Models and Settings to TX. The models and settings data file can be found at: %1 + + + + + Firmware write failed + + + + + Could not write firmware to to transmitter. The models and settings data file can be found at: %1 + + + + + Backup failed + + + + + Cannot backup existing Models and Settings from TX. Firmware write process aborted + + + + + Save transmitter Models and Settings to File + + + + + Impossible to identify the radio on your system, please verify that the eeprom disk is connected. + + + + + Read Tx Firmware to File + + + + + OpenTX Home Page: <a href='%1'>%1</a> + + + + + The OpenTX Companion project was originally forked from <a href='%2'>eePe</a> + + + + + If you've found this program useful, please support by <a href='%1'>donating</a> + + + + + Version %1, %3 + + + + + Copyright + + + + + About Companion + Noin Companion + + + + OpenTX Companion - FW: %1 - Profile: %2 + + + + + + New + + + + + Create a new file + + + + + Open... + + + + + Open an existing file + + + + + Save... + + + + + + Save the document to disk + + + + + Save As... + + + + + Exit + + + + + Exit the application + + + + + Cut + + + + + Cut current selection to the clipboard + + + + + Copy... + + + + + Copy current selection to the clipboard + + + + + Paste... + + + + + Paste clipboard into current selection + + + + + Classical + + + + + The classical Companion icon theme + + + + + The new Companion 2 icon theme + + + + + Monochrome + + + + + A monochrome black icon theme + + + + + MonoWhite + + + + + A monochrome white icon theme + + + + + MonoBlue + + + + + A monochrome blue icon theme + + + + + Small + + + + + Use small toolbar icons + + + + + Normal + + + + + Use normal size toolbar icons + + + + + Big + + + + + Use big toolbar icons + + + + + Huge + + + + + Use huge toolbar icons + + + + + System language + + + + + Use system language in menus + + + + + Czech + + + + + Use Czech in menus + + + + + German + + + + + Use German in menus + + + + + English + + + + + Use English in menus + + + + + French + + + + + Use French in menus + + + + + Italian + + + + + Use Italian in menus + + + + + Hebrew + + + + + Use Hebrew in menus + + + + + Polish + + + + + Use Polish in menus + + + + + Portuguese + + + + + Use Portuguese in menus + + + + + Swedish + + + + + Use Swedish in menus + + + + + Russian + + + + + Use Russian in menus + + + + + About + Noin + + + + Show the application's About box + + + + + Print + + + + + Print current model + + + + + Simulate + + + + + Simulate selected model + + + + + loadBackup... + + + + + Load backup from file + + + + + Logs + + + + + Open log file + + + + + Setting... + + + + + Edit Settings + + + + + Downloads... + + + + + Download firmware and voice files + + + + + Check for updates... + + + + + Check OpenTX and Companion updates + + + + + ChangeLog... + + + + + Show Companion changelog + + + + + Firmware ChangeLog... + + + + + Show firmware changelog + + + + + Compare... + + + + + Compare models + + + + + Edit Tx Splash Image... + + + + + edit the splash screen of your TX + + + + + List programmers + + + + + List available programmers + + + + + Fuses... + + + + + Show fuses dialog + + + + + Read Firmware + + + + + Read firmware from transmitter + + + + + Write Firmware + + + + + Write firmware to transmitter + + + + + New Profile + + + + + Create a new Radio Setting Profile + + + + + Manuals and other Documents + + + + + Open the OpenTX document page in a web browser + + + + + Write Models and Settings to transmitter + + + + + Read Models and Settings from transmitter + + + + + Configure connection software... + + + + + Configure software for reading from and writing to the transmitter + + + + + Write Models and Settings from file to Tx + + + + + Write Models and Settings from file to transmitter + + + + + Save Tx Models and Settings to file + + + + + Save the Models and Settings from the transmitter to a file + + + + + Contributors + + + + + A tribute to those who have contributed to OpenTX and Companion + + + + + + Recent Files + + + + + Set Menu Language + + + + + Set Icon Theme + + + + + Set Icon Size + + + + + + File + + + + + + Edit + + + + + Settings + + + + + Read/Write + + + + + + Help + + + + + Radio Settings Profiles + + + + + Show a selection list of recent documents + + + + + Radio Profiles + + + + + Show a selection list of radio settings profiles + + + + + Write + + + + + Ready + + + + + + &%1 %2 + + + + + Unable to find file %1! + + + + + + Invalid Models and Settings File %1 + + + + + Error reading file %1: +%2. + + + + + Invalid binary Models and Settings File %1 + + + + + MdiChild + + + free bytes + + + + + + + Companion + + + + + Do you want to use model wizard? + + + + + Ask this question again ? + + + + + Editing model %1: + + + + + + + + + + + + + + + + + + + + + + + Error + + + + + + Unable to find file %1! + + + + + + + + Error opening file %1: +%2. + + + + + + Invalid EEPROM File %1 + + + + + + Error reading file %1: +%2. + + + + + Invalid binary EEPROM File %1 + + + + + + + + Save As + + + + + + + + Cannot write file %1: +%2. + + + + + + Error writing file %1: +%2. + + + + + %1 has been modified. +Do you want to save your changes? + + + + + Backup is impossible + + + + + The backup dir set in preferences does not exist + + + + + Cannot write temporary file! + + + + + + + Taranis radio not found + + + + + + + Impossible to identify the radio on your system, please verify the eeprom disk is connected. + + + + + + + Backup EEPROM From Tx + + + + + Cannot check eeprom compatibility! Continue anyway? + + + + + + Warning + + + + + Firmware in radio is of a different family of eeprom written, check file and preferences! + + + + + Firmware in flash is outdated, please upgrade! + + + + + Write EEPROM To Tx + + + + + Open + + + + + Invalid binary backup File %1 + + + + + MixerDialog + + + Dialog + + + + + Delay + + + + + Slow + + + + + Up + + + + + Down + + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; text-decoration: underline;">Delay ans Slow</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These values control the speed and delay of the output of the mix. </p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Delay is not zero the actuation of the mix will be delayed by the specified amount of seconds.</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Slow is not zero then the speed of the mix will be set by the value specified -&gt; the value states the number of seconds it takes to transit from -100 to 100.</p></body></html> + + + + + Include Trim + + + + + Offset + + + + + Weight + + + + + 0 + + + + + 1 + + + + + 2 + + + + + 3 + + + + + 4 + + + + + 5 + + + + + 6 + + + + + 7 + + + + + 8 + + + + + Name + + + + + Source + + + + + Multiplex + + + + + Warning + + + + + The curve used by the mix + + + + + Include DR/Expo + + + + + Flight modes + + + + + Switch + + + + + Mixer warning. +Setting this value will cause a beep to be emmitted when this value is active. + + + + + OFF + + + + + 1 Beep + + + + + 2 Beep + + + + + 3 Beep + + + + + No + + + + + Yes + + + + + + + GV + + + + + + + + The source for the mixer + + + + + Multiplexer + +This determines how mixer values are added. + +"+" means the value of the current mix is added to the previous mixes in the same channel. +"*" means the value of the current mix is amultiplied with the previous mixes in the same channel. +"R" means the value replaces the previous values. If the switch is off the value will be ignored. + + + + + ADD + + + + + MULTIPLY + + + + + REPLACE + + + + + Curve + + + + + Switch used by the mix. +If blank then the mix is considered to be "ON" all the time. + + + + + DEST -> X%1 + + + + + DEST -> CH%1%2 + + + + + Rud + + + + + Ele + + + + + Thr + + + + + Ail + + + + + MixesPanel + + + + Move Up + + + + + + Ctrl+Up + + + + + + Move Down + + + + + + Ctrl+Down + + + + + Clear Mixes + + + + + + + X%1 + + + + + + + CH%1%2 + + + + + Weight(%1) + + + + + Switch(%1) + + + + + No Trim + + + + + No DR/Expo + + + + + Offset(%1) + + + + + Delay(u%1:d%2) + + + + + Slow(u%1:d%2) + + + + + Warn(%1) + + + + + Not enough available mixers! + + + + + Delete Selected Mixes? + + + + + &Add + + + + + Ctrl+A + + + + + &Edit + + + + + Enter + + + + + &Delete + + + + + Delete + + + + + &Copy + + + + + Ctrl+C + + + + + &Cut + + + + + Ctrl+X + + + + + &Paste + + + + + Ctrl+V + + + + + Du&plicate + + + + + Ctrl+U + + + + + Clear Mixes? + + + + + Really clear all the mixes? + + + + + ModelEdit + + + Dialog + + + + + Simulate + + + + + Clear Curves? + + + + + Really clear all the curves? + + + + + Setup + + + + + Heli + + + + + Flight Modes + + + + + Inputs + + + + + Mixes + + + + + Channels + + + + + Logical Switches + + + + + Switch Assignment + + + + + Curves + + + + + Telemetry + + + + + ModelsListWidget + + + &Edit + + + + + &Restore from backup + + + + + &Model Wizard + + + + + &Delete + + + + + Delete + + + + + &Copy + + + + + Ctrl+C + + + + + &Cut + + + + + Ctrl+X + + + + + &Paste + + + + + Ctrl+V + + + + + D&uplicate + + + + + Ctrl+U + + + + + &Use as default + + + + + P&rint model + + + + + Alt+R + + + + + &Simulate model + + + + + Alt+S + + + + + General Settings + + + + + Delete Selected Models? + + + + + + Cannot delete default model. + + + + + Cannot cut default model. + + + + + Do you want to overwrite TX general settings? + + + + + You are pasting on an not empty model, are you sure? + + + + + No free slot available, cannot duplicate + + + + + Module + + + Form + + + + + Failsafe Mode + + + + + Start + + + + + PPM delay + + + + + usec + + + + + Negative + + + + + Positive + + + + + RX Number + + + + + Master + + + + + Slave + + + + + Polarity + + + + + Trainer Mode + + + + + mSec + + + + + PPM Frame Length + + + + + Label + + + + + + ch + + + + + Channels + + + + + Hold + + + + + Custom + + + + + No Pulses + + + + + Failsafe Positions + + + + + Protocol + + + + + ModulePanel + + + Trainer Output + + + + + Internal Radio System + + + + + External Radio Module + + + + + QObject + + + FW: %1 + + + + + Pict: %1 + + + + + Profile image + + + + + + Rud + + + + + + Ele + + + + + + Thr + + + + + + Ail + + + + + + + P1 + + + + + + + P2 + + + + + + + P3 + + + + + + S1 + + + + + + S2 + + + + + + LS + + + + + + RS + + + + + + + REa + + + + + + + REb + + + + + TrmR + + + + + TrmE + + + + + TrmT + + + + + TrmA + + + + + Batt + + + + + + + + Timer1 + + + + + + + + Timer2 + + + + + SWR + + + + + Tx + + + + + RSSI + + + + + Rx + + + + + A1 + + + + + A2 + + + + + Alt + + + + + Rpm + + + + + Fuel + + + + + T1 + + + + + T2 + + + + + Speed + + + + + Dist + + + + + GPS Alt + + + + + Cell + + + + + Cels + + + + + Vfas + + + + + Curr + + + + + Cnsp + + + + + Powr + + + + + AccX + + + + + AccY + + + + + AccZ + + + + + HDG + + + + + VSpd + + + + + ASpd + + + + + dTE + + + + + A1- + + + + + A2- + + + + + Alt- + + + + + Alt+ + + + + + Rpm+ + + + + + T1+ + + + + + T2+ + + + + + Spd+ + + + + + Dst+ + + + + + Cel- + + + + + Vfs- + + + + + Cur+ + + + + + Pwr+ + + + + + ACC + + + + + Time + + + + + + LS1 + + + + + + LS2 + + + + + + LS3 + + + + + + LS4 + + + + + + LS5 + + + + + + LS6 + + + + + + LS7 + + + + + + LS8 + + + + + + LS9 + + + + + + LSA + + + + + + LSB + + + + + + LSC + + + + + + LSD + + + + + + LSE + + + + + + LSF + + + + + + LSG + + + + + + LSH + + + + + + LSI + + + + + + LSJ + + + + + + LSK + + + + + + LSL + + + + + + LSM + + + + + + LSN + + + + + + LSO + + + + + + LSP + + + + + + LSQ + + + + + + LSR + + + + + + LSS + + + + + + LST + + + + + + LSU + + + + + + LSV + + + + + + LSW + + + + + + + + ---- + + + + + Input %1 + + + + + MAX + + + + + CYC%1 + + + + + PPM%1 + + + + + CH%1%2 + + + + + X%1 + + + + + + + GV%1 + + + + + S11 + + + + + S12 + + + + + S13 + + + + + S14 + + + + + S15 + + + + + S16 + + + + + S21 + + + + + S22 + + + + + S23 + + + + + S24 + + + + + S25 + + + + + S26 + + + + + RudTrim Left + + + + + RudTrim Right + + + + + EleTrim Down + + + + + EleTrim Up + + + + + ThrTrim Down + + + + + ThrTrim Up + + + + + AilTrim Left + + + + + AilTrim Right + + + + + + + OFF + + + + + ABS + + + + + THs + + + + + TH% + + + + + THt + + + + + + ON + + + + + ??? + + + + + Diff(%1) + + + + + Expo(%1) + + + + + Function(%1) + + + + + Curve(%1) + + + + + !Curve(%1) + + + + + + + --- + + + + + a>x + + + + + a<x + + + + + |a|>x + + + + + |a|<x + + + + + AND + + + + + OR + + + + + XOR + + + + + a=b + + + + + a!=b + + + + + a>b + + + + + a<b + + + + + a>=b + + + + + a<=b + + + + + d>=x + + + + + |d|>=x + + + + + a~x + + + + + Timer + + + + + Sticky + + + + + Stay + + + + + Unknown + + + + + STAY(%1, [%2:%3]) + + + + + STICKY(%1, %2) + + + + + TIMER(%1, %2) + + + + + Delay %1 sec + + + + + Duration %1 sec + + + + + + + + + + <font color=red><b>Inconsistent parameter</b></font> + + + + + + + All + + + + + + + Telemetry + + + + + + Value + + + + + + Decr: + + + + + + Incr: + + + + + Safety %1 + + + + + Trainer + + + + + Trainer RUD + + + + + Trainer ELE + + + + + Trainer THR + + + + + Trainer AIL + + + + + Instant Trim + + + + + Play Sound + + + + + Play Haptic + + + + + Reset + + + + + Set Timer %1 + + + + + Vario + + + + + Play Track + + + + + Play Both + + + + + Play Value + + + + + Start Logs + + + + + Volume + + + + + Backlight + + + + + Background Music + + + + + Background Music Pause + + + + + Adjust GV%1 + + + + + + No repeat + + + + + %1 sec + + + + + th9x + + + + + er9x + + + + + ersky9x + + + + + + Simultaneous usage of expo and curves is no longer supported + + + + + Simultaneous usage of expo and curves is no longer supported in open9x + + + + + openTx only accepts %1 points in all curves + + + + + + + + OpenTX on this board doesn't accept this function + + + + + + OpenTX doesn't accept this protocol + + + + + OpenTX doesn't allow this number of channels + + + + + Your radio probably uses a wrong firmware, + eeprom size is 4096 but only the first 2048 are used + + + + + + + + Warning + + + + + EEPROM saved with these warnings: + + + + + + Support for frsky telemetry mod + + + + + Support for telemetry easy board + + + + + + Support for jeti telemetry mod + + + + + + Support for receiving ardupilot data + + + + + + Support for receiving NMEA data + + + + + + Support for MAVLINK devices + + + + + Rotary Encoder use in menus navigation + + + + + + + + + Pots use in menus navigation + + + + + Possibility to enable FAI MODE at field + + + + + FAI MODE always enabled + + + + + OpenTX for 9X board + + + + + + + + + Enable heli menu and cyclic mix support + + + + + + + + + + Enable TEMPLATES menu + + + + + + + + No splash screen + + + + + + + + + + No flight modes + + + + + + + + + + Disable curves menus + + + + + + + + Support for radio modified with regular speaker + + + + + + + + + Used if you have modified your radio with voice mode + + + + + + + + Used if you have modified your radio with haptic mode + + + + + + + + + Support for DSM2 modules + + + + + + + + + + PPM center adjustment in limits + + + + + + + + + + + + PPM values displayed in us + + + + + + + + + + Global variables + + + + + + + + + + Symetrical Limits + + + + + + SmartieParts 2.2 Backlight support + + + + + + + + + + In model setup menus automatically set source by moving some of them + + + + + + + + + + In model setup menus automatically set switch by moving some of them + + + + + + + + Enable resetting values by pressing up and down at the same time + + + + + + + + + + No graphical check boxes and sliders + + + + + + + + + + Battery graph + + + + + + + + + + Don't use bold font for highlighting active items + + + + + + + + + + + + Use alternative SQT5 font + + + + + + + + Enable the throttle trace in Statistics + + + + + EEprom write progress bar + + + + + + + + + Imperial units + + + + + + No Winged Shadow How High support + + + + + + No vario support + + + + + + No GPS support + + + + + + No gauges in the custom telemetry screen + + + + + Allow compensating for offset errors in FrSky FAS current sensors + + + + + OpenTX for M128 / 9X board + + + + + + + + EEprom write Progress bar + + + + + OpenTX for 9XR + + + + + OpenTX for 9XR with M128 chip + + + + + OpenTX for Gruvin9x board / 9X + + + + + Support for SD memory card + + + + + Support of FrSky PXX protocol + + + + + Support for DSM2 modules using ppm instead of true serial + + + + + OpenTX for Sky9x board / 9X + + + + + Enable HELI menu and cyclic mix support + + + + + Use FrSky Taranis sticks in a 9X/9XR + + + + + Bluetooth interface + + + + + OpenTX for FrSky Taranis + + + + + + Disable HELI menu and cyclic mix support + + + + + + Disable TEMPLATES menu + + + + + + Disable Global variables + + + + + OpenTX for FrSky Taranis Rev4a + + + + + th9x on this board doesn't have Rotary Encoders + + + + + + FM%1 + + + + + Input%1 + + + + + Rud Trim + + + + + Ele Trim + + + + + Thr Trim + + + + + Ail Trim + + + + + Rot Enc + + + + + English + + + + + French + + + + + Italian + + + + + German + + + + + Czech + + + + + Slovak + + + + + Spanish + + + + + Polish + + + + + Portuguese + + + + + Swedish + + + + + + THR + + + + + CH%1 + + + + + No + + + + + RotEnc A + + + + + Rot Enc B + + + + + Rot Enc C + + + + + Rot Enc D + + + + + Rot Enc E + + + + + !Flight mode %1 + + + + + Flight mode %1 + + + + + Own value + + + + + Flight mode %1 value + + + + + Keys + + + + + Sticks + + + + + Keys + Sticks + + + + + + -GV%1 + + + + + Yellow + + + + + Orange + + + + + Red + + + + + Winged Shadow How High + + + + + Winged Shadow How High (not supported) + + + + + FrSky Sensor Hub + + + + + + None + + + + + Imperial + + + + + Metric + + + + + Extra Fine + + + + + Fine + + + + + Medium + + + + + Coarse + + + + + Exponential + + + + + Count Up + + + + + Count Down + + + + + %1:%2, + + + + + : %1 Channels, %2usec Delay + + + + + Flight modes(%1) + + + + + Flight mode(%1) + + + + + Rudder + + + + + Elevator + + + + + Throttle + + + + + Aileron + + + + + + + Simulator for this firmware is not yet available + + + + + Played once, not during startup + + + + + %1s + + + + + Value + + + + + Source + + + + + GVAR + + + + + Increment + + + + + Rotary Encoder + + + + + Trim disabled + + + + + Own Trim + + + + + Use Trim from Flight mode %1 + + + + + Use Trim from Flight mode %1 + Own Trim as an offset + + + + + Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next OpenTX/Companion funding model. + +We are really appreciative for that! + +The OpenTX/Companion Team. + + + + + Setup + + + Form + + + + + Model Image + + + + + Model Name + + + + + Timer2 + + + + + Timer1 + + + + + Throttle Source + + + + + Switch Warnings + + + + + Center beep + + + + + Trim Increment + + + + + Exponential + + + + + Extra Fine + + + + + Fine + + + + + Medium + + + + + Coarse + + + + + Extended Limits + + + + + Extended Trims + + + + + Display Checklist + + + + + Throttle Trim + + + + + Throttle Warning + + + + + Reverse throttle operation. +If this is checked the throttle will be reversed. Idle will be forward, trim will also be reversed and the throttle warning will be reversed as well. + + + + + + + Reverse Throttle + + + + + Pot Warnings + + + + + OFF + + + + + Manual + + + + + Auto + + + + + Telemetry + + + Form + + + + + + + + A1 + + + + + + + + A2 + + + + + RSSI + + + + + Alarm 1 + + + + + + ---- + + + + + + Yellow + + + + + + Orange + + + + + + Red + + + + + Alarm 2 + + + + + Serial Protocol + + + + + Volt source + + + + + Metric + + + + + Imperial + + + + + Current source + + + + + Protocol + + + + + NONE + + + + + + FAS + + + + + None + + + + + FrSky Sensor Hub + + + + + CEL + + + + + 2 + + + + + 3 + + + + + 4 + + + + + Units + + + + + Blades + + + + + Altimetry / Vario + + + + + Alti + + + + + Alti+ + + + + + Vario + + + + + Sink Max + + + + + Off + + + + + Climb Max + + + + + Sink Min + + + + + Climb Min + + + + + Vario source + + + + + Vario limits + + + + + Use GPS as altitude source + + + + + Display altitude in toolbar + + + + + Various + + + + + mAh count + + + + + FAS Offset + + + + + Persistent mAh + + + + + TelemetryAnalog + + + Form + + + + + Unit + + + + + Max Value + + + + + Alarm 1 + + + + + + ---- + + + + + + Yellow + + + + + + Orange + + + + + + Red + + + + + + < + + + + + + > + + + + + Alarm 2 + + + + + Min Value + + + + + Volts (V) + + + + + Amps (A) + + + + + Speed (m/s or ft/s) + + + + + Raw (-) + + + + + Speed (km/h or miles/h) + + + + + Meters (m or ft) + + + + + Temp (°) + + + + + Fuel (%) + + + + + mAmps (mA) + + + + + Range + + + + + TelemetryCustomScreen + + + Form + + + + + Custom Screen Type + + + + + Nums + + + + + Bars + + + + + Min + + + + + Source + + + + + Gauge + + + + + Max + + + + + TelemetryPanel + + + Telemetry screen %1 + + + + + Winged Shadow How High + + + + + Winged Shadow How High (not supported) + + + + + Timer + + + Form + + + + + mm:ss + + + + + Countdown + + + + + MinuteBeep + + + + + Persistent + + + + + (00:00:00) + + + + + TimerPanel + + + None + + + + + Beeps + + + + + Countdown + + + + + appPreferencesDialog + + + Edit Settings + + + + + Application Settings + + + + + Automatic Backup Folder + + + + + User Splash Screens + + + + + Include companion splashes + + + + + Only user defined splashes + + + + + Google Earth Executable + + + + + Automatic check for OpenTX firmware updates + + + + + + + + Open Folder + + + + + Find Executable + + + + + Files to keep + + + + + Splash Screen Library + + + + + Enable automatic backup before writing firmware + + + + + Automatic check for Companion updates + + + + + Offer to use wizard for new models + + + + + Show splash screen when Companion starts + + + + + Simulator Settings + + + + + Simulator BackLight + + + + + Enable + + + + + Blue + + + + + Green + + + + + Red + + + + + Orange + + + + + Yellow + + + + + Joystick + + + + + Only capture to clipboard + + + + + Calibrate + + + + + Remember simulator switch values + + + + + Simulator capture folder + + + + + Radio Settings + + + + + Mode selection: + +Mode 1: + Left stick: Elevator, Rudder + Right stick: Throttle, Aileron + +Mode 2: + Left stick: Throttle, Rudder + Right stick: Elevator, Aileron + +Mode 3: + Left stick: Elevator, Aileron + Right stick: Throttle, Rudder + +Mode 4: + Left stick: Throttle, Aileron + Right stick: Elevator, Rudder + + + + + + + Mode 1 (RUD ELE THR AIL) + + + + + Mode 2 (RUD THR ELE AIL) + + + + + Mode 3 (AIL ELE THR RUD) + + + + + Mode 4 (AIL THR ELE RUD) + + + + + Channel order + +This is used by the templated to determine which channel goes to what number output. + + + + + R E T A + + + + + R E A T + + + + + R T E A + + + + + R T A E + + + + + R A E T + + + + + R A T E + + + + + E R T A + + + + + E R A T + + + + + E T R A + + + + + E T A R + + + + + E A R T + + + + + E A T R + + + + + T R E A + + + + + T R A E + + + + + T E R A + + + + + T E A R + + + + + T A R E + + + + + T A E R + + + + + A R E T + + + + + A R T E + + + + + A E R T + + + + + A E T R + + + + + A T R E + + + + + A T E R + + + + + Default Stick Mode + + + + + Settings Profile + + + + + Splash Screen + + + + + Channel Order + + + + + Append version number to FW file name + + + + + SD Structure path + + + + + Offer to write FW to Tx after download + + + + + Remove Profile + + + + + Firmware + + + + + Select Image + + + + + Clear Image + + + + + Select your snapshot folder + + + + + + No joysticks found + + + + + Select your library folder + + + + + Select your Models and Settings backup folder + + + + + Select Google Earth executable + + + + + Select the folder replicating your SD structure + + + + + Not possible to remove profile + + + + + The default profile can not be removed. + + + + + Open Image to load + + + + + Images (%1) + + + + + avrOutputDialog + + + Dialog + + + + + Show Details + + + + + result + + + + + executable not found + + + + + + Error + + + + + Cannot open source file + + + + + Cannot write destination + + + + + Writing file: + + + + + ie: OpenTX for 9X board or OpenTX for 9XR board + + + + + ie: OpenTX for M128 / 9X board or OpenTX for 9XR board with M128 chip + + + + + ie: OpenTX for Gruvin9X board + + + + + Your radio uses a %1 CPU!!! + +Please check advanced burn options to set the correct cpu type. + + + + + Your radio uses a %1 CPU!!! + +Please select an appropriate firmware type to program it. + + + + + +You are currently using: + %1 + + + + + + Writing + + + + + + Reading + + + + + + Verifying + + + + + done - exit code %1 + + + + + done with errors + + + + + + done - SUCCESSFUL + + + + + did not finish correctly + + + + + did not finish correctly! +Do you want some help ? + + + + + Copy did not finish correctly + + + + + finished correctly + + + + + Copy finished correctly + + + + + Started + + + + + FUSES: Low=%1 High=%2 Ext=%3 + + + + + burnConfigDialog + + + Programmer Configuration + + + + + + Location of sam-ba executable + + + + + + + + The location of the AVRDUDE executable. + + + + + DFU-Util Location + + + + + Location of AVRDUDE executable + + + + + + + Use this button to browse and look for the AVRDUDE executable file. + + + + + + + Browse... + + + + + Programmer + + + + + Programmer used for communicating with the controller. +Please consult the programmer's documentation and the AVRDUDE documentation to select the appropriate programmer. + + + + + List all available programmers. + + + + + List Available + + + + + + Extra arguments that will be passed to AVRDUDE on every call + + + + + + Extra arguments used in AVRDUDE. +This can be used for providing extra information to AVRDUDE. + +Please only use this if you know what you are doing. There are no error checks and you could cripple your controller. + + + + + Extra Arguments + + + + + Show AVRDUDE help + + + + + Show Help + + + + + Communication port to the programmer. + + + + + + + Port + + + + + AVRDUDE Location + + + + + MCU + + + + + + CPU of your TX + + + + + + CPU present on your 9x radio +Should be m64 for stock radios +m2560 for v4.1 boards + + + + + SAM-BA Location + + + + + ARM MCU + + + + + sam-ba serial port + + + + + Alternate device + + + + + Use advanced controls + + + + + DFU-UTIL Configuration + + + + + SAM-BA Configuration + + + + + AVRDUDE Configuration + + + + + + + Select Location + + + + + + Companion + + + + + <b><u>WARNING!</u></b><br>This will reset the fuses of %1 to the factory settings.<br>Writing fuses can mess up your radio.<br>Do this only if you are sure they are wrong!<br>Are you sure you want to continue? + + + + + <b><u>WARNING!</u></b><br>Normally CPU type is automatically selected according to the chosen firmware.<br>If you change the CPU type the resulting eeprom could be inconsistent. + + + + + burnDialog + + + Customize Splash + + + + + Cancel + + + + + + Write to TX + + + + + <html><head/><body><p>Modify calibration parameters using settings from current profile</p></body></html> + + + + + Patch calibration setting from profile + + + + + <html><head/><body><p>Modify HW parameters using settings from current profile</p></body></html> + + + + + Patch HW setting from profile + + + + + Date & Time + + + + + SVN + + + + + Variant + + + + + + Browse for file + + + + + Allows Companion to write to older version of the firmware + + + + + Check Firmware compatibility + + + + + Backup and restore Models and Settings + + + + + Current Profile + + + + + Invert Color + + + + + Use image in settings + + + + + Substitute image in firmware + + + + + Load Image + + + + + Open Splash Library + + + + + ... + + + + + Write firmware to TX + + + + + Write Models and Settings to TX + + + + + Write Models and Settings in %1 to TX + + + + + Current profile + + + + + Open + + + + + Choose file to load Models and Settings from + + + + + + + + + + Warning + + + + + %1 is not a known firmware + + + + + Burn anyway ! + + + + + + + + + + + + + + Error + + + + + Unable to find file %1! + + + + + + + Error opening file %1: +%2. + + + + + + + Invalid binary Models and Settings File %1, Proceed anyway ? + + + + + Error reading file %1: +%2. + + + + + Open Image to load + + + + + Images (%1) + + + + + + Cannot load %1. + + + + + Cannot save customized firmware + + + + + Custom image not found + + + + + No firmware selected + + + + + Wrong radio calibration data in profile, Settings not patched + + + + + Wrong radio setting data in profile, Settings not patched + + + + + + Cannot write file %1: +%2. + + + + + Error writing file %1: +%2. + + + + + compareDialog + + + Dialog + + + + + Drag first model here + + + + + Drag second model here + + + + + Close + + + + + Print + + + + + Print to file + + + + + + No name + + + + + General Model Settings + + + + + + + Name + + + + + + EEprom Size + + + + + + Timer1 + + + + + + Timer2 + + + + + + Protocol + + + + + + Pulse Polarity + + + + + + Throttle Trim + + + + + + + + Enabled + + + + + + + + Disabled + + + + + + Throttle Expo + + + + + + Trim Increment + + + + + + Center Beep + + + + + Flight modes Settings + + + + + + Fades + + + + + + Trims + + + + + + + + + + + + Switch + + + + + + + + Flight mode name + + + + + + IN + + + + + + OUT + + + + + + + + + + + + + + FM + + + + + + Gvars + + + + + + Rot. Enc. + + + + + Limits + + + + + + + + + + + Offset + + + + + + + + + Min + + + + + + + + + Max + + + + + + + Invert + + + + + + + + + CH + + + + + + INV + + + + + + NOR + + + + + Global Variables + + + + + + GV + + + + + Expo/Dr Settings + + + + + + Weight + + + + + + + + Flight modes + + + + + + + + Flight mode + + + + + + + + DISABLED + + + + + Mixers + + + + + + noTrim + + + + + + Delay(u%1:d%2) + + + + + + Slow(u%1:d%2) + + + + + + Warn + + + + + Curves + + + + + 5 Points Curves + + + + + + + + pt %1 + + + + + + Curve + + + + + 9 Points Curves + + + + + Logical Switches + + + + + + LS + + + + + Switch Assignment + + + + + + Function + + + + + + Param + + + + + + Repeat + + + + + + Enable + + + + + CF + + + + + Telemetry Settings + + + + + + Analog + + + + + + Unit + + + + + + Scale + + + + + + + + A%1 + + + + + + Alarm 1 + + + + + + Alarm 2 + + + + + + + + Type + + + + + + + + Condition + + + + + + + + Value + + + + + + RSSI Alarm + + + + + + Custom Telemetry View + + + + + + Telemetry Bars + + + + + + Bar Number + + + + + + Source + + + + + Print Document + + + + + Select PDF output file + + + + + contributorsDialog + + + Dialog + + + + + People who have contributed to this project + + + + + Coders + + + + + Honors go to Rafal Tomczak (RadioClone), Thomas Husterer (th9x) and Erez Raviv (er9x and eePe) + + + + + Thank you all !!! + + + + + Contributors + + + + + Companion Release Notes + + + + + OpenTX Release Notes + + + + + customizeSplashDialog + + + Transmitter Splash Screen Editor + + + + + + Invert + + + + + + Open Splash Library + + + + + + + + ... + + + + + + Load Profile + + + + + + Load FW + + + + + + Load Pict + + + + + + Save + + + + + Open + + + + + + + + Error + + + + + Cannot load embedded FW image from %1. + + + + + Open Image to load + + + + + Images (%1) + + + + + Cannot load the image file %1. + + + + + Cannot load the profile image %1. + + + + + Cannot load the library image %1. + + + + + File Saved + + + + + The image was saved to the file %1 + + + + + Image Refresh Error + + + + + Failed to refresh image from file %1 + + + + + File Save Error + + + + + Failed to write image to %1 + + + + + downloadDialog + + + Downloading: + + + + + Unable to save the file %1: %2. + + + + + Companion + + + + + Download failed: %1. + + + + + fusesDialog + + + Fuses + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Reads the current fuses in the AVR controller.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Proper states for </span><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">AtMega 64 </span><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">:</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">EEPROM erase fuse not set: 0E, 81, FF</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">EEPROM erase fuse set: 0E, 89, FF</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Proper states for AtMega 2560 :</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">EEPROM erase fuse not set: D7, 11, FC</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">EEPROM erase fuse set: D7, 19, FC</span></p></body></html> + + + + + Read Fuses + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600; text-decoration: underline;">Reset Fuses</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Fuses in the AVR tell it how to behave. Pressing this button sets the fuses to the default parameters needed in the FW. These parameters are different for stock and 4.1 MB, please verify you selected the appropriate processor type in preferences.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">This button also sets the &quot;EEPROM protect&quot; Fuse.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">This prevents erasing of the EEPROM when the flash memory is written.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600; text-decoration: underline;">WARNING</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Setting fuses can lead to problems and even a total lockout from your controller. Do this only if you know what you are doing.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">When in doubt consult either the project's page or the 9xforum (http://9xforums.com/forum/)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">If you do get locked out - google lookup for &quot;dealing with Fuse Bricks&quot;.</span></p></body></html> + + + + + Reset Fuses +EEPROM - PROTECT + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600; text-decoration: underline;">Reset Fuses</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Fuses in the AVR tell it how to behave. Pressing this button sets the fuses to the default parameters needed in the </span><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">FW. These parameters are different for stock and 4.1 MB, please verify you selected the appropriate processor type in preferences.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">This button also clears the &quot;EEPROM protect&quot; Fuse.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">This causes erasing of the EEPROM when the flash memory is written.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600; text-decoration: underline;">WARNING</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Setting fuses can lead to problems and even a total lockout from your controller. Do this only if you know what you are doing.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">When in doubt consult either the project's page or the 9xforum (http://9xforums.com/forum/)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">If you do get locked out - google lookup for &quot;dealing with Fuse Bricks&quot;.</span></p></body></html> + + + + + Reset Fuses +EEPROM - DELETE + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; text-decoration: underline;">WARNING</span></p> +<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;"></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Changing the fuses can mess up your radio.</p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Proceed only if you know what you are doing.</p></body></html> + + + + + fwPreferencesDialog + + + Downloads + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CheckBox + + + + + Menu Language + + + + + Firmware Type + + + + + Check for updates + + + + + Voice Language + + + + + Set language of voice. +May be different from firmware language + + + + + Download Voice + + + + + Download FW + + + + + Options + + + + + Processor ID + + + + + FwInfo + + + + + Last downloaded release: %1 + + + + + The selected firmware has never been downloaded by Companion. + + + + + The selected firmware cannot be downloaded by Companion. + + + + + joystickDialog + + + Configure Joystick + + + + + Ch2 + + + + + + + + + + + + Not Assigned + + + + + + + + + + + + Right Vertical + + + + + + + + + + + + Right Horizontal + + + + + + + + + + + + Left Vertical + + + + + + + + + + + + Left Horizontal + + + + + + + + + + + + P1 + + + + + + + + + + + + P2 + + + + + + + + + + + + P3/LS + + + + + + + + + + + + RS + + + + + Ch1 + + + + + Ch4 + + + + + Ch6 + + + + + Ch3 + + + + + Ch5 + + + + + Ch7 + + + + + Ch8 + + + + + Instructions + + + + + Cancel + + + + + Next + + + + + Ok + + + + + Move sticks and pots in every direction making full movement +Press next when finished + + + + + + Error + + + + + Cannot open joystick. + + + + + Place sticks and pots in middle position. +Press next when done + + + + + Map joystick channels to controls using comboboxes. +Press next when done + + + + + Check inversion checkbox to get maximum at top-right position. +Press next when done + + + + + Press ok to save configuration +Press cancel to abort joystick calibration + + + + + Duplicated stick assignement + + + + + logsDialog + + + Companion Log Viewer + + + + + Filename + + + + + Open LogFile + + + + + Zoom + + + + + X + + + + + Y + + + + + Fly sessions + + + + + Telemetry logs + + + + + Time + + + + + Error + + + + + Cannot write file %1: +%2. + + + + + Select your log file + + + + + Available fields + + + + + The selected logfile contains %1 invalid lines out of %2 total lines + + + + + mdiChild + + + Simulate Tx + + + + + modelConfigDialog + + + Model Configuration Wizard + + + + + Engine + + + + + Model Type + + + + + Airplane + + + + + Helicopter + + + + + Glider + + + + + Wing + + + + + Aileron controls + + + + + No Ailerons + + + + + 1 Servo (or Y) + + + + + + + 2 Servos + + + + + Flaps controls + + + + + No Flaps + + + + + 1 Servo (or inverting Y) + + + + + Spoilers + + + + + No Spoilers/Airbrakes + + + + + 1 Servo (or Y or inverting Y) + + + + + Swash Plate + + + + + Swash plate + + + + + 90° / Fixed / Coax + + + + + 120° + + + + + 120X° + + + + + 140° + + + + + FlyBarLess + + + + + Tail + + + + + Tail controls + + + + + 1 Servo Elevator / 1 Servo Rudder + + + + + V Tail + + + + + 2 Servos Elevator / 1 Servo Rudder + + + + + Gyroscope + + + + + NoGyro + + + + + Switch control + + + + + Pot control + + + + + Channel style + + + + + Open9x Style + + + + + Futaba Style + + + + + 2 + + + + + 3 + + + + + 4 + + + + + 5 + + + + + 6 + + + + + 7 + + + + + 8 + + + + + 9 + + + + + 1 + + + + + 10 + + + + + Ele2 + + + + + Use advanced controls + + + + + Spoiler2 + + + + + Flap2 + + + + + Flap1 + + + + + Rud2 + + + + + + + + + + + AUTO + + + + + + + + + + + CH01 + + + + + + + + + + + CH02 + + + + + + + + + + + CH03 + + + + + + + + + + + CH04 + + + + + + + + + + + CH05 + + + + + + + + + + + CH06 + + + + + + + + + + + CH07 + + + + + + + + + + + CH08 + + + + + + + + + + + CH09 + + + + + + + + + + + CH10 + + + + + Ail2 + + + + + Spoiler 1 + + + + + Delta wing + + + + + + Not present + + + + + Present + + + + + Rudder + + + + + Single rudder + + + + + Dual rudder (with 2 servos) + + + + + Apply configuration ? + + + + + Apply configuration deleting existing model ? + + + + + preferencesDialog + + + + Preferences + + + + + + Simu BackLight + + + + + + Simulator capture folder + + + + + + Joystick + + + + + Remember simulator switches + + + + + + Enable + + + + + + Use clipboard only + + + + + + Calibrate + + + + + + Blue + + + + + + Green + + + + + + Red + + + + + + Orange + + + + + + Yellow + + + + + + + + + + Open Folder + + + + + + Personal splash library + + + + + + Include companion splashes + + + + + + Only user defined splashes + + + + + + Splash library behaviour + + + + + + Custom TX splash screen + + + + + + Open Image + + + + + + + + ... + + + + + + Invert Pixels + + + + + Mode selection: + +Mode 1: + Left stick: Elevator, Rudder + Right stick: Throttle, Aileron + +Mode 2: + Left stick: Throttle, Rudder + Right stick: Elevator, Aileron + +Mode 3: + Left stick: Elevator, Aileron + Right stick: Throttle, Rudder + +Mode 4: + Left stick: Throttle, Aileron + Right stick: Elevator, Rudder + + + + + + + Mode 1 (RUD ELE THR AIL) + + + + + Mode 2 (RUD THR ELE AIL) + + + + + Mode 3 (AIL ELE THR RUD) + + + + + Mode 4 (AIL THR ELE RUD) + + + + + auto backup before write + + + + + Automatic Backup Folder + + + + + Show Splash At Start + + + + + Ask use of wizard for new models + + + + + Remember switches in simulator + + + + + Channel order + +This is used by the templated to determine which channel goes to what number output. + + + + + R E T A + + + + + R E A T + + + + + R T E A + + + + + R T A E + + + + + R A E T + + + + + R A T E + + + + + E R T A + + + + + E R A T + + + + + E T R A + + + + + E T A R + + + + + E A R T + + + + + E A T R + + + + + T R E A + + + + + T R A E + + + + + T E R A + + + + + T E A R + + + + + T A R E + + + + + T A E R + + + + + A R E T + + + + + A R T E + + + + + A E R T + + + + + A E T R + + + + + A T R E + + + + + A T E R + + + + + FwInfo + + + + + Check for updates + + + + + Ask for flashing after Download + + + + + Export Profile + + + + + Save Profile + + + + + Import Profile + + + + + Profile Name + + + + + Default Stick Mode + + + + + Default Channel Order + + + + + Profile slot + + + + + Automatically add version number to the filename after download + + + + + Voice + + + + + + Download + + + + + Set language of voice. +May be different from firmware language + + + + + Language + + + + + Firmware + + + + + SD Structure path + + + + + Processor ID + + + + + Recent History Size + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CheckBox + + + + + Check for updates on startup + + + + + Check for selected Fw updates + + + + + Google Earth Executable + + + + + Find Executable + + + + + Last downloaded release: %1 + + + + + The selected firmware has never been downloaded by Companion. + + + + + The selected firmware cannot be downloaded by Companion. + + + + + Image stored in settings + + + + + + No joysticks found + + + + + Select your library folder + + + + + Select your snapshot folder + + + + + Select your Models and Settings backup folder + + + + + Select Google Earth executable + + + + + + Error + + + + + + Cannot load %1. + + + + + Select the folder replicating your SD structure + + + + + Profile name is empty, profile slot %1 will be deleted.<br>Are you sure ? + + + + + Export profile As + + + + + Profile slot is not empty, profile slot %1 will we overwritten.<br>Are you sure ? + + + + + Open Profile to import + + + + + Open Image to load + + + + + Images (%1) + + + + + printDialog + + + Dialog + + + + + Close + + + + + Print + + + + + Print to file + + + + + Setup for: + + + + + printed on: %1 + + + + + General Model Settings + + + + + + + + Name + + + + + EEprom Size + + + + + Timer1 + + + + + Timer2 + + + + + Protocol + + + + + Pulse Polarity + + + + + Throttle Trim + + + + + + + Enabled + + + + + + Disabled + + + + + Throttle Expo + + + + + Trim Increment + + + + + Center Beep + + + + + Flight modes Settings + + + + + Fades + + + + + Trims + + + + + Gvars + + + + + Rot.Enc. + + + + + + + + Switch + + + + + Flight mode name + + + + + IN + + + + + OUT + + + + + + + + FM + + + + + Expo/Dr Settings + + + + + Weight + + + + + + Flight modes + + + + + + Flight mode + + + + + + DISABLED + + + + + Mixers + + + + + + + + CH + + + + + noTrim + + + + + + + + + Offset + + + + + Delay(u%1:d%2) + + + + + Slow(u%1:d%2) + + + + + Warn + + + + + Limits + + + + + + + + Min + + + + + + + + Max + + + + + + + Invert + + + + + + + INV + + + + + + + NOR + + + + + Curves + + + + + + + Curve + + + + + pt %1 + + + + + Logical Switches + + + + + + LS + + + + + Global Variables + + + + + GV + + + + + Switch Assignments + + + + + Function + + + + + Parameter + + + + + Repeat + + + + + Telemetry Settings + + + + + + Alarm 1 + + + + + + Alarm 2 + + + + + Analog + + + + + Unit + + + + + Scale + + + + + + + + Type + + + + + + + + Condition + + + + + + + + Value + + + + + A%1 + + + + + RSSI Alarm + + + + + Frsky serial protocol + + + + + System of units + + + + + Propeller blades + + + + + + Custom Telemetry View + + + + + Telemetry Bars + + + + + Bar Number + + + + + Source + + + + + Print Document + + + + + Select PDF output file + + + + + ODF files (*.odt);;PDF Files(*.pdf);;HTML-Files (*.htm *.html);;All Files (*) + + + + + simulatorDialog + + + Companion Simulator + + + + + + + + Right Double Click to Reset + + + + + THR + + + + + RUD + + + + + ELE + + + + + AIL + + + + + + Hold X + + + + + + Fix X + + + + + + Fix Y + + + + + + Hold Y + + + + + + + + TextLabel + + + + + TRN + + + + + GEA + + + + + ID0 + + + + + ID1 + + + + + ID2 + + + + + BEEP + + + + + P1 + + + + + + + 0 % + + + + + P2 + + + + + P3 + + + + + 9x Simulator + + + + + Outputs + + + + + LS1 + + + + + LS2 + + + + + LS3 + + + + + LS4 + + + + + LS5 + + + + + LS6 + + + + + LS7 + + + + + LS8 + + + + + LS9 + + + + + LSA + + + + + LSB + + + + + LSC + + + + + LSD + + + + + LSE + + + + + LSF + + + + + LSG + + + + + LSH + + + + + LSI + + + + + LSJ + + + + + LSK + + + + + LSL + + + + + LSM + + + + + LSN + + + + + LSO + + + + + LSP + + + + + LSQ + + + + + LSR + + + + + LSS + + + + + LST + + + + + LSU + + + + + LSV + + + + + LSW + + + + + CH1 + + + + + + + + + + + + + + + + + + + + -100.1 + + + + + CH9 + + + + + CH2 + + + + + CH10 + + + + + CH3 + + + + + CH11 + + + + + CH4 + + + + + CH12 + + + + + CH5 + + + + + CH13 + + + + + CH6 + + + + + CH14 + + + + + CH7 + + + + + CH15 + + + + + CH8 + + + + + CH16 + + + + + + Warning + + + + + Joystick enabled but not configured correctly + + + + + Cannot open joystick, joystick disabled + + + + + Firmware %1 error: %2 + + + + + - Flight mode: %1(%2) + + + + + Simulating Tx (%1) + + + + + Simulating + + + + + splashLibrary + + + + ... + + + + + Splash Library - page %1 of %2 + + + + + Warning + + + + + Invalid image in library %1 + + + + + Information + + + + + No valid image found in library, check your settings + + + + + xsimulatorDialog + + + Companion Simulator + + + + + + Hold Y + + + + + + Fix Y + + + + + + Fix X + + + + + + Hold X + + + + + + SD + + + + + + SC + + + + + + + + Right Double Click to Reset + + + + + + S2 + + + + + + SG + + + + + + RS + + + + + + SH + + + + + + + + TextLabel + + + + + + S1 + + + + + + SB + + + + + + SA + + + + + + SE + + + + + + + SF + + + + + + LS + + + + + Taranis Simulator + + + + + Outputs + + + + + CH1 + + + + + + + + + + + + + + + + + + + + -100.1 + + + + + CH9 + + + + + CH2 + + + + + CH10 + + + + + CH3 + + + + + CH11 + + + + + CH4 + + + + + CH12 + + + + + CH5 + + + + + CH13 + + + + + CH6 + + + + + CH14 + + + + + CH7 + + + + + CH15 + + + + + CH8 + + + + + CH16 + + + + + LSK + + + + + LSC + + + + + LSD + + + + + LS7 + + + + + LSL + + + + + LSB + + + + + LS1 + + + + + LSH + + + + + LSG + + + + + LSE + + + + + LSF + + + + + LS8 + + + + + LS9 + + + + + LSA + + + + + LSM + + + + + LSJ + + + + + LSI + + + + + LS4 + + + + + LS5 + + + + + LS2 + + + + + LS3 + + + + + LS6 + + + + + LSN + + + + + LSO + + + + + LSP + + + + + LSQ + + + + + LSR + + + + + LSS + + + + + LST + + + + + LSU + + + + + LSV + + + + + LSW + + + + + + Warning + + + + + Joystick enabled but not configured correctly + + + + + Cannot open joystick, joystick disabled + + + + + Firmware %1 error: %2 + + + + + - Flight mode: %1(%2) + + + + + Simulating Tx (%1) + + + + + Simulating + + + + diff --git a/companion/src/translations/companion_pl.ts b/companion/src/translations/companion_pl.ts index ddf91dee7..8f9fde66b 100644 --- a/companion/src/translations/companion_pl.ts +++ b/companion/src/translations/companion_pl.ts @@ -2061,119 +2061,119 @@ Jesteś pewien ? MainWindow - - - - + + + + File loaded Plik załadowany - + Display previous warning again at startup ? Wyświetlić poprzednie ostrzeżenie przy uruchomieniu? - + Checking for updates Sprawdź aktualizacje - - - - - + + + + + Unable to check for updates. Nie mogę sprawdzić aktualizacji. - - - - - + + + + + Save As Zapisz jako - + Executable (*.exe) Wykonywalny (*.exe) - + New release available Dostępne jest nowe wydanie - - + + No updates available at this time. Brak aktualizacji dostępnych teraz. - + Would you like to launch the installer? Chcesz uruchomić instalator? - - - - - - - - - - - - - + + + + + + + + + + + + + Error Błąd - - - - - + + + + + Error opening file %1: %2. Błąd otwarcia pliku %1: %2. - + Compilation server termporary failure, try later Serwer kompilacji chwilowo nieczynny, spróbuj później - + Display previous message again at startup ? Czy ponownie wyświetlić poprzednią informację przy uruchomieniu? - + Compilation server temporary failure, try later Serwer kompilacji chwilowo nieczynny, spróbuj później - - + + Compilation server too busy, try later Serwer kompilacji zbyt zajęty, spróbuj później - - + + Unknown server failure, try later Nieznany błąd serwera, spróbuj później - + Firmware %1 does not seem to have ever been downloaded. Version %2 is available. Do you want to download it now ? @@ -2183,31 +2183,31 @@ Pobrać teraz? - - + + Yes Tak - - + + No Nie - - + + Release Notes Informacje o wydaniu - - + + Do you want to download release %1 now ? Chcesz pobrać wydanie %1 teraz? - + A new version of %1 firmware is available (current %2 - newer %3). Do you want to download it now ? Jest dostępna nowa wersja firmware %1 @@ -2215,348 +2215,434 @@ Do you want to download it now ? Chcesz pobrać teraz? - + Ignore this version (r%1)? Zignorować wersję (r%1)? - + Release notes contain very important informations. Do you want to see them now ? Opis wydania zawiera bardzo ważne informacje. Chcesz je przeczytać teraz? - - + + File saved Plik zapisany - + Firmware updates Aktualizacja firmware - + Current firmware does not provide release notes informations. Aktualny firmware nie zawiera opisu wydania. - + Cannot write file %1: %2. Nie mogę zapisać pliku %1: %2. - - - - - + + + + + Taranis radio not found Nie znaleziono Radia Taranis - - - - + + + + Impossible to identify the radio on your system, please verify the eeprom disk is connected. Identyfikacja radia niemożliwa w Twoim systemie, proszę sprawdzić podłączony dysk eeprom. - - - + + + Backup is impossible Backup jest niemożliwy do wykonania - - - + + + The backup dir set in preferences does not exist Brak ustawień ścieżki backupu - - + + Warning Ostrzeżenie - + Conversion failed Konwersja nieudana - + Restore failed Zapis nieudany - + Backup failed Backup nieudany - + Copyright - + OpenTX Companion - FW: %1 - Profile: %2 OpenTX Companion - FW: %1 - Profil: %2 - &Setting... - &Ustawienia... + &Ustawienia... - + Edit Settings Edycja Ustawień - &Downloads... - &Pobieranie... + &Pobieranie... - + Download firmware and voice files Pobierz firmware i pliki dźwiękowe - Configure transmitter start screen... - Ustawienia ekranu startowego radia... + Ustawienia ekranu startowego radia... - &Configure connection software... - &Ustawienia oprogramowania łączącego... + &Ustawienia oprogramowania łączącego... - + New Profile Nowy Profil - + Create a new Radio Setting Profile Utwórz nowy Profil Ustawień Radia - Classic - Klasyczna + Klasyczna - The multicolor classical Companion icon theme - Wielokolorowy klasyczny wygląd ikon Companion + Wielokolorowy klasyczny wygląd ikon Companion - + A monochrome black icon theme Monochromatyczny czarny wygląd ikon - + A monochrome white icon theme Monochromatyczny biały wygląd ikon - + A monochrome blue icon theme Monochromatyczny niebieski wygląd ikon - + Small Małe - + Use small toolbar icons Użyj małych ikon paska narzędzi - + Use normal size toolbar icons Użyj normalnych ikon paska narzędzi - + Normal Normalne - + Use big toolbar icons Użyj dużych ikon paska narzędzi - + Big Duże - + Use huge toolbar icons Użyj olbrzymich ikon paska narzędzi - + Huge Olbrzymie - System default language - Podstawowy język systemu + Podstawowy język systemu - Use system default language in menus - Użyj podstawowego języka systemu w menu + Użyj podstawowego języka systemu w menu - + Czech Czeski - + Use Czech in menus Użyj Czeskiego w menu - + German Niemiecki - + Use German in menus Użyj Niemieckiego w menu - + English Angielski - + Use English in menus Użyj Angielskiego w menu - + French Francuski - + Use French in menus Użyj Francuskiego w menu - + Italian Włoski - + Use Italian in menus Użyj Włoskiego w menu - + Hebrew Hebrajski - + Use Hebrew in menus Użyj Hebrajskiego w menu - + Polish Polski - + Use Polish in menus Użyj Polskiego w menu - + Portuguese Portugalski - + Use Portuguese in menus Użyj Portualskiego w menu - + Swedish Szwedzki - + Use Swedish in menus Użyj Szwedzkiego w menu - + Russian Rosyjski - + Use Russian in menus Użyj Rosyjskiego w menu - + + About + O aplikacji + + + + Print + Drukuj + + + + Print current model + Drukuj aktualny model + + + + Simulate + Symulacja + + + + Simulate selected model + Symulacja wybranego modelu + + + + loadBackup... + Załaduj backup... + + + + Logs + Logi + + + + Setting... + Ustawienia... + + + + Downloads... + Pobieranie... + + + + Check for updates... + Sprawdź aktualizacje... + + + + Check OpenTX and Companion updates + Sprawdź aktualizacje OpenTX i Companion + + + + Edit Tx Splash Image... + Edytor erkanu startowego radia... + + + + edit the splash screen of your TX + Edytuj ekran startowy swojego radia + + + + List programmers + Lista programatorów + + + + Fuses... + Bezpieczniki... + + + Manuals and other Documents Podręcznik i dokumentacja - + Open the OpenTX document page in a web browser Otwórz stronę dokumentacji OpenTX w przeglądarce - + + Configure connection software... + Ustawienia oprogramowania łączącego... + + + + Save Tx Models and Settings to file + Zapisz modele radia i ustawienia do pliku + + + + Contributors + Współpracownicy + + + + A tribute to those who have contributed to OpenTX and Companion + Hołd dla tych, którzy przyczynili się do rozwoju OpenTX i Companion + + + Set Icon Theme Ustaw wygląd ikon - + Set Icon Size Ustaw wielkość ikon - &Settings - &Ustawienia + &Ustawienia - + Radio Settings Profiles Profile Ustawień Radia - - + + &%1 %2 @@ -2569,78 +2655,79 @@ Chcesz pobrać teraz? Companion - Edytor Modeli i Ustawień - %1 - + A new version of Companion is available (version %1)<br>Would you like to download it? Dostępna jest nowy Companion (wersja %1)<br>Chcesz ją pobrać ? - + A new release of Companion is available please check the OpenTX website! Nowe wydanie Companion jest dostępne, proszę sprawdzić stronę OpenTX! - + Firmware does not longer fit in the Tx, due to selected firmware options Firmware już nie mieści się w pamięci radia ze względu na wybrane parametry - - + + Compilation server requires registration, please check OpenTX web site Serwer kompilacji wymaga rejestracji, proszę odwiedzić stronę OpenTX - + Firmware does not fit in the Tx, due to selected firmware options Firmware już nie mieści się w pamięci radia ze względu na wybrane parametry - + Do you want to write the firmware to the transmitter now ? Chcesz wgrać firmware do radia teraz? - + The selected language will be used the next time you start Companion. Wybrany język będzie użyty po ponownym uruchomieniu Comapnion. - - - + + + OK OK - + The new theme will be loaded the next time you start Companion. Wybrany wygląd będzie użyty po ponownym uruchomieniu Comapnion. - + The icon size will be used the next time you start Companion. Wybrana wiekość ikon będzie użyta po ponownym uruchomieniu Comapnion. - + Open Otwórz - - - - + + + + + Read Models and Settings From Tx Wczytaj Modele i Ustawienia z radia - + Write Models and settings from %1 to the Tx? Czy zapisać Modele i Ustawienia z %1 do radia ? - + The file %1 has not been recognized as a valid Models and Settings file Write anyway ? @@ -2649,173 +2736,163 @@ nie został rozpoznany jako prawidłowy pli Modeli i Ustawień. Czy mimo wszystko zapisać? - - - - - - + + + + + + Backup Models and Settings From Tx Zbakupuj Modele i Ustawienia z radia - + Cannot check Models and Settings compatibility! Continue anyway? Nie mogę potwierdzić kompatybilności Modeli i Ustawień. Kontynuować? - + The transmitter firmware belongs to another product family, check file and preferences! Firmwqare radia nalezy do innej rodziny produktów, sprawdź plik i preferencje ! - + The transmitter firmware is outdated, please upgrade! Firmware radia jest przestarzały, proszę zaktualizować! - + + Write Models and Settings To Tx Zapisz Modele i Ustawienia do radia - - + + Write Firmware To Tx Zapisz firmware do radia - + Cannot convert Models and Settings for use with this firmware, original data will be used Nie mogę skonwertować Modeli i Ustawień na ten rodzaj firmware, zostaną użyte oryginalne dane - + Restore Models and Settings To Tx Odtwórz Modele i Ustawienia do radia - + Could not restore Models and Settings to TX. The models and settings data file can be found at: %1 Nie mogę odtworzyć Modeli i Ustawień do radia. Plik modeli i ustawień mozna znaleźć w: %1 - + Firmware write failed Zapis firmawe nie powiódł się - + Could not write firmware to to transmitter. The models and settings data file can be found at: %1 Nie mogę zapisać Firmware do radia. Plik modeli i ustawień mozna znaleźć w: %1 - + Cannot backup existing Models and Settings from TX. Firmware write process aborted Nie mogę zbackupować Modeli i Ustawień z radia, Zapis Firmawe przerwany - + Save transmitter Models and Settings to File Zapisz Modele i Ustawienia z radia do pliku - + Impossible to identify the radio on your system, please verify that the eeprom disk is connected. Identyfikacja radia niemożliwa w Twoim systemie, proszę sprawdzić podłączony dysk eeprom. - + Read Tx Firmware to File Odczytaj firmware z radia do pliku - + OpenTX Home Page: <a href='%1'>%1</a> Strona domowa OpenTX: <a href='%1'>%1</a> - + The OpenTX Companion project was originally forked from <a href='%2'>eePe</a> Projekt Companion odłączony z oryginalnego <a href='%2'>eePe</a> - + If you've found this program useful, please support by <a href='%1'>donating</a> Jeśli uważasz, że ten program jest użyteczny, wesprzyj poprzez <a href='%1'>donację</a> - + Version %1, %3 Wersja %1, %3 - + About Companion O aplikacji Companion - &New - &Nowy + &Nowy - + Create a new file Utwórz nowy plik - &Open... - &Otwórz... + &Otwórz... - + Open an existing file Otwórz istniejący plik - &loadBackup... - &Załaduj backup... + &Załaduj backup... - + Load backup from file Załaduj backup z pliku - &Save - &Zapisz + &Zapisz - + + Save the document to disk Zapisz dokument na dysku - Save &As... - Zapisz j&ako... + Zapisz j&ako... - Save the document under a new name - Zapisz dokument pod nową nazwą + Zapisz dokument pod nową nazwą - Lo&gs - Lo&gi + Lo&gi - - Ctrl+G - - - - + Open log file Otwórz plik logów @@ -2828,115 +2905,187 @@ Czy mimo wszystko zapisać? Pobrania plików Firmware i głosów jak również definicje profili. - &Check for updates... - &Sprawdź aktualizacje... + &Sprawdź aktualizacje... - Check for new version of Companion - Sprawdź nową wersję Companion + Sprawdź nową wersję Companion - Show Companion contributors list - Pokaz listę twórców Companion + Pokaz listę twórców Companion - + Show Companion changelog Zobacz zmiany w Companion - &Write Models and Settings To Tx - &Zapisz Modele i Ustawienia do radia + &Zapisz Modele i Ustawienia do radia - + Write Models and Settings to transmitter Zapisz Modele i Ustawienia do radia - &Read Models and Settings From Tx - &Wczytaj Modele i Ustawienia z radia + &Wczytaj Modele i Ustawienia z radia - + Read Models and Settings from transmitter Wczytaj Modele i Ustawienia z radia - + Write Firmware Zapisz firmware - + + Open... + Otwórz... + + + + Save... + Zapisz... + + + + Save As... + Zapisz jako... + + + + Exit + Zakończ + + + + Cut + Wytnij + + + + Cut current selection to the clipboard + Wytnij zaznaczenie do schowka + + + + Copy... + Kopiuj... + + + + Copy current selection to the clipboard + Wytnij zaznaczenie do schowka + + + + Paste... + Wklej... + + + + Paste clipboard into current selection + Wytnij zaznaczenie do schowka + + + + The new Companion 2 icon theme + Nowy zestaw ikon Companion 2 + + + + Monochrome + Monochromatyczny + + + + MonoWhite + MonoBiały + + + + MonoBlue + MonoNiebieski + + + + System language + Język systemu + + + + Use system language in menus + Użyj języka systemu w menu + + + Write firmware to transmitter Zapisz firmware do radia - + Write Models and Settings from file to Tx Zapisz Modele i Ustawienia z pliku do radia - + Write Models and Settings from file to transmitter Zapisz Modele i Ustawienia z pliku do radia - Save transmitter Models and Settings to file - Zapisz Modele i Ustawienia do pliku + Zapisz Modele i Ustawienia do pliku - + Save the Models and Settings from the transmitter to a file Zapisz Modele i Ustawienia z radia do pliku - + Read Firmware Wczytaj Firmware - + Read firmware from transmitter Wczytaj Firmware z radia - + Configure software for reading from and writing to the transmitter Ustawienia oprogramowania do odczytu i zapisu radia - &Read/Write - &Odczyt/Zapis + &Odczyt/Zapis - + Write Zapis - - + + Invalid Models and Settings File %1 Błędny plik %1 Modeli i Ustawień - + Invalid binary Models and Settings File %1 Błędny binarny plik %1 Modeli i Ustawień - Contributors &List... - &Lista twórców... + &Lista twórców... &Old Preferences Dialog... @@ -2955,203 +3104,212 @@ Czy mimo wszystko zapisać? Edycja preferencji aplikacji - + ChangeLog... Zmiany... - + Firmware ChangeLog... Zmiany firmware... - + Show firmware changelog Zobacz zmiany w firmware - + Compare... Porównaj... - + Compare models Porównaj modele - Customize the splash screen of your TX - Personalizuj obrazek na swoim radiu + Personalizuj obrazek na swoim radiu - E&xit - Za&kończ + Za&kończ - + Exit the application Zakończ aplikację companion9x - Cu&t - &Wytnij + &Wytnij - Cut the current selection's contents to the clipboard - Wytnij zaznaczenie do schowka + Wytnij zaznaczenie do schowka - &Copy - &Kopiuj + &Kopiuj - Copy the current selection's contents to the clipboard - Kopiuj zaznaczenie do schowka + Kopiuj zaznaczenie do schowka + + + &Paste + &Wklej + + + Paste the clipboard's contents into the current selection + Wklej zawartość schowka na aktualnej pozycji + + + &List programmers + &Lista programatorów - &Paste - &Wklej - - - - Paste the clipboard's contents into the current selection - Wklej zawartość schowka na aktualnej pozycji - - - - Ctrl+Alt+W - - - - - Ctrl+Alt+R - - - - - &List programmers - &Lista programatorów - - - List available programmers Lista dostępnych programatorów - &Fuses... - Ustawienia &mikro-kontrolera... + Ustawienia &mikro-kontrolera... - + Show fuses dialog Pokaż okno ustawień mikro-kontrolera - &Simulate - &Symulator + &Symulator - - Alt+S - - - - Simulate selected model. - Symulacja wybranego modelu. + Symulacja wybranego modelu. - &Print - &Drukuj + &Drukuj - - Ctrl+P - - - - Print current model. - Wydrukuj aktualny model. + Wydrukuj aktualny model. - &About - &O aplikacji + &O aplikacji - + Show the application's About box O aplikacji companion9x - - + + Classical + Klasyczny + + + + The classical Companion icon theme + Klasyczny zestaw ikon Companion + + + + + New + Nowy + + + The Companion 2.0 colored icon theme + Kolowy zestaw ikon Companion 2.0 + + + + Recent Files Poprzednie pliki - Firmware Profiles - Profile firmware + Profile firmware - + Set Menu Language Ustaw język menu - &File - &Plik + &Plik - &Edit - &Edycja + &Edycja - &Help - &Pomoc + &Pomoc - + + File Plik - + + Edit Edycja - + + Settings + Ustawienia + + + + Read/Write + Odczyt/Zapis + + + + Help Pomoc - + + Show a selection list of recent documents + Pokaż listę wyboru poprzednich dokumentów + + + + Radio Profiles + Profile Radia + + + + Show a selection list of radio settings profiles + Pokaż listę wyboru profili ustawiań radia + + + Ready Gotowe - + Unable to find file %1! Nie mogę znaleźć pliku %1! - + Error reading file %1: %2. Błąd odczytu pliku %1: @@ -4381,7 +4539,7 @@ p, li { white-space: pre-wrap; } - + A1- @@ -4426,7 +4584,7 @@ p, li { white-space: pre-wrap; } - + Cur+ @@ -4441,7 +4599,7 @@ p, li { white-space: pre-wrap; } - + Pwr+ @@ -5326,6 +5484,26 @@ p, li { white-space: pre-wrap; } Safety %1 Bezpieczny %1 + + + ASpd + + + + + dTE + + + + + Cel- + + + + + Vfs- + + RudTrim Left @@ -5936,26 +6114,26 @@ p, li { white-space: pre-wrap; } Równoległe użycie expo i krzywych nie jest dłużej wspierane - + openTx only accepts %1 points in all curves openTx dopuszcza tylko %1 punktów dla wszystkich krzywych - - - - + + + + OpenTX on this board doesn't accept this function OpenTX na tej platformie nie dopuszcza tej funkcji - - + + OpenTX doesn't accept this protocol OpenTX nie obsługuje tego protokołu - + OpenTX doesn't allow this number of channels OpenTX nie obsługuje tej ilości kanałów @@ -6003,17 +6181,17 @@ Zespół OpenTX/Companion. Użyj trymerów dla Fazy Lotu %1 + Własne trymery jako offset - + FW: %1 FW:%1 - + Pict: %1 Obrazek:%1 - + Profile image Obrazek Profilu @@ -6643,7 +6821,7 @@ Wolne obroty będą na górze, trymer i ostrzeżenie o otwartym gazie również - + Open Folder Otwórz katalog @@ -6900,27 +7078,27 @@ To ustawienie jest używane przez szablony, określa jakie wyjście przypisane j Struktura karty SD - + Select Image Wybierz obrazek - + Offer to write FW to Tx after download Zaproponuj zapisanie FirmWare do radia po pobraniu - + Remove Profile Usuń Profil - + Clear Image Wyczyść obrazek - + Firmware Firmware @@ -7010,63 +7188,61 @@ To ustawienie jest używane przez szablony, określa jakie wyjście przypisane j Uaktywnij automatyczny backup przed zapisem firmware - + Select your snapshot folder Katalog zrzutów - - + + No joysticks found Brak oysticka - + Select your library folder Wybierz katalog bibliteki - + Select your Models and Settings backup folder Wybierz folder do backupowania Modeli i Ustawień - + Select Google Earth executable Wybierz wykonywalny plik Google Earth - + Select the folder replicating your SD structure Wybierz folder do zreplikowania struktury Twojej karty SD - + Not possible to remove profile Usunięcie profilu jest niemożliwe - + The default profile can not be removed. Podstawowy profil nie moze być usunięty. - Error - Błąd + Błąd - Cannot load %1. - Nie mogę załadować %1. + Nie mogę załadować %1. - + Open Image to load Otwórz obrazek do załadowania - + Images (%1) Obrazki (%1) @@ -8311,65 +8487,65 @@ m2560 dla platformy V4 - + Open Otwórz - - - - + + + + Error Błąd - + Cannot load embedded FW image from %1. Nie mogę załadować wstawionego obrazu FW z %1. - + Cannot load the image file %1. Nie mogę załadować pliku obrazka %1. - + Cannot load the profile image %1. Nie mogę załadować obrazu Profilu %1. - + Cannot load the library image %1. Nie mogę załadować obrazu biblioteki %1. - + File Saved Plik Zapisany - + The image was saved to the file %1 Obraz został zapisany do pliku %1 - + Image Refresh Error Błąd odświeżenia obrazka - + Failed to refresh image from file %1 Nieudane odswieżenie obrazka z pliku %1 - + File Save Error Błąd zapisu pliku - + Failed to write image to %1 Nieudany zapis obrazka do %1 @@ -8378,12 +8554,12 @@ m2560 dla platformy V4 Nie mogę znaleźć bitmapy w celu zastąpienia pliku - + Open Image to load Otwórz obrazek do załadowania - + Images (%1) Obrazki (%1) @@ -8566,6 +8742,11 @@ p, li { white-space: pre-wrap; } fwPreferencesDialog + + + Downloads + Pobrania + @@ -8698,9 +8879,8 @@ To ustawienie jest używane przez szablony, określa jakie wyjście przypisane j Pobierz Głos - Downloads and Profiles - Pobrania i profile + Pobrania i profile diff --git a/companion/src/translations/companion_sv.ts b/companion/src/translations/companion_sv.ts index 16b2798b4..9b2636f07 100644 --- a/companion/src/translations/companion_sv.ts +++ b/companion/src/translations/companion_sv.ts @@ -2064,15 +2064,15 @@ FAI-funktionen kan inte slås av i sändaren. MainWindow - + - + File loaded Filen har laddats - + @@ -2134,58 +2134,252 @@ Vill du ladda ned den nya versionen nu ? Copyright - - + + New + Ny + + + + Open... + Öppna... + + + + Save... + Spara... + + + + Save As... + Spara Som... + + + + Exit + Avsluta + + + + Cut + Klipp Ut + + + + Cut current selection to the clipboard + Klipp ut markeringens innehåll till klippbordet + + + + Copy... + Kopiera... + + + + Copy current selection to the clipboard + Kopiera markeringens innehåll till klippbordet + + + + Paste... + Klistra In... + + + + Paste clipboard into current selection + Klistra in klippbokens innehåll i det valda avsnittet + + + + Classical + Klassiskt + + + + The classical Companion icon theme + Det klassiska Companion-temat + + + + The new Companion 2 icon theme + Det nya Companion2-temat + + + + Companion2 + Companion2 + + + + Monochrome + Monokromt + + + + MonoWhite + MonoVitt + + + + MonoBlue + MonoBlått + + + + System language + Systemspråk + + + + Use system language in menus + Använd systemspråket i menyerna + + + + About + Om + + + + Print + Skriv ut + + + + Print current model + Skriv ut modell + + + + Simulate + Simulera + + + + Simulate selected model + Simulera modell + + + loadBackup... + Ladda backup från fil... + + + + Logs + Loggar + + + + Setting... + Inställningar... + + + + Downloads... + Nedladdningar... + + + + Check for updates... + Sök efter uppdateringar... + + + + Edit Tx Splash Image... + Startbildsredigerare... + + + + edit the splash screen of your TX + Editera startbilder för din sändare + + + + List programmers + Programmerare + + + + Fuses... + Säkringar... + + + + Configure connection software... + Inställningar för kommunikation... + + + + Save Tx Models and Settings to file + Spara sändarens Modeller och Inställningar till fil + + + + Contributors + Bidragande + + + + A tribute to those who have contributed to OpenTX and Companion + Ett tack till alla de som bidragit till OpenTX och Companion + + + + Settings + Inställningar + + + + Read/Write + Läs/Skriv + + + + &%1 %2 &%1 %2 - &New - &Ny + &Ny - + Create a new file Skapa ny fil - &Open... - &Öppna... + &Öppna... - + Open an existing file Öppna en existerande fil - &Save - &Spara + &Spara - + + Save the document to disk Spara dokumentet till fil - Save &As... - Spara S&om... + Spara S&om... - Save the document under a new name - Spara dokumentet under nytt namn + Spara dokumentet under nytt namn - &Check for updates... - &Sök efter uppdateringar... + &Sök efter uppdateringar... - + Display previous message again at startup ? Skall föregående varning visas igen vid uppstart ? @@ -2234,24 +2428,22 @@ Vill du ladda ned den nu ? Säkerhetskopieringen misslyckades - + OpenTX Companion - FW: %1 - Profile: %2 OpenTX Companion - FW: %1 - Profil: %2 - &Setting... - &Inställningar... + &Inställningar... - + Edit Settings Redigera Inställningar - &Downloads... - &Nedladdningar... + &Nedladdningar... @@ -2259,79 +2451,67 @@ Vill du ladda ned den nu ? Ladda ned firmware och röstfiler - Customize the splash screen of your TX - Ställ din sändares startbild + Ställ din sändares startbild - E&xit - &Avsluta + &Avsluta - + Exit the application Avsluta programmet - Cu&t - Klipp &Ut + Klipp &Ut - Cut the current selection's contents to the clipboard - Klipp ut markeringens innehåll till klippbordet + Klipp ut markeringens innehåll till klippbordet - &Copy - &Kopiera + &Kopiera - Copy the current selection's contents to the clipboard - Kopiera markeringens innehåll till klippbordet + Kopiera markeringens innehåll till klippbordet - &Paste - Klistra &In + Klistra &In - Paste the clipboard's contents into the current selection - Klistra in klippbokens innehåll i det valda avsnittet + Klistra in klippbokens innehåll i det valda avsnittet - Ctrl+Alt+W - Ctrl+Alt+W + Ctrl+Alt+W - Ctrl+Alt+R - Ctrl+Alt+R + Ctrl+Alt+R - + Configure software for reading from and writing to the transmitter Inställningar för mjukvaran som kommunicerar med sändaren - &List programmers - &Programmerare + &Programmerare - + List available programmers Lista upp tillgängliga prorammerare - &Fuses... - S&äkringar... + S&äkringar... @@ -2339,55 +2519,47 @@ Vill du ladda ned den nu ? Visa säkrings-dialog - &Simulate - S&imulera + S&imulera - Alt+S - Alt+S + Alt+S - Simulate selected model. - Simulera den valda modellen. + Simulera den valda modellen. - &Print - Skriv &ut + Skriv &ut - Ctrl+P - Ctrl+P + Ctrl+P - Print current model. - Skriv ut den valda modellen. + Skriv ut den valda modellen. - &About - &Om + &Om - + Show the application's About box Visa information om programmet - - + + Recent Files Senaste Filer - &File - &Arkiv + &Arkiv Companion - Models and Settings Editor - %1 - profile %2 @@ -2398,7 +2570,7 @@ Vill du ladda ned den nu ? Companion - Editor för Modeller och Inställningar - %1 - + Checking for updates Letar efter uppdateringar @@ -2449,54 +2621,51 @@ Vill du ladda ned den nu ? Redigera programmets inställningar - + Show Companion changelog Visa en lista med förändringar av Companion - &Write Models and Settings To Tx - &Skriv Modeller och Inställningar till sändaren + &Skriv Modeller och Inställningar till sändaren - + Write Models and Settings to transmitter Skriv Modeller och Inställningar till sändaren - &Read Models and Settings From Tx - &Läs Modeller och Inställningar från sändaren + &Läs Modeller och Inställningar från sändaren - + Read Models and Settings from transmitter Läs Modeller och Inställningar från sändaren - + Write Firmware Skriv Firmware - + Write firmware to transmitter Skriv firmware till sändaren - + Write Models and Settings from file to Tx Skriv Modeller och Inställningar från fil till sändaren - + Write Models and Settings from file to transmitter Skriv Modeller och Inställningar från fil till sändaren - Save transmitter Models and Settings to file - Spara sändarens Modeller och Inställningar till en fil + Spara sändarens Modeller och Inställningar till en fil @@ -2504,42 +2673,43 @@ Vill du ladda ned den nu ? Spara sändarens Modeller och Inställningar till en fil - + Read Firmware Läs Firmware - + Read firmware from transmitter Läs firmware från sändaren - + Set Menu Language Ställ in Menyspråk - &Edit - &Redigera + &Redigera - &Help - &Hjälp + &Hjälp - + + File Arkiv - + + Edit Redigera - + + Help Hjälp @@ -2549,12 +2719,11 @@ Vill du ladda ned den nu ? Redo - Contributors &List... - &Bidragsgivare... + &Bidragsgivare... - + Display previous warning again at startup ? SKall föregående varning visas igen vid uppstart ? @@ -2564,7 +2733,7 @@ Vill du ladda ned den nu ? - + @@ -2576,7 +2745,7 @@ Vill du ladda ned den nu ? Fel - + Cannot write file %1: %2. Filen %1 kunde inte skrivas: @@ -2590,7 +2759,7 @@ Vill du ladda ned den nu ? - + Error opening file %1: @@ -2599,7 +2768,7 @@ Vill du ladda ned den nu ? %2. - + Compilation server termporary failure, try later Tillfälligt fel i byggservern. Försök igen senare @@ -2616,17 +2785,17 @@ Vill du ladda ned den nu ? Okänt server-fel. Försök igen senare - + Compare... Jämför... - + Compare models Jämför modeller - + Backup is impossible @@ -2646,22 +2815,21 @@ Vill du ladda ned den nu ? Varning - + Firmware Profiles Profiler för Firmware - &Read/Write - &Läs/Skriv + &Läs/Skriv - + Write Skriv - + Unable to find file %1! Kan inte hitta filen %1 ! @@ -2673,24 +2841,21 @@ Vill du ladda ned den nu ? %2. - &loadBackup... - ladda&Backup... + ladda&Backup... - + Load backup from file Ladda backup från fil - Lo&gs - &Loggar + &Loggar - Ctrl+G - Ctrl+G + Ctrl+G @@ -2698,7 +2863,7 @@ Vill du ladda ned den nu ? Öppna loggfil - + @@ -2791,11 +2956,12 @@ Vill du ladda ned den nu ? + Read Models and Settings From Tx Läs Modeller och Inställningar från sändaren - + The file %1 has not been recognized as a valid Models and Settings file Write anyway ? @@ -2830,11 +2996,12 @@ Starta skrivningen i alla fall ? + Write Models and Settings To Tx Skriv Modeller och Inställningar till sändaren - + Write Firmware To Tx Skriv firmware till sändaren @@ -2898,72 +3065,67 @@ Starta skrivningen i alla fall ? Ladda ned firmware och röstfiler. Definera profildata. - + Check for new version of Companion Sök efter ny version av Companion - Show Companion contributors list - Visa vilka som bidragit till Companion + Visa vilka som bidragit till Companion - + ChangeLog... Förändringar... - + Firmware ChangeLog... Firmware-förändringar... - + Show firmware changelog Visa firmware-förändringar - Configure transmitter start screen... - Konfigurera sändarens startbild... + Konfigurera sändarens startbild... - &Configure connection software... - Inställningar för &kommunikation... + Inställningar för &kommunikation... - + New Profile Ny Profil - + Create a new Radio Setting Profile Lägg till en ny profil med radio-inställningar - Classic - Klassiskt + Klassiskt - The multicolor classical Companion icon theme - Det flerfärgade klassiska Companion-temat + Det flerfärgade klassiska Companion-temat - + A monochrome black icon theme Ett monokromt svart tema - + A monochrome white icon theme Ett monokromt vitt tema - + A monochrome blue icon theme Ett monokromt blått tema @@ -2973,162 +3135,165 @@ Starta skrivningen i alla fall ? Liten - + Use small toolbar icons Använd små ikoner i verktygsfälten - + Use normal size toolbar icons Använd normalstora ikoner i verktygsfälten - + Normal Normal - + Use big toolbar icons Använd stora ikoner i verktygsfälten - + Big Stor - + Use huge toolbar icons Använd mycket stora ikoner i verktygsfälten - + Huge Mycket Stor - System default language - Systemspråk + Systemspråk - Use system default language in menus - Använd systemspråket i menyerna (om tillgängligt) + Använd systemspråket i menyerna (om tillgängligt) - + Czech Czeckiska - + Use Czech in menus Använd Tjeckiska i menyerna - + German Tyska - + Use German in menus Använd Tyska i menyerna - + English Engelska - + Use English in menus Använd Engelska i menyerna - + French Franska - + Use French in menus Använd Franska i menyerna - + Italian Italienska - + Use Italian in menus Använd Italienska i menyerna - + Hebrew Hebreiska - + Use Hebrew in menus Använd Hebreiska i menyerna - + Polish Polska - + Use Polish in menus Använd Polska i menyerna - + Portuguese Portugisiska - + Use Portuguese in menus Använd Portugisiska i menyerna - + Swedish Svenska - + Use Swedish in menus Använd Svenska i menyerna - + Russian Ryska - + Use Russian in menus Använd Ryska i menyerna - + + Load Backup... + Ladda backup från fil... + + + Manuals and other Documents Manualer och andra Dokument - + Open the OpenTX document page in a web browser Öppna OpenTX dokumentsida i en webbläsare - + Set Icon Theme Ställ in Ikontema @@ -3138,17 +3303,16 @@ Starta skrivningen i alla fall ? Ställ in Ikonstorlek - &Settings - &Inställningar + &Inställningar - + Radio Settings Profiles Profiler för Radioinställningar - + Invalid Models and Settings File %1 Filen innehåller inte Modeller och Inställningar: %1 @@ -4677,12 +4841,12 @@ p, li { white-space: pre-wrap; } VHastighet - + A1- A1- - + A2- A2- @@ -4722,12 +4886,12 @@ p, li { white-space: pre-wrap; } Avstånd+ - + Cur+ Ström+ - + ACC ACC @@ -5249,7 +5413,27 @@ p, li { white-space: pre-wrap; } HDG - + + ASpd + + + + + dTE + + + + + Cel- + + + + + Vfs- + + + + RudTrim Left RoderTrim Vänster @@ -5396,17 +5580,17 @@ p, li { white-space: pre-wrap; } Timer - + Timer Sticky - Klistrig + Klistrig Stay - + Håll @@ -5416,17 +5600,17 @@ p, li { white-space: pre-wrap; } STAY(%1, [%2:%3]) - + HÅLL(%1, [%2:%3]) STICKY(%1, %2) - + KLISTRIG(%1, %2) TIMER(%1, %2) - + TIMER(%1, %2) @@ -5659,12 +5843,12 @@ p, li { white-space: pre-wrap; } RSSI - + Pwr+ - + S11 S11 @@ -5815,12 +5999,12 @@ p, li { white-space: pre-wrap; } Flygläge %1 värde - + openTx only accepts %1 points in all curves openTX accepterar bar %1 punkter i alla kurvor - + @@ -5997,7 +6181,7 @@ Gruppen bakom OpenTX/Companion. Använd trim från flygläge %1 + Eget trim som offset - + FW: %1 FW: %1 @@ -6621,19 +6805,16 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga appPreferencesDialog - Application Preferences - Programmets Inställningar + Programmets Inställningar - Simulator capture folder Lagra simulatorbilder i - Remember simulator switch values Spara läget för alla brytare i simulatorn @@ -6641,16 +6822,12 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga - - - - + Open Folder Öppna katalog - - + User Splash Screens Egna Startbilder @@ -6671,31 +6848,26 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga - Blue Blå - Green Grön - Red Röd - Orange Orange - Yellow Gul @@ -6925,12 +7097,12 @@ Detta används av mallen för att koppla kanal till output-nummer. Sökväg till SD-struktur - + Select Image Välj Bild - + Offer to write FW to Tx after download Skriv FW till Tx efter nedladdning @@ -6940,119 +7112,102 @@ Detta används av mallen för att koppla kanal till output-nummer. Ta bort Profil - + Clear Image Ta bort Bild - + Firmware Firmware - - + Include companion splashes Användarens bilder och Companion-bilder - Only user defined splashes Enbart användarens bilder - Splash Screen Library Bibliotek för startbilder - Files to keep Behåll filer - Simulator BackLight Simulatorbelysning - Automatic Backup Folder Säkerhetskopiera till folder - Only capture to clipboard Spara bara bilder till Urklipp - Joystick Joystick - Find Executable Sök Program - Google Earth Executable Sökväg till Google Earth - Calibrate Kalibrera - Enable Aktivera - Show splash screen when Companion starts Visa en start-bild då Companion startas - Automatic check for OpenTX firmware updates Sök automatiskt efter uppdateringar av OpenTX - Automatic check for Companion updates Sök automatiskt efter uppdateringar av Companion - Offer to use wizard for new models Erbjud användning av modellguiden för nya modeller - Enable automatic backup before writing firmware Säkerhetskopiera innan firmware-skrivning - + Select your snapshot folder Välj katalog för snapshots av Tx-simulatorn @@ -7093,17 +7248,15 @@ Detta används av mallen för att koppla kanal till output-nummer. Standard-profilen kan inte tas bort. - Error - Fel + Fel - Cannot load %1. - Det går inte att ladda %1. + Det går inte att ladda %1. - + Open Image to load Öppna bild för laddning @@ -8308,38 +8461,38 @@ m2560 för v4.1-kort Startbildsredigerare - - + + Invert Invertera - - + + Load FW Ladda FW - - + + Load Pict Ladda Bild - - + + Load Profile Ladda Profil - - + + Save Spara - - + + Open Splash Library Öppna bildbibliotek @@ -8433,10 +8586,9 @@ m2560 för v4.1-kort Det gick inte att spara bilden i filen %1 - - - - + + + ... ... diff --git a/radio/.gitignore b/radio/.gitignore new file mode 100644 index 000000000..7091e5b78 --- /dev/null +++ b/radio/.gitignore @@ -0,0 +1 @@ +/gtest-1.6.0 diff --git a/radio/src/.gitignore b/radio/src/.gitignore index 4ef246e21..3a16d35fe 100644 --- a/radio/src/.gitignore +++ b/radio/src/.gitignore @@ -1,7 +1,6 @@ /stamp-opentx.h /opentx.elf /simu -/eeprom.bin /opentx.hex /opentx.map /simu.d @@ -9,7 +8,9 @@ /*.sh /*.o /*.bin +/*.bin.* /*.lst /SCRIPTS /SOUNDS /LOGS +/*.bat diff --git a/radio/src/Makefile b/radio/src/Makefile index 053b0371d..bf19f243a 100644 --- a/radio/src/Makefile +++ b/radio/src/Makefile @@ -216,7 +216,7 @@ TX_CADDY = NO IRPROTOS = NO # TRANSLATIONS -# Values = cz, de, en, fr, it, se, es, pl, pt +# Values = cz, de, en, fi, fr, it, se, es, pl, pt TRANSLATIONS = EN # TTS @@ -258,6 +258,10 @@ GVARS = NO # Values = NO, POT1, POT2, POT3, 3POS = NO +# Lua interpreter embedded +# Values = NO, NO_MODEL_SCRIPTS, YES +LUA = NO + # Menu Lock modes # Values = NO, READONLY, NOMENUS MENUS_LOCK == NO @@ -655,6 +659,20 @@ ifeq ($(PCB), TARANIS) EXTRABOARDSRC += targets/taranis/usbd_usr.cpp targets/taranis/usbd_storage_msd.cpp SRC += targets/sky9x/syscalls.c + ifneq ($(LUA), NO) + ifeq ($(LUA), YES) + CPPDEFS += -DLUA_MODEL_SCRIPTS + endif + CPPDEFS += -DLUA + INCDIRS += lua/src + CPPSRC += lua.cpp + LUASRC = lua/src/lapi.c lua/src/lcode.c lua/src/lctype.c lua/src/ldebug.c lua/src/ldo.c lua/src/ldump.c lua/src/lfunc.c lua/src/lgc.c lua/src/llex.c lua/src/lmem.c \ + lua/src/lobject.c lua/src/lopcodes.c lua/src/lparser.c lua/src/lstate.c lua/src/lstring.c lua/src/ltable.c lua/src/ltm.c lua/src/lundump.c lua/src/lvm.c lua/src/lzio.c \ + lua/src/lbaselib.c lua/src/linit.c lua/src/lmathlib.c lua/src/loadlib.c lua/src/lauxlib.c lua/src/ltablib.c lua/src/lcorolib.c + # lua/src/loslib.c lua/src/lbitlib.c lua/src/lstrlib.c lua/src/liolib.c lua/src/ldblib.c + SRC += $(LUASRC) + endif + ifeq ($(SDCARD), YES) EXTRABOARDSRC += FatFs/ff.c FatFs/fattime.c FatFs/option/ccsbcs.c targets/taranis/diskio.cpp CPPDEFS += -DVOICE @@ -1068,7 +1086,7 @@ else build: stamp_header tra lbm allsrc.cpp elf remallsrc bin endif -tra: translations/cz.h translations/de.h translations/es.h translations/fr.h translations/it.h translations/pl.h translations/pt.h translations/se.h +tra: translations/cz.h translations/de.h translations/es.h translations/fi.h translations/fr.h translations/it.h translations/pl.h translations/pt.h translations/se.h lbm: fonts bitmaps/sticks.lbm elf: $(TARGET).elf @@ -1080,13 +1098,11 @@ sym: $(TARGET).sym # Build stamp-file stamp_header: - @echo - @echo "Generate Version-stamp:" - @echo "//Automatically generated file (Makefile) - do not edit" > stamp-opentx.h + @echo "// Automatically generated file (Makefile) - do not edit" > stamp-opentx.h @echo "#define DATE_STR \"`date +%Y-%m-%d | tr -d '\r\n'`\"" >> stamp-opentx.h @echo "#define TIME_STR \"`date +%H:%M:%S | tr -d '\r\n'`\"" >> stamp-opentx.h @echo "#define VERS_STR \"$(VERSION)\"" >> stamp-opentx.h - @cat stamp-opentx.h + @echo "#define VERS_NUM $(VERSION)" >> stamp-opentx.h 9x-stamp: @echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > stamp-opentx-9x.txt @@ -1139,6 +1155,11 @@ translations/es.h: translations/es.h.txt @echo "Create Spanish language specific header files" $(TRANSLATE) translations/es.h.txt translations/es.h es +translations/fi.h: translations/fi.h.txt + @echo + @echo "Create Finnish language specific header files" + $(TRANSLATE) translations/fi.h.txt translations/fi.h fi + translations/fr.h: translations/fr.h.txt @echo @echo "Create French language specific header files" @@ -1224,7 +1245,7 @@ FOXLIB=-L/usr/local/lib \ -Wl,-rpath,$(FOXPATH)/src/.libs simu: stamp_header $(BOARDSRC) $(CPPSRC) Makefile simu.cpp simpgmspace.cpp *.h tra lbm eeprom.bin - g++ $(CPPFLAGS) $(INCFLAGS) simu.cpp $(BOARDSRC) $(CPPSRC) simpgmspace.cpp -MD -DSIMU -O0 -o simu $(FOXINC) $(FOXLIB) -pthread -fexceptions + g++ $(CPPFLAGS) $(INCFLAGS) simu.cpp $(BOARDSRC) $(CPPSRC) $(LUASRC) simpgmspace.cpp -MD -DSIMU -O0 -o simu $(FOXINC) $(FOXLIB) -pthread -fexceptions eeprom.bin: dd if=/dev/zero of=$@ bs=1 count=2048 diff --git a/radio/src/eeprom_conversions.cpp b/radio/src/eeprom_conversions.cpp index 349d685a8..8a0e6bac9 100644 --- a/radio/src/eeprom_conversions.cpp +++ b/radio/src/eeprom_conversions.cpp @@ -228,6 +228,13 @@ int ConvertSource_215_to_216(int source, bool insertZero=false) // 4 GVARS added if (source > MIXSRC_GVAR1+4) source += 4; + // ASpd and dTE added + if (source >= MIXSRC_FIRST_TELEM-1+TELEM_ASPD) + source += 2; + // Cel- and Vfas- added + if (source >= MIXSRC_FIRST_TELEM-1+TELEM_MIN_CELL) + source += 2; + return source; } @@ -241,11 +248,19 @@ int ConvertSwitch_215_to_216(int swtch) return swtch + (2*4) + (2*6); // 4 trims and 2 * 6-pos added as switches } #else -int ConvertSource_215_to_216(int source, bool removeZero=false) +int ConvertSource_215_to_216(int source, bool insertZero=false) { + if (insertZero) + source += 1; // 4 GVARS added if (source > MIXSRC_GVAR1+4) source += 4; + // ASpd and dTE added + if (source >= MIXSRC_FIRST_TELEM-1+TELEM_ASPD) + source += 2; + // Cel- and Vfas- added + if (source >= MIXSRC_FIRST_TELEM-1+TELEM_MIN_CELL) + source += 2; return source; } @@ -567,7 +582,7 @@ void ConvertModel_215_to_216(ModelData &model) } if (fn.func == FUNC_PLAY_VALUE || fn.func == FUNC_VOLUME || (IS_ADJUST_GV_FUNC(fn.func) && fn.all.mode == FUNC_ADJUST_GVAR_SOURCE)) { #if defined(PCBTARANIS) - fn.all.param = ConvertSource_215_to_216(fn.all.param, true); + fn.all.val = ConvertSource_215_to_216(fn.all.val, true); #endif } } diff --git a/radio/src/fonts/sqt5/font_fi_04x06.png b/radio/src/fonts/sqt5/font_fi_04x06.png new file mode 100644 index 0000000000000000000000000000000000000000..39346ec75d1ec84857031221e41e779fa8c52b27 GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^azM<^$P6S^)$=z2DYgKg5LY1m|NsA`H|O64vKW)R z-CY3FVdQ I&MBb@01Ij`r2qf` literal 0 HcmV?d00001 diff --git a/radio/src/fonts/sqt5/font_fi_05x07.png b/radio/src/fonts/sqt5/font_fi_05x07.png new file mode 100644 index 0000000000000000000000000000000000000000..59311bd3ce230a046deb23e71aa7739bf5cfbf5d GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^azM<%$P6T}6y8k-QfvV}A+A9B|Ns9>Z_d99WHBar zySp%Su*!M>Ih+L^k;M!Q+`=Ht$S`Y;1W=H@#M9T6{Vs>Jh`RE&iQl#Yh4egK978y+ zC%-s5ZP%d<|LXt9v$3UiD)ZcbZnHfhVM5}D1P!*$Q|9e9_ye?vpTRU&8%^kc+2_V+hA} z+tV8b4=C_BU$mdbt^d5|LElvme(ivhjWK#xtzW9NnM5y6zc+iLN)YDw$mMy+r!>#`vJ{k@O1TaS?83{1OR%wI+FkZ literal 0 HcmV?d00001 diff --git a/radio/src/fonts/sqt5/font_fi_10x14.png b/radio/src/fonts/sqt5/font_fi_10x14.png new file mode 100644 index 0000000000000000000000000000000000000000..dbd4d48d4f7bdc59fed88763ea93066dc09d4534 GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^Hb5-E$P6S4V)|-;6kC8#h%1o(|NsBeoAd7iS&T{E z?k)@+tg;?J4rhT!WHAE+w=f7ZGR&GI0Tg5}@$_|Nzsn&lYR0tU@%l4Bp)gMu#}JO| z$v^m6oFVdQ&MBb@ E09VyT8vp$WaWQu6{1- HoD!MZ_d99WN{XF zL>4nJa0`PlBg3pY5H=O_PcD{oD#ez{WxX=g>*e#978y+C;#|={}tEayE&c8 zJhqS&K+sj18QXOboFyt=akR{0D|u? Ai~s-t literal 0 HcmV?d00001 diff --git a/radio/src/fonts/std/font_fi_08x10.png b/radio/src/fonts/std/font_fi_08x10.png new file mode 100644 index 0000000000000000000000000000000000000000..70fbdbcfd949dc94b05b48fae816deed5ab8f806 GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^20+Zi$P6UqO4bMgDYgKg5LY1m|NsA`H|O64vKW)R z-CYOfEFEKkwh$$jE#~ al3`MvTQ2v?z*?XS7(8A5T-G@yGywpk=1&9w literal 0 HcmV?d00001 diff --git a/radio/src/lcd.cpp b/radio/src/lcd.cpp index e076fd278..85ef0a709 100644 --- a/radio/src/lcd.cpp +++ b/radio/src/lcd.cpp @@ -1236,12 +1236,14 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val, #endif case TELEM_CELL-1: + case TELEM_MIN_CELL-1: putsTelemetryValue(x, y, val, UNIT_VOLTS, att|PREC2); break; case TELEM_TX_VOLTAGE-1: case TELEM_VFAS-1: case TELEM_CELLS_SUM-1: + case TELEM_MIN_VFAS-1: putsTelemetryValue(x, y, val, UNIT_VOLTS, att|PREC1); break; @@ -1263,6 +1265,7 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val, case TELEM_ACCy-1: case TELEM_ACCz-1: case TELEM_VSPD-1: + case TELEM_ASPD-1: putsTelemetryValue(x, y, val, UNIT_RAW, att|PREC2); break; diff --git a/radio/src/lua.cpp b/radio/src/lua.cpp new file mode 100644 index 000000000..0e18824fa --- /dev/null +++ b/radio/src/lua.cpp @@ -0,0 +1,1124 @@ +/* + * Authors (alphabetical order) + * - Andre Bernet + * - Andreas Weitl + * - Bertrand Songis + * - Bryan J. Rentoul (Gruvin) + * - Cameron Weeks + * - Erez Raviv + * - Gabriel Birkus + * - Jean-Pierre Parisy + * - Karl Szmutny + * - Michael Blandford + * - Michal Hlavinka + * - Pat Mackenzie + * - Philip Moss + * - Rob Thomson + * - Romolo Manfredini + * - Thomas Husterer + * + * opentx is based on code named + * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, + * er9x by Erez Raviv: http://code.google.com/p/er9x/, + * and the original (and ongoing) project by + * Thomas Husterer, th9x: http://code.google.com/p/th9x/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include "opentx.h" +#include "stamp-opentx.h" + +#if !defined(SIMU) +extern "C" { +#endif + #include + #include + #include +#if !defined(SIMU) +} +#endif + +#define lua_registerint(L, n, i) (lua_pushinteger(L, (i)), lua_setglobal(L, (n))) +#define lua_pushtablenil(L, k) (lua_pushstring(L, (k)), lua_pushnil(L), lua_settable(L, -3)) +#define lua_pushtableboolean(L, k, v) (lua_pushstring(L, (k)), lua_pushboolean(L, (v)), lua_settable(L, -3)) +#define lua_pushtablenumber(L, k, v) (lua_pushstring(L, (k)), lua_pushinteger(L, (v)), lua_settable(L, -3)) +#define lua_pushtablestring(L, k, v) (lua_pushstring(L, (k)), lua_pushstring(L, (v)), lua_settable(L, -3)) +#define lua_pushtablezstring(L, k, v) { char _zz[sizeof(v)+1]; zchar2str(_zz, (v), sizeof(v)); lua_pushstring(L, (k)); lua_pushstring(L, _zz); lua_settable(L, -3); } +#define lua_registerlib(L, name, tab) (luaL_newmetatable(L, name), luaL_setfuncs(L, tab, 0), lua_setglobal(L, name)) + +lua_State *L = NULL; +uint8_t luaState = 0; +ScriptInternalData scriptInternalData[MAX_SCRIPTS] = { { SCRIPT_NOFILE, 0 } }; +ScriptInternalData standaloneScript = { SCRIPT_NOFILE, 0 }; + +#define PERMANENT_SCRIPTS_MAX_INSTRUCTIONS (1000/100) +#define MANUAL_SCRIPTS_MAX_INSTRUCTIONS (10000/100) +#define SCRIPTS_MAX_HEAP 50 +#define SET_LUA_INSTRUCTIONS_COUNT(x) (instructionsPercent=0, lua_sethook(L, hook, LUA_MASKCOUNT, x)) + +static int instructionsPercent = 0; +void hook(lua_State* L, lua_Debug *ar) +{ + instructionsPercent++; + if (instructionsPercent > 100) { + // From now on, as soon as a line is executed, error + // keep erroring until you're script reaches the top + lua_sethook(L, hook, LUA_MASKLINE, 0); + luaL_error(L, ""); + } +} + +static int luaGetVersion(lua_State *L) +{ + lua_pushnumber(L, VERS_NUM); + return 1; +} + +static int luaGetTime(lua_State *L) +{ + lua_pushunsigned(L, get_tmr10ms()); + return 1; +} + +static int luaGetValue(lua_State *L) +{ + if (lua_isnumber(L, 1)) { + int src = luaL_checkinteger(L, 1); + lua_pushinteger(L, getValue(src)); + return 1; + } + else { + const char *what = luaL_checkstring(L, 1); + if (!strcmp(what, "altitude")) { + lua_pushnumber(L, double(frskyData.hub.baroAltitude)/100); + return 1; + } + else if (!strcmp(what, "latitude")) { + if (frskyData.hub.gpsFix) + lua_pushnumber(L, gpsToDouble(frskyData.hub.gpsLatitudeNS=='S', frskyData.hub.gpsLatitude_bp, frskyData.hub.gpsLatitude_ap)); + else + lua_pushnil(L); + return 1; + } + else if (!strcmp(what, "longitude")) { + if (frskyData.hub.gpsFix) + lua_pushnumber(L, gpsToDouble(frskyData.hub.gpsLongitudeEW=='W', frskyData.hub.gpsLongitude_bp, frskyData.hub.gpsLongitude_ap)); + else + lua_pushnil(L); + return 1; + } + else if (!strcmp(what, "pilot latitude")) { + if (frskyData.hub.gpsFix) + lua_pushnumber(L, pilotLatitude); + else + lua_pushnil(L); + return 1; + } + else if (!strcmp(what, "pilot longitude")) { + if (frskyData.hub.gpsFix) + lua_pushnumber(L, pilotLongitude); + else + lua_pushnil(L); + return 1; + } + } + + return 0; +} + +static int luaPlayFile(lua_State *L) +{ + const char * filename = luaL_checkstring(L, 1); + PLAY_FILE(filename, 0, 0); + return 0; +} + +static int luaLcdLock(lua_State *L) +{ + lcd_locked = true; + return 0; +} + +static int luaLcdClear(lua_State *L) +{ + lcd_clear(); + return 0; +} + +static int luaLcdDrawPoint(lua_State *L) +{ + int x = luaL_checkinteger(L, 1); + int y = luaL_checkinteger(L, 2); + lcd_plot(x, y); + return 0; +} + +static int luaLcdDrawLine(lua_State *L) +{ + int x1 = luaL_checkinteger(L, 1); + int y1 = luaL_checkinteger(L, 2); + int x2 = luaL_checkinteger(L, 3); + int y2 = luaL_checkinteger(L, 4); + lcd_line(x1, y1, x2, y2); + return 0; +} + +static int luaLcdDrawRectangle(lua_State *L) +{ + int x = luaL_checkinteger(L, 1); + int y = luaL_checkinteger(L, 2); + int w = luaL_checkinteger(L, 3); + int h = luaL_checkinteger(L, 4); + lcd_rect(x, y, w, h, 0xff, 0); + return 0; +} + +static int luaLcdDrawText(lua_State *L) +{ + int x = luaL_checkinteger(L, 1); + int y = luaL_checkinteger(L, 2); + const char * s = luaL_checkstring(L, 3); + int att = luaL_checkinteger(L, 4); + lcd_putsAtt(x, y, s, att); + return 0; +} + +static int luaLcdDrawSwitch(lua_State *L) +{ + int x = luaL_checkinteger(L, 1); + int y = luaL_checkinteger(L, 2); + int s = luaL_checkinteger(L, 3); + int att = luaL_checkinteger(L, 4); + putsSwitches(x, y, s, att); + return 0; +} + +static int luaLcdDrawPixmap(lua_State *L) +{ + int x = luaL_checkinteger(L, 1); + int y = luaL_checkinteger(L, 2); + const char * filename = luaL_checkstring(L, 3); + // TODO int att = luaL_checkinteger(L, 4); + bmp_ptr_t bitmap = 0; + const pm_char * error = bmpLoad(bitmap, filename, LCD_W, LCD_H); + if (bitmap && !error) { + lcd_bmp(x, y, bitmap); + // free(bitmap); + } + return 0; +} + +static int luaLcdDrawScreenTitle(lua_State *L) +{ + const char * str = luaL_checkstring(L, 1); + int idx = luaL_checkinteger(L, 2); + int cnt = luaL_checkinteger(L, 3); + + displayScreenIndex(idx-1, cnt, 0); + lcd_filled_rect(0, 0, LCD_W, FH, SOLID, FILL_WHITE|GREY_DEFAULT); + title(str); + + return 0; +} + +static int luaModelGetTimer(lua_State *L) +{ + int idx = luaL_checkunsigned(L, 1); + if (idx < MAX_TIMERS) { + TimerData & timer = g_model.timers[idx]; + lua_newtable(L); + lua_pushtablenumber(L, "mode", timer.mode); + lua_pushtablenumber(L, "start", timer.start); + lua_pushtablenumber(L, "value", timersStates[idx].val); + lua_pushtablenumber(L, "countdownBeep", timer.countdownBeep); + lua_pushtableboolean(L, "minuteBeep", timer.minuteBeep); + lua_pushtableboolean(L, "persistent", timer.persistent); + } + else { + lua_pushnil(L); + } + return 1; +} + +static int luaModelSetTimer(lua_State *L) +{ + int idx = luaL_checkunsigned(L, 1); + + if (idx < MAX_TIMERS) { + TimerData & timer = g_model.timers[idx]; + luaL_checktype(L, -1, LUA_TTABLE); + for (lua_pushnil(L); lua_next(L, -2); lua_pop(L, 1)) { + luaL_checktype(L, -2, LUA_TSTRING); // key is string + const char * key = luaL_checkstring(L, -2); + if (!strcmp(key, "mode")) { + timer.mode = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "start")) { + timer.start = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "value")) { + timersStates[idx].val = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "countdownBeep")) { + timer.countdownBeep = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "minuteBeep")) { + timer.minuteBeep = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "persistent")) { + timer.persistent = luaL_checkinteger(L, -1); + } + } + eeDirty(EE_MODEL); + } + return 0; +} + +static int getFirstInput(int chn) +{ + for (int i=0; isrcRaw || expo->chn>chn) break; + if (expo->chn == chn) { + return i; + } + } + return -1; +} + +static int getInputsCountFromFirst(int chn, int first) +{ + int count = 0; + if (first >= 0) { + for (int i=first; isrcRaw || expo->chn!=chn) break; + count++; + } + } + return count; +} + +static int getInputsCount(int chn) +{ + int first = getFirstInput(chn); + return getInputsCountFromFirst(chn, first); +} + +static int luaModelGetInputsCount(lua_State *L) +{ + int chn = luaL_checkunsigned(L, 1); + int count = getInputsCount(chn); + lua_pushinteger(L, count); + return 1; +} + +static int luaModelGetInput(lua_State *L) +{ + int chn = luaL_checkunsigned(L, 1); + int idx = luaL_checkunsigned(L, 2); + int first = getFirstInput(chn); + int count = getInputsCountFromFirst(chn, first); + if (first>=0 && idxname); + lua_pushtablenumber(L, "source", expo->srcRaw); + lua_pushtablenumber(L, "weight", expo->weight); + lua_pushtablenumber(L, "offset", expo->offset); + } + else { + lua_pushnil(L); + } + return 1; +} + +static int luaModelInsertInput(lua_State *L) +{ + int chn = luaL_checkunsigned(L, 1); + int idx = luaL_checkunsigned(L, 2); + + int first = getFirstInput(chn); + int count = getInputsCountFromFirst(chn, first); + + if (chnname, name, sizeof(expo->name)); + } + else if (!strcmp(key, "source")) { + expo->srcRaw = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "weight")) { + expo->weight = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "offset")) { + expo->offset = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "switch")) { + expo->swtch = luaL_checkinteger(L, -1); + } + } + } + + return 0; +} + +static int luaModelDeleteInput(lua_State *L) +{ + int chn = luaL_checkunsigned(L, 1); + int idx = luaL_checkunsigned(L, 2); + + int first = getFirstInput(chn); + int count = getInputsCountFromFirst(chn, first); + + if (first>=0 && idxsrcRaw || mix->destCh>chn) break; + if (mix->destCh == chn) { + return i; + } + } + return -1; +} + +static int getMixesCountFromFirst(int chn, int first) +{ + int count = 0; + if (first >= 0) { + for (int i=first; isrcRaw || mix->destCh!=chn) break; + count++; + } + } + return count; +} + +static int getMixesCount(int chn) +{ + int first = getFirstMix(chn); + return getMixesCountFromFirst(chn, first); +} + +static int luaModelGetMixesCount(lua_State *L) +{ + int chn = luaL_checkunsigned(L, 1); + int count = getMixesCount(chn); + lua_pushinteger(L, count); + return 1; +} + +static int luaModelGetMix(lua_State *L) +{ + int chn = luaL_checkunsigned(L, 1); + int idx = luaL_checkunsigned(L, 2); + int first = getFirstMix(chn); + int count = getMixesCountFromFirst(chn, first); + if (first>=0 && idxname); + lua_pushtablenumber(L, "source", mix->srcRaw); + lua_pushtablenumber(L, "weight", mix->weight); + lua_pushtablenumber(L, "offset", mix->offset); + lua_pushtablenumber(L, "switch", mix->swtch); + lua_pushtablenumber(L, "multiplex", mix->mltpx); + } + else { + lua_pushnil(L); + } + return 1; +} + +static int luaModelInsertMix(lua_State *L) +{ + int chn = luaL_checkunsigned(L, 1); + int idx = luaL_checkunsigned(L, 2); + + int first = getFirstMix(chn); + int count = getMixesCountFromFirst(chn, first); + + if (chnname, name, sizeof(mix->name)); + } + else if (!strcmp(key, "source")) { + mix->srcRaw = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "weight")) { + mix->weight = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "offset")) { + mix->offset = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "switch")) { + mix->swtch = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "multiplex")) { + mix->mltpx = luaL_checkinteger(L, -1); + } + } + } + + return 0; +} + +static int luaModelDeleteMix(lua_State *L) +{ + int chn = luaL_checkunsigned(L, 1); + int idx = luaL_checkunsigned(L, 2); + + int first = getFirstMix(chn); + int count = getMixesCountFromFirst(chn, first); + + if (first>=0 && idxfunc); + lua_pushtablenumber(L, "v1", sw->v1); + lua_pushtablenumber(L, "v2", sw->v2); + lua_pushtablenumber(L, "v3", sw->v3); + lua_pushtablenumber(L, "and", sw->andsw); + lua_pushtablenumber(L, "delay", sw->delay); + lua_pushtablenumber(L, "duration", sw->duration); + } + else { + lua_pushnil(L); + } + return 1; +} + +static int luaModelSetLogicalSwitch(lua_State *L) +{ + int idx = luaL_checkunsigned(L, 1); + if (idx < NUM_CSW) { + LogicalSwitchData * sw = cswAddress(idx); + luaL_checktype(L, -1, LUA_TTABLE); + for (lua_pushnil(L); lua_next(L, -2); lua_pop(L, 1)) { + luaL_checktype(L, -2, LUA_TSTRING); // key is string + const char * key = luaL_checkstring(L, -2); + if (!strcmp(key, "function")) { + sw->func = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "v1")) { + sw->v1 = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "v2")) { + sw->v2 = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "v3")) { + sw->v3 = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "and")) { + sw->andsw = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "delay")) { + sw->delay = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "duration")) { + sw->duration = luaL_checkinteger(L, -1); + } + } + } + + return 0; +} + +static int luaModelGetCustomFunction(lua_State *L) +{ + int idx = luaL_checkunsigned(L, 1); + if (idx < NUM_CFN) { + CustomFnData * cfn = &g_model.funcSw[idx]; + lua_newtable(L); + lua_pushtablenumber(L, "switch", CFN_SWITCH(cfn)); + lua_pushtablenumber(L, "function", CFN_FUNC(cfn)); + lua_pushtablezstring(L, "name", cfn->play.name); + lua_pushtablenumber(L, "value", cfn->all.val); + lua_pushtablenumber(L, "mode", cfn->all.mode); + lua_pushtablenumber(L, "active", CFN_ACTIVE(cfn)); + } + else { + lua_pushnil(L); + } + return 1; +} + +static int luaModelSetCustomFunction(lua_State *L) +{ + int idx = luaL_checkunsigned(L, 1); + if (idx < NUM_CFN) { + CustomFnData * cfn = &g_model.funcSw[idx]; + luaL_checktype(L, -1, LUA_TTABLE); + for (lua_pushnil(L); lua_next(L, -2); lua_pop(L, 1)) { + luaL_checktype(L, -2, LUA_TSTRING); // key is string + const char * key = luaL_checkstring(L, -2); + if (!strcmp(key, "switch")) { + CFN_SWITCH(cfn) = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "function")) { + CFN_FUNC(cfn) = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "name")) { + const char * name = luaL_checkstring(L, -1); + str2zchar(cfn->play.name, name, sizeof(cfn->play.name)); + } + else if (!strcmp(key, "value")) { + cfn->all.val = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "mode")) { + cfn->all.mode = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "active")) { + CFN_ACTIVE(cfn) = luaL_checkinteger(L, -1); + } + } + } + + return 0; +} + +static int luaModelGetOutput(lua_State *L) +{ + int idx = luaL_checkunsigned(L, 1); + if (idx < NUM_CHNOUT) { + LimitData * limit = limitAddress(idx); + lua_newtable(L); + lua_pushtablezstring(L, "name", limit->name); + lua_pushtablenumber(L, "min", limit->min); + lua_pushtablenumber(L, "max", limit->min); + lua_pushtablenumber(L, "offset", limit->offset); + lua_pushtablenumber(L, "ppmCenter", limit->ppmCenter); + lua_pushtableboolean(L, "symetrical", limit->symetrical); + lua_pushtableboolean(L, "revert", limit->revert); + if (limit->curve) + lua_pushtablenil(L, "curve"); + else + lua_pushtablenumber(L, "curve", limit->curve-1); + } + else { + lua_pushnil(L); + } + return 1; +} + +static int luaModelSetOutput(lua_State *L) +{ + int idx = luaL_checkunsigned(L, 1); + if (idx < NUM_CHNOUT) { + LimitData * limit = limitAddress(idx); + luaL_checktype(L, -1, LUA_TTABLE); + for (lua_pushnil(L); lua_next(L, -2); lua_pop(L, 1)) { + luaL_checktype(L, -2, LUA_TSTRING); // key is string + const char * key = luaL_checkstring(L, -2); + if (!strcmp(key, "name")) { + const char * name = luaL_checkstring(L, -1); + str2zchar(limit->name, name, sizeof(limit->name)); + } + else if (!strcmp(key, "min")) { + limit->min = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "max")) { + limit->max = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "offset")) { + limit->offset = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "ppmCenter")) { + limit->ppmCenter = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "symetrical")) { + limit->symetrical = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "revert")) { + limit->revert = luaL_checkinteger(L, -1); + } + else if (!strcmp(key, "curve")) { + if (lua_isnil(L, -1)) + limit->curve = 0; + else + limit->curve = luaL_checkinteger(L, -1) + 1; + } + } + } + + return 0; +} +static int luaPopupInput(lua_State *L) +{ + uint8_t event = luaL_checkinteger(L, 2); + s_warning_input_value = luaL_checkinteger(L, 3); + s_warning_input_min = luaL_checkinteger(L, 4); + s_warning_input_max = luaL_checkinteger(L, 5); + s_warning = luaL_checkstring(L, 1); + s_warning_type = WARNING_TYPE_INPUT; + displayWarning(event); + if (s_warning_result) { + s_warning_result = 0; + lua_pushstring(L, "OK"); + } + else if (!s_warning) { + lua_pushstring(L, "CANCEL"); + } + else { + lua_pushinteger(L, s_warning_input_value); + } + s_warning = NULL; + return 1; +} + +int luaGetInputs(ScriptInternalData & sid) +{ + if (!lua_istable(L, -1)) + return -1; + + sid.inputsCount = 0; + for (lua_pushnil(L); lua_next(L, -2) && sid.inputsCount100) { + TRACE("Script killed"); + standaloneScript.state = SCRIPT_KILLED; + } + else { + TRACE("Script error"); + standaloneScript.state = SCRIPT_SYNTAX_ERROR; + } + luaState = LUASTATE_RELOAD_MODEL_SCRIPTS; + } + else { + int scriptResult = lua_tointeger(L, -1); + lua_pop(L, 1); /* pop returned value */ + if (scriptResult == 0) { + if (lua_gc(L, LUA_GCCOUNT, 0) > SCRIPTS_MAX_HEAP) { + TRACE("Script memory leak"); + standaloneScript.state = SCRIPT_LEAK; + luaState = LUASTATE_RELOAD_MODEL_SCRIPTS; + } + } + else { + TRACE("Script finished with status %d", scriptResult); + standaloneScript.state = SCRIPT_NOFILE; + luaState = LUASTATE_RELOAD_MODEL_SCRIPTS; + } + } + } + else { + TRACE("Script error: %s", lua_tostring(L, -1)); + standaloneScript.state = (instructionsPercent > 100 ? SCRIPT_KILLED : SCRIPT_SYNTAX_ERROR); + luaState = LUASTATE_RELOAD_MODEL_SCRIPTS; + } + + if (standaloneScript.state != SCRIPT_OK) { + luaError(standaloneScript.state); + } + + } + } + else { + // model scripts + if (luaState & LUASTATE_RELOAD_MODEL_SCRIPTS) { + luaState = 0; + LUA_RESET(); + luaLoadModelScripts(); + } + + for (int i=0; i 100 ? SCRIPT_KILLED : SCRIPT_SYNTAX_ERROR); + TRACE("Script %10s disabled", sd.file); + break; + } + sid.outputs[j].value = lua_tointeger(L, -1); + lua_pop(L, 1); + } + } + else { + if (instructionsPercent > 100) { + TRACE("Script %10s killed", sd.file); + sid.state = SCRIPT_KILLED; + } + else { + TRACE("Script %10s error: %s", sd.file, lua_tostring(L, -1)); + sid.state = SCRIPT_SYNTAX_ERROR; + } + } + + if (sid.state != SCRIPT_OK) { + luaFree(sid); + } + else { + sid.memory += lua_gc(L, LUA_GCCOUNT, 0) - prev_mem; + if (instructionsPercent > sid.instructions) { + sid.instructions = instructionsPercent; + } + } + } + } + + // TRACE("gc=%d", lua_gc(L, LUA_GCCOUNT, 0)); + + if (lua_gc(L, LUA_GCCOUNT, 0) > SCRIPTS_MAX_HEAP) { + uint8_t max_memory = 0; + int8_t max_idx = -1; + for (int i=0; i max_memory && sid.memory > 15) { + max_idx = i; + } + } + if (max_idx >= 0) { + ScriptInternalData & sid = scriptInternalData[max_idx]; + TRACE("Script %d killed", max_idx); + sid.state = SCRIPT_LEAK; + luaFree(sid); + } + } + } +} diff --git a/radio/src/lua/Makefile b/radio/src/lua/Makefile new file mode 100644 index 000000000..bd9515fd8 --- /dev/null +++ b/radio/src/lua/Makefile @@ -0,0 +1,114 @@ +# Makefile for installing Lua +# See doc/readme.html for installation and customization instructions. + +# == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT ======================= + +# Your platform. See PLATS for possible values. +PLAT= none + +# Where to install. The installation starts in the src and doc directories, +# so take care if INSTALL_TOP is not an absolute path. See the local target. +# You may want to make INSTALL_LMOD and INSTALL_CMOD consistent with +# LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h. +INSTALL_TOP= /usr/local +INSTALL_BIN= $(INSTALL_TOP)/bin +INSTALL_INC= $(INSTALL_TOP)/include +INSTALL_LIB= $(INSTALL_TOP)/lib +INSTALL_MAN= $(INSTALL_TOP)/man/man1 +INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V +INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V + +# How to install. If your install program does not support "-p", then +# you may have to run ranlib on the installed liblua.a. +INSTALL= install -p +INSTALL_EXEC= $(INSTALL) -m 0755 +INSTALL_DATA= $(INSTALL) -m 0644 +# +# If you don't have "install" you can use "cp" instead. +# INSTALL= cp -p +# INSTALL_EXEC= $(INSTALL) +# INSTALL_DATA= $(INSTALL) + +# Other utilities. +MKDIR= mkdir -p +RM= rm -f + +# == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= + +# Convenience platforms targets. +PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris + +# What to install. +TO_BIN= lua luac +TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp +TO_LIB= liblua.a +TO_MAN= lua.1 luac.1 + +# Lua version and release. +V= 5.2 +R= $V.1 + +# Targets start here. +all: $(PLAT) + +$(PLATS) clean: + cd src && $(MAKE) $@ + +test: dummy + src/lua -v + +install: dummy + cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) + cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN) + cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) + cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) + cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) + +uninstall: + cd src && cd $(INSTALL_BIN) && $(RM) $(TO_BIN) + cd src && cd $(INSTALL_INC) && $(RM) $(TO_INC) + cd src && cd $(INSTALL_LIB) && $(RM) $(TO_LIB) + cd doc && cd $(INSTALL_MAN) && $(RM) $(TO_MAN) + +local: + $(MAKE) install INSTALL_TOP=../install + +none: + @echo "Please do 'make PLATFORM' where PLATFORM is one of these:" + @echo " $(PLATS)" + @echo "See doc/readme.html for complete instructions." + +# make may get confused with test/ and install/ +dummy: + +# echo config parameters +echo: + @cd src && $(MAKE) -s echo + @echo "PLAT= $(PLAT)" + @echo "V= $V" + @echo "R= $R" + @echo "TO_BIN= $(TO_BIN)" + @echo "TO_INC= $(TO_INC)" + @echo "TO_LIB= $(TO_LIB)" + @echo "TO_MAN= $(TO_MAN)" + @echo "INSTALL_TOP= $(INSTALL_TOP)" + @echo "INSTALL_BIN= $(INSTALL_BIN)" + @echo "INSTALL_INC= $(INSTALL_INC)" + @echo "INSTALL_LIB= $(INSTALL_LIB)" + @echo "INSTALL_MAN= $(INSTALL_MAN)" + @echo "INSTALL_LMOD= $(INSTALL_LMOD)" + @echo "INSTALL_CMOD= $(INSTALL_CMOD)" + @echo "INSTALL_EXEC= $(INSTALL_EXEC)" + @echo "INSTALL_DATA= $(INSTALL_DATA)" + +# echo pkg-config data +pc: + @echo "version=$R" + @echo "prefix=$(INSTALL_TOP)" + @echo "libdir=$(INSTALL_LIB)" + @echo "includedir=$(INSTALL_INC)" + +# list targets that do not create files (but not all makes understand .PHONY) +.PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho + +# (end of Makefile) diff --git a/radio/src/lua/README b/radio/src/lua/README new file mode 100644 index 000000000..6e2aee6ce --- /dev/null +++ b/radio/src/lua/README @@ -0,0 +1,6 @@ + +This is Lua 5.2.2, released on 21 Mar 2013. + +For installation instructions, license details, and +further information about Lua, see doc/readme.html. + diff --git a/radio/src/lua/doc/contents.html b/radio/src/lua/doc/contents.html new file mode 100644 index 000000000..0ce297da1 --- /dev/null +++ b/radio/src/lua/doc/contents.html @@ -0,0 +1,533 @@ + + + +Lua 5.2 Reference Manual - contents + + + + + + + +


+

+ +Lua 5.2 Reference Manual +

+ +

+The reference manual is the official definition of the Lua language. +For a complete introduction to Lua programming, see the book +Programming in Lua. + +

+start +· +contents +· +index +


+ +Copyright © 2011–2013 Lua.org, PUC-Rio. +Freely available under the terms of the +Lua license. + + +

Contents

+ + +

Index

+ + + + + + + +
+

Lua functions

+

+_G
+_VERSION
+ +

+assert
+collectgarbage
+dofile
+error
+getmetatable
+ipairs
+load
+loadfile
+next
+pairs
+pcall
+print
+rawequal
+rawget
+rawlen
+rawset
+require
+select
+setmetatable
+tonumber
+tostring
+type
+xpcall
+ +

+bit32.arshift
+bit32.band
+bit32.bnot
+bit32.bor
+bit32.btest
+bit32.bxor
+bit32.extract
+bit32.lrotate
+bit32.lshift
+bit32.replace
+bit32.rrotate
+bit32.rshift
+ +

+coroutine.create
+coroutine.resume
+coroutine.running
+coroutine.status
+coroutine.wrap
+coroutine.yield
+ +

+debug.debug
+debug.getuservalue
+debug.gethook
+debug.getinfo
+debug.getlocal
+debug.getmetatable
+debug.getregistry
+debug.getupvalue
+debug.setuservalue
+debug.sethook
+debug.setlocal
+debug.setmetatable
+debug.setupvalue
+debug.traceback
+debug.upvalueid
+debug.upvaluejoin
+ +

+file:close
+file:flush
+file:lines
+file:read
+file:seek
+file:setvbuf
+file:write
+ +

+io.close
+io.flush
+io.input
+io.lines
+io.open
+io.output
+io.popen
+io.read
+io.stderr
+io.stdin
+io.stdout
+io.tmpfile
+io.type
+io.write
+ +

+

 

+

+math.abs
+math.acos
+math.asin
+math.atan
+math.atan2
+math.ceil
+math.cos
+math.cosh
+math.deg
+math.exp
+math.floor
+math.fmod
+math.frexp
+math.huge
+math.ldexp
+math.log
+math.max
+math.min
+math.modf
+math.pi
+math.pow
+math.rad
+math.random
+math.randomseed
+math.sin
+math.sinh
+math.sqrt
+math.tan
+math.tanh
+ +

+os.clock
+os.date
+os.difftime
+os.execute
+os.exit
+os.getenv
+os.remove
+os.rename
+os.setlocale
+os.time
+os.tmpname
+ +

+package.config
+package.cpath
+package.loaded
+package.loadlib
+package.path
+package.preload
+package.searchers
+package.searchpath
+ +

+string.byte
+string.char
+string.dump
+string.find
+string.format
+string.gmatch
+string.gsub
+string.len
+string.lower
+string.match
+string.rep
+string.reverse
+string.sub
+string.upper
+ +

+table.concat
+table.insert
+table.pack
+table.remove
+table.sort
+table.unpack
+ +

+

C API

+

+lua_Alloc
+lua_CFunction
+lua_Debug
+lua_Hook
+lua_Integer
+lua_Number
+lua_Reader
+lua_State
+lua_Unsigned
+lua_Writer
+ +

+lua_absindex
+lua_arith
+lua_atpanic
+lua_call
+lua_callk
+lua_checkstack
+lua_close
+lua_compare
+lua_concat
+lua_copy
+lua_createtable
+lua_dump
+lua_error
+lua_gc
+lua_getallocf
+lua_getctx
+lua_getfield
+lua_getglobal
+lua_gethook
+lua_gethookcount
+lua_gethookmask
+lua_getinfo
+lua_getlocal
+lua_getmetatable
+lua_getstack
+lua_gettable
+lua_gettop
+lua_getupvalue
+lua_getuservalue
+lua_insert
+lua_isboolean
+lua_iscfunction
+lua_isfunction
+lua_islightuserdata
+lua_isnil
+lua_isnone
+lua_isnoneornil
+lua_isnumber
+lua_isstring
+lua_istable
+lua_isthread
+lua_isuserdata
+lua_len
+lua_load
+lua_newstate
+lua_newtable
+lua_newthread
+lua_newuserdata
+lua_next
+lua_pcall
+lua_pcallk
+lua_pop
+lua_pushboolean
+lua_pushcclosure
+lua_pushcfunction
+lua_pushfstring
+lua_pushglobaltable
+lua_pushinteger
+lua_pushlightuserdata
+lua_pushliteral
+lua_pushlstring
+lua_pushnil
+lua_pushnumber
+lua_pushstring
+lua_pushthread
+lua_pushunsigned
+lua_pushvalue
+lua_pushvfstring
+lua_rawequal
+lua_rawget
+lua_rawgeti
+lua_rawgetp
+lua_rawlen
+lua_rawset
+lua_rawseti
+lua_rawsetp
+lua_register
+lua_remove
+lua_replace
+lua_resume
+lua_setallocf
+lua_setfield
+lua_setglobal
+lua_sethook
+lua_setlocal
+lua_setmetatable
+lua_settable
+lua_settop
+lua_setupvalue
+lua_setuservalue
+lua_status
+lua_toboolean
+lua_tocfunction
+lua_tointeger
+lua_tointegerx
+lua_tolstring
+lua_tonumber
+lua_tonumberx
+lua_topointer
+lua_tostring
+lua_tothread
+lua_tounsigned
+lua_tounsignedx
+lua_touserdata
+lua_type
+lua_typename
+lua_upvalueid
+lua_upvalueindex
+lua_upvaluejoin
+lua_version
+lua_xmove
+lua_yield
+lua_yieldk
+ +

+

auxiliary library

+

+luaL_Buffer
+luaL_Reg
+ +

+luaL_addchar
+luaL_addlstring
+luaL_addsize
+luaL_addstring
+luaL_addvalue
+luaL_argcheck
+luaL_argerror
+luaL_buffinit
+luaL_buffinitsize
+luaL_callmeta
+luaL_checkany
+luaL_checkint
+luaL_checkinteger
+luaL_checklong
+luaL_checklstring
+luaL_checknumber
+luaL_checkoption
+luaL_checkstack
+luaL_checkstring
+luaL_checktype
+luaL_checkudata
+luaL_checkunsigned
+luaL_checkversion
+luaL_dofile
+luaL_dostring
+luaL_error
+luaL_execresult
+luaL_fileresult
+luaL_getmetafield
+luaL_getmetatable
+luaL_getsubtable
+luaL_gsub
+luaL_len
+luaL_loadbuffer
+luaL_loadbufferx
+luaL_loadfile
+luaL_loadfilex
+luaL_loadstring
+luaL_newlib
+luaL_newlibtable
+luaL_newmetatable
+luaL_newstate
+luaL_openlibs
+luaL_optint
+luaL_optinteger
+luaL_optlong
+luaL_optlstring
+luaL_optnumber
+luaL_optstring
+luaL_optunsigned
+luaL_prepbuffer
+luaL_prepbuffsize
+luaL_pushresult
+luaL_pushresultsize
+luaL_ref
+luaL_requiref
+luaL_setfuncs
+luaL_setmetatable
+luaL_testudata
+luaL_tolstring
+luaL_traceback
+luaL_typename
+luaL_unref
+luaL_where
+ +

+ +
+ +Last update: +Tue Mar 12 11:22:18 BRT 2013 + + + + + diff --git a/radio/src/lua/doc/logo.gif b/radio/src/lua/doc/logo.gif new file mode 100644 index 0000000000000000000000000000000000000000..2f5e4ac2e742fbb7675e739879211553758aea9c GIT binary patch literal 4232 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 PWz_J}_#7St0k8iB@FZjZ literal 0 HcmV?d00001 diff --git a/radio/src/lua/doc/lua.1 b/radio/src/lua/doc/lua.1 new file mode 100644 index 000000000..1dbf04366 --- /dev/null +++ b/radio/src/lua/doc/lua.1 @@ -0,0 +1,116 @@ +.\" $Id: lua.man,v 1.13 2011/11/16 17:16:53 lhf Exp $ +.TH LUA 1 "$Date: 2011/11/16 17:16:53 $" +.SH NAME +lua \- Lua interpreter +.SH SYNOPSIS +.B lua +[ +.I options +] +[ +.I script +[ +.I args +] +] +.SH DESCRIPTION +.B lua +is the standalone Lua interpreter. +It loads and executes Lua programs, +either in textual source form or +in precompiled binary form. +(Precompiled binaries are output by +.BR luac , +the Lua compiler.) +.B lua +can be used as a batch interpreter and also interactively. +.LP +The given +.I options +are handled in order and then +the Lua program in file +.I script +is loaded and executed. +The given +.I args +are available to +.I script +as strings in a global table named +.BR arg . +If no options or arguments are given, +then +.B "\-v \-i" +is assumed when the standard input is a terminal; +otherwise, +.B "\-" +is assumed. +.LP +In interactive mode, +.B lua +prompts the user, +reads lines from the standard input, +and executes them as they are read. +If a line does not contain a complete statement, +then a secondary prompt is displayed and +lines are read until a complete statement is formed or +a syntax error is found. +If a line starts with +.BR '=' , +then +.B lua +evaluates and displays +the values of the expressions in the remainder of the line. +.LP +At the very start, +before even handling the command line, +.B lua +checks the contents of the environment variables +.B LUA_INIT_5_2 +or +.BR LUA_INIT , +in that order. +If the contents is of the form +.RI '@ filename ', +then +.I filename +is executed. +Otherwise, the string is assumed to be a Lua statement and is executed. +.SH OPTIONS +.TP +.BI \-e " stat" +execute statement +.IR stat . +.TP +.B \-i +enter interactive mode after executing +.IR script . +.TP +.BI \-l " name" +execute the equivalent of +.IB name =require(' name ') +before executing +.IR script . +.TP +.B \-v +show version information. +.TP +.B \-E +ignore environment variables. +.TP +.B \-\- +stop handling options. +.TP +.B \- +stop handling options and execute the standard input as a file. +.SH "SEE ALSO" +.BR luac (1) +.br +The documentation at lua.org, +especially section 7 of the reference manual. +.SH DIAGNOSTICS +Error messages should be self explanatory. +.SH AUTHORS +R. Ierusalimschy, +L. H. de Figueiredo, +W. Celes +.\" EOF diff --git a/radio/src/lua/doc/lua.css b/radio/src/lua/doc/lua.css new file mode 100644 index 000000000..240e85eb8 --- /dev/null +++ b/radio/src/lua/doc/lua.css @@ -0,0 +1,83 @@ +body { + color: #000000 ; + background-color: #FFFFFF ; + font-family: Helvetica, Arial, sans-serif ; + text-align: justify ; + margin-right: 30px ; + margin-left: 30px ; +} + +h1, h2, h3, h4 { + font-family: Verdana, Geneva, sans-serif ; + font-weight: normal ; + font-style: italic ; +} + +h2 { + padding-top: 0.4em ; + padding-bottom: 0.4em ; + padding-left: 1em ; + padding-right: 1em ; + background-color: #E0E0FF ; + border-radius: 8px ; +} + +h3 { + padding-left: 0.5em ; + border-left: solid #E0E0FF 1em ; +} + +table h3 { + padding-left: 0px ; + border-left: none ; +} + +a:link { + color: #000080 ; + background-color: inherit ; + text-decoration: none ; +} + +a:visited { + background-color: inherit ; + text-decoration: none ; +} + +a:link:hover, a:visited:hover { + color: #000080 ; + background-color: #E0E0FF ; +} + +a:link:active, a:visited:active { + color: #FF0000 ; +} + +hr { + border: 0 ; + height: 1px ; + color: #a0a0a0 ; + background-color: #a0a0a0 ; +} + +:target { + background-color: #F8F8F8 ; + padding: 8px ; + border: solid #a0a0a0 2px ; +} + +.footer { + color: gray ; + font-size: small ; +} + +input[type=text] { + border: solid #a0a0a0 2px ; + border-radius: 2em ; + -moz-border-radius: 2em ; + background-image: url('images/search.png') ; + background-repeat: no-repeat; + background-position: 4px center ; + padding-left: 20px ; + height: 2em ; +} + diff --git a/radio/src/lua/doc/luac.1 b/radio/src/lua/doc/luac.1 new file mode 100644 index 000000000..33a4ed00a --- /dev/null +++ b/radio/src/lua/doc/luac.1 @@ -0,0 +1,118 @@ +.\" $Id: luac.man,v 1.29 2011/11/16 13:53:40 lhf Exp $ +.TH LUAC 1 "$Date: 2011/11/16 13:53:40 $" +.SH NAME +luac \- Lua compiler +.SH SYNOPSIS +.B luac +[ +.I options +] [ +.I filenames +] +.SH DESCRIPTION +.B luac +is the Lua compiler. +It translates programs written in the Lua programming language +into binary files containing precompiled chunks +that can be later loaded and executed. +.LP +The main advantages of precompiling chunks are: +faster loading, +protecting source code from accidental user changes, +and +off-line syntax checking. +Precompiling does not imply faster execution +because in Lua chunks are always compiled into bytecodes before being executed. +.B luac +simply allows those bytecodes to be saved in a file for later execution. +Precompiled chunks are not necessarily smaller than the corresponding source. +The main goal in precompiling is faster loading. +.LP +In the command line, +you can mix +text files containing Lua source and +binary files containing precompiled chunks. +.B luac +produces a single output file containing the combined bytecodes +for all files given. +Executing the combined file is equivalent to executing the given files. +By default, +the output file is named +.BR luac.out , +but you can change this with the +.B \-o +option. +.LP +Precompiled chunks are +.I not +portable across different architectures. +Moreover, +the internal format of precompiled chunks +is likely to change when a new version of Lua is released. +Make sure you save the source files of all Lua programs that you precompile. +.LP +.SH OPTIONS +.TP +.B \-l +produce a listing of the compiled bytecode for Lua's virtual machine. +Listing bytecodes is useful to learn about Lua's virtual machine. +If no files are given, then +.B luac +loads +.B luac.out +and lists its contents. +Use +.B \-l \-l +for a full listing. +.TP +.BI \-o " file" +output to +.IR file , +instead of the default +.BR luac.out . +(You can use +.B "'\-'" +for standard output, +but not on platforms that open standard output in text mode.) +The output file may be one of the given files because +all files are loaded before the output file is written. +Be careful not to overwrite precious files. +.TP +.B \-p +load files but do not generate any output file. +Used mainly for syntax checking and for testing precompiled chunks: +corrupted files will probably generate errors when loaded. +If no files are given, then +.B luac +loads +.B luac.out +and tests its contents. +No messages are displayed if the file loads without errors. +.TP +.B \-s +strip debug information before writing the output file. +This saves some space in very large chunks, +but if errors occur when running a stripped chunk, +then the error messages may not contain the full information they usually do. +In particular, +line numbers and names of local variables are lost. +.TP +.B \-v +show version information. +.TP +.B \-\- +stop handling options. +.TP +.B \- +stop handling options and process standard input. +.SH "SEE ALSO" +.BR lua (1) +.br +The documentation at lua.org. +.SH DIAGNOSTICS +Error messages should be self explanatory. +.SH AUTHORS +R. Ierusalimschy, +L. H. de Figueiredo, +W. Celes +.\" EOF diff --git a/radio/src/lua/doc/manual.css b/radio/src/lua/doc/manual.css new file mode 100644 index 000000000..269bd4358 --- /dev/null +++ b/radio/src/lua/doc/manual.css @@ -0,0 +1,26 @@ +h3 code { + font-family: inherit ; + font-size: inherit ; +} + +pre, code { + font-size: 12pt ; +} + +span.apii { + float: right ; + font-family: inherit ; + font-style: normal ; + font-size: small ; + color: gray ; +} + +p+h1, ul+h1 { + padding-top: 0.4em ; + padding-bottom: 0.4em ; + padding-left: 24px ; + margin-left: -24px ; + background-color: #E0E0FF ; + border-radius: 8px ; +} + diff --git a/radio/src/lua/doc/manual.html b/radio/src/lua/doc/manual.html new file mode 100644 index 000000000..85365363f --- /dev/null +++ b/radio/src/lua/doc/manual.html @@ -0,0 +1,10507 @@ + + + + +Lua 5.2 Reference Manual + + + + + + + +
+

+ +Lua 5.2 Reference Manual +

+ +by Roberto Ierusalimschy, Luiz Henrique de Figueiredo, Waldemar Celes +

+ +Copyright © 2011–2013 Lua.org, PUC-Rio. +Freely available under the terms of the +Lua license. + +


+

+ +contents +· +index + + +

+ + + + + + +

1 – Introduction

+ +

+Lua is an extension programming language designed to support +general procedural programming with data description +facilities. +It also offers good support for object-oriented programming, +functional programming, and data-driven programming. +Lua is intended to be used as a powerful, lightweight, +embeddable scripting language for any program that needs one. +Lua is implemented as a library, written in clean C, +the common subset of Standard C and C++. + + +

+Being an extension language, Lua has no notion of a "main" program: +it only works embedded in a host client, +called the embedding program or simply the host. +The host program can invoke functions to execute a piece of Lua code, +can write and read Lua variables, +and can register C functions to be called by Lua code. +Through the use of C functions, Lua can be augmented to cope with +a wide range of different domains, +thus creating customized programming languages sharing a syntactical framework. +The Lua distribution includes a sample host program called lua, +which uses the Lua library to offer a complete, standalone Lua interpreter, +for interactive or batch use. + + +

+Lua is free software, +and is provided as usual with no guarantees, +as stated in its license. +The implementation described in this manual is available +at Lua's official web site, www.lua.org. + + +

+Like any other reference manual, +this document is dry in places. +For a discussion of the decisions behind the design of Lua, +see the technical papers available at Lua's web site. +For a detailed introduction to programming in Lua, +see Roberto's book, Programming in Lua. + + + +

2 – Basic Concepts

+ +

+This section describes the basic concepts of the language. + + + +

2.1 – Values and Types

+ +

+Lua is a dynamically typed language. +This means that +variables do not have types; only values do. +There are no type definitions in the language. +All values carry their own type. + + +

+All values in Lua are first-class values. +This means that all values can be stored in variables, +passed as arguments to other functions, and returned as results. + + +

+There are eight basic types in Lua: +nil, boolean, number, +string, function, userdata, +thread, and table. +Nil is the type of the value nil, +whose main property is to be different from any other value; +it usually represents the absence of a useful value. +Boolean is the type of the values false and true. +Both nil and false make a condition false; +any other value makes it true. +Number represents real (double-precision floating-point) numbers. +Operations on numbers follow the same rules of +the underlying C implementation, +which, in turn, usually follows the IEEE 754 standard. +(It is easy to build Lua interpreters that use other +internal representations for numbers, +such as single-precision floats or long integers; +see file luaconf.h.) +String represents immutable sequences of bytes. + +Lua is 8-bit clean: +strings can contain any 8-bit value, +including embedded zeros ('\0'). + + +

+Lua can call (and manipulate) functions written in Lua and +functions written in C +(see §3.4.9). + + +

+The type userdata is provided to allow arbitrary C data to +be stored in Lua variables. +A userdata value is a pointer to a block of raw memory. +There are two kinds of userdata: +full userdata, where the block of memory is managed by Lua, +and light userdata, where the block of memory is managed by the host. +Userdata has no predefined operations in Lua, +except assignment and identity test. +By using metatables, +the programmer can define operations for full userdata values +(see §2.4). +Userdata values cannot be created or modified in Lua, +only through the C API. +This guarantees the integrity of data owned by the host program. + + +

+The type thread represents independent threads of execution +and it is used to implement coroutines (see §2.6). +Do not confuse Lua threads with operating-system threads. +Lua supports coroutines on all systems, +even those that do not support threads. + + +

+The type table implements associative arrays, +that is, arrays that can be indexed not only with numbers, +but with any Lua value except nil and NaN +(Not a Number, a special numeric value used to represent +undefined or unrepresentable results, such as 0/0). +Tables can be heterogeneous; +that is, they can contain values of all types (except nil). +Any key with value nil is not considered part of the table. +Conversely, any key that is not part of a table has +an associated value nil. + + +

+Tables are the sole data structuring mechanism in Lua; +they can be used to represent ordinary arrays, sequences, +symbol tables, sets, records, graphs, trees, etc. +To represent records, Lua uses the field name as an index. +The language supports this representation by +providing a.name as syntactic sugar for a["name"]. +There are several convenient ways to create tables in Lua +(see §3.4.8). + + +

+We use the term sequence to denote a table where +the set of all positive numeric keys is equal to {1..n} +for some integer n, +which is called the length of the sequence (see §3.4.6). + + +

+Like indices, +the values of table fields can be of any type. +In particular, +because functions are first-class values, +table fields can contain functions. +Thus tables can also carry methods (see §3.4.10). + + +

+The indexing of tables follows +the definition of raw equality in the language. +The expressions a[i] and a[j] +denote the same table element +if and only if i and j are raw equal +(that is, equal without metamethods). + + +

+Tables, functions, threads, and (full) userdata values are objects: +variables do not actually contain these values, +only references to them. +Assignment, parameter passing, and function returns +always manipulate references to such values; +these operations do not imply any kind of copy. + + +

+The library function type returns a string describing the type +of a given value (see §6.1). + + + + + +

2.2 – Environments and the Global Environment

+ +

+As will be discussed in §3.2 and §3.3.3, +any reference to a global name var is syntactically translated +to _ENV.var. +Moreover, every chunk is compiled in the scope of +an external local variable called _ENV (see §3.3.2), +so _ENV itself is never a global name in a chunk. + + +

+Despite the existence of this external _ENV variable and +the translation of global names, +_ENV is a completely regular name. +In particular, +you can define new variables and parameters with that name. +Each reference to a global name uses the _ENV that is +visible at that point in the program, +following the usual visibility rules of Lua (see §3.5). + + +

+Any table used as the value of _ENV is called an environment. + + +

+Lua keeps a distinguished environment called the global environment. +This value is kept at a special index in the C registry (see §4.5). +In Lua, the variable _G is initialized with this same value. + + +

+When Lua compiles a chunk, +it initializes the value of its _ENV upvalue +with the global environment (see load). +Therefore, by default, +global variables in Lua code refer to entries in the global environment. +Moreover, all standard libraries are loaded in the global environment +and several functions there operate on that environment. +You can use load (or loadfile) +to load a chunk with a different environment. +(In C, you have to load the chunk and then change the value +of its first upvalue.) + + +

+If you change the global environment in the registry +(through C code or the debug library), +all chunks loaded after the change will get the new environment. +Previously loaded chunks are not affected, however, +as each has its own reference to the environment in its _ENV variable. +Moreover, the variable _G +(which is stored in the original global environment) +is never updated by Lua. + + + + + +

2.3 – Error Handling

+ +

+Because Lua is an embedded extension language, +all Lua actions start from C code in the host program +calling a function from the Lua library (see lua_pcall). +Whenever an error occurs during +the compilation or execution of a Lua chunk, +control returns to the host, +which can take appropriate measures +(such as printing an error message). + + +

+Lua code can explicitly generate an error by calling the +error function. +If you need to catch errors in Lua, +you can use pcall or xpcall +to call a given function in protected mode. + + +

+Whenever there is an error, +an error object (also called an error message) +is propagated with information about the error. +Lua itself only generates errors where the error object is a string, +but programs may generate errors with +any value for the error object. + + +

+When you use xpcall or lua_pcall, +you may give a message handler +to be called in case of errors. +This function is called with the original error message +and returns a new error message. +It is called before the error unwinds the stack, +so that it can gather more information about the error, +for instance by inspecting the stack and creating a stack traceback. +This message handler is still protected by the protected call; +so, an error inside the message handler +will call the message handler again. +If this loop goes on, Lua breaks it and returns an appropriate message. + + + + + +

2.4 – Metatables and Metamethods

+ +

+Every value in Lua can have a metatable. +This metatable is an ordinary Lua table +that defines the behavior of the original value +under certain special operations. +You can change several aspects of the behavior +of operations over a value by setting specific fields in its metatable. +For instance, when a non-numeric value is the operand of an addition, +Lua checks for a function in the field "__add" of the value's metatable. +If it finds one, +Lua calls this function to perform the addition. + + +

+The keys in a metatable are derived from the event names; +the corresponding values are called metamethods. +In the previous example, the event is "add" +and the metamethod is the function that performs the addition. + + +

+You can query the metatable of any value +using the getmetatable function. + + +

+You can replace the metatable of tables +using the setmetatable function. +You cannot change the metatable of other types from Lua +(except by using the debug library); +you must use the C API for that. + + +

+Tables and full userdata have individual metatables +(although multiple tables and userdata can share their metatables). +Values of all other types share one single metatable per type; +that is, there is one single metatable for all numbers, +one for all strings, etc. +By default, a value has no metatable, +but the string library sets a metatable for the string type (see §6.4). + + +

+A metatable controls how an object behaves in arithmetic operations, +order comparisons, concatenation, length operation, and indexing. +A metatable also can define a function to be called +when a userdata or a table is garbage collected. +When Lua performs one of these operations over a value, +it checks whether this value has a metatable with the corresponding event. +If so, the value associated with that key (the metamethod) +controls how Lua will perform the operation. + + +

+Metatables control the operations listed next. +Each operation is identified by its corresponding name. +The key for each operation is a string with its name prefixed by +two underscores, '__'; +for instance, the key for operation "add" is the +string "__add". + + +

+The semantics of these operations is better explained by a Lua function +describing how the interpreter executes the operation. +The code shown here in Lua is only illustrative; +the real behavior is hard coded in the interpreter +and it is much more efficient than this simulation. +All functions used in these descriptions +(rawget, tonumber, etc.) +are described in §6.1. +In particular, to retrieve the metamethod of a given object, +we use the expression + +

+     metatable(obj)[event]
+

+This should be read as + +

+     rawget(getmetatable(obj) or {}, event)
+

+This means that the access to a metamethod does not invoke other metamethods, +and access to objects with no metatables does not fail +(it simply results in nil). + + +

+For the unary - and # operators, +the metamethod is called with a dummy second argument. +This extra argument is only to simplify Lua's internals; +it may be removed in future versions and therefore it is not present +in the following code. +(For most uses this extra argument is irrelevant.) + + + +

    + +
  • "add": +the + operation. + + + +

    +The function getbinhandler below defines how Lua chooses a handler +for a binary operation. +First, Lua tries the first operand. +If its type does not define a handler for the operation, +then Lua tries the second operand. + +

    +     function getbinhandler (op1, op2, event)
    +       return metatable(op1)[event] or metatable(op2)[event]
    +     end
    +

    +By using this function, +the behavior of the op1 + op2 is + +

    +     function add_event (op1, op2)
    +       local o1, o2 = tonumber(op1), tonumber(op2)
    +       if o1 and o2 then  -- both operands are numeric?
    +         return o1 + o2   -- '+' here is the primitive 'add'
    +       else  -- at least one of the operands is not numeric
    +         local h = getbinhandler(op1, op2, "__add")
    +         if h then
    +           -- call the handler with both operands
    +           return (h(op1, op2))
    +         else  -- no handler available: default behavior
    +           error(···)
    +         end
    +       end
    +     end
    +

    +

  • + +
  • "sub": +the - operation. + +Behavior similar to the "add" operation. +
  • + +
  • "mul": +the * operation. + +Behavior similar to the "add" operation. +
  • + +
  • "div": +the / operation. + +Behavior similar to the "add" operation. +
  • + +
  • "mod": +the % operation. + +Behavior similar to the "add" operation, +with the operation +o1 - floor(o1/o2)*o2 as the primitive operation. +
  • + +
  • "pow": +the ^ (exponentiation) operation. + +Behavior similar to the "add" operation, +with the function pow (from the C math library) +as the primitive operation. +
  • + +
  • "unm": +the unary - operation. + + +
    +     function unm_event (op)
    +       local o = tonumber(op)
    +       if o then  -- operand is numeric?
    +         return -o  -- '-' here is the primitive 'unm'
    +       else  -- the operand is not numeric.
    +         -- Try to get a handler from the operand
    +         local h = metatable(op).__unm
    +         if h then
    +           -- call the handler with the operand
    +           return (h(op))
    +         else  -- no handler available: default behavior
    +           error(···)
    +         end
    +       end
    +     end
    +

    +

  • + +
  • "concat": +the .. (concatenation) operation. + + +
    +     function concat_event (op1, op2)
    +       if (type(op1) == "string" or type(op1) == "number") and
    +          (type(op2) == "string" or type(op2) == "number") then
    +         return op1 .. op2  -- primitive string concatenation
    +       else
    +         local h = getbinhandler(op1, op2, "__concat")
    +         if h then
    +           return (h(op1, op2))
    +         else
    +           error(···)
    +         end
    +       end
    +     end
    +

    +

  • + +
  • "len": +the # operation. + + +
    +     function len_event (op)
    +       if type(op) == "string" then
    +         return strlen(op)      -- primitive string length
    +       else
    +         local h = metatable(op).__len
    +         if h then
    +           return (h(op))       -- call handler with the operand
    +         elseif type(op) == "table" then
    +           return #op              -- primitive table length
    +         else  -- no handler available: error
    +           error(···)
    +         end
    +       end
    +     end
    +

    +See §3.4.6 for a description of the length of a table. +

  • + +
  • "eq": +the == operation. + +The function getequalhandler defines how Lua chooses a metamethod +for equality. +A metamethod is selected only when both values +being compared have the same type +and the same metamethod for the selected operation, +and the values are either tables or full userdata. + +
    +     function getequalhandler (op1, op2)
    +       if type(op1) ~= type(op2) or
    +          (type(op1) ~= "table" and type(op1) ~= "userdata") then
    +         return nil     -- different values
    +       end
    +       local mm1 = metatable(op1).__eq
    +       local mm2 = metatable(op2).__eq
    +       if mm1 == mm2 then return mm1 else return nil end
    +     end
    +

    +The "eq" event is defined as follows: + +

    +     function eq_event (op1, op2)
    +       if op1 == op2 then   -- primitive equal?
    +         return true   -- values are equal
    +       end
    +       -- try metamethod
    +       local h = getequalhandler(op1, op2)
    +       if h then
    +         return not not h(op1, op2)
    +       else
    +         return false
    +       end
    +     end
    +

    +Note that the result is always a boolean. +

  • + +
  • "lt": +the < operation. + + +
    +     function lt_event (op1, op2)
    +       if type(op1) == "number" and type(op2) == "number" then
    +         return op1 < op2   -- numeric comparison
    +       elseif type(op1) == "string" and type(op2) == "string" then
    +         return op1 < op2   -- lexicographic comparison
    +       else
    +         local h = getbinhandler(op1, op2, "__lt")
    +         if h then
    +           return not not h(op1, op2)
    +         else
    +           error(···)
    +         end
    +       end
    +     end
    +

    +Note that the result is always a boolean. +

  • + +
  • "le": +the <= operation. + + +
    +     function le_event (op1, op2)
    +       if type(op1) == "number" and type(op2) == "number" then
    +         return op1 <= op2   -- numeric comparison
    +       elseif type(op1) == "string" and type(op2) == "string" then
    +         return op1 <= op2   -- lexicographic comparison
    +       else
    +         local h = getbinhandler(op1, op2, "__le")
    +         if h then
    +           return not not h(op1, op2)
    +         else
    +           h = getbinhandler(op1, op2, "__lt")
    +           if h then
    +             return not h(op2, op1)
    +           else
    +             error(···)
    +           end
    +         end
    +       end
    +     end
    +

    +Note that, in the absence of a "le" metamethod, +Lua tries the "lt", assuming that a <= b is +equivalent to not (b < a). + + +

    +As with the other comparison operators, +the result is always a boolean. +

  • + +
  • "index": +The indexing access table[key]. +Note that the metamethod is tried only +when key is not present in table. +(When table is not a table, +no key is ever present, +so the metamethod is always tried.) + + +
    +     function gettable_event (table, key)
    +       local h
    +       if type(table) == "table" then
    +         local v = rawget(table, key)
    +         -- if key is present, return raw value
    +         if v ~= nil then return v end
    +         h = metatable(table).__index
    +         if h == nil then return nil end
    +       else
    +         h = metatable(table).__index
    +         if h == nil then
    +           error(···)
    +         end
    +       end
    +       if type(h) == "function" then
    +         return (h(table, key))     -- call the handler
    +       else return h[key]           -- or repeat operation on it
    +       end
    +     end
    +

    +

  • + +
  • "newindex": +The indexing assignment table[key] = value. +Note that the metamethod is tried only +when key is not present in table. + + +
    +     function settable_event (table, key, value)
    +       local h
    +       if type(table) == "table" then
    +         local v = rawget(table, key)
    +         -- if key is present, do raw assignment
    +         if v ~= nil then rawset(table, key, value); return end
    +         h = metatable(table).__newindex
    +         if h == nil then rawset(table, key, value); return end
    +       else
    +         h = metatable(table).__newindex
    +         if h == nil then
    +           error(···)
    +         end
    +       end
    +       if type(h) == "function" then
    +         h(table, key,value)           -- call the handler
    +       else h[key] = value             -- or repeat operation on it
    +       end
    +     end
    +

    +

  • + +
  • "call": +called when Lua calls a value. + + +
    +     function function_event (func, ...)
    +       if type(func) == "function" then
    +         return func(...)   -- primitive call
    +       else
    +         local h = metatable(func).__call
    +         if h then
    +           return h(func, ...)
    +         else
    +           error(···)
    +         end
    +       end
    +     end
    +

    +

  • + +
+ + + + +

2.5 – Garbage Collection

+ +

+Lua performs automatic memory management. +This means that +you have to worry neither about allocating memory for new objects +nor about freeing it when the objects are no longer needed. +Lua manages memory automatically by running +a garbage collector to collect all dead objects +(that is, objects that are no longer accessible from Lua). +All memory used by Lua is subject to automatic management: +strings, tables, userdata, functions, threads, internal structures, etc. + + +

+Lua implements an incremental mark-and-sweep collector. +It uses two numbers to control its garbage-collection cycles: +the garbage-collector pause and +the garbage-collector step multiplier. +Both use percentage points as units +(e.g., a value of 100 means an internal value of 1). + + +

+The garbage-collector pause +controls how long the collector waits before starting a new cycle. +Larger values make the collector less aggressive. +Values smaller than 100 mean the collector will not wait to +start a new cycle. +A value of 200 means that the collector waits for the total memory in use +to double before starting a new cycle. + + +

+The garbage-collector step multiplier +controls the relative speed of the collector relative to +memory allocation. +Larger values make the collector more aggressive but also increase +the size of each incremental step. +Values smaller than 100 make the collector too slow and +can result in the collector never finishing a cycle. +The default is 200, +which means that the collector runs at "twice" +the speed of memory allocation. + + +

+If you set the step multiplier to a very large number +(larger than 10% of the maximum number of +bytes that the program may use), +the collector behaves like a stop-the-world collector. +If you then set the pause to 200, +the collector behaves as in old Lua versions, +doing a complete collection every time Lua doubles its +memory usage. + + +

+You can change these numbers by calling lua_gc in C +or collectgarbage in Lua. +You can also use these functions to control +the collector directly (e.g., stop and restart it). + + +

+As an experimental feature in Lua 5.2, +you can change the collector's operation mode +from incremental to generational. +A generational collector assumes that most objects die young, +and therefore it traverses only young (recently created) objects. +This behavior can reduce the time used by the collector, +but also increases memory usage (as old dead objects may accumulate). +To mitigate this second problem, +from time to time the generational collector performs a full collection. +Remember that this is an experimental feature; +you are welcome to try it, +but check your gains. + + + +

2.5.1 – Garbage-Collection Metamethods

+ +

+You can set garbage-collector metamethods for tables +and, using the C API, +for full userdata (see §2.4). +These metamethods are also called finalizers. +Finalizers allow you to coordinate Lua's garbage collection +with external resource management +(such as closing files, network or database connections, +or freeing your own memory). + + +

+For an object (table or userdata) to be finalized when collected, +you must mark it for finalization. + +You mark an object for finalization when you set its metatable +and the metatable has a field indexed by the string "__gc". +Note that if you set a metatable without a __gc field +and later create that field in the metatable, +the object will not be marked for finalization. +However, after an object is marked, +you can freely change the __gc field of its metatable. + + +

+When a marked object becomes garbage, +it is not collected immediately by the garbage collector. +Instead, Lua puts it in a list. +After the collection, +Lua does the equivalent of the following function +for each object in that list: + +

+     function gc_event (obj)
+       local h = metatable(obj).__gc
+       if type(h) == "function" then
+         h(obj)
+       end
+     end
+
+ +

+At the end of each garbage-collection cycle, +the finalizers for objects are called in +the reverse order that they were marked for collection, +among those collected in that cycle; +that is, the first finalizer to be called is the one associated +with the object marked last in the program. +The execution of each finalizer may occur at any point during +the execution of the regular code. + + +

+Because the object being collected must still be used by the finalizer, +it (and other objects accessible only through it) +must be resurrected by Lua. +Usually, this resurrection is transient, +and the object memory is freed in the next garbage-collection cycle. +However, if the finalizer stores the object in some global place +(e.g., a global variable), +then there is a permanent resurrection. +In any case, +the object memory is freed only when it becomes completely inaccessible; +its finalizer will never be called twice. + + +

+When you close a state (see lua_close), +Lua calls the finalizers of all objects marked for finalization, +following the reverse order that they were marked. +If any finalizer marks new objects for collection during that phase, +these new objects will not be finalized. + + + + + +

2.5.2 – Weak Tables

+ +

+A weak table is a table whose elements are +weak references. +A weak reference is ignored by the garbage collector. +In other words, +if the only references to an object are weak references, +then the garbage collector will collect that object. + + +

+A weak table can have weak keys, weak values, or both. +A table with weak keys allows the collection of its keys, +but prevents the collection of its values. +A table with both weak keys and weak values allows the collection of +both keys and values. +In any case, if either the key or the value is collected, +the whole pair is removed from the table. +The weakness of a table is controlled by the +__mode field of its metatable. +If the __mode field is a string containing the character 'k', +the keys in the table are weak. +If __mode contains 'v', +the values in the table are weak. + + +

+A table with weak keys and strong values +is also called an ephemeron table. +In an ephemeron table, +a value is considered reachable only if its key is reachable. +In particular, +if the only reference to a key comes through its value, +the pair is removed. + + +

+Any change in the weakness of a table may take effect only +at the next collect cycle. +In particular, if you change the weakness to a stronger mode, +Lua may still collect some items from that table +before the change takes effect. + + +

+Only objects that have an explicit construction +are removed from weak tables. +Values, such as numbers and light C functions, +are not subject to garbage collection, +and therefore are not removed from weak tables +(unless its associated value is collected). +Although strings are subject to garbage collection, +they do not have an explicit construction, +and therefore are not removed from weak tables. + + +

+Resurrected objects +(that is, objects being finalized +and objects accessible only through objects being finalized) +have a special behavior in weak tables. +They are removed from weak values before running their finalizers, +but are removed from weak keys only in the next collection +after running their finalizers, when such objects are actually freed. +This behavior allows the finalizer to access properties +associated with the object through weak tables. + + +

+If a weak table is among the resurrected objects in a collection cycle, +it may not be properly cleared until the next cycle. + + + + + + + +

2.6 – Coroutines

+ +

+Lua supports coroutines, +also called collaborative multithreading. +A coroutine in Lua represents an independent thread of execution. +Unlike threads in multithread systems, however, +a coroutine only suspends its execution by explicitly calling +a yield function. + + +

+You create a coroutine by calling coroutine.create. +Its sole argument is a function +that is the main function of the coroutine. +The create function only creates a new coroutine and +returns a handle to it (an object of type thread); +it does not start the coroutine. + + +

+You execute a coroutine by calling coroutine.resume. +When you first call coroutine.resume, +passing as its first argument +a thread returned by coroutine.create, +the coroutine starts its execution, +at the first line of its main function. +Extra arguments passed to coroutine.resume are passed on +to the coroutine main function. +After the coroutine starts running, +it runs until it terminates or yields. + + +

+A coroutine can terminate its execution in two ways: +normally, when its main function returns +(explicitly or implicitly, after the last instruction); +and abnormally, if there is an unprotected error. +In the first case, coroutine.resume returns true, +plus any values returned by the coroutine main function. +In case of errors, coroutine.resume returns false +plus an error message. + + +

+A coroutine yields by calling coroutine.yield. +When a coroutine yields, +the corresponding coroutine.resume returns immediately, +even if the yield happens inside nested function calls +(that is, not in the main function, +but in a function directly or indirectly called by the main function). +In the case of a yield, coroutine.resume also returns true, +plus any values passed to coroutine.yield. +The next time you resume the same coroutine, +it continues its execution from the point where it yielded, +with the call to coroutine.yield returning any extra +arguments passed to coroutine.resume. + + +

+Like coroutine.create, +the coroutine.wrap function also creates a coroutine, +but instead of returning the coroutine itself, +it returns a function that, when called, resumes the coroutine. +Any arguments passed to this function +go as extra arguments to coroutine.resume. +coroutine.wrap returns all the values returned by coroutine.resume, +except the first one (the boolean error code). +Unlike coroutine.resume, +coroutine.wrap does not catch errors; +any error is propagated to the caller. + + +

+As an example of how coroutines work, +consider the following code: + +

+     function foo (a)
+       print("foo", a)
+       return coroutine.yield(2*a)
+     end
+     
+     co = coroutine.create(function (a,b)
+           print("co-body", a, b)
+           local r = foo(a+1)
+           print("co-body", r)
+           local r, s = coroutine.yield(a+b, a-b)
+           print("co-body", r, s)
+           return b, "end"
+     end)
+     
+     print("main", coroutine.resume(co, 1, 10))
+     print("main", coroutine.resume(co, "r"))
+     print("main", coroutine.resume(co, "x", "y"))
+     print("main", coroutine.resume(co, "x", "y"))
+

+When you run it, it produces the following output: + +

+     co-body 1       10
+     foo     2
+     main    true    4
+     co-body r
+     main    true    11      -9
+     co-body x       y
+     main    true    10      end
+     main    false   cannot resume dead coroutine
+
+ +

+You can also create and manipulate coroutines through the C API: +see functions lua_newthread, lua_resume, +and lua_yield. + + + + + +

3 – The Language

+ +

+This section describes the lexis, the syntax, and the semantics of Lua. +In other words, +this section describes +which tokens are valid, +how they can be combined, +and what their combinations mean. + + +

+Language constructs will be explained using the usual extended BNF notation, +in which +{a} means 0 or more a's, and +[a] means an optional a. +Non-terminals are shown like non-terminal, +keywords are shown like kword, +and other terminal symbols are shown like ‘=’. +The complete syntax of Lua can be found in §9 +at the end of this manual. + + + +

3.1 – Lexical Conventions

+ +

+Lua is a free-form language. +It ignores spaces (including new lines) and comments +between lexical elements (tokens), +except as delimiters between names and keywords. + + +

+Names +(also called identifiers) +in Lua can be any string of letters, +digits, and underscores, +not beginning with a digit. +Identifiers are used to name variables, table fields, and labels. + + +

+The following keywords are reserved +and cannot be used as names: + + +

+     and       break     do        else      elseif    end
+     false     for       function  goto      if        in
+     local     nil       not       or        repeat    return
+     then      true      until     while
+
+ +

+Lua is a case-sensitive language: +and is a reserved word, but And and AND +are two different, valid names. +As a convention, names starting with an underscore followed by +uppercase letters (such as _VERSION) +are reserved for variables used by Lua. + + +

+The following strings denote other tokens: + +

+     +     -     *     /     %     ^     #
+     ==    ~=    <=    >=    <     >     =
+     (     )     {     }     [     ]     ::
+     ;     :     ,     .     ..    ...
+
+ +

+Literal strings +can be delimited by matching single or double quotes, +and can contain the following C-like escape sequences: +'\a' (bell), +'\b' (backspace), +'\f' (form feed), +'\n' (newline), +'\r' (carriage return), +'\t' (horizontal tab), +'\v' (vertical tab), +'\\' (backslash), +'\"' (quotation mark [double quote]), +and '\'' (apostrophe [single quote]). +A backslash followed by a real newline +results in a newline in the string. +The escape sequence '\z' skips the following span +of white-space characters, +including line breaks; +it is particularly useful to break and indent a long literal string +into multiple lines without adding the newlines and spaces +into the string contents. + + +

+A byte in a literal string can also be specified by its numerical value. +This can be done with the escape sequence \xXX, +where XX is a sequence of exactly two hexadecimal digits, +or with the escape sequence \ddd, +where ddd is a sequence of up to three decimal digits. +(Note that if a decimal escape is to be followed by a digit, +it must be expressed using exactly three digits.) +Strings in Lua can contain any 8-bit value, including embedded zeros, +which can be specified as '\0'. + + +

+Literal strings can also be defined using a long format +enclosed by long brackets. +We define an opening long bracket of level n as an opening +square bracket followed by n equal signs followed by another +opening square bracket. +So, an opening long bracket of level 0 is written as [[, +an opening long bracket of level 1 is written as [=[, +and so on. +A closing long bracket is defined similarly; +for instance, a closing long bracket of level 4 is written as ]====]. +A long literal starts with an opening long bracket of any level and +ends at the first closing long bracket of the same level. +It can contain any text except a closing bracket of the proper level. +Literals in this bracketed form can run for several lines, +do not interpret any escape sequences, +and ignore long brackets of any other level. +Any kind of end-of-line sequence +(carriage return, newline, carriage return followed by newline, +or newline followed by carriage return) +is converted to a simple newline. + + +

+Any byte in a literal string not +explicitly affected by the previous rules represents itself. +However, Lua opens files for parsing in text mode, +and the system file functions may have problems with +some control characters. +So, it is safer to represent +non-text data as a quoted literal with +explicit escape sequences for non-text characters. + + +

+For convenience, +when the opening long bracket is immediately followed by a newline, +the newline is not included in the string. +As an example, in a system using ASCII +(in which 'a' is coded as 97, +newline is coded as 10, and '1' is coded as 49), +the five literal strings below denote the same string: + +

+     a = 'alo\n123"'
+     a = "alo\n123\""
+     a = '\97lo\10\04923"'
+     a = [[alo
+     123"]]
+     a = [==[
+     alo
+     123"]==]
+
+ +

+A numerical constant can be written with an optional fractional part +and an optional decimal exponent, +marked by a letter 'e' or 'E'. +Lua also accepts hexadecimal constants, +which start with 0x or 0X. +Hexadecimal constants also accept an optional fractional part +plus an optional binary exponent, +marked by a letter 'p' or 'P'. +Examples of valid numerical constants are + +

+     3     3.0     3.1416     314.16e-2     0.31416E1
+     0xff  0x0.1E  0xA23p-4   0X1.921FB54442D18P+1
+
+ +

+A comment starts with a double hyphen (--) +anywhere outside a string. +If the text immediately after -- is not an opening long bracket, +the comment is a short comment, +which runs until the end of the line. +Otherwise, it is a long comment, +which runs until the corresponding closing long bracket. +Long comments are frequently used to disable code temporarily. + + + + + +

3.2 – Variables

+ +

+Variables are places that store values. +There are three kinds of variables in Lua: +global variables, local variables, and table fields. + + +

+A single name can denote a global variable or a local variable +(or a function's formal parameter, +which is a particular kind of local variable): + +

+	var ::= Name
+

+Name denotes identifiers, as defined in §3.1. + + +

+Any variable name is assumed to be global unless explicitly declared +as a local (see §3.3.7). +Local variables are lexically scoped: +local variables can be freely accessed by functions +defined inside their scope (see §3.5). + + +

+Before the first assignment to a variable, its value is nil. + + +

+Square brackets are used to index a table: + +

+	var ::= prefixexp ‘[’ exp ‘]’
+

+The meaning of accesses to table fields can be changed via metatables. +An access to an indexed variable t[i] is equivalent to +a call gettable_event(t,i). +(See §2.4 for a complete description of the +gettable_event function. +This function is not defined or callable in Lua. +We use it here only for explanatory purposes.) + + +

+The syntax var.Name is just syntactic sugar for +var["Name"]: + +

+	var ::= prefixexp ‘.’ Name
+
+ +

+An access to a global variable x +is equivalent to _ENV.x. +Due to the way that chunks are compiled, +_ENV is never a global name (see §2.2). + + + + + +

3.3 – Statements

+ +

+Lua supports an almost conventional set of statements, +similar to those in Pascal or C. +This set includes +assignments, control structures, function calls, +and variable declarations. + + + +

3.3.1 – Blocks

+ +

+A block is a list of statements, +which are executed sequentially: + +

+	block ::= {stat}
+

+Lua has empty statements +that allow you to separate statements with semicolons, +start a block with a semicolon +or write two semicolons in sequence: + +

+	stat ::= ‘;’
+
+ +

+Function calls and assignments +can start with an open parenthesis. +This possibility leads to an ambiguity in Lua's grammar. +Consider the following fragment: + +

+     a = b + c
+     (print or io.write)('done')
+

+The grammar could see it in two ways: + +

+     a = b + c(print or io.write)('done')
+     
+     a = b + c; (print or io.write)('done')
+

+The current parser always sees such constructions +in the first way, +interpreting the open parenthesis +as the start of the arguments to a call. +To avoid this ambiguity, +it is a good practice to always precede with a semicolon +statements that start with a parenthesis: + +

+     ;(print or io.write)('done')
+
+ +

+A block can be explicitly delimited to produce a single statement: + +

+	stat ::= do block end
+

+Explicit blocks are useful +to control the scope of variable declarations. +Explicit blocks are also sometimes used to +add a return statement in the middle +of another block (see §3.3.4). + + + + + +

3.3.2 – Chunks

+ +

+The unit of compilation of Lua is called a chunk. +Syntactically, +a chunk is simply a block: + +

+	chunk ::= block
+
+ +

+Lua handles a chunk as the body of an anonymous function +with a variable number of arguments +(see §3.4.10). +As such, chunks can define local variables, +receive arguments, and return values. +Moreover, such anonymous function is compiled as in the +scope of an external local variable called _ENV (see §2.2). +The resulting function always has _ENV as its only upvalue, +even if it does not use that variable. + + +

+A chunk can be stored in a file or in a string inside the host program. +To execute a chunk, +Lua first precompiles the chunk into instructions for a virtual machine, +and then it executes the compiled code +with an interpreter for the virtual machine. + + +

+Chunks can also be precompiled into binary form; +see program luac for details. +Programs in source and compiled forms are interchangeable; +Lua automatically detects the file type and acts accordingly. + + + + + + +

3.3.3 – Assignment

+ +

+Lua allows multiple assignments. +Therefore, the syntax for assignment +defines a list of variables on the left side +and a list of expressions on the right side. +The elements in both lists are separated by commas: + +

+	stat ::= varlist ‘=’ explist
+	varlist ::= var {‘,’ var}
+	explist ::= exp {‘,’ exp}
+

+Expressions are discussed in §3.4. + + +

+Before the assignment, +the list of values is adjusted to the length of +the list of variables. +If there are more values than needed, +the excess values are thrown away. +If there are fewer values than needed, +the list is extended with as many nil's as needed. +If the list of expressions ends with a function call, +then all values returned by that call enter the list of values, +before the adjustment +(except when the call is enclosed in parentheses; see §3.4). + + +

+The assignment statement first evaluates all its expressions +and only then are the assignments performed. +Thus the code + +

+     i = 3
+     i, a[i] = i+1, 20
+

+sets a[3] to 20, without affecting a[4] +because the i in a[i] is evaluated (to 3) +before it is assigned 4. +Similarly, the line + +

+     x, y = y, x
+

+exchanges the values of x and y, +and + +

+     x, y, z = y, z, x
+

+cyclically permutes the values of x, y, and z. + + +

+The meaning of assignments to global variables +and table fields can be changed via metatables. +An assignment to an indexed variable t[i] = val is equivalent to +settable_event(t,i,val). +(See §2.4 for a complete description of the +settable_event function. +This function is not defined or callable in Lua. +We use it here only for explanatory purposes.) + + +

+An assignment to a global variable x = val +is equivalent to the assignment +_ENV.x = val (see §2.2). + + + + + +

3.3.4 – Control Structures

+The control structures +if, while, and repeat have the usual meaning and +familiar syntax: + + + + +

+	stat ::= while exp do block end
+	stat ::= repeat block until exp
+	stat ::= if exp then block {elseif exp then block} [else block] end
+

+Lua also has a for statement, in two flavors (see §3.3.5). + + +

+The condition expression of a +control structure can return any value. +Both false and nil are considered false. +All values different from nil and false are considered true +(in particular, the number 0 and the empty string are also true). + + +

+In the repeat–until loop, +the inner block does not end at the until keyword, +but only after the condition. +So, the condition can refer to local variables +declared inside the loop block. + + +

+The goto statement transfers the program control to a label. +For syntactical reasons, +labels in Lua are considered statements too: + + + +

+	stat ::= goto Name
+	stat ::= label
+	label ::= ‘::’ Name ‘::’
+
+ +

+A label is visible in the entire block where it is defined, +except +inside nested blocks where a label with the same name is defined and +inside nested functions. +A goto may jump to any visible label as long as it does not +enter into the scope of a local variable. + + +

+Labels and empty statements are called void statements, +as they perform no actions. + + +

+The break statement terminates the execution of a +while, repeat, or for loop, +skipping to the next statement after the loop: + + +

+	stat ::= break
+

+A break ends the innermost enclosing loop. + + +

+The return statement is used to return values +from a function or a chunk (which is a function in disguise). + +Functions can return more than one value, +so the syntax for the return statement is + +

+	stat ::= return [explist] [‘;’]
+
+ +

+The return statement can only be written +as the last statement of a block. +If it is really necessary to return in the middle of a block, +then an explicit inner block can be used, +as in the idiom do return end, +because now return is the last statement in its (inner) block. + + + + + +

3.3.5 – For Statement

+ +

+ +The for statement has two forms: +one numeric and one generic. + + +

+The numeric for loop repeats a block of code while a +control variable runs through an arithmetic progression. +It has the following syntax: + +

+	stat ::= for Name ‘=’ exp ‘,’ exp [‘,’ exp] do block end
+

+The block is repeated for name starting at the value of +the first exp, until it passes the second exp by steps of the +third exp. +More precisely, a for statement like + +

+     for v = e1, e2, e3 do block end
+

+is equivalent to the code: + +

+     do
+       local var, limit, step = tonumber(e1), tonumber(e2), tonumber(e3)
+       if not (var and limit and step) then error() end
+       while (step > 0 and var <= limit) or (step <= 0 and var >= limit) do
+         local v = var
+         block
+         var = var + step
+       end
+     end
+

+Note the following: + +

    + +
  • +All three control expressions are evaluated only once, +before the loop starts. +They must all result in numbers. +
  • + +
  • +var, limit, and step are invisible variables. +The names shown here are for explanatory purposes only. +
  • + +
  • +If the third expression (the step) is absent, +then a step of 1 is used. +
  • + +
  • +You can use break to exit a for loop. +
  • + +
  • +The loop variable v is local to the loop; +you cannot use its value after the for ends or is broken. +If you need this value, +assign it to another variable before breaking or exiting the loop. +
  • + +
+ +

+The generic for statement works over functions, +called iterators. +On each iteration, the iterator function is called to produce a new value, +stopping when this new value is nil. +The generic for loop has the following syntax: + +

+	stat ::= for namelist in explist do block end
+	namelist ::= Name {‘,’ Name}
+

+A for statement like + +

+     for var_1, ···, var_n in explist do block end
+

+is equivalent to the code: + +

+     do
+       local f, s, var = explist
+       while true do
+         local var_1, ···, var_n = f(s, var)
+         if var_1 == nil then break end
+         var = var_1
+         block
+       end
+     end
+

+Note the following: + +

    + +
  • +explist is evaluated only once. +Its results are an iterator function, +a state, +and an initial value for the first iterator variable. +
  • + +
  • +f, s, and var are invisible variables. +The names are here for explanatory purposes only. +
  • + +
  • +You can use break to exit a for loop. +
  • + +
  • +The loop variables var_i are local to the loop; +you cannot use their values after the for ends. +If you need these values, +then assign them to other variables before breaking or exiting the loop. +
  • + +
+ + + + +

3.3.6 – Function Calls as Statements

+To allow possible side-effects, +function calls can be executed as statements: + +

+	stat ::= functioncall
+

+In this case, all returned values are thrown away. +Function calls are explained in §3.4.9. + + + + + +

3.3.7 – Local Declarations

+Local variables can be declared anywhere inside a block. +The declaration can include an initial assignment: + +

+	stat ::= local namelist [‘=’ explist]
+

+If present, an initial assignment has the same semantics +of a multiple assignment (see §3.3.3). +Otherwise, all variables are initialized with nil. + + +

+A chunk is also a block (see §3.3.2), +and so local variables can be declared in a chunk outside any explicit block. + + +

+The visibility rules for local variables are explained in §3.5. + + + + + + + +

3.4 – Expressions

+ +

+The basic expressions in Lua are the following: + +

+	exp ::= prefixexp
+	exp ::= nil | false | true
+	exp ::= Number
+	exp ::= String
+	exp ::= functiondef
+	exp ::= tableconstructor
+	exp ::= ‘...’
+	exp ::= exp binop exp
+	exp ::= unop exp
+	prefixexp ::= var | functioncall | ‘(’ exp ‘)’
+
+ +

+Numbers and literal strings are explained in §3.1; +variables are explained in §3.2; +function definitions are explained in §3.4.10; +function calls are explained in §3.4.9; +table constructors are explained in §3.4.8. +Vararg expressions, +denoted by three dots ('...'), can only be used when +directly inside a vararg function; +they are explained in §3.4.10. + + +

+Binary operators comprise arithmetic operators (see §3.4.1), +relational operators (see §3.4.3), logical operators (see §3.4.4), +and the concatenation operator (see §3.4.5). +Unary operators comprise the unary minus (see §3.4.1), +the unary not (see §3.4.4), +and the unary length operator (see §3.4.6). + + +

+Both function calls and vararg expressions can result in multiple values. +If a function call is used as a statement (see §3.3.6), +then its return list is adjusted to zero elements, +thus discarding all returned values. +If an expression is used as the last (or the only) element +of a list of expressions, +then no adjustment is made +(unless the expression is enclosed in parentheses). +In all other contexts, +Lua adjusts the result list to one element, +either discarding all values except the first one +or adding a single nil if there are no values. + + +

+Here are some examples: + +

+     f()                -- adjusted to 0 results
+     g(f(), x)          -- f() is adjusted to 1 result
+     g(x, f())          -- g gets x plus all results from f()
+     a,b,c = f(), x     -- f() is adjusted to 1 result (c gets nil)
+     a,b = ...          -- a gets the first vararg parameter, b gets
+                        -- the second (both a and b can get nil if there
+                        -- is no corresponding vararg parameter)
+     
+     a,b,c = x, f()     -- f() is adjusted to 2 results
+     a,b,c = f()        -- f() is adjusted to 3 results
+     return f()         -- returns all results from f()
+     return ...         -- returns all received vararg parameters
+     return x,y,f()     -- returns x, y, and all results from f()
+     {f()}              -- creates a list with all results from f()
+     {...}              -- creates a list with all vararg parameters
+     {f(), nil}         -- f() is adjusted to 1 result
+
+ +

+Any expression enclosed in parentheses always results in only one value. +Thus, +(f(x,y,z)) is always a single value, +even if f returns several values. +(The value of (f(x,y,z)) is the first value returned by f +or nil if f does not return any values.) + + + +

3.4.1 – Arithmetic Operators

+Lua supports the usual arithmetic operators: +the binary + (addition), +- (subtraction), * (multiplication), +/ (division), % (modulo), and ^ (exponentiation); +and unary - (mathematical negation). +If the operands are numbers, or strings that can be converted to +numbers (see §3.4.2), +then all operations have the usual meaning. +Exponentiation works for any exponent. +For instance, x^(-0.5) computes the inverse of the square root of x. +Modulo is defined as + +

+     a % b == a - math.floor(a/b)*b
+

+That is, it is the remainder of a division that rounds +the quotient towards minus infinity. + + + + + +

3.4.2 – Coercion

+ +

+Lua provides automatic conversion between +string and number values at run time. +Any arithmetic operation applied to a string tries to convert +this string to a number, following the rules of the Lua lexer. +(The string may have leading and trailing spaces and a sign.) +Conversely, whenever a number is used where a string is expected, +the number is converted to a string, in a reasonable format. +For complete control over how numbers are converted to strings, +use the format function from the string library +(see string.format). + + + + + +

3.4.3 – Relational Operators

+The relational operators in Lua are + +

+     ==    ~=    <     >     <=    >=
+

+These operators always result in false or true. + + +

+Equality (==) first compares the type of its operands. +If the types are different, then the result is false. +Otherwise, the values of the operands are compared. +Numbers and strings are compared in the usual way. +Tables, userdata, and threads +are compared by reference: +two objects are considered equal only if they are the same object. +Every time you create a new object +(a table, userdata, or thread), +this new object is different from any previously existing object. +Closures with the same reference are always equal. +Closures with any detectable difference +(different behavior, different definition) are always different. + + +

+You can change the way that Lua compares tables and userdata +by using the "eq" metamethod (see §2.4). + + +

+The conversion rules of §3.4.2 +do not apply to equality comparisons. +Thus, "0"==0 evaluates to false, +and t[0] and t["0"] denote different +entries in a table. + + +

+The operator ~= is exactly the negation of equality (==). + + +

+The order operators work as follows. +If both arguments are numbers, then they are compared as such. +Otherwise, if both arguments are strings, +then their values are compared according to the current locale. +Otherwise, Lua tries to call the "lt" or the "le" +metamethod (see §2.4). +A comparison a > b is translated to b < a +and a >= b is translated to b <= a. + + + + + +

3.4.4 – Logical Operators

+The logical operators in Lua are +and, or, and not. +Like the control structures (see §3.3.4), +all logical operators consider both false and nil as false +and anything else as true. + + +

+The negation operator not always returns false or true. +The conjunction operator and returns its first argument +if this value is false or nil; +otherwise, and returns its second argument. +The disjunction operator or returns its first argument +if this value is different from nil and false; +otherwise, or returns its second argument. +Both and and or use short-cut evaluation; +that is, +the second operand is evaluated only if necessary. +Here are some examples: + +

+     10 or 20            --> 10
+     10 or error()       --> 10
+     nil or "a"          --> "a"
+     nil and 10          --> nil
+     false and error()   --> false
+     false and nil       --> false
+     false or nil        --> nil
+     10 and 20           --> 20
+

+(In this manual, +--> indicates the result of the preceding expression.) + + + + + +

3.4.5 – Concatenation

+The string concatenation operator in Lua is +denoted by two dots ('..'). +If both operands are strings or numbers, then they are converted to +strings according to the rules mentioned in §3.4.2. +Otherwise, the __concat metamethod is called (see §2.4). + + + + + +

3.4.6 – The Length Operator

+ +

+The length operator is denoted by the unary prefix operator #. +The length of a string is its number of bytes +(that is, the usual meaning of string length when each +character is one byte). + + +

+A program can modify the behavior of the length operator for +any value but strings through the __len metamethod (see §2.4). + + +

+Unless a __len metamethod is given, +the length of a table t is only defined if the +table is a sequence, +that is, +the set of its positive numeric keys is equal to {1..n} +for some integer n. +In that case, n is its length. +Note that a table like + +

+     {10, 20, nil, 40}
+

+is not a sequence, because it has the key 4 +but does not have the key 3. +(So, there is no n such that the set {1..n} is equal +to the set of positive numeric keys of that table.) +Note, however, that non-numeric keys do not interfere +with whether a table is a sequence. + + + + + +

3.4.7 – Precedence

+Operator precedence in Lua follows the table below, +from lower to higher priority: + +

+     or
+     and
+     <     >     <=    >=    ~=    ==
+     ..
+     +     -
+     *     /     %
+     not   #     - (unary)
+     ^
+

+As usual, +you can use parentheses to change the precedences of an expression. +The concatenation ('..') and exponentiation ('^') +operators are right associative. +All other binary operators are left associative. + + + + + +

3.4.8 – Table Constructors

+Table constructors are expressions that create tables. +Every time a constructor is evaluated, a new table is created. +A constructor can be used to create an empty table +or to create a table and initialize some of its fields. +The general syntax for constructors is + +

+	tableconstructor ::= ‘{’ [fieldlist] ‘}’
+	fieldlist ::= field {fieldsep field} [fieldsep]
+	field ::= ‘[’ exp ‘]’ ‘=’ exp | Name ‘=’ exp | exp
+	fieldsep ::= ‘,’ | ‘;’
+
+ +

+Each field of the form [exp1] = exp2 adds to the new table an entry +with key exp1 and value exp2. +A field of the form name = exp is equivalent to +["name"] = exp. +Finally, fields of the form exp are equivalent to +[i] = exp, where i are consecutive numerical integers, +starting with 1. +Fields in the other formats do not affect this counting. +For example, + +

+     a = { [f(1)] = g; "x", "y"; x = 1, f(x), [30] = 23; 45 }
+

+is equivalent to + +

+     do
+       local t = {}
+       t[f(1)] = g
+       t[1] = "x"         -- 1st exp
+       t[2] = "y"         -- 2nd exp
+       t.x = 1            -- t["x"] = 1
+       t[3] = f(x)        -- 3rd exp
+       t[30] = 23
+       t[4] = 45          -- 4th exp
+       a = t
+     end
+
+ +

+If the last field in the list has the form exp +and the expression is a function call or a vararg expression, +then all values returned by this expression enter the list consecutively +(see §3.4.9). + + +

+The field list can have an optional trailing separator, +as a convenience for machine-generated code. + + + + + +

3.4.9 – Function Calls

+A function call in Lua has the following syntax: + +

+	functioncall ::= prefixexp args
+

+In a function call, +first prefixexp and args are evaluated. +If the value of prefixexp has type function, +then this function is called +with the given arguments. +Otherwise, the prefixexp "call" metamethod is called, +having as first parameter the value of prefixexp, +followed by the original call arguments +(see §2.4). + + +

+The form + +

+	functioncall ::= prefixexp ‘:’ Name args
+

+can be used to call "methods". +A call v:name(args) +is syntactic sugar for v.name(v,args), +except that v is evaluated only once. + + +

+Arguments have the following syntax: + +

+	args ::= ‘(’ [explist] ‘)’
+	args ::= tableconstructor
+	args ::= String
+

+All argument expressions are evaluated before the call. +A call of the form f{fields} is +syntactic sugar for f({fields}); +that is, the argument list is a single new table. +A call of the form f'string' +(or f"string" or f[[string]]) +is syntactic sugar for f('string'); +that is, the argument list is a single literal string. + + +

+A call of the form return functioncall is called +a tail call. +Lua implements proper tail calls +(or proper tail recursion): +in a tail call, +the called function reuses the stack entry of the calling function. +Therefore, there is no limit on the number of nested tail calls that +a program can execute. +However, a tail call erases any debug information about the +calling function. +Note that a tail call only happens with a particular syntax, +where the return has one single function call as argument; +this syntax makes the calling function return exactly +the returns of the called function. +So, none of the following examples are tail calls: + +

+     return (f(x))        -- results adjusted to 1
+     return 2 * f(x)
+     return x, f(x)       -- additional results
+     f(x); return         -- results discarded
+     return x or f(x)     -- results adjusted to 1
+
+ + + + +

3.4.10 – Function Definitions

+ +

+The syntax for function definition is + +

+	functiondef ::= function funcbody
+	funcbody ::= ‘(’ [parlist] ‘)’ block end
+
+ +

+The following syntactic sugar simplifies function definitions: + +

+	stat ::= function funcname funcbody
+	stat ::= local function Name funcbody
+	funcname ::= Name {‘.’ Name} [‘:’ Name]
+

+The statement + +

+     function f () body end
+

+translates to + +

+     f = function () body end
+

+The statement + +

+     function t.a.b.c.f () body end
+

+translates to + +

+     t.a.b.c.f = function () body end
+

+The statement + +

+     local function f () body end
+

+translates to + +

+     local f; f = function () body end
+

+not to + +

+     local f = function () body end
+

+(This only makes a difference when the body of the function +contains references to f.) + + +

+A function definition is an executable expression, +whose value has type function. +When Lua precompiles a chunk, +all its function bodies are precompiled too. +Then, whenever Lua executes the function definition, +the function is instantiated (or closed). +This function instance (or closure) +is the final value of the expression. + + +

+Parameters act as local variables that are +initialized with the argument values: + +

+	parlist ::= namelist [‘,’ ‘...’] | ‘...’
+

+When a function is called, +the list of arguments is adjusted to +the length of the list of parameters, +unless the function is a vararg function, +which is indicated by three dots ('...') +at the end of its parameter list. +A vararg function does not adjust its argument list; +instead, it collects all extra arguments and supplies them +to the function through a vararg expression, +which is also written as three dots. +The value of this expression is a list of all actual extra arguments, +similar to a function with multiple results. +If a vararg expression is used inside another expression +or in the middle of a list of expressions, +then its return list is adjusted to one element. +If the expression is used as the last element of a list of expressions, +then no adjustment is made +(unless that last expression is enclosed in parentheses). + + +

+As an example, consider the following definitions: + +

+     function f(a, b) end
+     function g(a, b, ...) end
+     function r() return 1,2,3 end
+

+Then, we have the following mapping from arguments to parameters and +to the vararg expression: + +

+     CALL            PARAMETERS
+     
+     f(3)             a=3, b=nil
+     f(3, 4)          a=3, b=4
+     f(3, 4, 5)       a=3, b=4
+     f(r(), 10)       a=1, b=10
+     f(r())           a=1, b=2
+     
+     g(3)             a=3, b=nil, ... -->  (nothing)
+     g(3, 4)          a=3, b=4,   ... -->  (nothing)
+     g(3, 4, 5, 8)    a=3, b=4,   ... -->  5  8
+     g(5, r())        a=5, b=1,   ... -->  2  3
+
+ +

+Results are returned using the return statement (see §3.3.4). +If control reaches the end of a function +without encountering a return statement, +then the function returns with no results. + + +

+ +There is a system-dependent limit on the number of values +that a function may return. +This limit is guaranteed to be larger than 1000. + + +

+The colon syntax +is used for defining methods, +that is, functions that have an implicit extra parameter self. +Thus, the statement + +

+     function t.a.b.c:f (params) body end
+

+is syntactic sugar for + +

+     t.a.b.c.f = function (self, params) body end
+
+ + + + + + +

3.5 – Visibility Rules

+ +

+ +Lua is a lexically scoped language. +The scope of a local variable begins at the first statement after +its declaration and lasts until the last non-void statement +of the innermost block that includes the declaration. +Consider the following example: + +

+     x = 10                -- global variable
+     do                    -- new block
+       local x = x         -- new 'x', with value 10
+       print(x)            --> 10
+       x = x+1
+       do                  -- another block
+         local x = x+1     -- another 'x'
+         print(x)          --> 12
+       end
+       print(x)            --> 11
+     end
+     print(x)              --> 10  (the global one)
+
+ +

+Notice that, in a declaration like local x = x, +the new x being declared is not in scope yet, +and so the second x refers to the outside variable. + + +

+Because of the lexical scoping rules, +local variables can be freely accessed by functions +defined inside their scope. +A local variable used by an inner function is called +an upvalue, or external local variable, +inside the inner function. + + +

+Notice that each execution of a local statement +defines new local variables. +Consider the following example: + +

+     a = {}
+     local x = 20
+     for i=1,10 do
+       local y = 0
+       a[i] = function () y=y+1; return x+y end
+     end
+

+The loop creates ten closures +(that is, ten instances of the anonymous function). +Each of these closures uses a different y variable, +while all of them share the same x. + + + + + +

4 – The Application Program Interface

+ +

+ +This section describes the C API for Lua, that is, +the set of C functions available to the host program to communicate +with Lua. +All API functions and related types and constants +are declared in the header file lua.h. + + +

+Even when we use the term "function", +any facility in the API may be provided as a macro instead. +Except where stated otherwise, +all such macros use each of their arguments exactly once +(except for the first argument, which is always a Lua state), +and so do not generate any hidden side-effects. + + +

+As in most C libraries, +the Lua API functions do not check their arguments for validity or consistency. +However, you can change this behavior by compiling Lua +with the macro LUA_USE_APICHECK defined. + + + +

4.1 – The Stack

+ +

+Lua uses a virtual stack to pass values to and from C. +Each element in this stack represents a Lua value +(nil, number, string, etc.). + + +

+Whenever Lua calls C, the called function gets a new stack, +which is independent of previous stacks and of stacks of +C functions that are still active. +This stack initially contains any arguments to the C function +and it is where the C function pushes its results +to be returned to the caller (see lua_CFunction). + + +

+For convenience, +most query operations in the API do not follow a strict stack discipline. +Instead, they can refer to any element in the stack +by using an index: +A positive index represents an absolute stack position +(starting at 1); +a negative index represents an offset relative to the top of the stack. +More specifically, if the stack has n elements, +then index 1 represents the first element +(that is, the element that was pushed onto the stack first) +and +index n represents the last element; +index -1 also represents the last element +(that is, the element at the top) +and index -n represents the first element. + + + + + +

4.2 – Stack Size

+ +

+When you interact with the Lua API, +you are responsible for ensuring consistency. +In particular, +you are responsible for controlling stack overflow. +You can use the function lua_checkstack +to ensure that the stack has extra slots when pushing new elements. + + +

+Whenever Lua calls C, +it ensures that the stack has at least LUA_MINSTACK extra slots. +LUA_MINSTACK is defined as 20, +so that usually you do not have to worry about stack space +unless your code has loops pushing elements onto the stack. + + +

+When you call a Lua function +without a fixed number of results (see lua_call), +Lua ensures that the stack has enough size for all results, +but it does not ensure any extra space. +So, before pushing anything in the stack after such a call +you should use lua_checkstack. + + + + + +

4.3 – Valid and Acceptable Indices

+ +

+Any function in the API that receives stack indices +works only with valid indices or acceptable indices. + + +

+A valid index is an index that refers to a +real position within the stack, that is, +its position lies between 1 and the stack top +(1 ≤ abs(index) ≤ top). + +Usually, functions that can modify the value at an index +require valid indices. + + +

+Unless otherwise noted, +any function that accepts valid indices also accepts pseudo-indices, +which represent some Lua values that are accessible to C code +but which are not in the stack. +Pseudo-indices are used to access the registry +and the upvalues of a C function (see §4.4). + + +

+Functions that do not need a specific stack position, +but only a value in the stack (e.g., query functions), +can be called with acceptable indices. +An acceptable index can be any valid index, +including the pseudo-indices, +but it also can be any positive index after the stack top +within the space allocated for the stack, +that is, indices up to the stack size. +(Note that 0 is never an acceptable index.) +Except when noted otherwise, +functions in the API work with acceptable indices. + + +

+Acceptable indices serve to avoid extra tests +against the stack top when querying the stack. +For instance, a C function can query its third argument +without the need to first check whether there is a third argument, +that is, without the need to check whether 3 is a valid index. + + +

+For functions that can be called with acceptable indices, +any non-valid index is treated as if it +contains a value of a virtual type LUA_TNONE, +which behaves like a nil value. + + + + + +

4.4 – C Closures

+ +

+When a C function is created, +it is possible to associate some values with it, +thus creating a C closure +(see lua_pushcclosure); +these values are called upvalues and are +accessible to the function whenever it is called. + + +

+Whenever a C function is called, +its upvalues are located at specific pseudo-indices. +These pseudo-indices are produced by the macro +lua_upvalueindex. +The first value associated with a function is at position +lua_upvalueindex(1), and so on. +Any access to lua_upvalueindex(n), +where n is greater than the number of upvalues of the +current function (but not greater than 256), +produces an acceptable but invalid index. + + + + + +

4.5 – Registry

+ +

+Lua provides a registry, +a predefined table that can be used by any C code to +store whatever Lua values it needs to store. +The registry table is always located at pseudo-index +LUA_REGISTRYINDEX, +which is a valid index. +Any C library can store data into this table, +but it should take care to choose keys +that are different from those used +by other libraries, to avoid collisions. +Typically, you should use as key a string containing your library name, +or a light userdata with the address of a C object in your code, +or any Lua object created by your code. +As with global names, +string keys starting with an underscore followed by +uppercase letters are reserved for Lua. + + +

+The integer keys in the registry are used by the reference mechanism, +implemented by the auxiliary library, +and by some predefined values. +Therefore, integer keys should not be used for other purposes. + + +

+When you create a new Lua state, +its registry comes with some predefined values. +These predefined values are indexed with integer keys +defined as constants in lua.h. +The following constants are defined: + +

    +
  • LUA_RIDX_MAINTHREAD: At this index the registry has +the main thread of the state. +(The main thread is the one created together with the state.) +
  • + +
  • LUA_RIDX_GLOBALS: At this index the registry has +the global environment. +
  • +
+ + + + +

4.6 – Error Handling in C

+ +

+Internally, Lua uses the C longjmp facility to handle errors. +(You can also choose to use exceptions if you compile Lua as C++; +search for LUAI_THROW in the source code.) +When Lua faces any error +(such as a memory allocation error, type errors, syntax errors, +and runtime errors) +it raises an error; +that is, it does a long jump. +A protected environment uses setjmp +to set a recovery point; +any error jumps to the most recent active recovery point. + + +

+If an error happens outside any protected environment, +Lua calls a panic function (see lua_atpanic) +and then calls abort, +thus exiting the host application. +Your panic function can avoid this exit by +never returning +(e.g., doing a long jump to your own recovery point outside Lua). + + +

+The panic function runs as if it were a message handler (see §2.3); +in particular, the error message is at the top of the stack. +However, there is no guarantees about stack space. +To push anything on the stack, +the panic function should first check the available space (see §4.2). + + +

+Most functions in the API can throw an error, +for instance due to a memory allocation error. +The documentation for each function indicates whether +it can throw errors. + + +

+Inside a C function you can throw an error by calling lua_error. + + + + + +

4.7 – Handling Yields in C

+ +

+Internally, Lua uses the C longjmp facility to yield a coroutine. +Therefore, if a function foo calls an API function +and this API function yields +(directly or indirectly by calling another function that yields), +Lua cannot return to foo any more, +because the longjmp removes its frame from the C stack. + + +

+To avoid this kind of problem, +Lua raises an error whenever it tries to yield across an API call, +except for three functions: +lua_yieldk, lua_callk, and lua_pcallk. +All those functions receive a continuation function +(as a parameter called k) to continue execution after a yield. + + +

+We need to set some terminology to explain continuations. +We have a C function called from Lua which we will call +the original function. +This original function then calls one of those three functions in the C API, +which we will call the callee function, +that then yields the current thread. +(This can happen when the callee function is lua_yieldk, +or when the callee function is either lua_callk or lua_pcallk +and the function called by them yields.) + + +

+Suppose the running thread yields while executing the callee function. +After the thread resumes, +it eventually will finish running the callee function. +However, +the callee function cannot return to the original function, +because its frame in the C stack was destroyed by the yield. +Instead, Lua calls a continuation function, +which was given as an argument to the callee function. +As the name implies, +the continuation function should continue the task +of the original function. + + +

+Lua treats the continuation function as if it were the original function. +The continuation function receives the same Lua stack +from the original function, +in the same state it would be if the callee function had returned. +(For instance, +after a lua_callk the function and its arguments are +removed from the stack and replaced by the results from the call.) +It also has the same upvalues. +Whatever it returns is handled by Lua as if it were the return +of the original function. + + +

+The only difference in the Lua state between the original function +and its continuation is the result of a call to lua_getctx. + + + + + +

4.8 – Functions and Types

+ +

+Here we list all functions and types from the C API in +alphabetical order. +Each function has an indicator like this: +[-o, +p, x] + + +

+The first field, o, +is how many elements the function pops from the stack. +The second field, p, +is how many elements the function pushes onto the stack. +(Any function always pushes its results after popping its arguments.) +A field in the form x|y means the function can push (or pop) +x or y elements, +depending on the situation; +an interrogation mark '?' means that +we cannot know how many elements the function pops/pushes +by looking only at its arguments +(e.g., they may depend on what is on the stack). +The third field, x, +tells whether the function may throw errors: +'-' means the function never throws any error; +'e' means the function may throw errors; +'v' means the function may throw an error on purpose. + + + +


lua_absindex

+[-0, +0, –] +

int lua_absindex (lua_State *L, int idx);
+ +

+Converts the acceptable index idx into an absolute index +(that is, one that does not depend on the stack top). + + + + + +


lua_Alloc

+
typedef void * (*lua_Alloc) (void *ud,
+                             void *ptr,
+                             size_t osize,
+                             size_t nsize);
+ +

+The type of the memory-allocation function used by Lua states. +The allocator function must provide a +functionality similar to realloc, +but not exactly the same. +Its arguments are +ud, an opaque pointer passed to lua_newstate; +ptr, a pointer to the block being allocated/reallocated/freed; +osize, the original size of the block or some code about what +is being allocated; +nsize, the new size of the block. + + +

+When ptr is not NULL, +osize is the size of the block pointed by ptr, +that is, the size given when it was allocated or reallocated. + + +

+When ptr is NULL, +osize encodes the kind of object that Lua is allocating. +osize is any of +LUA_TSTRING, LUA_TTABLE, LUA_TFUNCTION, +LUA_TUSERDATA, or LUA_TTHREAD when (and only when) +Lua is creating a new object of that type. +When osize is some other value, +Lua is allocating memory for something else. + + +

+Lua assumes the following behavior from the allocator function: + + +

+When nsize is zero, +the allocator should behave like free +and return NULL. + + +

+When nsize is not zero, +the allocator should behave like realloc. +The allocator returns NULL +if and only if it cannot fulfill the request. +Lua assumes that the allocator never fails when +osize >= nsize. + + +

+Here is a simple implementation for the allocator function. +It is used in the auxiliary library by luaL_newstate. + +

+     static void *l_alloc (void *ud, void *ptr, size_t osize,
+                                                size_t nsize) {
+       (void)ud;  (void)osize;  /* not used */
+       if (nsize == 0) {
+         free(ptr);
+         return NULL;
+       }
+       else
+         return realloc(ptr, nsize);
+     }
+

+Note that Standard C ensures +that free(NULL) has no effect and that +realloc(NULL, size) is equivalent to malloc(size). +This code assumes that realloc does not fail when shrinking a block. +(Although Standard C does not ensure this behavior, +it seems to be a safe assumption.) + + + + + +


lua_arith

+[-(2|1), +1, e] +

void lua_arith (lua_State *L, int op);
+ +

+Performs an arithmetic operation over the two values +(or one, in the case of negation) +at the top of the stack, +with the value at the top being the second operand, +pops these values, and pushes the result of the operation. +The function follows the semantics of the corresponding Lua operator +(that is, it may call metamethods). + + +

+The value of op must be one of the following constants: + +

+ + + + +

lua_atpanic

+[-0, +0, –] +

lua_CFunction lua_atpanic (lua_State *L, lua_CFunction panicf);
+ +

+Sets a new panic function and returns the old one (see §4.6). + + + + + +


lua_call

+[-(nargs+1), +nresults, e] +

void lua_call (lua_State *L, int nargs, int nresults);
+ +

+Calls a function. + + +

+To call a function you must use the following protocol: +first, the function to be called is pushed onto the stack; +then, the arguments to the function are pushed +in direct order; +that is, the first argument is pushed first. +Finally you call lua_call; +nargs is the number of arguments that you pushed onto the stack. +All arguments and the function value are popped from the stack +when the function is called. +The function results are pushed onto the stack when the function returns. +The number of results is adjusted to nresults, +unless nresults is LUA_MULTRET. +In this case, all results from the function are pushed. +Lua takes care that the returned values fit into the stack space. +The function results are pushed onto the stack in direct order +(the first result is pushed first), +so that after the call the last result is on the top of the stack. + + +

+Any error inside the called function is propagated upwards +(with a longjmp). + + +

+The following example shows how the host program can do the +equivalent to this Lua code: + +

+     a = f("how", t.x, 14)
+

+Here it is in C: + +

+     lua_getglobal(L, "f");                  /* function to be called */
+     lua_pushstring(L, "how");                        /* 1st argument */
+     lua_getglobal(L, "t");                    /* table to be indexed */
+     lua_getfield(L, -1, "x");        /* push result of t.x (2nd arg) */
+     lua_remove(L, -2);                  /* remove 't' from the stack */
+     lua_pushinteger(L, 14);                          /* 3rd argument */
+     lua_call(L, 3, 1);     /* call 'f' with 3 arguments and 1 result */
+     lua_setglobal(L, "a");                         /* set global 'a' */
+

+Note that the code above is "balanced": +at its end, the stack is back to its original configuration. +This is considered good programming practice. + + + + + +


lua_callk

+[-(nargs + 1), +nresults, e] +

void lua_callk (lua_State *L, int nargs, int nresults, int ctx,
+                lua_CFunction k);
+ +

+This function behaves exactly like lua_call, +but allows the called function to yield (see §4.7). + + + + + +


lua_CFunction

+
typedef int (*lua_CFunction) (lua_State *L);
+ +

+Type for C functions. + + +

+In order to communicate properly with Lua, +a C function must use the following protocol, +which defines the way parameters and results are passed: +a C function receives its arguments from Lua in its stack +in direct order (the first argument is pushed first). +So, when the function starts, +lua_gettop(L) returns the number of arguments received by the function. +The first argument (if any) is at index 1 +and its last argument is at index lua_gettop(L). +To return values to Lua, a C function just pushes them onto the stack, +in direct order (the first result is pushed first), +and returns the number of results. +Any other value in the stack below the results will be properly +discarded by Lua. +Like a Lua function, a C function called by Lua can also return +many results. + + +

+As an example, the following function receives a variable number +of numerical arguments and returns their average and sum: + +

+     static int foo (lua_State *L) {
+       int n = lua_gettop(L);    /* number of arguments */
+       lua_Number sum = 0;
+       int i;
+       for (i = 1; i <= n; i++) {
+         if (!lua_isnumber(L, i)) {
+           lua_pushstring(L, "incorrect argument");
+           lua_error(L);
+         }
+         sum += lua_tonumber(L, i);
+       }
+       lua_pushnumber(L, sum/n);        /* first result */
+       lua_pushnumber(L, sum);         /* second result */
+       return 2;                   /* number of results */
+     }
+
+ + + + +

lua_checkstack

+[-0, +0, –] +

int lua_checkstack (lua_State *L, int extra);
+ +

+Ensures that there are at least extra free stack slots in the stack. +It returns false if it cannot fulfill the request, +because it would cause the stack to be larger than a fixed maximum size +(typically at least a few thousand elements) or +because it cannot allocate memory for the new stack size. +This function never shrinks the stack; +if the stack is already larger than the new size, +it is left unchanged. + + + + + +


lua_close

+[-0, +0, –] +

void lua_close (lua_State *L);
+ +

+Destroys all objects in the given Lua state +(calling the corresponding garbage-collection metamethods, if any) +and frees all dynamic memory used by this state. +On several platforms, you may not need to call this function, +because all resources are naturally released when the host program ends. +On the other hand, long-running programs that create multiple states, +such as daemons or web servers, +might need to close states as soon as they are not needed. + + + + + +


lua_compare

+[-0, +0, e] +

int lua_compare (lua_State *L, int index1, int index2, int op);
+ +

+Compares two Lua values. +Returns 1 if the value at index index1 satisfies op +when compared with the value at index index2, +following the semantics of the corresponding Lua operator +(that is, it may call metamethods). +Otherwise returns 0. +Also returns 0 if any of the indices is non valid. + + +

+The value of op must be one of the following constants: + +

    + +
  • LUA_OPEQ: compares for equality (==)
  • +
  • LUA_OPLT: compares for less than (<)
  • +
  • LUA_OPLE: compares for less or equal (<=)
  • + +
+ + + + +

lua_concat

+[-n, +1, e] +

void lua_concat (lua_State *L, int n);
+ +

+Concatenates the n values at the top of the stack, +pops them, and leaves the result at the top. +If n is 1, the result is the single value on the stack +(that is, the function does nothing); +if n is 0, the result is the empty string. +Concatenation is performed following the usual semantics of Lua +(see §3.4.5). + + + + + +


lua_copy

+[-0, +0, –] +

void lua_copy (lua_State *L, int fromidx, int toidx);
+ +

+Moves the element at index fromidx +into the valid index toidx +without shifting any element +(therefore replacing the value at that position). + + + + + +


lua_createtable

+[-0, +1, e] +

void lua_createtable (lua_State *L, int narr, int nrec);
+ +

+Creates a new empty table and pushes it onto the stack. +Parameter narr is a hint for how many elements the table +will have as a sequence; +parameter nrec is a hint for how many other elements +the table will have. +Lua may use these hints to preallocate memory for the new table. +This pre-allocation is useful for performance when you know in advance +how many elements the table will have. +Otherwise you can use the function lua_newtable. + + + + + +


lua_dump

+[-0, +0, e] +

int lua_dump (lua_State *L, lua_Writer writer, void *data);
+ +

+Dumps a function as a binary chunk. +Receives a Lua function on the top of the stack +and produces a binary chunk that, +if loaded again, +results in a function equivalent to the one dumped. +As it produces parts of the chunk, +lua_dump calls function writer (see lua_Writer) +with the given data +to write them. + + +

+The value returned is the error code returned by the last +call to the writer; +0 means no errors. + + +

+This function does not pop the Lua function from the stack. + + + + + +


lua_error

+[-1, +0, v] +

int lua_error (lua_State *L);
+ +

+Generates a Lua error. +The error message (which can actually be a Lua value of any type) +must be on the stack top. +This function does a long jump, +and therefore never returns +(see luaL_error). + + + + + +


lua_gc

+[-0, +0, e] +

int lua_gc (lua_State *L, int what, int data);
+ +

+Controls the garbage collector. + + +

+This function performs several tasks, +according to the value of the parameter what: + +

    + +
  • LUA_GCSTOP: +stops the garbage collector. +
  • + +
  • LUA_GCRESTART: +restarts the garbage collector. +
  • + +
  • LUA_GCCOLLECT: +performs a full garbage-collection cycle. +
  • + +
  • LUA_GCCOUNT: +returns the current amount of memory (in Kbytes) in use by Lua. +
  • + +
  • LUA_GCCOUNTB: +returns the remainder of dividing the current amount of bytes of +memory in use by Lua by 1024. +
  • + +
  • LUA_GCSTEP: +performs an incremental step of garbage collection. +The step "size" is controlled by data +(larger values mean more steps) in a non-specified way. +If you want to control the step size +you must experimentally tune the value of data. +The function returns 1 if the step finished a +garbage-collection cycle. +
  • + +
  • LUA_GCSETPAUSE: +sets data as the new value +for the pause of the collector (see §2.5). +The function returns the previous value of the pause. +
  • + +
  • LUA_GCSETSTEPMUL: +sets data as the new value for the step multiplier of +the collector (see §2.5). +The function returns the previous value of the step multiplier. +
  • + +
  • LUA_GCISRUNNING: +returns a boolean that tells whether the collector is running +(i.e., not stopped). +
  • + +
  • LUA_GCGEN: +changes the collector to generational mode +(see §2.5). +
  • + +
  • LUA_GCINC: +changes the collector to incremental mode. +This is the default mode. +
  • + +
+ +

+For more details about these options, +see collectgarbage. + + + + + +


lua_getallocf

+[-0, +0, –] +

lua_Alloc lua_getallocf (lua_State *L, void **ud);
+ +

+Returns the memory-allocation function of a given state. +If ud is not NULL, Lua stores in *ud the +opaque pointer passed to lua_newstate. + + + + + +


lua_getctx

+[-0, +0, –] +

int lua_getctx (lua_State *L, int *ctx);
+ +

+This function is called by a continuation function (see §4.7) +to retrieve the status of the thread and a context information. + + +

+When called in the original function, +lua_getctx always returns LUA_OK +and does not change the value of its argument ctx. +When called inside a continuation function, +lua_getctx returns LUA_YIELD and sets +the value of ctx to be the context information +(the value passed as the ctx argument +to the callee together with the continuation function). + + +

+When the callee is lua_pcallk, +Lua may also call its continuation function +to handle errors during the call. +That is, upon an error in the function called by lua_pcallk, +Lua may not return to the original function +but instead may call the continuation function. +In that case, a call to lua_getctx will return the error code +(the value that would be returned by lua_pcallk); +the value of ctx will be set to the context information, +as in the case of a yield. + + + + + +


lua_getfield

+[-0, +1, e] +

void lua_getfield (lua_State *L, int index, const char *k);
+ +

+Pushes onto the stack the value t[k], +where t is the value at the given index. +As in Lua, this function may trigger a metamethod +for the "index" event (see §2.4). + + + + + +


lua_getglobal

+[-0, +1, e] +

void lua_getglobal (lua_State *L, const char *name);
+ +

+Pushes onto the stack the value of the global name. + + + + + +


lua_getmetatable

+[-0, +(0|1), –] +

int lua_getmetatable (lua_State *L, int index);
+ +

+Pushes onto the stack the metatable of the value at the given index. +If the value does not have a metatable, +the function returns 0 and pushes nothing on the stack. + + + + + +


lua_gettable

+[-1, +1, e] +

void lua_gettable (lua_State *L, int index);
+ +

+Pushes onto the stack the value t[k], +where t is the value at the given index +and k is the value at the top of the stack. + + +

+This function pops the key from the stack +(putting the resulting value in its place). +As in Lua, this function may trigger a metamethod +for the "index" event (see §2.4). + + + + + +


lua_gettop

+[-0, +0, –] +

int lua_gettop (lua_State *L);
+ +

+Returns the index of the top element in the stack. +Because indices start at 1, +this result is equal to the number of elements in the stack +(and so 0 means an empty stack). + + + + + +


lua_getuservalue

+[-0, +1, –] +

void lua_getuservalue (lua_State *L, int index);
+ +

+Pushes onto the stack the Lua value associated with the userdata +at the given index. +This Lua value must be a table or nil. + + + + + +


lua_insert

+[-1, +1, –] +

void lua_insert (lua_State *L, int index);
+ +

+Moves the top element into the given valid index, +shifting up the elements above this index to open space. +This function cannot be called with a pseudo-index, +because a pseudo-index is not an actual stack position. + + + + + +


lua_Integer

+
typedef ptrdiff_t lua_Integer;
+ +

+The type used by the Lua API to represent signed integral values. + + +

+By default it is a ptrdiff_t, +which is usually the largest signed integral type the machine handles +"comfortably". + + + + + +


lua_isboolean

+[-0, +0, –] +

int lua_isboolean (lua_State *L, int index);
+ +

+Returns 1 if the value at the given index is a boolean, +and 0 otherwise. + + + + + +


lua_iscfunction

+[-0, +0, –] +

int lua_iscfunction (lua_State *L, int index);
+ +

+Returns 1 if the value at the given index is a C function, +and 0 otherwise. + + + + + +


lua_isfunction

+[-0, +0, –] +

int lua_isfunction (lua_State *L, int index);
+ +

+Returns 1 if the value at the given index is a function +(either C or Lua), and 0 otherwise. + + + + + +


lua_islightuserdata

+[-0, +0, –] +

int lua_islightuserdata (lua_State *L, int index);
+ +

+Returns 1 if the value at the given index is a light userdata, +and 0 otherwise. + + + + + +


lua_isnil

+[-0, +0, –] +

int lua_isnil (lua_State *L, int index);
+ +

+Returns 1 if the value at the given index is nil, +and 0 otherwise. + + + + + +


lua_isnone

+[-0, +0, –] +

int lua_isnone (lua_State *L, int index);
+ +

+Returns 1 if the given index is not valid, +and 0 otherwise. + + + + + +


lua_isnoneornil

+[-0, +0, –] +

int lua_isnoneornil (lua_State *L, int index);
+ +

+Returns 1 if the given index is not valid +or if the value at this index is nil, +and 0 otherwise. + + + + + +


lua_isnumber

+[-0, +0, –] +

int lua_isnumber (lua_State *L, int index);
+ +

+Returns 1 if the value at the given index is a number +or a string convertible to a number, +and 0 otherwise. + + + + + +


lua_isstring

+[-0, +0, –] +

int lua_isstring (lua_State *L, int index);
+ +

+Returns 1 if the value at the given index is a string +or a number (which is always convertible to a string), +and 0 otherwise. + + + + + +


lua_istable

+[-0, +0, –] +

int lua_istable (lua_State *L, int index);
+ +

+Returns 1 if the value at the given index is a table, +and 0 otherwise. + + + + + +


lua_isthread

+[-0, +0, –] +

int lua_isthread (lua_State *L, int index);
+ +

+Returns 1 if the value at the given index is a thread, +and 0 otherwise. + + + + + +


lua_isuserdata

+[-0, +0, –] +

int lua_isuserdata (lua_State *L, int index);
+ +

+Returns 1 if the value at the given index is a userdata +(either full or light), and 0 otherwise. + + + + + +


lua_len

+[-0, +1, e] +

void lua_len (lua_State *L, int index);
+ +

+Returns the "length" of the value at the given index; +it is equivalent to the '#' operator in Lua (see §3.4.6). +The result is pushed on the stack. + + + + + +


lua_load

+[-0, +1, –] +

int lua_load (lua_State *L,
+              lua_Reader reader,
+              void *data,
+              const char *source,
+              const char *mode);
+ +

+Loads a Lua chunk (without running it). +If there are no errors, +lua_load pushes the compiled chunk as a Lua +function on top of the stack. +Otherwise, it pushes an error message. + + +

+The return values of lua_load are: + +

    + +
  • LUA_OK: no errors;
  • + +
  • LUA_ERRSYNTAX: +syntax error during precompilation;
  • + +
  • LUA_ERRMEM: +memory allocation error;
  • + +
  • LUA_ERRGCMM: +error while running a __gc metamethod. +(This error has no relation with the chunk being loaded. +It is generated by the garbage collector.) +
  • + +
+ +

+The lua_load function uses a user-supplied reader function +to read the chunk (see lua_Reader). +The data argument is an opaque value passed to the reader function. + + +

+The source argument gives a name to the chunk, +which is used for error messages and in debug information (see §4.9). + + +

+lua_load automatically detects whether the chunk is text or binary +and loads it accordingly (see program luac). +The string mode works as in function load, +with the addition that +a NULL value is equivalent to the string "bt". + + +

+lua_load uses the stack internally, +so the reader function should always leave the stack +unmodified when returning. + + +

+If the resulting function has one upvalue, +this upvalue is set to the value of the global environment +stored at index LUA_RIDX_GLOBALS in the registry (see §4.5). +When loading main chunks, +this upvalue will be the _ENV variable (see §2.2). + + + + + +


lua_newstate

+[-0, +0, –] +

lua_State *lua_newstate (lua_Alloc f, void *ud);
+ +

+Creates a new thread running in a new, independent state. +Returns NULL if cannot create the thread or the state +(due to lack of memory). +The argument f is the allocator function; +Lua does all memory allocation for this state through this function. +The second argument, ud, is an opaque pointer that Lua +passes to the allocator in every call. + + + + + +


lua_newtable

+[-0, +1, e] +

void lua_newtable (lua_State *L);
+ +

+Creates a new empty table and pushes it onto the stack. +It is equivalent to lua_createtable(L, 0, 0). + + + + + +


lua_newthread

+[-0, +1, e] +

lua_State *lua_newthread (lua_State *L);
+ +

+Creates a new thread, pushes it on the stack, +and returns a pointer to a lua_State that represents this new thread. +The new thread returned by this function shares with the original thread +its global environment, +but has an independent execution stack. + + +

+There is no explicit function to close or to destroy a thread. +Threads are subject to garbage collection, +like any Lua object. + + + + + +


lua_newuserdata

+[-0, +1, e] +

void *lua_newuserdata (lua_State *L, size_t size);
+ +

+This function allocates a new block of memory with the given size, +pushes onto the stack a new full userdata with the block address, +and returns this address. +The host program can freely use this memory. + + + + + +


lua_next

+[-1, +(2|0), e] +

int lua_next (lua_State *L, int index);
+ +

+Pops a key from the stack, +and pushes a key–value pair from the table at the given index +(the "next" pair after the given key). +If there are no more elements in the table, +then lua_next returns 0 (and pushes nothing). + + +

+A typical traversal looks like this: + +

+     /* table is in the stack at index 't' */
+     lua_pushnil(L);  /* first key */
+     while (lua_next(L, t) != 0) {
+       /* uses 'key' (at index -2) and 'value' (at index -1) */
+       printf("%s - %s\n",
+              lua_typename(L, lua_type(L, -2)),
+              lua_typename(L, lua_type(L, -1)));
+       /* removes 'value'; keeps 'key' for next iteration */
+       lua_pop(L, 1);
+     }
+
+ +

+While traversing a table, +do not call lua_tolstring directly on a key, +unless you know that the key is actually a string. +Recall that lua_tolstring may change +the value at the given index; +this confuses the next call to lua_next. + + +

+See function next for the caveats of modifying +the table during its traversal. + + + + + +


lua_Number

+
typedef double lua_Number;
+ +

+The type of numbers in Lua. +By default, it is double, but that can be changed in luaconf.h. +Through this configuration file you can change +Lua to operate with another type for numbers (e.g., float or long). + + + + + +


lua_pcall

+[-(nargs + 1), +(nresults|1), –] +

int lua_pcall (lua_State *L, int nargs, int nresults, int msgh);
+ +

+Calls a function in protected mode. + + +

+Both nargs and nresults have the same meaning as +in lua_call. +If there are no errors during the call, +lua_pcall behaves exactly like lua_call. +However, if there is any error, +lua_pcall catches it, +pushes a single value on the stack (the error message), +and returns an error code. +Like lua_call, +lua_pcall always removes the function +and its arguments from the stack. + + +

+If msgh is 0, +then the error message returned on the stack +is exactly the original error message. +Otherwise, msgh is the stack index of a +message handler. +(In the current implementation, this index cannot be a pseudo-index.) +In case of runtime errors, +this function will be called with the error message +and its return value will be the message +returned on the stack by lua_pcall. + + +

+Typically, the message handler is used to add more debug +information to the error message, such as a stack traceback. +Such information cannot be gathered after the return of lua_pcall, +since by then the stack has unwound. + + +

+The lua_pcall function returns one of the following codes +(defined in lua.h): + +

    + +
  • LUA_OK (0): +success.
  • + +
  • LUA_ERRRUN: +a runtime error. +
  • + +
  • LUA_ERRMEM: +memory allocation error. +For such errors, Lua does not call the message handler. +
  • + +
  • LUA_ERRERR: +error while running the message handler. +
  • + +
  • LUA_ERRGCMM: +error while running a __gc metamethod. +(This error typically has no relation with the function being called. +It is generated by the garbage collector.) +
  • + +
+ + + + +

lua_pcallk

+[-(nargs + 1), +(nresults|1), –] +

int lua_pcallk (lua_State *L,
+                int nargs,
+                int nresults,
+                int errfunc,
+                int ctx,
+                lua_CFunction k);
+ +

+This function behaves exactly like lua_pcall, +but allows the called function to yield (see §4.7). + + + + + +


lua_pop

+[-n, +0, –] +

void lua_pop (lua_State *L, int n);
+ +

+Pops n elements from the stack. + + + + + +


lua_pushboolean

+[-0, +1, –] +

void lua_pushboolean (lua_State *L, int b);
+ +

+Pushes a boolean value with value b onto the stack. + + + + + +


lua_pushcclosure

+[-n, +1, e] +

void lua_pushcclosure (lua_State *L, lua_CFunction fn, int n);
+ +

+Pushes a new C closure onto the stack. + + +

+When a C function is created, +it is possible to associate some values with it, +thus creating a C closure (see §4.4); +these values are then accessible to the function whenever it is called. +To associate values with a C function, +first these values should be pushed onto the stack +(when there are multiple values, the first value is pushed first). +Then lua_pushcclosure +is called to create and push the C function onto the stack, +with the argument n telling how many values should be +associated with the function. +lua_pushcclosure also pops these values from the stack. + + +

+The maximum value for n is 255. + + +

+When n is zero, +this function creates a light C function, +which is just a pointer to the C function. +In that case, it never throws a memory error. + + + + + +


lua_pushcfunction

+[-0, +1, –] +

void lua_pushcfunction (lua_State *L, lua_CFunction f);
+ +

+Pushes a C function onto the stack. +This function receives a pointer to a C function +and pushes onto the stack a Lua value of type function that, +when called, invokes the corresponding C function. + + +

+Any function to be registered in Lua must +follow the correct protocol to receive its parameters +and return its results (see lua_CFunction). + + +

+lua_pushcfunction is defined as a macro: + +

+     #define lua_pushcfunction(L,f)  lua_pushcclosure(L,f,0)
+

+Note that f is used twice. + + + + + +


lua_pushfstring

+[-0, +1, e] +

const char *lua_pushfstring (lua_State *L, const char *fmt, ...);
+ +

+Pushes onto the stack a formatted string +and returns a pointer to this string. +It is similar to the ANSI C function sprintf, +but has some important differences: + +

    + +
  • +You do not have to allocate space for the result: +the result is a Lua string and Lua takes care of memory allocation +(and deallocation, through garbage collection). +
  • + +
  • +The conversion specifiers are quite restricted. +There are no flags, widths, or precisions. +The conversion specifiers can only be +'%%' (inserts a '%' in the string), +'%s' (inserts a zero-terminated string, with no size restrictions), +'%f' (inserts a lua_Number), +'%p' (inserts a pointer as a hexadecimal numeral), +'%d' (inserts an int), and +'%c' (inserts an int as a byte). +
  • + +
+ + + + +

lua_pushglobaltable

+[-0, +1, –] +

void lua_pushglobaltable (lua_State *L);
+ +

+Pushes the global environment onto the stack. + + + + + +


lua_pushinteger

+[-0, +1, –] +

void lua_pushinteger (lua_State *L, lua_Integer n);
+ +

+Pushes a number with value n onto the stack. + + + + + +


lua_pushlightuserdata

+[-0, +1, –] +

void lua_pushlightuserdata (lua_State *L, void *p);
+ +

+Pushes a light userdata onto the stack. + + +

+Userdata represent C values in Lua. +A light userdata represents a pointer, a void*. +It is a value (like a number): +you do not create it, it has no individual metatable, +and it is not collected (as it was never created). +A light userdata is equal to "any" +light userdata with the same C address. + + + + + +


lua_pushliteral

+[-0, +1, e] +

const char *lua_pushliteral (lua_State *L, const char *s);
+ +

+This macro is equivalent to lua_pushlstring, +but can be used only when s is a literal string. +It automatically provides the string length. + + + + + +


lua_pushlstring

+[-0, +1, e] +

const char *lua_pushlstring (lua_State *L, const char *s, size_t len);
+ +

+Pushes the string pointed to by s with size len +onto the stack. +Lua makes (or reuses) an internal copy of the given string, +so the memory at s can be freed or reused immediately after +the function returns. +The string can contain any binary data, +including embedded zeros. + + +

+Returns a pointer to the internal copy of the string. + + + + + +


lua_pushnil

+[-0, +1, –] +

void lua_pushnil (lua_State *L);
+ +

+Pushes a nil value onto the stack. + + + + + +


lua_pushnumber

+[-0, +1, –] +

void lua_pushnumber (lua_State *L, lua_Number n);
+ +

+Pushes a number with value n onto the stack. + + + + + +


lua_pushstring

+[-0, +1, e] +

const char *lua_pushstring (lua_State *L, const char *s);
+ +

+Pushes the zero-terminated string pointed to by s +onto the stack. +Lua makes (or reuses) an internal copy of the given string, +so the memory at s can be freed or reused immediately after +the function returns. + + +

+Returns a pointer to the internal copy of the string. + + +

+If s is NULL, pushes nil and returns NULL. + + + + + +


lua_pushthread

+[-0, +1, –] +

int lua_pushthread (lua_State *L);
+ +

+Pushes the thread represented by L onto the stack. +Returns 1 if this thread is the main thread of its state. + + + + + +


lua_pushunsigned

+[-0, +1, –] +

void lua_pushunsigned (lua_State *L, lua_Unsigned n);
+ +

+Pushes a number with value n onto the stack. + + + + + +


lua_pushvalue

+[-0, +1, –] +

void lua_pushvalue (lua_State *L, int index);
+ +

+Pushes a copy of the element at the given index +onto the stack. + + + + + +


lua_pushvfstring

+[-0, +1, e] +

const char *lua_pushvfstring (lua_State *L,
+                              const char *fmt,
+                              va_list argp);
+ +

+Equivalent to lua_pushfstring, except that it receives a va_list +instead of a variable number of arguments. + + + + + +


lua_rawequal

+[-0, +0, –] +

int lua_rawequal (lua_State *L, int index1, int index2);
+ +

+Returns 1 if the two values in indices index1 and +index2 are primitively equal +(that is, without calling metamethods). +Otherwise returns 0. +Also returns 0 if any of the indices are non valid. + + + + + +


lua_rawget

+[-1, +1, –] +

void lua_rawget (lua_State *L, int index);
+ +

+Similar to lua_gettable, but does a raw access +(i.e., without metamethods). + + + + + +


lua_rawgeti

+[-0, +1, –] +

void lua_rawgeti (lua_State *L, int index, int n);
+ +

+Pushes onto the stack the value t[n], +where t is the table at the given index. +The access is raw; +that is, it does not invoke metamethods. + + + + + +


lua_rawgetp

+[-0, +1, –] +

void lua_rawgetp (lua_State *L, int index, const void *p);
+ +

+Pushes onto the stack the value t[k], +where t is the table at the given index and +k is the pointer p represented as a light userdata. +The access is raw; +that is, it does not invoke metamethods. + + + + + +


lua_rawlen

+[-0, +0, –] +

size_t lua_rawlen (lua_State *L, int index);
+ +

+Returns the raw "length" of the value at the given index: +for strings, this is the string length; +for tables, this is the result of the length operator ('#') +with no metamethods; +for userdata, this is the size of the block of memory allocated +for the userdata; +for other values, it is 0. + + + + + +


lua_rawset

+[-2, +0, e] +

void lua_rawset (lua_State *L, int index);
+ +

+Similar to lua_settable, but does a raw assignment +(i.e., without metamethods). + + + + + +


lua_rawseti

+[-1, +0, e] +

void lua_rawseti (lua_State *L, int index, int n);
+ +

+Does the equivalent of t[n] = v, +where t is the table at the given index +and v is the value at the top of the stack. + + +

+This function pops the value from the stack. +The assignment is raw; +that is, it does not invoke metamethods. + + + + + +


lua_rawsetp

+[-1, +0, e] +

void lua_rawsetp (lua_State *L, int index, const void *p);
+ +

+Does the equivalent of t[k] = v, +where t is the table at the given index, +k is the pointer p represented as a light userdata, +and v is the value at the top of the stack. + + +

+This function pops the value from the stack. +The assignment is raw; +that is, it does not invoke metamethods. + + + + + +


lua_Reader

+
typedef const char * (*lua_Reader) (lua_State *L,
+                                    void *data,
+                                    size_t *size);
+ +

+The reader function used by lua_load. +Every time it needs another piece of the chunk, +lua_load calls the reader, +passing along its data parameter. +The reader must return a pointer to a block of memory +with a new piece of the chunk +and set size to the block size. +The block must exist until the reader function is called again. +To signal the end of the chunk, +the reader must return NULL or set size to zero. +The reader function may return pieces of any size greater than zero. + + + + + +


lua_register

+[-0, +0, e] +

void lua_register (lua_State *L, const char *name, lua_CFunction f);
+ +

+Sets the C function f as the new value of global name. +It is defined as a macro: + +

+     #define lua_register(L,n,f) \
+            (lua_pushcfunction(L, f), lua_setglobal(L, n))
+
+ + + + +

lua_remove

+[-1, +0, –] +

void lua_remove (lua_State *L, int index);
+ +

+Removes the element at the given valid index, +shifting down the elements above this index to fill the gap. +This function cannot be called with a pseudo-index, +because a pseudo-index is not an actual stack position. + + + + + +


lua_replace

+[-1, +0, –] +

void lua_replace (lua_State *L, int index);
+ +

+Moves the top element into the given valid index +without shifting any element +(therefore replacing the value at the given index), +and then pops the top element. + + + + + +


lua_resume

+[-?, +?, –] +

int lua_resume (lua_State *L, lua_State *from, int nargs);
+ +

+Starts and resumes a coroutine in a given thread. + + +

+To start a coroutine, +you push onto the thread stack the main function plus any arguments; +then you call lua_resume, +with nargs being the number of arguments. +This call returns when the coroutine suspends or finishes its execution. +When it returns, the stack contains all values passed to lua_yield, +or all values returned by the body function. +lua_resume returns +LUA_YIELD if the coroutine yields, +LUA_OK if the coroutine finishes its execution +without errors, +or an error code in case of errors (see lua_pcall). + + +

+In case of errors, +the stack is not unwound, +so you can use the debug API over it. +The error message is on the top of the stack. + + +

+To resume a coroutine, +you remove any results from the last lua_yield, +put on its stack only the values to +be passed as results from yield, +and then call lua_resume. + + +

+The parameter from represents the coroutine that is resuming L. +If there is no such coroutine, +this parameter can be NULL. + + + + + +


lua_setallocf

+[-0, +0, –] +

void lua_setallocf (lua_State *L, lua_Alloc f, void *ud);
+ +

+Changes the allocator function of a given state to f +with user data ud. + + + + + +


lua_setfield

+[-1, +0, e] +

void lua_setfield (lua_State *L, int index, const char *k);
+ +

+Does the equivalent to t[k] = v, +where t is the value at the given index +and v is the value at the top of the stack. + + +

+This function pops the value from the stack. +As in Lua, this function may trigger a metamethod +for the "newindex" event (see §2.4). + + + + + +


lua_setglobal

+[-1, +0, e] +

void lua_setglobal (lua_State *L, const char *name);
+ +

+Pops a value from the stack and +sets it as the new value of global name. + + + + + +


lua_setmetatable

+[-1, +0, –] +

void lua_setmetatable (lua_State *L, int index);
+ +

+Pops a table from the stack and +sets it as the new metatable for the value at the given index. + + + + + +


lua_settable

+[-2, +0, e] +

void lua_settable (lua_State *L, int index);
+ +

+Does the equivalent to t[k] = v, +where t is the value at the given index, +v is the value at the top of the stack, +and k is the value just below the top. + + +

+This function pops both the key and the value from the stack. +As in Lua, this function may trigger a metamethod +for the "newindex" event (see §2.4). + + + + + +


lua_settop

+[-?, +?, –] +

void lua_settop (lua_State *L, int index);
+ +

+Accepts any index, or 0, +and sets the stack top to this index. +If the new top is larger than the old one, +then the new elements are filled with nil. +If index is 0, then all stack elements are removed. + + + + + +


lua_setuservalue

+[-1, +0, –] +

void lua_setuservalue (lua_State *L, int index);
+ +

+Pops a table or nil from the stack and sets it as +the new value associated to the userdata at the given index. + + + + + +


lua_State

+
typedef struct lua_State lua_State;
+ +

+An opaque structure that points to a thread and indirectly +(through the thread) to the whole state of a Lua interpreter. +The Lua library is fully reentrant: +it has no global variables. +All information about a state is accessible through this structure. + + +

+A pointer to this structure must be passed as the first argument to +every function in the library, except to lua_newstate, +which creates a Lua state from scratch. + + + + + +


lua_status

+[-0, +0, –] +

int lua_status (lua_State *L);
+ +

+Returns the status of the thread L. + + +

+The status can be 0 (LUA_OK) for a normal thread, +an error code if the thread finished the execution +of a lua_resume with an error, +or LUA_YIELD if the thread is suspended. + + +

+You can only call functions in threads with status LUA_OK. +You can resume threads with status LUA_OK +(to start a new coroutine) or LUA_YIELD +(to resume a coroutine). + + + + + +


lua_toboolean

+[-0, +0, –] +

int lua_toboolean (lua_State *L, int index);
+ +

+Converts the Lua value at the given index to a C boolean +value (0 or 1). +Like all tests in Lua, +lua_toboolean returns true for any Lua value +different from false and nil; +otherwise it returns false. +(If you want to accept only actual boolean values, +use lua_isboolean to test the value's type.) + + + + + +


lua_tocfunction

+[-0, +0, –] +

lua_CFunction lua_tocfunction (lua_State *L, int index);
+ +

+Converts a value at the given index to a C function. +That value must be a C function; +otherwise, returns NULL. + + + + + +


lua_tointeger

+[-0, +0, –] +

lua_Integer lua_tointeger (lua_State *L, int index);
+ +

+Equivalent to lua_tointegerx with isnum equal to NULL. + + + + + +


lua_tointegerx

+[-0, +0, –] +

lua_Integer lua_tointegerx (lua_State *L, int index, int *isnum);
+ +

+Converts the Lua value at the given index +to the signed integral type lua_Integer. +The Lua value must be a number or a string convertible to a number +(see §3.4.2); +otherwise, lua_tointegerx returns 0. + + +

+If the number is not an integer, +it is truncated in some non-specified way. + + +

+If isnum is not NULL, +its referent is assigned a boolean value that +indicates whether the operation succeeded. + + + + + +


lua_tolstring

+[-0, +0, e] +

const char *lua_tolstring (lua_State *L, int index, size_t *len);
+ +

+Converts the Lua value at the given index to a C string. +If len is not NULL, +it also sets *len with the string length. +The Lua value must be a string or a number; +otherwise, the function returns NULL. +If the value is a number, +then lua_tolstring also +changes the actual value in the stack to a string. +(This change confuses lua_next +when lua_tolstring is applied to keys during a table traversal.) + + +

+lua_tolstring returns a fully aligned pointer +to a string inside the Lua state. +This string always has a zero ('\0') +after its last character (as in C), +but can contain other zeros in its body. +Because Lua has garbage collection, +there is no guarantee that the pointer returned by lua_tolstring +will be valid after the corresponding value is removed from the stack. + + + + + +


lua_tonumber

+[-0, +0, –] +

lua_Number lua_tonumber (lua_State *L, int index);
+ +

+Equivalent to lua_tonumberx with isnum equal to NULL. + + + + + +


lua_tonumberx

+[-0, +0, –] +

lua_Number lua_tonumberx (lua_State *L, int index, int *isnum);
+ +

+Converts the Lua value at the given index +to the C type lua_Number (see lua_Number). +The Lua value must be a number or a string convertible to a number +(see §3.4.2); +otherwise, lua_tonumberx returns 0. + + +

+If isnum is not NULL, +its referent is assigned a boolean value that +indicates whether the operation succeeded. + + + + + +


lua_topointer

+[-0, +0, –] +

const void *lua_topointer (lua_State *L, int index);
+ +

+Converts the value at the given index to a generic +C pointer (void*). +The value can be a userdata, a table, a thread, or a function; +otherwise, lua_topointer returns NULL. +Different objects will give different pointers. +There is no way to convert the pointer back to its original value. + + +

+Typically this function is used only for debug information. + + + + + +


lua_tostring

+[-0, +0, e] +

const char *lua_tostring (lua_State *L, int index);
+ +

+Equivalent to lua_tolstring with len equal to NULL. + + + + + +


lua_tothread

+[-0, +0, –] +

lua_State *lua_tothread (lua_State *L, int index);
+ +

+Converts the value at the given index to a Lua thread +(represented as lua_State*). +This value must be a thread; +otherwise, the function returns NULL. + + + + + +


lua_tounsigned

+[-0, +0, –] +

lua_Unsigned lua_tounsigned (lua_State *L, int index);
+ +

+Equivalent to lua_tounsignedx with isnum equal to NULL. + + + + + +


lua_tounsignedx

+[-0, +0, –] +

lua_Unsigned lua_tounsignedx (lua_State *L, int index, int *isnum);
+ +

+Converts the Lua value at the given index +to the unsigned integral type lua_Unsigned. +The Lua value must be a number or a string convertible to a number +(see §3.4.2); +otherwise, lua_tounsignedx returns 0. + + +

+If the number is not an integer, +it is truncated in some non-specified way. +If the number is outside the range of representable values, +it is normalized to the remainder of its division by +one more than the maximum representable value. + + +

+If isnum is not NULL, +its referent is assigned a boolean value that +indicates whether the operation succeeded. + + + + + +


lua_touserdata

+[-0, +0, –] +

void *lua_touserdata (lua_State *L, int index);
+ +

+If the value at the given index is a full userdata, +returns its block address. +If the value is a light userdata, +returns its pointer. +Otherwise, returns NULL. + + + + + +


lua_type

+[-0, +0, –] +

int lua_type (lua_State *L, int index);
+ +

+Returns the type of the value in the given valid index, +or LUA_TNONE for a non-valid (but acceptable) index. +The types returned by lua_type are coded by the following constants +defined in lua.h: +LUA_TNIL, +LUA_TNUMBER, +LUA_TBOOLEAN, +LUA_TSTRING, +LUA_TTABLE, +LUA_TFUNCTION, +LUA_TUSERDATA, +LUA_TTHREAD, +and +LUA_TLIGHTUSERDATA. + + + + + +


lua_typename

+[-0, +0, –] +

const char *lua_typename (lua_State *L, int tp);
+ +

+Returns the name of the type encoded by the value tp, +which must be one the values returned by lua_type. + + + + + +


lua_Unsigned

+
typedef unsigned long lua_Unsigned;
+ +

+The type used by the Lua API to represent unsigned integral values. +It must have at least 32 bits. + + +

+By default it is an unsigned int or an unsigned long, +whichever can hold 32-bit values. + + + + + +


lua_upvalueindex

+[-0, +0, –] +

int lua_upvalueindex (int i);
+ +

+Returns the pseudo-index that represents the i-th upvalue of +the running function (see §4.4). + + + + + +


lua_version

+[-0, +0, v] +

const lua_Number *lua_version (lua_State *L);
+ +

+Returns the address of the version number stored in the Lua core. +When called with a valid lua_State, +returns the address of the version used to create that state. +When called with NULL, +returns the address of the version running the call. + + + + + +


lua_Writer

+
typedef int (*lua_Writer) (lua_State *L,
+                           const void* p,
+                           size_t sz,
+                           void* ud);
+ +

+The type of the writer function used by lua_dump. +Every time it produces another piece of chunk, +lua_dump calls the writer, +passing along the buffer to be written (p), +its size (sz), +and the data parameter supplied to lua_dump. + + +

+The writer returns an error code: +0 means no errors; +any other value means an error and stops lua_dump from +calling the writer again. + + + + + +


lua_xmove

+[-?, +?, –] +

void lua_xmove (lua_State *from, lua_State *to, int n);
+ +

+Exchange values between different threads of the same state. + + +

+This function pops n values from the stack from, +and pushes them onto the stack to. + + + + + +


lua_yield

+[-?, +?, –] +

int lua_yield (lua_State *L, int nresults);
+ +

+This function is equivalent to lua_yieldk, +but it has no continuation (see §4.7). +Therefore, when the thread resumes, +it returns to the function that called +the function calling lua_yield. + + + + + +


lua_yieldk

+[-?, +?, –] +

int lua_yieldk (lua_State *L, int nresults, int ctx, lua_CFunction k);
+ +

+Yields a coroutine. + + +

+This function should only be called as the +return expression of a C function, as follows: + +

+     return lua_yieldk (L, n, i, k);
+

+When a C function calls lua_yieldk in that way, +the running coroutine suspends its execution, +and the call to lua_resume that started this coroutine returns. +The parameter nresults is the number of values from the stack +that are passed as results to lua_resume. + + +

+When the coroutine is resumed again, +Lua calls the given continuation function k to continue +the execution of the C function that yielded (see §4.7). +This continuation function receives the same stack +from the previous function, +with the results removed and +replaced by the arguments passed to lua_resume. +Moreover, +the continuation function may access the value ctx +by calling lua_getctx. + + + + + + + +

4.9 – The Debug Interface

+ +

+Lua has no built-in debugging facilities. +Instead, it offers a special interface +by means of functions and hooks. +This interface allows the construction of different +kinds of debuggers, profilers, and other tools +that need "inside information" from the interpreter. + + + +


lua_Debug

+
typedef struct lua_Debug {
+  int event;
+  const char *name;           /* (n) */
+  const char *namewhat;       /* (n) */
+  const char *what;           /* (S) */
+  const char *source;         /* (S) */
+  int currentline;            /* (l) */
+  int linedefined;            /* (S) */
+  int lastlinedefined;        /* (S) */
+  unsigned char nups;         /* (u) number of upvalues */
+  unsigned char nparams;      /* (u) number of parameters */
+  char isvararg;              /* (u) */
+  char istailcall;            /* (t) */
+  char short_src[LUA_IDSIZE]; /* (S) */
+  /* private part */
+  other fields
+} lua_Debug;
+ +

+A structure used to carry different pieces of +information about a function or an activation record. +lua_getstack fills only the private part +of this structure, for later use. +To fill the other fields of lua_Debug with useful information, +call lua_getinfo. + + +

+The fields of lua_Debug have the following meaning: + +

    + +
  • source: +the source of the chunk that created the function. +If source starts with a '@', +it means that the function was defined in a file where +the file name follows the '@'. +If source starts with a '=', +the remainder of its contents describe the source in a user-dependent manner. +Otherwise, +the function was defined in a string where +source is that string. +
  • + +
  • short_src: +a "printable" version of source, to be used in error messages. +
  • + +
  • linedefined: +the line number where the definition of the function starts. +
  • + +
  • lastlinedefined: +the line number where the definition of the function ends. +
  • + +
  • what: +the string "Lua" if the function is a Lua function, +"C" if it is a C function, +"main" if it is the main part of a chunk. +
  • + +
  • currentline: +the current line where the given function is executing. +When no line information is available, +currentline is set to -1. +
  • + +
  • name: +a reasonable name for the given function. +Because functions in Lua are first-class values, +they do not have a fixed name: +some functions can be the value of multiple global variables, +while others can be stored only in a table field. +The lua_getinfo function checks how the function was +called to find a suitable name. +If it cannot find a name, +then name is set to NULL. +
  • + +
  • namewhat: +explains the name field. +The value of namewhat can be +"global", "local", "method", +"field", "upvalue", or "" (the empty string), +according to how the function was called. +(Lua uses the empty string when no other option seems to apply.) +
  • + +
  • istailcall: +true if this function invocation was called by a tail call. +In this case, the caller of this level is not in the stack. +
  • + +
  • nups: +the number of upvalues of the function. +
  • + +
  • nparams: +the number of fixed parameters of the function +(always 0 for C functions). +
  • + +
  • isvararg: +true if the function is a vararg function +(always true for C functions). +
  • + +
+ + + + +

lua_gethook

+[-0, +0, –] +

lua_Hook lua_gethook (lua_State *L);
+ +

+Returns the current hook function. + + + + + +


lua_gethookcount

+[-0, +0, –] +

int lua_gethookcount (lua_State *L);
+ +

+Returns the current hook count. + + + + + +


lua_gethookmask

+[-0, +0, –] +

int lua_gethookmask (lua_State *L);
+ +

+Returns the current hook mask. + + + + + +


lua_getinfo

+[-(0|1), +(0|1|2), e] +

int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar);
+ +

+Gets information about a specific function or function invocation. + + +

+To get information about a function invocation, +the parameter ar must be a valid activation record that was +filled by a previous call to lua_getstack or +given as argument to a hook (see lua_Hook). + + +

+To get information about a function you push it onto the stack +and start the what string with the character '>'. +(In that case, +lua_getinfo pops the function from the top of the stack.) +For instance, to know in which line a function f was defined, +you can write the following code: + +

+     lua_Debug ar;
+     lua_getglobal(L, "f");  /* get global 'f' */
+     lua_getinfo(L, ">S", &ar);
+     printf("%d\n", ar.linedefined);
+
+ +

+Each character in the string what +selects some fields of the structure ar to be filled or +a value to be pushed on the stack: + +

    + +
  • 'n': fills in the field name and namewhat; +
  • + +
  • 'S': +fills in the fields source, short_src, +linedefined, lastlinedefined, and what; +
  • + +
  • 'l': fills in the field currentline; +
  • + +
  • 't': fills in the field istailcall; +
  • + +
  • 'u': fills in the fields +nups, nparams, and isvararg; +
  • + +
  • 'f': +pushes onto the stack the function that is +running at the given level; +
  • + +
  • 'L': +pushes onto the stack a table whose indices are the +numbers of the lines that are valid on the function. +(A valid line is a line with some associated code, +that is, a line where you can put a break point. +Non-valid lines include empty lines and comments.) +
  • + +
+ +

+This function returns 0 on error +(for instance, an invalid option in what). + + + + + +


lua_getlocal

+[-0, +(0|1), –] +

const char *lua_getlocal (lua_State *L, lua_Debug *ar, int n);
+ +

+Gets information about a local variable of +a given activation record or a given function. + + +

+In the first case, +the parameter ar must be a valid activation record that was +filled by a previous call to lua_getstack or +given as argument to a hook (see lua_Hook). +The index n selects which local variable to inspect; +see debug.getlocal for details about variable indices +and names. + + +

+lua_getlocal pushes the variable's value onto the stack +and returns its name. + + +

+In the second case, ar should be NULL and the function +to be inspected must be at the top of the stack. +In this case, only parameters of Lua functions are visible +(as there is no information about what variables are active) +and no values are pushed onto the stack. + + +

+Returns NULL (and pushes nothing) +when the index is greater than +the number of active local variables. + + + + + +


lua_getstack

+[-0, +0, –] +

int lua_getstack (lua_State *L, int level, lua_Debug *ar);
+ +

+Gets information about the interpreter runtime stack. + + +

+This function fills parts of a lua_Debug structure with +an identification of the activation record +of the function executing at a given level. +Level 0 is the current running function, +whereas level n+1 is the function that has called level n +(except for tail calls, which do not count on the stack). +When there are no errors, lua_getstack returns 1; +when called with a level greater than the stack depth, +it returns 0. + + + + + +


lua_getupvalue

+[-0, +(0|1), –] +

const char *lua_getupvalue (lua_State *L, int funcindex, int n);
+ +

+Gets information about a closure's upvalue. +(For Lua functions, +upvalues are the external local variables that the function uses, +and that are consequently included in its closure.) +lua_getupvalue gets the index n of an upvalue, +pushes the upvalue's value onto the stack, +and returns its name. +funcindex points to the closure in the stack. +(Upvalues have no particular order, +as they are active through the whole function. +So, they are numbered in an arbitrary order.) + + +

+Returns NULL (and pushes nothing) +when the index is greater than the number of upvalues. +For C functions, this function uses the empty string "" +as a name for all upvalues. + + + + + +


lua_Hook

+
typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
+ +

+Type for debugging hook functions. + + +

+Whenever a hook is called, its ar argument has its field +event set to the specific event that triggered the hook. +Lua identifies these events with the following constants: +LUA_HOOKCALL, LUA_HOOKRET, +LUA_HOOKTAILCALL, LUA_HOOKLINE, +and LUA_HOOKCOUNT. +Moreover, for line events, the field currentline is also set. +To get the value of any other field in ar, +the hook must call lua_getinfo. + + +

+For call events, event can be LUA_HOOKCALL, +the normal value, or LUA_HOOKTAILCALL, for a tail call; +in this case, there will be no corresponding return event. + + +

+While Lua is running a hook, it disables other calls to hooks. +Therefore, if a hook calls back Lua to execute a function or a chunk, +this execution occurs without any calls to hooks. + + +

+Hook functions cannot have continuations, +that is, they cannot call lua_yieldk, +lua_pcallk, or lua_callk with a non-null k. + + +

+Hook functions can yield under the following conditions: +Only count and line events can yield +and they cannot yield any value; +to yield a hook function must finish its execution +calling lua_yield with nresults equal to zero. + + + + + +


lua_sethook

+[-0, +0, –] +

int lua_sethook (lua_State *L, lua_Hook f, int mask, int count);
+ +

+Sets the debugging hook function. + + +

+Argument f is the hook function. +mask specifies on which events the hook will be called: +it is formed by a bitwise or of the constants +LUA_MASKCALL, +LUA_MASKRET, +LUA_MASKLINE, +and LUA_MASKCOUNT. +The count argument is only meaningful when the mask +includes LUA_MASKCOUNT. +For each event, the hook is called as explained below: + +

    + +
  • The call hook: is called when the interpreter calls a function. +The hook is called just after Lua enters the new function, +before the function gets its arguments. +
  • + +
  • The return hook: is called when the interpreter returns from a function. +The hook is called just before Lua leaves the function. +There is no standard way to access the values +to be returned by the function. +
  • + +
  • The line hook: is called when the interpreter is about to +start the execution of a new line of code, +or when it jumps back in the code (even to the same line). +(This event only happens while Lua is executing a Lua function.) +
  • + +
  • The count hook: is called after the interpreter executes every +count instructions. +(This event only happens while Lua is executing a Lua function.) +
  • + +
+ +

+A hook is disabled by setting mask to zero. + + + + + +


lua_setlocal

+[-(0|1), +0, –] +

const char *lua_setlocal (lua_State *L, lua_Debug *ar, int n);
+ +

+Sets the value of a local variable of a given activation record. +Parameters ar and n are as in lua_getlocal +(see lua_getlocal). +lua_setlocal assigns the value at the top of the stack +to the variable and returns its name. +It also pops the value from the stack. + + +

+Returns NULL (and pops nothing) +when the index is greater than +the number of active local variables. + + + + + +


lua_setupvalue

+[-(0|1), +0, –] +

const char *lua_setupvalue (lua_State *L, int funcindex, int n);
+ +

+Sets the value of a closure's upvalue. +It assigns the value at the top of the stack +to the upvalue and returns its name. +It also pops the value from the stack. +Parameters funcindex and n are as in the lua_getupvalue +(see lua_getupvalue). + + +

+Returns NULL (and pops nothing) +when the index is greater than the number of upvalues. + + + + + +


lua_upvalueid

+[-0, +0, –] +

void *lua_upvalueid (lua_State *L, int funcindex, int n);
+ +

+Returns an unique identifier for the upvalue numbered n +from the closure at index funcindex. +Parameters funcindex and n are as in the lua_getupvalue +(see lua_getupvalue) +(but n cannot be greater than the number of upvalues). + + +

+These unique identifiers allow a program to check whether different +closures share upvalues. +Lua closures that share an upvalue +(that is, that access a same external local variable) +will return identical ids for those upvalue indices. + + + + + +


lua_upvaluejoin

+[-0, +0, –] +

void lua_upvaluejoin (lua_State *L, int funcindex1, int n1,
+                                    int funcindex2, int n2);
+ +

+Make the n1-th upvalue of the Lua closure at index funcindex1 +refer to the n2-th upvalue of the Lua closure at index funcindex2. + + + + + + + +

5 – The Auxiliary Library

+ +

+ +The auxiliary library provides several convenient functions +to interface C with Lua. +While the basic API provides the primitive functions for all +interactions between C and Lua, +the auxiliary library provides higher-level functions for some +common tasks. + + +

+All functions and types from the auxiliary library +are defined in header file lauxlib.h and +have a prefix luaL_. + + +

+All functions in the auxiliary library are built on +top of the basic API, +and so they provide nothing that cannot be done with that API. +Nevertheless, the use of the auxiliary library ensures +more consistency to your code. + + +

+Several functions in the auxiliary library use internally some +extra stack slots. +When a function in the auxiliary library uses less than five slots, +it does not check the stack size; +it simply assumes that there are enough slots. + + +

+Several functions in the auxiliary library are used to +check C function arguments. +Because the error message is formatted for arguments +(e.g., "bad argument #1"), +you should not use these functions for other stack values. + + +

+Functions called luaL_check* +always throw an error if the check is not satisfied. + + + +

5.1 – Functions and Types

+ +

+Here we list all functions and types from the auxiliary library +in alphabetical order. + + + +


luaL_addchar

+[-?, +?, e] +

void luaL_addchar (luaL_Buffer *B, char c);
+ +

+Adds the byte c to the buffer B +(see luaL_Buffer). + + + + + +


luaL_addlstring

+[-?, +?, e] +

void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l);
+ +

+Adds the string pointed to by s with length l to +the buffer B +(see luaL_Buffer). +The string can contain embedded zeros. + + + + + +


luaL_addsize

+[-?, +?, e] +

void luaL_addsize (luaL_Buffer *B, size_t n);
+ +

+Adds to the buffer B (see luaL_Buffer) +a string of length n previously copied to the +buffer area (see luaL_prepbuffer). + + + + + +


luaL_addstring

+[-?, +?, e] +

void luaL_addstring (luaL_Buffer *B, const char *s);
+ +

+Adds the zero-terminated string pointed to by s +to the buffer B +(see luaL_Buffer). +The string cannot contain embedded zeros. + + + + + +


luaL_addvalue

+[-1, +?, e] +

void luaL_addvalue (luaL_Buffer *B);
+ +

+Adds the value at the top of the stack +to the buffer B +(see luaL_Buffer). +Pops the value. + + +

+This is the only function on string buffers that can (and must) +be called with an extra element on the stack, +which is the value to be added to the buffer. + + + + + +


luaL_argcheck

+[-0, +0, v] +

void luaL_argcheck (lua_State *L,
+                    int cond,
+                    int arg,
+                    const char *extramsg);
+ +

+Checks whether cond is true. +If not, raises an error with a standard message. + + + + + +


luaL_argerror

+[-0, +0, v] +

int luaL_argerror (lua_State *L, int arg, const char *extramsg);
+ +

+Raises an error with a standard message +that includes extramsg as a comment. + + +

+This function never returns, +but it is an idiom to use it in C functions +as return luaL_argerror(args). + + + + + +


luaL_Buffer

+
typedef struct luaL_Buffer luaL_Buffer;
+ +

+Type for a string buffer. + + +

+A string buffer allows C code to build Lua strings piecemeal. +Its pattern of use is as follows: + +

    + +
  • First declare a variable b of type luaL_Buffer.
  • + +
  • Then initialize it with a call luaL_buffinit(L, &b).
  • + +
  • +Then add string pieces to the buffer calling any of +the luaL_add* functions. +
  • + +
  • +Finish by calling luaL_pushresult(&b). +This call leaves the final string on the top of the stack. +
  • + +
+ +

+If you know beforehand the total size of the resulting string, +you can use the buffer like this: + +

    + +
  • First declare a variable b of type luaL_Buffer.
  • + +
  • Then initialize it and preallocate a space of +size sz with a call luaL_buffinitsize(L, &b, sz).
  • + +
  • Then copy the string into that space.
  • + +
  • +Finish by calling luaL_pushresultsize(&b, sz), +where sz is the total size of the resulting string +copied into that space. +
  • + +
+ +

+During its normal operation, +a string buffer uses a variable number of stack slots. +So, while using a buffer, you cannot assume that you know where +the top of the stack is. +You can use the stack between successive calls to buffer operations +as long as that use is balanced; +that is, +when you call a buffer operation, +the stack is at the same level +it was immediately after the previous buffer operation. +(The only exception to this rule is luaL_addvalue.) +After calling luaL_pushresult the stack is back to its +level when the buffer was initialized, +plus the final string on its top. + + + + + +


luaL_buffinit

+[-0, +0, –] +

void luaL_buffinit (lua_State *L, luaL_Buffer *B);
+ +

+Initializes a buffer B. +This function does not allocate any space; +the buffer must be declared as a variable +(see luaL_Buffer). + + + + + +


luaL_buffinitsize

+[-?, +?, e] +

char *luaL_buffinitsize (lua_State *L, luaL_Buffer *B, size_t sz);
+ +

+Equivalent to the sequence +luaL_buffinit, luaL_prepbuffsize. + + + + + +


luaL_callmeta

+[-0, +(0|1), e] +

int luaL_callmeta (lua_State *L, int obj, const char *e);
+ +

+Calls a metamethod. + + +

+If the object at index obj has a metatable and this +metatable has a field e, +this function calls this field passing the object as its only argument. +In this case this function returns true and pushes onto the +stack the value returned by the call. +If there is no metatable or no metamethod, +this function returns false (without pushing any value on the stack). + + + + + +


luaL_checkany

+[-0, +0, v] +

void luaL_checkany (lua_State *L, int arg);
+ +

+Checks whether the function has an argument +of any type (including nil) at position arg. + + + + + +


luaL_checkint

+[-0, +0, v] +

int luaL_checkint (lua_State *L, int arg);
+ +

+Checks whether the function argument arg is a number +and returns this number cast to an int. + + + + + +


luaL_checkinteger

+[-0, +0, v] +

lua_Integer luaL_checkinteger (lua_State *L, int arg);
+ +

+Checks whether the function argument arg is a number +and returns this number cast to a lua_Integer. + + + + + +


luaL_checklong

+[-0, +0, v] +

long luaL_checklong (lua_State *L, int arg);
+ +

+Checks whether the function argument arg is a number +and returns this number cast to a long. + + + + + +


luaL_checklstring

+[-0, +0, v] +

const char *luaL_checklstring (lua_State *L, int arg, size_t *l);
+ +

+Checks whether the function argument arg is a string +and returns this string; +if l is not NULL fills *l +with the string's length. + + +

+This function uses lua_tolstring to get its result, +so all conversions and caveats of that function apply here. + + + + + +


luaL_checknumber

+[-0, +0, v] +

lua_Number luaL_checknumber (lua_State *L, int arg);
+ +

+Checks whether the function argument arg is a number +and returns this number. + + + + + +


luaL_checkoption

+[-0, +0, v] +

int luaL_checkoption (lua_State *L,
+                      int arg,
+                      const char *def,
+                      const char *const lst[]);
+ +

+Checks whether the function argument arg is a string and +searches for this string in the array lst +(which must be NULL-terminated). +Returns the index in the array where the string was found. +Raises an error if the argument is not a string or +if the string cannot be found. + + +

+If def is not NULL, +the function uses def as a default value when +there is no argument arg or when this argument is nil. + + +

+This is a useful function for mapping strings to C enums. +(The usual convention in Lua libraries is +to use strings instead of numbers to select options.) + + + + + +


luaL_checkstack

+[-0, +0, v] +

void luaL_checkstack (lua_State *L, int sz, const char *msg);
+ +

+Grows the stack size to top + sz elements, +raising an error if the stack cannot grow to that size. +msg is an additional text to go into the error message +(or NULL for no additional text). + + + + + +


luaL_checkstring

+[-0, +0, v] +

const char *luaL_checkstring (lua_State *L, int arg);
+ +

+Checks whether the function argument arg is a string +and returns this string. + + +

+This function uses lua_tolstring to get its result, +so all conversions and caveats of that function apply here. + + + + + +


luaL_checktype

+[-0, +0, v] +

void luaL_checktype (lua_State *L, int arg, int t);
+ +

+Checks whether the function argument arg has type t. +See lua_type for the encoding of types for t. + + + + + +


luaL_checkudata

+[-0, +0, v] +

void *luaL_checkudata (lua_State *L, int arg, const char *tname);
+ +

+Checks whether the function argument arg is a userdata +of the type tname (see luaL_newmetatable) and +returns the userdata address (see lua_touserdata). + + + + + +


luaL_checkunsigned

+[-0, +0, v] +

lua_Unsigned luaL_checkunsigned (lua_State *L, int arg);
+ +

+Checks whether the function argument arg is a number +and returns this number cast to a lua_Unsigned. + + + + + +


luaL_checkversion

+[-0, +0, –] +

void luaL_checkversion (lua_State *L);
+ +

+Checks whether the core running the call, +the core that created the Lua state, +and the code making the call are all using the same version of Lua. +Also checks whether the core running the call +and the core that created the Lua state +are using the same address space. + + + + + +


luaL_dofile

+[-0, +?, e] +

int luaL_dofile (lua_State *L, const char *filename);
+ +

+Loads and runs the given file. +It is defined as the following macro: + +

+     (luaL_loadfile(L, filename) || lua_pcall(L, 0, LUA_MULTRET, 0))
+

+It returns false if there are no errors +or true in case of errors. + + + + + +


luaL_dostring

+[-0, +?, –] +

int luaL_dostring (lua_State *L, const char *str);
+ +

+Loads and runs the given string. +It is defined as the following macro: + +

+     (luaL_loadstring(L, str) || lua_pcall(L, 0, LUA_MULTRET, 0))
+

+It returns false if there are no errors +or true in case of errors. + + + + + +


luaL_error

+[-0, +0, v] +

int luaL_error (lua_State *L, const char *fmt, ...);
+ +

+Raises an error. +The error message format is given by fmt +plus any extra arguments, +following the same rules of lua_pushfstring. +It also adds at the beginning of the message the file name and +the line number where the error occurred, +if this information is available. + + +

+This function never returns, +but it is an idiom to use it in C functions +as return luaL_error(args). + + + + + +


luaL_execresult

+[-0, +3, e] +

int luaL_execresult (lua_State *L, int stat);
+ +

+This function produces the return values for +process-related functions in the standard library +(os.execute and io.close). + + + + + +


luaL_fileresult

+[-0, +(1|3), e] +

int luaL_fileresult (lua_State *L, int stat, const char *fname);
+ +

+This function produces the return values for +file-related functions in the standard library +(io.open, os.rename, file:seek, etc.). + + + + + +


luaL_getmetafield

+[-0, +(0|1), e] +

int luaL_getmetafield (lua_State *L, int obj, const char *e);
+ +

+Pushes onto the stack the field e from the metatable +of the object at index obj. +If the object does not have a metatable, +or if the metatable does not have this field, +returns false and pushes nothing. + + + + + +


luaL_getmetatable

+[-0, +1, –] +

void luaL_getmetatable (lua_State *L, const char *tname);
+ +

+Pushes onto the stack the metatable associated with name tname +in the registry (see luaL_newmetatable). + + + + + +


luaL_getsubtable

+[-0, +1, e] +

int luaL_getsubtable (lua_State *L, int idx, const char *fname);
+ +

+Ensures that the value t[fname], +where t is the value at index idx, +is a table, +and pushes that table onto the stack. +Returns true if it finds a previous table there +and false if it creates a new table. + + + + + +


luaL_gsub

+[-0, +1, e] +

const char *luaL_gsub (lua_State *L,
+                       const char *s,
+                       const char *p,
+                       const char *r);
+ +

+Creates a copy of string s by replacing +any occurrence of the string p +with the string r. +Pushes the resulting string on the stack and returns it. + + + + + +


luaL_len

+[-0, +0, e] +

int luaL_len (lua_State *L, int index);
+ +

+Returns the "length" of the value at the given index +as a number; +it is equivalent to the '#' operator in Lua (see §3.4.6). +Raises an error if the result of the operation is not a number. +(This case only can happen through metamethods.) + + + + + +


luaL_loadbuffer

+[-0, +1, –] +

int luaL_loadbuffer (lua_State *L,
+                     const char *buff,
+                     size_t sz,
+                     const char *name);
+ +

+Equivalent to luaL_loadbufferx with mode equal to NULL. + + + + + +


luaL_loadbufferx

+[-0, +1, –] +

int luaL_loadbufferx (lua_State *L,
+                      const char *buff,
+                      size_t sz,
+                      const char *name,
+                      const char *mode);
+ +

+Loads a buffer as a Lua chunk. +This function uses lua_load to load the chunk in the +buffer pointed to by buff with size sz. + + +

+This function returns the same results as lua_load. +name is the chunk name, +used for debug information and error messages. +The string mode works as in function lua_load. + + + + + +


luaL_loadfile

+[-0, +1, e] +

int luaL_loadfile (lua_State *L, const char *filename);
+ +

+Equivalent to luaL_loadfilex with mode equal to NULL. + + + + + +


luaL_loadfilex

+[-0, +1, e] +

int luaL_loadfilex (lua_State *L, const char *filename,
+                                            const char *mode);
+ +

+Loads a file as a Lua chunk. +This function uses lua_load to load the chunk in the file +named filename. +If filename is NULL, +then it loads from the standard input. +The first line in the file is ignored if it starts with a #. + + +

+The string mode works as in function lua_load. + + +

+This function returns the same results as lua_load, +but it has an extra error code LUA_ERRFILE +if it cannot open/read the file or the file has a wrong mode. + + +

+As lua_load, this function only loads the chunk; +it does not run it. + + + + + +


luaL_loadstring

+[-0, +1, –] +

int luaL_loadstring (lua_State *L, const char *s);
+ +

+Loads a string as a Lua chunk. +This function uses lua_load to load the chunk in +the zero-terminated string s. + + +

+This function returns the same results as lua_load. + + +

+Also as lua_load, this function only loads the chunk; +it does not run it. + + + + + +


luaL_newlib

+[-0, +1, e] +

void luaL_newlib (lua_State *L, const luaL_Reg *l);
+ +

+Creates a new table and registers there +the functions in list l. +It is implemented as the following macro: + +

+     (luaL_newlibtable(L,l), luaL_setfuncs(L,l,0))
+
+ + + + +

luaL_newlibtable

+[-0, +1, e] +

void luaL_newlibtable (lua_State *L, const luaL_Reg l[]);
+ +

+Creates a new table with a size optimized +to store all entries in the array l +(but does not actually store them). +It is intended to be used in conjunction with luaL_setfuncs +(see luaL_newlib). + + +

+It is implemented as a macro. +The array l must be the actual array, +not a pointer to it. + + + + + +


luaL_newmetatable

+[-0, +1, e] +

int luaL_newmetatable (lua_State *L, const char *tname);
+ +

+If the registry already has the key tname, +returns 0. +Otherwise, +creates a new table to be used as a metatable for userdata, +adds it to the registry with key tname, +and returns 1. + + +

+In both cases pushes onto the stack the final value associated +with tname in the registry. + + + + + +


luaL_newstate

+[-0, +0, –] +

lua_State *luaL_newstate (void);
+ +

+Creates a new Lua state. +It calls lua_newstate with an +allocator based on the standard C realloc function +and then sets a panic function (see §4.6) that prints +an error message to the standard error output in case of fatal +errors. + + +

+Returns the new state, +or NULL if there is a memory allocation error. + + + + + +


luaL_openlibs

+[-0, +0, e] +

void luaL_openlibs (lua_State *L);
+ +

+Opens all standard Lua libraries into the given state. + + + + + +


luaL_optint

+[-0, +0, v] +

int luaL_optint (lua_State *L, int arg, int d);
+ +

+If the function argument arg is a number, +returns this number cast to an int. +If this argument is absent or is nil, +returns d. +Otherwise, raises an error. + + + + + +


luaL_optinteger

+[-0, +0, v] +

lua_Integer luaL_optinteger (lua_State *L,
+                             int arg,
+                             lua_Integer d);
+ +

+If the function argument arg is a number, +returns this number cast to a lua_Integer. +If this argument is absent or is nil, +returns d. +Otherwise, raises an error. + + + + + +


luaL_optlong

+[-0, +0, v] +

long luaL_optlong (lua_State *L, int arg, long d);
+ +

+If the function argument arg is a number, +returns this number cast to a long. +If this argument is absent or is nil, +returns d. +Otherwise, raises an error. + + + + + +


luaL_optlstring

+[-0, +0, v] +

const char *luaL_optlstring (lua_State *L,
+                             int arg,
+                             const char *d,
+                             size_t *l);
+ +

+If the function argument arg is a string, +returns this string. +If this argument is absent or is nil, +returns d. +Otherwise, raises an error. + + +

+If l is not NULL, +fills the position *l with the result's length. + + + + + +


luaL_optnumber

+[-0, +0, v] +

lua_Number luaL_optnumber (lua_State *L, int arg, lua_Number d);
+ +

+If the function argument arg is a number, +returns this number. +If this argument is absent or is nil, +returns d. +Otherwise, raises an error. + + + + + +


luaL_optstring

+[-0, +0, v] +

const char *luaL_optstring (lua_State *L,
+                            int arg,
+                            const char *d);
+ +

+If the function argument arg is a string, +returns this string. +If this argument is absent or is nil, +returns d. +Otherwise, raises an error. + + + + + +


luaL_optunsigned

+[-0, +0, v] +

lua_Unsigned luaL_optunsigned (lua_State *L,
+                               int arg,
+                               lua_Unsigned u);
+ +

+If the function argument arg is a number, +returns this number cast to a lua_Unsigned. +If this argument is absent or is nil, +returns u. +Otherwise, raises an error. + + + + + +


luaL_prepbuffer

+[-?, +?, e] +

char *luaL_prepbuffer (luaL_Buffer *B);
+ +

+Equivalent to luaL_prepbuffsize +with the predefined size LUAL_BUFFERSIZE. + + + + + +


luaL_prepbuffsize

+[-?, +?, e] +

char *luaL_prepbuffsize (luaL_Buffer *B, size_t sz);
+ +

+Returns an address to a space of size sz +where you can copy a string to be added to buffer B +(see luaL_Buffer). +After copying the string into this space you must call +luaL_addsize with the size of the string to actually add +it to the buffer. + + + + + +


luaL_pushresult

+[-?, +1, e] +

void luaL_pushresult (luaL_Buffer *B);
+ +

+Finishes the use of buffer B leaving the final string on +the top of the stack. + + + + + +


luaL_pushresultsize

+[-?, +1, e] +

void luaL_pushresultsize (luaL_Buffer *B, size_t sz);
+ +

+Equivalent to the sequence luaL_addsize, luaL_pushresult. + + + + + +


luaL_ref

+[-1, +0, e] +

int luaL_ref (lua_State *L, int t);
+ +

+Creates and returns a reference, +in the table at index t, +for the object at the top of the stack (and pops the object). + + +

+A reference is a unique integer key. +As long as you do not manually add integer keys into table t, +luaL_ref ensures the uniqueness of the key it returns. +You can retrieve an object referred by reference r +by calling lua_rawgeti(L, t, r). +Function luaL_unref frees a reference and its associated object. + + +

+If the object at the top of the stack is nil, +luaL_ref returns the constant LUA_REFNIL. +The constant LUA_NOREF is guaranteed to be different +from any reference returned by luaL_ref. + + + + + +


luaL_Reg

+
typedef struct luaL_Reg {
+  const char *name;
+  lua_CFunction func;
+} luaL_Reg;
+ +

+Type for arrays of functions to be registered by +luaL_setfuncs. +name is the function name and func is a pointer to +the function. +Any array of luaL_Reg must end with an sentinel entry +in which both name and func are NULL. + + + + + +


luaL_requiref

+[-0, +1, e] +

void luaL_requiref (lua_State *L, const char *modname,
+                    lua_CFunction openf, int glb);
+ +

+Calls function openf with string modname as an argument +and sets the call result in package.loaded[modname], +as if that function has been called through require. + + +

+If glb is true, +also stores the result into global modname. + + +

+Leaves a copy of that result on the stack. + + + + + +


luaL_setfuncs

+[-nup, +0, e] +

void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup);
+ +

+Registers all functions in the array l +(see luaL_Reg) into the table on the top of the stack +(below optional upvalues, see next). + + +

+When nup is not zero, +all functions are created sharing nup upvalues, +which must be previously pushed on the stack +on top of the library table. +These values are popped from the stack after the registration. + + + + + +


luaL_setmetatable

+[-0, +0, –] +

void luaL_setmetatable (lua_State *L, const char *tname);
+ +

+Sets the metatable of the object at the top of the stack +as the metatable associated with name tname +in the registry (see luaL_newmetatable). + + + + + +


luaL_testudata

+[-0, +0, e] +

void *luaL_testudata (lua_State *L, int arg, const char *tname);
+ +

+This function works like luaL_checkudata, +except that, when the test fails, +it returns NULL instead of throwing an error. + + + + + +


luaL_tolstring

+[-0, +1, e] +

const char *luaL_tolstring (lua_State *L, int idx, size_t *len);
+ +

+Converts any Lua value at the given index to a C string +in a reasonable format. +The resulting string is pushed onto the stack and also +returned by the function. +If len is not NULL, +the function also sets *len with the string length. + + +

+If the value has a metatable with a "__tostring" field, +then luaL_tolstring calls the corresponding metamethod +with the value as argument, +and uses the result of the call as its result. + + + + + +


luaL_traceback

+[-0, +1, e] +

void luaL_traceback (lua_State *L, lua_State *L1, const char *msg,
+                     int level);
+ +

+Creates and pushes a traceback of the stack L1. +If msg is not NULL it is appended +at the beginning of the traceback. +The level parameter tells at which level +to start the traceback. + + + + + +


luaL_typename

+[-0, +0, –] +

const char *luaL_typename (lua_State *L, int index);
+ +

+Returns the name of the type of the value at the given index. + + + + + +


luaL_unref

+[-0, +0, –] +

void luaL_unref (lua_State *L, int t, int ref);
+ +

+Releases reference ref from the table at index t +(see luaL_ref). +The entry is removed from the table, +so that the referred object can be collected. +The reference ref is also freed to be used again. + + +

+If ref is LUA_NOREF or LUA_REFNIL, +luaL_unref does nothing. + + + + + +


luaL_where

+[-0, +1, e] +

void luaL_where (lua_State *L, int lvl);
+ +

+Pushes onto the stack a string identifying the current position +of the control at level lvl in the call stack. +Typically this string has the following format: + +

+     chunkname:currentline:
+

+Level 0 is the running function, +level 1 is the function that called the running function, +etc. + + +

+This function is used to build a prefix for error messages. + + + + + + + +

6 – Standard Libraries

+ +

+The standard Lua libraries provide useful functions +that are implemented directly through the C API. +Some of these functions provide essential services to the language +(e.g., type and getmetatable); +others provide access to "outside" services (e.g., I/O); +and others could be implemented in Lua itself, +but are quite useful or have critical performance requirements that +deserve an implementation in C (e.g., table.sort). + + +

+All libraries are implemented through the official C API +and are provided as separate C modules. +Currently, Lua has the following standard libraries: + +

    + +
  • basic library (§6.1);
  • + +
  • coroutine library (§6.2);
  • + +
  • package library (§6.3);
  • + +
  • string manipulation (§6.4);
  • + +
  • table manipulation (§6.5);
  • + +
  • mathematical functions (§6.6) (sin, log, etc.);
  • + +
  • bitwise operations (§6.7);
  • + +
  • input and output (§6.8);
  • + +
  • operating system facilities (§6.9);
  • + +
  • debug facilities (§6.10).
  • + +

+Except for the basic and the package libraries, +each library provides all its functions as fields of a global table +or as methods of its objects. + + +

+To have access to these libraries, +the C host program should call the luaL_openlibs function, +which opens all standard libraries. +Alternatively, +the host program can open them individually by using +luaL_requiref to call +luaopen_base (for the basic library), +luaopen_package (for the package library), +luaopen_coroutine (for the coroutine library), +luaopen_string (for the string library), +luaopen_table (for the table library), +luaopen_math (for the mathematical library), +luaopen_bit32 (for the bit library), +luaopen_io (for the I/O library), +luaopen_os (for the Operating System library), +and luaopen_debug (for the debug library). +These functions are declared in lualib.h. + + + +

6.1 – Basic Functions

+ +

+The basic library provides core functions to Lua. +If you do not include this library in your application, +you should check carefully whether you need to provide +implementations for some of its facilities. + + +

+


assert (v [, message])

+Issues an error when +the value of its argument v is false (i.e., nil or false); +otherwise, returns all its arguments. +message is an error message; +when absent, it defaults to "assertion failed!" + + + + +

+


collectgarbage ([opt [, arg]])

+ + +

+This function is a generic interface to the garbage collector. +It performs different functions according to its first argument, opt: + +

    + +
  • "collect": +performs a full garbage-collection cycle. +This is the default option. +
  • + +
  • "stop": +stops automatic execution of the garbage collector. +The collector will run only when explicitly invoked, +until a call to restart it. +
  • + +
  • "restart": +restarts automatic execution of the garbage collector. +
  • + +
  • "count": +returns the total memory in use by Lua (in Kbytes) and +a second value with the total memory in bytes modulo 1024. +The first value has a fractional part, +so the following equality is always true: + +
    +     k, b = collectgarbage("count")
    +     assert(k*1024 == math.floor(k)*1024 + b)
    +

    +(The second result is useful when Lua is compiled +with a non floating-point type for numbers.) +

  • + +
  • "step": +performs a garbage-collection step. +The step "size" is controlled by arg +(larger values mean more steps) in a non-specified way. +If you want to control the step size +you must experimentally tune the value of arg. +Returns true if the step finished a collection cycle. +
  • + +
  • "setpause": +sets arg as the new value for the pause of +the collector (see §2.5). +Returns the previous value for pause. +
  • + +
  • "setstepmul": +sets arg as the new value for the step multiplier of +the collector (see §2.5). +Returns the previous value for step. +
  • + +
  • "isrunning": +returns a boolean that tells whether the collector is running +(i.e., not stopped). +
  • + +
  • "generational": +changes the collector to generational mode. +This is an experimental feature (see §2.5). +
  • + +
  • "incremental": +changes the collector to incremental mode. +This is the default mode. +
  • + +
+ + + +

+


dofile ([filename])

+Opens the named file and executes its contents as a Lua chunk. +When called without arguments, +dofile executes the contents of the standard input (stdin). +Returns all values returned by the chunk. +In case of errors, dofile propagates the error +to its caller (that is, dofile does not run in protected mode). + + + + +

+


error (message [, level])

+Terminates the last protected function called +and returns message as the error message. +Function error never returns. + + +

+Usually, error adds some information about the error position +at the beginning of the message, if the message is a string. +The level argument specifies how to get the error position. +With level 1 (the default), the error position is where the +error function was called. +Level 2 points the error to where the function +that called error was called; and so on. +Passing a level 0 avoids the addition of error position information +to the message. + + + + +

+


_G

+A global variable (not a function) that +holds the global environment (see §2.2). +Lua itself does not use this variable; +changing its value does not affect any environment, +nor vice-versa. + + + + +

+


getmetatable (object)

+ + +

+If object does not have a metatable, returns nil. +Otherwise, +if the object's metatable has a "__metatable" field, +returns the associated value. +Otherwise, returns the metatable of the given object. + + + + +

+


ipairs (t)

+ + +

+If t has a metamethod __ipairs, +calls it with t as argument and returns the first three +results from the call. + + +

+Otherwise, +returns three values: an iterator function, the table t, and 0, +so that the construction + +

+     for i,v in ipairs(t) do body end
+

+will iterate over the pairs (1,t[1]), (2,t[2]), ..., +up to the first integer key absent from the table. + + + + +

+


load (ld [, source [, mode [, env]]])

+ + +

+Loads a chunk. + + +

+If ld is a string, the chunk is this string. +If ld is a function, +load calls it repeatedly to get the chunk pieces. +Each call to ld must return a string that concatenates +with previous results. +A return of an empty string, nil, or no value signals the end of the chunk. + + +

+If there are no syntactic errors, +returns the compiled chunk as a function; +otherwise, returns nil plus the error message. + + +

+If the resulting function has upvalues, +the first upvalue is set to the value of env, +if that parameter is given, +or to the value of the global environment. +(When you load a main chunk, +the resulting function will always have exactly one upvalue, +the _ENV variable (see §2.2). +When you load a binary chunk created from a function (see string.dump), +the resulting function can have arbitrary upvalues.) + + +

+source is used as the source of the chunk for error messages +and debug information (see §4.9). +When absent, +it defaults to ld, if ld is a string, +or to "=(load)" otherwise. + + +

+The string mode controls whether the chunk can be text or binary +(that is, a precompiled chunk). +It may be the string "b" (only binary chunks), +"t" (only text chunks), +or "bt" (both binary and text). +The default is "bt". + + + + +

+


loadfile ([filename [, mode [, env]]])

+ + +

+Similar to load, +but gets the chunk from file filename +or from the standard input, +if no file name is given. + + + + +

+


next (table [, index])

+ + +

+Allows a program to traverse all fields of a table. +Its first argument is a table and its second argument +is an index in this table. +next returns the next index of the table +and its associated value. +When called with nil as its second argument, +next returns an initial index +and its associated value. +When called with the last index, +or with nil in an empty table, +next returns nil. +If the second argument is absent, then it is interpreted as nil. +In particular, +you can use next(t) to check whether a table is empty. + + +

+The order in which the indices are enumerated is not specified, +even for numeric indices. +(To traverse a table in numeric order, +use a numerical for.) + + +

+The behavior of next is undefined if, +during the traversal, +you assign any value to a non-existent field in the table. +You may however modify existing fields. +In particular, you may clear existing fields. + + + + +

+


pairs (t)

+ + +

+If t has a metamethod __pairs, +calls it with t as argument and returns the first three +results from the call. + + +

+Otherwise, +returns three values: the next function, the table t, and nil, +so that the construction + +

+     for k,v in pairs(t) do body end
+

+will iterate over all key–value pairs of table t. + + +

+See function next for the caveats of modifying +the table during its traversal. + + + + +

+


pcall (f [, arg1, ···])

+ + +

+Calls function f with +the given arguments in protected mode. +This means that any error inside f is not propagated; +instead, pcall catches the error +and returns a status code. +Its first result is the status code (a boolean), +which is true if the call succeeds without errors. +In such case, pcall also returns all results from the call, +after this first result. +In case of any error, pcall returns false plus the error message. + + + + +

+


print (···)

+Receives any number of arguments +and prints their values to stdout, +using the tostring function to convert each argument to a string. +print is not intended for formatted output, +but only as a quick way to show a value, +for instance for debugging. +For complete control over the output, +use string.format and io.write. + + + + +

+


rawequal (v1, v2)

+Checks whether v1 is equal to v2, +without invoking any metamethod. +Returns a boolean. + + + + +

+


rawget (table, index)

+Gets the real value of table[index], +without invoking any metamethod. +table must be a table; +index may be any value. + + + + +

+


rawlen (v)

+Returns the length of the object v, +which must be a table or a string, +without invoking any metamethod. +Returns an integer number. + + + + +

+


rawset (table, index, value)

+Sets the real value of table[index] to value, +without invoking any metamethod. +table must be a table, +index any value different from nil and NaN, +and value any Lua value. + + +

+This function returns table. + + + + +

+


select (index, ···)

+ + +

+If index is a number, +returns all arguments after argument number index; +a negative number indexes from the end (-1 is the last argument). +Otherwise, index must be the string "#", +and select returns the total number of extra arguments it received. + + + + +

+


setmetatable (table, metatable)

+ + +

+Sets the metatable for the given table. +(You cannot change the metatable of other types from Lua, only from C.) +If metatable is nil, +removes the metatable of the given table. +If the original metatable has a "__metatable" field, +raises an error. + + +

+This function returns table. + + + + +

+


tonumber (e [, base])

+ + +

+When called with no base, +tonumber tries to convert its argument to a number. +If the argument is already a number or +a string convertible to a number (see §3.4.2), +then tonumber returns this number; +otherwise, it returns nil. + + +

+When called with base, +then e should be a string to be interpreted as +an integer numeral in that base. +The base may be any integer between 2 and 36, inclusive. +In bases above 10, the letter 'A' (in either upper or lower case) +represents 10, 'B' represents 11, and so forth, +with 'Z' representing 35. +If the string e is not a valid numeral in the given base, +the function returns nil. + + + + +

+


tostring (v)

+Receives a value of any type and +converts it to a string in a reasonable format. +(For complete control of how numbers are converted, +use string.format.) + + +

+If the metatable of v has a "__tostring" field, +then tostring calls the corresponding value +with v as argument, +and uses the result of the call as its result. + + + + +

+


type (v)

+Returns the type of its only argument, coded as a string. +The possible results of this function are +"nil" (a string, not the value nil), +"number", +"string", +"boolean", +"table", +"function", +"thread", +and "userdata". + + + + +

+


_VERSION

+A global variable (not a function) that +holds a string containing the current interpreter version. +The current contents of this variable is "Lua 5.2". + + + + +

+


xpcall (f, msgh [, arg1, ···])

+ + +

+This function is similar to pcall, +except that it sets a new message handler msgh. + + + + + + + +

6.2 – Coroutine Manipulation

+ +

+The operations related to coroutines comprise a sub-library of +the basic library and come inside the table coroutine. +See §2.6 for a general description of coroutines. + + +

+


coroutine.create (f)

+ + +

+Creates a new coroutine, with body f. +f must be a Lua function. +Returns this new coroutine, +an object with type "thread". + + + + +

+


coroutine.resume (co [, val1, ···])

+ + +

+Starts or continues the execution of coroutine co. +The first time you resume a coroutine, +it starts running its body. +The values val1, ... are passed +as the arguments to the body function. +If the coroutine has yielded, +resume restarts it; +the values val1, ... are passed +as the results from the yield. + + +

+If the coroutine runs without any errors, +resume returns true plus any values passed to yield +(if the coroutine yields) or any values returned by the body function +(if the coroutine terminates). +If there is any error, +resume returns false plus the error message. + + + + +

+


coroutine.running ()

+ + +

+Returns the running coroutine plus a boolean, +true when the running coroutine is the main one. + + + + +

+


coroutine.status (co)

+ + +

+Returns the status of coroutine co, as a string: +"running", +if the coroutine is running (that is, it called status); +"suspended", if the coroutine is suspended in a call to yield, +or if it has not started running yet; +"normal" if the coroutine is active but not running +(that is, it has resumed another coroutine); +and "dead" if the coroutine has finished its body function, +or if it has stopped with an error. + + + + +

+


coroutine.wrap (f)

+ + +

+Creates a new coroutine, with body f. +f must be a Lua function. +Returns a function that resumes the coroutine each time it is called. +Any arguments passed to the function behave as the +extra arguments to resume. +Returns the same values returned by resume, +except the first boolean. +In case of error, propagates the error. + + + + +

+


coroutine.yield (···)

+ + +

+Suspends the execution of the calling coroutine. +Any arguments to yield are passed as extra results to resume. + + + + + + + +

6.3 – Modules

+ +

+The package library provides basic +facilities for loading modules in Lua. +It exports one function directly in the global environment: +require. +Everything else is exported in a table package. + + +

+


require (modname)

+ + +

+Loads the given module. +The function starts by looking into the package.loaded table +to determine whether modname is already loaded. +If it is, then require returns the value stored +at package.loaded[modname]. +Otherwise, it tries to find a loader for the module. + + +

+To find a loader, +require is guided by the package.searchers sequence. +By changing this sequence, +we can change how require looks for a module. +The following explanation is based on the default configuration +for package.searchers. + + +

+First require queries package.preload[modname]. +If it has a value, +this value (which should be a function) is the loader. +Otherwise require searches for a Lua loader using the +path stored in package.path. +If that also fails, it searches for a C loader using the +path stored in package.cpath. +If that also fails, +it tries an all-in-one loader (see package.searchers). + + +

+Once a loader is found, +require calls the loader with two arguments: +modname and an extra value dependent on how it got the loader. +(If the loader came from a file, +this extra value is the file name.) +If the loader returns any non-nil value, +require assigns the returned value to package.loaded[modname]. +If the loader does not return a non-nil value and +has not assigned any value to package.loaded[modname], +then require assigns true to this entry. +In any case, require returns the +final value of package.loaded[modname]. + + +

+If there is any error loading or running the module, +or if it cannot find any loader for the module, +then require raises an error. + + + + +

+


package.config

+ + +

+A string describing some compile-time configurations for packages. +This string is a sequence of lines: + +

    + +
  • The first line is the directory separator string. +Default is '\' for Windows and '/' for all other systems.
  • + +
  • The second line is the character that separates templates in a path. +Default is ';'.
  • + +
  • The third line is the string that marks the +substitution points in a template. +Default is '?'.
  • + +
  • The fourth line is a string that, in a path in Windows, +is replaced by the executable's directory. +Default is '!'.
  • + +
  • The fifth line is a mark to ignore all text before it +when building the luaopen_ function name. +Default is '-'.
  • + +
+ + + +

+


package.cpath

+ + +

+The path used by require to search for a C loader. + + +

+Lua initializes the C path package.cpath in the same way +it initializes the Lua path package.path, +using the environment variable LUA_CPATH_5_2 +or the environment variable LUA_CPATH +or a default path defined in luaconf.h. + + + + +

+


package.loaded

+ + +

+A table used by require to control which +modules are already loaded. +When you require a module modname and +package.loaded[modname] is not false, +require simply returns the value stored there. + + +

+This variable is only a reference to the real table; +assignments to this variable do not change the +table used by require. + + + + +

+


package.loadlib (libname, funcname)

+ + +

+Dynamically links the host program with the C library libname. + + +

+If funcname is "*", +then it only links with the library, +making the symbols exported by the library +available to other dynamically linked libraries. +Otherwise, +it looks for a function funcname inside the library +and returns this function as a C function. +So, funcname must follow the lua_CFunction prototype +(see lua_CFunction). + + +

+This is a low-level function. +It completely bypasses the package and module system. +Unlike require, +it does not perform any path searching and +does not automatically adds extensions. +libname must be the complete file name of the C library, +including if necessary a path and an extension. +funcname must be the exact name exported by the C library +(which may depend on the C compiler and linker used). + + +

+This function is not supported by Standard C. +As such, it is only available on some platforms +(Windows, Linux, Mac OS X, Solaris, BSD, +plus other Unix systems that support the dlfcn standard). + + + + +

+


package.path

+ + +

+The path used by require to search for a Lua loader. + + +

+At start-up, Lua initializes this variable with +the value of the environment variable LUA_PATH_5_2 or +the environment variable LUA_PATH or +with a default path defined in luaconf.h, +if those environment variables are not defined. +Any ";;" in the value of the environment variable +is replaced by the default path. + + + + +

+


package.preload

+ + +

+A table to store loaders for specific modules +(see require). + + +

+This variable is only a reference to the real table; +assignments to this variable do not change the +table used by require. + + + + +

+


package.searchers

+ + +

+A table used by require to control how to load modules. + + +

+Each entry in this table is a searcher function. +When looking for a module, +require calls each of these searchers in ascending order, +with the module name (the argument given to require) as its +sole parameter. +The function can return another function (the module loader) +plus an extra value that will be passed to that loader, +or a string explaining why it did not find that module +(or nil if it has nothing to say). + + +

+Lua initializes this table with four searcher functions. + + +

+The first searcher simply looks for a loader in the +package.preload table. + + +

+The second searcher looks for a loader as a Lua library, +using the path stored at package.path. +The search is done as described in function package.searchpath. + + +

+The third searcher looks for a loader as a C library, +using the path given by the variable package.cpath. +Again, +the search is done as described in function package.searchpath. +For instance, +if the C path is the string + +

+     "./?.so;./?.dll;/usr/local/?/init.so"
+

+the searcher for module foo +will try to open the files ./foo.so, ./foo.dll, +and /usr/local/foo/init.so, in that order. +Once it finds a C library, +this searcher first uses a dynamic link facility to link the +application with the library. +Then it tries to find a C function inside the library to +be used as the loader. +The name of this C function is the string "luaopen_" +concatenated with a copy of the module name where each dot +is replaced by an underscore. +Moreover, if the module name has a hyphen, +its prefix up to (and including) the first hyphen is removed. +For instance, if the module name is a.v1-b.c, +the function name will be luaopen_b_c. + + +

+The fourth searcher tries an all-in-one loader. +It searches the C path for a library for +the root name of the given module. +For instance, when requiring a.b.c, +it will search for a C library for a. +If found, it looks into it for an open function for +the submodule; +in our example, that would be luaopen_a_b_c. +With this facility, a package can pack several C submodules +into one single library, +with each submodule keeping its original open function. + + +

+All searchers except the first one (preload) return as the extra value +the file name where the module was found, +as returned by package.searchpath. +The first searcher returns no extra value. + + + + +

+


package.searchpath (name, path [, sep [, rep]])

+ + +

+Searches for the given name in the given path. + + +

+A path is a string containing a sequence of +templates separated by semicolons. +For each template, +the function replaces each interrogation mark (if any) +in the template with a copy of name +wherein all occurrences of sep +(a dot, by default) +were replaced by rep +(the system's directory separator, by default), +and then tries to open the resulting file name. + + +

+For instance, if the path is the string + +

+     "./?.lua;./?.lc;/usr/local/?/init.lua"
+

+the search for the name foo.a +will try to open the files +./foo/a.lua, ./foo/a.lc, and +/usr/local/foo/a/init.lua, in that order. + + +

+Returns the resulting name of the first file that it can +open in read mode (after closing the file), +or nil plus an error message if none succeeds. +(This error message lists all file names it tried to open.) + + + + + + + +

6.4 – String Manipulation

+ +

+This library provides generic functions for string manipulation, +such as finding and extracting substrings, and pattern matching. +When indexing a string in Lua, the first character is at position 1 +(not at 0, as in C). +Indices are allowed to be negative and are interpreted as indexing backwards, +from the end of the string. +Thus, the last character is at position -1, and so on. + + +

+The string library provides all its functions inside the table +string. +It also sets a metatable for strings +where the __index field points to the string table. +Therefore, you can use the string functions in object-oriented style. +For instance, string.byte(s,i) +can be written as s:byte(i). + + +

+The string library assumes one-byte character encodings. + + +

+


string.byte (s [, i [, j]])

+Returns the internal numerical codes of the characters s[i], +s[i+1], ..., s[j]. +The default value for i is 1; +the default value for j is i. +These indices are corrected +following the same rules of function string.sub. + + +

+Numerical codes are not necessarily portable across platforms. + + + + +

+


string.char (···)

+Receives zero or more integers. +Returns a string with length equal to the number of arguments, +in which each character has the internal numerical code equal +to its corresponding argument. + + +

+Numerical codes are not necessarily portable across platforms. + + + + +

+


string.dump (function)

+ + +

+Returns a string containing a binary representation of the given function, +so that a later load on this string returns +a copy of the function (but with new upvalues). + + + + +

+


string.find (s, pattern [, init [, plain]])

+ + +

+Looks for the first match of +pattern in the string s. +If it finds a match, then find returns the indices of s +where this occurrence starts and ends; +otherwise, it returns nil. +A third, optional numerical argument init specifies +where to start the search; +its default value is 1 and can be negative. +A value of true as a fourth, optional argument plain +turns off the pattern matching facilities, +so the function does a plain "find substring" operation, +with no characters in pattern being considered magic. +Note that if plain is given, then init must be given as well. + + +

+If the pattern has captures, +then in a successful match +the captured values are also returned, +after the two indices. + + + + +

+


string.format (formatstring, ···)

+ + +

+Returns a formatted version of its variable number of arguments +following the description given in its first argument (which must be a string). +The format string follows the same rules as the ANSI C function sprintf. +The only differences are that the options/modifiers +*, h, L, l, n, +and p are not supported +and that there is an extra option, q. +The q option formats a string between double quotes, +using escape sequences when necessary to ensure that +it can safely be read back by the Lua interpreter. +For instance, the call + +

+     string.format('%q', 'a string with "quotes" and \n new line')
+

+may produce the string: + +

+     "a string with \"quotes\" and \
+      new line"
+
+ +

+Options +A and a (when available), +E, e, f, +G, and g all expect a number as argument. +Options c, d, +i, o, u, X, and x +also expect a number, +but the range of that number may be limited by +the underlying C implementation. +For options o, u, X, and x, +the number cannot be negative. +Option q expects a string; +option s expects a string without embedded zeros. +If the argument to option s is not a string, +it is converted to one following the same rules of tostring. + + + + +

+


string.gmatch (s, pattern)

+Returns an iterator function that, +each time it is called, +returns the next captures from pattern over the string s. +If pattern specifies no captures, +then the whole match is produced in each call. + + +

+As an example, the following loop +will iterate over all the words from string s, +printing one per line: + +

+     s = "hello world from Lua"
+     for w in string.gmatch(s, "%a+") do
+       print(w)
+     end
+

+The next example collects all pairs key=value from the +given string into a table: + +

+     t = {}
+     s = "from=world, to=Lua"
+     for k, v in string.gmatch(s, "(%w+)=(%w+)") do
+       t[k] = v
+     end
+
+ +

+For this function, a caret '^' at the start of a pattern does not +work as an anchor, as this would prevent the iteration. + + + + +

+


string.gsub (s, pattern, repl [, n])

+Returns a copy of s +in which all (or the first n, if given) +occurrences of the pattern have been +replaced by a replacement string specified by repl, +which can be a string, a table, or a function. +gsub also returns, as its second value, +the total number of matches that occurred. +The name gsub comes from Global SUBstitution. + + +

+If repl is a string, then its value is used for replacement. +The character % works as an escape character: +any sequence in repl of the form %d, +with d between 1 and 9, +stands for the value of the d-th captured substring. +The sequence %0 stands for the whole match. +The sequence %% stands for a single %. + + +

+If repl is a table, then the table is queried for every match, +using the first capture as the key. + + +

+If repl is a function, then this function is called every time a +match occurs, with all captured substrings passed as arguments, +in order. + + +

+In any case, +if the pattern specifies no captures, +then it behaves as if the whole pattern was inside a capture. + + +

+If the value returned by the table query or by the function call +is a string or a number, +then it is used as the replacement string; +otherwise, if it is false or nil, +then there is no replacement +(that is, the original match is kept in the string). + + +

+Here are some examples: + +

+     x = string.gsub("hello world", "(%w+)", "%1 %1")
+     --> x="hello hello world world"
+     
+     x = string.gsub("hello world", "%w+", "%0 %0", 1)
+     --> x="hello hello world"
+     
+     x = string.gsub("hello world from Lua", "(%w+)%s*(%w+)", "%2 %1")
+     --> x="world hello Lua from"
+     
+     x = string.gsub("home = $HOME, user = $USER", "%$(%w+)", os.getenv)
+     --> x="home = /home/roberto, user = roberto"
+     
+     x = string.gsub("4+5 = $return 4+5$", "%$(.-)%$", function (s)
+           return load(s)()
+         end)
+     --> x="4+5 = 9"
+     
+     local t = {name="lua", version="5.2"}
+     x = string.gsub("$name-$version.tar.gz", "%$(%w+)", t)
+     --> x="lua-5.2.tar.gz"
+
+ + + +

+


string.len (s)

+Receives a string and returns its length. +The empty string "" has length 0. +Embedded zeros are counted, +so "a\000bc\000" has length 5. + + + + +

+


string.lower (s)

+Receives a string and returns a copy of this string with all +uppercase letters changed to lowercase. +All other characters are left unchanged. +The definition of what an uppercase letter is depends on the current locale. + + + + +

+


string.match (s, pattern [, init])

+Looks for the first match of +pattern in the string s. +If it finds one, then match returns +the captures from the pattern; +otherwise it returns nil. +If pattern specifies no captures, +then the whole match is returned. +A third, optional numerical argument init specifies +where to start the search; +its default value is 1 and can be negative. + + + + +

+


string.rep (s, n [, sep])

+Returns a string that is the concatenation of n copies of +the string s separated by the string sep. +The default value for sep is the empty string +(that is, no separator). + + + + +

+


string.reverse (s)

+Returns a string that is the string s reversed. + + + + +

+


string.sub (s, i [, j])

+Returns the substring of s that +starts at i and continues until j; +i and j can be negative. +If j is absent, then it is assumed to be equal to -1 +(which is the same as the string length). +In particular, +the call string.sub(s,1,j) returns a prefix of s +with length j, +and string.sub(s, -i) returns a suffix of s +with length i. + + +

+If, after the translation of negative indices, +i is less than 1, +it is corrected to 1. +If j is greater than the string length, +it is corrected to that length. +If, after these corrections, +i is greater than j, +the function returns the empty string. + + + + +

+


string.upper (s)

+Receives a string and returns a copy of this string with all +lowercase letters changed to uppercase. +All other characters are left unchanged. +The definition of what a lowercase letter is depends on the current locale. + + + +

6.4.1 – Patterns

+ + +

Character Class:

+A character class is used to represent a set of characters. +The following combinations are allowed in describing a character class: + +

    + +
  • x: +(where x is not one of the magic characters +^$()%.[]*+-?) +represents the character x itself. +
  • + +
  • .: (a dot) represents all characters.
  • + +
  • %a: represents all letters.
  • + +
  • %c: represents all control characters.
  • + +
  • %d: represents all digits.
  • + +
  • %g: represents all printable characters except space.
  • + +
  • %l: represents all lowercase letters.
  • + +
  • %p: represents all punctuation characters.
  • + +
  • %s: represents all space characters.
  • + +
  • %u: represents all uppercase letters.
  • + +
  • %w: represents all alphanumeric characters.
  • + +
  • %x: represents all hexadecimal digits.
  • + +
  • %x: (where x is any non-alphanumeric character) +represents the character x. +This is the standard way to escape the magic characters. +Any punctuation character (even the non magic) +can be preceded by a '%' +when used to represent itself in a pattern. +
  • + +
  • [set]: +represents the class which is the union of all +characters in set. +A range of characters can be specified by +separating the end characters of the range, +in ascending order, with a '-', +All classes %x described above can also be used as +components in set. +All other characters in set represent themselves. +For example, [%w_] (or [_%w]) +represents all alphanumeric characters plus the underscore, +[0-7] represents the octal digits, +and [0-7%l%-] represents the octal digits plus +the lowercase letters plus the '-' character. + + +

    +The interaction between ranges and classes is not defined. +Therefore, patterns like [%a-z] or [a-%%] +have no meaning. +

  • + +
  • [^set]: +represents the complement of set, +where set is interpreted as above. +
  • + +

+For all classes represented by single letters (%a, %c, etc.), +the corresponding uppercase letter represents the complement of the class. +For instance, %S represents all non-space characters. + + +

+The definitions of letter, space, and other character groups +depend on the current locale. +In particular, the class [a-z] may not be equivalent to %l. + + + + + +

Pattern Item:

+A pattern item can be + +

    + +
  • +a single character class, +which matches any single character in the class; +
  • + +
  • +a single character class followed by '*', +which matches 0 or more repetitions of characters in the class. +These repetition items will always match the longest possible sequence; +
  • + +
  • +a single character class followed by '+', +which matches 1 or more repetitions of characters in the class. +These repetition items will always match the longest possible sequence; +
  • + +
  • +a single character class followed by '-', +which also matches 0 or more repetitions of characters in the class. +Unlike '*', +these repetition items will always match the shortest possible sequence; +
  • + +
  • +a single character class followed by '?', +which matches 0 or 1 occurrence of a character in the class; +
  • + +
  • +%n, for n between 1 and 9; +such item matches a substring equal to the n-th captured string +(see below); +
  • + +
  • +%bxy, where x and y are two distinct characters; +such item matches strings that start with x, end with y, +and where the x and y are balanced. +This means that, if one reads the string from left to right, +counting +1 for an x and -1 for a y, +the ending y is the first y where the count reaches 0. +For instance, the item %b() matches expressions with +balanced parentheses. +
  • + +
  • +%f[set], a frontier pattern; +such item matches an empty string at any position such that +the next character belongs to set +and the previous character does not belong to set. +The set set is interpreted as previously described. +The beginning and the end of the subject are handled as if +they were the character '\0'. +
  • + +
+ + + + +

Pattern:

+A pattern is a sequence of pattern items. +A caret '^' at the beginning of a pattern anchors the match at the +beginning of the subject string. +A '$' at the end of a pattern anchors the match at the +end of the subject string. +At other positions, +'^' and '$' have no special meaning and represent themselves. + + + + + +

Captures:

+A pattern can contain sub-patterns enclosed in parentheses; +they describe captures. +When a match succeeds, the substrings of the subject string +that match captures are stored (captured) for future use. +Captures are numbered according to their left parentheses. +For instance, in the pattern "(a*(.)%w(%s*))", +the part of the string matching "a*(.)%w(%s*)" is +stored as the first capture (and therefore has number 1); +the character matching "." is captured with number 2, +and the part matching "%s*" has number 3. + + +

+As a special case, the empty capture () captures +the current string position (a number). +For instance, if we apply the pattern "()aa()" on the +string "flaaap", there will be two captures: 3 and 5. + + + + + + + + + + + +

6.5 – Table Manipulation

+ +

+This library provides generic functions for table manipulation. +It provides all its functions inside the table table. + + +

+Remember that, whenever an operation needs the length of a table, +the table should be a proper sequence +or have a __len metamethod (see §3.4.6). +All functions ignore non-numeric keys +in tables given as arguments. + + +

+For performance reasons, +all table accesses (get/set) performed by these functions are raw. + + +

+


table.concat (list [, sep [, i [, j]]])

+ + +

+Given a list where all elements are strings or numbers, +returns the string list[i]..sep..list[i+1] ··· sep..list[j]. +The default value for sep is the empty string, +the default for i is 1, +and the default for j is #list. +If i is greater than j, returns the empty string. + + + + +

+


table.insert (list, [pos,] value)

+ + +

+Inserts element value at position pos in list, +shifting up the elements +list[pos], list[pos+1], ···, list[#list]. +The default value for pos is #list+1, +so that a call table.insert(t,x) inserts x at the end +of list t. + + + + +

+


table.pack (···)

+ + +

+Returns a new table with all parameters stored into keys 1, 2, etc. +and with a field "n" with the total number of parameters. +Note that the resulting table may not be a sequence. + + + + +

+


table.remove (list [, pos])

+ + +

+Removes from list the element at position pos, +returning the value of the removed element. +When pos is an integer between 1 and #list, +it shifts down the elements +list[pos+1], list[pos+2], ···, list[#list] +and erases element list[#list]; +The index pos can also be 0 when #list is 0, +or #list + 1; +in those cases, the function erases the element list[pos]. + + +

+The default value for pos is #list, +so that a call table.remove(t) removes the last element +of list t. + + + + +

+


table.sort (list [, comp])

+ + +

+Sorts list elements in a given order, in-place, +from list[1] to list[#list]. +If comp is given, +then it must be a function that receives two list elements +and returns true when the first element must come +before the second in the final order +(so that not comp(list[i+1],list[i]) will be true after the sort). +If comp is not given, +then the standard Lua operator < is used instead. + + +

+The sort algorithm is not stable; +that is, elements considered equal by the given order +may have their relative positions changed by the sort. + + + + +

+


table.unpack (list [, i [, j]])

+ + +

+Returns the elements from the given table. +This function is equivalent to + +

+     return list[i], list[i+1], ···, list[j]
+

+By default, i is 1 and j is #list. + + + + + + + +

6.6 – Mathematical Functions

+ +

+This library is an interface to the standard C math library. +It provides all its functions inside the table math. + + +

+


math.abs (x)

+ + +

+Returns the absolute value of x. + + + + +

+


math.acos (x)

+ + +

+Returns the arc cosine of x (in radians). + + + + +

+


math.asin (x)

+ + +

+Returns the arc sine of x (in radians). + + + + +

+


math.atan (x)

+ + +

+Returns the arc tangent of x (in radians). + + + + +

+


math.atan2 (y, x)

+ + +

+Returns the arc tangent of y/x (in radians), +but uses the signs of both parameters to find the +quadrant of the result. +(It also handles correctly the case of x being zero.) + + + + +

+


math.ceil (x)

+ + +

+Returns the smallest integer larger than or equal to x. + + + + +

+


math.cos (x)

+ + +

+Returns the cosine of x (assumed to be in radians). + + + + +

+


math.cosh (x)

+ + +

+Returns the hyperbolic cosine of x. + + + + +

+


math.deg (x)

+ + +

+Returns the angle x (given in radians) in degrees. + + + + +

+


math.exp (x)

+ + +

+Returns the value ex. + + + + +

+


math.floor (x)

+ + +

+Returns the largest integer smaller than or equal to x. + + + + +

+


math.fmod (x, y)

+ + +

+Returns the remainder of the division of x by y +that rounds the quotient towards zero. + + + + +

+


math.frexp (x)

+ + +

+Returns m and e such that x = m2e, +e is an integer and the absolute value of m is +in the range [0.5, 1) +(or zero when x is zero). + + + + +

+


math.huge

+ + +

+The value HUGE_VAL, +a value larger than or equal to any other numerical value. + + + + +

+


math.ldexp (m, e)

+ + +

+Returns m2e (e should be an integer). + + + + +

+


math.log (x [, base])

+ + +

+Returns the logarithm of x in the given base. +The default for base is e +(so that the function returns the natural logarithm of x). + + + + +

+


math.max (x, ···)

+ + +

+Returns the maximum value among its arguments. + + + + +

+


math.min (x, ···)

+ + +

+Returns the minimum value among its arguments. + + + + +

+


math.modf (x)

+ + +

+Returns two numbers, +the integral part of x and the fractional part of x. + + + + +

+


math.pi

+ + +

+The value of π. + + + + +

+


math.pow (x, y)

+ + +

+Returns xy. +(You can also use the expression x^y to compute this value.) + + + + +

+


math.rad (x)

+ + +

+Returns the angle x (given in degrees) in radians. + + + + +

+


math.random ([m [, n]])

+ + +

+This function is an interface to the simple +pseudo-random generator function rand provided by Standard C. +(No guarantees can be given for its statistical properties.) + + +

+When called without arguments, +returns a uniform pseudo-random real number +in the range [0,1). +When called with an integer number m, +math.random returns +a uniform pseudo-random integer in the range [1, m]. +When called with two integer numbers m and n, +math.random returns a uniform pseudo-random +integer in the range [m, n]. + + + + +

+


math.randomseed (x)

+ + +

+Sets x as the "seed" +for the pseudo-random generator: +equal seeds produce equal sequences of numbers. + + + + +

+


math.sin (x)

+ + +

+Returns the sine of x (assumed to be in radians). + + + + +

+


math.sinh (x)

+ + +

+Returns the hyperbolic sine of x. + + + + +

+


math.sqrt (x)

+ + +

+Returns the square root of x. +(You can also use the expression x^0.5 to compute this value.) + + + + +

+


math.tan (x)

+ + +

+Returns the tangent of x (assumed to be in radians). + + + + +

+


math.tanh (x)

+ + +

+Returns the hyperbolic tangent of x. + + + + + + + +

6.7 – Bitwise Operations

+ +

+This library provides bitwise operations. +It provides all its functions inside the table bit32. + + +

+Unless otherwise stated, +all functions accept numeric arguments in the range +(-251,+251); +each argument is normalized to +the remainder of its division by 232 +and truncated to an integer (in some unspecified way), +so that its final value falls in the range [0,232 - 1]. +Similarly, all results are in the range [0,232 - 1]. +Note that bit32.bnot(0) is 0xFFFFFFFF, +which is different from -1. + + +

+


bit32.arshift (x, disp)

+ + +

+Returns the number x shifted disp bits to the right. +The number disp may be any representable integer. +Negative displacements shift to the left. + + +

+This shift operation is what is called arithmetic shift. +Vacant bits on the left are filled +with copies of the higher bit of x; +vacant bits on the right are filled with zeros. +In particular, +displacements with absolute values higher than 31 +result in zero or 0xFFFFFFFF (all original bits are shifted out). + + + + +

+


bit32.band (···)

+ + +

+Returns the bitwise and of its operands. + + + + +

+


bit32.bnot (x)

+ + +

+Returns the bitwise negation of x. +For any integer x, +the following identity holds: + +

+     assert(bit32.bnot(x) == (-1 - x) % 2^32)
+
+ + + +

+


bit32.bor (···)

+ + +

+Returns the bitwise or of its operands. + + + + +

+


bit32.btest (···)

+ + +

+Returns a boolean signaling +whether the bitwise and of its operands is different from zero. + + + + +

+


bit32.bxor (···)

+ + +

+Returns the bitwise exclusive or of its operands. + + + + +

+


bit32.extract (n, field [, width])

+ + +

+Returns the unsigned number formed by the bits +field to field + width - 1 from n. +Bits are numbered from 0 (least significant) to 31 (most significant). +All accessed bits must be in the range [0, 31]. + + +

+The default for width is 1. + + + + +

+


bit32.replace (n, v, field [, width])

+ + +

+Returns a copy of n with +the bits field to field + width - 1 +replaced by the value v. +See bit32.extract for details about field and width. + + + + +

+


bit32.lrotate (x, disp)

+ + +

+Returns the number x rotated disp bits to the left. +The number disp may be any representable integer. + + +

+For any valid displacement, +the following identity holds: + +

+     assert(bit32.lrotate(x, disp) == bit32.lrotate(x, disp % 32))
+

+In particular, +negative displacements rotate to the right. + + + + +

+


bit32.lshift (x, disp)

+ + +

+Returns the number x shifted disp bits to the left. +The number disp may be any representable integer. +Negative displacements shift to the right. +In any direction, vacant bits are filled with zeros. +In particular, +displacements with absolute values higher than 31 +result in zero (all bits are shifted out). + + +

+For positive displacements, +the following equality holds: + +

+     assert(bit32.lshift(b, disp) == (b * 2^disp) % 2^32)
+
+ + + +

+


bit32.rrotate (x, disp)

+ + +

+Returns the number x rotated disp bits to the right. +The number disp may be any representable integer. + + +

+For any valid displacement, +the following identity holds: + +

+     assert(bit32.rrotate(x, disp) == bit32.rrotate(x, disp % 32))
+

+In particular, +negative displacements rotate to the left. + + + + +

+


bit32.rshift (x, disp)

+ + +

+Returns the number x shifted disp bits to the right. +The number disp may be any representable integer. +Negative displacements shift to the left. +In any direction, vacant bits are filled with zeros. +In particular, +displacements with absolute values higher than 31 +result in zero (all bits are shifted out). + + +

+For positive displacements, +the following equality holds: + +

+     assert(bit32.rshift(b, disp) == math.floor(b % 2^32 / 2^disp))
+
+ +

+This shift operation is what is called logical shift. + + + + + + + +

6.8 – Input and Output Facilities

+ +

+The I/O library provides two different styles for file manipulation. +The first one uses implicit file descriptors; +that is, there are operations to set a default input file and a +default output file, +and all input/output operations are over these default files. +The second style uses explicit file descriptors. + + +

+When using implicit file descriptors, +all operations are supplied by table io. +When using explicit file descriptors, +the operation io.open returns a file descriptor +and then all operations are supplied as methods of the file descriptor. + + +

+The table io also provides +three predefined file descriptors with their usual meanings from C: +io.stdin, io.stdout, and io.stderr. +The I/O library never closes these files. + + +

+Unless otherwise stated, +all I/O functions return nil on failure +(plus an error message as a second result and +a system-dependent error code as a third result) +and some value different from nil on success. +On non-Posix systems, +the computation of the error message and error code +in case of errors +may be not thread safe, +because they rely on the global C variable errno. + + +

+


io.close ([file])

+ + +

+Equivalent to file:close(). +Without a file, closes the default output file. + + + + +

+


io.flush ()

+ + +

+Equivalent to io.output():flush(). + + + + +

+


io.input ([file])

+ + +

+When called with a file name, it opens the named file (in text mode), +and sets its handle as the default input file. +When called with a file handle, +it simply sets this file handle as the default input file. +When called without parameters, +it returns the current default input file. + + +

+In case of errors this function raises the error, +instead of returning an error code. + + + + +

+


io.lines ([filename ···])

+ + +

+Opens the given file name in read mode +and returns an iterator function that +works like file:lines(···) over the opened file. +When the iterator function detects the end of file, +it returns nil (to finish the loop) and automatically closes the file. + + +

+The call io.lines() (with no file name) is equivalent +to io.input():lines(); +that is, it iterates over the lines of the default input file. +In this case it does not close the file when the loop ends. + + +

+In case of errors this function raises the error, +instead of returning an error code. + + + + +

+


io.open (filename [, mode])

+ + +

+This function opens a file, +in the mode specified in the string mode. +It returns a new file handle, +or, in case of errors, nil plus an error message. + + +

+The mode string can be any of the following: + +

    +
  • "r": read mode (the default);
  • +
  • "w": write mode;
  • +
  • "a": append mode;
  • +
  • "r+": update mode, all previous data is preserved;
  • +
  • "w+": update mode, all previous data is erased;
  • +
  • "a+": append update mode, previous data is preserved, + writing is only allowed at the end of file.
  • +

+The mode string can also have a 'b' at the end, +which is needed in some systems to open the file in binary mode. + + + + +

+


io.output ([file])

+ + +

+Similar to io.input, but operates over the default output file. + + + + +

+


io.popen (prog [, mode])

+ + +

+This function is system dependent and is not available +on all platforms. + + +

+Starts program prog in a separated process and returns +a file handle that you can use to read data from this program +(if mode is "r", the default) +or to write data to this program +(if mode is "w"). + + + + +

+


io.read (···)

+ + +

+Equivalent to io.input():read(···). + + + + +

+


io.tmpfile ()

+ + +

+Returns a handle for a temporary file. +This file is opened in update mode +and it is automatically removed when the program ends. + + + + +

+


io.type (obj)

+ + +

+Checks whether obj is a valid file handle. +Returns the string "file" if obj is an open file handle, +"closed file" if obj is a closed file handle, +or nil if obj is not a file handle. + + + + +

+


io.write (···)

+ + +

+Equivalent to io.output():write(···). + + + + +

+


file:close ()

+ + +

+Closes file. +Note that files are automatically closed when +their handles are garbage collected, +but that takes an unpredictable amount of time to happen. + + +

+When closing a file handle created with io.popen, +file:close returns the same values +returned by os.execute. + + + + +

+


file:flush ()

+ + +

+Saves any written data to file. + + + + +

+


file:lines (···)

+ + +

+Returns an iterator function that, +each time it is called, +reads the file according to the given formats. +When no format is given, +uses "*l" as a default. +As an example, the construction + +

+     for c in file:lines(1) do body end
+

+will iterate over all characters of the file, +starting at the current position. +Unlike io.lines, this function does not close the file +when the loop ends. + + +

+In case of errors this function raises the error, +instead of returning an error code. + + + + +

+


file:read (···)

+ + +

+Reads the file file, +according to the given formats, which specify what to read. +For each format, +the function returns a string (or a number) with the characters read, +or nil if it cannot read data with the specified format. +When called without formats, +it uses a default format that reads the next line +(see below). + + +

+The available formats are + +

    + +
  • "*n": +reads a number; +this is the only format that returns a number instead of a string. +
  • + +
  • "*a": +reads the whole file, starting at the current position. +On end of file, it returns the empty string. +
  • + +
  • "*l": +reads the next line skipping the end of line, +returning nil on end of file. +This is the default format. +
  • + +
  • "*L": +reads the next line keeping the end of line (if present), +returning nil on end of file. +
  • + +
  • number: +reads a string with up to this number of bytes, +returning nil on end of file. +If number is zero, +it reads nothing and returns an empty string, +or nil on end of file. +
  • + +
+ + + +

+


file:seek ([whence [, offset]])

+ + +

+Sets and gets the file position, +measured from the beginning of the file, +to the position given by offset plus a base +specified by the string whence, as follows: + +

    +
  • "set": base is position 0 (beginning of the file);
  • +
  • "cur": base is current position;
  • +
  • "end": base is end of file;
  • +

+In case of success, seek returns the final file position, +measured in bytes from the beginning of the file. +If seek fails, it returns nil, +plus a string describing the error. + + +

+The default value for whence is "cur", +and for offset is 0. +Therefore, the call file:seek() returns the current +file position, without changing it; +the call file:seek("set") sets the position to the +beginning of the file (and returns 0); +and the call file:seek("end") sets the position to the +end of the file, and returns its size. + + + + +

+


file:setvbuf (mode [, size])

+ + +

+Sets the buffering mode for an output file. +There are three available modes: + +

    + +
  • "no": +no buffering; the result of any output operation appears immediately. +
  • + +
  • "full": +full buffering; output operation is performed only +when the buffer is full or when +you explicitly flush the file (see io.flush). +
  • + +
  • "line": +line buffering; output is buffered until a newline is output +or there is any input from some special files +(such as a terminal device). +
  • + +

+For the last two cases, size +specifies the size of the buffer, in bytes. +The default is an appropriate size. + + + + +

+


file:write (···)

+ + +

+Writes the value of each of its arguments to file. +The arguments must be strings or numbers. + + +

+In case of success, this function returns file. +Otherwise it returns nil plus a string describing the error. + + + + + + + +

6.9 – Operating System Facilities

+ +

+This library is implemented through table os. + + +

+


os.clock ()

+ + +

+Returns an approximation of the amount in seconds of CPU time +used by the program. + + + + +

+


os.date ([format [, time]])

+ + +

+Returns a string or a table containing date and time, +formatted according to the given string format. + + +

+If the time argument is present, +this is the time to be formatted +(see the os.time function for a description of this value). +Otherwise, date formats the current time. + + +

+If format starts with '!', +then the date is formatted in Coordinated Universal Time. +After this optional character, +if format is the string "*t", +then date returns a table with the following fields: +year (four digits), month (1–12), day (1–31), +hour (0–23), min (0–59), sec (0–61), +wday (weekday, Sunday is 1), +yday (day of the year), +and isdst (daylight saving flag, a boolean). +This last field may be absent +if the information is not available. + + +

+If format is not "*t", +then date returns the date as a string, +formatted according to the same rules as the ANSI C function strftime. + + +

+When called without arguments, +date returns a reasonable date and time representation that depends on +the host system and on the current locale +(that is, os.date() is equivalent to os.date("%c")). + + +

+On non-Posix systems, +this function may be not thread safe +because of its reliance on C function gmtime and C function localtime. + + + + +

+


os.difftime (t2, t1)

+ + +

+Returns the number of seconds from time t1 to time t2. +In POSIX, Windows, and some other systems, +this value is exactly t2-t1. + + + + +

+


os.execute ([command])

+ + +

+This function is equivalent to the ANSI C function system. +It passes command to be executed by an operating system shell. +Its first result is true +if the command terminated successfully, +or nil otherwise. +After this first result +the function returns a string and a number, +as follows: + +

    + +
  • "exit": +the command terminated normally; +the following number is the exit status of the command. +
  • + +
  • "signal": +the command was terminated by a signal; +the following number is the signal that terminated the command. +
  • + +
+ +

+When called without a command, +os.execute returns a boolean that is true if a shell is available. + + + + +

+


os.exit ([code [, close])

+ + +

+Calls the ANSI C function exit to terminate the host program. +If code is true, +the returned status is EXIT_SUCCESS; +if code is false, +the returned status is EXIT_FAILURE; +if code is a number, +the returned status is this number. +The default value for code is true. + + +

+If the optional second argument close is true, +closes the Lua state before exiting. + + + + +

+


os.getenv (varname)

+ + +

+Returns the value of the process environment variable varname, +or nil if the variable is not defined. + + + + +

+


os.remove (filename)

+ + +

+Deletes the file (or empty directory, on POSIX systems) +with the given name. +If this function fails, it returns nil, +plus a string describing the error and the error code. + + + + +

+


os.rename (oldname, newname)

+ + +

+Renames file or directory named oldname to newname. +If this function fails, it returns nil, +plus a string describing the error and the error code. + + + + +

+


os.setlocale (locale [, category])

+ + +

+Sets the current locale of the program. +locale is a system-dependent string specifying a locale; +category is an optional string describing which category to change: +"all", "collate", "ctype", +"monetary", "numeric", or "time"; +the default category is "all". +The function returns the name of the new locale, +or nil if the request cannot be honored. + + +

+If locale is the empty string, +the current locale is set to an implementation-defined native locale. +If locale is the string "C", +the current locale is set to the standard C locale. + + +

+When called with nil as the first argument, +this function only returns the name of the current locale +for the given category. + + +

+This function may be not thread safe +because of its reliance on C function setlocale. + + + + +

+


os.time ([table])

+ + +

+Returns the current time when called without arguments, +or a time representing the date and time specified by the given table. +This table must have fields year, month, and day, +and may have fields +hour (default is 12), +min (default is 0), +sec (default is 0), +and isdst (default is nil). +For a description of these fields, see the os.date function. + + +

+The returned value is a number, whose meaning depends on your system. +In POSIX, Windows, and some other systems, +this number counts the number +of seconds since some given start time (the "epoch"). +In other systems, the meaning is not specified, +and the number returned by time can be used only as an argument to +os.date and os.difftime. + + + + +

+


os.tmpname ()

+ + +

+Returns a string with a file name that can +be used for a temporary file. +The file must be explicitly opened before its use +and explicitly removed when no longer needed. + + +

+On POSIX systems, +this function also creates a file with that name, +to avoid security risks. +(Someone else might create the file with wrong permissions +in the time between getting the name and creating the file.) +You still have to open the file to use it +and to remove it (even if you do not use it). + + +

+When possible, +you may prefer to use io.tmpfile, +which automatically removes the file when the program ends. + + + + + + + +

6.10 – The Debug Library

+ +

+This library provides +the functionality of the debug interface (§4.9) to Lua programs. +You should exert care when using this library. +Several of its functions +violate basic assumptions about Lua code +(e.g., that variables local to a function +cannot be accessed from outside; +that userdata metatables cannot be changed by Lua code; +that Lua programs do not crash) +and therefore can compromise otherwise secure code. +Moreover, some functions in this library may be slow. + + +

+All functions in this library are provided +inside the debug table. +All functions that operate over a thread +have an optional first argument which is the +thread to operate over. +The default is always the current thread. + + +

+


debug.debug ()

+ + +

+Enters an interactive mode with the user, +running each string that the user enters. +Using simple commands and other debug facilities, +the user can inspect global and local variables, +change their values, evaluate expressions, and so on. +A line containing only the word cont finishes this function, +so that the caller continues its execution. + + +

+Note that commands for debug.debug are not lexically nested +within any function and so have no direct access to local variables. + + + + +

+


debug.gethook ([thread])

+ + +

+Returns the current hook settings of the thread, as three values: +the current hook function, the current hook mask, +and the current hook count +(as set by the debug.sethook function). + + + + +

+


debug.getinfo ([thread,] f [, what])

+ + +

+Returns a table with information about a function. +You can give the function directly +or you can give a number as the value of f, +which means the function running at level f of the call stack +of the given thread: +level 0 is the current function (getinfo itself); +level 1 is the function that called getinfo +(except for tail calls, which do not count on the stack); +and so on. +If f is a number larger than the number of active functions, +then getinfo returns nil. + + +

+The returned table can contain all the fields returned by lua_getinfo, +with the string what describing which fields to fill in. +The default for what is to get all information available, +except the table of valid lines. +If present, +the option 'f' +adds a field named func with the function itself. +If present, +the option 'L' +adds a field named activelines with the table of +valid lines. + + +

+For instance, the expression debug.getinfo(1,"n").name returns +a table with a name for the current function, +if a reasonable name can be found, +and the expression debug.getinfo(print) +returns a table with all available information +about the print function. + + + + +

+


debug.getlocal ([thread,] f, local)

+ + +

+This function returns the name and the value of the local variable +with index local of the function at level f of the stack. +This function accesses not only explicit local variables, +but also parameters, temporaries, etc. + + +

+The first parameter or local variable has index 1, and so on, +until the last active variable. +Negative indices refer to vararg parameters; +-1 is the first vararg parameter. +The function returns nil if there is no variable with the given index, +and raises an error when called with a level out of range. +(You can call debug.getinfo to check whether the level is valid.) + + +

+Variable names starting with '(' (open parenthesis) +represent internal variables +(loop control variables, temporaries, varargs, and C function locals). + + +

+The parameter f may also be a function. +In that case, getlocal returns only the name of function parameters. + + + + +

+


debug.getmetatable (value)

+ + +

+Returns the metatable of the given value +or nil if it does not have a metatable. + + + + +

+


debug.getregistry ()

+ + +

+Returns the registry table (see §4.5). + + + + +

+


debug.getupvalue (f, up)

+ + +

+This function returns the name and the value of the upvalue +with index up of the function f. +The function returns nil if there is no upvalue with the given index. + + + + +

+


debug.getuservalue (u)

+ + +

+Returns the Lua value associated to u. +If u is not a userdata, +returns nil. + + + + +

+


debug.sethook ([thread,] hook, mask [, count])

+ + +

+Sets the given function as a hook. +The string mask and the number count describe +when the hook will be called. +The string mask may have the following characters, +with the given meaning: + +

    +
  • 'c': the hook is called every time Lua calls a function;
  • +
  • 'r': the hook is called every time Lua returns from a function;
  • +
  • 'l': the hook is called every time Lua enters a new line of code.
  • +

+With a count different from zero, +the hook is called after every count instructions. + + +

+When called without arguments, +debug.sethook turns off the hook. + + +

+When the hook is called, its first parameter is a string +describing the event that has triggered its call: +"call" (or "tail call"), +"return", +"line", and "count". +For line events, +the hook also gets the new line number as its second parameter. +Inside a hook, +you can call getinfo with level 2 to get more information about +the running function +(level 0 is the getinfo function, +and level 1 is the hook function). + + + + +

+


debug.setlocal ([thread,] level, local, value)

+ + +

+This function assigns the value value to the local variable +with index local of the function at level level of the stack. +The function returns nil if there is no local +variable with the given index, +and raises an error when called with a level out of range. +(You can call getinfo to check whether the level is valid.) +Otherwise, it returns the name of the local variable. + + +

+See debug.getlocal for more information about +variable indices and names. + + + + +

+


debug.setmetatable (value, table)

+ + +

+Sets the metatable for the given value to the given table +(which can be nil). +Returns value. + + + + +

+


debug.setupvalue (f, up, value)

+ + +

+This function assigns the value value to the upvalue +with index up of the function f. +The function returns nil if there is no upvalue +with the given index. +Otherwise, it returns the name of the upvalue. + + + + +

+


debug.setuservalue (udata, value)

+ + +

+Sets the given value as +the Lua value associated to the given udata. +value must be a table or nil; +udata must be a full userdata. + + +

+Returns udata. + + + + +

+


debug.traceback ([thread,] [message [, level]])

+ + +

+If message is present but is neither a string nor nil, +this function returns message without further processing. +Otherwise, +it returns a string with a traceback of the call stack. +An optional message string is appended +at the beginning of the traceback. +An optional level number tells at which level +to start the traceback +(default is 1, the function calling traceback). + + + + +

+


debug.upvalueid (f, n)

+ + +

+Returns an unique identifier (as a light userdata) +for the upvalue numbered n +from the given function. + + +

+These unique identifiers allow a program to check whether different +closures share upvalues. +Lua closures that share an upvalue +(that is, that access a same external local variable) +will return identical ids for those upvalue indices. + + + + +

+


debug.upvaluejoin (f1, n1, f2, n2)

+ + +

+Make the n1-th upvalue of the Lua closure f1 +refer to the n2-th upvalue of the Lua closure f2. + + + + + + + +

7 – Lua Standalone

+ +

+Although Lua has been designed as an extension language, +to be embedded in a host C program, +it is also frequently used as a standalone language. +An interpreter for Lua as a standalone language, +called simply lua, +is provided with the standard distribution. +The standalone interpreter includes +all standard libraries, including the debug library. +Its usage is: + +

+     lua [options] [script [args]]
+

+The options are: + +

    +
  • -e stat: executes string stat;
  • +
  • -l mod: "requires" mod;
  • +
  • -i: enters interactive mode after running script;
  • +
  • -v: prints version information;
  • +
  • -E: ignores environment variables;
  • +
  • --: stops handling options;
  • +
  • -: executes stdin as a file and stops handling options.
  • +

+After handling its options, lua runs the given script, +passing to it the given args as string arguments. +When called without arguments, +lua behaves as lua -v -i +when the standard input (stdin) is a terminal, +and as lua - otherwise. + + +

+When called without option -E, +the interpreter checks for an environment variable LUA_INIT_5_2 +(or LUA_INIT if it is not defined) +before running any argument. +If the variable content has the format @filename, +then lua executes the file. +Otherwise, lua executes the string itself. + + +

+When called with option -E, +besides ignoring LUA_INIT, +Lua also ignores +the values of LUA_PATH and LUA_CPATH, +setting the values of +package.path and package.cpath +with the default paths defined in luaconf.h. + + +

+All options are handled in order, except -i and -E. +For instance, an invocation like + +

+     $ lua -e'a=1' -e 'print(a)' script.lua
+

+will first set a to 1, then print the value of a, +and finally run the file script.lua with no arguments. +(Here $ is the shell prompt. Your prompt may be different.) + + +

+Before starting to run the script, +lua collects all arguments in the command line +in a global table called arg. +The script name is stored at index 0, +the first argument after the script name goes to index 1, +and so on. +Any arguments before the script name +(that is, the interpreter name plus the options) +go to negative indices. +For instance, in the call + +

+     $ lua -la b.lua t1 t2
+

+the interpreter first runs the file a.lua, +then creates a table + +

+     arg = { [-2] = "lua", [-1] = "-la",
+             [0] = "b.lua",
+             [1] = "t1", [2] = "t2" }
+

+and finally runs the file b.lua. +The script is called with arg[1], arg[2], ... +as arguments; +it can also access these arguments with the vararg expression '...'. + + +

+In interactive mode, +if you write an incomplete statement, +the interpreter waits for its completion +by issuing a different prompt. + + +

+In case of unprotected errors in the script, +the interpreter reports the error to the standard error stream. +If the error object is a string, +the interpreter adds a stack traceback to it. +Otherwise, if the error object has a metamethod __tostring, +the interpreter calls this metamethod to produce the final message. +Finally, if the error object is nil, +the interpreter does not report the error. + + +

+When finishing normally, +the interpreter closes its main Lua state +(see lua_close). +The script can avoid this step by +calling os.exit to terminate. + + +

+To allow the use of Lua as a +script interpreter in Unix systems, +the standalone interpreter skips +the first line of a chunk if it starts with #. +Therefore, Lua scripts can be made into executable programs +by using chmod +x and the #! form, +as in + +

+     #!/usr/local/bin/lua
+

+(Of course, +the location of the Lua interpreter may be different in your machine. +If lua is in your PATH, +then + +

+     #!/usr/bin/env lua
+

+is a more portable solution.) + + + +

8 – Incompatibilities with the Previous Version

+ +

+Here we list the incompatibilities that you may find when moving a program +from Lua 5.1 to Lua 5.2. +You can avoid some incompatibilities by compiling Lua with +appropriate options (see file luaconf.h). +However, +all these compatibility options will be removed in the next version of Lua. +Similarly, +all features marked as deprecated in Lua 5.1 +have been removed in Lua 5.2. + + + +

8.1 – Changes in the Language

+
    + +
  • +The concept of environment changed. +Only Lua functions have environments. +To set the environment of a Lua function, +use the variable _ENV or the function load. + + +

    +C functions no longer have environments. +Use an upvalue with a shared table if you need to keep +shared state among several C functions. +(You may use luaL_setfuncs to open a C library +with all functions sharing a common upvalue.) + + +

    +To manipulate the "environment" of a userdata +(which is now called user value), +use the new functions +lua_getuservalue and lua_setuservalue. +

  • + +
  • +Lua identifiers cannot use locale-dependent letters. +
  • + +
  • +Doing a step or a full collection in the garbage collector +does not restart the collector if it has been stopped. +
  • + +
  • +Weak tables with weak keys now perform like ephemeron tables. +
  • + +
  • +The event tail return in debug hooks was removed. +Instead, tail calls generate a special new event, +tail call, so that the debugger can know that +there will not be a corresponding return event. +
  • + +
  • +Equality between function values has changed. +Now, a function definition may not create a new value; +it may reuse some previous value if there is no +observable difference to the new function. +
  • + +
+ + + + +

8.2 – Changes in the Libraries

+
    + +
  • +Function module is deprecated. +It is easy to set up a module with regular Lua code. +Modules are not expected to set global variables. +
  • + +
  • +Functions setfenv and getfenv were removed, +because of the changes in environments. +
  • + +
  • +Function math.log10 is deprecated. +Use math.log with 10 as its second argument, instead. +
  • + +
  • +Function loadstring is deprecated. +Use load instead; it now accepts string arguments +and are exactly equivalent to loadstring. +
  • + +
  • +Function table.maxn is deprecated. +Write it in Lua if you really need it. +
  • + +
  • +Function os.execute now returns true when command +terminates successfully and nil plus error information +otherwise. +
  • + +
  • +Function unpack was moved into the table library +and therefore must be called as table.unpack. +
  • + +
  • +Character class %z in patterns is deprecated, +as now patterns may contain '\0' as a regular character. +
  • + +
  • +The table package.loaders was renamed package.searchers. +
  • + +
  • +Lua does not have bytecode verification anymore. +So, all functions that load code +(load and loadfile) +are potentially insecure when loading untrusted binary data. +(Actually, those functions were already insecure because +of flaws in the verification algorithm.) +When in doubt, +use the mode argument of those functions +to restrict them to loading textual chunks. +
  • + +
  • +The standard paths in the official distribution may +change between versions. +
  • + +
+ + + + +

8.3 – Changes in the API

+
    + +
  • +Pseudoindex LUA_GLOBALSINDEX was removed. +You must get the global environment from the registry +(see §4.5). +
  • + +
  • +Pseudoindex LUA_ENVIRONINDEX +and functions lua_getfenv/lua_setfenv +were removed, +as C functions no longer have environments. +
  • + +
  • +Function luaL_register is deprecated. +Use luaL_setfuncs so that your module does not create globals. +(Modules are not expected to set global variables anymore.) +
  • + +
  • +The osize argument to the allocation function +may not be zero when creating a new block, +that is, when ptr is NULL +(see lua_Alloc). +Use only the test ptr == NULL to check whether +the block is new. +
  • + +
  • +Finalizers (__gc metamethods) for userdata are called in the +reverse order that they were marked for finalization, +not that they were created (see §2.5.1). +(Most userdata are marked immediately after they are created.) +Moreover, +if the metatable does not have a __gc field when set, +the finalizer will not be called, +even if it is set later. +
  • + +
  • +luaL_typerror was removed. +Write your own version if you need it. +
  • + +
  • +Function lua_cpcall is deprecated. +You can simply push the function with lua_pushcfunction +and call it with lua_pcall. +
  • + +
  • +Functions lua_equal and lua_lessthan are deprecated. +Use the new lua_compare with appropriate options instead. +
  • + +
  • +Function lua_objlen was renamed lua_rawlen. +
  • + +
  • +Function lua_load has an extra parameter, mode. +Pass NULL to simulate the old behavior. +
  • + +
  • +Function lua_resume has an extra parameter, from. +Pass NULL or the thread doing the call. +
  • + +
+ + + + +

9 – The Complete Syntax of Lua

+ +

+Here is the complete syntax of Lua in extended BNF. +(It does not describe operator precedences.) + + + + +

+
+	chunk ::= block
+
+	block ::= {stat} [retstat]
+
+	stat ::=  ‘;’ | 
+		 varlist ‘=’ explist | 
+		 functioncall | 
+		 label | 
+		 break | 
+		 goto Name | 
+		 do block end | 
+		 while exp do block end | 
+		 repeat block until exp | 
+		 if exp then block {elseif exp then block} [else block] end | 
+		 for Name ‘=’ exp ‘,’ exp [‘,’ exp] do block end | 
+		 for namelist in explist do block end | 
+		 function funcname funcbody | 
+		 local function Name funcbody | 
+		 local namelist [‘=’ explist] 
+
+	retstat ::= return [explist] [‘;’]
+
+	label ::= ‘::’ Name ‘::’
+
+	funcname ::= Name {‘.’ Name} [‘:’ Name]
+
+	varlist ::= var {‘,’ var}
+
+	var ::=  Name | prefixexp ‘[’ exp ‘]’ | prefixexp ‘.’ Name 
+
+	namelist ::= Name {‘,’ Name}
+
+	explist ::= exp {‘,’ exp}
+
+	exp ::=  nil | false | true | Number | String | ‘...’ | functiondef | 
+		 prefixexp | tableconstructor | exp binop exp | unop exp 
+
+	prefixexp ::= var | functioncall | ‘(’ exp ‘)’
+
+	functioncall ::=  prefixexp args | prefixexp ‘:’ Name args 
+
+	args ::=  ‘(’ [explist] ‘)’ | tableconstructor | String 
+
+	functiondef ::= function funcbody
+
+	funcbody ::= ‘(’ [parlist] ‘)’ block end
+
+	parlist ::= namelist [‘,’ ‘...’] | ‘...’
+
+	tableconstructor ::= ‘{’ [fieldlist] ‘}’
+
+	fieldlist ::= field {fieldsep field} [fieldsep]
+
+	field ::= ‘[’ exp ‘]’ ‘=’ exp | Name ‘=’ exp | exp
+
+	fieldsep ::= ‘,’ | ‘;’
+
+	binop ::= ‘+’ | ‘-’ | ‘*’ | ‘/’ | ‘^’ | ‘%’ | ‘..’ | 
+		 ‘<’ | ‘<=’ | ‘>’ | ‘>=’ | ‘==’ | ‘~=’ | 
+		 and | or
+
+	unop ::= ‘-’ | not | ‘#’
+
+
+ +

+ + + + + + + +


+ +Last update: +Thu Mar 21 12:58:59 BRT 2013 + + + + + diff --git a/radio/src/lua/doc/osi-certified-72x60.png b/radio/src/lua/doc/osi-certified-72x60.png new file mode 100644 index 0000000000000000000000000000000000000000..07df5f6ee7a7a8b2108025dcd815f73f145a83af GIT binary patch literal 3774 zcmV;v4ngsWP)$kl5 zqcT7g&?zu8?ezWYz4zUB-|zR9d+&Qy2xAN{qY(ew0A7^*gV^7jytKqPFV3{hZfovn zs%x!l>(m&Gdb8C+5XeR7>h0kj=o=X3A39;2KLYfEMt>p1YMW~dt`rpAC{lN~P>5pq zH1L4nAdCT17}*hN=LnEsvMl=5Ij^QArAa&_V~zoht-Ei~)E~(Ivhe0#jik{t$isEK znCH$TxCB8EKmcF>3@pRaHpbR%Gqm*dsZA4H{j(NjZFp^iNFW+RBx6R*X19J*`0XG5 z^Y>cR=^Hi9#ovYGlbFSr#Q*^PgCGC^gb*SC5TcBfzQLe-r2m!Quik&_g9XzTj0qSR zD`FkG_RYWDa^+#UUxL&t+!K+&(ion@Fd`5l5p7{Qsva9vegC|4^NzJUMvn)^gqWsF zvu^j=%FfCVg^cgbXDRl1DE$lsfe;BjjmFmRHER~E-MeWoNsyyNHCpG%Y}igd_(Md;&9La8_B075NDRX9gTD zIHY`}9E~aGi9Kk1@P~rmPna=*=gz~UTdTpsQmjX)J23%v9NliQS)8`xJh6Qz_nE~e z&tP|!dcJdo;JMNa3>afSx$lko8>fp-I}OiCVz(dOF1u6e8$IrsSP?=5mp~lkaFqm? zAUMxRq%ecIu3WE)Uf=%p8g z+RSY?G=VO%wAfdICj?Uzb+5jr{8m|)i#{M}JjaDIoXf#1=DYLwX;1EW&sijPvm6EkBGuOx6r~lKv`g`yH?)|&PRUr$5Ibw2HBM7C74XvE@gaPjN+@;j$J)AgYhnT-U5m+wj|Wz8K630AfO8PUoGD^^Mcq zY9C<~%wUm^u%ox5P21)KNN0$(v^OI$A~?iwsS_fRu1+`EH|CRdpA4zsk8Z#|?x@^vVEAL+2JxH%&^{JUU%B=?EU7`Ar*Q|JvqPofcBt765(*f5JI$>=3{<%K)4ei zogo$)5XP}_X$y^pIYyWTt}EAnhTq}u4sAdBvC(WC{I#x4^>$vCvQ0UDs^18sAQG9o zEaP0qjrSSv1W0FyO%9&y$@em~n@8}}EXBG6x%ew49J_q%l@As_XnNpi|MTTPr~ca_ zW%uon6dBKL*pvzYFvf<~p6K8hK9BDNNN0$7xp^hWC3n^7FoQ?P(=m(6!Pj&S2f1fqH=`(w)KcPl5aEi2}~4hF*f*g}vaS-=c7v>N8c z{yNM*%+azq=@prWtgpi~^3?^AsJqS(>=pb=6PrGH#=O{Hcho$_F#MtsK$$3e2fZvg zy}!-V%`+uFMOW87LIgu3vKuMgqwY0}*Sd;aokQp(F#-{}Ss(Iy1iekY1ZQX?1WEL? z7=zq`lH-#Hw=bHRio3yPun%`c5rI1Hb|wTSWTs|12Mg#QkkwTmy zAYul0H*_b(BnkP#!R_&p@d54uz0JKthGv3C^fdKS%~alookE`QX@%#MQN2=SFWrOha7Ij7ImStNaWsy~? zsylUeT02_-z-G4s0L!v=+Wx|cxr$tmY&$a1by8z#6HBp!*9{@mU9XQ0h@L%V_R}4g z&s#2{MCOj4`5ux-SUautC5@{U895o-biKMWWoQ09{|jx8wz}@_(ep%Yk4{90C#s6-sa}fU5{}m>#>VtE_b#5bn8O+3k{&6GoEkB;yGie;A_5Uy zqPN*tU()pE+_&~``5XX({el-xT_}%`%fsc>_0@m5{+FhXru>rpyLESe31R>cK^FFrCm+#WL$-D{Z3*9>Lg{wi}xEYn_`@Hy`-d z1N}kIY%@Eu&Bpe|Rr6N;%Yk>6&RI$lgpIO26BYT%C!dU-o4bqqQpGY?p6lPru6Hzc z@WuSDI^BYaDH*>R)~)$V1J0Edn4r(9vo>E<2XjOJr2*G124;t^U+p{iUnZN5oapCpCk(F}}<#3ZZli!Nk z^UWT;Q9qm-i`i$kJS}5P%puBJ<&krTO;*#$Y7d$o96EbQ{aF1XFpTj}wf}eI|IOba z%w}_CWu?JjkV>U-ad9L$@Mu$CU;pUQBZgt5QmI@n=W@9K(A(SF-rnxzy|_!5ekKqCQTad`sa|&&Q6jfy}iAEst?|mH*emIjg9SB zRVWlHl?r3bvh2qnf6V6(+>4TulB%kzFveeh{k1?K*t&J=m>dk9P8SjqQdn4sF;*&- z(b3VFnVH$y*$Rb%rs zefJ#z#KpyZ_0?C$jvY%)O?7a?7#}%u1OT>d*)keF*REZ=c=4j6tkr5MilS*cB_$;< zFArmEv)Oby-7}4>TD9uE_ulKT4s6Bp@^Y0*rBEo&o;?cy8#Zi^%jH+DTv4f1SFc_L zfc5LwXJ=;vKt@K!?%liR&!6Almmq$2R@G|tg$oyGnpP+jQBhF<(9qCOR8%AuiBtJCSc zyu1LQw6wIQre^Zw$^E0N)#}R1%J}$rkw`Qc#z0A{)dIkjDN`I(PfyS2=x9f~R4N64 zPe1*1=gytQ#l=RWao4V0bLY-=?Bpl*dQDA@LZMJ9l{Gar$;rvzfB$`Tb#+==T0=ua zSy@?1N{UXWyL9Q&#*G`Zv$GE#JXljxBauj2T3VD!rO9N<%F3#*uP-Sn(P%W=w{Jgx z{(NC!VNOmC0OaN6ZQHg@tJQw^;fGtdZUulVSFX&NGv~~iGoO9-nNq0~2n78w23E{L zmth7T3|W>10ISuSm6cUgRCMXmr5!tV0D!x@`?6)rcI?<8lgZ#IIehqVOiYYpi@x#3 z8xau^+1c4ER;th&( zVHk--A`l3|!os9dsYatANm8TH96x@%qM{-&FmUtc&2qVX-MV%A_U(J~%{TY#*<&ym zX3Ur|c$No?u%e>k#EBDaZEY7XUVLH`0zh|n zw_~XRz;RH!y1MS)zn_X$Km70mNs@ZKo~G$z$BuD09F}FpVzEY}F&d2ug#rLPJUpgPpKh}a^y$-i zJl@%}XHT6vRaaNHckf=MQYn>6Fk&*D<+ja0B z5C{a#&CQN-V`HPyXe3EeAP~gH#>U3RayT5ZSd1}tbaaSNDAZ^)j%n&QHMoE=7KubA zlWEeVNpiV7Dk=&gzM|0Dz(>0HA5Q-_F}_znz(xxqbU~E|+`a#EH|V zPjA|^DJLg~rs?+f_6rv-T)upnAP7fChoq;cFJHcV=gyt)zWXjs(+gZ<%kMDTlOd1+TFW%&z(D`)oKF*0@Bmd zLqkIy?RvewprGK+ojWv5%Ve?@D^>&r1p$CcrMhuv}x1&joiO~|IC>)G) + + +Lua 5.2 readme + + + + + + + +
+

+Lua +Welcome to Lua 5.2 +

+ +

+about +· +installation +· +changes +· +license +· +reference manual + +

About Lua

+ +

+Lua is a powerful, fast, lightweight, embeddable scripting language +developed by a +team +at +PUC-Rio, +the Pontifical Catholic University of Rio de Janeiro in Brazil. +Lua is +free software +used in many products and projects around the world. + +

+Lua's +official web site +provides complete information +about Lua, +including +an +executive summary +and +updated +documentation, +especially the +reference manual, +which may differ slightly from the +local copy +distributed in this package. + +

Installing Lua

+ +

+Lua is distributed in +source +form. +You need to build it before using it. +Building Lua should be straightforward +because +Lua is implemented in pure ANSI C and compiles unmodified in all known +platforms that have an ANSI C compiler. +Lua also compiles unmodified as C++. +The instructions given below for building Lua are for Unix-like platforms. +See also +instructions for other systems +and +customization options. + +

+If you don't have the time or the inclination to compile Lua yourself, +get a binary from +LuaBinaries. +Try also +Lua for Windows, +an easy-to-use distribution of Lua that includes many useful libraries. + +

Building Lua

+ +

+In most Unix-like platforms, simply do "make" with a suitable target. +Here are the details. + +

    +
  1. +Open a terminal window and move to +the top-level directory, which is named lua-5.2.2. +The Makefile there controls both the build process and the installation process. +

    +

  2. + Do "make" and see if your platform is listed. + The platforms currently supported are: +

    +

    + aix ansi bsd freebsd generic linux macosx mingw posix solaris +

    +

    + If your platform is listed, just do "make xxx", where xxx + is your platform name. +

    + If your platform is not listed, try the closest one or posix, generic, + ansi, in this order. +

    +

  3. +The compilation takes only a few moments +and produces three files in the src directory: +lua (the interpreter), +luac (the compiler), +and liblua.a (the library). +

    +

  4. + To check that Lua has been built correctly, do "make test" + after building Lua. This will run the interpreter and print its version string. +
+

+If you're running Linux and get compilation errors, +make sure you have installed the readline development package. +If you get link errors after that, +then try "make linux MYLIBS=-ltermcap". + +

Installing Lua

+

+ Once you have built Lua, you may want to install it in an official + place in your system. In this case, do "make install". The official + place and the way to install files are defined in the Makefile. You'll + probably need the right permissions to install files. + +

+ To build and install Lua in one step, do "make xxx install", + where xxx is your platform name. + +

+ To install Lua locally, do "make local". + This will create a directory install with subdirectories + bin, include, lib, man, + and install Lua as listed below. + + To install Lua locally, but in some other directory, do + "make install INSTALL_TOP=xxx", where xxx is your chosen directory. + +

+
+ bin: +
+ lua luac +
+ include: +
+ lua.h luaconf.h lualib.h lauxlib.h lua.hpp +
+ lib: +
+ liblua.a +
+ man/man1: +
+ lua.1 luac.1 +
+ +

+ These are the only directories you need for development. + If you only want to run Lua programs, + you only need the files in bin and man. + The files in include and lib are needed for + embedding Lua in C or C++ programs. + +

Customization

+

+ Three kinds of things can be customized by editing a file: +

    +
  • Where and how to install Lua — edit Makefile. +
  • How to build Lua — edit src/Makefile. +
  • Lua features — edit src/luaconf.h. +
+ +

+ You don't actually need to edit the Makefiles because you may set the + relevant variables in the command line when invoking make. + Nevertheless, it's probably best to edit and save the Makefiles to + record the changes you need. + +

+ On the other hand, if you need to customize some Lua features, you'll need + to edit src/luaconf.h before building and installing Lua. + The edited file will be the one installed, and + it will be used by any Lua clients that you build, to ensure consistency. + Further customization is available to experts by editing the Lua sources. + +

+ We strongly recommend that you enable dynamic loading in src/luaconf.h. + This is done automatically for all platforms listed above that have + this feature and also for Windows. + +

Building Lua on other systems

+ +

+ If you're not using the usual Unix tools, then the instructions for + building Lua depend on the compiler you use. You'll need to create + projects (or whatever your compiler uses) for building the library, + the interpreter, and the compiler, as follows: + +

+
+library: +
+lapi.c lcode.c lctype.c ldebug.c ldo.c ldump.c lfunc.c lgc.c llex.c +lmem.c lobject.c lopcodes.c lparser.c lstate.c lstring.c ltable.c +ltm.c lundump.c lvm.c lzio.c +lauxlib.c lbaselib.c lbitlib.c lcorolib.c ldblib.c liolib.c +lmathlib.c loslib.c lstrlib.c ltablib.c loadlib.c linit.c +
+interpreter: +
+ library, lua.c +
+compiler: +
+ library, luac.c +
+ +

+ To use Lua as a library in your own programs you'll need to know how to + create and use libraries with your compiler. Moreover, to dynamically load + C libraries for Lua you'll need to know how to create dynamic libraries + and you'll need to make sure that the Lua API functions are accessible to + those dynamic libraries — but don't link the Lua library + into each dynamic library. For Unix, we recommend that the Lua library + be linked statically into the host program and its symbols exported for + dynamic linking; src/Makefile does this for the Lua interpreter. + For Windows, we recommend that the Lua library be a DLL. + +

+ As mentioned above, you may edit src/luaconf.h to customize + some features before building Lua. + +

Changes since Lua 5.1

+ +

+Here are the main changes introduced in Lua 5.2. +The +reference manual +lists the +incompatibilities that had to be introduced. + +

Main changes

+
    +
  • yieldable pcall and metamethods +
  • new lexical scheme for globals +
  • ephemeron tables +
  • new library for bitwise operations +
  • light C functions +
  • emergency garbage collector +
  • goto statement +
  • finalizers for tables +
+ +Here are the other changes introduced in Lua 5.2: +

Language

+
    +
  • no more fenv for threads or functions +
  • tables honor the __len metamethod +
  • hex and \z escapes in strings +
  • support for hexadecimal floats +
  • order metamethods work for different types +
  • no more verification of opcode consistency +
  • hook event "tail return" replaced by "tail call" +
  • empty statement +
  • break statement may appear in the middle of a block +
+ +

Libraries

+
    +
  • arguments for function called through xpcall +
  • optional 'mode' argument to load and loadfile (to control binary x text) +
  • optional 'env' argument to load and loadfile (environment for loaded chunk) +
  • loadlib may load libraries with global names (RTLD_GLOBAL) +
  • new function package.searchpath +
  • modules receive their paths when loaded +
  • optional base in math.log +
  • optional separator in string.rep +
  • file:write returns file +
  • closing a pipe returns exit status +
  • os.exit may close state +
  • new metamethods __pairs and __ipairs +
  • new option 'isrunning' for collectgarbage and lua_gc +
  • frontier patterns +
  • \0 in patterns +
  • new option *L for io.read +
  • options for io.lines +
  • debug.getlocal can access function varargs +
+ +

C API

+
    +
  • main thread predefined in the registry +
  • new functions +lua_absindex, +lua_arith, +lua_compare, +lua_copy, +lua_len, +lua_rawgetp, +lua_rawsetp, +lua_upvalueid, +lua_upvaluejoin, +lua_version. +
  • new functions +luaL_checkversion, +luaL_setmetatable, +luaL_testudata, +luaL_tolstring. +
  • lua_pushstring and pushlstring return string +
  • nparams and isvararg available in debug API +
  • new lua_Unsigned +
+ +

Implementation

+
    +
  • max constants per function raised to 226 +
  • generational mode for garbage collection (experimental) +
  • NaN trick (experimental) +
  • internal (immutable) version of ctypes +
  • simpler implementation for string buffers +
  • parser uses much less C-stack space (no more auto arrays) +
+ +

Lua standalone interpreter

+
    +
  • new -E option to avoid environment variables +
  • handling of non-string error messages +
+ +

License

+ +[osi certified] + + +

+Lua is free software distributed under the terms of the +MIT license +reproduced below; +it may be used for any purpose, including commercial purposes, +at absolutely no cost without having to ask us. + +The only requirement is that if you do use Lua, +then you should give us credit by including the appropriate copyright notice somewhere in your product or its documentation. + +For details, see +this. + +

+Copyright © 1994–2013 Lua.org, PUC-Rio. + +

+Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +

+The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +

+

+ +


+ +Last update: +Fri Feb 22 09:24:20 BRT 2013 + + + + + diff --git a/radio/src/lua/src/Makefile b/radio/src/lua/src/Makefile new file mode 100644 index 000000000..fea895bc0 --- /dev/null +++ b/radio/src/lua/src/Makefile @@ -0,0 +1,187 @@ +# Makefile for building Lua +# See ../doc/readme.html for installation and customization instructions. + +# == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT ======================= + +# Your platform. See PLATS for possible values. +PLAT= none + +CC= gcc +CFLAGS= -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS) +LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) +LIBS= -lm $(SYSLIBS) $(MYLIBS) + +AR= ar rcu +RANLIB= ranlib +RM= rm -f + +SYSCFLAGS= +SYSLDFLAGS= +SYSLIBS= + +MYCFLAGS= +MYLDFLAGS= +MYLIBS= +MYOBJS= + +# == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= + +PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris + +LUA_A= liblua.a +CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ + lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ + ltm.o lundump.o lvm.o lzio.o +LIB_O= lauxlib.o lbaselib.o lbitlib.o lcorolib.o ldblib.o liolib.o \ + lmathlib.o loslib.o lstrlib.o ltablib.o loadlib.o linit.o +BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) + +LUA_T= lua +LUA_O= lua.o + +LUAC_T= luac +LUAC_O= luac.o + +ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) +ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) +ALL_A= $(LUA_A) + +# Targets start here. +default: $(PLAT) + +all: $(ALL_T) + +o: $(ALL_O) + +a: $(ALL_A) + +$(LUA_A): $(BASE_O) + $(AR) $@ $(BASE_O) + $(RANLIB) $@ + +$(LUA_T): $(LUA_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) + +$(LUAC_T): $(LUAC_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) + +clean: + $(RM) $(ALL_T) $(ALL_O) + +depend: + @$(CC) $(CFLAGS) -MM l*.c + +echo: + @echo "PLAT= $(PLAT)" + @echo "CC= $(CC)" + @echo "CFLAGS= $(CFLAGS)" + @echo "LDFLAGS= $(SYSLDFLAGS)" + @echo "LIBS= $(LIBS)" + @echo "AR= $(AR)" + @echo "RANLIB= $(RANLIB)" + @echo "RM= $(RM)" + +# Convenience targets for popular platforms +ALL= all + +none: + @echo "Please do 'make PLATFORM' where PLATFORM is one of these:" + @echo " $(PLATS)" + +aix: + $(MAKE) $(ALL) CC="xlc" CFLAGS="-O2 -DLUA_USE_POSIX -DLUA_USE_DLOPEN" SYSLIBS="-ldl" SYSLDFLAGS="-brtl -bexpall" + +ansi: + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_ANSI" + +bsd: + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" SYSLIBS="-Wl,-E" + +freebsd: + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -lreadline" + +generic: $(ALL) + +linux: + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline" + +macosx: + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline" + +mingw: + $(MAKE) "LUA_A=lua52.dll" "LUA_T=lua.exe" \ + "AR=$(CC) -shared -o" "RANLIB=strip --strip-unneeded" \ + "SYSCFLAGS=-DLUA_BUILD_AS_DLL" "SYSLIBS=" "SYSLDFLAGS=-s" lua.exe + $(MAKE) "LUAC_T=luac.exe" luac.exe + +posix: + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX" + +solaris: + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" SYSLIBS="-ldl" + +# list targets that do not create files (but not all makes understand .PHONY) +.PHONY: all $(PLATS) default o a clean depend echo none + +# DO NOT DELETE + +lapi.o: lapi.c lua.h luaconf.h lapi.h llimits.h lstate.h lobject.h ltm.h \ + lzio.h lmem.h ldebug.h ldo.h lfunc.h lgc.h lstring.h ltable.h lundump.h \ + lvm.h +lauxlib.o: lauxlib.c lua.h luaconf.h lauxlib.h +lbaselib.o: lbaselib.c lua.h luaconf.h lauxlib.h lualib.h +lbitlib.o: lbitlib.c lua.h luaconf.h lauxlib.h lualib.h +lcode.o: lcode.c lua.h luaconf.h lcode.h llex.h lobject.h llimits.h \ + lzio.h lmem.h lopcodes.h lparser.h ldebug.h lstate.h ltm.h ldo.h lgc.h \ + lstring.h ltable.h lvm.h +lcorolib.o: lcorolib.c lua.h luaconf.h lauxlib.h lualib.h +lctype.o: lctype.c lctype.h lua.h luaconf.h llimits.h +ldblib.o: ldblib.c lua.h luaconf.h lauxlib.h lualib.h +ldebug.o: ldebug.c lua.h luaconf.h lapi.h llimits.h lstate.h lobject.h \ + ltm.h lzio.h lmem.h lcode.h llex.h lopcodes.h lparser.h ldebug.h ldo.h \ + lfunc.h lstring.h lgc.h ltable.h lvm.h +ldo.o: ldo.c lua.h luaconf.h lapi.h llimits.h lstate.h lobject.h ltm.h \ + lzio.h lmem.h ldebug.h ldo.h lfunc.h lgc.h lopcodes.h lparser.h \ + lstring.h ltable.h lundump.h lvm.h +ldump.o: ldump.c lua.h luaconf.h lobject.h llimits.h lstate.h ltm.h \ + lzio.h lmem.h lundump.h +lfunc.o: lfunc.c lua.h luaconf.h lfunc.h lobject.h llimits.h lgc.h \ + lstate.h ltm.h lzio.h lmem.h +lgc.o: lgc.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h ltm.h \ + lzio.h lmem.h ldo.h lfunc.h lgc.h lstring.h ltable.h +linit.o: linit.c lua.h luaconf.h lualib.h lauxlib.h +liolib.o: liolib.c lua.h luaconf.h lauxlib.h lualib.h +llex.o: llex.c lua.h luaconf.h lctype.h llimits.h ldo.h lobject.h \ + lstate.h ltm.h lzio.h lmem.h llex.h lparser.h lstring.h lgc.h ltable.h +lmathlib.o: lmathlib.c lua.h luaconf.h lauxlib.h lualib.h +lmem.o: lmem.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h \ + ltm.h lzio.h lmem.h ldo.h lgc.h +loadlib.o: loadlib.c lua.h luaconf.h lauxlib.h lualib.h +lobject.o: lobject.c lua.h luaconf.h lctype.h llimits.h ldebug.h lstate.h \ + lobject.h ltm.h lzio.h lmem.h ldo.h lstring.h lgc.h lvm.h +lopcodes.o: lopcodes.c lopcodes.h llimits.h lua.h luaconf.h +loslib.o: loslib.c lua.h luaconf.h lauxlib.h lualib.h +lparser.o: lparser.c lua.h luaconf.h lcode.h llex.h lobject.h llimits.h \ + lzio.h lmem.h lopcodes.h lparser.h ldebug.h lstate.h ltm.h ldo.h lfunc.h \ + lstring.h lgc.h ltable.h +lstate.o: lstate.c lua.h luaconf.h lapi.h llimits.h lstate.h lobject.h \ + ltm.h lzio.h lmem.h ldebug.h ldo.h lfunc.h lgc.h llex.h lstring.h \ + ltable.h +lstring.o: lstring.c lua.h luaconf.h lmem.h llimits.h lobject.h lstate.h \ + ltm.h lzio.h lstring.h lgc.h +lstrlib.o: lstrlib.c lua.h luaconf.h lauxlib.h lualib.h +ltable.o: ltable.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h \ + ltm.h lzio.h lmem.h ldo.h lgc.h lstring.h ltable.h lvm.h +ltablib.o: ltablib.c lua.h luaconf.h lauxlib.h lualib.h +ltm.o: ltm.c lua.h luaconf.h lobject.h llimits.h lstate.h ltm.h lzio.h \ + lmem.h lstring.h lgc.h ltable.h +lua.o: lua.c lua.h luaconf.h lauxlib.h lualib.h +luac.o: luac.c lua.h luaconf.h lauxlib.h lobject.h llimits.h lstate.h \ + ltm.h lzio.h lmem.h lundump.h ldebug.h lopcodes.h +lundump.o: lundump.c lua.h luaconf.h ldebug.h lstate.h lobject.h \ + llimits.h ltm.h lzio.h lmem.h ldo.h lfunc.h lstring.h lgc.h lundump.h +lvm.o: lvm.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h ltm.h \ + lzio.h lmem.h ldo.h lfunc.h lgc.h lopcodes.h lstring.h ltable.h lvm.h +lzio.o: lzio.c lua.h luaconf.h llimits.h lmem.h lstate.h lobject.h ltm.h \ + lzio.h + diff --git a/radio/src/lua/src/lapi.c b/radio/src/lua/src/lapi.c new file mode 100644 index 000000000..791d85454 --- /dev/null +++ b/radio/src/lua/src/lapi.c @@ -0,0 +1,1284 @@ +/* +** $Id: lapi.c,v 2.171 2013/03/16 21:10:18 roberto Exp $ +** Lua API +** See Copyright Notice in lua.h +*/ + + +#include +#include + +#define lapi_c +#define LUA_CORE + +#include "lua.h" + +#include "lapi.h" +#include "ldebug.h" +#include "ldo.h" +#include "lfunc.h" +#include "lgc.h" +#include "lmem.h" +#include "lobject.h" +#include "lstate.h" +#include "lstring.h" +#include "ltable.h" +#include "ltm.h" +#include "lundump.h" +#include "lvm.h" + + + +const char lua_ident[] = + "$LuaVersion: " LUA_COPYRIGHT " $" + "$LuaAuthors: " LUA_AUTHORS " $"; + + +/* value at a non-valid index */ +#define NONVALIDVALUE cast(TValue *, luaO_nilobject) + +/* corresponding test */ +#define isvalid(o) ((o) != luaO_nilobject) + +/* test for pseudo index */ +#define ispseudo(i) ((i) <= LUA_REGISTRYINDEX) + +/* test for valid but not pseudo index */ +#define isstackindex(i, o) (isvalid(o) && !ispseudo(i)) + +#define api_checkvalidindex(L, o) api_check(L, isvalid(o), "invalid index") + +#define api_checkstackindex(L, i, o) \ + api_check(L, isstackindex(i, o), "index not in the stack") + + +static TValue *index2addr (lua_State *L, int idx) { + CallInfo *ci = L->ci; + if (idx > 0) { + TValue *o = ci->func + idx; + api_check(L, idx <= ci->top - (ci->func + 1), "unacceptable index"); + if (o >= L->top) return NONVALIDVALUE; + else return o; + } + else if (!ispseudo(idx)) { /* negative index */ + api_check(L, idx != 0 && -idx <= L->top - (ci->func + 1), "invalid index"); + return L->top + idx; + } + else if (idx == LUA_REGISTRYINDEX) + return &G(L)->l_registry; + else { /* upvalues */ + idx = LUA_REGISTRYINDEX - idx; + api_check(L, idx <= MAXUPVAL + 1, "upvalue index too large"); + if (ttislcf(ci->func)) /* light C function? */ + return NONVALIDVALUE; /* it has no upvalues */ + else { + CClosure *func = clCvalue(ci->func); + return (idx <= func->nupvalues) ? &func->upvalue[idx-1] : NONVALIDVALUE; + } + } +} + + +/* +** to be called by 'lua_checkstack' in protected mode, to grow stack +** capturing memory errors +*/ +static void growstack (lua_State *L, void *ud) { + int size = *(int *)ud; + luaD_growstack(L, size); +} + + +LUA_API int lua_checkstack (lua_State *L, int size) { + int res; + CallInfo *ci = L->ci; + lua_lock(L); + if (L->stack_last - L->top > size) /* stack large enough? */ + res = 1; /* yes; check is OK */ + else { /* no; need to grow stack */ + int inuse = cast_int(L->top - L->stack) + EXTRA_STACK; + if (inuse > LUAI_MAXSTACK - size) /* can grow without overflow? */ + res = 0; /* no */ + else /* try to grow stack */ + res = (luaD_rawrunprotected(L, &growstack, &size) == LUA_OK); + } + if (res && ci->top < L->top + size) + ci->top = L->top + size; /* adjust frame top */ + lua_unlock(L); + return res; +} + + +LUA_API void lua_xmove (lua_State *from, lua_State *to, int n) { + int i; + if (from == to) return; + lua_lock(to); + api_checknelems(from, n); + api_check(from, G(from) == G(to), "moving among independent states"); + api_check(from, to->ci->top - to->top >= n, "not enough elements to move"); + from->top -= n; + for (i = 0; i < n; i++) { + setobj2s(to, to->top++, from->top + i); + } + lua_unlock(to); +} + + +LUA_API lua_CFunction lua_atpanic (lua_State *L, lua_CFunction panicf) { + lua_CFunction old; + lua_lock(L); + old = G(L)->panic; + G(L)->panic = panicf; + lua_unlock(L); + return old; +} + + +LUA_API const lua_Number *lua_version (lua_State *L) { + static const lua_Number version = LUA_VERSION_NUM; + if (L == NULL) return &version; + else return G(L)->version; +} + + + +/* +** basic stack manipulation +*/ + + +/* +** convert an acceptable stack index into an absolute index +*/ +LUA_API int lua_absindex (lua_State *L, int idx) { + return (idx > 0 || ispseudo(idx)) + ? idx + : cast_int(L->top - L->ci->func + idx); +} + + +LUA_API int lua_gettop (lua_State *L) { + return cast_int(L->top - (L->ci->func + 1)); +} + + +LUA_API void lua_settop (lua_State *L, int idx) { + StkId func = L->ci->func; + lua_lock(L); + if (idx >= 0) { + api_check(L, idx <= L->stack_last - (func + 1), "new top too large"); + while (L->top < (func + 1) + idx) + setnilvalue(L->top++); + L->top = (func + 1) + idx; + } + else { + api_check(L, -(idx+1) <= (L->top - (func + 1)), "invalid new top"); + L->top += idx+1; /* `subtract' index (index is negative) */ + } + lua_unlock(L); +} + + +LUA_API void lua_remove (lua_State *L, int idx) { + StkId p; + lua_lock(L); + p = index2addr(L, idx); + api_checkstackindex(L, idx, p); + while (++p < L->top) setobjs2s(L, p-1, p); + L->top--; + lua_unlock(L); +} + + +LUA_API void lua_insert (lua_State *L, int idx) { + StkId p; + StkId q; + lua_lock(L); + p = index2addr(L, idx); + api_checkstackindex(L, idx, p); + for (q = L->top; q > p; q--) /* use L->top as a temporary */ + setobjs2s(L, q, q - 1); + setobjs2s(L, p, L->top); + lua_unlock(L); +} + + +static void moveto (lua_State *L, TValue *fr, int idx) { + TValue *to = index2addr(L, idx); + api_checkvalidindex(L, to); + setobj(L, to, fr); + if (idx < LUA_REGISTRYINDEX) /* function upvalue? */ + luaC_barrier(L, clCvalue(L->ci->func), fr); + /* LUA_REGISTRYINDEX does not need gc barrier + (collector revisits it before finishing collection) */ +} + + +LUA_API void lua_replace (lua_State *L, int idx) { + lua_lock(L); + api_checknelems(L, 1); + moveto(L, L->top - 1, idx); + L->top--; + lua_unlock(L); +} + + +LUA_API void lua_copy (lua_State *L, int fromidx, int toidx) { + TValue *fr; + lua_lock(L); + fr = index2addr(L, fromidx); + moveto(L, fr, toidx); + lua_unlock(L); +} + + +LUA_API void lua_pushvalue (lua_State *L, int idx) { + lua_lock(L); + setobj2s(L, L->top, index2addr(L, idx)); + api_incr_top(L); + lua_unlock(L); +} + + + +/* +** access functions (stack -> C) +*/ + + +LUA_API int lua_type (lua_State *L, int idx) { + StkId o = index2addr(L, idx); + return (isvalid(o) ? ttypenv(o) : LUA_TNONE); +} + + +LUA_API const char *lua_typename (lua_State *L, int t) { + UNUSED(L); + return ttypename(t); +} + + +LUA_API int lua_iscfunction (lua_State *L, int idx) { + StkId o = index2addr(L, idx); + return (ttislcf(o) || (ttisCclosure(o))); +} + + +LUA_API int lua_isnumber (lua_State *L, int idx) { + TValue n; + const TValue *o = index2addr(L, idx); + return tonumber(o, &n); +} + + +LUA_API int lua_isstring (lua_State *L, int idx) { + int t = lua_type(L, idx); + return (t == LUA_TSTRING || t == LUA_TNUMBER); +} + + +LUA_API int lua_isuserdata (lua_State *L, int idx) { + const TValue *o = index2addr(L, idx); + return (ttisuserdata(o) || ttislightuserdata(o)); +} + + +LUA_API int lua_rawequal (lua_State *L, int index1, int index2) { + StkId o1 = index2addr(L, index1); + StkId o2 = index2addr(L, index2); + return (isvalid(o1) && isvalid(o2)) ? luaV_rawequalobj(o1, o2) : 0; +} + + +LUA_API void lua_arith (lua_State *L, int op) { + StkId o1; /* 1st operand */ + StkId o2; /* 2nd operand */ + lua_lock(L); + if (op != LUA_OPUNM) /* all other operations expect two operands */ + api_checknelems(L, 2); + else { /* for unary minus, add fake 2nd operand */ + api_checknelems(L, 1); + setobjs2s(L, L->top, L->top - 1); + L->top++; + } + o1 = L->top - 2; + o2 = L->top - 1; + if (ttisnumber(o1) && ttisnumber(o2)) { + setnvalue(o1, luaO_arith(op, nvalue(o1), nvalue(o2))); + } + else + luaV_arith(L, o1, o1, o2, cast(TMS, op - LUA_OPADD + TM_ADD)); + L->top--; + lua_unlock(L); +} + + +LUA_API int lua_compare (lua_State *L, int index1, int index2, int op) { + StkId o1, o2; + int i = 0; + lua_lock(L); /* may call tag method */ + o1 = index2addr(L, index1); + o2 = index2addr(L, index2); + if (isvalid(o1) && isvalid(o2)) { + switch (op) { + case LUA_OPEQ: i = equalobj(L, o1, o2); break; + case LUA_OPLT: i = luaV_lessthan(L, o1, o2); break; + case LUA_OPLE: i = luaV_lessequal(L, o1, o2); break; + default: api_check(L, 0, "invalid option"); + } + } + lua_unlock(L); + return i; +} + + +LUA_API lua_Number lua_tonumberx (lua_State *L, int idx, int *isnum) { + TValue n; + const TValue *o = index2addr(L, idx); + if (tonumber(o, &n)) { + if (isnum) *isnum = 1; + return nvalue(o); + } + else { + if (isnum) *isnum = 0; + return 0; + } +} + + +LUA_API lua_Integer lua_tointegerx (lua_State *L, int idx, int *isnum) { + TValue n; + const TValue *o = index2addr(L, idx); + if (tonumber(o, &n)) { + lua_Integer res; + lua_Number num = nvalue(o); + lua_number2integer(res, num); + if (isnum) *isnum = 1; + return res; + } + else { + if (isnum) *isnum = 0; + return 0; + } +} + + +LUA_API lua_Unsigned lua_tounsignedx (lua_State *L, int idx, int *isnum) { + TValue n; + const TValue *o = index2addr(L, idx); + if (tonumber(o, &n)) { + lua_Unsigned res; + lua_Number num = nvalue(o); + lua_number2unsigned(res, num); + if (isnum) *isnum = 1; + return res; + } + else { + if (isnum) *isnum = 0; + return 0; + } +} + + +LUA_API int lua_toboolean (lua_State *L, int idx) { + const TValue *o = index2addr(L, idx); + return !l_isfalse(o); +} + + +LUA_API const char *lua_tolstring (lua_State *L, int idx, size_t *len) { + StkId o = index2addr(L, idx); + if (!ttisstring(o)) { + lua_lock(L); /* `luaV_tostring' may create a new string */ + if (!luaV_tostring(L, o)) { /* conversion failed? */ + if (len != NULL) *len = 0; + lua_unlock(L); + return NULL; + } + luaC_checkGC(L); + o = index2addr(L, idx); /* previous call may reallocate the stack */ + lua_unlock(L); + } + if (len != NULL) *len = tsvalue(o)->len; + return svalue(o); +} + + +LUA_API size_t lua_rawlen (lua_State *L, int idx) { + StkId o = index2addr(L, idx); + switch (ttypenv(o)) { + case LUA_TSTRING: return tsvalue(o)->len; + case LUA_TUSERDATA: return uvalue(o)->len; + case LUA_TTABLE: return luaH_getn(hvalue(o)); + default: return 0; + } +} + + +LUA_API lua_CFunction lua_tocfunction (lua_State *L, int idx) { + StkId o = index2addr(L, idx); + if (ttislcf(o)) return fvalue(o); + else if (ttisCclosure(o)) + return clCvalue(o)->f; + else return NULL; /* not a C function */ +} + + +LUA_API void *lua_touserdata (lua_State *L, int idx) { + StkId o = index2addr(L, idx); + switch (ttypenv(o)) { + case LUA_TUSERDATA: return (rawuvalue(o) + 1); + case LUA_TLIGHTUSERDATA: return pvalue(o); + default: return NULL; + } +} + + +LUA_API lua_State *lua_tothread (lua_State *L, int idx) { + StkId o = index2addr(L, idx); + return (!ttisthread(o)) ? NULL : thvalue(o); +} + + +LUA_API const void *lua_topointer (lua_State *L, int idx) { + StkId o = index2addr(L, idx); + switch (ttype(o)) { + case LUA_TTABLE: return hvalue(o); + case LUA_TLCL: return clLvalue(o); + case LUA_TCCL: return clCvalue(o); + case LUA_TLCF: return cast(void *, cast(size_t, fvalue(o))); + case LUA_TTHREAD: return thvalue(o); + case LUA_TUSERDATA: + case LUA_TLIGHTUSERDATA: + return lua_touserdata(L, idx); + default: return NULL; + } +} + + + +/* +** push functions (C -> stack) +*/ + + +LUA_API void lua_pushnil (lua_State *L) { + lua_lock(L); + setnilvalue(L->top); + api_incr_top(L); + lua_unlock(L); +} + + +LUA_API void lua_pushnumber (lua_State *L, lua_Number n) { + lua_lock(L); + setnvalue(L->top, n); + luai_checknum(L, L->top, + luaG_runerror(L, "C API - attempt to push a signaling NaN")); + api_incr_top(L); + lua_unlock(L); +} + + +LUA_API void lua_pushinteger (lua_State *L, lua_Integer n) { + lua_lock(L); + setnvalue(L->top, cast_num(n)); + api_incr_top(L); + lua_unlock(L); +} + + +LUA_API void lua_pushunsigned (lua_State *L, lua_Unsigned u) { + lua_Number n; + lua_lock(L); + n = lua_unsigned2number(u); + setnvalue(L->top, n); + api_incr_top(L); + lua_unlock(L); +} + + +LUA_API const char *lua_pushlstring (lua_State *L, const char *s, size_t len) { + TString *ts; + lua_lock(L); + luaC_checkGC(L); + ts = luaS_newlstr(L, s, len); + setsvalue2s(L, L->top, ts); + api_incr_top(L); + lua_unlock(L); + return getstr(ts); +} + + +LUA_API const char *lua_pushstring (lua_State *L, const char *s) { + if (s == NULL) { + lua_pushnil(L); + return NULL; + } + else { + TString *ts; + lua_lock(L); + luaC_checkGC(L); + ts = luaS_new(L, s); + setsvalue2s(L, L->top, ts); + api_incr_top(L); + lua_unlock(L); + return getstr(ts); + } +} + + +LUA_API const char *lua_pushvfstring (lua_State *L, const char *fmt, + va_list argp) { + const char *ret; + lua_lock(L); + luaC_checkGC(L); + ret = luaO_pushvfstring(L, fmt, argp); + lua_unlock(L); + return ret; +} + + +LUA_API const char *lua_pushfstring (lua_State *L, const char *fmt, ...) { + const char *ret; + va_list argp; + lua_lock(L); + luaC_checkGC(L); + va_start(argp, fmt); + ret = luaO_pushvfstring(L, fmt, argp); + va_end(argp); + lua_unlock(L); + return ret; +} + + +LUA_API void lua_pushcclosure (lua_State *L, lua_CFunction fn, int n) { + lua_lock(L); + if (n == 0) { + setfvalue(L->top, fn); + } + else { + Closure *cl; + api_checknelems(L, n); + api_check(L, n <= MAXUPVAL, "upvalue index too large"); + luaC_checkGC(L); + cl = luaF_newCclosure(L, n); + cl->c.f = fn; + L->top -= n; + while (n--) + setobj2n(L, &cl->c.upvalue[n], L->top + n); + setclCvalue(L, L->top, cl); + } + api_incr_top(L); + lua_unlock(L); +} + + +LUA_API void lua_pushboolean (lua_State *L, int b) { + lua_lock(L); + setbvalue(L->top, (b != 0)); /* ensure that true is 1 */ + api_incr_top(L); + lua_unlock(L); +} + + +LUA_API void lua_pushlightuserdata (lua_State *L, void *p) { + lua_lock(L); + setpvalue(L->top, p); + api_incr_top(L); + lua_unlock(L); +} + + +LUA_API int lua_pushthread (lua_State *L) { + lua_lock(L); + setthvalue(L, L->top, L); + api_incr_top(L); + lua_unlock(L); + return (G(L)->mainthread == L); +} + + + +/* +** get functions (Lua -> stack) +*/ + + +LUA_API void lua_getglobal (lua_State *L, const char *var) { + Table *reg = hvalue(&G(L)->l_registry); + const TValue *gt; /* global table */ + lua_lock(L); + gt = luaH_getint(reg, LUA_RIDX_GLOBALS); + setsvalue2s(L, L->top++, luaS_new(L, var)); + luaV_gettable(L, gt, L->top - 1, L->top - 1); + lua_unlock(L); +} + + +LUA_API void lua_gettable (lua_State *L, int idx) { + StkId t; + lua_lock(L); + t = index2addr(L, idx); + luaV_gettable(L, t, L->top - 1, L->top - 1); + lua_unlock(L); +} + + +LUA_API void lua_getfield (lua_State *L, int idx, const char *k) { + StkId t; + lua_lock(L); + t = index2addr(L, idx); + setsvalue2s(L, L->top, luaS_new(L, k)); + api_incr_top(L); + luaV_gettable(L, t, L->top - 1, L->top - 1); + lua_unlock(L); +} + + +LUA_API void lua_rawget (lua_State *L, int idx) { + StkId t; + lua_lock(L); + t = index2addr(L, idx); + api_check(L, ttistable(t), "table expected"); + setobj2s(L, L->top - 1, luaH_get(hvalue(t), L->top - 1)); + lua_unlock(L); +} + + +LUA_API void lua_rawgeti (lua_State *L, int idx, int n) { + StkId t; + lua_lock(L); + t = index2addr(L, idx); + api_check(L, ttistable(t), "table expected"); + setobj2s(L, L->top, luaH_getint(hvalue(t), n)); + api_incr_top(L); + lua_unlock(L); +} + + +LUA_API void lua_rawgetp (lua_State *L, int idx, const void *p) { + StkId t; + TValue k; + lua_lock(L); + t = index2addr(L, idx); + api_check(L, ttistable(t), "table expected"); + setpvalue(&k, cast(void *, p)); + setobj2s(L, L->top, luaH_get(hvalue(t), &k)); + api_incr_top(L); + lua_unlock(L); +} + + +LUA_API void lua_createtable (lua_State *L, int narray, int nrec) { + Table *t; + lua_lock(L); + luaC_checkGC(L); + t = luaH_new(L); + sethvalue(L, L->top, t); + api_incr_top(L); + if (narray > 0 || nrec > 0) + luaH_resize(L, t, narray, nrec); + lua_unlock(L); +} + + +LUA_API int lua_getmetatable (lua_State *L, int objindex) { + const TValue *obj; + Table *mt = NULL; + int res; + lua_lock(L); + obj = index2addr(L, objindex); + switch (ttypenv(obj)) { + case LUA_TTABLE: + mt = hvalue(obj)->metatable; + break; + case LUA_TUSERDATA: + mt = uvalue(obj)->metatable; + break; + default: + mt = G(L)->mt[ttypenv(obj)]; + break; + } + if (mt == NULL) + res = 0; + else { + sethvalue(L, L->top, mt); + api_incr_top(L); + res = 1; + } + lua_unlock(L); + return res; +} + + +LUA_API void lua_getuservalue (lua_State *L, int idx) { + StkId o; + lua_lock(L); + o = index2addr(L, idx); + api_check(L, ttisuserdata(o), "userdata expected"); + if (uvalue(o)->env) { + sethvalue(L, L->top, uvalue(o)->env); + } else + setnilvalue(L->top); + api_incr_top(L); + lua_unlock(L); +} + + +/* +** set functions (stack -> Lua) +*/ + + +LUA_API void lua_setglobal (lua_State *L, const char *var) { + Table *reg = hvalue(&G(L)->l_registry); + const TValue *gt; /* global table */ + lua_lock(L); + api_checknelems(L, 1); + gt = luaH_getint(reg, LUA_RIDX_GLOBALS); + setsvalue2s(L, L->top++, luaS_new(L, var)); + luaV_settable(L, gt, L->top - 1, L->top - 2); + L->top -= 2; /* pop value and key */ + lua_unlock(L); +} + + +LUA_API void lua_settable (lua_State *L, int idx) { + StkId t; + lua_lock(L); + api_checknelems(L, 2); + t = index2addr(L, idx); + luaV_settable(L, t, L->top - 2, L->top - 1); + L->top -= 2; /* pop index and value */ + lua_unlock(L); +} + + +LUA_API void lua_setfield (lua_State *L, int idx, const char *k) { + StkId t; + lua_lock(L); + api_checknelems(L, 1); + t = index2addr(L, idx); + setsvalue2s(L, L->top++, luaS_new(L, k)); + luaV_settable(L, t, L->top - 1, L->top - 2); + L->top -= 2; /* pop value and key */ + lua_unlock(L); +} + + +LUA_API void lua_rawset (lua_State *L, int idx) { + StkId t; + lua_lock(L); + api_checknelems(L, 2); + t = index2addr(L, idx); + api_check(L, ttistable(t), "table expected"); + setobj2t(L, luaH_set(L, hvalue(t), L->top-2), L->top-1); + invalidateTMcache(hvalue(t)); + luaC_barrierback(L, gcvalue(t), L->top-1); + L->top -= 2; + lua_unlock(L); +} + + +LUA_API void lua_rawseti (lua_State *L, int idx, int n) { + StkId t; + lua_lock(L); + api_checknelems(L, 1); + t = index2addr(L, idx); + api_check(L, ttistable(t), "table expected"); + luaH_setint(L, hvalue(t), n, L->top - 1); + luaC_barrierback(L, gcvalue(t), L->top-1); + L->top--; + lua_unlock(L); +} + + +LUA_API void lua_rawsetp (lua_State *L, int idx, const void *p) { + StkId t; + TValue k; + lua_lock(L); + api_checknelems(L, 1); + t = index2addr(L, idx); + api_check(L, ttistable(t), "table expected"); + setpvalue(&k, cast(void *, p)); + setobj2t(L, luaH_set(L, hvalue(t), &k), L->top - 1); + luaC_barrierback(L, gcvalue(t), L->top - 1); + L->top--; + lua_unlock(L); +} + + +LUA_API int lua_setmetatable (lua_State *L, int objindex) { + TValue *obj; + Table *mt; + lua_lock(L); + api_checknelems(L, 1); + obj = index2addr(L, objindex); + if (ttisnil(L->top - 1)) + mt = NULL; + else { + api_check(L, ttistable(L->top - 1), "table expected"); + mt = hvalue(L->top - 1); + } + switch (ttypenv(obj)) { + case LUA_TTABLE: { + hvalue(obj)->metatable = mt; + if (mt) { + luaC_objbarrierback(L, gcvalue(obj), mt); + luaC_checkfinalizer(L, gcvalue(obj), mt); + } + break; + } + case LUA_TUSERDATA: { + uvalue(obj)->metatable = mt; + if (mt) { + luaC_objbarrier(L, rawuvalue(obj), mt); + luaC_checkfinalizer(L, gcvalue(obj), mt); + } + break; + } + default: { + G(L)->mt[ttypenv(obj)] = mt; + break; + } + } + L->top--; + lua_unlock(L); + return 1; +} + + +LUA_API void lua_setuservalue (lua_State *L, int idx) { + StkId o; + lua_lock(L); + api_checknelems(L, 1); + o = index2addr(L, idx); + api_check(L, ttisuserdata(o), "userdata expected"); + if (ttisnil(L->top - 1)) + uvalue(o)->env = NULL; + else { + api_check(L, ttistable(L->top - 1), "table expected"); + uvalue(o)->env = hvalue(L->top - 1); + luaC_objbarrier(L, gcvalue(o), hvalue(L->top - 1)); + } + L->top--; + lua_unlock(L); +} + + +/* +** `load' and `call' functions (run Lua code) +*/ + + +#define checkresults(L,na,nr) \ + api_check(L, (nr) == LUA_MULTRET || (L->ci->top - L->top >= (nr) - (na)), \ + "results from function overflow current stack size") + + +LUA_API int lua_getctx (lua_State *L, int *ctx) { + if (L->ci->callstatus & CIST_YIELDED) { + if (ctx) *ctx = L->ci->u.c.ctx; + return L->ci->u.c.status; + } + else return LUA_OK; +} + + +LUA_API void lua_callk (lua_State *L, int nargs, int nresults, int ctx, + lua_CFunction k) { + StkId func; + lua_lock(L); + api_check(L, k == NULL || !isLua(L->ci), + "cannot use continuations inside hooks"); + api_checknelems(L, nargs+1); + api_check(L, L->status == LUA_OK, "cannot do calls on non-normal thread"); + checkresults(L, nargs, nresults); + func = L->top - (nargs+1); + if (k != NULL && L->nny == 0) { /* need to prepare continuation? */ + L->ci->u.c.k = k; /* save continuation */ + L->ci->u.c.ctx = ctx; /* save context */ + luaD_call(L, func, nresults, 1); /* do the call */ + } + else /* no continuation or no yieldable */ + luaD_call(L, func, nresults, 0); /* just do the call */ + adjustresults(L, nresults); + lua_unlock(L); +} + + + +/* +** Execute a protected call. +*/ +struct CallS { /* data to `f_call' */ + StkId func; + int nresults; +}; + + +static void f_call (lua_State *L, void *ud) { + struct CallS *c = cast(struct CallS *, ud); + luaD_call(L, c->func, c->nresults, 0); +} + + + +LUA_API int lua_pcallk (lua_State *L, int nargs, int nresults, int errfunc, + int ctx, lua_CFunction k) { + struct CallS c; + int status; + ptrdiff_t func; + lua_lock(L); + api_check(L, k == NULL || !isLua(L->ci), + "cannot use continuations inside hooks"); + api_checknelems(L, nargs+1); + api_check(L, L->status == LUA_OK, "cannot do calls on non-normal thread"); + checkresults(L, nargs, nresults); + if (errfunc == 0) + func = 0; + else { + StkId o = index2addr(L, errfunc); + api_checkstackindex(L, errfunc, o); + func = savestack(L, o); + } + c.func = L->top - (nargs+1); /* function to be called */ + if (k == NULL || L->nny > 0) { /* no continuation or no yieldable? */ + c.nresults = nresults; /* do a 'conventional' protected call */ + status = luaD_pcall(L, f_call, &c, savestack(L, c.func), func); + } + else { /* prepare continuation (call is already protected by 'resume') */ + CallInfo *ci = L->ci; + ci->u.c.k = k; /* save continuation */ + ci->u.c.ctx = ctx; /* save context */ + /* save information for error recovery */ + ci->extra = savestack(L, c.func); + ci->u.c.old_allowhook = L->allowhook; + ci->u.c.old_errfunc = L->errfunc; + L->errfunc = func; + /* mark that function may do error recovery */ + ci->callstatus |= CIST_YPCALL; + luaD_call(L, c.func, nresults, 1); /* do the call */ + ci->callstatus &= ~CIST_YPCALL; + L->errfunc = ci->u.c.old_errfunc; + status = LUA_OK; /* if it is here, there were no errors */ + } + adjustresults(L, nresults); + lua_unlock(L); + return status; +} + + +LUA_API int lua_load (lua_State *L, lua_Reader reader, void *data, + const char *chunkname, const char *mode) { + ZIO z; + int status; + lua_lock(L); + if (!chunkname) chunkname = "?"; + luaZ_init(L, &z, reader, data); + status = luaD_protectedparser(L, &z, chunkname, mode); + if (status == LUA_OK) { /* no errors? */ + LClosure *f = clLvalue(L->top - 1); /* get newly created function */ + if (f->nupvalues == 1) { /* does it have one upvalue? */ + /* get global table from registry */ + Table *reg = hvalue(&G(L)->l_registry); + const TValue *gt = luaH_getint(reg, LUA_RIDX_GLOBALS); + /* set global table as 1st upvalue of 'f' (may be LUA_ENV) */ + setobj(L, f->upvals[0]->v, gt); + luaC_barrier(L, f->upvals[0], gt); + } + } + lua_unlock(L); + return status; +} + + +LUA_API int lua_dump (lua_State *L, lua_Writer writer, void *data) { + int status; + TValue *o; + lua_lock(L); + api_checknelems(L, 1); + o = L->top - 1; + if (isLfunction(o)) + status = luaU_dump(L, getproto(o), writer, data, 0); + else + status = 1; + lua_unlock(L); + return status; +} + + +LUA_API int lua_status (lua_State *L) { + return L->status; +} + + +/* +** Garbage-collection function +*/ + +LUA_API int lua_gc (lua_State *L, int what, int data) { + int res = 0; + global_State *g; + lua_lock(L); + g = G(L); + switch (what) { + case LUA_GCSTOP: { + g->gcrunning = 0; + break; + } + case LUA_GCRESTART: { + luaE_setdebt(g, 0); + g->gcrunning = 1; + break; + } + case LUA_GCCOLLECT: { + luaC_fullgc(L, 0); + break; + } + case LUA_GCCOUNT: { + /* GC values are expressed in Kbytes: #bytes/2^10 */ + res = cast_int(gettotalbytes(g) >> 10); + break; + } + case LUA_GCCOUNTB: { + res = cast_int(gettotalbytes(g) & 0x3ff); + break; + } + case LUA_GCSTEP: { + if (g->gckind == KGC_GEN) { /* generational mode? */ + res = (g->GCestimate == 0); /* true if it will do major collection */ + luaC_forcestep(L); /* do a single step */ + } + else { + lu_mem debt = cast(lu_mem, data) * 1024 - GCSTEPSIZE; + if (g->gcrunning) + debt += g->GCdebt; /* include current debt */ + luaE_setdebt(g, debt); + luaC_forcestep(L); + if (g->gcstate == GCSpause) /* end of cycle? */ + res = 1; /* signal it */ + } + break; + } + case LUA_GCSETPAUSE: { + res = g->gcpause; + g->gcpause = data; + break; + } + case LUA_GCSETMAJORINC: { + res = g->gcmajorinc; + g->gcmajorinc = data; + break; + } + case LUA_GCSETSTEPMUL: { + res = g->gcstepmul; + g->gcstepmul = data; + break; + } + case LUA_GCISRUNNING: { + res = g->gcrunning; + break; + } + case LUA_GCGEN: { /* change collector to generational mode */ + luaC_changemode(L, KGC_GEN); + break; + } + case LUA_GCINC: { /* change collector to incremental mode */ + luaC_changemode(L, KGC_NORMAL); + break; + } + default: res = -1; /* invalid option */ + } + lua_unlock(L); + return res; +} + + + +/* +** miscellaneous functions +*/ + + +LUA_API int lua_error (lua_State *L) { + lua_lock(L); + api_checknelems(L, 1); + luaG_errormsg(L); + /* code unreachable; will unlock when control actually leaves the kernel */ + return 0; /* to avoid warnings */ +} + + +LUA_API int lua_next (lua_State *L, int idx) { + StkId t; + int more; + lua_lock(L); + t = index2addr(L, idx); + api_check(L, ttistable(t), "table expected"); + more = luaH_next(L, hvalue(t), L->top - 1); + if (more) { + api_incr_top(L); + } + else /* no more elements */ + L->top -= 1; /* remove key */ + lua_unlock(L); + return more; +} + + +LUA_API void lua_concat (lua_State *L, int n) { + lua_lock(L); + api_checknelems(L, n); + if (n >= 2) { + luaC_checkGC(L); + luaV_concat(L, n); + } + else if (n == 0) { /* push empty string */ + setsvalue2s(L, L->top, luaS_newlstr(L, "", 0)); + api_incr_top(L); + } + /* else n == 1; nothing to do */ + lua_unlock(L); +} + + +LUA_API void lua_len (lua_State *L, int idx) { + StkId t; + lua_lock(L); + t = index2addr(L, idx); + luaV_objlen(L, L->top, t); + api_incr_top(L); + lua_unlock(L); +} + + +LUA_API lua_Alloc lua_getallocf (lua_State *L, void **ud) { + lua_Alloc f; + lua_lock(L); + if (ud) *ud = G(L)->ud; + f = G(L)->frealloc; + lua_unlock(L); + return f; +} + + +LUA_API void lua_setallocf (lua_State *L, lua_Alloc f, void *ud) { + lua_lock(L); + G(L)->ud = ud; + G(L)->frealloc = f; + lua_unlock(L); +} + + +LUA_API void *lua_newuserdata (lua_State *L, size_t size) { + Udata *u; + lua_lock(L); + luaC_checkGC(L); + u = luaS_newudata(L, size, NULL); + setuvalue(L, L->top, u); + api_incr_top(L); + lua_unlock(L); + return u + 1; +} + + + +static const char *aux_upvalue (StkId fi, int n, TValue **val, + GCObject **owner) { + switch (ttype(fi)) { + case LUA_TCCL: { /* C closure */ + CClosure *f = clCvalue(fi); + if (!(1 <= n && n <= f->nupvalues)) return NULL; + *val = &f->upvalue[n-1]; + if (owner) *owner = obj2gco(f); + return ""; + } + case LUA_TLCL: { /* Lua closure */ + LClosure *f = clLvalue(fi); + TString *name; + Proto *p = f->p; + if (!(1 <= n && n <= p->sizeupvalues)) return NULL; + *val = f->upvals[n-1]->v; + if (owner) *owner = obj2gco(f->upvals[n - 1]); + name = p->upvalues[n-1].name; + return (name == NULL) ? "" : getstr(name); + } + default: return NULL; /* not a closure */ + } +} + + +LUA_API const char *lua_getupvalue (lua_State *L, int funcindex, int n) { + const char *name; + TValue *val = NULL; /* to avoid warnings */ + lua_lock(L); + name = aux_upvalue(index2addr(L, funcindex), n, &val, NULL); + if (name) { + setobj2s(L, L->top, val); + api_incr_top(L); + } + lua_unlock(L); + return name; +} + + +LUA_API const char *lua_setupvalue (lua_State *L, int funcindex, int n) { + const char *name; + TValue *val = NULL; /* to avoid warnings */ + GCObject *owner = NULL; /* to avoid warnings */ + StkId fi; + lua_lock(L); + fi = index2addr(L, funcindex); + api_checknelems(L, 1); + name = aux_upvalue(fi, n, &val, &owner); + if (name) { + L->top--; + setobj(L, val, L->top); + luaC_barrier(L, owner, L->top); + } + lua_unlock(L); + return name; +} + + +static UpVal **getupvalref (lua_State *L, int fidx, int n, LClosure **pf) { + LClosure *f; + StkId fi = index2addr(L, fidx); + api_check(L, ttisLclosure(fi), "Lua function expected"); + f = clLvalue(fi); + api_check(L, (1 <= n && n <= f->p->sizeupvalues), "invalid upvalue index"); + if (pf) *pf = f; + return &f->upvals[n - 1]; /* get its upvalue pointer */ +} + + +LUA_API void *lua_upvalueid (lua_State *L, int fidx, int n) { + StkId fi = index2addr(L, fidx); + switch (ttype(fi)) { + case LUA_TLCL: { /* lua closure */ + return *getupvalref(L, fidx, n, NULL); + } + case LUA_TCCL: { /* C closure */ + CClosure *f = clCvalue(fi); + api_check(L, 1 <= n && n <= f->nupvalues, "invalid upvalue index"); + return &f->upvalue[n - 1]; + } + default: { + api_check(L, 0, "closure expected"); + return NULL; + } + } +} + + +LUA_API void lua_upvaluejoin (lua_State *L, int fidx1, int n1, + int fidx2, int n2) { + LClosure *f1; + UpVal **up1 = getupvalref(L, fidx1, n1, &f1); + UpVal **up2 = getupvalref(L, fidx2, n2, NULL); + *up1 = *up2; + luaC_objbarrier(L, f1, *up2); +} + diff --git a/radio/src/lua/src/lapi.h b/radio/src/lua/src/lapi.h new file mode 100644 index 000000000..0909a3911 --- /dev/null +++ b/radio/src/lua/src/lapi.h @@ -0,0 +1,24 @@ +/* +** $Id: lapi.h,v 2.7 2009/11/27 15:37:59 roberto Exp $ +** Auxiliary functions from Lua API +** See Copyright Notice in lua.h +*/ + +#ifndef lapi_h +#define lapi_h + + +#include "llimits.h" +#include "lstate.h" + +#define api_incr_top(L) {L->top++; api_check(L, L->top <= L->ci->top, \ + "stack overflow");} + +#define adjustresults(L,nres) \ + { if ((nres) == LUA_MULTRET && L->ci->top < L->top) L->ci->top = L->top; } + +#define api_checknelems(L,n) api_check(L, (n) < (L->top - L->ci->func), \ + "not enough elements in the stack") + + +#endif diff --git a/radio/src/lua/src/lauxlib.c b/radio/src/lua/src/lauxlib.c new file mode 100644 index 000000000..1c52b82a6 --- /dev/null +++ b/radio/src/lua/src/lauxlib.c @@ -0,0 +1,997 @@ +/* +** $Id: lauxlib.c,v 1.248 2013/03/21 13:54:57 roberto Exp $ +** Auxiliary functions for building Lua libraries +** See Copyright Notice in lua.h +*/ + + +#include +#include +#include +#include +#include + + +/* This file uses only the official API of Lua. +** Any function declared here could be written as an application function. +*/ + +#define lauxlib_c + +#include "lua.h" + +#include "lauxlib.h" + + +/* +** {====================================================== +** Traceback +** ======================================================= +*/ + + +#define LEVELS1 12 /* size of the first part of the stack */ +#define LEVELS2 10 /* size of the second part of the stack */ + + +#if defined(USE_FATFS) +int lua__getc(FIL *f) +{ + char c; + UINT result; + if (f_read(f, &c, 1, &result) == FR_OK && result == 1) + return c; + else + return -1; +} +#endif + + +/* +** search for 'objidx' in table at index -1. +** return 1 + string at top if find a good name. +*/ +static int findfield (lua_State *L, int objidx, int level) { + if (level == 0 || !lua_istable(L, -1)) + return 0; /* not found */ + lua_pushnil(L); /* start 'next' loop */ + while (lua_next(L, -2)) { /* for each pair in table */ + if (lua_type(L, -2) == LUA_TSTRING) { /* ignore non-string keys */ + if (lua_rawequal(L, objidx, -1)) { /* found object? */ + lua_pop(L, 1); /* remove value (but keep name) */ + return 1; + } + else if (findfield(L, objidx, level - 1)) { /* try recursively */ + lua_remove(L, -2); /* remove table (but keep name) */ + lua_pushliteral(L, "."); + lua_insert(L, -2); /* place '.' between the two names */ + lua_concat(L, 3); + return 1; + } + } + lua_pop(L, 1); /* remove value */ + } + return 0; /* not found */ +} + + +static int pushglobalfuncname (lua_State *L, lua_Debug *ar) { + int top = lua_gettop(L); + lua_getinfo(L, "f", ar); /* push function */ + lua_pushglobaltable(L); + if (findfield(L, top + 1, 2)) { + lua_copy(L, -1, top + 1); /* move name to proper place */ + lua_pop(L, 2); /* remove pushed values */ + return 1; + } + else { + lua_settop(L, top); /* remove function and global table */ + return 0; + } +} + + +static void pushfuncname (lua_State *L, lua_Debug *ar) { + if (*ar->namewhat != '\0') /* is there a name? */ + lua_pushfstring(L, "function " LUA_QS, ar->name); + else if (*ar->what == 'm') /* main? */ + lua_pushliteral(L, "main chunk"); + else if (*ar->what == 'C') { + if (pushglobalfuncname(L, ar)) { + lua_pushfstring(L, "function " LUA_QS, lua_tostring(L, -1)); + lua_remove(L, -2); /* remove name */ + } + else + lua_pushliteral(L, "?"); + } + else + lua_pushfstring(L, "function <%s:%d>", ar->short_src, ar->linedefined); +} + + +static int countlevels (lua_State *L) { + lua_Debug ar; + int li = 1, le = 1; + /* find an upper bound */ + while (lua_getstack(L, le, &ar)) { li = le; le *= 2; } + /* do a binary search */ + while (li < le) { + int m = (li + le)/2; + if (lua_getstack(L, m, &ar)) li = m + 1; + else le = m; + } + return le - 1; +} + + +LUALIB_API void luaL_traceback (lua_State *L, lua_State *L1, + const char *msg, int level) { + lua_Debug ar; + int top = lua_gettop(L); + int numlevels = countlevels(L1); + int mark = (numlevels > LEVELS1 + LEVELS2) ? LEVELS1 : 0; + if (msg) lua_pushfstring(L, "%s\n", msg); + lua_pushliteral(L, "stack traceback:"); + while (lua_getstack(L1, level++, &ar)) { + if (level == mark) { /* too many levels? */ + lua_pushliteral(L, "\n\t..."); /* add a '...' */ + level = numlevels - LEVELS2; /* and skip to last ones */ + } + else { + lua_getinfo(L1, "Slnt", &ar); + lua_pushfstring(L, "\n\t%s:", ar.short_src); + if (ar.currentline > 0) + lua_pushfstring(L, "%d:", ar.currentline); + lua_pushliteral(L, " in "); + pushfuncname(L, &ar); + if (ar.istailcall) + lua_pushliteral(L, "\n\t(...tail calls...)"); + lua_concat(L, lua_gettop(L) - top); + } + } + lua_concat(L, lua_gettop(L) - top); +} + +/* }====================================================== */ + + +/* +** {====================================================== +** Error-report functions +** ======================================================= +*/ + +LUALIB_API int luaL_argerror (lua_State *L, int narg, const char *extramsg) { + lua_Debug ar; + if (!lua_getstack(L, 0, &ar)) /* no stack frame? */ + return luaL_error(L, "bad argument #%d (%s)", narg, extramsg); + lua_getinfo(L, "n", &ar); + if (strcmp(ar.namewhat, "method") == 0) { + narg--; /* do not count `self' */ + if (narg == 0) /* error is in the self argument itself? */ + return luaL_error(L, "calling " LUA_QS " on bad self (%s)", + ar.name, extramsg); + } + if (ar.name == NULL) + ar.name = (pushglobalfuncname(L, &ar)) ? lua_tostring(L, -1) : "?"; + return luaL_error(L, "bad argument #%d to " LUA_QS " (%s)", + narg, ar.name, extramsg); +} + + +static int typeerror (lua_State *L, int narg, const char *tname) { + const char *msg = lua_pushfstring(L, "%s expected, got %s", + tname, luaL_typename(L, narg)); + return luaL_argerror(L, narg, msg); +} + + +static void tag_error (lua_State *L, int narg, int tag) { + typeerror(L, narg, lua_typename(L, tag)); +} + + +LUALIB_API void luaL_where (lua_State *L, int level) { + lua_Debug ar; + if (lua_getstack(L, level, &ar)) { /* check function at level */ + lua_getinfo(L, "Sl", &ar); /* get info about it */ + if (ar.currentline > 0) { /* is there info? */ + lua_pushfstring(L, "%s:%d: ", ar.short_src, ar.currentline); + return; + } + } + lua_pushliteral(L, ""); /* else, no information available... */ +} + + +LUALIB_API int luaL_error (lua_State *L, const char *fmt, ...) { + va_list argp; + va_start(argp, fmt); + luaL_where(L, 1); + lua_pushvfstring(L, fmt, argp); + va_end(argp); + lua_concat(L, 2); + return lua_error(L); +} + + +LUALIB_API int luaL_fileresult (lua_State *L, int stat, const char *fname) { + int en = errno; /* calls to Lua API may change this value */ + if (stat) { + lua_pushboolean(L, 1); + return 1; + } + else { + lua_pushnil(L); + if (fname) + lua_pushfstring(L, "%s: %s", fname, strerror(en)); + else + lua_pushstring(L, strerror(en)); + lua_pushinteger(L, en); + return 3; + } +} + + +#if !defined(inspectstat) /* { */ + +#if defined(LUA_USE_POSIX) + +#include + +/* +** use appropriate macros to interpret 'pclose' return status +*/ +#define inspectstat(stat,what) \ + if (WIFEXITED(stat)) { stat = WEXITSTATUS(stat); } \ + else if (WIFSIGNALED(stat)) { stat = WTERMSIG(stat); what = "signal"; } + +#else + +#define inspectstat(stat,what) /* no op */ + +#endif + +#endif /* } */ + + +LUALIB_API int luaL_execresult (lua_State *L, int stat) { + const char *what = "exit"; /* type of termination */ + if (stat == -1) /* error? */ + return luaL_fileresult(L, 0, NULL); + else { + inspectstat(stat, what); /* interpret result */ + if (*what == 'e' && stat == 0) /* successful termination? */ + lua_pushboolean(L, 1); + else + lua_pushnil(L); + lua_pushstring(L, what); + lua_pushinteger(L, stat); + return 3; /* return true/nil,what,code */ + } +} + +/* }====================================================== */ + + +/* +** {====================================================== +** Userdata's metatable manipulation +** ======================================================= +*/ + +LUALIB_API int luaL_newmetatable (lua_State *L, const char *tname) { + luaL_getmetatable(L, tname); /* try to get metatable */ + if (!lua_isnil(L, -1)) /* name already in use? */ + return 0; /* leave previous value on top, but return 0 */ + lua_pop(L, 1); + lua_newtable(L); /* create metatable */ + lua_pushvalue(L, -1); + lua_setfield(L, LUA_REGISTRYINDEX, tname); /* registry.name = metatable */ + return 1; +} + + +LUALIB_API void luaL_setmetatable (lua_State *L, const char *tname) { + luaL_getmetatable(L, tname); + lua_setmetatable(L, -2); +} + + +LUALIB_API void *luaL_testudata (lua_State *L, int ud, const char *tname) { + void *p = lua_touserdata(L, ud); + if (p != NULL) { /* value is a userdata? */ + if (lua_getmetatable(L, ud)) { /* does it have a metatable? */ + luaL_getmetatable(L, tname); /* get correct metatable */ + if (!lua_rawequal(L, -1, -2)) /* not the same? */ + p = NULL; /* value is a userdata with wrong metatable */ + lua_pop(L, 2); /* remove both metatables */ + return p; + } + } + return NULL; /* value is not a userdata with a metatable */ +} + + +LUALIB_API void *luaL_checkudata (lua_State *L, int ud, const char *tname) { + void *p = luaL_testudata(L, ud, tname); + if (p == NULL) typeerror(L, ud, tname); + return p; +} + +/* }====================================================== */ + + +/* +** {====================================================== +** Argument check functions +** ======================================================= +*/ + +LUALIB_API int luaL_checkoption (lua_State *L, int narg, const char *def, + const char *const lst[]) { + const char *name = (def) ? luaL_optstring(L, narg, def) : + luaL_checkstring(L, narg); + int i; + for (i=0; lst[i]; i++) + if (strcmp(lst[i], name) == 0) + return i; + return luaL_argerror(L, narg, + lua_pushfstring(L, "invalid option " LUA_QS, name)); +} + + +LUALIB_API void luaL_checkstack (lua_State *L, int space, const char *msg) { + /* keep some extra space to run error routines, if needed */ + const int extra = LUA_MINSTACK; + if (!lua_checkstack(L, space + extra)) { + if (msg) + luaL_error(L, "stack overflow (%s)", msg); + else + luaL_error(L, "stack overflow"); + } +} + + +LUALIB_API void luaL_checktype (lua_State *L, int narg, int t) { + if (lua_type(L, narg) != t) + tag_error(L, narg, t); +} + + +LUALIB_API void luaL_checkany (lua_State *L, int narg) { + if (lua_type(L, narg) == LUA_TNONE) + luaL_argerror(L, narg, "value expected"); +} + + +LUALIB_API const char *luaL_checklstring (lua_State *L, int narg, size_t *len) { + const char *s = lua_tolstring(L, narg, len); + if (!s) tag_error(L, narg, LUA_TSTRING); + return s; +} + + +LUALIB_API const char *luaL_optlstring (lua_State *L, int narg, + const char *def, size_t *len) { + if (lua_isnoneornil(L, narg)) { + if (len) + *len = (def ? strlen(def) : 0); + return def; + } + else return luaL_checklstring(L, narg, len); +} + + +LUALIB_API lua_Number luaL_checknumber (lua_State *L, int narg) { + int isnum; + lua_Number d = lua_tonumberx(L, narg, &isnum); + if (!isnum) + tag_error(L, narg, LUA_TNUMBER); + return d; +} + + +LUALIB_API lua_Number luaL_optnumber (lua_State *L, int narg, lua_Number def) { + return luaL_opt(L, luaL_checknumber, narg, def); +} + + +LUALIB_API lua_Integer luaL_checkinteger (lua_State *L, int narg) { + int isnum; + lua_Integer d = lua_tointegerx(L, narg, &isnum); + if (!isnum) + tag_error(L, narg, LUA_TNUMBER); + return d; +} + + +LUALIB_API lua_Unsigned luaL_checkunsigned (lua_State *L, int narg) { + int isnum; + lua_Unsigned d = lua_tounsignedx(L, narg, &isnum); + if (!isnum) + tag_error(L, narg, LUA_TNUMBER); + return d; +} + + +LUALIB_API lua_Integer luaL_optinteger (lua_State *L, int narg, + lua_Integer def) { + return luaL_opt(L, luaL_checkinteger, narg, def); +} + + +LUALIB_API lua_Unsigned luaL_optunsigned (lua_State *L, int narg, + lua_Unsigned def) { + return luaL_opt(L, luaL_checkunsigned, narg, def); +} + +/* }====================================================== */ + + +/* +** {====================================================== +** Generic Buffer manipulation +** ======================================================= +*/ + +/* +** check whether buffer is using a userdata on the stack as a temporary +** buffer +*/ +#define buffonstack(B) ((B)->b != (B)->initb) + + +/* +** returns a pointer to a free area with at least 'sz' bytes +*/ +LUALIB_API char *luaL_prepbuffsize (luaL_Buffer *B, size_t sz) { + lua_State *L = B->L; + if (B->size - B->n < sz) { /* not enough space? */ + char *newbuff; + size_t newsize = B->size * 2; /* double buffer size */ + if (newsize - B->n < sz) /* not big enough? */ + newsize = B->n + sz; + if (newsize < B->n || newsize - B->n < sz) + luaL_error(L, "buffer too large"); + /* create larger buffer */ + newbuff = (char *)lua_newuserdata(L, newsize * sizeof(char)); + /* move content to new buffer */ + memcpy(newbuff, B->b, B->n * sizeof(char)); + if (buffonstack(B)) + lua_remove(L, -2); /* remove old buffer */ + B->b = newbuff; + B->size = newsize; + } + return &B->b[B->n]; +} + + +LUALIB_API void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l) { + char *b = luaL_prepbuffsize(B, l); + memcpy(b, s, l * sizeof(char)); + luaL_addsize(B, l); +} + + +LUALIB_API void luaL_addstring (luaL_Buffer *B, const char *s) { + luaL_addlstring(B, s, strlen(s)); +} + + +LUALIB_API void luaL_pushresult (luaL_Buffer *B) { + lua_State *L = B->L; + lua_pushlstring(L, B->b, B->n); + if (buffonstack(B)) + lua_remove(L, -2); /* remove old buffer */ +} + + +LUALIB_API void luaL_pushresultsize (luaL_Buffer *B, size_t sz) { + luaL_addsize(B, sz); + luaL_pushresult(B); +} + + +LUALIB_API void luaL_addvalue (luaL_Buffer *B) { + lua_State *L = B->L; + size_t l; + const char *s = lua_tolstring(L, -1, &l); + if (buffonstack(B)) + lua_insert(L, -2); /* put value below buffer */ + luaL_addlstring(B, s, l); + lua_remove(L, (buffonstack(B)) ? -2 : -1); /* remove value */ +} + + +LUALIB_API void luaL_buffinit (lua_State *L, luaL_Buffer *B) { + B->L = L; + B->b = B->initb; + B->n = 0; + B->size = LUAL_BUFFERSIZE; +} + + +LUALIB_API char *luaL_buffinitsize (lua_State *L, luaL_Buffer *B, size_t sz) { + luaL_buffinit(L, B); + return luaL_prepbuffsize(B, sz); +} + +/* }====================================================== */ + + +/* +** {====================================================== +** Reference system +** ======================================================= +*/ + +/* index of free-list header */ +#define freelist 0 + + +LUALIB_API int luaL_ref (lua_State *L, int t) { + int ref; + if (lua_isnil(L, -1)) { + lua_pop(L, 1); /* remove from stack */ + return LUA_REFNIL; /* `nil' has a unique fixed reference */ + } + t = lua_absindex(L, t); + lua_rawgeti(L, t, freelist); /* get first free element */ + ref = (int)lua_tointeger(L, -1); /* ref = t[freelist] */ + lua_pop(L, 1); /* remove it from stack */ + if (ref != 0) { /* any free element? */ + lua_rawgeti(L, t, ref); /* remove it from list */ + lua_rawseti(L, t, freelist); /* (t[freelist] = t[ref]) */ + } + else /* no free elements */ + ref = (int)lua_rawlen(L, t) + 1; /* get a new reference */ + lua_rawseti(L, t, ref); + return ref; +} + + +LUALIB_API void luaL_unref (lua_State *L, int t, int ref) { + if (ref >= 0) { + t = lua_absindex(L, t); + lua_rawgeti(L, t, freelist); + lua_rawseti(L, t, ref); /* t[ref] = t[freelist] */ + lua_pushinteger(L, ref); + lua_rawseti(L, t, freelist); /* t[freelist] = ref */ + } +} + +/* }====================================================== */ + + +/* +** {====================================================== +** Load functions +** ======================================================= +*/ + +typedef struct LoadF { + int n; /* number of pre-read characters */ +#if defined(USE_FATFS) + FIL f; +#else + FILE *f; /* file being read */ +#endif + char buff[LUAL_BUFFERSIZE]; /* area for reading file */ +} LoadF; + + +static const char *getF (lua_State *L, void *ud, size_t *size) { + LoadF *lf = (LoadF *)ud; + (void)L; /* not used */ + if (lf->n > 0) { /* are there pre-read characters to be read? */ + *size = lf->n; /* return them (chars already in buffer) */ + lf->n = 0; /* no more pre-read characters */ + } + else { /* read a block from file */ + /* 'fread' can return > 0 *and* set the EOF flag. If next call to + 'getF' called 'fread', it might still wait for user input. + The next check avoids this problem. */ +#if defined(USE_FATFS) + UINT f_read_size; + FRESULT result = f_read(&lf->f, lf->buff, sizeof(lf->buff), &f_read_size); + if (result != FR_OK || f_read_size == 0) return NULL; + *size = f_read_size; +#else + if (feof(lf->f)) return NULL; + *size = fread(lf->buff, 1, sizeof(lf->buff), lf->f); /* read block */ +#endif + } + return lf->buff; +} + + +static int errfile (lua_State *L, const char *what, int fnameindex) { + const char *serr = strerror(errno); + const char *filename = lua_tostring(L, fnameindex) + 1; + lua_pushfstring(L, "cannot %s %s: %s", what, filename, serr); + lua_remove(L, fnameindex); + return LUA_ERRFILE; +} + + +static int skipBOM (LoadF *lf) { + const char *p = "\xEF\xBB\xBF"; /* Utf8 BOM mark */ + int c; + lf->n = 0; + do { + c = lua_getc(lf->f); + if (c == EOF || c != *(const unsigned char *)p++) return c; + lf->buff[lf->n++] = c; /* to be read by the parser */ + } while (*p != '\0'); + lf->n = 0; /* prefix matched; discard it */ + return lua_getc(lf->f); /* return next character */ +} + + +/* +** reads the first character of file 'f' and skips an optional BOM mark +** in its beginning plus its first line if it starts with '#'. Returns +** true if it skipped the first line. In any case, '*cp' has the +** first "valid" character of the file (after the optional BOM and +** a first-line comment). +*/ +static int skipcomment (LoadF *lf, int *cp) { + int c = *cp = skipBOM(lf); + if (c == '#') { /* first line is a comment (Unix exec. file)? */ + do { /* skip first line */ + c = lua_getc(lf->f); + } while (c != EOF && c != '\n') ; + *cp = lua_getc(lf->f); /* skip end-of-line, if present */ + return 1; /* there was a comment */ + } + else return 0; /* no comment */ +} + + +LUALIB_API int luaL_loadfilex (lua_State *L, const char *filename, + const char *mode) { + LoadF lf; + int status, readstatus; + int c; + int fnameindex = lua_gettop(L) + 1; /* index of filename on the stack */ + if (filename == NULL) { +#if defined(USE_FATFS) + return errfile(L, "open", fnameindex); +#else + lua_pushliteral(L, "=stdin"); + lf.f = stdin; +#endif + } + else { + lua_pushfstring(L, "@%s", filename); +#if defined(USE_FATFS) + FRESULT result = f_open(&lf.f, filename, FA_OPEN_EXISTING | FA_READ); + if (result != FR_OK) return errfile(L, "open", fnameindex); +#else + lf.f = fopen(filename, "r"); + if (lf.f == NULL) return errfile(L, "open", fnameindex); +#endif + } + if (skipcomment(&lf, &c)) /* read initial portion */ + lf.buff[lf.n++] = '\n'; /* add line to correct line numbers */ +#if !defined(USE_FATFS) + if (c == LUA_SIGNATURE[0] && filename) { /* binary file? */ + lf.f = freopen(filename, "rb", lf.f); /* reopen in binary mode */ + if (lf.f == NULL) return errfile(L, "reopen", fnameindex); + skipcomment(&lf, &c); /* re-read initial portion */ + } +#endif + if (c != EOF) + lf.buff[lf.n++] = c; /* 'c' is the first character of the stream */ + status = lua_load(L, getF, &lf, lua_tostring(L, -1), mode); +#if defined(USE_FATFS) + readstatus = 0; + if (filename) f_close(&lf.f); +#else + readstatus = ferror(lf.f); + if (filename) fclose(lf.f); /* close file (even in case of errors) */ +#endif + if (readstatus) { + lua_settop(L, fnameindex); /* ignore results from `lua_load' */ + return errfile(L, "read", fnameindex); + } + lua_remove(L, fnameindex); + return status; +} + + +typedef struct LoadS { + const char *s; + size_t size; +} LoadS; + + +static const char *getS (lua_State *L, void *ud, size_t *size) { + LoadS *ls = (LoadS *)ud; + (void)L; /* not used */ + if (ls->size == 0) return NULL; + *size = ls->size; + ls->size = 0; + return ls->s; +} + + +LUALIB_API int luaL_loadbufferx (lua_State *L, const char *buff, size_t size, + const char *name, const char *mode) { + LoadS ls; + ls.s = buff; + ls.size = size; + return lua_load(L, getS, &ls, name, mode); +} + + +LUALIB_API int luaL_loadstring (lua_State *L, const char *s) { + return luaL_loadbuffer(L, s, strlen(s), s); +} + +/* }====================================================== */ + + + +LUALIB_API int luaL_getmetafield (lua_State *L, int obj, const char *event) { + if (!lua_getmetatable(L, obj)) /* no metatable? */ + return 0; + lua_pushstring(L, event); + lua_rawget(L, -2); + if (lua_isnil(L, -1)) { + lua_pop(L, 2); /* remove metatable and metafield */ + return 0; + } + else { + lua_remove(L, -2); /* remove only metatable */ + return 1; + } +} + + +LUALIB_API int luaL_callmeta (lua_State *L, int obj, const char *event) { + obj = lua_absindex(L, obj); + if (!luaL_getmetafield(L, obj, event)) /* no metafield? */ + return 0; + lua_pushvalue(L, obj); + lua_call(L, 1, 1); + return 1; +} + + +LUALIB_API int luaL_len (lua_State *L, int idx) { + int l; + int isnum; + lua_len(L, idx); + l = (int)lua_tointegerx(L, -1, &isnum); + if (!isnum) + luaL_error(L, "object length is not a number"); + lua_pop(L, 1); /* remove object */ + return l; +} + + +LUALIB_API const char *luaL_tolstring (lua_State *L, int idx, size_t *len) { + if (!luaL_callmeta(L, idx, "__tostring")) { /* no metafield? */ + switch (lua_type(L, idx)) { + case LUA_TNUMBER: + case LUA_TSTRING: + lua_pushvalue(L, idx); + break; + case LUA_TBOOLEAN: + lua_pushstring(L, (lua_toboolean(L, idx) ? "true" : "false")); + break; + case LUA_TNIL: + lua_pushliteral(L, "nil"); + break; + default: + lua_pushfstring(L, "%s: %p", luaL_typename(L, idx), + lua_topointer(L, idx)); + break; + } + } + return lua_tolstring(L, -1, len); +} + + +/* +** {====================================================== +** Compatibility with 5.1 module functions +** ======================================================= +*/ +#if defined(LUA_COMPAT_MODULE) + +static const char *luaL_findtable (lua_State *L, int idx, + const char *fname, int szhint) { + const char *e; + if (idx) lua_pushvalue(L, idx); + do { + e = strchr(fname, '.'); + if (e == NULL) e = fname + strlen(fname); + lua_pushlstring(L, fname, e - fname); + lua_rawget(L, -2); + if (lua_isnil(L, -1)) { /* no such field? */ + lua_pop(L, 1); /* remove this nil */ + lua_createtable(L, 0, (*e == '.' ? 1 : szhint)); /* new table for field */ + lua_pushlstring(L, fname, e - fname); + lua_pushvalue(L, -2); + lua_settable(L, -4); /* set new table into field */ + } + else if (!lua_istable(L, -1)) { /* field has a non-table value? */ + lua_pop(L, 2); /* remove table and value */ + return fname; /* return problematic part of the name */ + } + lua_remove(L, -2); /* remove previous table */ + fname = e + 1; + } while (*e == '.'); + return NULL; +} + + +/* +** Count number of elements in a luaL_Reg list. +*/ +static int libsize (const luaL_Reg *l) { + int size = 0; + for (; l && l->name; l++) size++; + return size; +} + + +/* +** Find or create a module table with a given name. The function +** first looks at the _LOADED table and, if that fails, try a +** global variable with that name. In any case, leaves on the stack +** the module table. +*/ +LUALIB_API void luaL_pushmodule (lua_State *L, const char *modname, + int sizehint) { + luaL_findtable(L, LUA_REGISTRYINDEX, "_LOADED", 1); /* get _LOADED table */ + lua_getfield(L, -1, modname); /* get _LOADED[modname] */ + if (!lua_istable(L, -1)) { /* not found? */ + lua_pop(L, 1); /* remove previous result */ + /* try global variable (and create one if it does not exist) */ + lua_pushglobaltable(L); + if (luaL_findtable(L, 0, modname, sizehint) != NULL) + luaL_error(L, "name conflict for module " LUA_QS, modname); + lua_pushvalue(L, -1); + lua_setfield(L, -3, modname); /* _LOADED[modname] = new table */ + } + lua_remove(L, -2); /* remove _LOADED table */ +} + + +LUALIB_API void luaL_openlib (lua_State *L, const char *libname, + const luaL_Reg *l, int nup) { + luaL_checkversion(L); + if (libname) { + luaL_pushmodule(L, libname, libsize(l)); /* get/create library table */ + lua_insert(L, -(nup + 1)); /* move library table to below upvalues */ + } + if (l) + luaL_setfuncs(L, l, nup); + else + lua_pop(L, nup); /* remove upvalues */ +} + +#endif +/* }====================================================== */ + +/* +** set functions from list 'l' into table at top - 'nup'; each +** function gets the 'nup' elements at the top as upvalues. +** Returns with only the table at the stack. +*/ +LUALIB_API void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) { + luaL_checkversion(L); + luaL_checkstack(L, nup, "too many upvalues"); + for (; l->name != NULL; l++) { /* fill the table with given functions */ + int i; + for (i = 0; i < nup; i++) /* copy upvalues to the top */ + lua_pushvalue(L, -nup); + lua_pushcclosure(L, l->func, nup); /* closure with those upvalues */ + lua_setfield(L, -(nup + 2), l->name); + } + lua_pop(L, nup); /* remove upvalues */ +} + + +/* +** ensure that stack[idx][fname] has a table and push that table +** into the stack +*/ +LUALIB_API int luaL_getsubtable (lua_State *L, int idx, const char *fname) { + lua_getfield(L, idx, fname); + if (lua_istable(L, -1)) return 1; /* table already there */ + else { + lua_pop(L, 1); /* remove previous result */ + idx = lua_absindex(L, idx); + lua_newtable(L); + lua_pushvalue(L, -1); /* copy to be left at top */ + lua_setfield(L, idx, fname); /* assign new table to field */ + return 0; /* false, because did not find table there */ + } +} + + +/* +** stripped-down 'require'. Calls 'openf' to open a module, +** registers the result in 'package.loaded' table and, if 'glb' +** is true, also registers the result in the global table. +** Leaves resulting module on the top. +*/ +LUALIB_API void luaL_requiref (lua_State *L, const char *modname, + lua_CFunction openf, int glb) { + lua_pushcfunction(L, openf); + lua_pushstring(L, modname); /* argument to open function */ + lua_call(L, 1, 1); /* open module */ + luaL_getsubtable(L, LUA_REGISTRYINDEX, "_LOADED"); + lua_pushvalue(L, -2); /* make copy of module (call result) */ + lua_setfield(L, -2, modname); /* _LOADED[modname] = module */ + lua_pop(L, 1); /* remove _LOADED table */ + if (glb) { + lua_pushvalue(L, -1); /* copy of 'mod' */ + lua_setglobal(L, modname); /* _G[modname] = module */ + } +} + + +LUALIB_API const char *luaL_gsub (lua_State *L, const char *s, const char *p, + const char *r) { + const char *wild; + size_t l = strlen(p); + luaL_Buffer b; + luaL_buffinit(L, &b); + while ((wild = strstr(s, p)) != NULL) { + luaL_addlstring(&b, s, wild - s); /* push prefix */ + luaL_addstring(&b, r); /* push replacement in place of pattern */ + s = wild + l; /* continue after `p' */ + } + luaL_addstring(&b, s); /* push last suffix */ + luaL_pushresult(&b); + return lua_tostring(L, -1); +} + + +static void *l_alloc (void *ud, void *ptr, size_t osize, size_t nsize) { + (void)ud; (void)osize; /* not used */ + if (nsize == 0) { + free(ptr); + return NULL; + } + else + return realloc(ptr, nsize); +} + + +static int panic (lua_State *L) { + luai_writestringerror("PANIC: unprotected error in call to Lua API (%s)\n", + lua_tostring(L, -1)); + return 0; /* return to Lua to abort */ +} + + +LUALIB_API lua_State *luaL_newstate (void) { + lua_State *L = lua_newstate(l_alloc, NULL); + if (L) lua_atpanic(L, &panic); + return L; +} + + +LUALIB_API void luaL_checkversion_ (lua_State *L, lua_Number ver) { + const lua_Number *v = lua_version(L); + if (v != lua_version(NULL)) + luaL_error(L, "multiple Lua VMs detected"); + else if (*v != ver) + luaL_error(L, "version mismatch: app. needs %f, Lua core provides %f", + ver, *v); + /* check conversions number -> integer types */ + lua_pushnumber(L, -(lua_Number)0x1234); + if (lua_tointeger(L, -1) != -0x1234 || + lua_tounsigned(L, -1) != (lua_Unsigned)-0x1234) + luaL_error(L, "bad conversion number->int;" + " must recompile Lua with proper settings"); + lua_pop(L, 1); +} + diff --git a/radio/src/lua/src/lauxlib.h b/radio/src/lua/src/lauxlib.h new file mode 100644 index 000000000..d66471b0b --- /dev/null +++ b/radio/src/lua/src/lauxlib.h @@ -0,0 +1,215 @@ +/* +** $Id: lauxlib.h,v 1.120 2011/11/29 15:55:08 roberto Exp $ +** Auxiliary functions for building Lua libraries +** See Copyright Notice in lua.h +*/ + + +#ifndef lauxlib_h +#define lauxlib_h + + +#include + +#include "lua.h" + + + +/* extra error code for `luaL_load' */ +#define LUA_ERRFILE (LUA_ERRERR+1) + + +typedef struct luaL_Reg { + const char *name; + lua_CFunction func; +} luaL_Reg; + + +LUALIB_API void (luaL_checkversion_) (lua_State *L, lua_Number ver); +#define luaL_checkversion(L) luaL_checkversion_(L, LUA_VERSION_NUM) + +LUALIB_API int (luaL_getmetafield) (lua_State *L, int obj, const char *e); +LUALIB_API int (luaL_callmeta) (lua_State *L, int obj, const char *e); +LUALIB_API const char *(luaL_tolstring) (lua_State *L, int idx, size_t *len); +LUALIB_API int (luaL_argerror) (lua_State *L, int numarg, const char *extramsg); +LUALIB_API const char *(luaL_checklstring) (lua_State *L, int numArg, + size_t *l); +LUALIB_API const char *(luaL_optlstring) (lua_State *L, int numArg, + const char *def, size_t *l); +LUALIB_API lua_Number (luaL_checknumber) (lua_State *L, int numArg); +LUALIB_API lua_Number (luaL_optnumber) (lua_State *L, int nArg, lua_Number def); + +LUALIB_API lua_Integer (luaL_checkinteger) (lua_State *L, int numArg); +LUALIB_API lua_Integer (luaL_optinteger) (lua_State *L, int nArg, + lua_Integer def); +LUALIB_API lua_Unsigned (luaL_checkunsigned) (lua_State *L, int numArg); +LUALIB_API lua_Unsigned (luaL_optunsigned) (lua_State *L, int numArg, + lua_Unsigned def); + +LUALIB_API void (luaL_checkstack) (lua_State *L, int sz, const char *msg); +LUALIB_API void (luaL_checktype) (lua_State *L, int narg, int t); +LUALIB_API void (luaL_checkany) (lua_State *L, int narg); + +LUALIB_API int (luaL_newmetatable) (lua_State *L, const char *tname); +LUALIB_API void (luaL_setmetatable) (lua_State *L, const char *tname); +LUALIB_API void *(luaL_testudata) (lua_State *L, int ud, const char *tname); +LUALIB_API void *(luaL_checkudata) (lua_State *L, int ud, const char *tname); + +LUALIB_API void (luaL_where) (lua_State *L, int lvl); +LUALIB_API int (luaL_error) (lua_State *L, const char *fmt, ...); + +LUALIB_API int (luaL_checkoption) (lua_State *L, int narg, const char *def, + const char *const lst[]); + +LUALIB_API int (luaL_fileresult) (lua_State *L, int stat, const char *fname); +LUALIB_API int (luaL_execresult) (lua_State *L, int stat); + +/* pre-defined references */ +#define LUA_NOREF (-2) +#define LUA_REFNIL (-1) + +LUALIB_API int (luaL_ref) (lua_State *L, int t); +LUALIB_API void (luaL_unref) (lua_State *L, int t, int ref); + +LUALIB_API int (luaL_loadfilex) (lua_State *L, const char *filename, + const char *mode); + +#define luaL_loadfile(L,f) luaL_loadfilex(L,f,NULL) + +LUALIB_API int (luaL_loadbufferx) (lua_State *L, const char *buff, size_t sz, + const char *name, const char *mode); +LUALIB_API int (luaL_loadstring) (lua_State *L, const char *s); + +LUALIB_API lua_State *(luaL_newstate) (void); + +LUALIB_API int (luaL_len) (lua_State *L, int idx); + +LUALIB_API const char *(luaL_gsub) (lua_State *L, const char *s, const char *p, + const char *r); + +LUALIB_API void (luaL_setfuncs) (lua_State *L, const luaL_Reg *l, int nup); + +LUALIB_API int (luaL_getsubtable) (lua_State *L, int idx, const char *fname); + +LUALIB_API void (luaL_traceback) (lua_State *L, lua_State *L1, + const char *msg, int level); + +LUALIB_API void (luaL_requiref) (lua_State *L, const char *modname, + lua_CFunction openf, int glb); + +/* +** =============================================================== +** some useful macros +** =============================================================== +*/ + + +#define luaL_newlibtable(L,l) \ + lua_createtable(L, 0, sizeof(l)/sizeof((l)[0]) - 1) + +#define luaL_newlib(L,l) (luaL_newlibtable(L,l), luaL_setfuncs(L,l,0)) + +#define luaL_argcheck(L, cond,numarg,extramsg) \ + ((void)((cond) || luaL_argerror(L, (numarg), (extramsg)))) +#define luaL_checkstring(L,n) (luaL_checklstring(L, (n), NULL)) +#define luaL_optstring(L,n,d) (luaL_optlstring(L, (n), (d), NULL)) +#define luaL_checkint(L,n) ((int)luaL_checkinteger(L, (n))) +#define luaL_optint(L,n,d) ((int)luaL_optinteger(L, (n), (d))) +#define luaL_checklong(L,n) ((long)luaL_checkinteger(L, (n))) +#define luaL_optlong(L,n,d) ((long)luaL_optinteger(L, (n), (d))) + +#define luaL_typename(L,i) lua_typename(L, lua_type(L,(i))) + +#define luaL_dofile(L, fn) \ + (luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0)) + +#define luaL_dostring(L, s) \ + (luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0)) + +#define luaL_getmetatable(L,n) (lua_getfield(L, LUA_REGISTRYINDEX, (n))) + +#define luaL_opt(L,f,n,d) (lua_isnoneornil(L,(n)) ? (d) : f(L,(n))) + +#define luaL_loadbuffer(L,s,sz,n) luaL_loadbufferx(L,s,sz,n,NULL) + + +/* +** {====================================================== +** Generic Buffer manipulation +** ======================================================= +*/ + +typedef struct luaL_Buffer { + char *b; /* buffer address */ + size_t size; /* buffer size */ + size_t n; /* number of characters in buffer */ + lua_State *L; + char initb[LUAL_BUFFERSIZE]; /* initial buffer */ +} luaL_Buffer; + + +#define luaL_addchar(B,c) \ + ((void)((B)->n < (B)->size || luaL_prepbuffsize((B), 1)), \ + ((B)->b[(B)->n++] = (c))) + +#define luaL_addsize(B,s) ((B)->n += (s)) + +LUALIB_API void (luaL_buffinit) (lua_State *L, luaL_Buffer *B); +LUALIB_API char *(luaL_prepbuffsize) (luaL_Buffer *B, size_t sz); +LUALIB_API void (luaL_addlstring) (luaL_Buffer *B, const char *s, size_t l); +LUALIB_API void (luaL_addstring) (luaL_Buffer *B, const char *s); +LUALIB_API void (luaL_addvalue) (luaL_Buffer *B); +LUALIB_API void (luaL_pushresult) (luaL_Buffer *B); +LUALIB_API void (luaL_pushresultsize) (luaL_Buffer *B, size_t sz); +LUALIB_API char *(luaL_buffinitsize) (lua_State *L, luaL_Buffer *B, size_t sz); + +#define luaL_prepbuffer(B) luaL_prepbuffsize(B, LUAL_BUFFERSIZE) + +/* }====================================================== */ + + + +/* +** {====================================================== +** File handles for IO library +** ======================================================= +*/ + +/* +** A file handle is a userdata with metatable 'LUA_FILEHANDLE' and +** initial structure 'luaL_Stream' (it may contain other fields +** after that initial structure). +*/ + +#define LUA_FILEHANDLE "FILE*" + + +typedef struct luaL_Stream { +#if defined(USE_FATFS) + FIL *f; /* stream (NULL for incompletely created streams) */ +#else + FILE *f; /* stream (NULL for incompletely created streams) */ +#endif + lua_CFunction closef; /* to close stream (NULL for closed streams) */ +} luaL_Stream; + +/* }====================================================== */ + + + +/* compatibility with old module system */ +#if defined(LUA_COMPAT_MODULE) + +LUALIB_API void (luaL_pushmodule) (lua_State *L, const char *modname, + int sizehint); +LUALIB_API void (luaL_openlib) (lua_State *L, const char *libname, + const luaL_Reg *l, int nup); + +#define luaL_register(L,n,l) (luaL_openlib(L,(n),(l),0)) + +#endif + + +#endif + + diff --git a/radio/src/lua/src/lbaselib.c b/radio/src/lua/src/lbaselib.c new file mode 100644 index 000000000..a9521e536 --- /dev/null +++ b/radio/src/lua/src/lbaselib.c @@ -0,0 +1,456 @@ +/* +** $Id: lbaselib.c,v 1.276 2013/02/21 13:44:53 roberto Exp $ +** Basic library +** See Copyright Notice in lua.h +*/ + + + +#include +#include +#include + +#define lbaselib_c + +#include "lua.h" + +#include "lauxlib.h" +#include "lualib.h" + + +static int luaB_print (lua_State *L) { + int n = lua_gettop(L); /* number of arguments */ + int i; + lua_getglobal(L, "tostring"); + for (i=1; i<=n; i++) { + const char *s; + size_t l; + lua_pushvalue(L, -1); /* function to be called */ + lua_pushvalue(L, i); /* value to print */ + lua_call(L, 1, 1); + s = lua_tolstring(L, -1, &l); /* get result */ + if (s == NULL) + return luaL_error(L, + LUA_QL("tostring") " must return a string to " LUA_QL("print")); + if (i>1) luai_writestring("\t", 1); + luai_writestring(s, l); + lua_pop(L, 1); /* pop result */ + } + luai_writeline(); + return 0; +} + + +#define SPACECHARS " \f\n\r\t\v" + +static int luaB_tonumber (lua_State *L) { + if (lua_isnoneornil(L, 2)) { /* standard conversion */ + int isnum; + lua_Number n = lua_tonumberx(L, 1, &isnum); + if (isnum) { + lua_pushnumber(L, n); + return 1; + } /* else not a number; must be something */ + luaL_checkany(L, 1); + } + else { + size_t l; + const char *s = luaL_checklstring(L, 1, &l); + const char *e = s + l; /* end point for 's' */ + int base = luaL_checkint(L, 2); + int neg = 0; + luaL_argcheck(L, 2 <= base && base <= 36, 2, "base out of range"); + s += strspn(s, SPACECHARS); /* skip initial spaces */ + if (*s == '-') { s++; neg = 1; } /* handle signal */ + else if (*s == '+') s++; + if (isalnum((unsigned char)*s)) { + lua_Number n = 0; + do { + int digit = (isdigit((unsigned char)*s)) ? *s - '0' + : toupper((unsigned char)*s) - 'A' + 10; + if (digit >= base) break; /* invalid numeral; force a fail */ + n = n * (lua_Number)base + (lua_Number)digit; + s++; + } while (isalnum((unsigned char)*s)); + s += strspn(s, SPACECHARS); /* skip trailing spaces */ + if (s == e) { /* no invalid trailing characters? */ + lua_pushnumber(L, (neg) ? -n : n); + return 1; + } /* else not a number */ + } /* else not a number */ + } + lua_pushnil(L); /* not a number */ + return 1; +} + + +static int luaB_error (lua_State *L) { + int level = luaL_optint(L, 2, 1); + lua_settop(L, 1); + if (lua_isstring(L, 1) && level > 0) { /* add extra information? */ + luaL_where(L, level); + lua_pushvalue(L, 1); + lua_concat(L, 2); + } + return lua_error(L); +} + + +static int luaB_getmetatable (lua_State *L) { + luaL_checkany(L, 1); + if (!lua_getmetatable(L, 1)) { + lua_pushnil(L); + return 1; /* no metatable */ + } + luaL_getmetafield(L, 1, "__metatable"); + return 1; /* returns either __metatable field (if present) or metatable */ +} + + +static int luaB_setmetatable (lua_State *L) { + int t = lua_type(L, 2); + luaL_checktype(L, 1, LUA_TTABLE); + luaL_argcheck(L, t == LUA_TNIL || t == LUA_TTABLE, 2, + "nil or table expected"); + if (luaL_getmetafield(L, 1, "__metatable")) + return luaL_error(L, "cannot change a protected metatable"); + lua_settop(L, 2); + lua_setmetatable(L, 1); + return 1; +} + + +static int luaB_rawequal (lua_State *L) { + luaL_checkany(L, 1); + luaL_checkany(L, 2); + lua_pushboolean(L, lua_rawequal(L, 1, 2)); + return 1; +} + + +static int luaB_rawlen (lua_State *L) { + int t = lua_type(L, 1); + luaL_argcheck(L, t == LUA_TTABLE || t == LUA_TSTRING, 1, + "table or string expected"); + lua_pushinteger(L, lua_rawlen(L, 1)); + return 1; +} + + +static int luaB_rawget (lua_State *L) { + luaL_checktype(L, 1, LUA_TTABLE); + luaL_checkany(L, 2); + lua_settop(L, 2); + lua_rawget(L, 1); + return 1; +} + +static int luaB_rawset (lua_State *L) { + luaL_checktype(L, 1, LUA_TTABLE); + luaL_checkany(L, 2); + luaL_checkany(L, 3); + lua_settop(L, 3); + lua_rawset(L, 1); + return 1; +} + + +static int luaB_collectgarbage (lua_State *L) { + static const char *const opts[] = {"stop", "restart", "collect", + "count", "step", "setpause", "setstepmul", + "setmajorinc", "isrunning", "generational", "incremental", NULL}; + static const int optsnum[] = {LUA_GCSTOP, LUA_GCRESTART, LUA_GCCOLLECT, + LUA_GCCOUNT, LUA_GCSTEP, LUA_GCSETPAUSE, LUA_GCSETSTEPMUL, + LUA_GCSETMAJORINC, LUA_GCISRUNNING, LUA_GCGEN, LUA_GCINC}; + int o = optsnum[luaL_checkoption(L, 1, "collect", opts)]; + int ex = luaL_optint(L, 2, 0); + int res = lua_gc(L, o, ex); + switch (o) { + case LUA_GCCOUNT: { + int b = lua_gc(L, LUA_GCCOUNTB, 0); + lua_pushnumber(L, res + ((lua_Number)b/1024)); + lua_pushinteger(L, b); + return 2; + } + case LUA_GCSTEP: case LUA_GCISRUNNING: { + lua_pushboolean(L, res); + return 1; + } + default: { + lua_pushinteger(L, res); + return 1; + } + } +} + + +static int luaB_type (lua_State *L) { + luaL_checkany(L, 1); + lua_pushstring(L, luaL_typename(L, 1)); + return 1; +} + + +static int pairsmeta (lua_State *L, const char *method, int iszero, + lua_CFunction iter) { + if (!luaL_getmetafield(L, 1, method)) { /* no metamethod? */ + luaL_checktype(L, 1, LUA_TTABLE); /* argument must be a table */ + lua_pushcfunction(L, iter); /* will return generator, */ + lua_pushvalue(L, 1); /* state, */ + if (iszero) lua_pushinteger(L, 0); /* and initial value */ + else lua_pushnil(L); + } + else { + lua_pushvalue(L, 1); /* argument 'self' to metamethod */ + lua_call(L, 1, 3); /* get 3 values from metamethod */ + } + return 3; +} + + +static int luaB_next (lua_State *L) { + luaL_checktype(L, 1, LUA_TTABLE); + lua_settop(L, 2); /* create a 2nd argument if there isn't one */ + if (lua_next(L, 1)) + return 2; + else { + lua_pushnil(L); + return 1; + } +} + + +static int luaB_pairs (lua_State *L) { + return pairsmeta(L, "__pairs", 0, luaB_next); +} + + +static int ipairsaux (lua_State *L) { + int i = luaL_checkint(L, 2); + luaL_checktype(L, 1, LUA_TTABLE); + i++; /* next value */ + lua_pushinteger(L, i); + lua_rawgeti(L, 1, i); + return (lua_isnil(L, -1)) ? 1 : 2; +} + + +static int luaB_ipairs (lua_State *L) { + return pairsmeta(L, "__ipairs", 1, ipairsaux); +} + + +static int load_aux (lua_State *L, int status, int envidx) { + if (status == LUA_OK) { + if (envidx != 0) { /* 'env' parameter? */ + lua_pushvalue(L, envidx); /* environment for loaded function */ + if (!lua_setupvalue(L, -2, 1)) /* set it as 1st upvalue */ + lua_pop(L, 1); /* remove 'env' if not used by previous call */ + } + return 1; + } + else { /* error (message is on top of the stack) */ + lua_pushnil(L); + lua_insert(L, -2); /* put before error message */ + return 2; /* return nil plus error message */ + } +} + + +static int luaB_loadfile (lua_State *L) { + const char *fname = luaL_optstring(L, 1, NULL); + const char *mode = luaL_optstring(L, 2, NULL); + int env = (!lua_isnone(L, 3) ? 3 : 0); /* 'env' index or 0 if no 'env' */ + int status = luaL_loadfilex(L, fname, mode); + return load_aux(L, status, env); +} + + +/* +** {====================================================== +** Generic Read function +** ======================================================= +*/ + + +/* +** reserved slot, above all arguments, to hold a copy of the returned +** string to avoid it being collected while parsed. 'load' has four +** optional arguments (chunk, source name, mode, and environment). +*/ +#define RESERVEDSLOT 5 + + +/* +** Reader for generic `load' function: `lua_load' uses the +** stack for internal stuff, so the reader cannot change the +** stack top. Instead, it keeps its resulting string in a +** reserved slot inside the stack. +*/ +static const char *generic_reader (lua_State *L, void *ud, size_t *size) { + (void)(ud); /* not used */ + luaL_checkstack(L, 2, "too many nested functions"); + lua_pushvalue(L, 1); /* get function */ + lua_call(L, 0, 1); /* call it */ + if (lua_isnil(L, -1)) { + lua_pop(L, 1); /* pop result */ + *size = 0; + return NULL; + } + else if (!lua_isstring(L, -1)) + luaL_error(L, "reader function must return a string"); + lua_replace(L, RESERVEDSLOT); /* save string in reserved slot */ + return lua_tolstring(L, RESERVEDSLOT, size); +} + + +static int luaB_load (lua_State *L) { + int status; + size_t l; + const char *s = lua_tolstring(L, 1, &l); + const char *mode = luaL_optstring(L, 3, "bt"); + int env = (!lua_isnone(L, 4) ? 4 : 0); /* 'env' index or 0 if no 'env' */ + if (s != NULL) { /* loading a string? */ + const char *chunkname = luaL_optstring(L, 2, s); + status = luaL_loadbufferx(L, s, l, chunkname, mode); + } + else { /* loading from a reader function */ + const char *chunkname = luaL_optstring(L, 2, "=(load)"); + luaL_checktype(L, 1, LUA_TFUNCTION); + lua_settop(L, RESERVEDSLOT); /* create reserved slot */ + status = lua_load(L, generic_reader, NULL, chunkname, mode); + } + return load_aux(L, status, env); +} + +/* }====================================================== */ + + +static int dofilecont (lua_State *L) { + return lua_gettop(L) - 1; +} + + +static int luaB_dofile (lua_State *L) { + const char *fname = luaL_optstring(L, 1, NULL); + lua_settop(L, 1); + if (luaL_loadfile(L, fname) != LUA_OK) + return lua_error(L); + lua_callk(L, 0, LUA_MULTRET, 0, dofilecont); + return dofilecont(L); +} + + +static int luaB_assert (lua_State *L) { + if (!lua_toboolean(L, 1)) + return luaL_error(L, "%s", luaL_optstring(L, 2, "assertion failed!")); + return lua_gettop(L); +} + + +static int luaB_select (lua_State *L) { + int n = lua_gettop(L); + if (lua_type(L, 1) == LUA_TSTRING && *lua_tostring(L, 1) == '#') { + lua_pushinteger(L, n-1); + return 1; + } + else { + int i = luaL_checkint(L, 1); + if (i < 0) i = n + i; + else if (i > n) i = n; + luaL_argcheck(L, 1 <= i, 1, "index out of range"); + return n - i; + } +} + + +static int finishpcall (lua_State *L, int status) { + if (!lua_checkstack(L, 1)) { /* no space for extra boolean? */ + lua_settop(L, 0); /* create space for return values */ + lua_pushboolean(L, 0); + lua_pushstring(L, "stack overflow"); + return 2; /* return false, msg */ + } + lua_pushboolean(L, status); /* first result (status) */ + lua_replace(L, 1); /* put first result in first slot */ + return lua_gettop(L); +} + + +static int pcallcont (lua_State *L) { + int status = lua_getctx(L, NULL); + return finishpcall(L, (status == LUA_YIELD)); +} + + +static int luaB_pcall (lua_State *L) { + int status; + luaL_checkany(L, 1); + lua_pushnil(L); + lua_insert(L, 1); /* create space for status result */ + status = lua_pcallk(L, lua_gettop(L) - 2, LUA_MULTRET, 0, 0, pcallcont); + return finishpcall(L, (status == LUA_OK)); +} + + +static int luaB_xpcall (lua_State *L) { + int status; + int n = lua_gettop(L); + luaL_argcheck(L, n >= 2, 2, "value expected"); + lua_pushvalue(L, 1); /* exchange function... */ + lua_copy(L, 2, 1); /* ...and error handler */ + lua_replace(L, 2); + status = lua_pcallk(L, n - 2, LUA_MULTRET, 1, 0, pcallcont); + return finishpcall(L, (status == LUA_OK)); +} + + +static int luaB_tostring (lua_State *L) { + luaL_checkany(L, 1); + luaL_tolstring(L, 1, NULL); + return 1; +} + + +static const luaL_Reg base_funcs[] = { + {"assert", luaB_assert}, + {"collectgarbage", luaB_collectgarbage}, + {"dofile", luaB_dofile}, + {"error", luaB_error}, + {"getmetatable", luaB_getmetatable}, + {"ipairs", luaB_ipairs}, + {"loadfile", luaB_loadfile}, + {"load", luaB_load}, +#if defined(LUA_COMPAT_LOADSTRING) + {"loadstring", luaB_load}, +#endif + {"next", luaB_next}, + {"pairs", luaB_pairs}, + {"pcall", luaB_pcall}, + {"print", luaB_print}, + {"rawequal", luaB_rawequal}, + {"rawlen", luaB_rawlen}, + {"rawget", luaB_rawget}, + {"rawset", luaB_rawset}, + {"select", luaB_select}, + {"setmetatable", luaB_setmetatable}, + {"tonumber", luaB_tonumber}, + {"tostring", luaB_tostring}, + {"type", luaB_type}, + {"xpcall", luaB_xpcall}, + {NULL, NULL} +}; + + +LUAMOD_API int luaopen_base (lua_State *L) { + /* set global _G */ + lua_pushglobaltable(L); + lua_pushglobaltable(L); + lua_setfield(L, -2, "_G"); + /* open lib into global table */ + luaL_setfuncs(L, base_funcs, 0); + lua_pushliteral(L, LUA_VERSION); + lua_setfield(L, -2, "_VERSION"); /* set global _VERSION */ + return 1; +} + diff --git a/radio/src/lua/src/lbitlib.c b/radio/src/lua/src/lbitlib.c new file mode 100644 index 000000000..5910f135d --- /dev/null +++ b/radio/src/lua/src/lbitlib.c @@ -0,0 +1,210 @@ +/* +** $Id: lbitlib.c,v 1.18 2013/03/19 13:19:12 roberto Exp $ +** Standard library for bitwise operations +** See Copyright Notice in lua.h +*/ + +#define lbitlib_c + +#include "lua.h" + +#include "lauxlib.h" +#include "lualib.h" + + +/* number of bits to consider in a number */ +#if !defined(LUA_NBITS) +#define LUA_NBITS 32 +#endif + + +#define ALLONES (~(((~(lua_Unsigned)0) << (LUA_NBITS - 1)) << 1)) + +/* macro to trim extra bits */ +#define trim(x) ((x) & ALLONES) + + +/* builds a number with 'n' ones (1 <= n <= LUA_NBITS) */ +#define mask(n) (~((ALLONES << 1) << ((n) - 1))) + + +typedef lua_Unsigned b_uint; + + + +static b_uint andaux (lua_State *L) { + int i, n = lua_gettop(L); + b_uint r = ~(b_uint)0; + for (i = 1; i <= n; i++) + r &= luaL_checkunsigned(L, i); + return trim(r); +} + + +static int b_and (lua_State *L) { + b_uint r = andaux(L); + lua_pushunsigned(L, r); + return 1; +} + + +static int b_test (lua_State *L) { + b_uint r = andaux(L); + lua_pushboolean(L, r != 0); + return 1; +} + + +static int b_or (lua_State *L) { + int i, n = lua_gettop(L); + b_uint r = 0; + for (i = 1; i <= n; i++) + r |= luaL_checkunsigned(L, i); + lua_pushunsigned(L, trim(r)); + return 1; +} + + +static int b_xor (lua_State *L) { + int i, n = lua_gettop(L); + b_uint r = 0; + for (i = 1; i <= n; i++) + r ^= luaL_checkunsigned(L, i); + lua_pushunsigned(L, trim(r)); + return 1; +} + + +static int b_not (lua_State *L) { + b_uint r = ~luaL_checkunsigned(L, 1); + lua_pushunsigned(L, trim(r)); + return 1; +} + + +static int b_shift (lua_State *L, b_uint r, int i) { + if (i < 0) { /* shift right? */ + i = -i; + r = trim(r); + if (i >= LUA_NBITS) r = 0; + else r >>= i; + } + else { /* shift left */ + if (i >= LUA_NBITS) r = 0; + else r <<= i; + r = trim(r); + } + lua_pushunsigned(L, r); + return 1; +} + + +static int b_lshift (lua_State *L) { + return b_shift(L, luaL_checkunsigned(L, 1), luaL_checkint(L, 2)); +} + + +static int b_rshift (lua_State *L) { + return b_shift(L, luaL_checkunsigned(L, 1), -luaL_checkint(L, 2)); +} + + +static int b_arshift (lua_State *L) { + b_uint r = luaL_checkunsigned(L, 1); + int i = luaL_checkint(L, 2); + if (i < 0 || !(r & ((b_uint)1 << (LUA_NBITS - 1)))) + return b_shift(L, r, -i); + else { /* arithmetic shift for 'negative' number */ + if (i >= LUA_NBITS) r = ALLONES; + else + r = trim((r >> i) | ~(~(b_uint)0 >> i)); /* add signal bit */ + lua_pushunsigned(L, r); + return 1; + } +} + + +static int b_rot (lua_State *L, int i) { + b_uint r = luaL_checkunsigned(L, 1); + i &= (LUA_NBITS - 1); /* i = i % NBITS */ + r = trim(r); + r = (r << i) | (r >> (LUA_NBITS - i)); + lua_pushunsigned(L, trim(r)); + return 1; +} + + +static int b_lrot (lua_State *L) { + return b_rot(L, luaL_checkint(L, 2)); +} + + +static int b_rrot (lua_State *L) { + return b_rot(L, -luaL_checkint(L, 2)); +} + + +/* +** get field and width arguments for field-manipulation functions, +** checking whether they are valid. +** ('luaL_error' called without 'return' to avoid later warnings about +** 'width' being used uninitialized.) +*/ +static int fieldargs (lua_State *L, int farg, int *width) { + int f = luaL_checkint(L, farg); + int w = luaL_optint(L, farg + 1, 1); + luaL_argcheck(L, 0 <= f, farg, "field cannot be negative"); + luaL_argcheck(L, 0 < w, farg + 1, "width must be positive"); + if (f + w > LUA_NBITS) + luaL_error(L, "trying to access non-existent bits"); + *width = w; + return f; +} + + +static int b_extract (lua_State *L) { + int w; + b_uint r = luaL_checkunsigned(L, 1); + int f = fieldargs(L, 2, &w); + r = (r >> f) & mask(w); + lua_pushunsigned(L, r); + return 1; +} + + +static int b_replace (lua_State *L) { + int w; + b_uint r = luaL_checkunsigned(L, 1); + b_uint v = luaL_checkunsigned(L, 2); + int f = fieldargs(L, 3, &w); + int m = mask(w); + v &= m; /* erase bits outside given width */ + r = (r & ~(m << f)) | (v << f); + lua_pushunsigned(L, r); + return 1; +} + + +static const luaL_Reg bitlib[] = { + {"arshift", b_arshift}, + {"band", b_and}, + {"bnot", b_not}, + {"bor", b_or}, + {"bxor", b_xor}, + {"btest", b_test}, + {"extract", b_extract}, + {"lrotate", b_lrot}, + {"lshift", b_lshift}, + {"replace", b_replace}, + {"rrotate", b_rrot}, + {"rshift", b_rshift}, + {NULL, NULL} +}; + + + +LUAMOD_API int luaopen_bit32 (lua_State *L) { + luaL_newlib(L, bitlib); + return 1; +} + diff --git a/radio/src/lua/src/lcode.c b/radio/src/lua/src/lcode.c new file mode 100644 index 000000000..56c26ac8a --- /dev/null +++ b/radio/src/lua/src/lcode.c @@ -0,0 +1,881 @@ +/* +** $Id: lcode.c,v 2.62 2012/08/16 17:34:28 roberto Exp $ +** Code generator for Lua +** See Copyright Notice in lua.h +*/ + + +#include + +#define lcode_c +#define LUA_CORE + +#include "lua.h" + +#include "lcode.h" +#include "ldebug.h" +#include "ldo.h" +#include "lgc.h" +#include "llex.h" +#include "lmem.h" +#include "lobject.h" +#include "lopcodes.h" +#include "lparser.h" +#include "lstring.h" +#include "ltable.h" +#include "lvm.h" + + +#define hasjumps(e) ((e)->t != (e)->f) + + +static int isnumeral(expdesc *e) { + return (e->k == VKNUM && e->t == NO_JUMP && e->f == NO_JUMP); +} + + +void luaK_nil (FuncState *fs, int from, int n) { + Instruction *previous; + int l = from + n - 1; /* last register to set nil */ + if (fs->pc > fs->lasttarget) { /* no jumps to current position? */ + previous = &fs->f->code[fs->pc-1]; + if (GET_OPCODE(*previous) == OP_LOADNIL) { + int pfrom = GETARG_A(*previous); + int pl = pfrom + GETARG_B(*previous); + if ((pfrom <= from && from <= pl + 1) || + (from <= pfrom && pfrom <= l + 1)) { /* can connect both? */ + if (pfrom < from) from = pfrom; /* from = min(from, pfrom) */ + if (pl > l) l = pl; /* l = max(l, pl) */ + SETARG_A(*previous, from); + SETARG_B(*previous, l - from); + return; + } + } /* else go through */ + } + luaK_codeABC(fs, OP_LOADNIL, from, n - 1, 0); /* else no optimization */ +} + + +int luaK_jump (FuncState *fs) { + int jpc = fs->jpc; /* save list of jumps to here */ + int j; + fs->jpc = NO_JUMP; + j = luaK_codeAsBx(fs, OP_JMP, 0, NO_JUMP); + luaK_concat(fs, &j, jpc); /* keep them on hold */ + return j; +} + + +void luaK_ret (FuncState *fs, int first, int nret) { + luaK_codeABC(fs, OP_RETURN, first, nret+1, 0); +} + + +static int condjump (FuncState *fs, OpCode op, int A, int B, int C) { + luaK_codeABC(fs, op, A, B, C); + return luaK_jump(fs); +} + + +static void fixjump (FuncState *fs, int pc, int dest) { + Instruction *jmp = &fs->f->code[pc]; + int offset = dest-(pc+1); + lua_assert(dest != NO_JUMP); + if (abs(offset) > MAXARG_sBx) + luaX_syntaxerror(fs->ls, "control structure too long"); + SETARG_sBx(*jmp, offset); +} + + +/* +** returns current `pc' and marks it as a jump target (to avoid wrong +** optimizations with consecutive instructions not in the same basic block). +*/ +int luaK_getlabel (FuncState *fs) { + fs->lasttarget = fs->pc; + return fs->pc; +} + + +static int getjump (FuncState *fs, int pc) { + int offset = GETARG_sBx(fs->f->code[pc]); + if (offset == NO_JUMP) /* point to itself represents end of list */ + return NO_JUMP; /* end of list */ + else + return (pc+1)+offset; /* turn offset into absolute position */ +} + + +static Instruction *getjumpcontrol (FuncState *fs, int pc) { + Instruction *pi = &fs->f->code[pc]; + if (pc >= 1 && testTMode(GET_OPCODE(*(pi-1)))) + return pi-1; + else + return pi; +} + + +/* +** check whether list has any jump that do not produce a value +** (or produce an inverted value) +*/ +static int need_value (FuncState *fs, int list) { + for (; list != NO_JUMP; list = getjump(fs, list)) { + Instruction i = *getjumpcontrol(fs, list); + if (GET_OPCODE(i) != OP_TESTSET) return 1; + } + return 0; /* not found */ +} + + +static int patchtestreg (FuncState *fs, int node, int reg) { + Instruction *i = getjumpcontrol(fs, node); + if (GET_OPCODE(*i) != OP_TESTSET) + return 0; /* cannot patch other instructions */ + if (reg != NO_REG && reg != GETARG_B(*i)) + SETARG_A(*i, reg); + else /* no register to put value or register already has the value */ + *i = CREATE_ABC(OP_TEST, GETARG_B(*i), 0, GETARG_C(*i)); + + return 1; +} + + +static void removevalues (FuncState *fs, int list) { + for (; list != NO_JUMP; list = getjump(fs, list)) + patchtestreg(fs, list, NO_REG); +} + + +static void patchlistaux (FuncState *fs, int list, int vtarget, int reg, + int dtarget) { + while (list != NO_JUMP) { + int next = getjump(fs, list); + if (patchtestreg(fs, list, reg)) + fixjump(fs, list, vtarget); + else + fixjump(fs, list, dtarget); /* jump to default target */ + list = next; + } +} + + +static void dischargejpc (FuncState *fs) { + patchlistaux(fs, fs->jpc, fs->pc, NO_REG, fs->pc); + fs->jpc = NO_JUMP; +} + + +void luaK_patchlist (FuncState *fs, int list, int target) { + if (target == fs->pc) + luaK_patchtohere(fs, list); + else { + lua_assert(target < fs->pc); + patchlistaux(fs, list, target, NO_REG, target); + } +} + + +LUAI_FUNC void luaK_patchclose (FuncState *fs, int list, int level) { + level++; /* argument is +1 to reserve 0 as non-op */ + while (list != NO_JUMP) { + int next = getjump(fs, list); + lua_assert(GET_OPCODE(fs->f->code[list]) == OP_JMP && + (GETARG_A(fs->f->code[list]) == 0 || + GETARG_A(fs->f->code[list]) >= level)); + SETARG_A(fs->f->code[list], level); + list = next; + } +} + + +void luaK_patchtohere (FuncState *fs, int list) { + luaK_getlabel(fs); + luaK_concat(fs, &fs->jpc, list); +} + + +void luaK_concat (FuncState *fs, int *l1, int l2) { + if (l2 == NO_JUMP) return; + else if (*l1 == NO_JUMP) + *l1 = l2; + else { + int list = *l1; + int next; + while ((next = getjump(fs, list)) != NO_JUMP) /* find last element */ + list = next; + fixjump(fs, list, l2); + } +} + + +static int luaK_code (FuncState *fs, Instruction i) { + Proto *f = fs->f; + dischargejpc(fs); /* `pc' will change */ + /* put new instruction in code array */ + luaM_growvector(fs->ls->L, f->code, fs->pc, f->sizecode, Instruction, + MAX_INT, "opcodes"); + f->code[fs->pc] = i; + /* save corresponding line information */ + luaM_growvector(fs->ls->L, f->lineinfo, fs->pc, f->sizelineinfo, int, + MAX_INT, "opcodes"); + f->lineinfo[fs->pc] = fs->ls->lastline; + return fs->pc++; +} + + +int luaK_codeABC (FuncState *fs, OpCode o, int a, int b, int c) { + lua_assert(getOpMode(o) == iABC); + lua_assert(getBMode(o) != OpArgN || b == 0); + lua_assert(getCMode(o) != OpArgN || c == 0); + lua_assert(a <= MAXARG_A && b <= MAXARG_B && c <= MAXARG_C); + return luaK_code(fs, CREATE_ABC(o, a, b, c)); +} + + +int luaK_codeABx (FuncState *fs, OpCode o, int a, unsigned int bc) { + lua_assert(getOpMode(o) == iABx || getOpMode(o) == iAsBx); + lua_assert(getCMode(o) == OpArgN); + lua_assert(a <= MAXARG_A && bc <= MAXARG_Bx); + return luaK_code(fs, CREATE_ABx(o, a, bc)); +} + + +static int codeextraarg (FuncState *fs, int a) { + lua_assert(a <= MAXARG_Ax); + return luaK_code(fs, CREATE_Ax(OP_EXTRAARG, a)); +} + + +int luaK_codek (FuncState *fs, int reg, int k) { + if (k <= MAXARG_Bx) + return luaK_codeABx(fs, OP_LOADK, reg, k); + else { + int p = luaK_codeABx(fs, OP_LOADKX, reg, 0); + codeextraarg(fs, k); + return p; + } +} + + +void luaK_checkstack (FuncState *fs, int n) { + int newstack = fs->freereg + n; + if (newstack > fs->f->maxstacksize) { + if (newstack >= MAXSTACK) + luaX_syntaxerror(fs->ls, "function or expression too complex"); + fs->f->maxstacksize = cast_byte(newstack); + } +} + + +void luaK_reserveregs (FuncState *fs, int n) { + luaK_checkstack(fs, n); + fs->freereg += n; +} + + +static void freereg (FuncState *fs, int reg) { + if (!ISK(reg) && reg >= fs->nactvar) { + fs->freereg--; + lua_assert(reg == fs->freereg); + } +} + + +static void freeexp (FuncState *fs, expdesc *e) { + if (e->k == VNONRELOC) + freereg(fs, e->u.info); +} + + +static int addk (FuncState *fs, TValue *key, TValue *v) { + lua_State *L = fs->ls->L; + TValue *idx = luaH_set(L, fs->h, key); + Proto *f = fs->f; + int k, oldsize; + if (ttisnumber(idx)) { + lua_Number n = nvalue(idx); + lua_number2int(k, n); + if (luaV_rawequalobj(&f->k[k], v)) + return k; + /* else may be a collision (e.g., between 0.0 and "\0\0\0\0\0\0\0\0"); + go through and create a new entry for this value */ + } + /* constant not found; create a new entry */ + oldsize = f->sizek; + k = fs->nk; + /* numerical value does not need GC barrier; + table has no metatable, so it does not need to invalidate cache */ + setnvalue(idx, cast_num(k)); + luaM_growvector(L, f->k, k, f->sizek, TValue, MAXARG_Ax, "constants"); + while (oldsize < f->sizek) setnilvalue(&f->k[oldsize++]); + setobj(L, &f->k[k], v); + fs->nk++; + luaC_barrier(L, f, v); + return k; +} + + +int luaK_stringK (FuncState *fs, TString *s) { + TValue o; + setsvalue(fs->ls->L, &o, s); + return addk(fs, &o, &o); +} + + +int luaK_numberK (FuncState *fs, lua_Number r) { + int n; + lua_State *L = fs->ls->L; + TValue o; + setnvalue(&o, r); + if (r == 0 || luai_numisnan(NULL, r)) { /* handle -0 and NaN */ + /* use raw representation as key to avoid numeric problems */ + setsvalue(L, L->top++, luaS_newlstr(L, (char *)&r, sizeof(r))); + n = addk(fs, L->top - 1, &o); + L->top--; + } + else + n = addk(fs, &o, &o); /* regular case */ + return n; +} + + +static int boolK (FuncState *fs, int b) { + TValue o; + setbvalue(&o, b); + return addk(fs, &o, &o); +} + + +static int nilK (FuncState *fs) { + TValue k, v; + setnilvalue(&v); + /* cannot use nil as key; instead use table itself to represent nil */ + sethvalue(fs->ls->L, &k, fs->h); + return addk(fs, &k, &v); +} + + +void luaK_setreturns (FuncState *fs, expdesc *e, int nresults) { + if (e->k == VCALL) { /* expression is an open function call? */ + SETARG_C(getcode(fs, e), nresults+1); + } + else if (e->k == VVARARG) { + SETARG_B(getcode(fs, e), nresults+1); + SETARG_A(getcode(fs, e), fs->freereg); + luaK_reserveregs(fs, 1); + } +} + + +void luaK_setoneret (FuncState *fs, expdesc *e) { + if (e->k == VCALL) { /* expression is an open function call? */ + e->k = VNONRELOC; + e->u.info = GETARG_A(getcode(fs, e)); + } + else if (e->k == VVARARG) { + SETARG_B(getcode(fs, e), 2); + e->k = VRELOCABLE; /* can relocate its simple result */ + } +} + + +void luaK_dischargevars (FuncState *fs, expdesc *e) { + switch (e->k) { + case VLOCAL: { + e->k = VNONRELOC; + break; + } + case VUPVAL: { + e->u.info = luaK_codeABC(fs, OP_GETUPVAL, 0, e->u.info, 0); + e->k = VRELOCABLE; + break; + } + case VINDEXED: { + OpCode op = OP_GETTABUP; /* assume 't' is in an upvalue */ + freereg(fs, e->u.ind.idx); + if (e->u.ind.vt == VLOCAL) { /* 't' is in a register? */ + freereg(fs, e->u.ind.t); + op = OP_GETTABLE; + } + e->u.info = luaK_codeABC(fs, op, 0, e->u.ind.t, e->u.ind.idx); + e->k = VRELOCABLE; + break; + } + case VVARARG: + case VCALL: { + luaK_setoneret(fs, e); + break; + } + default: break; /* there is one value available (somewhere) */ + } +} + + +static int code_label (FuncState *fs, int A, int b, int jump) { + luaK_getlabel(fs); /* those instructions may be jump targets */ + return luaK_codeABC(fs, OP_LOADBOOL, A, b, jump); +} + + +static void discharge2reg (FuncState *fs, expdesc *e, int reg) { + luaK_dischargevars(fs, e); + switch (e->k) { + case VNIL: { + luaK_nil(fs, reg, 1); + break; + } + case VFALSE: case VTRUE: { + luaK_codeABC(fs, OP_LOADBOOL, reg, e->k == VTRUE, 0); + break; + } + case VK: { + luaK_codek(fs, reg, e->u.info); + break; + } + case VKNUM: { + luaK_codek(fs, reg, luaK_numberK(fs, e->u.nval)); + break; + } + case VRELOCABLE: { + Instruction *pc = &getcode(fs, e); + SETARG_A(*pc, reg); + break; + } + case VNONRELOC: { + if (reg != e->u.info) + luaK_codeABC(fs, OP_MOVE, reg, e->u.info, 0); + break; + } + default: { + lua_assert(e->k == VVOID || e->k == VJMP); + return; /* nothing to do... */ + } + } + e->u.info = reg; + e->k = VNONRELOC; +} + + +static void discharge2anyreg (FuncState *fs, expdesc *e) { + if (e->k != VNONRELOC) { + luaK_reserveregs(fs, 1); + discharge2reg(fs, e, fs->freereg-1); + } +} + + +static void exp2reg (FuncState *fs, expdesc *e, int reg) { + discharge2reg(fs, e, reg); + if (e->k == VJMP) + luaK_concat(fs, &e->t, e->u.info); /* put this jump in `t' list */ + if (hasjumps(e)) { + int final; /* position after whole expression */ + int p_f = NO_JUMP; /* position of an eventual LOAD false */ + int p_t = NO_JUMP; /* position of an eventual LOAD true */ + if (need_value(fs, e->t) || need_value(fs, e->f)) { + int fj = (e->k == VJMP) ? NO_JUMP : luaK_jump(fs); + p_f = code_label(fs, reg, 0, 1); + p_t = code_label(fs, reg, 1, 0); + luaK_patchtohere(fs, fj); + } + final = luaK_getlabel(fs); + patchlistaux(fs, e->f, final, reg, p_f); + patchlistaux(fs, e->t, final, reg, p_t); + } + e->f = e->t = NO_JUMP; + e->u.info = reg; + e->k = VNONRELOC; +} + + +void luaK_exp2nextreg (FuncState *fs, expdesc *e) { + luaK_dischargevars(fs, e); + freeexp(fs, e); + luaK_reserveregs(fs, 1); + exp2reg(fs, e, fs->freereg - 1); +} + + +int luaK_exp2anyreg (FuncState *fs, expdesc *e) { + luaK_dischargevars(fs, e); + if (e->k == VNONRELOC) { + if (!hasjumps(e)) return e->u.info; /* exp is already in a register */ + if (e->u.info >= fs->nactvar) { /* reg. is not a local? */ + exp2reg(fs, e, e->u.info); /* put value on it */ + return e->u.info; + } + } + luaK_exp2nextreg(fs, e); /* default */ + return e->u.info; +} + + +void luaK_exp2anyregup (FuncState *fs, expdesc *e) { + if (e->k != VUPVAL || hasjumps(e)) + luaK_exp2anyreg(fs, e); +} + + +void luaK_exp2val (FuncState *fs, expdesc *e) { + if (hasjumps(e)) + luaK_exp2anyreg(fs, e); + else + luaK_dischargevars(fs, e); +} + + +int luaK_exp2RK (FuncState *fs, expdesc *e) { + luaK_exp2val(fs, e); + switch (e->k) { + case VTRUE: + case VFALSE: + case VNIL: { + if (fs->nk <= MAXINDEXRK) { /* constant fits in RK operand? */ + e->u.info = (e->k == VNIL) ? nilK(fs) : boolK(fs, (e->k == VTRUE)); + e->k = VK; + return RKASK(e->u.info); + } + else break; + } + case VKNUM: { + e->u.info = luaK_numberK(fs, e->u.nval); + e->k = VK; + /* go through */ + } + case VK: { + if (e->u.info <= MAXINDEXRK) /* constant fits in argC? */ + return RKASK(e->u.info); + else break; + } + default: break; + } + /* not a constant in the right range: put it in a register */ + return luaK_exp2anyreg(fs, e); +} + + +void luaK_storevar (FuncState *fs, expdesc *var, expdesc *ex) { + switch (var->k) { + case VLOCAL: { + freeexp(fs, ex); + exp2reg(fs, ex, var->u.info); + return; + } + case VUPVAL: { + int e = luaK_exp2anyreg(fs, ex); + luaK_codeABC(fs, OP_SETUPVAL, e, var->u.info, 0); + break; + } + case VINDEXED: { + OpCode op = (var->u.ind.vt == VLOCAL) ? OP_SETTABLE : OP_SETTABUP; + int e = luaK_exp2RK(fs, ex); + luaK_codeABC(fs, op, var->u.ind.t, var->u.ind.idx, e); + break; + } + default: { + lua_assert(0); /* invalid var kind to store */ + break; + } + } + freeexp(fs, ex); +} + + +void luaK_self (FuncState *fs, expdesc *e, expdesc *key) { + int ereg; + luaK_exp2anyreg(fs, e); + ereg = e->u.info; /* register where 'e' was placed */ + freeexp(fs, e); + e->u.info = fs->freereg; /* base register for op_self */ + e->k = VNONRELOC; + luaK_reserveregs(fs, 2); /* function and 'self' produced by op_self */ + luaK_codeABC(fs, OP_SELF, e->u.info, ereg, luaK_exp2RK(fs, key)); + freeexp(fs, key); +} + + +static void invertjump (FuncState *fs, expdesc *e) { + Instruction *pc = getjumpcontrol(fs, e->u.info); + lua_assert(testTMode(GET_OPCODE(*pc)) && GET_OPCODE(*pc) != OP_TESTSET && + GET_OPCODE(*pc) != OP_TEST); + SETARG_A(*pc, !(GETARG_A(*pc))); +} + + +static int jumponcond (FuncState *fs, expdesc *e, int cond) { + if (e->k == VRELOCABLE) { + Instruction ie = getcode(fs, e); + if (GET_OPCODE(ie) == OP_NOT) { + fs->pc--; /* remove previous OP_NOT */ + return condjump(fs, OP_TEST, GETARG_B(ie), 0, !cond); + } + /* else go through */ + } + discharge2anyreg(fs, e); + freeexp(fs, e); + return condjump(fs, OP_TESTSET, NO_REG, e->u.info, cond); +} + + +void luaK_goiftrue (FuncState *fs, expdesc *e) { + int pc; /* pc of last jump */ + luaK_dischargevars(fs, e); + switch (e->k) { + case VJMP: { + invertjump(fs, e); + pc = e->u.info; + break; + } + case VK: case VKNUM: case VTRUE: { + pc = NO_JUMP; /* always true; do nothing */ + break; + } + default: { + pc = jumponcond(fs, e, 0); + break; + } + } + luaK_concat(fs, &e->f, pc); /* insert last jump in `f' list */ + luaK_patchtohere(fs, e->t); + e->t = NO_JUMP; +} + + +void luaK_goiffalse (FuncState *fs, expdesc *e) { + int pc; /* pc of last jump */ + luaK_dischargevars(fs, e); + switch (e->k) { + case VJMP: { + pc = e->u.info; + break; + } + case VNIL: case VFALSE: { + pc = NO_JUMP; /* always false; do nothing */ + break; + } + default: { + pc = jumponcond(fs, e, 1); + break; + } + } + luaK_concat(fs, &e->t, pc); /* insert last jump in `t' list */ + luaK_patchtohere(fs, e->f); + e->f = NO_JUMP; +} + + +static void codenot (FuncState *fs, expdesc *e) { + luaK_dischargevars(fs, e); + switch (e->k) { + case VNIL: case VFALSE: { + e->k = VTRUE; + break; + } + case VK: case VKNUM: case VTRUE: { + e->k = VFALSE; + break; + } + case VJMP: { + invertjump(fs, e); + break; + } + case VRELOCABLE: + case VNONRELOC: { + discharge2anyreg(fs, e); + freeexp(fs, e); + e->u.info = luaK_codeABC(fs, OP_NOT, 0, e->u.info, 0); + e->k = VRELOCABLE; + break; + } + default: { + lua_assert(0); /* cannot happen */ + break; + } + } + /* interchange true and false lists */ + { int temp = e->f; e->f = e->t; e->t = temp; } + removevalues(fs, e->f); + removevalues(fs, e->t); +} + + +void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k) { + lua_assert(!hasjumps(t)); + t->u.ind.t = t->u.info; + t->u.ind.idx = luaK_exp2RK(fs, k); + t->u.ind.vt = (t->k == VUPVAL) ? VUPVAL + : check_exp(vkisinreg(t->k), VLOCAL); + t->k = VINDEXED; +} + + +static int constfolding (OpCode op, expdesc *e1, expdesc *e2) { + lua_Number r; + if (!isnumeral(e1) || !isnumeral(e2)) return 0; + if ((op == OP_DIV || op == OP_MOD) && e2->u.nval == 0) + return 0; /* do not attempt to divide by 0 */ + r = luaO_arith(op - OP_ADD + LUA_OPADD, e1->u.nval, e2->u.nval); + e1->u.nval = r; + return 1; +} + + +static void codearith (FuncState *fs, OpCode op, + expdesc *e1, expdesc *e2, int line) { + if (constfolding(op, e1, e2)) + return; + else { + int o2 = (op != OP_UNM && op != OP_LEN) ? luaK_exp2RK(fs, e2) : 0; + int o1 = luaK_exp2RK(fs, e1); + if (o1 > o2) { + freeexp(fs, e1); + freeexp(fs, e2); + } + else { + freeexp(fs, e2); + freeexp(fs, e1); + } + e1->u.info = luaK_codeABC(fs, op, 0, o1, o2); + e1->k = VRELOCABLE; + luaK_fixline(fs, line); + } +} + + +static void codecomp (FuncState *fs, OpCode op, int cond, expdesc *e1, + expdesc *e2) { + int o1 = luaK_exp2RK(fs, e1); + int o2 = luaK_exp2RK(fs, e2); + freeexp(fs, e2); + freeexp(fs, e1); + if (cond == 0 && op != OP_EQ) { + int temp; /* exchange args to replace by `<' or `<=' */ + temp = o1; o1 = o2; o2 = temp; /* o1 <==> o2 */ + cond = 1; + } + e1->u.info = condjump(fs, op, cond, o1, o2); + e1->k = VJMP; +} + + +void luaK_prefix (FuncState *fs, UnOpr op, expdesc *e, int line) { + expdesc e2; + e2.t = e2.f = NO_JUMP; e2.k = VKNUM; e2.u.nval = 0; + switch (op) { + case OPR_MINUS: { + if (isnumeral(e)) /* minus constant? */ + e->u.nval = luai_numunm(NULL, e->u.nval); /* fold it */ + else { + luaK_exp2anyreg(fs, e); + codearith(fs, OP_UNM, e, &e2, line); + } + break; + } + case OPR_NOT: codenot(fs, e); break; + case OPR_LEN: { + luaK_exp2anyreg(fs, e); /* cannot operate on constants */ + codearith(fs, OP_LEN, e, &e2, line); + break; + } + default: lua_assert(0); + } +} + + +void luaK_infix (FuncState *fs, BinOpr op, expdesc *v) { + switch (op) { + case OPR_AND: { + luaK_goiftrue(fs, v); + break; + } + case OPR_OR: { + luaK_goiffalse(fs, v); + break; + } + case OPR_CONCAT: { + luaK_exp2nextreg(fs, v); /* operand must be on the `stack' */ + break; + } + case OPR_ADD: case OPR_SUB: case OPR_MUL: case OPR_DIV: + case OPR_MOD: case OPR_POW: { + if (!isnumeral(v)) luaK_exp2RK(fs, v); + break; + } + default: { + luaK_exp2RK(fs, v); + break; + } + } +} + + +void luaK_posfix (FuncState *fs, BinOpr op, + expdesc *e1, expdesc *e2, int line) { + switch (op) { + case OPR_AND: { + lua_assert(e1->t == NO_JUMP); /* list must be closed */ + luaK_dischargevars(fs, e2); + luaK_concat(fs, &e2->f, e1->f); + *e1 = *e2; + break; + } + case OPR_OR: { + lua_assert(e1->f == NO_JUMP); /* list must be closed */ + luaK_dischargevars(fs, e2); + luaK_concat(fs, &e2->t, e1->t); + *e1 = *e2; + break; + } + case OPR_CONCAT: { + luaK_exp2val(fs, e2); + if (e2->k == VRELOCABLE && GET_OPCODE(getcode(fs, e2)) == OP_CONCAT) { + lua_assert(e1->u.info == GETARG_B(getcode(fs, e2))-1); + freeexp(fs, e1); + SETARG_B(getcode(fs, e2), e1->u.info); + e1->k = VRELOCABLE; e1->u.info = e2->u.info; + } + else { + luaK_exp2nextreg(fs, e2); /* operand must be on the 'stack' */ + codearith(fs, OP_CONCAT, e1, e2, line); + } + break; + } + case OPR_ADD: case OPR_SUB: case OPR_MUL: case OPR_DIV: + case OPR_MOD: case OPR_POW: { + codearith(fs, cast(OpCode, op - OPR_ADD + OP_ADD), e1, e2, line); + break; + } + case OPR_EQ: case OPR_LT: case OPR_LE: { + codecomp(fs, cast(OpCode, op - OPR_EQ + OP_EQ), 1, e1, e2); + break; + } + case OPR_NE: case OPR_GT: case OPR_GE: { + codecomp(fs, cast(OpCode, op - OPR_NE + OP_EQ), 0, e1, e2); + break; + } + default: lua_assert(0); + } +} + + +void luaK_fixline (FuncState *fs, int line) { + fs->f->lineinfo[fs->pc - 1] = line; +} + + +void luaK_setlist (FuncState *fs, int base, int nelems, int tostore) { + int c = (nelems - 1)/LFIELDS_PER_FLUSH + 1; + int b = (tostore == LUA_MULTRET) ? 0 : tostore; + lua_assert(tostore != 0); + if (c <= MAXARG_C) + luaK_codeABC(fs, OP_SETLIST, base, b, c); + else if (c <= MAXARG_Ax) { + luaK_codeABC(fs, OP_SETLIST, base, b, 0); + codeextraarg(fs, c); + } + else + luaX_syntaxerror(fs->ls, "constructor too long"); + fs->freereg = base + 1; /* free registers with list values */ +} + diff --git a/radio/src/lua/src/lcode.h b/radio/src/lua/src/lcode.h new file mode 100644 index 000000000..5a1fa9fea --- /dev/null +++ b/radio/src/lua/src/lcode.h @@ -0,0 +1,83 @@ +/* +** $Id: lcode.h,v 1.58 2011/08/30 16:26:41 roberto Exp $ +** Code generator for Lua +** See Copyright Notice in lua.h +*/ + +#ifndef lcode_h +#define lcode_h + +#include "llex.h" +#include "lobject.h" +#include "lopcodes.h" +#include "lparser.h" + + +/* +** Marks the end of a patch list. It is an invalid value both as an absolute +** address, and as a list link (would link an element to itself). +*/ +#define NO_JUMP (-1) + + +/* +** grep "ORDER OPR" if you change these enums (ORDER OP) +*/ +typedef enum BinOpr { + OPR_ADD, OPR_SUB, OPR_MUL, OPR_DIV, OPR_MOD, OPR_POW, + OPR_CONCAT, + OPR_EQ, OPR_LT, OPR_LE, + OPR_NE, OPR_GT, OPR_GE, + OPR_AND, OPR_OR, + OPR_NOBINOPR +} BinOpr; + + +typedef enum UnOpr { OPR_MINUS, OPR_NOT, OPR_LEN, OPR_NOUNOPR } UnOpr; + + +#define getcode(fs,e) ((fs)->f->code[(e)->u.info]) + +#define luaK_codeAsBx(fs,o,A,sBx) luaK_codeABx(fs,o,A,(sBx)+MAXARG_sBx) + +#define luaK_setmultret(fs,e) luaK_setreturns(fs, e, LUA_MULTRET) + +#define luaK_jumpto(fs,t) luaK_patchlist(fs, luaK_jump(fs), t) + +LUAI_FUNC int luaK_codeABx (FuncState *fs, OpCode o, int A, unsigned int Bx); +LUAI_FUNC int luaK_codeABC (FuncState *fs, OpCode o, int A, int B, int C); +LUAI_FUNC int luaK_codek (FuncState *fs, int reg, int k); +LUAI_FUNC void luaK_fixline (FuncState *fs, int line); +LUAI_FUNC void luaK_nil (FuncState *fs, int from, int n); +LUAI_FUNC void luaK_reserveregs (FuncState *fs, int n); +LUAI_FUNC void luaK_checkstack (FuncState *fs, int n); +LUAI_FUNC int luaK_stringK (FuncState *fs, TString *s); +LUAI_FUNC int luaK_numberK (FuncState *fs, lua_Number r); +LUAI_FUNC void luaK_dischargevars (FuncState *fs, expdesc *e); +LUAI_FUNC int luaK_exp2anyreg (FuncState *fs, expdesc *e); +LUAI_FUNC void luaK_exp2anyregup (FuncState *fs, expdesc *e); +LUAI_FUNC void luaK_exp2nextreg (FuncState *fs, expdesc *e); +LUAI_FUNC void luaK_exp2val (FuncState *fs, expdesc *e); +LUAI_FUNC int luaK_exp2RK (FuncState *fs, expdesc *e); +LUAI_FUNC void luaK_self (FuncState *fs, expdesc *e, expdesc *key); +LUAI_FUNC void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k); +LUAI_FUNC void luaK_goiftrue (FuncState *fs, expdesc *e); +LUAI_FUNC void luaK_goiffalse (FuncState *fs, expdesc *e); +LUAI_FUNC void luaK_storevar (FuncState *fs, expdesc *var, expdesc *e); +LUAI_FUNC void luaK_setreturns (FuncState *fs, expdesc *e, int nresults); +LUAI_FUNC void luaK_setoneret (FuncState *fs, expdesc *e); +LUAI_FUNC int luaK_jump (FuncState *fs); +LUAI_FUNC void luaK_ret (FuncState *fs, int first, int nret); +LUAI_FUNC void luaK_patchlist (FuncState *fs, int list, int target); +LUAI_FUNC void luaK_patchtohere (FuncState *fs, int list); +LUAI_FUNC void luaK_patchclose (FuncState *fs, int list, int level); +LUAI_FUNC void luaK_concat (FuncState *fs, int *l1, int l2); +LUAI_FUNC int luaK_getlabel (FuncState *fs); +LUAI_FUNC void luaK_prefix (FuncState *fs, UnOpr op, expdesc *v, int line); +LUAI_FUNC void luaK_infix (FuncState *fs, BinOpr op, expdesc *v); +LUAI_FUNC void luaK_posfix (FuncState *fs, BinOpr op, expdesc *v1, + expdesc *v2, int line); +LUAI_FUNC void luaK_setlist (FuncState *fs, int base, int nelems, int tostore); + + +#endif diff --git a/radio/src/lua/src/lcorolib.c b/radio/src/lua/src/lcorolib.c new file mode 100644 index 000000000..e2f601eb6 --- /dev/null +++ b/radio/src/lua/src/lcorolib.c @@ -0,0 +1,154 @@ +/* +** $Id: lcorolib.c,v 1.5 2013/02/21 13:44:53 roberto Exp $ +** Coroutine Library +** See Copyright Notice in lua.h +*/ + + +#include + + +#define lcorolib_c + +#include "lua.h" + +#include "lauxlib.h" +#include "lualib.h" + + +static int auxresume (lua_State *L, lua_State *co, int narg) { + int status; + if (!lua_checkstack(co, narg)) { + lua_pushliteral(L, "too many arguments to resume"); + return -1; /* error flag */ + } + if (lua_status(co) == LUA_OK && lua_gettop(co) == 0) { + lua_pushliteral(L, "cannot resume dead coroutine"); + return -1; /* error flag */ + } + lua_xmove(L, co, narg); + status = lua_resume(co, L, narg); + if (status == LUA_OK || status == LUA_YIELD) { + int nres = lua_gettop(co); + if (!lua_checkstack(L, nres + 1)) { + lua_pop(co, nres); /* remove results anyway */ + lua_pushliteral(L, "too many results to resume"); + return -1; /* error flag */ + } + lua_xmove(co, L, nres); /* move yielded values */ + return nres; + } + else { + lua_xmove(co, L, 1); /* move error message */ + return -1; /* error flag */ + } +} + + +static int luaB_coresume (lua_State *L) { + lua_State *co = lua_tothread(L, 1); + int r; + luaL_argcheck(L, co, 1, "coroutine expected"); + r = auxresume(L, co, lua_gettop(L) - 1); + if (r < 0) { + lua_pushboolean(L, 0); + lua_insert(L, -2); + return 2; /* return false + error message */ + } + else { + lua_pushboolean(L, 1); + lua_insert(L, -(r + 1)); + return r + 1; /* return true + `resume' returns */ + } +} + + +static int luaB_auxwrap (lua_State *L) { + lua_State *co = lua_tothread(L, lua_upvalueindex(1)); + int r = auxresume(L, co, lua_gettop(L)); + if (r < 0) { + if (lua_isstring(L, -1)) { /* error object is a string? */ + luaL_where(L, 1); /* add extra info */ + lua_insert(L, -2); + lua_concat(L, 2); + } + return lua_error(L); /* propagate error */ + } + return r; +} + + +static int luaB_cocreate (lua_State *L) { + lua_State *NL; + luaL_checktype(L, 1, LUA_TFUNCTION); + NL = lua_newthread(L); + lua_pushvalue(L, 1); /* move function to top */ + lua_xmove(L, NL, 1); /* move function from L to NL */ + return 1; +} + + +static int luaB_cowrap (lua_State *L) { + luaB_cocreate(L); + lua_pushcclosure(L, luaB_auxwrap, 1); + return 1; +} + + +static int luaB_yield (lua_State *L) { + return lua_yield(L, lua_gettop(L)); +} + + +static int luaB_costatus (lua_State *L) { + lua_State *co = lua_tothread(L, 1); + luaL_argcheck(L, co, 1, "coroutine expected"); + if (L == co) lua_pushliteral(L, "running"); + else { + switch (lua_status(co)) { + case LUA_YIELD: + lua_pushliteral(L, "suspended"); + break; + case LUA_OK: { + lua_Debug ar; + if (lua_getstack(co, 0, &ar) > 0) /* does it have frames? */ + lua_pushliteral(L, "normal"); /* it is running */ + else if (lua_gettop(co) == 0) + lua_pushliteral(L, "dead"); + else + lua_pushliteral(L, "suspended"); /* initial state */ + break; + } + default: /* some error occurred */ + lua_pushliteral(L, "dead"); + break; + } + } + return 1; +} + + +static int luaB_corunning (lua_State *L) { + int ismain = lua_pushthread(L); + lua_pushboolean(L, ismain); + return 2; +} + + +static const luaL_Reg co_funcs[] = { + {"create", luaB_cocreate}, + {"resume", luaB_coresume}, + {"running", luaB_corunning}, + {"status", luaB_costatus}, + {"wrap", luaB_cowrap}, + {"yield", luaB_yield}, + {NULL, NULL} +}; + + + +LUAMOD_API int luaopen_coroutine (lua_State *L) { + luaL_newlib(L, co_funcs); + return 1; +} + diff --git a/radio/src/lua/src/lctype.c b/radio/src/lua/src/lctype.c new file mode 100644 index 000000000..55e433a5d --- /dev/null +++ b/radio/src/lua/src/lctype.c @@ -0,0 +1,52 @@ +/* +** $Id: lctype.c,v 1.11 2011/10/03 16:19:23 roberto Exp $ +** 'ctype' functions for Lua +** See Copyright Notice in lua.h +*/ + +#define lctype_c +#define LUA_CORE + +#include "lctype.h" + +#if !LUA_USE_CTYPE /* { */ + +#include + +LUAI_DDEF const lu_byte luai_ctype_[UCHAR_MAX + 2] = { + 0x00, /* EOZ */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0. */ + 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 1. */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0c, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, /* 2. */ + 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, + 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, /* 3. */ + 0x16, 0x16, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, + 0x04, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x05, /* 4. */ + 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, + 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, /* 5. */ + 0x05, 0x05, 0x05, 0x04, 0x04, 0x04, 0x04, 0x05, + 0x04, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x05, /* 6. */ + 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, + 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, /* 7. */ + 0x05, 0x05, 0x05, 0x04, 0x04, 0x04, 0x04, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 8. */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 9. */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* a. */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* b. */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* c. */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* d. */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* e. */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* f. */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; + +#endif /* } */ diff --git a/radio/src/lua/src/lctype.h b/radio/src/lua/src/lctype.h new file mode 100644 index 000000000..99c7d1223 --- /dev/null +++ b/radio/src/lua/src/lctype.h @@ -0,0 +1,95 @@ +/* +** $Id: lctype.h,v 1.12 2011/07/15 12:50:29 roberto Exp $ +** 'ctype' functions for Lua +** See Copyright Notice in lua.h +*/ + +#ifndef lctype_h +#define lctype_h + +#include "lua.h" + + +/* +** WARNING: the functions defined here do not necessarily correspond +** to the similar functions in the standard C ctype.h. They are +** optimized for the specific needs of Lua +*/ + +#if !defined(LUA_USE_CTYPE) + +#if 'A' == 65 && '0' == 48 +/* ASCII case: can use its own tables; faster and fixed */ +#define LUA_USE_CTYPE 0 +#else +/* must use standard C ctype */ +#define LUA_USE_CTYPE 1 +#endif + +#endif + + +#if !LUA_USE_CTYPE /* { */ + +#include + +#include "llimits.h" + + +#define ALPHABIT 0 +#define DIGITBIT 1 +#define PRINTBIT 2 +#define SPACEBIT 3 +#define XDIGITBIT 4 + + +#define MASK(B) (1 << (B)) + + +/* +** add 1 to char to allow index -1 (EOZ) +*/ +#define testprop(c,p) (luai_ctype_[(c)+1] & (p)) + +/* +** 'lalpha' (Lua alphabetic) and 'lalnum' (Lua alphanumeric) both include '_' +*/ +#define lislalpha(c) testprop(c, MASK(ALPHABIT)) +#define lislalnum(c) testprop(c, (MASK(ALPHABIT) | MASK(DIGITBIT))) +#define lisdigit(c) testprop(c, MASK(DIGITBIT)) +#define lisspace(c) testprop(c, MASK(SPACEBIT)) +#define lisprint(c) testprop(c, MASK(PRINTBIT)) +#define lisxdigit(c) testprop(c, MASK(XDIGITBIT)) + +/* +** this 'ltolower' only works for alphabetic characters +*/ +#define ltolower(c) ((c) | ('A' ^ 'a')) + + +/* two more entries for 0 and -1 (EOZ) */ +LUAI_DDEC const lu_byte luai_ctype_[UCHAR_MAX + 2]; + + +#else /* }{ */ + +/* +** use standard C ctypes +*/ + +#include + + +#define lislalpha(c) (isalpha(c) || (c) == '_') +#define lislalnum(c) (isalnum(c) || (c) == '_') +#define lisdigit(c) (isdigit(c)) +#define lisspace(c) (isspace(c)) +#define lisprint(c) (isprint(c)) +#define lisxdigit(c) (isxdigit(c)) + +#define ltolower(c) (tolower(c)) + +#endif /* } */ + +#endif + diff --git a/radio/src/lua/src/ldblib.c b/radio/src/lua/src/ldblib.c new file mode 100644 index 000000000..596d10d30 --- /dev/null +++ b/radio/src/lua/src/ldblib.c @@ -0,0 +1,396 @@ +/* +** $Id: ldblib.c,v 1.132 2012/01/19 20:14:44 roberto Exp $ +** Interface from Lua to its debug API +** See Copyright Notice in lua.h +*/ + + +#include +#include + +#define ldblib_c + +#include "lua.h" + +#include "lauxlib.h" +#include "lualib.h" + + +#define HOOKKEY "_HKEY" + + + +static int db_getregistry (lua_State *L) { + lua_pushvalue(L, LUA_REGISTRYINDEX); + return 1; +} + + +static int db_getmetatable (lua_State *L) { + luaL_checkany(L, 1); + if (!lua_getmetatable(L, 1)) { + lua_pushnil(L); /* no metatable */ + } + return 1; +} + + +static int db_setmetatable (lua_State *L) { + int t = lua_type(L, 2); + luaL_argcheck(L, t == LUA_TNIL || t == LUA_TTABLE, 2, + "nil or table expected"); + lua_settop(L, 2); + lua_setmetatable(L, 1); + return 1; /* return 1st argument */ +} + + +static int db_getuservalue (lua_State *L) { + if (lua_type(L, 1) != LUA_TUSERDATA) + lua_pushnil(L); + else + lua_getuservalue(L, 1); + return 1; +} + + +static int db_setuservalue (lua_State *L) { + if (lua_type(L, 1) == LUA_TLIGHTUSERDATA) + luaL_argerror(L, 1, "full userdata expected, got light userdata"); + luaL_checktype(L, 1, LUA_TUSERDATA); + if (!lua_isnoneornil(L, 2)) + luaL_checktype(L, 2, LUA_TTABLE); + lua_settop(L, 2); + lua_setuservalue(L, 1); + return 1; +} + + +static void settabss (lua_State *L, const char *i, const char *v) { + lua_pushstring(L, v); + lua_setfield(L, -2, i); +} + + +static void settabsi (lua_State *L, const char *i, int v) { + lua_pushinteger(L, v); + lua_setfield(L, -2, i); +} + + +static void settabsb (lua_State *L, const char *i, int v) { + lua_pushboolean(L, v); + lua_setfield(L, -2, i); +} + + +static lua_State *getthread (lua_State *L, int *arg) { + if (lua_isthread(L, 1)) { + *arg = 1; + return lua_tothread(L, 1); + } + else { + *arg = 0; + return L; + } +} + + +static void treatstackoption (lua_State *L, lua_State *L1, const char *fname) { + if (L == L1) { + lua_pushvalue(L, -2); + lua_remove(L, -3); + } + else + lua_xmove(L1, L, 1); + lua_setfield(L, -2, fname); +} + + +static int db_getinfo (lua_State *L) { + lua_Debug ar; + int arg; + lua_State *L1 = getthread(L, &arg); + const char *options = luaL_optstring(L, arg+2, "flnStu"); + if (lua_isnumber(L, arg+1)) { + if (!lua_getstack(L1, (int)lua_tointeger(L, arg+1), &ar)) { + lua_pushnil(L); /* level out of range */ + return 1; + } + } + else if (lua_isfunction(L, arg+1)) { + lua_pushfstring(L, ">%s", options); + options = lua_tostring(L, -1); + lua_pushvalue(L, arg+1); + lua_xmove(L, L1, 1); + } + else + return luaL_argerror(L, arg+1, "function or level expected"); + if (!lua_getinfo(L1, options, &ar)) + return luaL_argerror(L, arg+2, "invalid option"); + lua_createtable(L, 0, 2); + if (strchr(options, 'S')) { + settabss(L, "source", ar.source); + settabss(L, "short_src", ar.short_src); + settabsi(L, "linedefined", ar.linedefined); + settabsi(L, "lastlinedefined", ar.lastlinedefined); + settabss(L, "what", ar.what); + } + if (strchr(options, 'l')) + settabsi(L, "currentline", ar.currentline); + if (strchr(options, 'u')) { + settabsi(L, "nups", ar.nups); + settabsi(L, "nparams", ar.nparams); + settabsb(L, "isvararg", ar.isvararg); + } + if (strchr(options, 'n')) { + settabss(L, "name", ar.name); + settabss(L, "namewhat", ar.namewhat); + } + if (strchr(options, 't')) + settabsb(L, "istailcall", ar.istailcall); + if (strchr(options, 'L')) + treatstackoption(L, L1, "activelines"); + if (strchr(options, 'f')) + treatstackoption(L, L1, "func"); + return 1; /* return table */ +} + + +static int db_getlocal (lua_State *L) { + int arg; + lua_State *L1 = getthread(L, &arg); + lua_Debug ar; + const char *name; + int nvar = luaL_checkint(L, arg+2); /* local-variable index */ + if (lua_isfunction(L, arg + 1)) { /* function argument? */ + lua_pushvalue(L, arg + 1); /* push function */ + lua_pushstring(L, lua_getlocal(L, NULL, nvar)); /* push local name */ + return 1; + } + else { /* stack-level argument */ + if (!lua_getstack(L1, luaL_checkint(L, arg+1), &ar)) /* out of range? */ + return luaL_argerror(L, arg+1, "level out of range"); + name = lua_getlocal(L1, &ar, nvar); + if (name) { + lua_xmove(L1, L, 1); /* push local value */ + lua_pushstring(L, name); /* push name */ + lua_pushvalue(L, -2); /* re-order */ + return 2; + } + else { + lua_pushnil(L); /* no name (nor value) */ + return 1; + } + } +} + + +static int db_setlocal (lua_State *L) { + int arg; + lua_State *L1 = getthread(L, &arg); + lua_Debug ar; + if (!lua_getstack(L1, luaL_checkint(L, arg+1), &ar)) /* out of range? */ + return luaL_argerror(L, arg+1, "level out of range"); + luaL_checkany(L, arg+3); + lua_settop(L, arg+3); + lua_xmove(L, L1, 1); + lua_pushstring(L, lua_setlocal(L1, &ar, luaL_checkint(L, arg+2))); + return 1; +} + + +static int auxupvalue (lua_State *L, int get) { + const char *name; + int n = luaL_checkint(L, 2); + luaL_checktype(L, 1, LUA_TFUNCTION); + name = get ? lua_getupvalue(L, 1, n) : lua_setupvalue(L, 1, n); + if (name == NULL) return 0; + lua_pushstring(L, name); + lua_insert(L, -(get+1)); + return get + 1; +} + + +static int db_getupvalue (lua_State *L) { + return auxupvalue(L, 1); +} + + +static int db_setupvalue (lua_State *L) { + luaL_checkany(L, 3); + return auxupvalue(L, 0); +} + + +static int checkupval (lua_State *L, int argf, int argnup) { + lua_Debug ar; + int nup = luaL_checkint(L, argnup); + luaL_checktype(L, argf, LUA_TFUNCTION); + lua_pushvalue(L, argf); + lua_getinfo(L, ">u", &ar); + luaL_argcheck(L, 1 <= nup && nup <= ar.nups, argnup, "invalid upvalue index"); + return nup; +} + + +static int db_upvalueid (lua_State *L) { + int n = checkupval(L, 1, 2); + lua_pushlightuserdata(L, lua_upvalueid(L, 1, n)); + return 1; +} + + +static int db_upvaluejoin (lua_State *L) { + int n1 = checkupval(L, 1, 2); + int n2 = checkupval(L, 3, 4); + luaL_argcheck(L, !lua_iscfunction(L, 1), 1, "Lua function expected"); + luaL_argcheck(L, !lua_iscfunction(L, 3), 3, "Lua function expected"); + lua_upvaluejoin(L, 1, n1, 3, n2); + return 0; +} + + +#define gethooktable(L) luaL_getsubtable(L, LUA_REGISTRYINDEX, HOOKKEY) + + +static void hookf (lua_State *L, lua_Debug *ar) { + static const char *const hooknames[] = + {"call", "return", "line", "count", "tail call"}; + gethooktable(L); + lua_pushthread(L); + lua_rawget(L, -2); + if (lua_isfunction(L, -1)) { + lua_pushstring(L, hooknames[(int)ar->event]); + if (ar->currentline >= 0) + lua_pushinteger(L, ar->currentline); + else lua_pushnil(L); + lua_assert(lua_getinfo(L, "lS", ar)); + lua_call(L, 2, 0); + } +} + + +static int makemask (const char *smask, int count) { + int mask = 0; + if (strchr(smask, 'c')) mask |= LUA_MASKCALL; + if (strchr(smask, 'r')) mask |= LUA_MASKRET; + if (strchr(smask, 'l')) mask |= LUA_MASKLINE; + if (count > 0) mask |= LUA_MASKCOUNT; + return mask; +} + + +static char *unmakemask (int mask, char *smask) { + int i = 0; + if (mask & LUA_MASKCALL) smask[i++] = 'c'; + if (mask & LUA_MASKRET) smask[i++] = 'r'; + if (mask & LUA_MASKLINE) smask[i++] = 'l'; + smask[i] = '\0'; + return smask; +} + + +static int db_sethook (lua_State *L) { + int arg, mask, count; + lua_Hook func; + lua_State *L1 = getthread(L, &arg); + if (lua_isnoneornil(L, arg+1)) { + lua_settop(L, arg+1); + func = NULL; mask = 0; count = 0; /* turn off hooks */ + } + else { + const char *smask = luaL_checkstring(L, arg+2); + luaL_checktype(L, arg+1, LUA_TFUNCTION); + count = luaL_optint(L, arg+3, 0); + func = hookf; mask = makemask(smask, count); + } + if (gethooktable(L) == 0) { /* creating hook table? */ + lua_pushstring(L, "k"); + lua_setfield(L, -2, "__mode"); /** hooktable.__mode = "k" */ + lua_pushvalue(L, -1); + lua_setmetatable(L, -2); /* setmetatable(hooktable) = hooktable */ + } + lua_pushthread(L1); lua_xmove(L1, L, 1); + lua_pushvalue(L, arg+1); + lua_rawset(L, -3); /* set new hook */ + lua_sethook(L1, func, mask, count); /* set hooks */ + return 0; +} + + +static int db_gethook (lua_State *L) { + int arg; + lua_State *L1 = getthread(L, &arg); + char buff[5]; + int mask = lua_gethookmask(L1); + lua_Hook hook = lua_gethook(L1); + if (hook != NULL && hook != hookf) /* external hook? */ + lua_pushliteral(L, "external hook"); + else { + gethooktable(L); + lua_pushthread(L1); lua_xmove(L1, L, 1); + lua_rawget(L, -2); /* get hook */ + lua_remove(L, -2); /* remove hook table */ + } + lua_pushstring(L, unmakemask(mask, buff)); + lua_pushinteger(L, lua_gethookcount(L1)); + return 3; +} + + +static int db_debug (lua_State *L) { + for (;;) { + char buffer[250]; + luai_writestringerror("%s", "lua_debug> "); + if (fgets(buffer, sizeof(buffer), stdin) == 0 || + strcmp(buffer, "cont\n") == 0) + return 0; + if (luaL_loadbuffer(L, buffer, strlen(buffer), "=(debug command)") || + lua_pcall(L, 0, 0, 0)) + luai_writestringerror("%s\n", lua_tostring(L, -1)); + lua_settop(L, 0); /* remove eventual returns */ + } +} + + +static int db_traceback (lua_State *L) { + int arg; + lua_State *L1 = getthread(L, &arg); + const char *msg = lua_tostring(L, arg + 1); + if (msg == NULL && !lua_isnoneornil(L, arg + 1)) /* non-string 'msg'? */ + lua_pushvalue(L, arg + 1); /* return it untouched */ + else { + int level = luaL_optint(L, arg + 2, (L == L1) ? 1 : 0); + luaL_traceback(L, L1, msg, level); + } + return 1; +} + + +static const luaL_Reg dblib[] = { + {"debug", db_debug}, + {"getuservalue", db_getuservalue}, + {"gethook", db_gethook}, + {"getinfo", db_getinfo}, + {"getlocal", db_getlocal}, + {"getregistry", db_getregistry}, + {"getmetatable", db_getmetatable}, + {"getupvalue", db_getupvalue}, + {"upvaluejoin", db_upvaluejoin}, + {"upvalueid", db_upvalueid}, + {"setuservalue", db_setuservalue}, + {"sethook", db_sethook}, + {"setlocal", db_setlocal}, + {"setmetatable", db_setmetatable}, + {"setupvalue", db_setupvalue}, + {"traceback", db_traceback}, + {NULL, NULL} +}; + + +LUAMOD_API int luaopen_debug (lua_State *L) { + luaL_newlib(L, dblib); + return 1; +} + diff --git a/radio/src/lua/src/ldebug.c b/radio/src/lua/src/ldebug.c new file mode 100644 index 000000000..7e04f9d09 --- /dev/null +++ b/radio/src/lua/src/ldebug.c @@ -0,0 +1,580 @@ +/* +** $Id: ldebug.c,v 2.90 2012/08/16 17:34:28 roberto Exp $ +** Debug Interface +** See Copyright Notice in lua.h +*/ + + +#include +#include +#include + + +#define ldebug_c +#define LUA_CORE + +#include "lua.h" + +#include "lapi.h" +#include "lcode.h" +#include "ldebug.h" +#include "ldo.h" +#include "lfunc.h" +#include "lobject.h" +#include "lopcodes.h" +#include "lstate.h" +#include "lstring.h" +#include "ltable.h" +#include "ltm.h" +#include "lvm.h" + + + +#define noLuaClosure(f) ((f) == NULL || (f)->c.tt == LUA_TCCL) + + +static const char *getfuncname (lua_State *L, CallInfo *ci, const char **name); + + +static int currentpc (CallInfo *ci) { + lua_assert(isLua(ci)); + return pcRel(ci->u.l.savedpc, ci_func(ci)->p); +} + + +static int currentline (CallInfo *ci) { + return getfuncline(ci_func(ci)->p, currentpc(ci)); +} + + +/* +** this function can be called asynchronous (e.g. during a signal) +*/ +LUA_API int lua_sethook (lua_State *L, lua_Hook func, int mask, int count) { + if (func == NULL || mask == 0) { /* turn off hooks? */ + mask = 0; + func = NULL; + } + if (isLua(L->ci)) + L->oldpc = L->ci->u.l.savedpc; + L->hook = func; + L->basehookcount = count; + resethookcount(L); + L->hookmask = cast_byte(mask); + return 1; +} + + +LUA_API lua_Hook lua_gethook (lua_State *L) { + return L->hook; +} + + +LUA_API int lua_gethookmask (lua_State *L) { + return L->hookmask; +} + + +LUA_API int lua_gethookcount (lua_State *L) { + return L->basehookcount; +} + + +LUA_API int lua_getstack (lua_State *L, int level, lua_Debug *ar) { + int status; + CallInfo *ci; + if (level < 0) return 0; /* invalid (negative) level */ + lua_lock(L); + for (ci = L->ci; level > 0 && ci != &L->base_ci; ci = ci->previous) + level--; + if (level == 0 && ci != &L->base_ci) { /* level found? */ + status = 1; + ar->i_ci = ci; + } + else status = 0; /* no such level */ + lua_unlock(L); + return status; +} + + +static const char *upvalname (Proto *p, int uv) { + TString *s = check_exp(uv < p->sizeupvalues, p->upvalues[uv].name); + if (s == NULL) return "?"; + else return getstr(s); +} + + +static const char *findvararg (CallInfo *ci, int n, StkId *pos) { + int nparams = clLvalue(ci->func)->p->numparams; + if (n >= ci->u.l.base - ci->func - nparams) + return NULL; /* no such vararg */ + else { + *pos = ci->func + nparams + n; + return "(*vararg)"; /* generic name for any vararg */ + } +} + + +static const char *findlocal (lua_State *L, CallInfo *ci, int n, + StkId *pos) { + const char *name = NULL; + StkId base; + if (isLua(ci)) { + if (n < 0) /* access to vararg values? */ + return findvararg(ci, -n, pos); + else { + base = ci->u.l.base; + name = luaF_getlocalname(ci_func(ci)->p, n, currentpc(ci)); + } + } + else + base = ci->func + 1; + if (name == NULL) { /* no 'standard' name? */ + StkId limit = (ci == L->ci) ? L->top : ci->next->func; + if (limit - base >= n && n > 0) /* is 'n' inside 'ci' stack? */ + name = "(*temporary)"; /* generic name for any valid slot */ + else + return NULL; /* no name */ + } + *pos = base + (n - 1); + return name; +} + + +LUA_API const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n) { + const char *name; + lua_lock(L); + if (ar == NULL) { /* information about non-active function? */ + if (!isLfunction(L->top - 1)) /* not a Lua function? */ + name = NULL; + else /* consider live variables at function start (parameters) */ + name = luaF_getlocalname(clLvalue(L->top - 1)->p, n, 0); + } + else { /* active function; get information through 'ar' */ + StkId pos = 0; /* to avoid warnings */ + name = findlocal(L, ar->i_ci, n, &pos); + if (name) { + setobj2s(L, L->top, pos); + api_incr_top(L); + } + } + lua_unlock(L); + return name; +} + + +LUA_API const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n) { + StkId pos = 0; /* to avoid warnings */ + const char *name = findlocal(L, ar->i_ci, n, &pos); + lua_lock(L); + if (name) + setobjs2s(L, pos, L->top - 1); + L->top--; /* pop value */ + lua_unlock(L); + return name; +} + + +static void funcinfo (lua_Debug *ar, Closure *cl) { + if (noLuaClosure(cl)) { + ar->source = "=[C]"; + ar->linedefined = -1; + ar->lastlinedefined = -1; + ar->what = "C"; + } + else { + Proto *p = cl->l.p; + ar->source = p->source ? getstr(p->source) : "=?"; + ar->linedefined = p->linedefined; + ar->lastlinedefined = p->lastlinedefined; + ar->what = (ar->linedefined == 0) ? "main" : "Lua"; + } + luaO_chunkid(ar->short_src, ar->source, LUA_IDSIZE); +} + + +static void collectvalidlines (lua_State *L, Closure *f) { + if (noLuaClosure(f)) { + setnilvalue(L->top); + api_incr_top(L); + } + else { + int i; + TValue v; + int *lineinfo = f->l.p->lineinfo; + Table *t = luaH_new(L); /* new table to store active lines */ + sethvalue(L, L->top, t); /* push it on stack */ + api_incr_top(L); + setbvalue(&v, 1); /* boolean 'true' to be the value of all indices */ + for (i = 0; i < f->l.p->sizelineinfo; i++) /* for all lines with code */ + luaH_setint(L, t, lineinfo[i], &v); /* table[line] = true */ + } +} + + +static int auxgetinfo (lua_State *L, const char *what, lua_Debug *ar, + Closure *f, CallInfo *ci) { + int status = 1; + for (; *what; what++) { + switch (*what) { + case 'S': { + funcinfo(ar, f); + break; + } + case 'l': { + ar->currentline = (ci && isLua(ci)) ? currentline(ci) : -1; + break; + } + case 'u': { + ar->nups = (f == NULL) ? 0 : f->c.nupvalues; + if (noLuaClosure(f)) { + ar->isvararg = 1; + ar->nparams = 0; + } + else { + ar->isvararg = f->l.p->is_vararg; + ar->nparams = f->l.p->numparams; + } + break; + } + case 't': { + ar->istailcall = (ci) ? ci->callstatus & CIST_TAIL : 0; + break; + } + case 'n': { + /* calling function is a known Lua function? */ + if (ci && !(ci->callstatus & CIST_TAIL) && isLua(ci->previous)) + ar->namewhat = getfuncname(L, ci->previous, &ar->name); + else + ar->namewhat = NULL; + if (ar->namewhat == NULL) { + ar->namewhat = ""; /* not found */ + ar->name = NULL; + } + break; + } + case 'L': + case 'f': /* handled by lua_getinfo */ + break; + default: status = 0; /* invalid option */ + } + } + return status; +} + + +LUA_API int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar) { + int status; + Closure *cl; + CallInfo *ci; + StkId func; + lua_lock(L); + if (*what == '>') { + ci = NULL; + func = L->top - 1; + api_check(L, ttisfunction(func), "function expected"); + what++; /* skip the '>' */ + L->top--; /* pop function */ + } + else { + ci = ar->i_ci; + func = ci->func; + lua_assert(ttisfunction(ci->func)); + } + cl = ttisclosure(func) ? clvalue(func) : NULL; + status = auxgetinfo(L, what, ar, cl, ci); + if (strchr(what, 'f')) { + setobjs2s(L, L->top, func); + api_incr_top(L); + } + if (strchr(what, 'L')) + collectvalidlines(L, cl); + lua_unlock(L); + return status; +} + + +/* +** {====================================================== +** Symbolic Execution +** ======================================================= +*/ + +static const char *getobjname (Proto *p, int lastpc, int reg, + const char **name); + + +/* +** find a "name" for the RK value 'c' +*/ +static void kname (Proto *p, int pc, int c, const char **name) { + if (ISK(c)) { /* is 'c' a constant? */ + TValue *kvalue = &p->k[INDEXK(c)]; + if (ttisstring(kvalue)) { /* literal constant? */ + *name = svalue(kvalue); /* it is its own name */ + return; + } + /* else no reasonable name found */ + } + else { /* 'c' is a register */ + const char *what = getobjname(p, pc, c, name); /* search for 'c' */ + if (what && *what == 'c') { /* found a constant name? */ + return; /* 'name' already filled */ + } + /* else no reasonable name found */ + } + *name = "?"; /* no reasonable name found */ +} + + +/* +** try to find last instruction before 'lastpc' that modified register 'reg' +*/ +static int findsetreg (Proto *p, int lastpc, int reg) { + int pc; + int setreg = -1; /* keep last instruction that changed 'reg' */ + for (pc = 0; pc < lastpc; pc++) { + Instruction i = p->code[pc]; + OpCode op = GET_OPCODE(i); + int a = GETARG_A(i); + switch (op) { + case OP_LOADNIL: { + int b = GETARG_B(i); + if (a <= reg && reg <= a + b) /* set registers from 'a' to 'a+b' */ + setreg = pc; + break; + } + case OP_TFORCALL: { + if (reg >= a + 2) setreg = pc; /* affect all regs above its base */ + break; + } + case OP_CALL: + case OP_TAILCALL: { + if (reg >= a) setreg = pc; /* affect all registers above base */ + break; + } + case OP_JMP: { + int b = GETARG_sBx(i); + int dest = pc + 1 + b; + /* jump is forward and do not skip `lastpc'? */ + if (pc < dest && dest <= lastpc) + pc += b; /* do the jump */ + break; + } + case OP_TEST: { + if (reg == a) setreg = pc; /* jumped code can change 'a' */ + break; + } + default: + if (testAMode(op) && reg == a) /* any instruction that set A */ + setreg = pc; + break; + } + } + return setreg; +} + + +static const char *getobjname (Proto *p, int lastpc, int reg, + const char **name) { + int pc; + *name = luaF_getlocalname(p, reg + 1, lastpc); + if (*name) /* is a local? */ + return "local"; + /* else try symbolic execution */ + pc = findsetreg(p, lastpc, reg); + if (pc != -1) { /* could find instruction? */ + Instruction i = p->code[pc]; + OpCode op = GET_OPCODE(i); + switch (op) { + case OP_MOVE: { + int b = GETARG_B(i); /* move from 'b' to 'a' */ + if (b < GETARG_A(i)) + return getobjname(p, pc, b, name); /* get name for 'b' */ + break; + } + case OP_GETTABUP: + case OP_GETTABLE: { + int k = GETARG_C(i); /* key index */ + int t = GETARG_B(i); /* table index */ + const char *vn = (op == OP_GETTABLE) /* name of indexed variable */ + ? luaF_getlocalname(p, t + 1, pc) + : upvalname(p, t); + kname(p, pc, k, name); + return (vn && strcmp(vn, LUA_ENV) == 0) ? "global" : "field"; + } + case OP_GETUPVAL: { + *name = upvalname(p, GETARG_B(i)); + return "upvalue"; + } + case OP_LOADK: + case OP_LOADKX: { + int b = (op == OP_LOADK) ? GETARG_Bx(i) + : GETARG_Ax(p->code[pc + 1]); + if (ttisstring(&p->k[b])) { + *name = svalue(&p->k[b]); + return "constant"; + } + break; + } + case OP_SELF: { + int k = GETARG_C(i); /* key index */ + kname(p, pc, k, name); + return "method"; + } + default: break; /* go through to return NULL */ + } + } + return NULL; /* could not find reasonable name */ +} + + +static const char *getfuncname (lua_State *L, CallInfo *ci, const char **name) { + TMS tm; + Proto *p = ci_func(ci)->p; /* calling function */ + int pc = currentpc(ci); /* calling instruction index */ + Instruction i = p->code[pc]; /* calling instruction */ + switch (GET_OPCODE(i)) { + case OP_CALL: + case OP_TAILCALL: /* get function name */ + return getobjname(p, pc, GETARG_A(i), name); + case OP_TFORCALL: { /* for iterator */ + *name = "for iterator"; + return "for iterator"; + } + /* all other instructions can call only through metamethods */ + case OP_SELF: + case OP_GETTABUP: + case OP_GETTABLE: tm = TM_INDEX; break; + case OP_SETTABUP: + case OP_SETTABLE: tm = TM_NEWINDEX; break; + case OP_EQ: tm = TM_EQ; break; + case OP_ADD: tm = TM_ADD; break; + case OP_SUB: tm = TM_SUB; break; + case OP_MUL: tm = TM_MUL; break; + case OP_DIV: tm = TM_DIV; break; + case OP_MOD: tm = TM_MOD; break; + case OP_POW: tm = TM_POW; break; + case OP_UNM: tm = TM_UNM; break; + case OP_LEN: tm = TM_LEN; break; + case OP_LT: tm = TM_LT; break; + case OP_LE: tm = TM_LE; break; + case OP_CONCAT: tm = TM_CONCAT; break; + default: + return NULL; /* else no useful name can be found */ + } + *name = getstr(G(L)->tmname[tm]); + return "metamethod"; +} + +/* }====================================================== */ + + + +/* +** only ANSI way to check whether a pointer points to an array +** (used only for error messages, so efficiency is not a big concern) +*/ +static int isinstack (CallInfo *ci, const TValue *o) { + StkId p; + for (p = ci->u.l.base; p < ci->top; p++) + if (o == p) return 1; + return 0; +} + + +static const char *getupvalname (CallInfo *ci, const TValue *o, + const char **name) { + LClosure *c = ci_func(ci); + int i; + for (i = 0; i < c->nupvalues; i++) { + if (c->upvals[i]->v == o) { + *name = upvalname(c->p, i); + return "upvalue"; + } + } + return NULL; +} + + +l_noret luaG_typeerror (lua_State *L, const TValue *o, const char *op) { + CallInfo *ci = L->ci; + const char *name = NULL; + const char *t = objtypename(o); + const char *kind = NULL; + if (isLua(ci)) { + kind = getupvalname(ci, o, &name); /* check whether 'o' is an upvalue */ + if (!kind && isinstack(ci, o)) /* no? try a register */ + kind = getobjname(ci_func(ci)->p, currentpc(ci), + cast_int(o - ci->u.l.base), &name); + } + if (kind) + luaG_runerror(L, "attempt to %s %s " LUA_QS " (a %s value)", + op, kind, name, t); + else + luaG_runerror(L, "attempt to %s a %s value", op, t); +} + + +l_noret luaG_concaterror (lua_State *L, StkId p1, StkId p2) { + if (ttisstring(p1) || ttisnumber(p1)) p1 = p2; + lua_assert(!ttisstring(p1) && !ttisnumber(p2)); + luaG_typeerror(L, p1, "concatenate"); +} + + +l_noret luaG_aritherror (lua_State *L, const TValue *p1, const TValue *p2) { + TValue temp; + if (luaV_tonumber(p1, &temp) == NULL) + p2 = p1; /* first operand is wrong */ + luaG_typeerror(L, p2, "perform arithmetic on"); +} + + +l_noret luaG_ordererror (lua_State *L, const TValue *p1, const TValue *p2) { + const char *t1 = objtypename(p1); + const char *t2 = objtypename(p2); + if (t1 == t2) + luaG_runerror(L, "attempt to compare two %s values", t1); + else + luaG_runerror(L, "attempt to compare %s with %s", t1, t2); +} + + +static void addinfo (lua_State *L, const char *msg) { + CallInfo *ci = L->ci; + if (isLua(ci)) { /* is Lua code? */ + char buff[LUA_IDSIZE]; /* add file:line information */ + int line = currentline(ci); + TString *src = ci_func(ci)->p->source; + if (src) + luaO_chunkid(buff, getstr(src), LUA_IDSIZE); + else { /* no source available; use "?" instead */ + buff[0] = '?'; buff[1] = '\0'; + } + luaO_pushfstring(L, "%s:%d: %s", buff, line, msg); + } +} + + +l_noret luaG_errormsg (lua_State *L) { + if (L->errfunc != 0) { /* is there an error handling function? */ + StkId errfunc = restorestack(L, L->errfunc); + if (!ttisfunction(errfunc)) luaD_throw(L, LUA_ERRERR); + setobjs2s(L, L->top, L->top - 1); /* move argument */ + setobjs2s(L, L->top - 1, errfunc); /* push function */ + L->top++; + luaD_call(L, L->top - 2, 1, 0); /* call it */ + } + luaD_throw(L, LUA_ERRRUN); +} + + +l_noret luaG_runerror (lua_State *L, const char *fmt, ...) { + va_list argp; + va_start(argp, fmt); + addinfo(L, luaO_pushvfstring(L, fmt, argp)); + va_end(argp); + luaG_errormsg(L); +} + diff --git a/radio/src/lua/src/ldebug.h b/radio/src/lua/src/ldebug.h new file mode 100644 index 000000000..fe39556b0 --- /dev/null +++ b/radio/src/lua/src/ldebug.h @@ -0,0 +1,34 @@ +/* +** $Id: ldebug.h,v 2.7 2011/10/07 20:45:19 roberto Exp $ +** Auxiliary functions from Debug Interface module +** See Copyright Notice in lua.h +*/ + +#ifndef ldebug_h +#define ldebug_h + + +#include "lstate.h" + + +#define pcRel(pc, p) (cast(int, (pc) - (p)->code) - 1) + +#define getfuncline(f,pc) (((f)->lineinfo) ? (f)->lineinfo[pc] : 0) + +#define resethookcount(L) (L->hookcount = L->basehookcount) + +/* Active Lua function (given call info) */ +#define ci_func(ci) (clLvalue((ci)->func)) + + +LUAI_FUNC l_noret luaG_typeerror (lua_State *L, const TValue *o, + const char *opname); +LUAI_FUNC l_noret luaG_concaterror (lua_State *L, StkId p1, StkId p2); +LUAI_FUNC l_noret luaG_aritherror (lua_State *L, const TValue *p1, + const TValue *p2); +LUAI_FUNC l_noret luaG_ordererror (lua_State *L, const TValue *p1, + const TValue *p2); +LUAI_FUNC l_noret luaG_runerror (lua_State *L, const char *fmt, ...); +LUAI_FUNC l_noret luaG_errormsg (lua_State *L); + +#endif diff --git a/radio/src/lua/src/ldo.c b/radio/src/lua/src/ldo.c new file mode 100644 index 000000000..aafa3dca2 --- /dev/null +++ b/radio/src/lua/src/ldo.c @@ -0,0 +1,673 @@ +/* +** $Id: ldo.c,v 2.108 2012/10/01 14:05:04 roberto Exp $ +** Stack and Call structure of Lua +** See Copyright Notice in lua.h +*/ + + +#include +#include +#include + +#define ldo_c +#define LUA_CORE + +#include "lua.h" + +#include "lapi.h" +#include "ldebug.h" +#include "ldo.h" +#include "lfunc.h" +#include "lgc.h" +#include "lmem.h" +#include "lobject.h" +#include "lopcodes.h" +#include "lparser.h" +#include "lstate.h" +#include "lstring.h" +#include "ltable.h" +#include "ltm.h" +#include "lundump.h" +#include "lvm.h" +#include "lzio.h" + + + + +/* +** {====================================================== +** Error-recovery functions +** ======================================================= +*/ + +/* +** LUAI_THROW/LUAI_TRY define how Lua does exception handling. By +** default, Lua handles errors with exceptions when compiling as +** C++ code, with _longjmp/_setjmp when asked to use them, and with +** longjmp/setjmp otherwise. +*/ +#if !defined(LUAI_THROW) + +#if defined(__cplusplus) && !defined(LUA_USE_LONGJMP) +/* C++ exceptions */ +#define LUAI_THROW(L,c) throw(c) +#define LUAI_TRY(L,c,a) \ + try { a } catch(...) { if ((c)->status == 0) (c)->status = -1; } +#define luai_jmpbuf int /* dummy variable */ + +#elif defined(LUA_USE_ULONGJMP) +/* in Unix, try _longjmp/_setjmp (more efficient) */ +#define LUAI_THROW(L,c) _longjmp((c)->b, 1) +#define LUAI_TRY(L,c,a) if (_setjmp((c)->b) == 0) { a } +#define luai_jmpbuf jmp_buf + +#else +/* default handling with long jumps */ +#define LUAI_THROW(L,c) longjmp((c)->b, 1) +#define LUAI_TRY(L,c,a) if (setjmp((c)->b) == 0) { a } +#define luai_jmpbuf jmp_buf + +#endif + +#endif + + + +/* chain list of long jump buffers */ +struct lua_longjmp { + struct lua_longjmp *previous; + luai_jmpbuf b; + volatile int status; /* error code */ +}; + + +static void seterrorobj (lua_State *L, int errcode, StkId oldtop) { + switch (errcode) { + case LUA_ERRMEM: { /* memory error? */ + setsvalue2s(L, oldtop, G(L)->memerrmsg); /* reuse preregistered msg. */ + break; + } + case LUA_ERRERR: { + setsvalue2s(L, oldtop, luaS_newliteral(L, "error in error handling")); + break; + } + default: { + setobjs2s(L, oldtop, L->top - 1); /* error message on current top */ + break; + } + } + L->top = oldtop + 1; +} + + +l_noret luaD_throw (lua_State *L, int errcode) { + if (L->errorJmp) { /* thread has an error handler? */ + L->errorJmp->status = errcode; /* set status */ + LUAI_THROW(L, L->errorJmp); /* jump to it */ + } + else { /* thread has no error handler */ + L->status = cast_byte(errcode); /* mark it as dead */ + if (G(L)->mainthread->errorJmp) { /* main thread has a handler? */ + setobjs2s(L, G(L)->mainthread->top++, L->top - 1); /* copy error obj. */ + luaD_throw(G(L)->mainthread, errcode); /* re-throw in main thread */ + } + else { /* no handler at all; abort */ + if (G(L)->panic) { /* panic function? */ + lua_unlock(L); + G(L)->panic(L); /* call it (last chance to jump out) */ + } + abort(); + } + } +} + + +int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud) { + unsigned short oldnCcalls = L->nCcalls; + struct lua_longjmp lj; + lj.status = LUA_OK; + lj.previous = L->errorJmp; /* chain new error handler */ + L->errorJmp = &lj; + LUAI_TRY(L, &lj, + (*f)(L, ud); + ); + L->errorJmp = lj.previous; /* restore old error handler */ + L->nCcalls = oldnCcalls; + return lj.status; +} + +/* }====================================================== */ + + +static void correctstack (lua_State *L, TValue *oldstack) { + CallInfo *ci; + GCObject *up; + L->top = (L->top - oldstack) + L->stack; + for (up = L->openupval; up != NULL; up = up->gch.next) + gco2uv(up)->v = (gco2uv(up)->v - oldstack) + L->stack; + for (ci = L->ci; ci != NULL; ci = ci->previous) { + ci->top = (ci->top - oldstack) + L->stack; + ci->func = (ci->func - oldstack) + L->stack; + if (isLua(ci)) + ci->u.l.base = (ci->u.l.base - oldstack) + L->stack; + } +} + + +/* some space for error handling */ +#define ERRORSTACKSIZE (LUAI_MAXSTACK + 200) + + +void luaD_reallocstack (lua_State *L, int newsize) { + TValue *oldstack = L->stack; + int lim = L->stacksize; + lua_assert(newsize <= LUAI_MAXSTACK || newsize == ERRORSTACKSIZE); + lua_assert(L->stack_last - L->stack == L->stacksize - EXTRA_STACK); + luaM_reallocvector(L, L->stack, L->stacksize, newsize, TValue); + for (; lim < newsize; lim++) + setnilvalue(L->stack + lim); /* erase new segment */ + L->stacksize = newsize; + L->stack_last = L->stack + newsize - EXTRA_STACK; + correctstack(L, oldstack); +} + + +void luaD_growstack (lua_State *L, int n) { + int size = L->stacksize; + if (size > LUAI_MAXSTACK) /* error after extra size? */ + luaD_throw(L, LUA_ERRERR); + else { + int needed = cast_int(L->top - L->stack) + n + EXTRA_STACK; + int newsize = 2 * size; + if (newsize > LUAI_MAXSTACK) newsize = LUAI_MAXSTACK; + if (newsize < needed) newsize = needed; + if (newsize > LUAI_MAXSTACK) { /* stack overflow? */ + luaD_reallocstack(L, ERRORSTACKSIZE); + luaG_runerror(L, "stack overflow"); + } + else + luaD_reallocstack(L, newsize); + } +} + + +static int stackinuse (lua_State *L) { + CallInfo *ci; + StkId lim = L->top; + for (ci = L->ci; ci != NULL; ci = ci->previous) { + lua_assert(ci->top <= L->stack_last); + if (lim < ci->top) lim = ci->top; + } + return cast_int(lim - L->stack) + 1; /* part of stack in use */ +} + + +void luaD_shrinkstack (lua_State *L) { + int inuse = stackinuse(L); + int goodsize = inuse + (inuse / 8) + 2*EXTRA_STACK; + if (goodsize > LUAI_MAXSTACK) goodsize = LUAI_MAXSTACK; + if (inuse > LUAI_MAXSTACK || /* handling stack overflow? */ + goodsize >= L->stacksize) /* would grow instead of shrink? */ + condmovestack(L); /* don't change stack (change only for debugging) */ + else + luaD_reallocstack(L, goodsize); /* shrink it */ +} + + +void luaD_hook (lua_State *L, int event, int line) { + lua_Hook hook = L->hook; + if (hook && L->allowhook) { + CallInfo *ci = L->ci; + ptrdiff_t top = savestack(L, L->top); + ptrdiff_t ci_top = savestack(L, ci->top); + lua_Debug ar; + ar.event = event; + ar.currentline = line; + ar.i_ci = ci; + luaD_checkstack(L, LUA_MINSTACK); /* ensure minimum stack size */ + ci->top = L->top + LUA_MINSTACK; + lua_assert(ci->top <= L->stack_last); + L->allowhook = 0; /* cannot call hooks inside a hook */ + ci->callstatus |= CIST_HOOKED; + lua_unlock(L); + (*hook)(L, &ar); + lua_lock(L); + lua_assert(!L->allowhook); + L->allowhook = 1; + ci->top = restorestack(L, ci_top); + L->top = restorestack(L, top); + ci->callstatus &= ~CIST_HOOKED; + } +} + + +static void callhook (lua_State *L, CallInfo *ci) { + int hook = LUA_HOOKCALL; + ci->u.l.savedpc++; /* hooks assume 'pc' is already incremented */ + if (isLua(ci->previous) && + GET_OPCODE(*(ci->previous->u.l.savedpc - 1)) == OP_TAILCALL) { + ci->callstatus |= CIST_TAIL; + hook = LUA_HOOKTAILCALL; + } + luaD_hook(L, hook, -1); + ci->u.l.savedpc--; /* correct 'pc' */ +} + + +static StkId adjust_varargs (lua_State *L, Proto *p, int actual) { + int i; + int nfixargs = p->numparams; + StkId base, fixed; + lua_assert(actual >= nfixargs); + /* move fixed parameters to final position */ + fixed = L->top - actual; /* first fixed argument */ + base = L->top; /* final position of first argument */ + for (i=0; itop++, fixed + i); + setnilvalue(fixed + i); + } + return base; +} + + +static StkId tryfuncTM (lua_State *L, StkId func) { + const TValue *tm = luaT_gettmbyobj(L, func, TM_CALL); + StkId p; + ptrdiff_t funcr = savestack(L, func); + if (!ttisfunction(tm)) + luaG_typeerror(L, func, "call"); + /* Open a hole inside the stack at `func' */ + for (p = L->top; p > func; p--) setobjs2s(L, p, p-1); + incr_top(L); + func = restorestack(L, funcr); /* previous call may change stack */ + setobj2s(L, func, tm); /* tag method is the new function to be called */ + return func; +} + + + +#define next_ci(L) (L->ci = (L->ci->next ? L->ci->next : luaE_extendCI(L))) + + +/* +** returns true if function has been executed (C function) +*/ +int luaD_precall (lua_State *L, StkId func, int nresults) { + lua_CFunction f; + CallInfo *ci; + int n; /* number of arguments (Lua) or returns (C) */ + ptrdiff_t funcr = savestack(L, func); + switch (ttype(func)) { + case LUA_TLCF: /* light C function */ + f = fvalue(func); + goto Cfunc; + case LUA_TCCL: { /* C closure */ + f = clCvalue(func)->f; + Cfunc: + luaD_checkstack(L, LUA_MINSTACK); /* ensure minimum stack size */ + ci = next_ci(L); /* now 'enter' new function */ + ci->nresults = nresults; + ci->func = restorestack(L, funcr); + ci->top = L->top + LUA_MINSTACK; + lua_assert(ci->top <= L->stack_last); + ci->callstatus = 0; + luaC_checkGC(L); /* stack grow uses memory */ + if (L->hookmask & LUA_MASKCALL) + luaD_hook(L, LUA_HOOKCALL, -1); + lua_unlock(L); + n = (*f)(L); /* do the actual call */ + lua_lock(L); + api_checknelems(L, n); + luaD_poscall(L, L->top - n); + return 1; + } + case LUA_TLCL: { /* Lua function: prepare its call */ + StkId base; + Proto *p = clLvalue(func)->p; + luaD_checkstack(L, p->maxstacksize); + func = restorestack(L, funcr); + n = cast_int(L->top - func) - 1; /* number of real arguments */ + for (; n < p->numparams; n++) + setnilvalue(L->top++); /* complete missing arguments */ + base = (!p->is_vararg) ? func + 1 : adjust_varargs(L, p, n); + ci = next_ci(L); /* now 'enter' new function */ + ci->nresults = nresults; + ci->func = func; + ci->u.l.base = base; + ci->top = base + p->maxstacksize; + lua_assert(ci->top <= L->stack_last); + ci->u.l.savedpc = p->code; /* starting point */ + ci->callstatus = CIST_LUA; + L->top = ci->top; + luaC_checkGC(L); /* stack grow uses memory */ + if (L->hookmask & LUA_MASKCALL) + callhook(L, ci); + return 0; + } + default: { /* not a function */ + func = tryfuncTM(L, func); /* retry with 'function' tag method */ + return luaD_precall(L, func, nresults); /* now it must be a function */ + } + } +} + + +int luaD_poscall (lua_State *L, StkId firstResult) { + StkId res; + int wanted, i; + CallInfo *ci = L->ci; + if (L->hookmask & (LUA_MASKRET | LUA_MASKLINE)) { + if (L->hookmask & LUA_MASKRET) { + ptrdiff_t fr = savestack(L, firstResult); /* hook may change stack */ + luaD_hook(L, LUA_HOOKRET, -1); + firstResult = restorestack(L, fr); + } + L->oldpc = ci->previous->u.l.savedpc; /* 'oldpc' for caller function */ + } + res = ci->func; /* res == final position of 1st result */ + wanted = ci->nresults; + L->ci = ci = ci->previous; /* back to caller */ + /* move results to correct place */ + for (i = wanted; i != 0 && firstResult < L->top; i--) + setobjs2s(L, res++, firstResult++); + while (i-- > 0) + setnilvalue(res++); + L->top = res; + return (wanted - LUA_MULTRET); /* 0 iff wanted == LUA_MULTRET */ +} + + +/* +** Call a function (C or Lua). The function to be called is at *func. +** The arguments are on the stack, right after the function. +** When returns, all the results are on the stack, starting at the original +** function position. +*/ +void luaD_call (lua_State *L, StkId func, int nResults, int allowyield) { + if (++L->nCcalls >= LUAI_MAXCCALLS) { + if (L->nCcalls == LUAI_MAXCCALLS) + luaG_runerror(L, "C stack overflow"); + else if (L->nCcalls >= (LUAI_MAXCCALLS + (LUAI_MAXCCALLS>>3))) + luaD_throw(L, LUA_ERRERR); /* error while handing stack error */ + } + if (!allowyield) L->nny++; + if (!luaD_precall(L, func, nResults)) /* is a Lua function? */ + luaV_execute(L); /* call it */ + if (!allowyield) L->nny--; + L->nCcalls--; +} + + +static void finishCcall (lua_State *L) { + CallInfo *ci = L->ci; + int n; + lua_assert(ci->u.c.k != NULL); /* must have a continuation */ + lua_assert(L->nny == 0); + if (ci->callstatus & CIST_YPCALL) { /* was inside a pcall? */ + ci->callstatus &= ~CIST_YPCALL; /* finish 'lua_pcall' */ + L->errfunc = ci->u.c.old_errfunc; + } + /* finish 'lua_callk'/'lua_pcall' */ + adjustresults(L, ci->nresults); + /* call continuation function */ + if (!(ci->callstatus & CIST_STAT)) /* no call status? */ + ci->u.c.status = LUA_YIELD; /* 'default' status */ + lua_assert(ci->u.c.status != LUA_OK); + ci->callstatus = (ci->callstatus & ~(CIST_YPCALL | CIST_STAT)) | CIST_YIELDED; + lua_unlock(L); + n = (*ci->u.c.k)(L); + lua_lock(L); + api_checknelems(L, n); + /* finish 'luaD_precall' */ + luaD_poscall(L, L->top - n); +} + + +static void unroll (lua_State *L, void *ud) { + UNUSED(ud); + for (;;) { + if (L->ci == &L->base_ci) /* stack is empty? */ + return; /* coroutine finished normally */ + if (!isLua(L->ci)) /* C function? */ + finishCcall(L); + else { /* Lua function */ + luaV_finishOp(L); /* finish interrupted instruction */ + luaV_execute(L); /* execute down to higher C 'boundary' */ + } + } +} + + +/* +** check whether thread has a suspended protected call +*/ +static CallInfo *findpcall (lua_State *L) { + CallInfo *ci; + for (ci = L->ci; ci != NULL; ci = ci->previous) { /* search for a pcall */ + if (ci->callstatus & CIST_YPCALL) + return ci; + } + return NULL; /* no pending pcall */ +} + + +static int recover (lua_State *L, int status) { + StkId oldtop; + CallInfo *ci = findpcall(L); + if (ci == NULL) return 0; /* no recovery point */ + /* "finish" luaD_pcall */ + oldtop = restorestack(L, ci->extra); + luaF_close(L, oldtop); + seterrorobj(L, status, oldtop); + L->ci = ci; + L->allowhook = ci->u.c.old_allowhook; + L->nny = 0; /* should be zero to be yieldable */ + luaD_shrinkstack(L); + L->errfunc = ci->u.c.old_errfunc; + ci->callstatus |= CIST_STAT; /* call has error status */ + ci->u.c.status = status; /* (here it is) */ + return 1; /* continue running the coroutine */ +} + + +/* +** signal an error in the call to 'resume', not in the execution of the +** coroutine itself. (Such errors should not be handled by any coroutine +** error handler and should not kill the coroutine.) +*/ +static l_noret resume_error (lua_State *L, const char *msg, StkId firstArg) { + L->top = firstArg; /* remove args from the stack */ + setsvalue2s(L, L->top, luaS_new(L, msg)); /* push error message */ + api_incr_top(L); + luaD_throw(L, -1); /* jump back to 'lua_resume' */ +} + + +/* +** do the work for 'lua_resume' in protected mode +*/ +static void resume (lua_State *L, void *ud) { + int nCcalls = L->nCcalls; + StkId firstArg = cast(StkId, ud); + CallInfo *ci = L->ci; + if (nCcalls >= LUAI_MAXCCALLS) + resume_error(L, "C stack overflow", firstArg); + if (L->status == LUA_OK) { /* may be starting a coroutine */ + if (ci != &L->base_ci) /* not in base level? */ + resume_error(L, "cannot resume non-suspended coroutine", firstArg); + /* coroutine is in base level; start running it */ + if (!luaD_precall(L, firstArg - 1, LUA_MULTRET)) /* Lua function? */ + luaV_execute(L); /* call it */ + } + else if (L->status != LUA_YIELD) + resume_error(L, "cannot resume dead coroutine", firstArg); + else { /* resuming from previous yield */ + L->status = LUA_OK; + ci->func = restorestack(L, ci->extra); + if (isLua(ci)) /* yielded inside a hook? */ + luaV_execute(L); /* just continue running Lua code */ + else { /* 'common' yield */ + if (ci->u.c.k != NULL) { /* does it have a continuation? */ + int n; + ci->u.c.status = LUA_YIELD; /* 'default' status */ + ci->callstatus |= CIST_YIELDED; + lua_unlock(L); + n = (*ci->u.c.k)(L); /* call continuation */ + lua_lock(L); + api_checknelems(L, n); + firstArg = L->top - n; /* yield results come from continuation */ + } + luaD_poscall(L, firstArg); /* finish 'luaD_precall' */ + } + unroll(L, NULL); + } + lua_assert(nCcalls == L->nCcalls); +} + + +LUA_API int lua_resume (lua_State *L, lua_State *from, int nargs) { + int status; + lua_lock(L); + luai_userstateresume(L, nargs); + L->nCcalls = (from) ? from->nCcalls + 1 : 1; + L->nny = 0; /* allow yields */ + api_checknelems(L, (L->status == LUA_OK) ? nargs + 1 : nargs); + status = luaD_rawrunprotected(L, resume, L->top - nargs); + if (status == -1) /* error calling 'lua_resume'? */ + status = LUA_ERRRUN; + else { /* yield or regular error */ + while (status != LUA_OK && status != LUA_YIELD) { /* error? */ + if (recover(L, status)) /* recover point? */ + status = luaD_rawrunprotected(L, unroll, NULL); /* run continuation */ + else { /* unrecoverable error */ + L->status = cast_byte(status); /* mark thread as `dead' */ + seterrorobj(L, status, L->top); + L->ci->top = L->top; + break; + } + } + lua_assert(status == L->status); + } + L->nny = 1; /* do not allow yields */ + L->nCcalls--; + lua_assert(L->nCcalls == ((from) ? from->nCcalls : 0)); + lua_unlock(L); + return status; +} + + +LUA_API int lua_yieldk (lua_State *L, int nresults, int ctx, lua_CFunction k) { + CallInfo *ci = L->ci; + luai_userstateyield(L, nresults); + lua_lock(L); + api_checknelems(L, nresults); + if (L->nny > 0) { + if (L != G(L)->mainthread) + luaG_runerror(L, "attempt to yield across a C-call boundary"); + else + luaG_runerror(L, "attempt to yield from outside a coroutine"); + } + L->status = LUA_YIELD; + ci->extra = savestack(L, ci->func); /* save current 'func' */ + if (isLua(ci)) { /* inside a hook? */ + api_check(L, k == NULL, "hooks cannot continue after yielding"); + } + else { + if ((ci->u.c.k = k) != NULL) /* is there a continuation? */ + ci->u.c.ctx = ctx; /* save context */ + ci->func = L->top - nresults - 1; /* protect stack below results */ + luaD_throw(L, LUA_YIELD); + } + lua_assert(ci->callstatus & CIST_HOOKED); /* must be inside a hook */ + lua_unlock(L); + return 0; /* return to 'luaD_hook' */ +} + + +int luaD_pcall (lua_State *L, Pfunc func, void *u, + ptrdiff_t old_top, ptrdiff_t ef) { + int status; + CallInfo *old_ci = L->ci; + lu_byte old_allowhooks = L->allowhook; + unsigned short old_nny = L->nny; + ptrdiff_t old_errfunc = L->errfunc; + L->errfunc = ef; + status = luaD_rawrunprotected(L, func, u); + if (status != LUA_OK) { /* an error occurred? */ + StkId oldtop = restorestack(L, old_top); + luaF_close(L, oldtop); /* close possible pending closures */ + seterrorobj(L, status, oldtop); + L->ci = old_ci; + L->allowhook = old_allowhooks; + L->nny = old_nny; + luaD_shrinkstack(L); + } + L->errfunc = old_errfunc; + return status; +} + + + +/* +** Execute a protected parser. +*/ +struct SParser { /* data to `f_parser' */ + ZIO *z; + Mbuffer buff; /* dynamic structure used by the scanner */ + Dyndata dyd; /* dynamic structures used by the parser */ + const char *mode; + const char *name; +}; + + +static void checkmode (lua_State *L, const char *mode, const char *x) { + if (mode && strchr(mode, x[0]) == NULL) { + luaO_pushfstring(L, + "attempt to load a %s chunk (mode is " LUA_QS ")", x, mode); + luaD_throw(L, LUA_ERRSYNTAX); + } +} + + +static void f_parser (lua_State *L, void *ud) { + int i; + Closure *cl; + struct SParser *p = cast(struct SParser *, ud); + int c = zgetc(p->z); /* read first character */ + if (c == LUA_SIGNATURE[0]) { + checkmode(L, p->mode, "binary"); + cl = luaU_undump(L, p->z, &p->buff, p->name); + } + else { + checkmode(L, p->mode, "text"); + cl = luaY_parser(L, p->z, &p->buff, &p->dyd, p->name, c); + } + lua_assert(cl->l.nupvalues == cl->l.p->sizeupvalues); + for (i = 0; i < cl->l.nupvalues; i++) { /* initialize upvalues */ + UpVal *up = luaF_newupval(L); + cl->l.upvals[i] = up; + luaC_objbarrier(L, cl, up); + } +} + + +int luaD_protectedparser (lua_State *L, ZIO *z, const char *name, + const char *mode) { + struct SParser p; + int status; + L->nny++; /* cannot yield during parsing */ + p.z = z; p.name = name; p.mode = mode; + p.dyd.actvar.arr = NULL; p.dyd.actvar.size = 0; + p.dyd.gt.arr = NULL; p.dyd.gt.size = 0; + p.dyd.label.arr = NULL; p.dyd.label.size = 0; + luaZ_initbuffer(L, &p.buff); + status = luaD_pcall(L, f_parser, &p, savestack(L, L->top), L->errfunc); + luaZ_freebuffer(L, &p.buff); + luaM_freearray(L, p.dyd.actvar.arr, p.dyd.actvar.size); + luaM_freearray(L, p.dyd.gt.arr, p.dyd.gt.size); + luaM_freearray(L, p.dyd.label.arr, p.dyd.label.size); + L->nny--; + return status; +} + + diff --git a/radio/src/lua/src/ldo.h b/radio/src/lua/src/ldo.h new file mode 100644 index 000000000..27b837d99 --- /dev/null +++ b/radio/src/lua/src/ldo.h @@ -0,0 +1,46 @@ +/* +** $Id: ldo.h,v 2.20 2011/11/29 15:55:08 roberto Exp $ +** Stack and Call structure of Lua +** See Copyright Notice in lua.h +*/ + +#ifndef ldo_h +#define ldo_h + + +#include "lobject.h" +#include "lstate.h" +#include "lzio.h" + + +#define luaD_checkstack(L,n) if (L->stack_last - L->top <= (n)) \ + luaD_growstack(L, n); else condmovestack(L); + + +#define incr_top(L) {L->top++; luaD_checkstack(L,0);} + +#define savestack(L,p) ((char *)(p) - (char *)L->stack) +#define restorestack(L,n) ((TValue *)((char *)L->stack + (n))) + + +/* type of protected functions, to be ran by `runprotected' */ +typedef void (*Pfunc) (lua_State *L, void *ud); + +LUAI_FUNC int luaD_protectedparser (lua_State *L, ZIO *z, const char *name, + const char *mode); +LUAI_FUNC void luaD_hook (lua_State *L, int event, int line); +LUAI_FUNC int luaD_precall (lua_State *L, StkId func, int nresults); +LUAI_FUNC void luaD_call (lua_State *L, StkId func, int nResults, + int allowyield); +LUAI_FUNC int luaD_pcall (lua_State *L, Pfunc func, void *u, + ptrdiff_t oldtop, ptrdiff_t ef); +LUAI_FUNC int luaD_poscall (lua_State *L, StkId firstResult); +LUAI_FUNC void luaD_reallocstack (lua_State *L, int newsize); +LUAI_FUNC void luaD_growstack (lua_State *L, int n); +LUAI_FUNC void luaD_shrinkstack (lua_State *L); + +LUAI_FUNC l_noret luaD_throw (lua_State *L, int errcode); +LUAI_FUNC int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud); + +#endif + diff --git a/radio/src/lua/src/ldump.c b/radio/src/lua/src/ldump.c new file mode 100644 index 000000000..d5e6a47cb --- /dev/null +++ b/radio/src/lua/src/ldump.c @@ -0,0 +1,173 @@ +/* +** $Id: ldump.c,v 2.17 2012/01/23 23:02:10 roberto Exp $ +** save precompiled Lua chunks +** See Copyright Notice in lua.h +*/ + +#include + +#define ldump_c +#define LUA_CORE + +#include "lua.h" + +#include "lobject.h" +#include "lstate.h" +#include "lundump.h" + +typedef struct { + lua_State* L; + lua_Writer writer; + void* data; + int strip; + int status; +} DumpState; + +#define DumpMem(b,n,size,D) DumpBlock(b,(n)*(size),D) +#define DumpVar(x,D) DumpMem(&x,1,sizeof(x),D) + +static void DumpBlock(const void* b, size_t size, DumpState* D) +{ + if (D->status==0) + { + lua_unlock(D->L); + D->status=(*D->writer)(D->L,b,size,D->data); + lua_lock(D->L); + } +} + +static void DumpChar(int y, DumpState* D) +{ + char x=(char)y; + DumpVar(x,D); +} + +static void DumpInt(int x, DumpState* D) +{ + DumpVar(x,D); +} + +static void DumpNumber(lua_Number x, DumpState* D) +{ + DumpVar(x,D); +} + +static void DumpVector(const void* b, int n, size_t size, DumpState* D) +{ + DumpInt(n,D); + DumpMem(b,n,size,D); +} + +static void DumpString(const TString* s, DumpState* D) +{ + if (s==NULL) + { + size_t size=0; + DumpVar(size,D); + } + else + { + size_t size=s->tsv.len+1; /* include trailing '\0' */ + DumpVar(size,D); + DumpBlock(getstr(s),size*sizeof(char),D); + } +} + +#define DumpCode(f,D) DumpVector(f->code,f->sizecode,sizeof(Instruction),D) + +static void DumpFunction(const Proto* f, DumpState* D); + +static void DumpConstants(const Proto* f, DumpState* D) +{ + int i,n=f->sizek; + DumpInt(n,D); + for (i=0; ik[i]; + DumpChar(ttypenv(o),D); + switch (ttypenv(o)) + { + case LUA_TNIL: + break; + case LUA_TBOOLEAN: + DumpChar(bvalue(o),D); + break; + case LUA_TNUMBER: + DumpNumber(nvalue(o),D); + break; + case LUA_TSTRING: + DumpString(rawtsvalue(o),D); + break; + default: lua_assert(0); + } + } + n=f->sizep; + DumpInt(n,D); + for (i=0; ip[i],D); +} + +static void DumpUpvalues(const Proto* f, DumpState* D) +{ + int i,n=f->sizeupvalues; + DumpInt(n,D); + for (i=0; iupvalues[i].instack,D); + DumpChar(f->upvalues[i].idx,D); + } +} + +static void DumpDebug(const Proto* f, DumpState* D) +{ + int i,n; + DumpString((D->strip) ? NULL : f->source,D); + n= (D->strip) ? 0 : f->sizelineinfo; + DumpVector(f->lineinfo,n,sizeof(int),D); + n= (D->strip) ? 0 : f->sizelocvars; + DumpInt(n,D); + for (i=0; ilocvars[i].varname,D); + DumpInt(f->locvars[i].startpc,D); + DumpInt(f->locvars[i].endpc,D); + } + n= (D->strip) ? 0 : f->sizeupvalues; + DumpInt(n,D); + for (i=0; iupvalues[i].name,D); +} + +static void DumpFunction(const Proto* f, DumpState* D) +{ + DumpInt(f->linedefined,D); + DumpInt(f->lastlinedefined,D); + DumpChar(f->numparams,D); + DumpChar(f->is_vararg,D); + DumpChar(f->maxstacksize,D); + DumpCode(f,D); + DumpConstants(f,D); + DumpUpvalues(f,D); + DumpDebug(f,D); +} + +static void DumpHeader(DumpState* D) +{ + lu_byte h[LUAC_HEADERSIZE]; + luaU_header(h); + DumpBlock(h,LUAC_HEADERSIZE,D); +} + +/* +** dump Lua function as precompiled chunk +*/ +int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip) +{ + DumpState D; + D.L=L; + D.writer=w; + D.data=data; + D.strip=strip; + D.status=0; + DumpHeader(&D); + DumpFunction(f,&D); + return D.status; +} diff --git a/radio/src/lua/src/lfunc.c b/radio/src/lua/src/lfunc.c new file mode 100644 index 000000000..c2128405b --- /dev/null +++ b/radio/src/lua/src/lfunc.c @@ -0,0 +1,161 @@ +/* +** $Id: lfunc.c,v 2.30 2012/10/03 12:36:46 roberto Exp $ +** Auxiliary functions to manipulate prototypes and closures +** See Copyright Notice in lua.h +*/ + + +#include + +#define lfunc_c +#define LUA_CORE + +#include "lua.h" + +#include "lfunc.h" +#include "lgc.h" +#include "lmem.h" +#include "lobject.h" +#include "lstate.h" + + + +Closure *luaF_newCclosure (lua_State *L, int n) { + Closure *c = &luaC_newobj(L, LUA_TCCL, sizeCclosure(n), NULL, 0)->cl; + c->c.nupvalues = cast_byte(n); + return c; +} + + +Closure *luaF_newLclosure (lua_State *L, int n) { + Closure *c = &luaC_newobj(L, LUA_TLCL, sizeLclosure(n), NULL, 0)->cl; + c->l.p = NULL; + c->l.nupvalues = cast_byte(n); + while (n--) c->l.upvals[n] = NULL; + return c; +} + + +UpVal *luaF_newupval (lua_State *L) { + UpVal *uv = &luaC_newobj(L, LUA_TUPVAL, sizeof(UpVal), NULL, 0)->uv; + uv->v = &uv->u.value; + setnilvalue(uv->v); + return uv; +} + + +UpVal *luaF_findupval (lua_State *L, StkId level) { + global_State *g = G(L); + GCObject **pp = &L->openupval; + UpVal *p; + UpVal *uv; + while (*pp != NULL && (p = gco2uv(*pp))->v >= level) { + GCObject *o = obj2gco(p); + lua_assert(p->v != &p->u.value); + lua_assert(!isold(o) || isold(obj2gco(L))); + if (p->v == level) { /* found a corresponding upvalue? */ + if (isdead(g, o)) /* is it dead? */ + changewhite(o); /* resurrect it */ + return p; + } + pp = &p->next; + } + /* not found: create a new one */ + uv = &luaC_newobj(L, LUA_TUPVAL, sizeof(UpVal), pp, 0)->uv; + uv->v = level; /* current value lives in the stack */ + uv->u.l.prev = &g->uvhead; /* double link it in `uvhead' list */ + uv->u.l.next = g->uvhead.u.l.next; + uv->u.l.next->u.l.prev = uv; + g->uvhead.u.l.next = uv; + lua_assert(uv->u.l.next->u.l.prev == uv && uv->u.l.prev->u.l.next == uv); + return uv; +} + + +static void unlinkupval (UpVal *uv) { + lua_assert(uv->u.l.next->u.l.prev == uv && uv->u.l.prev->u.l.next == uv); + uv->u.l.next->u.l.prev = uv->u.l.prev; /* remove from `uvhead' list */ + uv->u.l.prev->u.l.next = uv->u.l.next; +} + + +void luaF_freeupval (lua_State *L, UpVal *uv) { + if (uv->v != &uv->u.value) /* is it open? */ + unlinkupval(uv); /* remove from open list */ + luaM_free(L, uv); /* free upvalue */ +} + + +void luaF_close (lua_State *L, StkId level) { + UpVal *uv; + global_State *g = G(L); + while (L->openupval != NULL && (uv = gco2uv(L->openupval))->v >= level) { + GCObject *o = obj2gco(uv); + lua_assert(!isblack(o) && uv->v != &uv->u.value); + L->openupval = uv->next; /* remove from `open' list */ + if (isdead(g, o)) + luaF_freeupval(L, uv); /* free upvalue */ + else { + unlinkupval(uv); /* remove upvalue from 'uvhead' list */ + setobj(L, &uv->u.value, uv->v); /* move value to upvalue slot */ + uv->v = &uv->u.value; /* now current value lives here */ + gch(o)->next = g->allgc; /* link upvalue into 'allgc' list */ + g->allgc = o; + luaC_checkupvalcolor(g, uv); + } + } +} + + +Proto *luaF_newproto (lua_State *L) { + Proto *f = &luaC_newobj(L, LUA_TPROTO, sizeof(Proto), NULL, 0)->p; + f->k = NULL; + f->sizek = 0; + f->p = NULL; + f->sizep = 0; + f->code = NULL; + f->cache = NULL; + f->sizecode = 0; + f->lineinfo = NULL; + f->sizelineinfo = 0; + f->upvalues = NULL; + f->sizeupvalues = 0; + f->numparams = 0; + f->is_vararg = 0; + f->maxstacksize = 0; + f->locvars = NULL; + f->sizelocvars = 0; + f->linedefined = 0; + f->lastlinedefined = 0; + f->source = NULL; + return f; +} + + +void luaF_freeproto (lua_State *L, Proto *f) { + luaM_freearray(L, f->code, f->sizecode); + luaM_freearray(L, f->p, f->sizep); + luaM_freearray(L, f->k, f->sizek); + luaM_freearray(L, f->lineinfo, f->sizelineinfo); + luaM_freearray(L, f->locvars, f->sizelocvars); + luaM_freearray(L, f->upvalues, f->sizeupvalues); + luaM_free(L, f); +} + + +/* +** Look for n-th local variable at line `line' in function `func'. +** Returns NULL if not found. +*/ +const char *luaF_getlocalname (const Proto *f, int local_number, int pc) { + int i; + for (i = 0; isizelocvars && f->locvars[i].startpc <= pc; i++) { + if (pc < f->locvars[i].endpc) { /* is variable active? */ + local_number--; + if (local_number == 0) + return getstr(f->locvars[i].varname); + } + } + return NULL; /* not found */ +} + diff --git a/radio/src/lua/src/lfunc.h b/radio/src/lua/src/lfunc.h new file mode 100644 index 000000000..e236a717c --- /dev/null +++ b/radio/src/lua/src/lfunc.h @@ -0,0 +1,33 @@ +/* +** $Id: lfunc.h,v 2.8 2012/05/08 13:53:33 roberto Exp $ +** Auxiliary functions to manipulate prototypes and closures +** See Copyright Notice in lua.h +*/ + +#ifndef lfunc_h +#define lfunc_h + + +#include "lobject.h" + + +#define sizeCclosure(n) (cast(int, sizeof(CClosure)) + \ + cast(int, sizeof(TValue)*((n)-1))) + +#define sizeLclosure(n) (cast(int, sizeof(LClosure)) + \ + cast(int, sizeof(TValue *)*((n)-1))) + + +LUAI_FUNC Proto *luaF_newproto (lua_State *L); +LUAI_FUNC Closure *luaF_newCclosure (lua_State *L, int nelems); +LUAI_FUNC Closure *luaF_newLclosure (lua_State *L, int nelems); +LUAI_FUNC UpVal *luaF_newupval (lua_State *L); +LUAI_FUNC UpVal *luaF_findupval (lua_State *L, StkId level); +LUAI_FUNC void luaF_close (lua_State *L, StkId level); +LUAI_FUNC void luaF_freeproto (lua_State *L, Proto *f); +LUAI_FUNC void luaF_freeupval (lua_State *L, UpVal *uv); +LUAI_FUNC const char *luaF_getlocalname (const Proto *func, int local_number, + int pc); + + +#endif diff --git a/radio/src/lua/src/lgc.c b/radio/src/lua/src/lgc.c new file mode 100644 index 000000000..535e988ae --- /dev/null +++ b/radio/src/lua/src/lgc.c @@ -0,0 +1,1213 @@ +/* +** $Id: lgc.c,v 2.140 2013/03/16 21:10:18 roberto Exp $ +** Garbage Collector +** See Copyright Notice in lua.h +*/ + +#include + +#define lgc_c +#define LUA_CORE + +#include "lua.h" + +#include "ldebug.h" +#include "ldo.h" +#include "lfunc.h" +#include "lgc.h" +#include "lmem.h" +#include "lobject.h" +#include "lstate.h" +#include "lstring.h" +#include "ltable.h" +#include "ltm.h" + + + +/* +** cost of sweeping one element (the size of a small object divided +** by some adjust for the sweep speed) +*/ +#define GCSWEEPCOST ((sizeof(TString) + 4) / 4) + +/* maximum number of elements to sweep in each single step */ +#define GCSWEEPMAX (cast_int((GCSTEPSIZE / GCSWEEPCOST) / 4)) + +/* maximum number of finalizers to call in each GC step */ +#define GCFINALIZENUM 4 + + +/* +** macro to adjust 'stepmul': 'stepmul' is actually used like +** 'stepmul / STEPMULADJ' (value chosen by tests) +*/ +#define STEPMULADJ 200 + + +/* +** macro to adjust 'pause': 'pause' is actually used like +** 'pause / PAUSEADJ' (value chosen by tests) +*/ +#define PAUSEADJ 100 + + +/* +** 'makewhite' erases all color bits plus the old bit and then +** sets only the current white bit +*/ +#define maskcolors (~(bit2mask(BLACKBIT, OLDBIT) | WHITEBITS)) +#define makewhite(g,x) \ + (gch(x)->marked = cast_byte((gch(x)->marked & maskcolors) | luaC_white(g))) + +#define white2gray(x) resetbits(gch(x)->marked, WHITEBITS) +#define black2gray(x) resetbit(gch(x)->marked, BLACKBIT) + + +#define isfinalized(x) testbit(gch(x)->marked, FINALIZEDBIT) + +#define checkdeadkey(n) lua_assert(!ttisdeadkey(gkey(n)) || ttisnil(gval(n))) + + +#define checkconsistency(obj) \ + lua_longassert(!iscollectable(obj) || righttt(obj)) + + +#define markvalue(g,o) { checkconsistency(o); \ + if (valiswhite(o)) reallymarkobject(g,gcvalue(o)); } + +#define markobject(g,t) { if ((t) && iswhite(obj2gco(t))) \ + reallymarkobject(g, obj2gco(t)); } + +static void reallymarkobject (global_State *g, GCObject *o); + + +/* +** {====================================================== +** Generic functions +** ======================================================= +*/ + + +/* +** one after last element in a hash array +*/ +#define gnodelast(h) gnode(h, cast(size_t, sizenode(h))) + + +/* +** link table 'h' into list pointed by 'p' +*/ +#define linktable(h,p) ((h)->gclist = *(p), *(p) = obj2gco(h)) + + +/* +** if key is not marked, mark its entry as dead (therefore removing it +** from the table) +*/ +static void removeentry (Node *n) { + lua_assert(ttisnil(gval(n))); + if (valiswhite(gkey(n))) + setdeadvalue(gkey(n)); /* unused and unmarked key; remove it */ +} + + +/* +** tells whether a key or value can be cleared from a weak +** table. Non-collectable objects are never removed from weak +** tables. Strings behave as `values', so are never removed too. for +** other objects: if really collected, cannot keep them; for objects +** being finalized, keep them in keys, but not in values +*/ +static int iscleared (global_State *g, const TValue *o) { + if (!iscollectable(o)) return 0; + else if (ttisstring(o)) { + markobject(g, rawtsvalue(o)); /* strings are `values', so are never weak */ + return 0; + } + else return iswhite(gcvalue(o)); +} + + +/* +** barrier that moves collector forward, that is, mark the white object +** being pointed by a black object. +*/ +void luaC_barrier_ (lua_State *L, GCObject *o, GCObject *v) { + global_State *g = G(L); + lua_assert(isblack(o) && iswhite(v) && !isdead(g, v) && !isdead(g, o)); + lua_assert(g->gcstate != GCSpause); + lua_assert(gch(o)->tt != LUA_TTABLE); + if (keepinvariantout(g)) /* must keep invariant? */ + reallymarkobject(g, v); /* restore invariant */ + else { /* sweep phase */ + lua_assert(issweepphase(g)); + makewhite(g, o); /* mark main obj. as white to avoid other barriers */ + } +} + + +/* +** barrier that moves collector backward, that is, mark the black object +** pointing to a white object as gray again. (Current implementation +** only works for tables; access to 'gclist' is not uniform across +** different types.) +*/ +void luaC_barrierback_ (lua_State *L, GCObject *o) { + global_State *g = G(L); + lua_assert(isblack(o) && !isdead(g, o) && gch(o)->tt == LUA_TTABLE); + black2gray(o); /* make object gray (again) */ + gco2t(o)->gclist = g->grayagain; + g->grayagain = o; +} + + +/* +** barrier for prototypes. When creating first closure (cache is +** NULL), use a forward barrier; this may be the only closure of the +** prototype (if it is a "regular" function, with a single instance) +** and the prototype may be big, so it is better to avoid traversing +** it again. Otherwise, use a backward barrier, to avoid marking all +** possible instances. +*/ +LUAI_FUNC void luaC_barrierproto_ (lua_State *L, Proto *p, Closure *c) { + global_State *g = G(L); + lua_assert(isblack(obj2gco(p))); + if (p->cache == NULL) { /* first time? */ + luaC_objbarrier(L, p, c); + } + else { /* use a backward barrier */ + black2gray(obj2gco(p)); /* make prototype gray (again) */ + p->gclist = g->grayagain; + g->grayagain = obj2gco(p); + } +} + + +/* +** check color (and invariants) for an upvalue that was closed, +** i.e., moved into the 'allgc' list +*/ +void luaC_checkupvalcolor (global_State *g, UpVal *uv) { + GCObject *o = obj2gco(uv); + lua_assert(!isblack(o)); /* open upvalues are never black */ + if (isgray(o)) { + if (keepinvariant(g)) { + resetoldbit(o); /* see MOVE OLD rule */ + gray2black(o); /* it is being visited now */ + markvalue(g, uv->v); + } + else { + lua_assert(issweepphase(g)); + makewhite(g, o); + } + } +} + + +/* +** create a new collectable object (with given type and size) and link +** it to '*list'. 'offset' tells how many bytes to allocate before the +** object itself (used only by states). +*/ +GCObject *luaC_newobj (lua_State *L, int tt, size_t sz, GCObject **list, + int offset) { + global_State *g = G(L); + char *raw = cast(char *, luaM_newobject(L, novariant(tt), sz)); + GCObject *o = obj2gco(raw + offset); + if (list == NULL) + list = &g->allgc; /* standard list for collectable objects */ + gch(o)->marked = luaC_white(g); + gch(o)->tt = tt; + gch(o)->next = *list; + *list = o; + return o; +} + +/* }====================================================== */ + + + +/* +** {====================================================== +** Mark functions +** ======================================================= +*/ + + +/* +** mark an object. Userdata, strings, and closed upvalues are visited +** and turned black here. Other objects are marked gray and added +** to appropriate list to be visited (and turned black) later. (Open +** upvalues are already linked in 'headuv' list.) +*/ +static void reallymarkobject (global_State *g, GCObject *o) { + lu_mem size; + white2gray(o); + switch (gch(o)->tt) { + case LUA_TSHRSTR: + case LUA_TLNGSTR: { + size = sizestring(gco2ts(o)); + break; /* nothing else to mark; make it black */ + } + case LUA_TUSERDATA: { + Table *mt = gco2u(o)->metatable; + markobject(g, mt); + markobject(g, gco2u(o)->env); + size = sizeudata(gco2u(o)); + break; + } + case LUA_TUPVAL: { + UpVal *uv = gco2uv(o); + markvalue(g, uv->v); + if (uv->v != &uv->u.value) /* open? */ + return; /* open upvalues remain gray */ + size = sizeof(UpVal); + break; + } + case LUA_TLCL: { + gco2lcl(o)->gclist = g->gray; + g->gray = o; + return; + } + case LUA_TCCL: { + gco2ccl(o)->gclist = g->gray; + g->gray = o; + return; + } + case LUA_TTABLE: { + linktable(gco2t(o), &g->gray); + return; + } + case LUA_TTHREAD: { + gco2th(o)->gclist = g->gray; + g->gray = o; + return; + } + case LUA_TPROTO: { + gco2p(o)->gclist = g->gray; + g->gray = o; + return; + } + default: lua_assert(0); return; + } + gray2black(o); + g->GCmemtrav += size; +} + + +/* +** mark metamethods for basic types +*/ +static void markmt (global_State *g) { + int i; + for (i=0; i < LUA_NUMTAGS; i++) + markobject(g, g->mt[i]); +} + + +/* +** mark all objects in list of being-finalized +*/ +static void markbeingfnz (global_State *g) { + GCObject *o; + for (o = g->tobefnz; o != NULL; o = gch(o)->next) { + makewhite(g, o); + reallymarkobject(g, o); + } +} + + +/* +** mark all values stored in marked open upvalues. (See comment in +** 'lstate.h'.) +*/ +static void remarkupvals (global_State *g) { + UpVal *uv; + for (uv = g->uvhead.u.l.next; uv != &g->uvhead; uv = uv->u.l.next) { + if (isgray(obj2gco(uv))) + markvalue(g, uv->v); + } +} + + +/* +** mark root set and reset all gray lists, to start a new +** incremental (or full) collection +*/ +static void restartcollection (global_State *g) { + g->gray = g->grayagain = NULL; + g->weak = g->allweak = g->ephemeron = NULL; + markobject(g, g->mainthread); + markvalue(g, &g->l_registry); + markmt(g); + markbeingfnz(g); /* mark any finalizing object left from previous cycle */ +} + +/* }====================================================== */ + + +/* +** {====================================================== +** Traverse functions +** ======================================================= +*/ + +static void traverseweakvalue (global_State *g, Table *h) { + Node *n, *limit = gnodelast(h); + /* if there is array part, assume it may have white values (do not + traverse it just to check) */ + int hasclears = (h->sizearray > 0); + for (n = gnode(h, 0); n < limit; n++) { + checkdeadkey(n); + if (ttisnil(gval(n))) /* entry is empty? */ + removeentry(n); /* remove it */ + else { + lua_assert(!ttisnil(gkey(n))); + markvalue(g, gkey(n)); /* mark key */ + if (!hasclears && iscleared(g, gval(n))) /* is there a white value? */ + hasclears = 1; /* table will have to be cleared */ + } + } + if (hasclears) + linktable(h, &g->weak); /* has to be cleared later */ + else /* no white values */ + linktable(h, &g->grayagain); /* no need to clean */ +} + + +static int traverseephemeron (global_State *g, Table *h) { + int marked = 0; /* true if an object is marked in this traversal */ + int hasclears = 0; /* true if table has white keys */ + int prop = 0; /* true if table has entry "white-key -> white-value" */ + Node *n, *limit = gnodelast(h); + int i; + /* traverse array part (numeric keys are 'strong') */ + for (i = 0; i < h->sizearray; i++) { + if (valiswhite(&h->array[i])) { + marked = 1; + reallymarkobject(g, gcvalue(&h->array[i])); + } + } + /* traverse hash part */ + for (n = gnode(h, 0); n < limit; n++) { + checkdeadkey(n); + if (ttisnil(gval(n))) /* entry is empty? */ + removeentry(n); /* remove it */ + else if (iscleared(g, gkey(n))) { /* key is not marked (yet)? */ + hasclears = 1; /* table must be cleared */ + if (valiswhite(gval(n))) /* value not marked yet? */ + prop = 1; /* must propagate again */ + } + else if (valiswhite(gval(n))) { /* value not marked yet? */ + marked = 1; + reallymarkobject(g, gcvalue(gval(n))); /* mark it now */ + } + } + if (prop) + linktable(h, &g->ephemeron); /* have to propagate again */ + else if (hasclears) /* does table have white keys? */ + linktable(h, &g->allweak); /* may have to clean white keys */ + else /* no white keys */ + linktable(h, &g->grayagain); /* no need to clean */ + return marked; +} + + +static void traversestrongtable (global_State *g, Table *h) { + Node *n, *limit = gnodelast(h); + int i; + for (i = 0; i < h->sizearray; i++) /* traverse array part */ + markvalue(g, &h->array[i]); + for (n = gnode(h, 0); n < limit; n++) { /* traverse hash part */ + checkdeadkey(n); + if (ttisnil(gval(n))) /* entry is empty? */ + removeentry(n); /* remove it */ + else { + lua_assert(!ttisnil(gkey(n))); + markvalue(g, gkey(n)); /* mark key */ + markvalue(g, gval(n)); /* mark value */ + } + } +} + + +static lu_mem traversetable (global_State *g, Table *h) { + const char *weakkey, *weakvalue; + const TValue *mode = gfasttm(g, h->metatable, TM_MODE); + markobject(g, h->metatable); + if (mode && ttisstring(mode) && /* is there a weak mode? */ + ((weakkey = strchr(svalue(mode), 'k')), + (weakvalue = strchr(svalue(mode), 'v')), + (weakkey || weakvalue))) { /* is really weak? */ + black2gray(obj2gco(h)); /* keep table gray */ + if (!weakkey) /* strong keys? */ + traverseweakvalue(g, h); + else if (!weakvalue) /* strong values? */ + traverseephemeron(g, h); + else /* all weak */ + linktable(h, &g->allweak); /* nothing to traverse now */ + } + else /* not weak */ + traversestrongtable(g, h); + return sizeof(Table) + sizeof(TValue) * h->sizearray + + sizeof(Node) * cast(size_t, sizenode(h)); +} + + +static int traverseproto (global_State *g, Proto *f) { + int i; + if (f->cache && iswhite(obj2gco(f->cache))) + f->cache = NULL; /* allow cache to be collected */ + markobject(g, f->source); + for (i = 0; i < f->sizek; i++) /* mark literals */ + markvalue(g, &f->k[i]); + for (i = 0; i < f->sizeupvalues; i++) /* mark upvalue names */ + markobject(g, f->upvalues[i].name); + for (i = 0; i < f->sizep; i++) /* mark nested protos */ + markobject(g, f->p[i]); + for (i = 0; i < f->sizelocvars; i++) /* mark local-variable names */ + markobject(g, f->locvars[i].varname); + return sizeof(Proto) + sizeof(Instruction) * f->sizecode + + sizeof(Proto *) * f->sizep + + sizeof(TValue) * f->sizek + + sizeof(int) * f->sizelineinfo + + sizeof(LocVar) * f->sizelocvars + + sizeof(Upvaldesc) * f->sizeupvalues; +} + + +static lu_mem traverseCclosure (global_State *g, CClosure *cl) { + int i; + for (i = 0; i < cl->nupvalues; i++) /* mark its upvalues */ + markvalue(g, &cl->upvalue[i]); + return sizeCclosure(cl->nupvalues); +} + +static lu_mem traverseLclosure (global_State *g, LClosure *cl) { + int i; + markobject(g, cl->p); /* mark its prototype */ + for (i = 0; i < cl->nupvalues; i++) /* mark its upvalues */ + markobject(g, cl->upvals[i]); + return sizeLclosure(cl->nupvalues); +} + + +static lu_mem traversestack (global_State *g, lua_State *th) { + StkId o = th->stack; + if (o == NULL) + return 1; /* stack not completely built yet */ + for (; o < th->top; o++) + markvalue(g, o); + if (g->gcstate == GCSatomic) { /* final traversal? */ + StkId lim = th->stack + th->stacksize; /* real end of stack */ + for (; o < lim; o++) /* clear not-marked stack slice */ + setnilvalue(o); + } + return sizeof(lua_State) + sizeof(TValue) * th->stacksize; +} + + +/* +** traverse one gray object, turning it to black (except for threads, +** which are always gray). +*/ +static void propagatemark (global_State *g) { + lu_mem size; + GCObject *o = g->gray; + lua_assert(isgray(o)); + gray2black(o); + switch (gch(o)->tt) { + case LUA_TTABLE: { + Table *h = gco2t(o); + g->gray = h->gclist; /* remove from 'gray' list */ + size = traversetable(g, h); + break; + } + case LUA_TLCL: { + LClosure *cl = gco2lcl(o); + g->gray = cl->gclist; /* remove from 'gray' list */ + size = traverseLclosure(g, cl); + break; + } + case LUA_TCCL: { + CClosure *cl = gco2ccl(o); + g->gray = cl->gclist; /* remove from 'gray' list */ + size = traverseCclosure(g, cl); + break; + } + case LUA_TTHREAD: { + lua_State *th = gco2th(o); + g->gray = th->gclist; /* remove from 'gray' list */ + th->gclist = g->grayagain; + g->grayagain = o; /* insert into 'grayagain' list */ + black2gray(o); + size = traversestack(g, th); + break; + } + case LUA_TPROTO: { + Proto *p = gco2p(o); + g->gray = p->gclist; /* remove from 'gray' list */ + size = traverseproto(g, p); + break; + } + default: lua_assert(0); return; + } + g->GCmemtrav += size; +} + + +static void propagateall (global_State *g) { + while (g->gray) propagatemark(g); +} + + +static void propagatelist (global_State *g, GCObject *l) { + lua_assert(g->gray == NULL); /* no grays left */ + g->gray = l; + propagateall(g); /* traverse all elements from 'l' */ +} + +/* +** retraverse all gray lists. Because tables may be reinserted in other +** lists when traversed, traverse the original lists to avoid traversing +** twice the same table (which is not wrong, but inefficient) +*/ +static void retraversegrays (global_State *g) { + GCObject *weak = g->weak; /* save original lists */ + GCObject *grayagain = g->grayagain; + GCObject *ephemeron = g->ephemeron; + g->weak = g->grayagain = g->ephemeron = NULL; + propagateall(g); /* traverse main gray list */ + propagatelist(g, grayagain); + propagatelist(g, weak); + propagatelist(g, ephemeron); +} + + +static void convergeephemerons (global_State *g) { + int changed; + do { + GCObject *w; + GCObject *next = g->ephemeron; /* get ephemeron list */ + g->ephemeron = NULL; /* tables will return to this list when traversed */ + changed = 0; + while ((w = next) != NULL) { + next = gco2t(w)->gclist; + if (traverseephemeron(g, gco2t(w))) { /* traverse marked some value? */ + propagateall(g); /* propagate changes */ + changed = 1; /* will have to revisit all ephemeron tables */ + } + } + } while (changed); +} + +/* }====================================================== */ + + +/* +** {====================================================== +** Sweep Functions +** ======================================================= +*/ + + +/* +** clear entries with unmarked keys from all weaktables in list 'l' up +** to element 'f' +*/ +static void clearkeys (global_State *g, GCObject *l, GCObject *f) { + for (; l != f; l = gco2t(l)->gclist) { + Table *h = gco2t(l); + Node *n, *limit = gnodelast(h); + for (n = gnode(h, 0); n < limit; n++) { + if (!ttisnil(gval(n)) && (iscleared(g, gkey(n)))) { + setnilvalue(gval(n)); /* remove value ... */ + removeentry(n); /* and remove entry from table */ + } + } + } +} + + +/* +** clear entries with unmarked values from all weaktables in list 'l' up +** to element 'f' +*/ +static void clearvalues (global_State *g, GCObject *l, GCObject *f) { + for (; l != f; l = gco2t(l)->gclist) { + Table *h = gco2t(l); + Node *n, *limit = gnodelast(h); + int i; + for (i = 0; i < h->sizearray; i++) { + TValue *o = &h->array[i]; + if (iscleared(g, o)) /* value was collected? */ + setnilvalue(o); /* remove value */ + } + for (n = gnode(h, 0); n < limit; n++) { + if (!ttisnil(gval(n)) && iscleared(g, gval(n))) { + setnilvalue(gval(n)); /* remove value ... */ + removeentry(n); /* and remove entry from table */ + } + } + } +} + + +static void freeobj (lua_State *L, GCObject *o) { + switch (gch(o)->tt) { + case LUA_TPROTO: luaF_freeproto(L, gco2p(o)); break; + case LUA_TLCL: { + luaM_freemem(L, o, sizeLclosure(gco2lcl(o)->nupvalues)); + break; + } + case LUA_TCCL: { + luaM_freemem(L, o, sizeCclosure(gco2ccl(o)->nupvalues)); + break; + } + case LUA_TUPVAL: luaF_freeupval(L, gco2uv(o)); break; + case LUA_TTABLE: luaH_free(L, gco2t(o)); break; + case LUA_TTHREAD: luaE_freethread(L, gco2th(o)); break; + case LUA_TUSERDATA: luaM_freemem(L, o, sizeudata(gco2u(o))); break; + case LUA_TSHRSTR: + G(L)->strt.nuse--; + /* go through */ + case LUA_TLNGSTR: { + luaM_freemem(L, o, sizestring(gco2ts(o))); + break; + } + default: lua_assert(0); + } +} + + +#define sweepwholelist(L,p) sweeplist(L,p,MAX_LUMEM) +static GCObject **sweeplist (lua_State *L, GCObject **p, lu_mem count); + + +/* +** sweep the (open) upvalues of a thread and resize its stack and +** list of call-info structures. +*/ +static void sweepthread (lua_State *L, lua_State *L1) { + if (L1->stack == NULL) return; /* stack not completely built yet */ + sweepwholelist(L, &L1->openupval); /* sweep open upvalues */ + luaE_freeCI(L1); /* free extra CallInfo slots */ + /* should not change the stack during an emergency gc cycle */ + if (G(L)->gckind != KGC_EMERGENCY) + luaD_shrinkstack(L1); +} + + +/* +** sweep at most 'count' elements from a list of GCObjects erasing dead +** objects, where a dead (not alive) object is one marked with the "old" +** (non current) white and not fixed. +** In non-generational mode, change all non-dead objects back to white, +** preparing for next collection cycle. +** In generational mode, keep black objects black, and also mark them as +** old; stop when hitting an old object, as all objects after that +** one will be old too. +** When object is a thread, sweep its list of open upvalues too. +*/ +static GCObject **sweeplist (lua_State *L, GCObject **p, lu_mem count) { + global_State *g = G(L); + int ow = otherwhite(g); + int toclear, toset; /* bits to clear and to set in all live objects */ + int tostop; /* stop sweep when this is true */ + if (isgenerational(g)) { /* generational mode? */ + toclear = ~0; /* clear nothing */ + toset = bitmask(OLDBIT); /* set the old bit of all surviving objects */ + tostop = bitmask(OLDBIT); /* do not sweep old generation */ + } + else { /* normal mode */ + toclear = maskcolors; /* clear all color bits + old bit */ + toset = luaC_white(g); /* make object white */ + tostop = 0; /* do not stop */ + } + while (*p != NULL && count-- > 0) { + GCObject *curr = *p; + int marked = gch(curr)->marked; + if (isdeadm(ow, marked)) { /* is 'curr' dead? */ + *p = gch(curr)->next; /* remove 'curr' from list */ + freeobj(L, curr); /* erase 'curr' */ + } + else { + if (testbits(marked, tostop)) + return NULL; /* stop sweeping this list */ + if (gch(curr)->tt == LUA_TTHREAD) + sweepthread(L, gco2th(curr)); /* sweep thread's upvalues */ + /* update marks */ + gch(curr)->marked = cast_byte((marked & toclear) | toset); + p = &gch(curr)->next; /* go to next element */ + } + } + return (*p == NULL) ? NULL : p; +} + + +/* +** sweep a list until a live object (or end of list) +*/ +static GCObject **sweeptolive (lua_State *L, GCObject **p, int *n) { + GCObject ** old = p; + int i = 0; + do { + i++; + p = sweeplist(L, p, 1); + } while (p == old); + if (n) *n += i; + return p; +} + +/* }====================================================== */ + + +/* +** {====================================================== +** Finalization +** ======================================================= +*/ + +static void checkSizes (lua_State *L) { + global_State *g = G(L); + if (g->gckind != KGC_EMERGENCY) { /* do not change sizes in emergency */ + int hs = g->strt.size / 2; /* half the size of the string table */ + if (g->strt.nuse < cast(lu_int32, hs)) /* using less than that half? */ + luaS_resize(L, hs); /* halve its size */ + luaZ_freebuffer(L, &g->buff); /* free concatenation buffer */ + } +} + + +static GCObject *udata2finalize (global_State *g) { + GCObject *o = g->tobefnz; /* get first element */ + lua_assert(isfinalized(o)); + g->tobefnz = gch(o)->next; /* remove it from 'tobefnz' list */ + gch(o)->next = g->allgc; /* return it to 'allgc' list */ + g->allgc = o; + resetbit(gch(o)->marked, SEPARATED); /* mark that it is not in 'tobefnz' */ + lua_assert(!isold(o)); /* see MOVE OLD rule */ + if (!keepinvariantout(g)) /* not keeping invariant? */ + makewhite(g, o); /* "sweep" object */ + return o; +} + + +static void dothecall (lua_State *L, void *ud) { + UNUSED(ud); + luaD_call(L, L->top - 2, 0, 0); +} + + +static void GCTM (lua_State *L, int propagateerrors) { + global_State *g = G(L); + const TValue *tm; + TValue v; + setgcovalue(L, &v, udata2finalize(g)); + tm = luaT_gettmbyobj(L, &v, TM_GC); + if (tm != NULL && ttisfunction(tm)) { /* is there a finalizer? */ + int status; + lu_byte oldah = L->allowhook; + int running = g->gcrunning; + L->allowhook = 0; /* stop debug hooks during GC metamethod */ + g->gcrunning = 0; /* avoid GC steps */ + setobj2s(L, L->top, tm); /* push finalizer... */ + setobj2s(L, L->top + 1, &v); /* ... and its argument */ + L->top += 2; /* and (next line) call the finalizer */ + status = luaD_pcall(L, dothecall, NULL, savestack(L, L->top - 2), 0); + L->allowhook = oldah; /* restore hooks */ + g->gcrunning = running; /* restore state */ + if (status != LUA_OK && propagateerrors) { /* error while running __gc? */ + if (status == LUA_ERRRUN) { /* is there an error object? */ + const char *msg = (ttisstring(L->top - 1)) + ? svalue(L->top - 1) + : "no message"; + luaO_pushfstring(L, "error in __gc metamethod (%s)", msg); + status = LUA_ERRGCMM; /* error in __gc metamethod */ + } + luaD_throw(L, status); /* re-throw error */ + } + } +} + + +/* +** move all unreachable objects (or 'all' objects) that need +** finalization from list 'finobj' to list 'tobefnz' (to be finalized) +*/ +static void separatetobefnz (lua_State *L, int all) { + global_State *g = G(L); + GCObject **p = &g->finobj; + GCObject *curr; + GCObject **lastnext = &g->tobefnz; + /* find last 'next' field in 'tobefnz' list (to add elements in its end) */ + while (*lastnext != NULL) + lastnext = &gch(*lastnext)->next; + while ((curr = *p) != NULL) { /* traverse all finalizable objects */ + lua_assert(!isfinalized(curr)); + lua_assert(testbit(gch(curr)->marked, SEPARATED)); + if (!(iswhite(curr) || all)) /* not being collected? */ + p = &gch(curr)->next; /* don't bother with it */ + else { + l_setbit(gch(curr)->marked, FINALIZEDBIT); /* won't be finalized again */ + *p = gch(curr)->next; /* remove 'curr' from 'finobj' list */ + gch(curr)->next = *lastnext; /* link at the end of 'tobefnz' list */ + *lastnext = curr; + lastnext = &gch(curr)->next; + } + } +} + + +/* +** if object 'o' has a finalizer, remove it from 'allgc' list (must +** search the list to find it) and link it in 'finobj' list. +*/ +void luaC_checkfinalizer (lua_State *L, GCObject *o, Table *mt) { + global_State *g = G(L); + if (testbit(gch(o)->marked, SEPARATED) || /* obj. is already separated... */ + isfinalized(o) || /* ... or is finalized... */ + gfasttm(g, mt, TM_GC) == NULL) /* or has no finalizer? */ + return; /* nothing to be done */ + else { /* move 'o' to 'finobj' list */ + GCObject **p; + GCheader *ho = gch(o); + if (g->sweepgc == &ho->next) { /* avoid removing current sweep object */ + lua_assert(issweepphase(g)); + g->sweepgc = sweeptolive(L, g->sweepgc, NULL); + } + /* search for pointer pointing to 'o' */ + for (p = &g->allgc; *p != o; p = &gch(*p)->next) { /* empty */ } + *p = ho->next; /* remove 'o' from root list */ + ho->next = g->finobj; /* link it in list 'finobj' */ + g->finobj = o; + l_setbit(ho->marked, SEPARATED); /* mark it as such */ + if (!keepinvariantout(g)) /* not keeping invariant? */ + makewhite(g, o); /* "sweep" object */ + else + resetoldbit(o); /* see MOVE OLD rule */ + } +} + +/* }====================================================== */ + + +/* +** {====================================================== +** GC control +** ======================================================= +*/ + + +/* +** set a reasonable "time" to wait before starting a new GC cycle; +** cycle will start when memory use hits threshold +*/ +static void setpause (global_State *g, l_mem estimate) { + l_mem debt, threshold; + estimate = estimate / PAUSEADJ; /* adjust 'estimate' */ + threshold = (g->gcpause < MAX_LMEM / estimate) /* overflow? */ + ? estimate * g->gcpause /* no overflow */ + : MAX_LMEM; /* overflow; truncate to maximum */ + debt = -cast(l_mem, threshold - gettotalbytes(g)); + luaE_setdebt(g, debt); +} + + +#define sweepphases \ + (bitmask(GCSsweepstring) | bitmask(GCSsweepudata) | bitmask(GCSsweep)) + + +/* +** enter first sweep phase (strings) and prepare pointers for other +** sweep phases. The calls to 'sweeptolive' make pointers point to an +** object inside the list (instead of to the header), so that the real +** sweep do not need to skip objects created between "now" and the start +** of the real sweep. +** Returns how many objects it swept. +*/ +static int entersweep (lua_State *L) { + global_State *g = G(L); + int n = 0; + g->gcstate = GCSsweepstring; + lua_assert(g->sweepgc == NULL && g->sweepfin == NULL); + /* prepare to sweep strings, finalizable objects, and regular objects */ + g->sweepstrgc = 0; + g->sweepfin = sweeptolive(L, &g->finobj, &n); + g->sweepgc = sweeptolive(L, &g->allgc, &n); + return n; +} + + +/* +** change GC mode +*/ +void luaC_changemode (lua_State *L, int mode) { + global_State *g = G(L); + if (mode == g->gckind) return; /* nothing to change */ + if (mode == KGC_GEN) { /* change to generational mode */ + /* make sure gray lists are consistent */ + luaC_runtilstate(L, bitmask(GCSpropagate)); + g->GCestimate = gettotalbytes(g); + g->gckind = KGC_GEN; + } + else { /* change to incremental mode */ + /* sweep all objects to turn them back to white + (as white has not changed, nothing extra will be collected) */ + g->gckind = KGC_NORMAL; + entersweep(L); + luaC_runtilstate(L, ~sweepphases); + } +} + + +/* +** call all pending finalizers +*/ +static void callallpendingfinalizers (lua_State *L, int propagateerrors) { + global_State *g = G(L); + while (g->tobefnz) { + resetoldbit(g->tobefnz); + GCTM(L, propagateerrors); + } +} + + +void luaC_freeallobjects (lua_State *L) { + global_State *g = G(L); + int i; + separatetobefnz(L, 1); /* separate all objects with finalizers */ + lua_assert(g->finobj == NULL); + callallpendingfinalizers(L, 0); + g->currentwhite = WHITEBITS; /* this "white" makes all objects look dead */ + g->gckind = KGC_NORMAL; + sweepwholelist(L, &g->finobj); /* finalizers can create objs. in 'finobj' */ + sweepwholelist(L, &g->allgc); + for (i = 0; i < g->strt.size; i++) /* free all string lists */ + sweepwholelist(L, &g->strt.hash[i]); + lua_assert(g->strt.nuse == 0); +} + + +static l_mem atomic (lua_State *L) { + global_State *g = G(L); + l_mem work = -cast(l_mem, g->GCmemtrav); /* start counting work */ + GCObject *origweak, *origall; + lua_assert(!iswhite(obj2gco(g->mainthread))); + markobject(g, L); /* mark running thread */ + /* registry and global metatables may be changed by API */ + markvalue(g, &g->l_registry); + markmt(g); /* mark basic metatables */ + /* remark occasional upvalues of (maybe) dead threads */ + remarkupvals(g); + propagateall(g); /* propagate changes */ + work += g->GCmemtrav; /* stop counting (do not (re)count grays) */ + /* traverse objects caught by write barrier and by 'remarkupvals' */ + retraversegrays(g); + work -= g->GCmemtrav; /* restart counting */ + convergeephemerons(g); + /* at this point, all strongly accessible objects are marked. */ + /* clear values from weak tables, before checking finalizers */ + clearvalues(g, g->weak, NULL); + clearvalues(g, g->allweak, NULL); + origweak = g->weak; origall = g->allweak; + work += g->GCmemtrav; /* stop counting (objects being finalized) */ + separatetobefnz(L, 0); /* separate objects to be finalized */ + markbeingfnz(g); /* mark objects that will be finalized */ + propagateall(g); /* remark, to propagate `preserveness' */ + work -= g->GCmemtrav; /* restart counting */ + convergeephemerons(g); + /* at this point, all resurrected objects are marked. */ + /* remove dead objects from weak tables */ + clearkeys(g, g->ephemeron, NULL); /* clear keys from all ephemeron tables */ + clearkeys(g, g->allweak, NULL); /* clear keys from all allweak tables */ + /* clear values from resurrected weak tables */ + clearvalues(g, g->weak, origweak); + clearvalues(g, g->allweak, origall); + g->currentwhite = cast_byte(otherwhite(g)); /* flip current white */ + work += g->GCmemtrav; /* complete counting */ + return work; /* estimate of memory marked by 'atomic' */ +} + + +static lu_mem singlestep (lua_State *L) { + global_State *g = G(L); + switch (g->gcstate) { + case GCSpause: { + /* start to count memory traversed */ + g->GCmemtrav = g->strt.size * sizeof(GCObject*); + lua_assert(!isgenerational(g)); + restartcollection(g); + g->gcstate = GCSpropagate; + return g->GCmemtrav; + } + case GCSpropagate: { + if (g->gray) { + lu_mem oldtrav = g->GCmemtrav; + propagatemark(g); + return g->GCmemtrav - oldtrav; /* memory traversed in this step */ + } + else { /* no more `gray' objects */ + lu_mem work; + int sw; + g->gcstate = GCSatomic; /* finish mark phase */ + g->GCestimate = g->GCmemtrav; /* save what was counted */; + work = atomic(L); /* add what was traversed by 'atomic' */ + g->GCestimate += work; /* estimate of total memory traversed */ + sw = entersweep(L); + return work + sw * GCSWEEPCOST; + } + } + case GCSsweepstring: { + int i; + for (i = 0; i < GCSWEEPMAX && g->sweepstrgc + i < g->strt.size; i++) + sweepwholelist(L, &g->strt.hash[g->sweepstrgc + i]); + g->sweepstrgc += i; + if (g->sweepstrgc >= g->strt.size) /* no more strings to sweep? */ + g->gcstate = GCSsweepudata; + return i * GCSWEEPCOST; + } + case GCSsweepudata: { + if (g->sweepfin) { + g->sweepfin = sweeplist(L, g->sweepfin, GCSWEEPMAX); + return GCSWEEPMAX*GCSWEEPCOST; + } + else { + g->gcstate = GCSsweep; + return 0; + } + } + case GCSsweep: { + if (g->sweepgc) { + g->sweepgc = sweeplist(L, g->sweepgc, GCSWEEPMAX); + return GCSWEEPMAX*GCSWEEPCOST; + } + else { + /* sweep main thread */ + GCObject *mt = obj2gco(g->mainthread); + sweeplist(L, &mt, 1); + checkSizes(L); + g->gcstate = GCSpause; /* finish collection */ + return GCSWEEPCOST; + } + } + default: lua_assert(0); return 0; + } +} + + +/* +** advances the garbage collector until it reaches a state allowed +** by 'statemask' +*/ +void luaC_runtilstate (lua_State *L, int statesmask) { + global_State *g = G(L); + while (!testbit(statesmask, g->gcstate)) + singlestep(L); +} + + +static void generationalcollection (lua_State *L) { + global_State *g = G(L); + lua_assert(g->gcstate == GCSpropagate); + if (g->GCestimate == 0) { /* signal for another major collection? */ + luaC_fullgc(L, 0); /* perform a full regular collection */ + g->GCestimate = gettotalbytes(g); /* update control */ + } + else { + lu_mem estimate = g->GCestimate; + luaC_runtilstate(L, bitmask(GCSpause)); /* run complete (minor) cycle */ + g->gcstate = GCSpropagate; /* skip restart */ + if (gettotalbytes(g) > (estimate / 100) * g->gcmajorinc) + g->GCestimate = 0; /* signal for a major collection */ + else + g->GCestimate = estimate; /* keep estimate from last major coll. */ + + } + setpause(g, gettotalbytes(g)); + lua_assert(g->gcstate == GCSpropagate); +} + + +static void incstep (lua_State *L) { + global_State *g = G(L); + l_mem debt = g->GCdebt; + int stepmul = g->gcstepmul; + if (stepmul < 40) stepmul = 40; /* avoid ridiculous low values (and 0) */ + /* convert debt from Kb to 'work units' (avoid zero debt and overflows) */ + debt = (debt / STEPMULADJ) + 1; + debt = (debt < MAX_LMEM / stepmul) ? debt * stepmul : MAX_LMEM; + do { /* always perform at least one single step */ + lu_mem work = singlestep(L); /* do some work */ + debt -= work; + } while (debt > -GCSTEPSIZE && g->gcstate != GCSpause); + if (g->gcstate == GCSpause) + setpause(g, g->GCestimate); /* pause until next cycle */ + else { + debt = (debt / stepmul) * STEPMULADJ; /* convert 'work units' to Kb */ + luaE_setdebt(g, debt); + } +} + + +/* +** performs a basic GC step +*/ +void luaC_forcestep (lua_State *L) { + global_State *g = G(L); + int i; + if (isgenerational(g)) generationalcollection(L); + else incstep(L); + /* run a few finalizers (or all of them at the end of a collect cycle) */ + for (i = 0; g->tobefnz && (i < GCFINALIZENUM || g->gcstate == GCSpause); i++) + GCTM(L, 1); /* call one finalizer */ +} + + +/* +** performs a basic GC step only if collector is running +*/ +void luaC_step (lua_State *L) { + global_State *g = G(L); + if (g->gcrunning) luaC_forcestep(L); + else luaE_setdebt(g, -GCSTEPSIZE); /* avoid being called too often */ +} + + + +/* +** performs a full GC cycle; if "isemergency", does not call +** finalizers (which could change stack positions) +*/ +void luaC_fullgc (lua_State *L, int isemergency) { + global_State *g = G(L); + int origkind = g->gckind; + lua_assert(origkind != KGC_EMERGENCY); + if (isemergency) /* do not run finalizers during emergency GC */ + g->gckind = KGC_EMERGENCY; + else { + g->gckind = KGC_NORMAL; + callallpendingfinalizers(L, 1); + } + if (keepinvariant(g)) { /* may there be some black objects? */ + /* must sweep all objects to turn them back to white + (as white has not changed, nothing will be collected) */ + entersweep(L); + } + /* finish any pending sweep phase to start a new cycle */ + luaC_runtilstate(L, bitmask(GCSpause)); + luaC_runtilstate(L, ~bitmask(GCSpause)); /* start new collection */ + luaC_runtilstate(L, bitmask(GCSpause)); /* run entire collection */ + if (origkind == KGC_GEN) { /* generational mode? */ + /* generational mode must be kept in propagate phase */ + luaC_runtilstate(L, bitmask(GCSpropagate)); + } + g->gckind = origkind; + setpause(g, gettotalbytes(g)); + if (!isemergency) /* do not run finalizers during emergency GC */ + callallpendingfinalizers(L, 1); +} + +/* }====================================================== */ + + diff --git a/radio/src/lua/src/lgc.h b/radio/src/lua/src/lgc.h new file mode 100644 index 000000000..dee270b4d --- /dev/null +++ b/radio/src/lua/src/lgc.h @@ -0,0 +1,157 @@ +/* +** $Id: lgc.h,v 2.58 2012/09/11 12:53:08 roberto Exp $ +** Garbage Collector +** See Copyright Notice in lua.h +*/ + +#ifndef lgc_h +#define lgc_h + + +#include "lobject.h" +#include "lstate.h" + +/* +** Collectable objects may have one of three colors: white, which +** means the object is not marked; gray, which means the +** object is marked, but its references may be not marked; and +** black, which means that the object and all its references are marked. +** The main invariant of the garbage collector, while marking objects, +** is that a black object can never point to a white one. Moreover, +** any gray object must be in a "gray list" (gray, grayagain, weak, +** allweak, ephemeron) so that it can be visited again before finishing +** the collection cycle. These lists have no meaning when the invariant +** is not being enforced (e.g., sweep phase). +*/ + + + +/* how much to allocate before next GC step */ +#if !defined(GCSTEPSIZE) +/* ~100 small strings */ +#define GCSTEPSIZE (cast_int(100 * sizeof(TString))) +#endif + + +/* +** Possible states of the Garbage Collector +*/ +#define GCSpropagate 0 +#define GCSatomic 1 +#define GCSsweepstring 2 +#define GCSsweepudata 3 +#define GCSsweep 4 +#define GCSpause 5 + + +#define issweepphase(g) \ + (GCSsweepstring <= (g)->gcstate && (g)->gcstate <= GCSsweep) + +#define isgenerational(g) ((g)->gckind == KGC_GEN) + +/* +** macros to tell when main invariant (white objects cannot point to black +** ones) must be kept. During a non-generational collection, the sweep +** phase may break the invariant, as objects turned white may point to +** still-black objects. The invariant is restored when sweep ends and +** all objects are white again. During a generational collection, the +** invariant must be kept all times. +*/ + +#define keepinvariant(g) (isgenerational(g) || g->gcstate <= GCSatomic) + + +/* +** Outside the collector, the state in generational mode is kept in +** 'propagate', so 'keepinvariant' is always true. +*/ +#define keepinvariantout(g) \ + check_exp(g->gcstate == GCSpropagate || !isgenerational(g), \ + g->gcstate <= GCSatomic) + + +/* +** some useful bit tricks +*/ +#define resetbits(x,m) ((x) &= cast(lu_byte, ~(m))) +#define setbits(x,m) ((x) |= (m)) +#define testbits(x,m) ((x) & (m)) +#define bitmask(b) (1<<(b)) +#define bit2mask(b1,b2) (bitmask(b1) | bitmask(b2)) +#define l_setbit(x,b) setbits(x, bitmask(b)) +#define resetbit(x,b) resetbits(x, bitmask(b)) +#define testbit(x,b) testbits(x, bitmask(b)) + + +/* Layout for bit use in `marked' field: */ +#define WHITE0BIT 0 /* object is white (type 0) */ +#define WHITE1BIT 1 /* object is white (type 1) */ +#define BLACKBIT 2 /* object is black */ +#define FINALIZEDBIT 3 /* object has been separated for finalization */ +#define SEPARATED 4 /* object is in 'finobj' list or in 'tobefnz' */ +#define FIXEDBIT 5 /* object is fixed (should not be collected) */ +#define OLDBIT 6 /* object is old (only in generational mode) */ +/* bit 7 is currently used by tests (luaL_checkmemory) */ + +#define WHITEBITS bit2mask(WHITE0BIT, WHITE1BIT) + + +#define iswhite(x) testbits((x)->gch.marked, WHITEBITS) +#define isblack(x) testbit((x)->gch.marked, BLACKBIT) +#define isgray(x) /* neither white nor black */ \ + (!testbits((x)->gch.marked, WHITEBITS | bitmask(BLACKBIT))) + +#define isold(x) testbit((x)->gch.marked, OLDBIT) + +/* MOVE OLD rule: whenever an object is moved to the beginning of + a GC list, its old bit must be cleared */ +#define resetoldbit(o) resetbit((o)->gch.marked, OLDBIT) + +#define otherwhite(g) (g->currentwhite ^ WHITEBITS) +#define isdeadm(ow,m) (!(((m) ^ WHITEBITS) & (ow))) +#define isdead(g,v) isdeadm(otherwhite(g), (v)->gch.marked) + +#define changewhite(x) ((x)->gch.marked ^= WHITEBITS) +#define gray2black(x) l_setbit((x)->gch.marked, BLACKBIT) + +#define valiswhite(x) (iscollectable(x) && iswhite(gcvalue(x))) + +#define luaC_white(g) cast(lu_byte, (g)->currentwhite & WHITEBITS) + + +#define luaC_condGC(L,c) \ + {if (G(L)->GCdebt > 0) {c;}; condchangemem(L);} +#define luaC_checkGC(L) luaC_condGC(L, luaC_step(L);) + + +#define luaC_barrier(L,p,v) { if (valiswhite(v) && isblack(obj2gco(p))) \ + luaC_barrier_(L,obj2gco(p),gcvalue(v)); } + +#define luaC_barrierback(L,p,v) { if (valiswhite(v) && isblack(obj2gco(p))) \ + luaC_barrierback_(L,p); } + +#define luaC_objbarrier(L,p,o) \ + { if (iswhite(obj2gco(o)) && isblack(obj2gco(p))) \ + luaC_barrier_(L,obj2gco(p),obj2gco(o)); } + +#define luaC_objbarrierback(L,p,o) \ + { if (iswhite(obj2gco(o)) && isblack(obj2gco(p))) luaC_barrierback_(L,p); } + +#define luaC_barrierproto(L,p,c) \ + { if (isblack(obj2gco(p))) luaC_barrierproto_(L,p,c); } + +LUAI_FUNC void luaC_freeallobjects (lua_State *L); +LUAI_FUNC void luaC_step (lua_State *L); +LUAI_FUNC void luaC_forcestep (lua_State *L); +LUAI_FUNC void luaC_runtilstate (lua_State *L, int statesmask); +LUAI_FUNC void luaC_fullgc (lua_State *L, int isemergency); +LUAI_FUNC GCObject *luaC_newobj (lua_State *L, int tt, size_t sz, + GCObject **list, int offset); +LUAI_FUNC void luaC_barrier_ (lua_State *L, GCObject *o, GCObject *v); +LUAI_FUNC void luaC_barrierback_ (lua_State *L, GCObject *o); +LUAI_FUNC void luaC_barrierproto_ (lua_State *L, Proto *p, Closure *c); +LUAI_FUNC void luaC_checkfinalizer (lua_State *L, GCObject *o, Table *mt); +LUAI_FUNC void luaC_checkupvalcolor (global_State *g, UpVal *uv); +LUAI_FUNC void luaC_changemode (lua_State *L, int mode); + +#endif diff --git a/radio/src/lua/src/linit.c b/radio/src/lua/src/linit.c new file mode 100644 index 000000000..58e8c1dd9 --- /dev/null +++ b/radio/src/lua/src/linit.c @@ -0,0 +1,66 @@ +/* +** $Id: linit.c,v 1.32 2011/04/08 19:17:36 roberto Exp $ +** Initialization of libraries for lua.c and other clients +** See Copyright Notice in lua.h +*/ + + +/* +** If you embed Lua in your program and need to open the standard +** libraries, call luaL_openlibs in your program. If you need a +** different set of libraries, copy this file to your project and edit +** it to suit your needs. +*/ + + +#define linit_c + +#include "lua.h" + +#include "lualib.h" +#include "lauxlib.h" + + +/* +** these libs are loaded by lua.c and are readily available to any Lua +** program +*/ +static const luaL_Reg loadedlibs[] = { + {"_G", luaopen_base}, + // {LUA_LOADLIBNAME, luaopen_package}, + // {LUA_COLIBNAME, luaopen_coroutine}, + {LUA_TABLIBNAME, luaopen_table}, + // {LUA_IOLIBNAME, luaopen_io}, + // {LUA_OSLIBNAME, luaopen_os}, + // {LUA_STRLIBNAME, luaopen_string}, + // {LUA_BITLIBNAME, luaopen_bit32}, + {LUA_MATHLIBNAME, luaopen_math}, + // {LUA_DBLIBNAME, luaopen_debug}, + {NULL, NULL} +}; + + +/* +** these libs are preloaded and must be required before used +*/ +static const luaL_Reg preloadedlibs[] = { + {NULL, NULL} +}; + + +LUALIB_API void luaL_openlibs (lua_State *L) { + const luaL_Reg *lib; + /* call open functions from 'loadedlibs' and set results to global table */ + for (lib = loadedlibs; lib->func; lib++) { + luaL_requiref(L, lib->name, lib->func, 1); + lua_pop(L, 1); /* remove lib */ + } + /* add open functions from 'preloadedlibs' into 'package.preload' table */ + luaL_getsubtable(L, LUA_REGISTRYINDEX, "_PRELOAD"); + for (lib = preloadedlibs; lib->func; lib++) { + lua_pushcfunction(L, lib->func); + lua_setfield(L, -2, lib->name); + } + lua_pop(L, 1); /* remove _PRELOAD table */ +} + diff --git a/radio/src/lua/src/liolib.c b/radio/src/lua/src/liolib.c new file mode 100644 index 000000000..8d61394da --- /dev/null +++ b/radio/src/lua/src/liolib.c @@ -0,0 +1,663 @@ +/* +** $Id: liolib.c,v 2.111 2013/03/21 13:57:27 roberto Exp $ +** Standard I/O (and system) library +** See Copyright Notice in lua.h +*/ + + +/* +** POSIX idiosyncrasy! +** This definition must come before the inclusion of 'stdio.h'; it +** should not affect non-POSIX systems +*/ +#if !defined(_FILE_OFFSET_BITS) +#define _FILE_OFFSET_BITS 64 +#endif + + +#include +#include +#include + +#define liolib_c + +#include "lua.h" + +#include "lauxlib.h" +#include "lualib.h" + + +#if !defined(lua_checkmode) + +/* +** Check whether 'mode' matches '[rwa]%+?b?'. +** Change this macro to accept other modes for 'fopen' besides +** the standard ones. +*/ +#define lua_checkmode(mode) \ + (*mode != '\0' && strchr("rwa", *(mode++)) != NULL && \ + (*mode != '+' || ++mode) && /* skip if char is '+' */ \ + (*mode != 'b' || ++mode) && /* skip if char is 'b' */ \ + (*mode == '\0')) + +#endif + +/* +** {====================================================== +** lua_popen spawns a new process connected to the current +** one through the file streams. +** ======================================================= +*/ + +#if !defined(lua_popen) /* { */ + +#if defined(LUA_USE_POPEN) /* { */ + +#define lua_popen(L,c,m) ((void)L, fflush(NULL), popen(c,m)) +#define lua_pclose(L,file) ((void)L, pclose(file)) + +#elif defined(LUA_WIN) /* }{ */ + +#define lua_popen(L,c,m) ((void)L, _popen(c,m)) +#define lua_pclose(L,file) ((void)L, _pclose(file)) + + +#else /* }{ */ + +#define lua_popen(L,c,m) ((void)((void)c, m), \ + luaL_error(L, LUA_QL("popen") " not supported"), (FILE*)0) +#define lua_pclose(L,file) ((void)((void)L, file), -1) + + +#endif /* } */ + +#endif /* } */ + +/* }====================================================== */ + + +/* +** {====================================================== +** lua_fseek/lua_ftell: configuration for longer offsets +** ======================================================= +*/ + +#if !defined(lua_fseek) /* { */ + +#if defined(LUA_USE_POSIX) + +#define l_fseek(f,o,w) fseeko(f,o,w) +#define l_ftell(f) ftello(f) +#define l_seeknum off_t + +#elif defined(LUA_WIN) && !defined(_CRTIMP_TYPEINFO) \ + && defined(_MSC_VER) && (_MSC_VER >= 1400) +/* Windows (but not DDK) and Visual C++ 2005 or higher */ + +#define l_fseek(f,o,w) _fseeki64(f,o,w) +#define l_ftell(f) _ftelli64(f) +#define l_seeknum __int64 + +#else + +#define l_fseek(f,o,w) fseek(f,o,w) +#define l_ftell(f) ftell(f) +#define l_seeknum long + +#endif + +#endif /* } */ + +/* }====================================================== */ + + +#define IO_PREFIX "_IO_" +#define IO_INPUT (IO_PREFIX "input") +#define IO_OUTPUT (IO_PREFIX "output") + + +typedef luaL_Stream LStream; + + +#define tolstream(L) ((LStream *)luaL_checkudata(L, 1, LUA_FILEHANDLE)) + +#define isclosed(p) ((p)->closef == NULL) + + +static int io_type (lua_State *L) { + LStream *p; + luaL_checkany(L, 1); + p = (LStream *)luaL_testudata(L, 1, LUA_FILEHANDLE); + if (p == NULL) + lua_pushnil(L); /* not a file */ + else if (isclosed(p)) + lua_pushliteral(L, "closed file"); + else + lua_pushliteral(L, "file"); + return 1; +} + + +static int f_tostring (lua_State *L) { + LStream *p = tolstream(L); + if (isclosed(p)) + lua_pushliteral(L, "file (closed)"); + else + lua_pushfstring(L, "file (%p)", p->f); + return 1; +} + + +static FILE *tofile (lua_State *L) { + LStream *p = tolstream(L); + if (isclosed(p)) + luaL_error(L, "attempt to use a closed file"); + lua_assert(p->f); + return p->f; +} + + +/* +** When creating file handles, always creates a `closed' file handle +** before opening the actual file; so, if there is a memory error, the +** file is not left opened. +*/ +static LStream *newprefile (lua_State *L) { + LStream *p = (LStream *)lua_newuserdata(L, sizeof(LStream)); + p->closef = NULL; /* mark file handle as 'closed' */ + luaL_setmetatable(L, LUA_FILEHANDLE); + return p; +} + + +static int aux_close (lua_State *L) { + LStream *p = tolstream(L); + lua_CFunction cf = p->closef; + p->closef = NULL; /* mark stream as closed */ + return (*cf)(L); /* close it */ +} + + +static int io_close (lua_State *L) { + if (lua_isnone(L, 1)) /* no argument? */ + lua_getfield(L, LUA_REGISTRYINDEX, IO_OUTPUT); /* use standard output */ + tofile(L); /* make sure argument is an open stream */ + return aux_close(L); +} + + +static int f_gc (lua_State *L) { + LStream *p = tolstream(L); + if (!isclosed(p) && p->f != NULL) + aux_close(L); /* ignore closed and incompletely open files */ + return 0; +} + + +/* +** function to close regular files +*/ +static int io_fclose (lua_State *L) { + LStream *p = tolstream(L); + int res = fclose(p->f); + return luaL_fileresult(L, (res == 0), NULL); +} + + +static LStream *newfile (lua_State *L) { + LStream *p = newprefile(L); + p->f = NULL; + p->closef = &io_fclose; + return p; +} + + +static void opencheck (lua_State *L, const char *fname, const char *mode) { + LStream *p = newfile(L); + p->f = fopen(fname, mode); + if (p->f == NULL) + luaL_error(L, "cannot open file " LUA_QS " (%s)", fname, strerror(errno)); +} + + +static int io_open (lua_State *L) { + const char *filename = luaL_checkstring(L, 1); + const char *mode = luaL_optstring(L, 2, "r"); + LStream *p = newfile(L); + const char *md = mode; /* to traverse/check mode */ + luaL_argcheck(L, lua_checkmode(md), 2, "invalid mode"); + p->f = fopen(filename, mode); + return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1; +} + + +/* +** function to close 'popen' files +*/ +static int io_pclose (lua_State *L) { + LStream *p = tolstream(L); + return luaL_execresult(L, lua_pclose(L, p->f)); +} + + +static int io_popen (lua_State *L) { + const char *filename = luaL_checkstring(L, 1); + const char *mode = luaL_optstring(L, 2, "r"); + LStream *p = newprefile(L); + p->f = lua_popen(L, filename, mode); + p->closef = &io_pclose; + return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1; +} + + +static int io_tmpfile (lua_State *L) { + LStream *p = newfile(L); + p->f = tmpfile(); + return (p->f == NULL) ? luaL_fileresult(L, 0, NULL) : 1; +} + + +static FILE *getiofile (lua_State *L, const char *findex) { + LStream *p; + lua_getfield(L, LUA_REGISTRYINDEX, findex); + p = (LStream *)lua_touserdata(L, -1); + if (isclosed(p)) + luaL_error(L, "standard %s file is closed", findex + strlen(IO_PREFIX)); + return p->f; +} + + +static int g_iofile (lua_State *L, const char *f, const char *mode) { + if (!lua_isnoneornil(L, 1)) { + const char *filename = lua_tostring(L, 1); + if (filename) + opencheck(L, filename, mode); + else { + tofile(L); /* check that it's a valid file handle */ + lua_pushvalue(L, 1); + } + lua_setfield(L, LUA_REGISTRYINDEX, f); + } + /* return current value */ + lua_getfield(L, LUA_REGISTRYINDEX, f); + return 1; +} + + +static int io_input (lua_State *L) { + return g_iofile(L, IO_INPUT, "r"); +} + + +static int io_output (lua_State *L) { + return g_iofile(L, IO_OUTPUT, "w"); +} + + +static int io_readline (lua_State *L); + + +static void aux_lines (lua_State *L, int toclose) { + int i; + int n = lua_gettop(L) - 1; /* number of arguments to read */ + /* ensure that arguments will fit here and into 'io_readline' stack */ + luaL_argcheck(L, n <= LUA_MINSTACK - 3, LUA_MINSTACK - 3, "too many options"); + lua_pushvalue(L, 1); /* file handle */ + lua_pushinteger(L, n); /* number of arguments to read */ + lua_pushboolean(L, toclose); /* close/not close file when finished */ + for (i = 1; i <= n; i++) lua_pushvalue(L, i + 1); /* copy arguments */ + lua_pushcclosure(L, io_readline, 3 + n); +} + + +static int f_lines (lua_State *L) { + tofile(L); /* check that it's a valid file handle */ + aux_lines(L, 0); + return 1; +} + + +static int io_lines (lua_State *L) { + int toclose; + if (lua_isnone(L, 1)) lua_pushnil(L); /* at least one argument */ + if (lua_isnil(L, 1)) { /* no file name? */ + lua_getfield(L, LUA_REGISTRYINDEX, IO_INPUT); /* get default input */ + lua_replace(L, 1); /* put it at index 1 */ + tofile(L); /* check that it's a valid file handle */ + toclose = 0; /* do not close it after iteration */ + } + else { /* open a new file */ + const char *filename = luaL_checkstring(L, 1); + opencheck(L, filename, "r"); + lua_replace(L, 1); /* put file at index 1 */ + toclose = 1; /* close it after iteration */ + } + aux_lines(L, toclose); + return 1; +} + + +/* +** {====================================================== +** READ +** ======================================================= +*/ + + +static int read_number (lua_State *L, FILE *f) { + lua_Number d; + if (fscanf(f, LUA_NUMBER_SCAN, &d) == 1) { + lua_pushnumber(L, d); + return 1; + } + else { + lua_pushnil(L); /* "result" to be removed */ + return 0; /* read fails */ + } +} + + +static int test_eof (lua_State *L, FILE *f) { + int c = lua_getc(f); + ungetc(c, f); + lua_pushlstring(L, NULL, 0); + return (c != EOF); +} + + +static int read_line (lua_State *L, FILE *f, int chop) { + luaL_Buffer b; + luaL_buffinit(L, &b); + for (;;) { + size_t l; + char *p = luaL_prepbuffer(&b); + if (fgets(p, LUAL_BUFFERSIZE, f) == NULL) { /* eof? */ + luaL_pushresult(&b); /* close buffer */ + return (lua_rawlen(L, -1) > 0); /* check whether read something */ + } + l = strlen(p); + if (l == 0 || p[l-1] != '\n') + luaL_addsize(&b, l); + else { + luaL_addsize(&b, l - chop); /* chop 'eol' if needed */ + luaL_pushresult(&b); /* close buffer */ + return 1; /* read at least an `eol' */ + } + } +} + + +#define MAX_SIZE_T (~(size_t)0) + +static void read_all (lua_State *L, FILE *f) { + size_t rlen = LUAL_BUFFERSIZE; /* how much to read in each cycle */ + luaL_Buffer b; + luaL_buffinit(L, &b); + for (;;) { + char *p = luaL_prepbuffsize(&b, rlen); + size_t nr = fread(p, sizeof(char), rlen, f); + luaL_addsize(&b, nr); + if (nr < rlen) break; /* eof? */ + else if (rlen <= (MAX_SIZE_T / 4)) /* avoid buffers too large */ + rlen *= 2; /* double buffer size at each iteration */ + } + luaL_pushresult(&b); /* close buffer */ +} + + +static int read_chars (lua_State *L, FILE *f, size_t n) { + size_t nr; /* number of chars actually read */ + char *p; + luaL_Buffer b; + luaL_buffinit(L, &b); + p = luaL_prepbuffsize(&b, n); /* prepare buffer to read whole block */ + nr = fread(p, sizeof(char), n, f); /* try to read 'n' chars */ + luaL_addsize(&b, nr); + luaL_pushresult(&b); /* close buffer */ + return (nr > 0); /* true iff read something */ +} + + +static int g_read (lua_State *L, FILE *f, int first) { + int nargs = lua_gettop(L) - 1; + int success; + int n; + clearerr(f); + if (nargs == 0) { /* no arguments? */ + success = read_line(L, f, 1); + n = first+1; /* to return 1 result */ + } + else { /* ensure stack space for all results and for auxlib's buffer */ + luaL_checkstack(L, nargs+LUA_MINSTACK, "too many arguments"); + success = 1; + for (n = first; nargs-- && success; n++) { + if (lua_type(L, n) == LUA_TNUMBER) { + size_t l = (size_t)lua_tointeger(L, n); + success = (l == 0) ? test_eof(L, f) : read_chars(L, f, l); + } + else { + const char *p = lua_tostring(L, n); + luaL_argcheck(L, p && p[0] == '*', n, "invalid option"); + switch (p[1]) { + case 'n': /* number */ + success = read_number(L, f); + break; + case 'l': /* line */ + success = read_line(L, f, 1); + break; + case 'L': /* line with end-of-line */ + success = read_line(L, f, 0); + break; + case 'a': /* file */ + read_all(L, f); /* read entire file */ + success = 1; /* always success */ + break; + default: + return luaL_argerror(L, n, "invalid format"); + } + } + } + } + if (ferror(f)) + return luaL_fileresult(L, 0, NULL); + if (!success) { + lua_pop(L, 1); /* remove last result */ + lua_pushnil(L); /* push nil instead */ + } + return n - first; +} + + +static int io_read (lua_State *L) { + return g_read(L, getiofile(L, IO_INPUT), 1); +} + + +static int f_read (lua_State *L) { + return g_read(L, tofile(L), 2); +} + + +static int io_readline (lua_State *L) { + LStream *p = (LStream *)lua_touserdata(L, lua_upvalueindex(1)); + int i; + int n = (int)lua_tointeger(L, lua_upvalueindex(2)); + if (isclosed(p)) /* file is already closed? */ + return luaL_error(L, "file is already closed"); + lua_settop(L , 1); + for (i = 1; i <= n; i++) /* push arguments to 'g_read' */ + lua_pushvalue(L, lua_upvalueindex(3 + i)); + n = g_read(L, p->f, 2); /* 'n' is number of results */ + lua_assert(n > 0); /* should return at least a nil */ + if (!lua_isnil(L, -n)) /* read at least one value? */ + return n; /* return them */ + else { /* first result is nil: EOF or error */ + if (n > 1) { /* is there error information? */ + /* 2nd result is error message */ + return luaL_error(L, "%s", lua_tostring(L, -n + 1)); + } + if (lua_toboolean(L, lua_upvalueindex(3))) { /* generator created file? */ + lua_settop(L, 0); + lua_pushvalue(L, lua_upvalueindex(1)); + aux_close(L); /* close it */ + } + return 0; + } +} + +/* }====================================================== */ + + +static int g_write (lua_State *L, FILE *f, int arg) { + int nargs = lua_gettop(L) - arg; + int status = 1; + for (; nargs--; arg++) { + if (lua_type(L, arg) == LUA_TNUMBER) { + /* optimization: could be done exactly as for strings */ + status = status && + fprintf(f, LUA_NUMBER_FMT, lua_tonumber(L, arg)) > 0; + } + else { + size_t l; + const char *s = luaL_checklstring(L, arg, &l); + status = status && (fwrite(s, sizeof(char), l, f) == l); + } + } + if (status) return 1; /* file handle already on stack top */ + else return luaL_fileresult(L, status, NULL); +} + + +static int io_write (lua_State *L) { + return g_write(L, getiofile(L, IO_OUTPUT), 1); +} + + +static int f_write (lua_State *L) { + FILE *f = tofile(L); + lua_pushvalue(L, 1); /* push file at the stack top (to be returned) */ + return g_write(L, f, 2); +} + + +static int f_seek (lua_State *L) { + static const int mode[] = {SEEK_SET, SEEK_CUR, SEEK_END}; + static const char *const modenames[] = {"set", "cur", "end", NULL}; + FILE *f = tofile(L); + int op = luaL_checkoption(L, 2, "cur", modenames); + lua_Number p3 = luaL_optnumber(L, 3, 0); + l_seeknum offset = (l_seeknum)p3; + luaL_argcheck(L, (lua_Number)offset == p3, 3, + "not an integer in proper range"); + op = l_fseek(f, offset, mode[op]); + if (op) + return luaL_fileresult(L, 0, NULL); /* error */ + else { + lua_pushnumber(L, (lua_Number)l_ftell(f)); + return 1; + } +} + + +static int f_setvbuf (lua_State *L) { + static const int mode[] = {_IONBF, _IOFBF, _IOLBF}; + static const char *const modenames[] = {"no", "full", "line", NULL}; + FILE *f = tofile(L); + int op = luaL_checkoption(L, 2, NULL, modenames); + lua_Integer sz = luaL_optinteger(L, 3, LUAL_BUFFERSIZE); + int res = setvbuf(f, NULL, mode[op], sz); + return luaL_fileresult(L, res == 0, NULL); +} + + + +static int io_flush (lua_State *L) { + return luaL_fileresult(L, fflush(getiofile(L, IO_OUTPUT)) == 0, NULL); +} + + +static int f_flush (lua_State *L) { + return luaL_fileresult(L, fflush(tofile(L)) == 0, NULL); +} + + +/* +** functions for 'io' library +*/ +static const luaL_Reg iolib[] = { + {"close", io_close}, + {"flush", io_flush}, + {"input", io_input}, + {"lines", io_lines}, + {"open", io_open}, + {"output", io_output}, + {"popen", io_popen}, + {"read", io_read}, + {"tmpfile", io_tmpfile}, + {"type", io_type}, + {"write", io_write}, + {NULL, NULL} +}; + + +/* +** methods for file handles +*/ +static const luaL_Reg flib[] = { + {"close", io_close}, + {"flush", f_flush}, + {"lines", f_lines}, + {"read", f_read}, + {"seek", f_seek}, + {"setvbuf", f_setvbuf}, + {"write", f_write}, + {"__gc", f_gc}, + {"__tostring", f_tostring}, + {NULL, NULL} +}; + + +static void createmeta (lua_State *L) { + luaL_newmetatable(L, LUA_FILEHANDLE); /* create metatable for file handles */ + lua_pushvalue(L, -1); /* push metatable */ + lua_setfield(L, -2, "__index"); /* metatable.__index = metatable */ + luaL_setfuncs(L, flib, 0); /* add file methods to new metatable */ + lua_pop(L, 1); /* pop new metatable */ +} + + +/* +** function to (not) close the standard files stdin, stdout, and stderr +*/ +static int io_noclose (lua_State *L) { + LStream *p = tolstream(L); + p->closef = &io_noclose; /* keep file opened */ + lua_pushnil(L); + lua_pushliteral(L, "cannot close standard file"); + return 2; +} + + +static void createstdfile (lua_State *L, FILE *f, const char *k, + const char *fname) { + LStream *p = newprefile(L); + p->f = f; + p->closef = &io_noclose; + if (k != NULL) { + lua_pushvalue(L, -1); + lua_setfield(L, LUA_REGISTRYINDEX, k); /* add file to registry */ + } + lua_setfield(L, -2, fname); /* add file to module */ +} + + +LUAMOD_API int luaopen_io (lua_State *L) { + luaL_newlib(L, iolib); /* new module */ + createmeta(L); + /* create (and set) default files */ + createstdfile(L, stdin, IO_INPUT, "stdin"); + createstdfile(L, stdout, IO_OUTPUT, "stdout"); + createstdfile(L, stderr, NULL, "stderr"); + return 1; +} + diff --git a/radio/src/lua/src/llex.c b/radio/src/lua/src/llex.c new file mode 100644 index 000000000..1a32e348b --- /dev/null +++ b/radio/src/lua/src/llex.c @@ -0,0 +1,527 @@ +/* +** $Id: llex.c,v 2.63 2013/03/16 21:10:18 roberto Exp $ +** Lexical Analyzer +** See Copyright Notice in lua.h +*/ + + +#include +#include + +#define llex_c +#define LUA_CORE + +#include "lua.h" + +#include "lctype.h" +#include "ldo.h" +#include "llex.h" +#include "lobject.h" +#include "lparser.h" +#include "lstate.h" +#include "lstring.h" +#include "ltable.h" +#include "lzio.h" + + + +#define next(ls) (ls->current = zgetc(ls->z)) + + + +#define currIsNewline(ls) (ls->current == '\n' || ls->current == '\r') + + +/* ORDER RESERVED */ +static const char *const luaX_tokens [] = { + "and", "break", "do", "else", "elseif", + "end", "false", "for", "function", "goto", "if", + "in", "local", "nil", "not", "or", "repeat", + "return", "then", "true", "until", "while", + "..", "...", "==", ">=", "<=", "~=", "::", "", + "", "", "" +}; + + +#define save_and_next(ls) (save(ls, ls->current), next(ls)) + + +static l_noret lexerror (LexState *ls, const char *msg, int token); + + +static void save (LexState *ls, int c) { + Mbuffer *b = ls->buff; + if (luaZ_bufflen(b) + 1 > luaZ_sizebuffer(b)) { + size_t newsize; + if (luaZ_sizebuffer(b) >= MAX_SIZET/2) + lexerror(ls, "lexical element too long", 0); + newsize = luaZ_sizebuffer(b) * 2; + luaZ_resizebuffer(ls->L, b, newsize); + } + b->buffer[luaZ_bufflen(b)++] = cast(char, c); +} + + +void luaX_init (lua_State *L) { + int i; + for (i=0; itsv.extra = cast_byte(i+1); /* reserved word */ + } +} + + +const char *luaX_token2str (LexState *ls, int token) { + if (token < FIRST_RESERVED) { /* single-byte symbols? */ + lua_assert(token == cast(unsigned char, token)); + return (lisprint(token)) ? luaO_pushfstring(ls->L, LUA_QL("%c"), token) : + luaO_pushfstring(ls->L, "char(%d)", token); + } + else { + const char *s = luaX_tokens[token - FIRST_RESERVED]; + if (token < TK_EOS) /* fixed format (symbols and reserved words)? */ + return luaO_pushfstring(ls->L, LUA_QS, s); + else /* names, strings, and numerals */ + return s; + } +} + + +static const char *txtToken (LexState *ls, int token) { + switch (token) { + case TK_NAME: + case TK_STRING: + case TK_NUMBER: + save(ls, '\0'); + return luaO_pushfstring(ls->L, LUA_QS, luaZ_buffer(ls->buff)); + default: + return luaX_token2str(ls, token); + } +} + + +static l_noret lexerror (LexState *ls, const char *msg, int token) { + char buff[LUA_IDSIZE]; + luaO_chunkid(buff, getstr(ls->source), LUA_IDSIZE); + msg = luaO_pushfstring(ls->L, "%s:%d: %s", buff, ls->linenumber, msg); + if (token) + luaO_pushfstring(ls->L, "%s near %s", msg, txtToken(ls, token)); + luaD_throw(ls->L, LUA_ERRSYNTAX); +} + + +l_noret luaX_syntaxerror (LexState *ls, const char *msg) { + lexerror(ls, msg, ls->t.token); +} + + +/* +** creates a new string and anchors it in function's table so that +** it will not be collected until the end of the function's compilation +** (by that time it should be anchored in function's prototype) +*/ +TString *luaX_newstring (LexState *ls, const char *str, size_t l) { + lua_State *L = ls->L; + TValue *o; /* entry for `str' */ + TString *ts = luaS_newlstr(L, str, l); /* create new string */ + setsvalue2s(L, L->top++, ts); /* temporarily anchor it in stack */ + o = luaH_set(L, ls->fs->h, L->top - 1); + if (ttisnil(o)) { /* not in use yet? (see 'addK') */ + /* boolean value does not need GC barrier; + table has no metatable, so it does not need to invalidate cache */ + setbvalue(o, 1); /* t[string] = true */ + luaC_checkGC(L); + } + L->top--; /* remove string from stack */ + return ts; +} + + +/* +** increment line number and skips newline sequence (any of +** \n, \r, \n\r, or \r\n) +*/ +static void inclinenumber (LexState *ls) { + int old = ls->current; + lua_assert(currIsNewline(ls)); + next(ls); /* skip `\n' or `\r' */ + if (currIsNewline(ls) && ls->current != old) + next(ls); /* skip `\n\r' or `\r\n' */ + if (++ls->linenumber >= MAX_INT) + luaX_syntaxerror(ls, "chunk has too many lines"); +} + + +void luaX_setinput (lua_State *L, LexState *ls, ZIO *z, TString *source, + int firstchar) { + ls->decpoint = '.'; + ls->L = L; + ls->current = firstchar; + ls->lookahead.token = TK_EOS; /* no look-ahead token */ + ls->z = z; + ls->fs = NULL; + ls->linenumber = 1; + ls->lastline = 1; + ls->source = source; + ls->envn = luaS_new(L, LUA_ENV); /* create env name */ + luaS_fix(ls->envn); /* never collect this name */ + luaZ_resizebuffer(ls->L, ls->buff, LUA_MINBUFFER); /* initialize buffer */ +} + + + +/* +** ======================================================= +** LEXICAL ANALYZER +** ======================================================= +*/ + + + +static int check_next (LexState *ls, const char *set) { + if (ls->current == '\0' || !strchr(set, ls->current)) + return 0; + save_and_next(ls); + return 1; +} + + +/* +** change all characters 'from' in buffer to 'to' +*/ +static void buffreplace (LexState *ls, char from, char to) { + size_t n = luaZ_bufflen(ls->buff); + char *p = luaZ_buffer(ls->buff); + while (n--) + if (p[n] == from) p[n] = to; +} + + +#if !defined(getlocaledecpoint) +#define getlocaledecpoint() (localeconv()->decimal_point[0]) +#endif + + +#define buff2d(b,e) luaO_str2d(luaZ_buffer(b), luaZ_bufflen(b) - 1, e) + +/* +** in case of format error, try to change decimal point separator to +** the one defined in the current locale and check again +*/ +static void trydecpoint (LexState *ls, SemInfo *seminfo) { + char old = ls->decpoint; + ls->decpoint = getlocaledecpoint(); + buffreplace(ls, old, ls->decpoint); /* try new decimal separator */ + if (!buff2d(ls->buff, &seminfo->r)) { + /* format error with correct decimal point: no more options */ + buffreplace(ls, ls->decpoint, '.'); /* undo change (for error message) */ + lexerror(ls, "malformed number", TK_NUMBER); + } +} + + +/* LUA_NUMBER */ +/* +** this function is quite liberal in what it accepts, as 'luaO_str2d' +** will reject ill-formed numerals. +*/ +static void read_numeral (LexState *ls, SemInfo *seminfo) { + const char *expo = "Ee"; + int first = ls->current; + lua_assert(lisdigit(ls->current)); + save_and_next(ls); + if (first == '0' && check_next(ls, "Xx")) /* hexadecimal? */ + expo = "Pp"; + for (;;) { + if (check_next(ls, expo)) /* exponent part? */ + check_next(ls, "+-"); /* optional exponent sign */ + if (lisxdigit(ls->current) || ls->current == '.') + save_and_next(ls); + else break; + } + save(ls, '\0'); + buffreplace(ls, '.', ls->decpoint); /* follow locale for decimal point */ + if (!buff2d(ls->buff, &seminfo->r)) /* format error? */ + trydecpoint(ls, seminfo); /* try to update decimal point separator */ +} + + +/* +** skip a sequence '[=*[' or ']=*]' and return its number of '='s or +** -1 if sequence is malformed +*/ +static int skip_sep (LexState *ls) { + int count = 0; + int s = ls->current; + lua_assert(s == '[' || s == ']'); + save_and_next(ls); + while (ls->current == '=') { + save_and_next(ls); + count++; + } + return (ls->current == s) ? count : (-count) - 1; +} + + +static void read_long_string (LexState *ls, SemInfo *seminfo, int sep) { + save_and_next(ls); /* skip 2nd `[' */ + if (currIsNewline(ls)) /* string starts with a newline? */ + inclinenumber(ls); /* skip it */ + for (;;) { + switch (ls->current) { + case EOZ: + lexerror(ls, (seminfo) ? "unfinished long string" : + "unfinished long comment", TK_EOS); + break; /* to avoid warnings */ + case ']': { + if (skip_sep(ls) == sep) { + save_and_next(ls); /* skip 2nd `]' */ + goto endloop; + } + break; + } + case '\n': case '\r': { + save(ls, '\n'); + inclinenumber(ls); + if (!seminfo) luaZ_resetbuffer(ls->buff); /* avoid wasting space */ + break; + } + default: { + if (seminfo) save_and_next(ls); + else next(ls); + } + } + } endloop: + if (seminfo) + seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + (2 + sep), + luaZ_bufflen(ls->buff) - 2*(2 + sep)); +} + + +static void escerror (LexState *ls, int *c, int n, const char *msg) { + int i; + luaZ_resetbuffer(ls->buff); /* prepare error message */ + save(ls, '\\'); + for (i = 0; i < n && c[i] != EOZ; i++) + save(ls, c[i]); + lexerror(ls, msg, TK_STRING); +} + + +static int readhexaesc (LexState *ls) { + int c[3], i; /* keep input for error message */ + int r = 0; /* result accumulator */ + c[0] = 'x'; /* for error message */ + for (i = 1; i < 3; i++) { /* read two hexadecimal digits */ + c[i] = next(ls); + if (!lisxdigit(c[i])) + escerror(ls, c, i + 1, "hexadecimal digit expected"); + r = (r << 4) + luaO_hexavalue(c[i]); + } + return r; +} + + +static int readdecesc (LexState *ls) { + int c[3], i; + int r = 0; /* result accumulator */ + for (i = 0; i < 3 && lisdigit(ls->current); i++) { /* read up to 3 digits */ + c[i] = ls->current; + r = 10*r + c[i] - '0'; + next(ls); + } + if (r > UCHAR_MAX) + escerror(ls, c, i, "decimal escape too large"); + return r; +} + + +static void read_string (LexState *ls, int del, SemInfo *seminfo) { + save_and_next(ls); /* keep delimiter (for error messages) */ + while (ls->current != del) { + switch (ls->current) { + case EOZ: + lexerror(ls, "unfinished string", TK_EOS); + break; /* to avoid warnings */ + case '\n': + case '\r': + lexerror(ls, "unfinished string", TK_STRING); + break; /* to avoid warnings */ + case '\\': { /* escape sequences */ + int c; /* final character to be saved */ + next(ls); /* do not save the `\' */ + switch (ls->current) { + case 'a': c = '\a'; goto read_save; + case 'b': c = '\b'; goto read_save; + case 'f': c = '\f'; goto read_save; + case 'n': c = '\n'; goto read_save; + case 'r': c = '\r'; goto read_save; + case 't': c = '\t'; goto read_save; + case 'v': c = '\v'; goto read_save; + case 'x': c = readhexaesc(ls); goto read_save; + case '\n': case '\r': + inclinenumber(ls); c = '\n'; goto only_save; + case '\\': case '\"': case '\'': + c = ls->current; goto read_save; + case EOZ: goto no_save; /* will raise an error next loop */ + case 'z': { /* zap following span of spaces */ + next(ls); /* skip the 'z' */ + while (lisspace(ls->current)) { + if (currIsNewline(ls)) inclinenumber(ls); + else next(ls); + } + goto no_save; + } + default: { + if (!lisdigit(ls->current)) + escerror(ls, &ls->current, 1, "invalid escape sequence"); + /* digital escape \ddd */ + c = readdecesc(ls); + goto only_save; + } + } + read_save: next(ls); /* read next character */ + only_save: save(ls, c); /* save 'c' */ + no_save: break; + } + default: + save_and_next(ls); + } + } + save_and_next(ls); /* skip delimiter */ + seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + 1, + luaZ_bufflen(ls->buff) - 2); +} + + +static int llex (LexState *ls, SemInfo *seminfo) { + luaZ_resetbuffer(ls->buff); + for (;;) { + switch (ls->current) { + case '\n': case '\r': { /* line breaks */ + inclinenumber(ls); + break; + } + case ' ': case '\f': case '\t': case '\v': { /* spaces */ + next(ls); + break; + } + case '-': { /* '-' or '--' (comment) */ + next(ls); + if (ls->current != '-') return '-'; + /* else is a comment */ + next(ls); + if (ls->current == '[') { /* long comment? */ + int sep = skip_sep(ls); + luaZ_resetbuffer(ls->buff); /* `skip_sep' may dirty the buffer */ + if (sep >= 0) { + read_long_string(ls, NULL, sep); /* skip long comment */ + luaZ_resetbuffer(ls->buff); /* previous call may dirty the buff. */ + break; + } + } + /* else short comment */ + while (!currIsNewline(ls) && ls->current != EOZ) + next(ls); /* skip until end of line (or end of file) */ + break; + } + case '[': { /* long string or simply '[' */ + int sep = skip_sep(ls); + if (sep >= 0) { + read_long_string(ls, seminfo, sep); + return TK_STRING; + } + else if (sep == -1) return '['; + else lexerror(ls, "invalid long string delimiter", TK_STRING); + } + case '=': { + next(ls); + if (ls->current != '=') return '='; + else { next(ls); return TK_EQ; } + } + case '<': { + next(ls); + if (ls->current != '=') return '<'; + else { next(ls); return TK_LE; } + } + case '>': { + next(ls); + if (ls->current != '=') return '>'; + else { next(ls); return TK_GE; } + } + case '~': { + next(ls); + if (ls->current != '=') return '~'; + else { next(ls); return TK_NE; } + } + case ':': { + next(ls); + if (ls->current != ':') return ':'; + else { next(ls); return TK_DBCOLON; } + } + case '"': case '\'': { /* short literal strings */ + read_string(ls, ls->current, seminfo); + return TK_STRING; + } + case '.': { /* '.', '..', '...', or number */ + save_and_next(ls); + if (check_next(ls, ".")) { + if (check_next(ls, ".")) + return TK_DOTS; /* '...' */ + else return TK_CONCAT; /* '..' */ + } + else if (!lisdigit(ls->current)) return '.'; + /* else go through */ + } + case '0': case '1': case '2': case '3': case '4': + case '5': case '6': case '7': case '8': case '9': { + read_numeral(ls, seminfo); + return TK_NUMBER; + } + case EOZ: { + return TK_EOS; + } + default: { + if (lislalpha(ls->current)) { /* identifier or reserved word? */ + TString *ts; + do { + save_and_next(ls); + } while (lislalnum(ls->current)); + ts = luaX_newstring(ls, luaZ_buffer(ls->buff), + luaZ_bufflen(ls->buff)); + seminfo->ts = ts; + if (isreserved(ts)) /* reserved word? */ + return ts->tsv.extra - 1 + FIRST_RESERVED; + else { + return TK_NAME; + } + } + else { /* single-char tokens (+ - / ...) */ + int c = ls->current; + next(ls); + return c; + } + } + } + } +} + + +void luaX_next (LexState *ls) { + ls->lastline = ls->linenumber; + if (ls->lookahead.token != TK_EOS) { /* is there a look-ahead token? */ + ls->t = ls->lookahead; /* use this one */ + ls->lookahead.token = TK_EOS; /* and discharge it */ + } + else + ls->t.token = llex(ls, &ls->t.seminfo); /* read next token */ +} + + +int luaX_lookahead (LexState *ls) { + lua_assert(ls->lookahead.token == TK_EOS); + ls->lookahead.token = llex(ls, &ls->lookahead.seminfo); + return ls->lookahead.token; +} + diff --git a/radio/src/lua/src/llex.h b/radio/src/lua/src/llex.h new file mode 100644 index 000000000..9ca8a2994 --- /dev/null +++ b/radio/src/lua/src/llex.h @@ -0,0 +1,78 @@ +/* +** $Id: llex.h,v 1.72 2011/11/30 12:43:51 roberto Exp $ +** Lexical Analyzer +** See Copyright Notice in lua.h +*/ + +#ifndef llex_h +#define llex_h + +#include "lobject.h" +#include "lzio.h" + + +#define FIRST_RESERVED 257 + + + +/* +* WARNING: if you change the order of this enumeration, +* grep "ORDER RESERVED" +*/ +enum RESERVED { + /* terminal symbols denoted by reserved words */ + TK_AND = FIRST_RESERVED, TK_BREAK, + TK_DO, TK_ELSE, TK_ELSEIF, TK_END, TK_FALSE, TK_FOR, TK_FUNCTION, + TK_GOTO, TK_IF, TK_IN, TK_LOCAL, TK_NIL, TK_NOT, TK_OR, TK_REPEAT, + TK_RETURN, TK_THEN, TK_TRUE, TK_UNTIL, TK_WHILE, + /* other terminal symbols */ + TK_CONCAT, TK_DOTS, TK_EQ, TK_GE, TK_LE, TK_NE, TK_DBCOLON, TK_EOS, + TK_NUMBER, TK_NAME, TK_STRING +}; + +/* number of reserved words */ +#define NUM_RESERVED (cast(int, TK_WHILE-FIRST_RESERVED+1)) + + +typedef union { + lua_Number r; + TString *ts; +} SemInfo; /* semantics information */ + + +typedef struct Token { + int token; + SemInfo seminfo; +} Token; + + +/* state of the lexer plus state of the parser when shared by all + functions */ +typedef struct LexState { + int current; /* current character (charint) */ + int linenumber; /* input line counter */ + int lastline; /* line of last token `consumed' */ + Token t; /* current token */ + Token lookahead; /* look ahead token */ + struct FuncState *fs; /* current function (parser) */ + struct lua_State *L; + ZIO *z; /* input stream */ + Mbuffer *buff; /* buffer for tokens */ + struct Dyndata *dyd; /* dynamic structures used by the parser */ + TString *source; /* current source name */ + TString *envn; /* environment variable name */ + char decpoint; /* locale decimal point */ +} LexState; + + +LUAI_FUNC void luaX_init (lua_State *L); +LUAI_FUNC void luaX_setinput (lua_State *L, LexState *ls, ZIO *z, + TString *source, int firstchar); +LUAI_FUNC TString *luaX_newstring (LexState *ls, const char *str, size_t l); +LUAI_FUNC void luaX_next (LexState *ls); +LUAI_FUNC int luaX_lookahead (LexState *ls); +LUAI_FUNC l_noret luaX_syntaxerror (LexState *ls, const char *s); +LUAI_FUNC const char *luaX_token2str (LexState *ls, int token); + + +#endif diff --git a/radio/src/lua/src/llimits.h b/radio/src/lua/src/llimits.h new file mode 100644 index 000000000..b278d4880 --- /dev/null +++ b/radio/src/lua/src/llimits.h @@ -0,0 +1,309 @@ +/* +** $Id: llimits.h,v 1.103 2013/02/20 14:08:56 roberto Exp $ +** Limits, basic types, and some other `installation-dependent' definitions +** See Copyright Notice in lua.h +*/ + +#ifndef llimits_h +#define llimits_h + + +#include +#include + + +#include "lua.h" + + +typedef unsigned LUA_INT32 lu_int32; + +typedef LUAI_UMEM lu_mem; + +typedef LUAI_MEM l_mem; + + + +/* chars used as small naturals (so that `char' is reserved for characters) */ +typedef unsigned char lu_byte; + + +#define MAX_SIZET ((size_t)(~(size_t)0)-2) + +#define MAX_LUMEM ((lu_mem)(~(lu_mem)0)-2) + +#define MAX_LMEM ((l_mem) ((MAX_LUMEM >> 1) - 2)) + + +#define MAX_INT (INT_MAX-2) /* maximum value of an int (-2 for safety) */ + +/* +** conversion of pointer to integer +** this is for hashing only; there is no problem if the integer +** cannot hold the whole pointer value +*/ +#define IntPoint(p) ((unsigned int)(lu_mem)(p)) + + + +/* type to ensure maximum alignment */ +#if !defined(LUAI_USER_ALIGNMENT_T) +#define LUAI_USER_ALIGNMENT_T union { double u; void *s; long l; } +#endif + +typedef LUAI_USER_ALIGNMENT_T L_Umaxalign; + + +/* result of a `usual argument conversion' over lua_Number */ +typedef LUAI_UACNUMBER l_uacNumber; + + +/* internal assertions for in-house debugging */ +#if defined(lua_assert) +#define check_exp(c,e) (lua_assert(c), (e)) +/* to avoid problems with conditions too long */ +#define lua_longassert(c) { if (!(c)) lua_assert(0); } +#else +#define lua_assert(c) ((void)0) +#define check_exp(c,e) (e) +#define lua_longassert(c) ((void)0) +#endif + +/* +** assertion for checking API calls +*/ +#if !defined(luai_apicheck) + +#if defined(LUA_USE_APICHECK) +#include +#define luai_apicheck(L,e) assert(e) +#else +#define luai_apicheck(L,e) lua_assert(e) +#endif + +#endif + +#define api_check(l,e,msg) luai_apicheck(l,(e) && msg) + + +#if !defined(UNUSED) +#define UNUSED(x) ((void)(x)) /* to avoid warnings */ +#endif + + +#define cast(t, exp) ((t)(exp)) + +#define cast_byte(i) cast(lu_byte, (i)) +#define cast_num(i) cast(lua_Number, (i)) +#define cast_int(i) cast(int, (i)) +#define cast_uchar(i) cast(unsigned char, (i)) + + +/* +** non-return type +*/ +#if defined(__GNUC__) +#define l_noret void __attribute__((noreturn)) +#elif defined(_MSC_VER) +#define l_noret void __declspec(noreturn) +#else +#define l_noret void +#endif + + + +/* +** maximum depth for nested C calls and syntactical nested non-terminals +** in a program. (Value must fit in an unsigned short int.) +*/ +#if !defined(LUAI_MAXCCALLS) +#define LUAI_MAXCCALLS 200 +#endif + +/* +** maximum number of upvalues in a closure (both C and Lua). (Value +** must fit in an unsigned char.) +*/ +#define MAXUPVAL UCHAR_MAX + + +/* +** type for virtual-machine instructions +** must be an unsigned with (at least) 4 bytes (see details in lopcodes.h) +*/ +typedef lu_int32 Instruction; + + + +/* maximum stack for a Lua function */ +#define MAXSTACK 250 + + + +/* minimum size for the string table (must be power of 2) */ +#if !defined(MINSTRTABSIZE) +#define MINSTRTABSIZE 32 +#endif + + +/* minimum size for string buffer */ +#if !defined(LUA_MINBUFFER) +#define LUA_MINBUFFER 32 +#endif + + +#if !defined(lua_lock) +#define lua_lock(L) ((void) 0) +#define lua_unlock(L) ((void) 0) +#endif + +#if !defined(luai_threadyield) +#define luai_threadyield(L) {lua_unlock(L); lua_lock(L);} +#endif + + +/* +** these macros allow user-specific actions on threads when you defined +** LUAI_EXTRASPACE and need to do something extra when a thread is +** created/deleted/resumed/yielded. +*/ +#if !defined(luai_userstateopen) +#define luai_userstateopen(L) ((void)L) +#endif + +#if !defined(luai_userstateclose) +#define luai_userstateclose(L) ((void)L) +#endif + +#if !defined(luai_userstatethread) +#define luai_userstatethread(L,L1) ((void)L) +#endif + +#if !defined(luai_userstatefree) +#define luai_userstatefree(L,L1) ((void)L) +#endif + +#if !defined(luai_userstateresume) +#define luai_userstateresume(L,n) ((void)L) +#endif + +#if !defined(luai_userstateyield) +#define luai_userstateyield(L,n) ((void)L) +#endif + +/* +** lua_number2int is a macro to convert lua_Number to int. +** lua_number2integer is a macro to convert lua_Number to lua_Integer. +** lua_number2unsigned is a macro to convert a lua_Number to a lua_Unsigned. +** lua_unsigned2number is a macro to convert a lua_Unsigned to a lua_Number. +** luai_hashnum is a macro to hash a lua_Number value into an integer. +** The hash must be deterministic and give reasonable values for +** both small and large values (outside the range of integers). +*/ + +#if defined(MS_ASMTRICK) || defined(LUA_MSASMTRICK) /* { */ +/* trick with Microsoft assembler for X86 */ + +#define lua_number2int(i,n) __asm {__asm fld n __asm fistp i} +#define lua_number2integer(i,n) lua_number2int(i, n) +#define lua_number2unsigned(i,n) \ + {__int64 l; __asm {__asm fld n __asm fistp l} i = (unsigned int)l;} + + +#elif defined(LUA_IEEE754TRICK) /* }{ */ +/* the next trick should work on any machine using IEEE754 with + a 32-bit int type */ + +union luai_Cast { double l_d; LUA_INT32 l_p[2]; }; + +#if !defined(LUA_IEEEENDIAN) /* { */ +#define LUAI_EXTRAIEEE \ + static const union luai_Cast ieeeendian = {-(33.0 + 6755399441055744.0)}; +#define LUA_IEEEENDIANLOC (ieeeendian.l_p[1] == 33) +#else +#define LUA_IEEEENDIANLOC LUA_IEEEENDIAN +#define LUAI_EXTRAIEEE /* empty */ +#endif /* } */ + +#define lua_number2int32(i,n,t) \ + { LUAI_EXTRAIEEE \ + volatile union luai_Cast u; u.l_d = (n) + 6755399441055744.0; \ + (i) = (t)u.l_p[LUA_IEEEENDIANLOC]; } + +#define luai_hashnum(i,n) \ + { volatile union luai_Cast u; u.l_d = (n) + 1.0; /* avoid -0 */ \ + (i) = u.l_p[0]; (i) += u.l_p[1]; } /* add double bits for his hash */ + +#define lua_number2int(i,n) lua_number2int32(i, n, int) +#define lua_number2unsigned(i,n) lua_number2int32(i, n, lua_Unsigned) + +/* the trick can be expanded to lua_Integer when it is a 32-bit value */ +#if defined(LUA_IEEELL) +#define lua_number2integer(i,n) lua_number2int32(i, n, lua_Integer) +#endif + +#endif /* } */ + + +/* the following definitions always work, but may be slow */ + +#if !defined(lua_number2int) +#define lua_number2int(i,n) ((i)=(int)(n)) +#endif + +#if !defined(lua_number2integer) +#define lua_number2integer(i,n) ((i)=(lua_Integer)(n)) +#endif + +#if !defined(lua_number2unsigned) /* { */ +/* the following definition assures proper modulo behavior */ +#if defined(LUA_NUMBER_DOUBLE) || defined(LUA_NUMBER_FLOAT) +#include +#define SUPUNSIGNED ((lua_Number)(~(lua_Unsigned)0) + 1) +#define lua_number2unsigned(i,n) \ + ((i)=(lua_Unsigned)((n) - floor((n)/SUPUNSIGNED)*SUPUNSIGNED)) +#else +#define lua_number2unsigned(i,n) ((i)=(lua_Unsigned)(n)) +#endif +#endif /* } */ + + +#if !defined(lua_unsigned2number) +/* on several machines, coercion from unsigned to double is slow, + so it may be worth to avoid */ +#define lua_unsigned2number(u) \ + (((u) <= (lua_Unsigned)INT_MAX) ? (lua_Number)(int)(u) : (lua_Number)(u)) +#endif + + + +#if !defined(luai_hashnum) + +#include +#include + +#define luai_hashnum(i,n) { int e; \ + n = l_mathop(frexp)(n, &e) * (lua_Number)(INT_MAX - DBL_MAX_EXP); \ + lua_number2int(i, n); i += e; } + +#endif + + + +/* +** macro to control inclusion of some hard tests on stack reallocation +*/ +#if !defined(HARDSTACKTESTS) +#define condmovestack(L) ((void)0) +#else +/* realloc stack keeping its size */ +#define condmovestack(L) luaD_reallocstack((L), (L)->stacksize) +#endif + +#if !defined(HARDMEMTESTS) +#define condchangemem(L) condmovestack(L) +#else +#define condchangemem(L) \ + ((void)(!(G(L)->gcrunning) || (luaC_fullgc(L, 0), 1))) +#endif + +#endif diff --git a/radio/src/lua/src/lmathlib.c b/radio/src/lua/src/lmathlib.c new file mode 100644 index 000000000..20292d720 --- /dev/null +++ b/radio/src/lua/src/lmathlib.c @@ -0,0 +1,278 @@ +/* +** $Id: lmathlib.c,v 1.83 2013/03/07 18:21:32 roberto Exp $ +** Standard mathematical library +** See Copyright Notice in lua.h +*/ + + +#include +#include + +#define lmathlib_c + +#include "lua.h" + +#include "lauxlib.h" +#include "lualib.h" + + +#undef PI +#define PI ((lua_Number)(3.1415926535897932384626433832795)) +#define RADIANS_PER_DEGREE ((lua_Number)(PI/180.0)) + + + +static int math_abs (lua_State *L) { + lua_pushnumber(L, l_mathop(fabs)(luaL_checknumber(L, 1))); + return 1; +} + +static int math_sin (lua_State *L) { + lua_pushnumber(L, l_mathop(sin)(luaL_checknumber(L, 1))); + return 1; +} + +static int math_sinh (lua_State *L) { + lua_pushnumber(L, l_mathop(sinh)(luaL_checknumber(L, 1))); + return 1; +} + +static int math_cos (lua_State *L) { + lua_pushnumber(L, l_mathop(cos)(luaL_checknumber(L, 1))); + return 1; +} + +static int math_cosh (lua_State *L) { + lua_pushnumber(L, l_mathop(cosh)(luaL_checknumber(L, 1))); + return 1; +} + +static int math_tan (lua_State *L) { + lua_pushnumber(L, l_mathop(tan)(luaL_checknumber(L, 1))); + return 1; +} + +static int math_tanh (lua_State *L) { + lua_pushnumber(L, l_mathop(tanh)(luaL_checknumber(L, 1))); + return 1; +} + +static int math_asin (lua_State *L) { + lua_pushnumber(L, l_mathop(asin)(luaL_checknumber(L, 1))); + return 1; +} + +static int math_acos (lua_State *L) { + lua_pushnumber(L, l_mathop(acos)(luaL_checknumber(L, 1))); + return 1; +} + +static int math_atan (lua_State *L) { + lua_pushnumber(L, l_mathop(atan)(luaL_checknumber(L, 1))); + return 1; +} + +static int math_atan2 (lua_State *L) { + lua_pushnumber(L, l_mathop(atan2)(luaL_checknumber(L, 1), + luaL_checknumber(L, 2))); + return 1; +} + +static int math_ceil (lua_State *L) { + lua_pushnumber(L, l_mathop(ceil)(luaL_checknumber(L, 1))); + return 1; +} + +static int math_floor (lua_State *L) { + lua_pushnumber(L, l_mathop(floor)(luaL_checknumber(L, 1))); + return 1; +} + +static int math_fmod (lua_State *L) { + lua_pushnumber(L, l_mathop(fmod)(luaL_checknumber(L, 1), + luaL_checknumber(L, 2))); + return 1; +} + +static int math_modf (lua_State *L) { + lua_Number ip; + lua_Number fp = l_mathop(modf)(luaL_checknumber(L, 1), &ip); + lua_pushnumber(L, ip); + lua_pushnumber(L, fp); + return 2; +} + +static int math_sqrt (lua_State *L) { + lua_pushnumber(L, l_mathop(sqrt)(luaL_checknumber(L, 1))); + return 1; +} + +static int math_pow (lua_State *L) { + lua_Number x = luaL_checknumber(L, 1); + lua_Number y = luaL_checknumber(L, 2); + lua_pushnumber(L, l_mathop(pow)(x, y)); + return 1; +} + +static int math_log (lua_State *L) { + lua_Number x = luaL_checknumber(L, 1); + lua_Number res; + if (lua_isnoneornil(L, 2)) + res = l_mathop(log)(x); + else { + lua_Number base = luaL_checknumber(L, 2); + if (base == (lua_Number)10.0) res = l_mathop(log10)(x); + else res = l_mathop(log)(x)/l_mathop(log)(base); + } + lua_pushnumber(L, res); + return 1; +} + +#if defined(LUA_COMPAT_LOG10) +static int math_log10 (lua_State *L) { + lua_pushnumber(L, l_mathop(log10)(luaL_checknumber(L, 1))); + return 1; +} +#endif + +static int math_exp (lua_State *L) { + lua_pushnumber(L, l_mathop(exp)(luaL_checknumber(L, 1))); + return 1; +} + +static int math_deg (lua_State *L) { + lua_pushnumber(L, luaL_checknumber(L, 1)/RADIANS_PER_DEGREE); + return 1; +} + +static int math_rad (lua_State *L) { + lua_pushnumber(L, luaL_checknumber(L, 1)*RADIANS_PER_DEGREE); + return 1; +} + +static int math_frexp (lua_State *L) { + int e; + lua_pushnumber(L, l_mathop(frexp)(luaL_checknumber(L, 1), &e)); + lua_pushinteger(L, e); + return 2; +} + +static int math_ldexp (lua_State *L) { + lua_Number x = luaL_checknumber(L, 1); + int ep = luaL_checkint(L, 2); + lua_pushnumber(L, l_mathop(ldexp)(x, ep)); + return 1; +} + + + +static int math_min (lua_State *L) { + int n = lua_gettop(L); /* number of arguments */ + lua_Number dmin = luaL_checknumber(L, 1); + int i; + for (i=2; i<=n; i++) { + lua_Number d = luaL_checknumber(L, i); + if (d < dmin) + dmin = d; + } + lua_pushnumber(L, dmin); + return 1; +} + + +static int math_max (lua_State *L) { + int n = lua_gettop(L); /* number of arguments */ + lua_Number dmax = luaL_checknumber(L, 1); + int i; + for (i=2; i<=n; i++) { + lua_Number d = luaL_checknumber(L, i); + if (d > dmax) + dmax = d; + } + lua_pushnumber(L, dmax); + return 1; +} + + +static int math_random (lua_State *L) { + /* the `%' avoids the (rare) case of r==1, and is needed also because on + some systems (SunOS!) `rand()' may return a value larger than RAND_MAX */ + lua_Number r = (lua_Number)(rand()%RAND_MAX) / (lua_Number)RAND_MAX; + switch (lua_gettop(L)) { /* check number of arguments */ + case 0: { /* no arguments */ + lua_pushnumber(L, r); /* Number between 0 and 1 */ + break; + } + case 1: { /* only upper limit */ + lua_Number u = luaL_checknumber(L, 1); + luaL_argcheck(L, (lua_Number)1.0 <= u, 1, "interval is empty"); + lua_pushnumber(L, l_mathop(floor)(r*u) + (lua_Number)(1.0)); /* [1, u] */ + break; + } + case 2: { /* lower and upper limits */ + lua_Number l = luaL_checknumber(L, 1); + lua_Number u = luaL_checknumber(L, 2); + luaL_argcheck(L, l <= u, 2, "interval is empty"); + lua_pushnumber(L, l_mathop(floor)(r*(u-l+1)) + l); /* [l, u] */ + break; + } + default: return luaL_error(L, "wrong number of arguments"); + } + return 1; +} + + +static int math_randomseed (lua_State *L) { + srand(luaL_checkunsigned(L, 1)); + (void)rand(); /* discard first value to avoid undesirable correlations */ + return 0; +} + + +static const luaL_Reg mathlib[] = { + {"abs", math_abs}, + {"acos", math_acos}, + {"asin", math_asin}, + {"atan2", math_atan2}, + {"atan", math_atan}, + {"ceil", math_ceil}, + {"cosh", math_cosh}, + {"cos", math_cos}, + {"deg", math_deg}, + {"exp", math_exp}, + {"floor", math_floor}, + {"fmod", math_fmod}, + {"frexp", math_frexp}, + {"ldexp", math_ldexp}, +#if defined(LUA_COMPAT_LOG10) + {"log10", math_log10}, +#endif + {"log", math_log}, + {"max", math_max}, + {"min", math_min}, + {"modf", math_modf}, + {"pow", math_pow}, + {"rad", math_rad}, + {"random", math_random}, + {"randomseed", math_randomseed}, + {"sinh", math_sinh}, + {"sin", math_sin}, + {"sqrt", math_sqrt}, + {"tanh", math_tanh}, + {"tan", math_tan}, + {NULL, NULL} +}; + + +/* +** Open math library +*/ +LUAMOD_API int luaopen_math (lua_State *L) { + luaL_newlib(L, mathlib); + lua_pushnumber(L, PI); + lua_setfield(L, -2, "pi"); + lua_pushnumber(L, HUGE_VAL); + lua_setfield(L, -2, "huge"); + return 1; +} + diff --git a/radio/src/lua/src/lmem.c b/radio/src/lua/src/lmem.c new file mode 100644 index 000000000..83d2349ee --- /dev/null +++ b/radio/src/lua/src/lmem.c @@ -0,0 +1,98 @@ +/* +** $Id: lmem.c,v 1.84 2012/05/23 15:41:53 roberto Exp $ +** Interface to Memory Manager +** See Copyright Notice in lua.h +*/ + + +#include + +#define lmem_c +#define LUA_CORE + +#include "lua.h" + +#include "ldebug.h" +#include "ldo.h" +#include "lgc.h" +#include "lmem.h" +#include "lobject.h" +#include "lstate.h" + + + +/* +** About the realloc function: +** void * frealloc (void *ud, void *ptr, size_t osize, size_t nsize); +** (`osize' is the old size, `nsize' is the new size) +** +** * frealloc(ud, NULL, x, s) creates a new block of size `s' (no +** matter 'x'). +** +** * frealloc(ud, p, x, 0) frees the block `p' +** (in this specific case, frealloc must return NULL); +** particularly, frealloc(ud, NULL, 0, 0) does nothing +** (which is equivalent to free(NULL) in ANSI C) +** +** frealloc returns NULL if it cannot create or reallocate the area +** (any reallocation to an equal or smaller size cannot fail!) +*/ + + + +#define MINSIZEARRAY 4 + +void *luaM_growaux_ (lua_State *L, void *block, int *size, size_t size_elems, + int limit, const char *what) { + void *newblock; + int newsize; + if (*size >= limit/2) { /* cannot double it? */ + if (*size >= limit) /* cannot grow even a little? */ + luaG_runerror(L, "too many %s (limit is %d)", what, limit); + newsize = limit; /* still have at least one free place */ + } + else { + newsize = (*size)*2; + if (newsize < MINSIZEARRAY) + newsize = MINSIZEARRAY; /* minimum size */ + } + newblock = luaM_reallocv(L, block, *size, newsize, size_elems); + *size = newsize; /* update only when everything else is OK */ + return newblock; +} + + +l_noret luaM_toobig (lua_State *L) { + luaG_runerror(L, "memory allocation error: block too big"); +} + + + +/* +** generic allocation routine. +*/ +void *luaM_realloc_ (lua_State *L, void *block, size_t osize, size_t nsize) { + void *newblock; + global_State *g = G(L); + size_t realosize = (block) ? osize : 0; + lua_assert((realosize == 0) == (block == NULL)); +#if defined(HARDMEMTESTS) + if (nsize > realosize && g->gcrunning) + luaC_fullgc(L, 1); /* force a GC whenever possible */ +#endif + newblock = (*g->frealloc)(g->ud, block, osize, nsize); + if (newblock == NULL && nsize > 0) { + api_check(L, nsize > realosize, + "realloc cannot fail when shrinking a block"); + if (g->gcrunning) { + luaC_fullgc(L, 1); /* try to free some memory... */ + newblock = (*g->frealloc)(g->ud, block, osize, nsize); /* try again */ + } + if (newblock == NULL) + luaD_throw(L, LUA_ERRMEM); + } + lua_assert((nsize == 0) == (newblock == NULL)); + g->GCdebt = (g->GCdebt + nsize) - realosize; + return newblock; +} + diff --git a/radio/src/lua/src/lmem.h b/radio/src/lua/src/lmem.h new file mode 100644 index 000000000..5f850999a --- /dev/null +++ b/radio/src/lua/src/lmem.h @@ -0,0 +1,57 @@ +/* +** $Id: lmem.h,v 1.40 2013/02/20 14:08:21 roberto Exp $ +** Interface to Memory Manager +** See Copyright Notice in lua.h +*/ + +#ifndef lmem_h +#define lmem_h + + +#include + +#include "llimits.h" +#include "lua.h" + + +/* +** This macro avoids the runtime division MAX_SIZET/(e), as 'e' is +** always constant. +** The macro is somewhat complex to avoid warnings: +** +1 avoids warnings of "comparison has constant result"; +** cast to 'void' avoids warnings of "value unused". +*/ +#define luaM_reallocv(L,b,on,n,e) \ + (cast(void, \ + (cast(size_t, (n)+1) > MAX_SIZET/(e)) ? (luaM_toobig(L), 0) : 0), \ + luaM_realloc_(L, (b), (on)*(e), (n)*(e))) + +#define luaM_freemem(L, b, s) luaM_realloc_(L, (b), (s), 0) +#define luaM_free(L, b) luaM_realloc_(L, (b), sizeof(*(b)), 0) +#define luaM_freearray(L, b, n) luaM_reallocv(L, (b), n, 0, sizeof((b)[0])) + +#define luaM_malloc(L,s) luaM_realloc_(L, NULL, 0, (s)) +#define luaM_new(L,t) cast(t *, luaM_malloc(L, sizeof(t))) +#define luaM_newvector(L,n,t) \ + cast(t *, luaM_reallocv(L, NULL, 0, n, sizeof(t))) + +#define luaM_newobject(L,tag,s) luaM_realloc_(L, NULL, tag, (s)) + +#define luaM_growvector(L,v,nelems,size,t,limit,e) \ + if ((nelems)+1 > (size)) \ + ((v)=cast(t *, luaM_growaux_(L,v,&(size),sizeof(t),limit,e))) + +#define luaM_reallocvector(L, v,oldn,n,t) \ + ((v)=cast(t *, luaM_reallocv(L, v, oldn, n, sizeof(t)))) + +LUAI_FUNC l_noret luaM_toobig (lua_State *L); + +/* not to be called directly */ +LUAI_FUNC void *luaM_realloc_ (lua_State *L, void *block, size_t oldsize, + size_t size); +LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int *size, + size_t size_elem, int limit, + const char *what); + +#endif + diff --git a/radio/src/lua/src/loadlib.c b/radio/src/lua/src/loadlib.c new file mode 100644 index 000000000..3849a7859 --- /dev/null +++ b/radio/src/lua/src/loadlib.c @@ -0,0 +1,731 @@ +/* +** $Id: loadlib.c,v 1.111 2012/05/30 12:33:44 roberto Exp $ +** Dynamic library loader for Lua +** See Copyright Notice in lua.h +** +** This module contains an implementation of loadlib for Unix systems +** that have dlfcn, an implementation for Windows, and a stub for other +** systems. +*/ + + +/* +** if needed, includes windows header before everything else +*/ +#if defined(_WIN32) +#include +#endif + + +#include +#include + + +#define loadlib_c + +#include "lua.h" + +#include "lauxlib.h" +#include "lualib.h" + + +/* +** LUA_PATH and LUA_CPATH are the names of the environment +** variables that Lua check to set its paths. +*/ +#if !defined(LUA_PATH) +#define LUA_PATH "LUA_PATH" +#endif + +#if !defined(LUA_CPATH) +#define LUA_CPATH "LUA_CPATH" +#endif + +#define LUA_PATHSUFFIX "_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR + +#define LUA_PATHVERSION LUA_PATH LUA_PATHSUFFIX +#define LUA_CPATHVERSION LUA_CPATH LUA_PATHSUFFIX + +/* +** LUA_PATH_SEP is the character that separates templates in a path. +** LUA_PATH_MARK is the string that marks the substitution points in a +** template. +** LUA_EXEC_DIR in a Windows path is replaced by the executable's +** directory. +** LUA_IGMARK is a mark to ignore all before it when building the +** luaopen_ function name. +*/ +#if !defined (LUA_PATH_SEP) +#define LUA_PATH_SEP ";" +#endif +#if !defined (LUA_PATH_MARK) +#define LUA_PATH_MARK "?" +#endif +#if !defined (LUA_EXEC_DIR) +#define LUA_EXEC_DIR "!" +#endif +#if !defined (LUA_IGMARK) +#define LUA_IGMARK "-" +#endif + + +/* +** LUA_CSUBSEP is the character that replaces dots in submodule names +** when searching for a C loader. +** LUA_LSUBSEP is the character that replaces dots in submodule names +** when searching for a Lua loader. +*/ +#if !defined(LUA_CSUBSEP) +#define LUA_CSUBSEP LUA_DIRSEP +#endif + +#if !defined(LUA_LSUBSEP) +#define LUA_LSUBSEP LUA_DIRSEP +#endif + + +/* prefix for open functions in C libraries */ +#define LUA_POF "luaopen_" + +/* separator for open functions in C libraries */ +#define LUA_OFSEP "_" + + +/* table (in the registry) that keeps handles for all loaded C libraries */ +#define CLIBS "_CLIBS" + +#define LIB_FAIL "open" + + +/* error codes for ll_loadfunc */ +#define ERRLIB 1 +#define ERRFUNC 2 + +#define setprogdir(L) ((void)0) + + +/* +** system-dependent functions +*/ +static void ll_unloadlib (void *lib); +static void *ll_load (lua_State *L, const char *path, int seeglb); +static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym); + + + +#if defined(LUA_USE_DLOPEN) +/* +** {======================================================================== +** This is an implementation of loadlib based on the dlfcn interface. +** The dlfcn interface is available in Linux, SunOS, Solaris, IRIX, FreeBSD, +** NetBSD, AIX 4.2, HPUX 11, and probably most other Unix flavors, at least +** as an emulation layer on top of native functions. +** ========================================================================= +*/ + +#include + +static void ll_unloadlib (void *lib) { + dlclose(lib); +} + + +static void *ll_load (lua_State *L, const char *path, int seeglb) { + void *lib = dlopen(path, RTLD_NOW | (seeglb ? RTLD_GLOBAL : RTLD_LOCAL)); + if (lib == NULL) lua_pushstring(L, dlerror()); + return lib; +} + + +static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) { + lua_CFunction f = (lua_CFunction)dlsym(lib, sym); + if (f == NULL) lua_pushstring(L, dlerror()); + return f; +} + +/* }====================================================== */ + + + +#elif defined(LUA_DL_DLL) +/* +** {====================================================================== +** This is an implementation of loadlib for Windows using native functions. +** ======================================================================= +*/ + +#undef setprogdir + +/* +** optional flags for LoadLibraryEx +*/ +#if !defined(LUA_LLE_FLAGS) +#define LUA_LLE_FLAGS 0 +#endif + + +static void setprogdir (lua_State *L) { + char buff[MAX_PATH + 1]; + char *lb; + DWORD nsize = sizeof(buff)/sizeof(char); + DWORD n = GetModuleFileNameA(NULL, buff, nsize); + if (n == 0 || n == nsize || (lb = strrchr(buff, '\\')) == NULL) + luaL_error(L, "unable to get ModuleFileName"); + else { + *lb = '\0'; + luaL_gsub(L, lua_tostring(L, -1), LUA_EXEC_DIR, buff); + lua_remove(L, -2); /* remove original string */ + } +} + + +static void pusherror (lua_State *L) { + int error = GetLastError(); + char buffer[128]; + if (FormatMessageA(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, error, 0, buffer, sizeof(buffer)/sizeof(char), NULL)) + lua_pushstring(L, buffer); + else + lua_pushfstring(L, "system error %d\n", error); +} + +static void ll_unloadlib (void *lib) { + FreeLibrary((HMODULE)lib); +} + + +static void *ll_load (lua_State *L, const char *path, int seeglb) { + HMODULE lib = LoadLibraryExA(path, NULL, LUA_LLE_FLAGS); + (void)(seeglb); /* not used: symbols are 'global' by default */ + if (lib == NULL) pusherror(L); + return lib; +} + + +static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) { + lua_CFunction f = (lua_CFunction)GetProcAddress((HMODULE)lib, sym); + if (f == NULL) pusherror(L); + return f; +} + +/* }====================================================== */ + + +#else +/* +** {====================================================== +** Fallback for other systems +** ======================================================= +*/ + +#undef LIB_FAIL +#define LIB_FAIL "absent" + + +#define DLMSG "dynamic libraries not enabled; check your Lua installation" + + +static void ll_unloadlib (void *lib) { + (void)(lib); /* not used */ +} + + +static void *ll_load (lua_State *L, const char *path, int seeglb) { + (void)(path); (void)(seeglb); /* not used */ + lua_pushliteral(L, DLMSG); + return NULL; +} + + +static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) { + (void)(lib); (void)(sym); /* not used */ + lua_pushliteral(L, DLMSG); + return NULL; +} + +/* }====================================================== */ +#endif + + +static void *ll_checkclib (lua_State *L, const char *path) { + void *plib; + lua_getfield(L, LUA_REGISTRYINDEX, CLIBS); + lua_getfield(L, -1, path); + plib = lua_touserdata(L, -1); /* plib = CLIBS[path] */ + lua_pop(L, 2); /* pop CLIBS table and 'plib' */ + return plib; +} + + +static void ll_addtoclib (lua_State *L, const char *path, void *plib) { + lua_getfield(L, LUA_REGISTRYINDEX, CLIBS); + lua_pushlightuserdata(L, plib); + lua_pushvalue(L, -1); + lua_setfield(L, -3, path); /* CLIBS[path] = plib */ + lua_rawseti(L, -2, luaL_len(L, -2) + 1); /* CLIBS[#CLIBS + 1] = plib */ + lua_pop(L, 1); /* pop CLIBS table */ +} + + +/* +** __gc tag method for CLIBS table: calls 'll_unloadlib' for all lib +** handles in list CLIBS +*/ +static int gctm (lua_State *L) { + int n = luaL_len(L, 1); + for (; n >= 1; n--) { /* for each handle, in reverse order */ + lua_rawgeti(L, 1, n); /* get handle CLIBS[n] */ + ll_unloadlib(lua_touserdata(L, -1)); + lua_pop(L, 1); /* pop handle */ + } + return 0; +} + + +static int ll_loadfunc (lua_State *L, const char *path, const char *sym) { + void *reg = ll_checkclib(L, path); /* check loaded C libraries */ + if (reg == NULL) { /* must load library? */ + reg = ll_load(L, path, *sym == '*'); + if (reg == NULL) return ERRLIB; /* unable to load library */ + ll_addtoclib(L, path, reg); + } + if (*sym == '*') { /* loading only library (no function)? */ + lua_pushboolean(L, 1); /* return 'true' */ + return 0; /* no errors */ + } + else { + lua_CFunction f = ll_sym(L, reg, sym); + if (f == NULL) + return ERRFUNC; /* unable to find function */ + lua_pushcfunction(L, f); /* else create new function */ + return 0; /* no errors */ + } +} + + +static int ll_loadlib (lua_State *L) { + const char *path = luaL_checkstring(L, 1); + const char *init = luaL_checkstring(L, 2); + int stat = ll_loadfunc(L, path, init); + if (stat == 0) /* no errors? */ + return 1; /* return the loaded function */ + else { /* error; error message is on stack top */ + lua_pushnil(L); + lua_insert(L, -2); + lua_pushstring(L, (stat == ERRLIB) ? LIB_FAIL : "init"); + return 3; /* return nil, error message, and where */ + } +} + + + +/* +** {====================================================== +** 'require' function +** ======================================================= +*/ + + +static int readable (const char *filename) { +#if defined(USE_FATFS) + FIL f; + FRESULT result = f_open(&f, filename, FA_OPEN_EXISTING | FA_READ); + if (result != FR_OK) return 0; + f_close(&f); +#else + FILE *f = fopen(filename, "r"); /* try to open file */ + if (f == NULL) return 0; /* open failed */ + fclose(f); +#endif + return 1; +} + + +static const char *pushnexttemplate (lua_State *L, const char *path) { + const char *l; + while (*path == *LUA_PATH_SEP) path++; /* skip separators */ + if (*path == '\0') return NULL; /* no more templates */ + l = strchr(path, *LUA_PATH_SEP); /* find next separator */ + if (l == NULL) l = path + strlen(path); + lua_pushlstring(L, path, l - path); /* template */ + return l; +} + + +static const char *searchpath (lua_State *L, const char *name, + const char *path, + const char *sep, + const char *dirsep) { + luaL_Buffer msg; /* to build error message */ + luaL_buffinit(L, &msg); + if (*sep != '\0') /* non-empty separator? */ + name = luaL_gsub(L, name, sep, dirsep); /* replace it by 'dirsep' */ + while ((path = pushnexttemplate(L, path)) != NULL) { + const char *filename = luaL_gsub(L, lua_tostring(L, -1), + LUA_PATH_MARK, name); + lua_remove(L, -2); /* remove path template */ + if (readable(filename)) /* does file exist and is readable? */ + return filename; /* return that file name */ + lua_pushfstring(L, "\n\tno file " LUA_QS, filename); + lua_remove(L, -2); /* remove file name */ + luaL_addvalue(&msg); /* concatenate error msg. entry */ + } + luaL_pushresult(&msg); /* create error message */ + return NULL; /* not found */ +} + + +static int ll_searchpath (lua_State *L) { + const char *f = searchpath(L, luaL_checkstring(L, 1), + luaL_checkstring(L, 2), + luaL_optstring(L, 3, "."), + luaL_optstring(L, 4, LUA_DIRSEP)); + if (f != NULL) return 1; + else { /* error message is on top of the stack */ + lua_pushnil(L); + lua_insert(L, -2); + return 2; /* return nil + error message */ + } +} + + +static const char *findfile (lua_State *L, const char *name, + const char *pname, + const char *dirsep) { + const char *path; + lua_getfield(L, lua_upvalueindex(1), pname); + path = lua_tostring(L, -1); + if (path == NULL) + luaL_error(L, LUA_QL("package.%s") " must be a string", pname); + return searchpath(L, name, path, ".", dirsep); +} + + +static int checkload (lua_State *L, int stat, const char *filename) { + if (stat) { /* module loaded successfully? */ + lua_pushstring(L, filename); /* will be 2nd argument to module */ + return 2; /* return open function and file name */ + } + else + return luaL_error(L, "error loading module " LUA_QS + " from file " LUA_QS ":\n\t%s", + lua_tostring(L, 1), filename, lua_tostring(L, -1)); +} + + +static int searcher_Lua (lua_State *L) { + const char *filename; + const char *name = luaL_checkstring(L, 1); + filename = findfile(L, name, "path", LUA_LSUBSEP); + if (filename == NULL) return 1; /* module not found in this path */ + return checkload(L, (luaL_loadfile(L, filename) == LUA_OK), filename); +} + + +static int loadfunc (lua_State *L, const char *filename, const char *modname) { + const char *funcname; + const char *mark; + modname = luaL_gsub(L, modname, ".", LUA_OFSEP); + mark = strchr(modname, *LUA_IGMARK); + if (mark) { + int stat; + funcname = lua_pushlstring(L, modname, mark - modname); + funcname = lua_pushfstring(L, LUA_POF"%s", funcname); + stat = ll_loadfunc(L, filename, funcname); + if (stat != ERRFUNC) return stat; + modname = mark + 1; /* else go ahead and try old-style name */ + } + funcname = lua_pushfstring(L, LUA_POF"%s", modname); + return ll_loadfunc(L, filename, funcname); +} + + +static int searcher_C (lua_State *L) { + const char *name = luaL_checkstring(L, 1); + const char *filename = findfile(L, name, "cpath", LUA_CSUBSEP); + if (filename == NULL) return 1; /* module not found in this path */ + return checkload(L, (loadfunc(L, filename, name) == 0), filename); +} + + +static int searcher_Croot (lua_State *L) { + const char *filename; + const char *name = luaL_checkstring(L, 1); + const char *p = strchr(name, '.'); + int stat; + if (p == NULL) return 0; /* is root */ + lua_pushlstring(L, name, p - name); + filename = findfile(L, lua_tostring(L, -1), "cpath", LUA_CSUBSEP); + if (filename == NULL) return 1; /* root not found */ + if ((stat = loadfunc(L, filename, name)) != 0) { + if (stat != ERRFUNC) + return checkload(L, 0, filename); /* real error */ + else { /* open function not found */ + lua_pushfstring(L, "\n\tno module " LUA_QS " in file " LUA_QS, + name, filename); + return 1; + } + } + lua_pushstring(L, filename); /* will be 2nd argument to module */ + return 2; +} + + +static int searcher_preload (lua_State *L) { + const char *name = luaL_checkstring(L, 1); + lua_getfield(L, LUA_REGISTRYINDEX, "_PRELOAD"); + lua_getfield(L, -1, name); + if (lua_isnil(L, -1)) /* not found? */ + lua_pushfstring(L, "\n\tno field package.preload['%s']", name); + return 1; +} + + +static void findloader (lua_State *L, const char *name) { + int i; + luaL_Buffer msg; /* to build error message */ + luaL_buffinit(L, &msg); + lua_getfield(L, lua_upvalueindex(1), "searchers"); /* will be at index 3 */ + if (!lua_istable(L, 3)) + luaL_error(L, LUA_QL("package.searchers") " must be a table"); + /* iterate over available searchers to find a loader */ + for (i = 1; ; i++) { + lua_rawgeti(L, 3, i); /* get a searcher */ + if (lua_isnil(L, -1)) { /* no more searchers? */ + lua_pop(L, 1); /* remove nil */ + luaL_pushresult(&msg); /* create error message */ + luaL_error(L, "module " LUA_QS " not found:%s", + name, lua_tostring(L, -1)); + } + lua_pushstring(L, name); + lua_call(L, 1, 2); /* call it */ + if (lua_isfunction(L, -2)) /* did it find a loader? */ + return; /* module loader found */ + else if (lua_isstring(L, -2)) { /* searcher returned error message? */ + lua_pop(L, 1); /* remove extra return */ + luaL_addvalue(&msg); /* concatenate error message */ + } + else + lua_pop(L, 2); /* remove both returns */ + } +} + + +static int ll_require (lua_State *L) { + const char *name = luaL_checkstring(L, 1); + lua_settop(L, 1); /* _LOADED table will be at index 2 */ + lua_getfield(L, LUA_REGISTRYINDEX, "_LOADED"); + lua_getfield(L, 2, name); /* _LOADED[name] */ + if (lua_toboolean(L, -1)) /* is it there? */ + return 1; /* package is already loaded */ + /* else must load package */ + lua_pop(L, 1); /* remove 'getfield' result */ + findloader(L, name); + lua_pushstring(L, name); /* pass name as argument to module loader */ + lua_insert(L, -2); /* name is 1st argument (before search data) */ + lua_call(L, 2, 1); /* run loader to load module */ + if (!lua_isnil(L, -1)) /* non-nil return? */ + lua_setfield(L, 2, name); /* _LOADED[name] = returned value */ + lua_getfield(L, 2, name); + if (lua_isnil(L, -1)) { /* module did not set a value? */ + lua_pushboolean(L, 1); /* use true as result */ + lua_pushvalue(L, -1); /* extra copy to be returned */ + lua_setfield(L, 2, name); /* _LOADED[name] = true */ + } + return 1; +} + +/* }====================================================== */ + + + +/* +** {====================================================== +** 'module' function +** ======================================================= +*/ +#if defined(LUA_COMPAT_MODULE) + +/* +** changes the environment variable of calling function +*/ +static void set_env (lua_State *L) { + lua_Debug ar; + if (lua_getstack(L, 1, &ar) == 0 || + lua_getinfo(L, "f", &ar) == 0 || /* get calling function */ + lua_iscfunction(L, -1)) + luaL_error(L, LUA_QL("module") " not called from a Lua function"); + lua_pushvalue(L, -2); /* copy new environment table to top */ + lua_setupvalue(L, -2, 1); + lua_pop(L, 1); /* remove function */ +} + + +static void dooptions (lua_State *L, int n) { + int i; + for (i = 2; i <= n; i++) { + if (lua_isfunction(L, i)) { /* avoid 'calling' extra info. */ + lua_pushvalue(L, i); /* get option (a function) */ + lua_pushvalue(L, -2); /* module */ + lua_call(L, 1, 0); + } + } +} + + +static void modinit (lua_State *L, const char *modname) { + const char *dot; + lua_pushvalue(L, -1); + lua_setfield(L, -2, "_M"); /* module._M = module */ + lua_pushstring(L, modname); + lua_setfield(L, -2, "_NAME"); + dot = strrchr(modname, '.'); /* look for last dot in module name */ + if (dot == NULL) dot = modname; + else dot++; + /* set _PACKAGE as package name (full module name minus last part) */ + lua_pushlstring(L, modname, dot - modname); + lua_setfield(L, -2, "_PACKAGE"); +} + + +static int ll_module (lua_State *L) { + const char *modname = luaL_checkstring(L, 1); + int lastarg = lua_gettop(L); /* last parameter */ + luaL_pushmodule(L, modname, 1); /* get/create module table */ + /* check whether table already has a _NAME field */ + lua_getfield(L, -1, "_NAME"); + if (!lua_isnil(L, -1)) /* is table an initialized module? */ + lua_pop(L, 1); + else { /* no; initialize it */ + lua_pop(L, 1); + modinit(L, modname); + } + lua_pushvalue(L, -1); + set_env(L); + dooptions(L, lastarg); + return 1; +} + + +static int ll_seeall (lua_State *L) { + luaL_checktype(L, 1, LUA_TTABLE); + if (!lua_getmetatable(L, 1)) { + lua_createtable(L, 0, 1); /* create new metatable */ + lua_pushvalue(L, -1); + lua_setmetatable(L, 1); + } + lua_pushglobaltable(L); + lua_setfield(L, -2, "__index"); /* mt.__index = _G */ + return 0; +} + +#endif +/* }====================================================== */ + + + +/* auxiliary mark (for internal use) */ +#define AUXMARK "\1" + + +/* +** return registry.LUA_NOENV as a boolean +*/ +static int noenv (lua_State *L) { + int b; + lua_getfield(L, LUA_REGISTRYINDEX, "LUA_NOENV"); + b = lua_toboolean(L, -1); + lua_pop(L, 1); /* remove value */ + return b; +} + + +static void setpath (lua_State *L, const char *fieldname, const char *envname1, + const char *envname2, const char *def) { + const char *path = getenv(envname1); + if (path == NULL) /* no environment variable? */ + path = getenv(envname2); /* try alternative name */ + if (path == NULL || noenv(L)) /* no environment variable? */ + lua_pushstring(L, def); /* use default */ + else { + /* replace ";;" by ";AUXMARK;" and then AUXMARK by default path */ + path = luaL_gsub(L, path, LUA_PATH_SEP LUA_PATH_SEP, + LUA_PATH_SEP AUXMARK LUA_PATH_SEP); + luaL_gsub(L, path, AUXMARK, def); + lua_remove(L, -2); + } + setprogdir(L); + lua_setfield(L, -2, fieldname); +} + + +static const luaL_Reg pk_funcs[] = { + {"loadlib", ll_loadlib}, + {"searchpath", ll_searchpath}, +#if defined(LUA_COMPAT_MODULE) + {"seeall", ll_seeall}, +#endif + {NULL, NULL} +}; + + +static const luaL_Reg ll_funcs[] = { +#if defined(LUA_COMPAT_MODULE) + {"module", ll_module}, +#endif + {"require", ll_require}, + {NULL, NULL} +}; + + +static void createsearcherstable (lua_State *L) { + static const lua_CFunction searchers[] = + {searcher_preload, searcher_Lua, searcher_C, searcher_Croot, NULL}; + int i; + /* create 'searchers' table */ + lua_createtable(L, sizeof(searchers)/sizeof(searchers[0]) - 1, 0); + /* fill it with pre-defined searchers */ + for (i=0; searchers[i] != NULL; i++) { + lua_pushvalue(L, -2); /* set 'package' as upvalue for all searchers */ + lua_pushcclosure(L, searchers[i], 1); + lua_rawseti(L, -2, i+1); + } +} + + +LUAMOD_API int luaopen_package (lua_State *L) { + /* create table CLIBS to keep track of loaded C libraries */ + luaL_getsubtable(L, LUA_REGISTRYINDEX, CLIBS); + lua_createtable(L, 0, 1); /* metatable for CLIBS */ + lua_pushcfunction(L, gctm); + lua_setfield(L, -2, "__gc"); /* set finalizer for CLIBS table */ + lua_setmetatable(L, -2); + /* create `package' table */ + luaL_newlib(L, pk_funcs); + createsearcherstable(L); +#if defined(LUA_COMPAT_LOADERS) + lua_pushvalue(L, -1); /* make a copy of 'searchers' table */ + lua_setfield(L, -3, "loaders"); /* put it in field `loaders' */ +#endif + lua_setfield(L, -2, "searchers"); /* put it in field 'searchers' */ + /* set field 'path' */ + setpath(L, "path", LUA_PATHVERSION, LUA_PATH, LUA_PATH_DEFAULT); + /* set field 'cpath' */ + setpath(L, "cpath", LUA_CPATHVERSION, LUA_CPATH, LUA_CPATH_DEFAULT); + /* store config information */ + lua_pushliteral(L, LUA_DIRSEP "\n" LUA_PATH_SEP "\n" LUA_PATH_MARK "\n" + LUA_EXEC_DIR "\n" LUA_IGMARK "\n"); + lua_setfield(L, -2, "config"); + /* set field `loaded' */ + luaL_getsubtable(L, LUA_REGISTRYINDEX, "_LOADED"); + lua_setfield(L, -2, "loaded"); + /* set field `preload' */ + luaL_getsubtable(L, LUA_REGISTRYINDEX, "_PRELOAD"); + lua_setfield(L, -2, "preload"); + lua_pushglobaltable(L); + lua_pushvalue(L, -2); /* set 'package' as upvalue for next lib */ + luaL_setfuncs(L, ll_funcs, 1); /* open lib into global table */ + lua_pop(L, 1); /* pop global table */ + return 1; /* return 'package' table */ +} + diff --git a/radio/src/lua/src/lobject.c b/radio/src/lua/src/lobject.c new file mode 100644 index 000000000..51eb7f0b9 --- /dev/null +++ b/radio/src/lua/src/lobject.c @@ -0,0 +1,287 @@ +/* +** $Id: lobject.c,v 2.58 2013/02/20 14:08:56 roberto Exp $ +** Some generic functions over Lua objects +** See Copyright Notice in lua.h +*/ + +#include +#include +#include +#include + +#define lobject_c +#define LUA_CORE + +#include "lua.h" + +#include "lctype.h" +#include "ldebug.h" +#include "ldo.h" +#include "lmem.h" +#include "lobject.h" +#include "lstate.h" +#include "lstring.h" +#include "lvm.h" + + + +LUAI_DDEF const TValue luaO_nilobject_ = {NILCONSTANT}; + + +/* +** converts an integer to a "floating point byte", represented as +** (eeeeexxx), where the real value is (1xxx) * 2^(eeeee - 1) if +** eeeee != 0 and (xxx) otherwise. +*/ +int luaO_int2fb (unsigned int x) { + int e = 0; /* exponent */ + if (x < 8) return x; + while (x >= 0x10) { + x = (x+1) >> 1; + e++; + } + return ((e+1) << 3) | (cast_int(x) - 8); +} + + +/* converts back */ +int luaO_fb2int (int x) { + int e = (x >> 3) & 0x1f; + if (e == 0) return x; + else return ((x & 7) + 8) << (e - 1); +} + + +int luaO_ceillog2 (unsigned int x) { + static const lu_byte log_2[256] = { + 0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, + 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, + 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, + 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, + 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, + 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8 + }; + int l = 0; + x--; + while (x >= 256) { l += 8; x >>= 8; } + return l + log_2[x]; +} + + +lua_Number luaO_arith (int op, lua_Number v1, lua_Number v2) { + switch (op) { + case LUA_OPADD: return luai_numadd(NULL, v1, v2); + case LUA_OPSUB: return luai_numsub(NULL, v1, v2); + case LUA_OPMUL: return luai_nummul(NULL, v1, v2); + case LUA_OPDIV: return luai_numdiv(NULL, v1, v2); + case LUA_OPMOD: return luai_nummod(NULL, v1, v2); + case LUA_OPPOW: return luai_numpow(NULL, v1, v2); + case LUA_OPUNM: return luai_numunm(NULL, v1); + default: lua_assert(0); return 0; + } +} + + +int luaO_hexavalue (int c) { + if (lisdigit(c)) return c - '0'; + else return ltolower(c) - 'a' + 10; +} + + +#if !defined(lua_strx2number) + +#include + + +static int isneg (const char **s) { + if (**s == '-') { (*s)++; return 1; } + else if (**s == '+') (*s)++; + return 0; +} + + +static lua_Number readhexa (const char **s, lua_Number r, int *count) { + for (; lisxdigit(cast_uchar(**s)); (*s)++) { /* read integer part */ + r = (r * cast_num(16.0)) + cast_num(luaO_hexavalue(cast_uchar(**s))); + (*count)++; + } + return r; +} + + +/* +** convert an hexadecimal numeric string to a number, following +** C99 specification for 'strtod' +*/ +static lua_Number lua_strx2number (const char *s, char **endptr) { + lua_Number r = 0.0; + int e = 0, i = 0; + int neg = 0; /* 1 if number is negative */ + *endptr = cast(char *, s); /* nothing is valid yet */ + while (lisspace(cast_uchar(*s))) s++; /* skip initial spaces */ + neg = isneg(&s); /* check signal */ + if (!(*s == '0' && (*(s + 1) == 'x' || *(s + 1) == 'X'))) /* check '0x' */ + return 0.0; /* invalid format (no '0x') */ + s += 2; /* skip '0x' */ + r = readhexa(&s, r, &i); /* read integer part */ + if (*s == '.') { + s++; /* skip dot */ + r = readhexa(&s, r, &e); /* read fractional part */ + } + if (i == 0 && e == 0) + return 0.0; /* invalid format (no digit) */ + e *= -4; /* each fractional digit divides value by 2^-4 */ + *endptr = cast(char *, s); /* valid up to here */ + if (*s == 'p' || *s == 'P') { /* exponent part? */ + int exp1 = 0; + int neg1; + s++; /* skip 'p' */ + neg1 = isneg(&s); /* signal */ + if (!lisdigit(cast_uchar(*s))) + goto ret; /* must have at least one digit */ + while (lisdigit(cast_uchar(*s))) /* read exponent */ + exp1 = exp1 * 10 + *(s++) - '0'; + if (neg1) exp1 = -exp1; + e += exp1; + } + *endptr = cast(char *, s); /* valid up to here */ + ret: + if (neg) r = -r; + return l_mathop(ldexp)(r, e); +} + +#endif + + +int luaO_str2d (const char *s, size_t len, lua_Number *result) { + char *endptr; + if (strpbrk(s, "nN")) /* reject 'inf' and 'nan' */ + return 0; + else if (strpbrk(s, "xX")) /* hexa? */ + *result = lua_strx2number(s, &endptr); + else + *result = lua_str2number(s, &endptr); + if (endptr == s) return 0; /* nothing recognized */ + while (lisspace(cast_uchar(*endptr))) endptr++; + return (endptr == s + len); /* OK if no trailing characters */ +} + + + +static void pushstr (lua_State *L, const char *str, size_t l) { + setsvalue2s(L, L->top++, luaS_newlstr(L, str, l)); +} + + +/* this function handles only `%d', `%c', %f, %p, and `%s' formats */ +const char *luaO_pushvfstring (lua_State *L, const char *fmt, va_list argp) { + int n = 0; + for (;;) { + const char *e = strchr(fmt, '%'); + if (e == NULL) break; + luaD_checkstack(L, 2); /* fmt + item */ + pushstr(L, fmt, e - fmt); + switch (*(e+1)) { + case 's': { + const char *s = va_arg(argp, char *); + if (s == NULL) s = "(null)"; + pushstr(L, s, strlen(s)); + break; + } + case 'c': { + char buff; + buff = cast(char, va_arg(argp, int)); + pushstr(L, &buff, 1); + break; + } + case 'd': { + setnvalue(L->top++, cast_num(va_arg(argp, int))); + break; + } + case 'f': { + setnvalue(L->top++, cast_num(va_arg(argp, l_uacNumber))); + break; + } + case 'p': { + char buff[4*sizeof(void *) + 8]; /* should be enough space for a `%p' */ + int l = sprintf(buff, "%p", va_arg(argp, void *)); + pushstr(L, buff, l); + break; + } + case '%': { + pushstr(L, "%", 1); + break; + } + default: { + luaG_runerror(L, + "invalid option " LUA_QL("%%%c") " to " LUA_QL("lua_pushfstring"), + *(e + 1)); + } + } + n += 2; + fmt = e+2; + } + luaD_checkstack(L, 1); + pushstr(L, fmt, strlen(fmt)); + if (n > 0) luaV_concat(L, n + 1); + return svalue(L->top - 1); +} + + +const char *luaO_pushfstring (lua_State *L, const char *fmt, ...) { + const char *msg; + va_list argp; + va_start(argp, fmt); + msg = luaO_pushvfstring(L, fmt, argp); + va_end(argp); + return msg; +} + + +/* number of chars of a literal string without the ending \0 */ +#define LL(x) (sizeof(x)/sizeof(char) - 1) + +#define RETS "..." +#define PRE "[string \"" +#define POS "\"]" + +#define addstr(a,b,l) ( memcpy(a,b,(l) * sizeof(char)), a += (l) ) + +void luaO_chunkid (char *out, const char *source, size_t bufflen) { + size_t l = strlen(source); + if (*source == '=') { /* 'literal' source */ + if (l <= bufflen) /* small enough? */ + memcpy(out, source + 1, l * sizeof(char)); + else { /* truncate it */ + addstr(out, source + 1, bufflen - 1); + *out = '\0'; + } + } + else if (*source == '@') { /* file name */ + if (l <= bufflen) /* small enough? */ + memcpy(out, source + 1, l * sizeof(char)); + else { /* add '...' before rest of name */ + addstr(out, RETS, LL(RETS)); + bufflen -= LL(RETS); + memcpy(out, source + 1 + l - bufflen, bufflen * sizeof(char)); + } + } + else { /* string; format as [string "source"] */ + const char *nl = strchr(source, '\n'); /* find first new line (if any) */ + addstr(out, PRE, LL(PRE)); /* add prefix */ + bufflen -= LL(PRE RETS POS) + 1; /* save space for prefix+suffix+'\0' */ + if (l < bufflen && nl == NULL) { /* small one-line source? */ + addstr(out, source, l); /* keep it */ + } + else { + if (nl != NULL) l = nl - source; /* stop at first newline */ + if (l > bufflen) l = bufflen; + addstr(out, source, l); + addstr(out, RETS, LL(RETS)); + } + memcpy(out, POS, (LL(POS) + 1) * sizeof(char)); + } +} + diff --git a/radio/src/lua/src/lobject.h b/radio/src/lua/src/lobject.h new file mode 100644 index 000000000..dd23b9143 --- /dev/null +++ b/radio/src/lua/src/lobject.h @@ -0,0 +1,607 @@ +/* +** $Id: lobject.h,v 2.71 2012/09/11 18:21:44 roberto Exp $ +** Type definitions for Lua objects +** See Copyright Notice in lua.h +*/ + + +#ifndef lobject_h +#define lobject_h + + +#include + + +#include "llimits.h" +#include "lua.h" + + +/* +** Extra tags for non-values +*/ +#define LUA_TPROTO LUA_NUMTAGS +#define LUA_TUPVAL (LUA_NUMTAGS+1) +#define LUA_TDEADKEY (LUA_NUMTAGS+2) + +/* +** number of all possible tags (including LUA_TNONE but excluding DEADKEY) +*/ +#define LUA_TOTALTAGS (LUA_TUPVAL+2) + + +/* +** tags for Tagged Values have the following use of bits: +** bits 0-3: actual tag (a LUA_T* value) +** bits 4-5: variant bits +** bit 6: whether value is collectable +*/ + +#define VARBITS (3 << 4) + + +/* +** LUA_TFUNCTION variants: +** 0 - Lua function +** 1 - light C function +** 2 - regular C function (closure) +*/ + +/* Variant tags for functions */ +#define LUA_TLCL (LUA_TFUNCTION | (0 << 4)) /* Lua closure */ +#define LUA_TLCF (LUA_TFUNCTION | (1 << 4)) /* light C function */ +#define LUA_TCCL (LUA_TFUNCTION | (2 << 4)) /* C closure */ + + +/* Variant tags for strings */ +#define LUA_TSHRSTR (LUA_TSTRING | (0 << 4)) /* short strings */ +#define LUA_TLNGSTR (LUA_TSTRING | (1 << 4)) /* long strings */ + + +/* Bit mark for collectable types */ +#define BIT_ISCOLLECTABLE (1 << 6) + +/* mark a tag as collectable */ +#define ctb(t) ((t) | BIT_ISCOLLECTABLE) + + +/* +** Union of all collectable objects +*/ +typedef union GCObject GCObject; + + +/* +** Common Header for all collectable objects (in macro form, to be +** included in other objects) +*/ +#define CommonHeader GCObject *next; lu_byte tt; lu_byte marked + + +/* +** Common header in struct form +*/ +typedef struct GCheader { + CommonHeader; +} GCheader; + + + +/* +** Union of all Lua values +*/ +typedef union Value Value; + + +#define numfield lua_Number n; /* numbers */ + + + +/* +** Tagged Values. This is the basic representation of values in Lua, +** an actual value plus a tag with its type. +*/ + +#define TValuefields Value value_; int tt_ + +typedef struct lua_TValue TValue; + + +/* macro defining a nil value */ +#define NILCONSTANT {NULL}, LUA_TNIL + + +#define val_(o) ((o)->value_) +#define num_(o) (val_(o).n) + + +/* raw type tag of a TValue */ +#define rttype(o) ((o)->tt_) + +/* tag with no variants (bits 0-3) */ +#define novariant(x) ((x) & 0x0F) + +/* type tag of a TValue (bits 0-3 for tags + variant bits 4-5) */ +#define ttype(o) (rttype(o) & 0x3F) + +/* type tag of a TValue with no variants (bits 0-3) */ +#define ttypenv(o) (novariant(rttype(o))) + + +/* Macros to test type */ +#define checktag(o,t) (rttype(o) == (t)) +#define checktype(o,t) (ttypenv(o) == (t)) +#define ttisnumber(o) checktag((o), LUA_TNUMBER) +#define ttisnil(o) checktag((o), LUA_TNIL) +#define ttisboolean(o) checktag((o), LUA_TBOOLEAN) +#define ttislightuserdata(o) checktag((o), LUA_TLIGHTUSERDATA) +#define ttisstring(o) checktype((o), LUA_TSTRING) +#define ttisshrstring(o) checktag((o), ctb(LUA_TSHRSTR)) +#define ttislngstring(o) checktag((o), ctb(LUA_TLNGSTR)) +#define ttistable(o) checktag((o), ctb(LUA_TTABLE)) +#define ttisfunction(o) checktype(o, LUA_TFUNCTION) +#define ttisclosure(o) ((rttype(o) & 0x1F) == LUA_TFUNCTION) +#define ttisCclosure(o) checktag((o), ctb(LUA_TCCL)) +#define ttisLclosure(o) checktag((o), ctb(LUA_TLCL)) +#define ttislcf(o) checktag((o), LUA_TLCF) +#define ttisuserdata(o) checktag((o), ctb(LUA_TUSERDATA)) +#define ttisthread(o) checktag((o), ctb(LUA_TTHREAD)) +#define ttisdeadkey(o) checktag((o), LUA_TDEADKEY) + +#define ttisequal(o1,o2) (rttype(o1) == rttype(o2)) + +/* Macros to access values */ +#define nvalue(o) check_exp(ttisnumber(o), num_(o)) +#define gcvalue(o) check_exp(iscollectable(o), val_(o).gc) +#define pvalue(o) check_exp(ttislightuserdata(o), val_(o).p) +#define rawtsvalue(o) check_exp(ttisstring(o), &val_(o).gc->ts) +#define tsvalue(o) (&rawtsvalue(o)->tsv) +#define rawuvalue(o) check_exp(ttisuserdata(o), &val_(o).gc->u) +#define uvalue(o) (&rawuvalue(o)->uv) +#define clvalue(o) check_exp(ttisclosure(o), &val_(o).gc->cl) +#define clLvalue(o) check_exp(ttisLclosure(o), &val_(o).gc->cl.l) +#define clCvalue(o) check_exp(ttisCclosure(o), &val_(o).gc->cl.c) +#define fvalue(o) check_exp(ttislcf(o), val_(o).f) +#define hvalue(o) check_exp(ttistable(o), &val_(o).gc->h) +#define bvalue(o) check_exp(ttisboolean(o), val_(o).b) +#define thvalue(o) check_exp(ttisthread(o), &val_(o).gc->th) +/* a dead value may get the 'gc' field, but cannot access its contents */ +#define deadvalue(o) check_exp(ttisdeadkey(o), cast(void *, val_(o).gc)) + +#define l_isfalse(o) (ttisnil(o) || (ttisboolean(o) && bvalue(o) == 0)) + + +#define iscollectable(o) (rttype(o) & BIT_ISCOLLECTABLE) + + +/* Macros for internal tests */ +#define righttt(obj) (ttype(obj) == gcvalue(obj)->gch.tt) + +#define checkliveness(g,obj) \ + lua_longassert(!iscollectable(obj) || \ + (righttt(obj) && !isdead(g,gcvalue(obj)))) + + +/* Macros to set values */ +#define settt_(o,t) ((o)->tt_=(t)) + +#define setnvalue(obj,x) \ + { TValue *io=(obj); num_(io)=(x); settt_(io, LUA_TNUMBER); } + +#define setnilvalue(obj) settt_(obj, LUA_TNIL) + +#define setfvalue(obj,x) \ + { TValue *io=(obj); val_(io).f=(x); settt_(io, LUA_TLCF); } + +#define setpvalue(obj,x) \ + { TValue *io=(obj); val_(io).p=(x); settt_(io, LUA_TLIGHTUSERDATA); } + +#define setbvalue(obj,x) \ + { TValue *io=(obj); val_(io).b=(x); settt_(io, LUA_TBOOLEAN); } + +#define setgcovalue(L,obj,x) \ + { TValue *io=(obj); GCObject *i_g=(x); \ + val_(io).gc=i_g; settt_(io, ctb(gch(i_g)->tt)); } + +#define setsvalue(L,obj,x) \ + { TValue *io=(obj); \ + TString *x_ = (x); \ + val_(io).gc=cast(GCObject *, x_); settt_(io, ctb(x_->tsv.tt)); \ + checkliveness(G(L),io); } + +#define setuvalue(L,obj,x) \ + { TValue *io=(obj); \ + val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TUSERDATA)); \ + checkliveness(G(L),io); } + +#define setthvalue(L,obj,x) \ + { TValue *io=(obj); \ + val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TTHREAD)); \ + checkliveness(G(L),io); } + +#define setclLvalue(L,obj,x) \ + { TValue *io=(obj); \ + val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TLCL)); \ + checkliveness(G(L),io); } + +#define setclCvalue(L,obj,x) \ + { TValue *io=(obj); \ + val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TCCL)); \ + checkliveness(G(L),io); } + +#define sethvalue(L,obj,x) \ + { TValue *io=(obj); \ + val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TTABLE)); \ + checkliveness(G(L),io); } + +#define setdeadvalue(obj) settt_(obj, LUA_TDEADKEY) + + + +#define setobj(L,obj1,obj2) \ + { const TValue *io2=(obj2); TValue *io1=(obj1); \ + io1->value_ = io2->value_; io1->tt_ = io2->tt_; \ + checkliveness(G(L),io1); } + + +/* +** different types of assignments, according to destination +*/ + +/* from stack to (same) stack */ +#define setobjs2s setobj +/* to stack (not from same stack) */ +#define setobj2s setobj +#define setsvalue2s setsvalue +#define sethvalue2s sethvalue +#define setptvalue2s setptvalue +/* from table to same table */ +#define setobjt2t setobj +/* to table */ +#define setobj2t setobj +/* to new object */ +#define setobj2n setobj +#define setsvalue2n setsvalue + + +/* check whether a number is valid (useful only for NaN trick) */ +#define luai_checknum(L,o,c) { /* empty */ } + + +/* +** {====================================================== +** NaN Trick +** ======================================================= +*/ +#if defined(LUA_NANTRICK) + +/* +** numbers are represented in the 'd_' field. All other values have the +** value (NNMARK | tag) in 'tt__'. A number with such pattern would be +** a "signaled NaN", which is never generated by regular operations by +** the CPU (nor by 'strtod') +*/ + +/* allows for external implementation for part of the trick */ +#if !defined(NNMARK) /* { */ + + +#if !defined(LUA_IEEEENDIAN) +#error option 'LUA_NANTRICK' needs 'LUA_IEEEENDIAN' +#endif + + +#define NNMARK 0x7FF7A500 +#define NNMASK 0x7FFFFF00 + +#undef TValuefields +#undef NILCONSTANT + +#if (LUA_IEEEENDIAN == 0) /* { */ + +/* little endian */ +#define TValuefields \ + union { struct { Value v__; int tt__; } i; double d__; } u +#define NILCONSTANT {{{NULL}, tag2tt(LUA_TNIL)}} +/* field-access macros */ +#define v_(o) ((o)->u.i.v__) +#define d_(o) ((o)->u.d__) +#define tt_(o) ((o)->u.i.tt__) + +#else /* }{ */ + +/* big endian */ +#define TValuefields \ + union { struct { int tt__; Value v__; } i; double d__; } u +#define NILCONSTANT {{tag2tt(LUA_TNIL), {NULL}}} +/* field-access macros */ +#define v_(o) ((o)->u.i.v__) +#define d_(o) ((o)->u.d__) +#define tt_(o) ((o)->u.i.tt__) + +#endif /* } */ + +#endif /* } */ + + +/* correspondence with standard representation */ +#undef val_ +#define val_(o) v_(o) +#undef num_ +#define num_(o) d_(o) + + +#undef numfield +#define numfield /* no such field; numbers are the entire struct */ + +/* basic check to distinguish numbers from non-numbers */ +#undef ttisnumber +#define ttisnumber(o) ((tt_(o) & NNMASK) != NNMARK) + +#define tag2tt(t) (NNMARK | (t)) + +#undef rttype +#define rttype(o) (ttisnumber(o) ? LUA_TNUMBER : tt_(o) & 0xff) + +#undef settt_ +#define settt_(o,t) (tt_(o) = tag2tt(t)) + +#undef setnvalue +#define setnvalue(obj,x) \ + { TValue *io_=(obj); num_(io_)=(x); lua_assert(ttisnumber(io_)); } + +#undef setobj +#define setobj(L,obj1,obj2) \ + { const TValue *o2_=(obj2); TValue *o1_=(obj1); \ + o1_->u = o2_->u; \ + checkliveness(G(L),o1_); } + + +/* +** these redefinitions are not mandatory, but these forms are more efficient +*/ + +#undef checktag +#undef checktype +#define checktag(o,t) (tt_(o) == tag2tt(t)) +#define checktype(o,t) (ctb(tt_(o) | VARBITS) == ctb(tag2tt(t) | VARBITS)) + +#undef ttisequal +#define ttisequal(o1,o2) \ + (ttisnumber(o1) ? ttisnumber(o2) : (tt_(o1) == tt_(o2))) + + +#undef luai_checknum +#define luai_checknum(L,o,c) { if (!ttisnumber(o)) c; } + +#endif +/* }====================================================== */ + + + +/* +** {====================================================== +** types and prototypes +** ======================================================= +*/ + + +union Value { + GCObject *gc; /* collectable objects */ + void *p; /* light userdata */ + int b; /* booleans */ + lua_CFunction f; /* light C functions */ + numfield /* numbers */ +}; + + +struct lua_TValue { + TValuefields; +}; + + +typedef TValue *StkId; /* index to stack elements */ + + + + +/* +** Header for string value; string bytes follow the end of this structure +*/ +typedef union TString { + L_Umaxalign dummy; /* ensures maximum alignment for strings */ + struct { + CommonHeader; + lu_byte extra; /* reserved words for short strings; "has hash" for longs */ + unsigned int hash; + size_t len; /* number of characters in string */ + } tsv; +} TString; + + +/* get the actual string (array of bytes) from a TString */ +#define getstr(ts) cast(const char *, (ts) + 1) + +/* get the actual string (array of bytes) from a Lua value */ +#define svalue(o) getstr(rawtsvalue(o)) + + +/* +** Header for userdata; memory area follows the end of this structure +*/ +typedef union Udata { + L_Umaxalign dummy; /* ensures maximum alignment for `local' udata */ + struct { + CommonHeader; + struct Table *metatable; + struct Table *env; + size_t len; /* number of bytes */ + } uv; +} Udata; + + + +/* +** Description of an upvalue for function prototypes +*/ +typedef struct Upvaldesc { + TString *name; /* upvalue name (for debug information) */ + lu_byte instack; /* whether it is in stack */ + lu_byte idx; /* index of upvalue (in stack or in outer function's list) */ +} Upvaldesc; + + +/* +** Description of a local variable for function prototypes +** (used for debug information) +*/ +typedef struct LocVar { + TString *varname; + int startpc; /* first point where variable is active */ + int endpc; /* first point where variable is dead */ +} LocVar; + + +/* +** Function Prototypes +*/ +typedef struct Proto { + CommonHeader; + TValue *k; /* constants used by the function */ + Instruction *code; + struct Proto **p; /* functions defined inside the function */ + int *lineinfo; /* map from opcodes to source lines (debug information) */ + LocVar *locvars; /* information about local variables (debug information) */ + Upvaldesc *upvalues; /* upvalue information */ + union Closure *cache; /* last created closure with this prototype */ + TString *source; /* used for debug information */ + int sizeupvalues; /* size of 'upvalues' */ + int sizek; /* size of `k' */ + int sizecode; + int sizelineinfo; + int sizep; /* size of `p' */ + int sizelocvars; + int linedefined; + int lastlinedefined; + GCObject *gclist; + lu_byte numparams; /* number of fixed parameters */ + lu_byte is_vararg; + lu_byte maxstacksize; /* maximum stack used by this function */ +} Proto; + + + +/* +** Lua Upvalues +*/ +typedef struct UpVal { + CommonHeader; + TValue *v; /* points to stack or to its own value */ + union { + TValue value; /* the value (when closed) */ + struct { /* double linked list (when open) */ + struct UpVal *prev; + struct UpVal *next; + } l; + } u; +} UpVal; + + +/* +** Closures +*/ + +#define ClosureHeader \ + CommonHeader; lu_byte nupvalues; GCObject *gclist + +typedef struct CClosure { + ClosureHeader; + lua_CFunction f; + TValue upvalue[1]; /* list of upvalues */ +} CClosure; + + +typedef struct LClosure { + ClosureHeader; + struct Proto *p; + UpVal *upvals[1]; /* list of upvalues */ +} LClosure; + + +typedef union Closure { + CClosure c; + LClosure l; +} Closure; + + +#define isLfunction(o) ttisLclosure(o) + +#define getproto(o) (clLvalue(o)->p) + + +/* +** Tables +*/ + +typedef union TKey { + struct { + TValuefields; + struct Node *next; /* for chaining */ + } nk; + TValue tvk; +} TKey; + + +typedef struct Node { + TValue i_val; + TKey i_key; +} Node; + + +typedef struct Table { + CommonHeader; + lu_byte flags; /* 1<

lsizenode)) + + +/* +** (address of) a fixed nil value +*/ +#define luaO_nilobject (&luaO_nilobject_) + + +LUAI_DDEC const TValue luaO_nilobject_; + + +LUAI_FUNC int luaO_int2fb (unsigned int x); +LUAI_FUNC int luaO_fb2int (int x); +LUAI_FUNC int luaO_ceillog2 (unsigned int x); +LUAI_FUNC lua_Number luaO_arith (int op, lua_Number v1, lua_Number v2); +LUAI_FUNC int luaO_str2d (const char *s, size_t len, lua_Number *result); +LUAI_FUNC int luaO_hexavalue (int c); +LUAI_FUNC const char *luaO_pushvfstring (lua_State *L, const char *fmt, + va_list argp); +LUAI_FUNC const char *luaO_pushfstring (lua_State *L, const char *fmt, ...); +LUAI_FUNC void luaO_chunkid (char *out, const char *source, size_t len); + + +#endif + diff --git a/radio/src/lua/src/lopcodes.c b/radio/src/lua/src/lopcodes.c new file mode 100644 index 000000000..ef7369275 --- /dev/null +++ b/radio/src/lua/src/lopcodes.c @@ -0,0 +1,107 @@ +/* +** $Id: lopcodes.c,v 1.49 2012/05/14 13:34:18 roberto Exp $ +** Opcodes for Lua virtual machine +** See Copyright Notice in lua.h +*/ + + +#define lopcodes_c +#define LUA_CORE + + +#include "lopcodes.h" + + +/* ORDER OP */ + +LUAI_DDEF const char *const luaP_opnames[NUM_OPCODES+1] = { + "MOVE", + "LOADK", + "LOADKX", + "LOADBOOL", + "LOADNIL", + "GETUPVAL", + "GETTABUP", + "GETTABLE", + "SETTABUP", + "SETUPVAL", + "SETTABLE", + "NEWTABLE", + "SELF", + "ADD", + "SUB", + "MUL", + "DIV", + "MOD", + "POW", + "UNM", + "NOT", + "LEN", + "CONCAT", + "JMP", + "EQ", + "LT", + "LE", + "TEST", + "TESTSET", + "CALL", + "TAILCALL", + "RETURN", + "FORLOOP", + "FORPREP", + "TFORCALL", + "TFORLOOP", + "SETLIST", + "CLOSURE", + "VARARG", + "EXTRAARG", + NULL +}; + + +#define opmode(t,a,b,c,m) (((t)<<7) | ((a)<<6) | ((b)<<4) | ((c)<<2) | (m)) + +LUAI_DDEF const lu_byte luaP_opmodes[NUM_OPCODES] = { +/* T A B C mode opcode */ + opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_MOVE */ + ,opmode(0, 1, OpArgK, OpArgN, iABx) /* OP_LOADK */ + ,opmode(0, 1, OpArgN, OpArgN, iABx) /* OP_LOADKX */ + ,opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_LOADBOOL */ + ,opmode(0, 1, OpArgU, OpArgN, iABC) /* OP_LOADNIL */ + ,opmode(0, 1, OpArgU, OpArgN, iABC) /* OP_GETUPVAL */ + ,opmode(0, 1, OpArgU, OpArgK, iABC) /* OP_GETTABUP */ + ,opmode(0, 1, OpArgR, OpArgK, iABC) /* OP_GETTABLE */ + ,opmode(0, 0, OpArgK, OpArgK, iABC) /* OP_SETTABUP */ + ,opmode(0, 0, OpArgU, OpArgN, iABC) /* OP_SETUPVAL */ + ,opmode(0, 0, OpArgK, OpArgK, iABC) /* OP_SETTABLE */ + ,opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_NEWTABLE */ + ,opmode(0, 1, OpArgR, OpArgK, iABC) /* OP_SELF */ + ,opmode(0, 1, OpArgK, OpArgK, iABC) /* OP_ADD */ + ,opmode(0, 1, OpArgK, OpArgK, iABC) /* OP_SUB */ + ,opmode(0, 1, OpArgK, OpArgK, iABC) /* OP_MUL */ + ,opmode(0, 1, OpArgK, OpArgK, iABC) /* OP_DIV */ + ,opmode(0, 1, OpArgK, OpArgK, iABC) /* OP_MOD */ + ,opmode(0, 1, OpArgK, OpArgK, iABC) /* OP_POW */ + ,opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_UNM */ + ,opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_NOT */ + ,opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_LEN */ + ,opmode(0, 1, OpArgR, OpArgR, iABC) /* OP_CONCAT */ + ,opmode(0, 0, OpArgR, OpArgN, iAsBx) /* OP_JMP */ + ,opmode(1, 0, OpArgK, OpArgK, iABC) /* OP_EQ */ + ,opmode(1, 0, OpArgK, OpArgK, iABC) /* OP_LT */ + ,opmode(1, 0, OpArgK, OpArgK, iABC) /* OP_LE */ + ,opmode(1, 0, OpArgN, OpArgU, iABC) /* OP_TEST */ + ,opmode(1, 1, OpArgR, OpArgU, iABC) /* OP_TESTSET */ + ,opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_CALL */ + ,opmode(0, 1, OpArgU, OpArgU, iABC) /* OP_TAILCALL */ + ,opmode(0, 0, OpArgU, OpArgN, iABC) /* OP_RETURN */ + ,opmode(0, 1, OpArgR, OpArgN, iAsBx) /* OP_FORLOOP */ + ,opmode(0, 1, OpArgR, OpArgN, iAsBx) /* OP_FORPREP */ + ,opmode(0, 0, OpArgN, OpArgU, iABC) /* OP_TFORCALL */ + ,opmode(0, 1, OpArgR, OpArgN, iAsBx) /* OP_TFORLOOP */ + ,opmode(0, 0, OpArgU, OpArgU, iABC) /* OP_SETLIST */ + ,opmode(0, 1, OpArgU, OpArgN, iABx) /* OP_CLOSURE */ + ,opmode(0, 1, OpArgU, OpArgN, iABC) /* OP_VARARG */ + ,opmode(0, 0, OpArgU, OpArgU, iAx) /* OP_EXTRAARG */ +}; + diff --git a/radio/src/lua/src/lopcodes.h b/radio/src/lua/src/lopcodes.h new file mode 100644 index 000000000..07d2b3f39 --- /dev/null +++ b/radio/src/lua/src/lopcodes.h @@ -0,0 +1,288 @@ +/* +** $Id: lopcodes.h,v 1.142 2011/07/15 12:50:29 roberto Exp $ +** Opcodes for Lua virtual machine +** See Copyright Notice in lua.h +*/ + +#ifndef lopcodes_h +#define lopcodes_h + +#include "llimits.h" + + +/*=========================================================================== + We assume that instructions are unsigned numbers. + All instructions have an opcode in the first 6 bits. + Instructions can have the following fields: + `A' : 8 bits + `B' : 9 bits + `C' : 9 bits + 'Ax' : 26 bits ('A', 'B', and 'C' together) + `Bx' : 18 bits (`B' and `C' together) + `sBx' : signed Bx + + A signed argument is represented in excess K; that is, the number + value is the unsigned value minus K. K is exactly the maximum value + for that argument (so that -max is represented by 0, and +max is + represented by 2*max), which is half the maximum for the corresponding + unsigned argument. +===========================================================================*/ + + +enum OpMode {iABC, iABx, iAsBx, iAx}; /* basic instruction format */ + + +/* +** size and position of opcode arguments. +*/ +#define SIZE_C 9 +#define SIZE_B 9 +#define SIZE_Bx (SIZE_C + SIZE_B) +#define SIZE_A 8 +#define SIZE_Ax (SIZE_C + SIZE_B + SIZE_A) + +#define SIZE_OP 6 + +#define POS_OP 0 +#define POS_A (POS_OP + SIZE_OP) +#define POS_C (POS_A + SIZE_A) +#define POS_B (POS_C + SIZE_C) +#define POS_Bx POS_C +#define POS_Ax POS_A + + +/* +** limits for opcode arguments. +** we use (signed) int to manipulate most arguments, +** so they must fit in LUAI_BITSINT-1 bits (-1 for sign) +*/ +#if SIZE_Bx < LUAI_BITSINT-1 +#define MAXARG_Bx ((1<>1) /* `sBx' is signed */ +#else +#define MAXARG_Bx MAX_INT +#define MAXARG_sBx MAX_INT +#endif + +#if SIZE_Ax < LUAI_BITSINT-1 +#define MAXARG_Ax ((1<>POS_OP) & MASK1(SIZE_OP,0))) +#define SET_OPCODE(i,o) ((i) = (((i)&MASK0(SIZE_OP,POS_OP)) | \ + ((cast(Instruction, o)<>pos) & MASK1(size,0))) +#define setarg(i,v,pos,size) ((i) = (((i)&MASK0(size,pos)) | \ + ((cast(Instruction, v)<= R(A) + 1 */ +OP_EQ,/* A B C if ((RK(B) == RK(C)) ~= A) then pc++ */ +OP_LT,/* A B C if ((RK(B) < RK(C)) ~= A) then pc++ */ +OP_LE,/* A B C if ((RK(B) <= RK(C)) ~= A) then pc++ */ + +OP_TEST,/* A C if not (R(A) <=> C) then pc++ */ +OP_TESTSET,/* A B C if (R(B) <=> C) then R(A) := R(B) else pc++ */ + +OP_CALL,/* A B C R(A), ... ,R(A+C-2) := R(A)(R(A+1), ... ,R(A+B-1)) */ +OP_TAILCALL,/* A B C return R(A)(R(A+1), ... ,R(A+B-1)) */ +OP_RETURN,/* A B return R(A), ... ,R(A+B-2) (see note) */ + +OP_FORLOOP,/* A sBx R(A)+=R(A+2); + if R(A) > 4) & 3)) +#define getCMode(m) (cast(enum OpArgMask, (luaP_opmodes[m] >> 2) & 3)) +#define testAMode(m) (luaP_opmodes[m] & (1 << 6)) +#define testTMode(m) (luaP_opmodes[m] & (1 << 7)) + + +LUAI_DDEC const char *const luaP_opnames[NUM_OPCODES+1]; /* opcode names */ + + +/* number of list items to accumulate before a SETLIST instruction */ +#define LFIELDS_PER_FLUSH 50 + + +#endif diff --git a/radio/src/lua/src/loslib.c b/radio/src/lua/src/loslib.c new file mode 100644 index 000000000..d991b9deb --- /dev/null +++ b/radio/src/lua/src/loslib.c @@ -0,0 +1,322 @@ +/* +** $Id: loslib.c,v 1.40 2012/10/19 15:54:02 roberto Exp $ +** Standard Operating System library +** See Copyright Notice in lua.h +*/ + + +#include +#include +#include +#include +#include + +#define loslib_c + +#include "lua.h" + +#include "lauxlib.h" +#include "lualib.h" + + +/* +** list of valid conversion specifiers for the 'strftime' function +*/ +#if !defined(LUA_STRFTIMEOPTIONS) + +#if !defined(LUA_USE_POSIX) +#define LUA_STRFTIMEOPTIONS { "aAbBcdHIjmMpSUwWxXyYz%", "" } +#else +#define LUA_STRFTIMEOPTIONS \ + { "aAbBcCdDeFgGhHIjmMnprRStTuUVwWxXyYzZ%", "" \ + "", "E", "cCxXyY", \ + "O", "deHImMSuUVwWy" } +#endif + +#endif + + + +/* +** By default, Lua uses tmpnam except when POSIX is available, where it +** uses mkstemp. +*/ +#if defined(LUA_USE_MKSTEMP) +#include +#define LUA_TMPNAMBUFSIZE 32 +#define lua_tmpnam(b,e) { \ + strcpy(b, "/tmp/lua_XXXXXX"); \ + e = mkstemp(b); \ + if (e != -1) close(e); \ + e = (e == -1); } + +#elif !defined(lua_tmpnam) + +#define LUA_TMPNAMBUFSIZE L_tmpnam +#define lua_tmpnam(b,e) { e = (tmpnam(b) == NULL); } + +#endif + + +/* +** By default, Lua uses gmtime/localtime, except when POSIX is available, +** where it uses gmtime_r/localtime_r +*/ +#if defined(LUA_USE_GMTIME_R) + +#define l_gmtime(t,r) gmtime_r(t,r) +#define l_localtime(t,r) localtime_r(t,r) + +#elif !defined(l_gmtime) + +#define l_gmtime(t,r) ((void)r, gmtime(t)) +#define l_localtime(t,r) ((void)r, localtime(t)) + +#endif + + + +static int os_execute (lua_State *L) { + const char *cmd = luaL_optstring(L, 1, NULL); + int stat = system(cmd); + if (cmd != NULL) + return luaL_execresult(L, stat); + else { + lua_pushboolean(L, stat); /* true if there is a shell */ + return 1; + } +} + + +static int os_remove (lua_State *L) { + const char *filename = luaL_checkstring(L, 1); + return luaL_fileresult(L, remove(filename) == 0, filename); +} + + +static int os_rename (lua_State *L) { + const char *fromname = luaL_checkstring(L, 1); + const char *toname = luaL_checkstring(L, 2); + return luaL_fileresult(L, rename(fromname, toname) == 0, NULL); +} + + +static int os_tmpname (lua_State *L) { + char buff[LUA_TMPNAMBUFSIZE]; + int err; + lua_tmpnam(buff, err); + if (err) + return luaL_error(L, "unable to generate a unique filename"); + lua_pushstring(L, buff); + return 1; +} + + +static int os_getenv (lua_State *L) { + lua_pushstring(L, getenv(luaL_checkstring(L, 1))); /* if NULL push nil */ + return 1; +} + + +static int os_clock (lua_State *L) { + lua_pushnumber(L, ((lua_Number)clock())/(lua_Number)CLOCKS_PER_SEC); + return 1; +} + + +/* +** {====================================================== +** Time/Date operations +** { year=%Y, month=%m, day=%d, hour=%H, min=%M, sec=%S, +** wday=%w+1, yday=%j, isdst=? } +** ======================================================= +*/ + +static void setfield (lua_State *L, const char *key, int value) { + lua_pushinteger(L, value); + lua_setfield(L, -2, key); +} + +static void setboolfield (lua_State *L, const char *key, int value) { + if (value < 0) /* undefined? */ + return; /* does not set field */ + lua_pushboolean(L, value); + lua_setfield(L, -2, key); +} + +static int getboolfield (lua_State *L, const char *key) { + int res; + lua_getfield(L, -1, key); + res = lua_isnil(L, -1) ? -1 : lua_toboolean(L, -1); + lua_pop(L, 1); + return res; +} + + +static int getfield (lua_State *L, const char *key, int d) { + int res, isnum; + lua_getfield(L, -1, key); + res = (int)lua_tointegerx(L, -1, &isnum); + if (!isnum) { + if (d < 0) + return luaL_error(L, "field " LUA_QS " missing in date table", key); + res = d; + } + lua_pop(L, 1); + return res; +} + + +static const char *checkoption (lua_State *L, const char *conv, char *buff) { + static const char *const options[] = LUA_STRFTIMEOPTIONS; + unsigned int i; + for (i = 0; i < sizeof(options)/sizeof(options[0]); i += 2) { + if (*conv != '\0' && strchr(options[i], *conv) != NULL) { + buff[1] = *conv; + if (*options[i + 1] == '\0') { /* one-char conversion specifier? */ + buff[2] = '\0'; /* end buffer */ + return conv + 1; + } + else if (*(conv + 1) != '\0' && + strchr(options[i + 1], *(conv + 1)) != NULL) { + buff[2] = *(conv + 1); /* valid two-char conversion specifier */ + buff[3] = '\0'; /* end buffer */ + return conv + 2; + } + } + } + luaL_argerror(L, 1, + lua_pushfstring(L, "invalid conversion specifier '%%%s'", conv)); + return conv; /* to avoid warnings */ +} + + +static int os_date (lua_State *L) { + const char *s = luaL_optstring(L, 1, "%c"); + time_t t = luaL_opt(L, (time_t)luaL_checknumber, 2, time(NULL)); + struct tm tmr, *stm; + if (*s == '!') { /* UTC? */ + stm = l_gmtime(&t, &tmr); + s++; /* skip `!' */ + } + else + stm = l_localtime(&t, &tmr); + if (stm == NULL) /* invalid date? */ + lua_pushnil(L); + else if (strcmp(s, "*t") == 0) { + lua_createtable(L, 0, 9); /* 9 = number of fields */ + setfield(L, "sec", stm->tm_sec); + setfield(L, "min", stm->tm_min); + setfield(L, "hour", stm->tm_hour); + setfield(L, "day", stm->tm_mday); + setfield(L, "month", stm->tm_mon+1); + setfield(L, "year", stm->tm_year+1900); + setfield(L, "wday", stm->tm_wday+1); + setfield(L, "yday", stm->tm_yday+1); + setboolfield(L, "isdst", stm->tm_isdst); + } + else { + char cc[4]; + luaL_Buffer b; + cc[0] = '%'; + luaL_buffinit(L, &b); + while (*s) { + if (*s != '%') /* no conversion specifier? */ + luaL_addchar(&b, *s++); + else { + size_t reslen; + char buff[200]; /* should be big enough for any conversion result */ + s = checkoption(L, s + 1, cc); + reslen = strftime(buff, sizeof(buff), cc, stm); + luaL_addlstring(&b, buff, reslen); + } + } + luaL_pushresult(&b); + } + return 1; +} + + +static int os_time (lua_State *L) { + time_t t; + if (lua_isnoneornil(L, 1)) /* called without args? */ + t = time(NULL); /* get current time */ + else { + struct tm ts; + luaL_checktype(L, 1, LUA_TTABLE); + lua_settop(L, 1); /* make sure table is at the top */ + ts.tm_sec = getfield(L, "sec", 0); + ts.tm_min = getfield(L, "min", 0); + ts.tm_hour = getfield(L, "hour", 12); + ts.tm_mday = getfield(L, "day", -1); + ts.tm_mon = getfield(L, "month", -1) - 1; + ts.tm_year = getfield(L, "year", -1) - 1900; + ts.tm_isdst = getboolfield(L, "isdst"); + t = mktime(&ts); + } + if (t == (time_t)(-1)) + lua_pushnil(L); + else + lua_pushnumber(L, (lua_Number)t); + return 1; +} + + +static int os_difftime (lua_State *L) { + lua_pushnumber(L, difftime((time_t)(luaL_checknumber(L, 1)), + (time_t)(luaL_optnumber(L, 2, 0)))); + return 1; +} + +/* }====================================================== */ + + +static int os_setlocale (lua_State *L) { + static const int cat[] = {LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY, + LC_NUMERIC, LC_TIME}; + static const char *const catnames[] = {"all", "collate", "ctype", "monetary", + "numeric", "time", NULL}; + const char *l = luaL_optstring(L, 1, NULL); + int op = luaL_checkoption(L, 2, "all", catnames); + lua_pushstring(L, setlocale(cat[op], l)); + return 1; +} + + +static int os_exit (lua_State *L) { + int status; + if (lua_isboolean(L, 1)) + status = (lua_toboolean(L, 1) ? EXIT_SUCCESS : EXIT_FAILURE); + else + status = luaL_optint(L, 1, EXIT_SUCCESS); + if (lua_toboolean(L, 2)) + lua_close(L); + if (L) exit(status); /* 'if' to avoid warnings for unreachable 'return' */ + return 0; +} + + +static const luaL_Reg syslib[] = { + {"clock", os_clock}, + {"date", os_date}, + {"difftime", os_difftime}, + {"execute", os_execute}, + {"exit", os_exit}, + {"getenv", os_getenv}, + {"remove", os_remove}, + {"rename", os_rename}, + {"setlocale", os_setlocale}, + {"time", os_time}, + {"tmpname", os_tmpname}, + {NULL, NULL} +}; + +/* }====================================================== */ + + + +LUAMOD_API int luaopen_os (lua_State *L) { + luaL_newlib(L, syslib); + return 1; +} + diff --git a/radio/src/lua/src/lparser.c b/radio/src/lua/src/lparser.c new file mode 100644 index 000000000..d8f5b4ffc --- /dev/null +++ b/radio/src/lua/src/lparser.c @@ -0,0 +1,1638 @@ +/* +** $Id: lparser.c,v 2.130 2013/02/06 13:37:39 roberto Exp $ +** Lua Parser +** See Copyright Notice in lua.h +*/ + + +#include + +#define lparser_c +#define LUA_CORE + +#include "lua.h" + +#include "lcode.h" +#include "ldebug.h" +#include "ldo.h" +#include "lfunc.h" +#include "llex.h" +#include "lmem.h" +#include "lobject.h" +#include "lopcodes.h" +#include "lparser.h" +#include "lstate.h" +#include "lstring.h" +#include "ltable.h" + + + +/* maximum number of local variables per function (must be smaller + than 250, due to the bytecode format) */ +#define MAXVARS 200 + + +#define hasmultret(k) ((k) == VCALL || (k) == VVARARG) + + + +/* +** nodes for block list (list of active blocks) +*/ +typedef struct BlockCnt { + struct BlockCnt *previous; /* chain */ + short firstlabel; /* index of first label in this block */ + short firstgoto; /* index of first pending goto in this block */ + lu_byte nactvar; /* # active locals outside the block */ + lu_byte upval; /* true if some variable in the block is an upvalue */ + lu_byte isloop; /* true if `block' is a loop */ +} BlockCnt; + + + +/* +** prototypes for recursive non-terminal functions +*/ +static void statement (LexState *ls); +static void expr (LexState *ls, expdesc *v); + + +static void anchor_token (LexState *ls) { + /* last token from outer function must be EOS */ + lua_assert(ls->fs != NULL || ls->t.token == TK_EOS); + if (ls->t.token == TK_NAME || ls->t.token == TK_STRING) { + TString *ts = ls->t.seminfo.ts; + luaX_newstring(ls, getstr(ts), ts->tsv.len); + } +} + + +/* semantic error */ +static l_noret semerror (LexState *ls, const char *msg) { + ls->t.token = 0; /* remove 'near to' from final message */ + luaX_syntaxerror(ls, msg); +} + + +static l_noret error_expected (LexState *ls, int token) { + luaX_syntaxerror(ls, + luaO_pushfstring(ls->L, "%s expected", luaX_token2str(ls, token))); +} + + +static l_noret errorlimit (FuncState *fs, int limit, const char *what) { + lua_State *L = fs->ls->L; + const char *msg; + int line = fs->f->linedefined; + const char *where = (line == 0) + ? "main function" + : luaO_pushfstring(L, "function at line %d", line); + msg = luaO_pushfstring(L, "too many %s (limit is %d) in %s", + what, limit, where); + luaX_syntaxerror(fs->ls, msg); +} + + +static void checklimit (FuncState *fs, int v, int l, const char *what) { + if (v > l) errorlimit(fs, l, what); +} + + +static int testnext (LexState *ls, int c) { + if (ls->t.token == c) { + luaX_next(ls); + return 1; + } + else return 0; +} + + +static void check (LexState *ls, int c) { + if (ls->t.token != c) + error_expected(ls, c); +} + + +static void checknext (LexState *ls, int c) { + check(ls, c); + luaX_next(ls); +} + + +#define check_condition(ls,c,msg) { if (!(c)) luaX_syntaxerror(ls, msg); } + + + +static void check_match (LexState *ls, int what, int who, int where) { + if (!testnext(ls, what)) { + if (where == ls->linenumber) + error_expected(ls, what); + else { + luaX_syntaxerror(ls, luaO_pushfstring(ls->L, + "%s expected (to close %s at line %d)", + luaX_token2str(ls, what), luaX_token2str(ls, who), where)); + } + } +} + + +static TString *str_checkname (LexState *ls) { + TString *ts; + check(ls, TK_NAME); + ts = ls->t.seminfo.ts; + luaX_next(ls); + return ts; +} + + +static void init_exp (expdesc *e, expkind k, int i) { + e->f = e->t = NO_JUMP; + e->k = k; + e->u.info = i; +} + + +static void codestring (LexState *ls, expdesc *e, TString *s) { + init_exp(e, VK, luaK_stringK(ls->fs, s)); +} + + +static void checkname (LexState *ls, expdesc *e) { + codestring(ls, e, str_checkname(ls)); +} + + +static int registerlocalvar (LexState *ls, TString *varname) { + FuncState *fs = ls->fs; + Proto *f = fs->f; + int oldsize = f->sizelocvars; + luaM_growvector(ls->L, f->locvars, fs->nlocvars, f->sizelocvars, + LocVar, SHRT_MAX, "local variables"); + while (oldsize < f->sizelocvars) f->locvars[oldsize++].varname = NULL; + f->locvars[fs->nlocvars].varname = varname; + luaC_objbarrier(ls->L, f, varname); + return fs->nlocvars++; +} + + +static void new_localvar (LexState *ls, TString *name) { + FuncState *fs = ls->fs; + Dyndata *dyd = ls->dyd; + int reg = registerlocalvar(ls, name); + checklimit(fs, dyd->actvar.n + 1 - fs->firstlocal, + MAXVARS, "local variables"); + luaM_growvector(ls->L, dyd->actvar.arr, dyd->actvar.n + 1, + dyd->actvar.size, Vardesc, MAX_INT, "local variables"); + dyd->actvar.arr[dyd->actvar.n++].idx = cast(short, reg); +} + + +static void new_localvarliteral_ (LexState *ls, const char *name, size_t sz) { + new_localvar(ls, luaX_newstring(ls, name, sz)); +} + +#define new_localvarliteral(ls,v) \ + new_localvarliteral_(ls, "" v, (sizeof(v)/sizeof(char))-1) + + +static LocVar *getlocvar (FuncState *fs, int i) { + int idx = fs->ls->dyd->actvar.arr[fs->firstlocal + i].idx; + lua_assert(idx < fs->nlocvars); + return &fs->f->locvars[idx]; +} + + +static void adjustlocalvars (LexState *ls, int nvars) { + FuncState *fs = ls->fs; + fs->nactvar = cast_byte(fs->nactvar + nvars); + for (; nvars; nvars--) { + getlocvar(fs, fs->nactvar - nvars)->startpc = fs->pc; + } +} + + +static void removevars (FuncState *fs, int tolevel) { + fs->ls->dyd->actvar.n -= (fs->nactvar - tolevel); + while (fs->nactvar > tolevel) + getlocvar(fs, --fs->nactvar)->endpc = fs->pc; +} + + +static int searchupvalue (FuncState *fs, TString *name) { + int i; + Upvaldesc *up = fs->f->upvalues; + for (i = 0; i < fs->nups; i++) { + if (luaS_eqstr(up[i].name, name)) return i; + } + return -1; /* not found */ +} + + +static int newupvalue (FuncState *fs, TString *name, expdesc *v) { + Proto *f = fs->f; + int oldsize = f->sizeupvalues; + checklimit(fs, fs->nups + 1, MAXUPVAL, "upvalues"); + luaM_growvector(fs->ls->L, f->upvalues, fs->nups, f->sizeupvalues, + Upvaldesc, MAXUPVAL, "upvalues"); + while (oldsize < f->sizeupvalues) f->upvalues[oldsize++].name = NULL; + f->upvalues[fs->nups].instack = (v->k == VLOCAL); + f->upvalues[fs->nups].idx = cast_byte(v->u.info); + f->upvalues[fs->nups].name = name; + luaC_objbarrier(fs->ls->L, f, name); + return fs->nups++; +} + + +static int searchvar (FuncState *fs, TString *n) { + int i; + for (i = cast_int(fs->nactvar) - 1; i >= 0; i--) { + if (luaS_eqstr(n, getlocvar(fs, i)->varname)) + return i; + } + return -1; /* not found */ +} + + +/* + Mark block where variable at given level was defined + (to emit close instructions later). +*/ +static void markupval (FuncState *fs, int level) { + BlockCnt *bl = fs->bl; + while (bl->nactvar > level) bl = bl->previous; + bl->upval = 1; +} + + +/* + Find variable with given name 'n'. If it is an upvalue, add this + upvalue into all intermediate functions. +*/ +static int singlevaraux (FuncState *fs, TString *n, expdesc *var, int base) { + if (fs == NULL) /* no more levels? */ + return VVOID; /* default is global */ + else { + int v = searchvar(fs, n); /* look up locals at current level */ + if (v >= 0) { /* found? */ + init_exp(var, VLOCAL, v); /* variable is local */ + if (!base) + markupval(fs, v); /* local will be used as an upval */ + return VLOCAL; + } + else { /* not found as local at current level; try upvalues */ + int idx = searchupvalue(fs, n); /* try existing upvalues */ + if (idx < 0) { /* not found? */ + if (singlevaraux(fs->prev, n, var, 0) == VVOID) /* try upper levels */ + return VVOID; /* not found; is a global */ + /* else was LOCAL or UPVAL */ + idx = newupvalue(fs, n, var); /* will be a new upvalue */ + } + init_exp(var, VUPVAL, idx); + return VUPVAL; + } + } +} + + +static void singlevar (LexState *ls, expdesc *var) { + TString *varname = str_checkname(ls); + FuncState *fs = ls->fs; + if (singlevaraux(fs, varname, var, 1) == VVOID) { /* global name? */ + expdesc key; + singlevaraux(fs, ls->envn, var, 1); /* get environment variable */ + lua_assert(var->k == VLOCAL || var->k == VUPVAL); + codestring(ls, &key, varname); /* key is variable name */ + luaK_indexed(fs, var, &key); /* env[varname] */ + } +} + + +static void adjust_assign (LexState *ls, int nvars, int nexps, expdesc *e) { + FuncState *fs = ls->fs; + int extra = nvars - nexps; + if (hasmultret(e->k)) { + extra++; /* includes call itself */ + if (extra < 0) extra = 0; + luaK_setreturns(fs, e, extra); /* last exp. provides the difference */ + if (extra > 1) luaK_reserveregs(fs, extra-1); + } + else { + if (e->k != VVOID) luaK_exp2nextreg(fs, e); /* close last expression */ + if (extra > 0) { + int reg = fs->freereg; + luaK_reserveregs(fs, extra); + luaK_nil(fs, reg, extra); + } + } +} + + +static void enterlevel (LexState *ls) { + lua_State *L = ls->L; + ++L->nCcalls; + checklimit(ls->fs, L->nCcalls, LUAI_MAXCCALLS, "C levels"); +} + + +#define leavelevel(ls) ((ls)->L->nCcalls--) + + +static void closegoto (LexState *ls, int g, Labeldesc *label) { + int i; + FuncState *fs = ls->fs; + Labellist *gl = &ls->dyd->gt; + Labeldesc *gt = &gl->arr[g]; + lua_assert(luaS_eqstr(gt->name, label->name)); + if (gt->nactvar < label->nactvar) { + TString *vname = getlocvar(fs, gt->nactvar)->varname; + const char *msg = luaO_pushfstring(ls->L, + " at line %d jumps into the scope of local " LUA_QS, + getstr(gt->name), gt->line, getstr(vname)); + semerror(ls, msg); + } + luaK_patchlist(fs, gt->pc, label->pc); + /* remove goto from pending list */ + for (i = g; i < gl->n - 1; i++) + gl->arr[i] = gl->arr[i + 1]; + gl->n--; +} + + +/* +** try to close a goto with existing labels; this solves backward jumps +*/ +static int findlabel (LexState *ls, int g) { + int i; + BlockCnt *bl = ls->fs->bl; + Dyndata *dyd = ls->dyd; + Labeldesc *gt = &dyd->gt.arr[g]; + /* check labels in current block for a match */ + for (i = bl->firstlabel; i < dyd->label.n; i++) { + Labeldesc *lb = &dyd->label.arr[i]; + if (luaS_eqstr(lb->name, gt->name)) { /* correct label? */ + if (gt->nactvar > lb->nactvar && + (bl->upval || dyd->label.n > bl->firstlabel)) + luaK_patchclose(ls->fs, gt->pc, lb->nactvar); + closegoto(ls, g, lb); /* close it */ + return 1; + } + } + return 0; /* label not found; cannot close goto */ +} + + +static int newlabelentry (LexState *ls, Labellist *l, TString *name, + int line, int pc) { + int n = l->n; + luaM_growvector(ls->L, l->arr, n, l->size, + Labeldesc, SHRT_MAX, "labels/gotos"); + l->arr[n].name = name; + l->arr[n].line = line; + l->arr[n].nactvar = ls->fs->nactvar; + l->arr[n].pc = pc; + l->n++; + return n; +} + + +/* +** check whether new label 'lb' matches any pending gotos in current +** block; solves forward jumps +*/ +static void findgotos (LexState *ls, Labeldesc *lb) { + Labellist *gl = &ls->dyd->gt; + int i = ls->fs->bl->firstgoto; + while (i < gl->n) { + if (luaS_eqstr(gl->arr[i].name, lb->name)) + closegoto(ls, i, lb); + else + i++; + } +} + + +/* +** "export" pending gotos to outer level, to check them against +** outer labels; if the block being exited has upvalues, and +** the goto exits the scope of any variable (which can be the +** upvalue), close those variables being exited. +*/ +static void movegotosout (FuncState *fs, BlockCnt *bl) { + int i = bl->firstgoto; + Labellist *gl = &fs->ls->dyd->gt; + /* correct pending gotos to current block and try to close it + with visible labels */ + while (i < gl->n) { + Labeldesc *gt = &gl->arr[i]; + if (gt->nactvar > bl->nactvar) { + if (bl->upval) + luaK_patchclose(fs, gt->pc, bl->nactvar); + gt->nactvar = bl->nactvar; + } + if (!findlabel(fs->ls, i)) + i++; /* move to next one */ + } +} + + +static void enterblock (FuncState *fs, BlockCnt *bl, lu_byte isloop) { + bl->isloop = isloop; + bl->nactvar = fs->nactvar; + bl->firstlabel = fs->ls->dyd->label.n; + bl->firstgoto = fs->ls->dyd->gt.n; + bl->upval = 0; + bl->previous = fs->bl; + fs->bl = bl; + lua_assert(fs->freereg == fs->nactvar); +} + + +/* +** create a label named "break" to resolve break statements +*/ +static void breaklabel (LexState *ls) { + TString *n = luaS_new(ls->L, "break"); + int l = newlabelentry(ls, &ls->dyd->label, n, 0, ls->fs->pc); + findgotos(ls, &ls->dyd->label.arr[l]); +} + +/* +** generates an error for an undefined 'goto'; choose appropriate +** message when label name is a reserved word (which can only be 'break') +*/ +static l_noret undefgoto (LexState *ls, Labeldesc *gt) { + const char *msg = isreserved(gt->name) + ? "<%s> at line %d not inside a loop" + : "no visible label " LUA_QS " for at line %d"; + msg = luaO_pushfstring(ls->L, msg, getstr(gt->name), gt->line); + semerror(ls, msg); +} + + +static void leaveblock (FuncState *fs) { + BlockCnt *bl = fs->bl; + LexState *ls = fs->ls; + if (bl->previous && bl->upval) { + /* create a 'jump to here' to close upvalues */ + int j = luaK_jump(fs); + luaK_patchclose(fs, j, bl->nactvar); + luaK_patchtohere(fs, j); + } + if (bl->isloop) + breaklabel(ls); /* close pending breaks */ + fs->bl = bl->previous; + removevars(fs, bl->nactvar); + lua_assert(bl->nactvar == fs->nactvar); + fs->freereg = fs->nactvar; /* free registers */ + ls->dyd->label.n = bl->firstlabel; /* remove local labels */ + if (bl->previous) /* inner block? */ + movegotosout(fs, bl); /* update pending gotos to outer block */ + else if (bl->firstgoto < ls->dyd->gt.n) /* pending gotos in outer block? */ + undefgoto(ls, &ls->dyd->gt.arr[bl->firstgoto]); /* error */ +} + + +/* +** adds a new prototype into list of prototypes +*/ +static Proto *addprototype (LexState *ls) { + Proto *clp; + lua_State *L = ls->L; + FuncState *fs = ls->fs; + Proto *f = fs->f; /* prototype of current function */ + if (fs->np >= f->sizep) { + int oldsize = f->sizep; + luaM_growvector(L, f->p, fs->np, f->sizep, Proto *, MAXARG_Bx, "functions"); + while (oldsize < f->sizep) f->p[oldsize++] = NULL; + } + f->p[fs->np++] = clp = luaF_newproto(L); + luaC_objbarrier(L, f, clp); + return clp; +} + + +/* +** codes instruction to create new closure in parent function. +** The OP_CLOSURE instruction must use the last available register, +** so that, if it invokes the GC, the GC knows which registers +** are in use at that time. +*/ +static void codeclosure (LexState *ls, expdesc *v) { + FuncState *fs = ls->fs->prev; + init_exp(v, VRELOCABLE, luaK_codeABx(fs, OP_CLOSURE, 0, fs->np - 1)); + luaK_exp2nextreg(fs, v); /* fix it at the last register */ +} + + +static void open_func (LexState *ls, FuncState *fs, BlockCnt *bl) { + lua_State *L = ls->L; + Proto *f; + fs->prev = ls->fs; /* linked list of funcstates */ + fs->ls = ls; + ls->fs = fs; + fs->pc = 0; + fs->lasttarget = 0; + fs->jpc = NO_JUMP; + fs->freereg = 0; + fs->nk = 0; + fs->np = 0; + fs->nups = 0; + fs->nlocvars = 0; + fs->nactvar = 0; + fs->firstlocal = ls->dyd->actvar.n; + fs->bl = NULL; + f = fs->f; + f->source = ls->source; + f->maxstacksize = 2; /* registers 0/1 are always valid */ + fs->h = luaH_new(L); + /* anchor table of constants (to avoid being collected) */ + sethvalue2s(L, L->top, fs->h); + incr_top(L); + enterblock(fs, bl, 0); +} + + +static void close_func (LexState *ls) { + lua_State *L = ls->L; + FuncState *fs = ls->fs; + Proto *f = fs->f; + luaK_ret(fs, 0, 0); /* final return */ + leaveblock(fs); + luaM_reallocvector(L, f->code, f->sizecode, fs->pc, Instruction); + f->sizecode = fs->pc; + luaM_reallocvector(L, f->lineinfo, f->sizelineinfo, fs->pc, int); + f->sizelineinfo = fs->pc; + luaM_reallocvector(L, f->k, f->sizek, fs->nk, TValue); + f->sizek = fs->nk; + luaM_reallocvector(L, f->p, f->sizep, fs->np, Proto *); + f->sizep = fs->np; + luaM_reallocvector(L, f->locvars, f->sizelocvars, fs->nlocvars, LocVar); + f->sizelocvars = fs->nlocvars; + luaM_reallocvector(L, f->upvalues, f->sizeupvalues, fs->nups, Upvaldesc); + f->sizeupvalues = fs->nups; + lua_assert(fs->bl == NULL); + ls->fs = fs->prev; + /* last token read was anchored in defunct function; must re-anchor it */ + anchor_token(ls); + L->top--; /* pop table of constants */ + luaC_checkGC(L); +} + + + +/*============================================================*/ +/* GRAMMAR RULES */ +/*============================================================*/ + + +/* +** check whether current token is in the follow set of a block. +** 'until' closes syntactical blocks, but do not close scope, +** so it handled in separate. +*/ +static int block_follow (LexState *ls, int withuntil) { + switch (ls->t.token) { + case TK_ELSE: case TK_ELSEIF: + case TK_END: case TK_EOS: + return 1; + case TK_UNTIL: return withuntil; + default: return 0; + } +} + + +static void statlist (LexState *ls) { + /* statlist -> { stat [`;'] } */ + while (!block_follow(ls, 1)) { + if (ls->t.token == TK_RETURN) { + statement(ls); + return; /* 'return' must be last statement */ + } + statement(ls); + } +} + + +static void fieldsel (LexState *ls, expdesc *v) { + /* fieldsel -> ['.' | ':'] NAME */ + FuncState *fs = ls->fs; + expdesc key; + luaK_exp2anyregup(fs, v); + luaX_next(ls); /* skip the dot or colon */ + checkname(ls, &key); + luaK_indexed(fs, v, &key); +} + + +static void yindex (LexState *ls, expdesc *v) { + /* index -> '[' expr ']' */ + luaX_next(ls); /* skip the '[' */ + expr(ls, v); + luaK_exp2val(ls->fs, v); + checknext(ls, ']'); +} + + +/* +** {====================================================================== +** Rules for Constructors +** ======================================================================= +*/ + + +struct ConsControl { + expdesc v; /* last list item read */ + expdesc *t; /* table descriptor */ + int nh; /* total number of `record' elements */ + int na; /* total number of array elements */ + int tostore; /* number of array elements pending to be stored */ +}; + + +static void recfield (LexState *ls, struct ConsControl *cc) { + /* recfield -> (NAME | `['exp1`]') = exp1 */ + FuncState *fs = ls->fs; + int reg = ls->fs->freereg; + expdesc key, val; + int rkkey; + if (ls->t.token == TK_NAME) { + checklimit(fs, cc->nh, MAX_INT, "items in a constructor"); + checkname(ls, &key); + } + else /* ls->t.token == '[' */ + yindex(ls, &key); + cc->nh++; + checknext(ls, '='); + rkkey = luaK_exp2RK(fs, &key); + expr(ls, &val); + luaK_codeABC(fs, OP_SETTABLE, cc->t->u.info, rkkey, luaK_exp2RK(fs, &val)); + fs->freereg = reg; /* free registers */ +} + + +static void closelistfield (FuncState *fs, struct ConsControl *cc) { + if (cc->v.k == VVOID) return; /* there is no list item */ + luaK_exp2nextreg(fs, &cc->v); + cc->v.k = VVOID; + if (cc->tostore == LFIELDS_PER_FLUSH) { + luaK_setlist(fs, cc->t->u.info, cc->na, cc->tostore); /* flush */ + cc->tostore = 0; /* no more items pending */ + } +} + + +static void lastlistfield (FuncState *fs, struct ConsControl *cc) { + if (cc->tostore == 0) return; + if (hasmultret(cc->v.k)) { + luaK_setmultret(fs, &cc->v); + luaK_setlist(fs, cc->t->u.info, cc->na, LUA_MULTRET); + cc->na--; /* do not count last expression (unknown number of elements) */ + } + else { + if (cc->v.k != VVOID) + luaK_exp2nextreg(fs, &cc->v); + luaK_setlist(fs, cc->t->u.info, cc->na, cc->tostore); + } +} + + +static void listfield (LexState *ls, struct ConsControl *cc) { + /* listfield -> exp */ + expr(ls, &cc->v); + checklimit(ls->fs, cc->na, MAX_INT, "items in a constructor"); + cc->na++; + cc->tostore++; +} + + +static void field (LexState *ls, struct ConsControl *cc) { + /* field -> listfield | recfield */ + switch(ls->t.token) { + case TK_NAME: { /* may be 'listfield' or 'recfield' */ + if (luaX_lookahead(ls) != '=') /* expression? */ + listfield(ls, cc); + else + recfield(ls, cc); + break; + } + case '[': { + recfield(ls, cc); + break; + } + default: { + listfield(ls, cc); + break; + } + } +} + + +static void constructor (LexState *ls, expdesc *t) { + /* constructor -> '{' [ field { sep field } [sep] ] '}' + sep -> ',' | ';' */ + FuncState *fs = ls->fs; + int line = ls->linenumber; + int pc = luaK_codeABC(fs, OP_NEWTABLE, 0, 0, 0); + struct ConsControl cc; + cc.na = cc.nh = cc.tostore = 0; + cc.t = t; + init_exp(t, VRELOCABLE, pc); + init_exp(&cc.v, VVOID, 0); /* no value (yet) */ + luaK_exp2nextreg(ls->fs, t); /* fix it at stack top */ + checknext(ls, '{'); + do { + lua_assert(cc.v.k == VVOID || cc.tostore > 0); + if (ls->t.token == '}') break; + closelistfield(fs, &cc); + field(ls, &cc); + } while (testnext(ls, ',') || testnext(ls, ';')); + check_match(ls, '}', '{', line); + lastlistfield(fs, &cc); + SETARG_B(fs->f->code[pc], luaO_int2fb(cc.na)); /* set initial array size */ + SETARG_C(fs->f->code[pc], luaO_int2fb(cc.nh)); /* set initial table size */ +} + +/* }====================================================================== */ + + + +static void parlist (LexState *ls) { + /* parlist -> [ param { `,' param } ] */ + FuncState *fs = ls->fs; + Proto *f = fs->f; + int nparams = 0; + f->is_vararg = 0; + if (ls->t.token != ')') { /* is `parlist' not empty? */ + do { + switch (ls->t.token) { + case TK_NAME: { /* param -> NAME */ + new_localvar(ls, str_checkname(ls)); + nparams++; + break; + } + case TK_DOTS: { /* param -> `...' */ + luaX_next(ls); + f->is_vararg = 1; + break; + } + default: luaX_syntaxerror(ls, " or " LUA_QL("...") " expected"); + } + } while (!f->is_vararg && testnext(ls, ',')); + } + adjustlocalvars(ls, nparams); + f->numparams = cast_byte(fs->nactvar); + luaK_reserveregs(fs, fs->nactvar); /* reserve register for parameters */ +} + + +static void body (LexState *ls, expdesc *e, int ismethod, int line) { + /* body -> `(' parlist `)' block END */ + FuncState new_fs; + BlockCnt bl; + new_fs.f = addprototype(ls); + new_fs.f->linedefined = line; + open_func(ls, &new_fs, &bl); + checknext(ls, '('); + if (ismethod) { + new_localvarliteral(ls, "self"); /* create 'self' parameter */ + adjustlocalvars(ls, 1); + } + parlist(ls); + checknext(ls, ')'); + statlist(ls); + new_fs.f->lastlinedefined = ls->linenumber; + check_match(ls, TK_END, TK_FUNCTION, line); + codeclosure(ls, e); + close_func(ls); +} + + +static int explist (LexState *ls, expdesc *v) { + /* explist -> expr { `,' expr } */ + int n = 1; /* at least one expression */ + expr(ls, v); + while (testnext(ls, ',')) { + luaK_exp2nextreg(ls->fs, v); + expr(ls, v); + n++; + } + return n; +} + + +static void funcargs (LexState *ls, expdesc *f, int line) { + FuncState *fs = ls->fs; + expdesc args; + int base, nparams; + switch (ls->t.token) { + case '(': { /* funcargs -> `(' [ explist ] `)' */ + luaX_next(ls); + if (ls->t.token == ')') /* arg list is empty? */ + args.k = VVOID; + else { + explist(ls, &args); + luaK_setmultret(fs, &args); + } + check_match(ls, ')', '(', line); + break; + } + case '{': { /* funcargs -> constructor */ + constructor(ls, &args); + break; + } + case TK_STRING: { /* funcargs -> STRING */ + codestring(ls, &args, ls->t.seminfo.ts); + luaX_next(ls); /* must use `seminfo' before `next' */ + break; + } + default: { + luaX_syntaxerror(ls, "function arguments expected"); + } + } + lua_assert(f->k == VNONRELOC); + base = f->u.info; /* base register for call */ + if (hasmultret(args.k)) + nparams = LUA_MULTRET; /* open call */ + else { + if (args.k != VVOID) + luaK_exp2nextreg(fs, &args); /* close last argument */ + nparams = fs->freereg - (base+1); + } + init_exp(f, VCALL, luaK_codeABC(fs, OP_CALL, base, nparams+1, 2)); + luaK_fixline(fs, line); + fs->freereg = base+1; /* call remove function and arguments and leaves + (unless changed) one result */ +} + + + + +/* +** {====================================================================== +** Expression parsing +** ======================================================================= +*/ + + +static void primaryexp (LexState *ls, expdesc *v) { + /* primaryexp -> NAME | '(' expr ')' */ + switch (ls->t.token) { + case '(': { + int line = ls->linenumber; + luaX_next(ls); + expr(ls, v); + check_match(ls, ')', '(', line); + luaK_dischargevars(ls->fs, v); + return; + } + case TK_NAME: { + singlevar(ls, v); + return; + } + default: { + luaX_syntaxerror(ls, "unexpected symbol"); + } + } +} + + +static void suffixedexp (LexState *ls, expdesc *v) { + /* suffixedexp -> + primaryexp { '.' NAME | '[' exp ']' | ':' NAME funcargs | funcargs } */ + FuncState *fs = ls->fs; + int line = ls->linenumber; + primaryexp(ls, v); + for (;;) { + switch (ls->t.token) { + case '.': { /* fieldsel */ + fieldsel(ls, v); + break; + } + case '[': { /* `[' exp1 `]' */ + expdesc key; + luaK_exp2anyregup(fs, v); + yindex(ls, &key); + luaK_indexed(fs, v, &key); + break; + } + case ':': { /* `:' NAME funcargs */ + expdesc key; + luaX_next(ls); + checkname(ls, &key); + luaK_self(fs, v, &key); + funcargs(ls, v, line); + break; + } + case '(': case TK_STRING: case '{': { /* funcargs */ + luaK_exp2nextreg(fs, v); + funcargs(ls, v, line); + break; + } + default: return; + } + } +} + + +static void simpleexp (LexState *ls, expdesc *v) { + /* simpleexp -> NUMBER | STRING | NIL | TRUE | FALSE | ... | + constructor | FUNCTION body | suffixedexp */ + switch (ls->t.token) { + case TK_NUMBER: { + init_exp(v, VKNUM, 0); + v->u.nval = ls->t.seminfo.r; + break; + } + case TK_STRING: { + codestring(ls, v, ls->t.seminfo.ts); + break; + } + case TK_NIL: { + init_exp(v, VNIL, 0); + break; + } + case TK_TRUE: { + init_exp(v, VTRUE, 0); + break; + } + case TK_FALSE: { + init_exp(v, VFALSE, 0); + break; + } + case TK_DOTS: { /* vararg */ + FuncState *fs = ls->fs; + check_condition(ls, fs->f->is_vararg, + "cannot use " LUA_QL("...") " outside a vararg function"); + init_exp(v, VVARARG, luaK_codeABC(fs, OP_VARARG, 0, 1, 0)); + break; + } + case '{': { /* constructor */ + constructor(ls, v); + return; + } + case TK_FUNCTION: { + luaX_next(ls); + body(ls, v, 0, ls->linenumber); + return; + } + default: { + suffixedexp(ls, v); + return; + } + } + luaX_next(ls); +} + + +static UnOpr getunopr (int op) { + switch (op) { + case TK_NOT: return OPR_NOT; + case '-': return OPR_MINUS; + case '#': return OPR_LEN; + default: return OPR_NOUNOPR; + } +} + + +static BinOpr getbinopr (int op) { + switch (op) { + case '+': return OPR_ADD; + case '-': return OPR_SUB; + case '*': return OPR_MUL; + case '/': return OPR_DIV; + case '%': return OPR_MOD; + case '^': return OPR_POW; + case TK_CONCAT: return OPR_CONCAT; + case TK_NE: return OPR_NE; + case TK_EQ: return OPR_EQ; + case '<': return OPR_LT; + case TK_LE: return OPR_LE; + case '>': return OPR_GT; + case TK_GE: return OPR_GE; + case TK_AND: return OPR_AND; + case TK_OR: return OPR_OR; + default: return OPR_NOBINOPR; + } +} + + +static const struct { + lu_byte left; /* left priority for each binary operator */ + lu_byte right; /* right priority */ +} priority[] = { /* ORDER OPR */ + {6, 6}, {6, 6}, {7, 7}, {7, 7}, {7, 7}, /* `+' `-' `*' `/' `%' */ + {10, 9}, {5, 4}, /* ^, .. (right associative) */ + {3, 3}, {3, 3}, {3, 3}, /* ==, <, <= */ + {3, 3}, {3, 3}, {3, 3}, /* ~=, >, >= */ + {2, 2}, {1, 1} /* and, or */ +}; + +#define UNARY_PRIORITY 8 /* priority for unary operators */ + + +/* +** subexpr -> (simpleexp | unop subexpr) { binop subexpr } +** where `binop' is any binary operator with a priority higher than `limit' +*/ +static BinOpr subexpr (LexState *ls, expdesc *v, int limit) { + BinOpr op; + UnOpr uop; + enterlevel(ls); + uop = getunopr(ls->t.token); + if (uop != OPR_NOUNOPR) { + int line = ls->linenumber; + luaX_next(ls); + subexpr(ls, v, UNARY_PRIORITY); + luaK_prefix(ls->fs, uop, v, line); + } + else simpleexp(ls, v); + /* expand while operators have priorities higher than `limit' */ + op = getbinopr(ls->t.token); + while (op != OPR_NOBINOPR && priority[op].left > limit) { + expdesc v2; + BinOpr nextop; + int line = ls->linenumber; + luaX_next(ls); + luaK_infix(ls->fs, op, v); + /* read sub-expression with higher priority */ + nextop = subexpr(ls, &v2, priority[op].right); + luaK_posfix(ls->fs, op, v, &v2, line); + op = nextop; + } + leavelevel(ls); + return op; /* return first untreated operator */ +} + + +static void expr (LexState *ls, expdesc *v) { + subexpr(ls, v, 0); +} + +/* }==================================================================== */ + + + +/* +** {====================================================================== +** Rules for Statements +** ======================================================================= +*/ + + +static void block (LexState *ls) { + /* block -> statlist */ + FuncState *fs = ls->fs; + BlockCnt bl; + enterblock(fs, &bl, 0); + statlist(ls); + leaveblock(fs); +} + + +/* +** structure to chain all variables in the left-hand side of an +** assignment +*/ +struct LHS_assign { + struct LHS_assign *prev; + expdesc v; /* variable (global, local, upvalue, or indexed) */ +}; + + +/* +** check whether, in an assignment to an upvalue/local variable, the +** upvalue/local variable is begin used in a previous assignment to a +** table. If so, save original upvalue/local value in a safe place and +** use this safe copy in the previous assignment. +*/ +static void check_conflict (LexState *ls, struct LHS_assign *lh, expdesc *v) { + FuncState *fs = ls->fs; + int extra = fs->freereg; /* eventual position to save local variable */ + int conflict = 0; + for (; lh; lh = lh->prev) { /* check all previous assignments */ + if (lh->v.k == VINDEXED) { /* assigning to a table? */ + /* table is the upvalue/local being assigned now? */ + if (lh->v.u.ind.vt == v->k && lh->v.u.ind.t == v->u.info) { + conflict = 1; + lh->v.u.ind.vt = VLOCAL; + lh->v.u.ind.t = extra; /* previous assignment will use safe copy */ + } + /* index is the local being assigned? (index cannot be upvalue) */ + if (v->k == VLOCAL && lh->v.u.ind.idx == v->u.info) { + conflict = 1; + lh->v.u.ind.idx = extra; /* previous assignment will use safe copy */ + } + } + } + if (conflict) { + /* copy upvalue/local value to a temporary (in position 'extra') */ + OpCode op = (v->k == VLOCAL) ? OP_MOVE : OP_GETUPVAL; + luaK_codeABC(fs, op, extra, v->u.info, 0); + luaK_reserveregs(fs, 1); + } +} + + +static void assignment (LexState *ls, struct LHS_assign *lh, int nvars) { + expdesc e; + check_condition(ls, vkisvar(lh->v.k), "syntax error"); + if (testnext(ls, ',')) { /* assignment -> ',' suffixedexp assignment */ + struct LHS_assign nv; + nv.prev = lh; + suffixedexp(ls, &nv.v); + if (nv.v.k != VINDEXED) + check_conflict(ls, lh, &nv.v); + checklimit(ls->fs, nvars + ls->L->nCcalls, LUAI_MAXCCALLS, + "C levels"); + assignment(ls, &nv, nvars+1); + } + else { /* assignment -> `=' explist */ + int nexps; + checknext(ls, '='); + nexps = explist(ls, &e); + if (nexps != nvars) { + adjust_assign(ls, nvars, nexps, &e); + if (nexps > nvars) + ls->fs->freereg -= nexps - nvars; /* remove extra values */ + } + else { + luaK_setoneret(ls->fs, &e); /* close last expression */ + luaK_storevar(ls->fs, &lh->v, &e); + return; /* avoid default */ + } + } + init_exp(&e, VNONRELOC, ls->fs->freereg-1); /* default assignment */ + luaK_storevar(ls->fs, &lh->v, &e); +} + + +static int cond (LexState *ls) { + /* cond -> exp */ + expdesc v; + expr(ls, &v); /* read condition */ + if (v.k == VNIL) v.k = VFALSE; /* `falses' are all equal here */ + luaK_goiftrue(ls->fs, &v); + return v.f; +} + + +static void gotostat (LexState *ls, int pc) { + int line = ls->linenumber; + TString *label; + int g; + if (testnext(ls, TK_GOTO)) + label = str_checkname(ls); + else { + luaX_next(ls); /* skip break */ + label = luaS_new(ls->L, "break"); + } + g = newlabelentry(ls, &ls->dyd->gt, label, line, pc); + findlabel(ls, g); /* close it if label already defined */ +} + + +/* check for repeated labels on the same block */ +static void checkrepeated (FuncState *fs, Labellist *ll, TString *label) { + int i; + for (i = fs->bl->firstlabel; i < ll->n; i++) { + if (luaS_eqstr(label, ll->arr[i].name)) { + const char *msg = luaO_pushfstring(fs->ls->L, + "label " LUA_QS " already defined on line %d", + getstr(label), ll->arr[i].line); + semerror(fs->ls, msg); + } + } +} + + +/* skip no-op statements */ +static void skipnoopstat (LexState *ls) { + while (ls->t.token == ';' || ls->t.token == TK_DBCOLON) + statement(ls); +} + + +static void labelstat (LexState *ls, TString *label, int line) { + /* label -> '::' NAME '::' */ + FuncState *fs = ls->fs; + Labellist *ll = &ls->dyd->label; + int l; /* index of new label being created */ + checkrepeated(fs, ll, label); /* check for repeated labels */ + checknext(ls, TK_DBCOLON); /* skip double colon */ + /* create new entry for this label */ + l = newlabelentry(ls, ll, label, line, fs->pc); + skipnoopstat(ls); /* skip other no-op statements */ + if (block_follow(ls, 0)) { /* label is last no-op statement in the block? */ + /* assume that locals are already out of scope */ + ll->arr[l].nactvar = fs->bl->nactvar; + } + findgotos(ls, &ll->arr[l]); +} + + +static void whilestat (LexState *ls, int line) { + /* whilestat -> WHILE cond DO block END */ + FuncState *fs = ls->fs; + int whileinit; + int condexit; + BlockCnt bl; + luaX_next(ls); /* skip WHILE */ + whileinit = luaK_getlabel(fs); + condexit = cond(ls); + enterblock(fs, &bl, 1); + checknext(ls, TK_DO); + block(ls); + luaK_jumpto(fs, whileinit); + check_match(ls, TK_END, TK_WHILE, line); + leaveblock(fs); + luaK_patchtohere(fs, condexit); /* false conditions finish the loop */ +} + + +static void repeatstat (LexState *ls, int line) { + /* repeatstat -> REPEAT block UNTIL cond */ + int condexit; + FuncState *fs = ls->fs; + int repeat_init = luaK_getlabel(fs); + BlockCnt bl1, bl2; + enterblock(fs, &bl1, 1); /* loop block */ + enterblock(fs, &bl2, 0); /* scope block */ + luaX_next(ls); /* skip REPEAT */ + statlist(ls); + check_match(ls, TK_UNTIL, TK_REPEAT, line); + condexit = cond(ls); /* read condition (inside scope block) */ + if (bl2.upval) /* upvalues? */ + luaK_patchclose(fs, condexit, bl2.nactvar); + leaveblock(fs); /* finish scope */ + luaK_patchlist(fs, condexit, repeat_init); /* close the loop */ + leaveblock(fs); /* finish loop */ +} + + +static int exp1 (LexState *ls) { + expdesc e; + int reg; + expr(ls, &e); + luaK_exp2nextreg(ls->fs, &e); + lua_assert(e.k == VNONRELOC); + reg = e.u.info; + return reg; +} + + +static void forbody (LexState *ls, int base, int line, int nvars, int isnum) { + /* forbody -> DO block */ + BlockCnt bl; + FuncState *fs = ls->fs; + int prep, endfor; + adjustlocalvars(ls, 3); /* control variables */ + checknext(ls, TK_DO); + prep = isnum ? luaK_codeAsBx(fs, OP_FORPREP, base, NO_JUMP) : luaK_jump(fs); + enterblock(fs, &bl, 0); /* scope for declared variables */ + adjustlocalvars(ls, nvars); + luaK_reserveregs(fs, nvars); + block(ls); + leaveblock(fs); /* end of scope for declared variables */ + luaK_patchtohere(fs, prep); + if (isnum) /* numeric for? */ + endfor = luaK_codeAsBx(fs, OP_FORLOOP, base, NO_JUMP); + else { /* generic for */ + luaK_codeABC(fs, OP_TFORCALL, base, 0, nvars); + luaK_fixline(fs, line); + endfor = luaK_codeAsBx(fs, OP_TFORLOOP, base + 2, NO_JUMP); + } + luaK_patchlist(fs, endfor, prep + 1); + luaK_fixline(fs, line); +} + + +static void fornum (LexState *ls, TString *varname, int line) { + /* fornum -> NAME = exp1,exp1[,exp1] forbody */ + FuncState *fs = ls->fs; + int base = fs->freereg; + new_localvarliteral(ls, "(for index)"); + new_localvarliteral(ls, "(for limit)"); + new_localvarliteral(ls, "(for step)"); + new_localvar(ls, varname); + checknext(ls, '='); + exp1(ls); /* initial value */ + checknext(ls, ','); + exp1(ls); /* limit */ + if (testnext(ls, ',')) + exp1(ls); /* optional step */ + else { /* default step = 1 */ + luaK_codek(fs, fs->freereg, luaK_numberK(fs, 1)); + luaK_reserveregs(fs, 1); + } + forbody(ls, base, line, 1, 1); +} + + +static void forlist (LexState *ls, TString *indexname) { + /* forlist -> NAME {,NAME} IN explist forbody */ + FuncState *fs = ls->fs; + expdesc e; + int nvars = 4; /* gen, state, control, plus at least one declared var */ + int line; + int base = fs->freereg; + /* create control variables */ + new_localvarliteral(ls, "(for generator)"); + new_localvarliteral(ls, "(for state)"); + new_localvarliteral(ls, "(for control)"); + /* create declared variables */ + new_localvar(ls, indexname); + while (testnext(ls, ',')) { + new_localvar(ls, str_checkname(ls)); + nvars++; + } + checknext(ls, TK_IN); + line = ls->linenumber; + adjust_assign(ls, 3, explist(ls, &e), &e); + luaK_checkstack(fs, 3); /* extra space to call generator */ + forbody(ls, base, line, nvars - 3, 0); +} + + +static void forstat (LexState *ls, int line) { + /* forstat -> FOR (fornum | forlist) END */ + FuncState *fs = ls->fs; + TString *varname; + BlockCnt bl; + enterblock(fs, &bl, 1); /* scope for loop and control variables */ + luaX_next(ls); /* skip `for' */ + varname = str_checkname(ls); /* first variable name */ + switch (ls->t.token) { + case '=': fornum(ls, varname, line); break; + case ',': case TK_IN: forlist(ls, varname); break; + default: luaX_syntaxerror(ls, LUA_QL("=") " or " LUA_QL("in") " expected"); + } + check_match(ls, TK_END, TK_FOR, line); + leaveblock(fs); /* loop scope (`break' jumps to this point) */ +} + + +static void test_then_block (LexState *ls, int *escapelist) { + /* test_then_block -> [IF | ELSEIF] cond THEN block */ + BlockCnt bl; + FuncState *fs = ls->fs; + expdesc v; + int jf; /* instruction to skip 'then' code (if condition is false) */ + luaX_next(ls); /* skip IF or ELSEIF */ + expr(ls, &v); /* read condition */ + checknext(ls, TK_THEN); + if (ls->t.token == TK_GOTO || ls->t.token == TK_BREAK) { + luaK_goiffalse(ls->fs, &v); /* will jump to label if condition is true */ + enterblock(fs, &bl, 0); /* must enter block before 'goto' */ + gotostat(ls, v.t); /* handle goto/break */ + skipnoopstat(ls); /* skip other no-op statements */ + if (block_follow(ls, 0)) { /* 'goto' is the entire block? */ + leaveblock(fs); + return; /* and that is it */ + } + else /* must skip over 'then' part if condition is false */ + jf = luaK_jump(fs); + } + else { /* regular case (not goto/break) */ + luaK_goiftrue(ls->fs, &v); /* skip over block if condition is false */ + enterblock(fs, &bl, 0); + jf = v.f; + } + statlist(ls); /* `then' part */ + leaveblock(fs); + if (ls->t.token == TK_ELSE || + ls->t.token == TK_ELSEIF) /* followed by 'else'/'elseif'? */ + luaK_concat(fs, escapelist, luaK_jump(fs)); /* must jump over it */ + luaK_patchtohere(fs, jf); +} + + +static void ifstat (LexState *ls, int line) { + /* ifstat -> IF cond THEN block {ELSEIF cond THEN block} [ELSE block] END */ + FuncState *fs = ls->fs; + int escapelist = NO_JUMP; /* exit list for finished parts */ + test_then_block(ls, &escapelist); /* IF cond THEN block */ + while (ls->t.token == TK_ELSEIF) + test_then_block(ls, &escapelist); /* ELSEIF cond THEN block */ + if (testnext(ls, TK_ELSE)) + block(ls); /* `else' part */ + check_match(ls, TK_END, TK_IF, line); + luaK_patchtohere(fs, escapelist); /* patch escape list to 'if' end */ +} + + +static void localfunc (LexState *ls) { + expdesc b; + FuncState *fs = ls->fs; + new_localvar(ls, str_checkname(ls)); /* new local variable */ + adjustlocalvars(ls, 1); /* enter its scope */ + body(ls, &b, 0, ls->linenumber); /* function created in next register */ + /* debug information will only see the variable after this point! */ + getlocvar(fs, b.u.info)->startpc = fs->pc; +} + + +static void localstat (LexState *ls) { + /* stat -> LOCAL NAME {`,' NAME} [`=' explist] */ + int nvars = 0; + int nexps; + expdesc e; + do { + new_localvar(ls, str_checkname(ls)); + nvars++; + } while (testnext(ls, ',')); + if (testnext(ls, '=')) + nexps = explist(ls, &e); + else { + e.k = VVOID; + nexps = 0; + } + adjust_assign(ls, nvars, nexps, &e); + adjustlocalvars(ls, nvars); +} + + +static int funcname (LexState *ls, expdesc *v) { + /* funcname -> NAME {fieldsel} [`:' NAME] */ + int ismethod = 0; + singlevar(ls, v); + while (ls->t.token == '.') + fieldsel(ls, v); + if (ls->t.token == ':') { + ismethod = 1; + fieldsel(ls, v); + } + return ismethod; +} + + +static void funcstat (LexState *ls, int line) { + /* funcstat -> FUNCTION funcname body */ + int ismethod; + expdesc v, b; + luaX_next(ls); /* skip FUNCTION */ + ismethod = funcname(ls, &v); + body(ls, &b, ismethod, line); + luaK_storevar(ls->fs, &v, &b); + luaK_fixline(ls->fs, line); /* definition `happens' in the first line */ +} + + +static void exprstat (LexState *ls) { + /* stat -> func | assignment */ + FuncState *fs = ls->fs; + struct LHS_assign v; + suffixedexp(ls, &v.v); + if (ls->t.token == '=' || ls->t.token == ',') { /* stat -> assignment ? */ + v.prev = NULL; + assignment(ls, &v, 1); + } + else { /* stat -> func */ + check_condition(ls, v.v.k == VCALL, "syntax error"); + SETARG_C(getcode(fs, &v.v), 1); /* call statement uses no results */ + } +} + + +static void retstat (LexState *ls) { + /* stat -> RETURN [explist] [';'] */ + FuncState *fs = ls->fs; + expdesc e; + int first, nret; /* registers with returned values */ + if (block_follow(ls, 1) || ls->t.token == ';') + first = nret = 0; /* return no values */ + else { + nret = explist(ls, &e); /* optional return values */ + if (hasmultret(e.k)) { + luaK_setmultret(fs, &e); + if (e.k == VCALL && nret == 1) { /* tail call? */ + SET_OPCODE(getcode(fs,&e), OP_TAILCALL); + lua_assert(GETARG_A(getcode(fs,&e)) == fs->nactvar); + } + first = fs->nactvar; + nret = LUA_MULTRET; /* return all values */ + } + else { + if (nret == 1) /* only one single value? */ + first = luaK_exp2anyreg(fs, &e); + else { + luaK_exp2nextreg(fs, &e); /* values must go to the `stack' */ + first = fs->nactvar; /* return all `active' values */ + lua_assert(nret == fs->freereg - first); + } + } + } + luaK_ret(fs, first, nret); + testnext(ls, ';'); /* skip optional semicolon */ +} + + +static void statement (LexState *ls) { + int line = ls->linenumber; /* may be needed for error messages */ + enterlevel(ls); + switch (ls->t.token) { + case ';': { /* stat -> ';' (empty statement) */ + luaX_next(ls); /* skip ';' */ + break; + } + case TK_IF: { /* stat -> ifstat */ + ifstat(ls, line); + break; + } + case TK_WHILE: { /* stat -> whilestat */ + whilestat(ls, line); + break; + } + case TK_DO: { /* stat -> DO block END */ + luaX_next(ls); /* skip DO */ + block(ls); + check_match(ls, TK_END, TK_DO, line); + break; + } + case TK_FOR: { /* stat -> forstat */ + forstat(ls, line); + break; + } + case TK_REPEAT: { /* stat -> repeatstat */ + repeatstat(ls, line); + break; + } + case TK_FUNCTION: { /* stat -> funcstat */ + funcstat(ls, line); + break; + } + case TK_LOCAL: { /* stat -> localstat */ + luaX_next(ls); /* skip LOCAL */ + if (testnext(ls, TK_FUNCTION)) /* local function? */ + localfunc(ls); + else + localstat(ls); + break; + } + case TK_DBCOLON: { /* stat -> label */ + luaX_next(ls); /* skip double colon */ + labelstat(ls, str_checkname(ls), line); + break; + } + case TK_RETURN: { /* stat -> retstat */ + luaX_next(ls); /* skip RETURN */ + retstat(ls); + break; + } + case TK_BREAK: /* stat -> breakstat */ + case TK_GOTO: { /* stat -> 'goto' NAME */ + gotostat(ls, luaK_jump(ls->fs)); + break; + } + default: { /* stat -> func | assignment */ + exprstat(ls); + break; + } + } + lua_assert(ls->fs->f->maxstacksize >= ls->fs->freereg && + ls->fs->freereg >= ls->fs->nactvar); + ls->fs->freereg = ls->fs->nactvar; /* free registers */ + leavelevel(ls); +} + +/* }====================================================================== */ + + +/* +** compiles the main function, which is a regular vararg function with an +** upvalue named LUA_ENV +*/ +static void mainfunc (LexState *ls, FuncState *fs) { + BlockCnt bl; + expdesc v; + open_func(ls, fs, &bl); + fs->f->is_vararg = 1; /* main function is always vararg */ + init_exp(&v, VLOCAL, 0); /* create and... */ + newupvalue(fs, ls->envn, &v); /* ...set environment upvalue */ + luaX_next(ls); /* read first token */ + statlist(ls); /* parse main body */ + check(ls, TK_EOS); + close_func(ls); +} + + +Closure *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff, + Dyndata *dyd, const char *name, int firstchar) { + LexState lexstate; + FuncState funcstate; + Closure *cl = luaF_newLclosure(L, 1); /* create main closure */ + /* anchor closure (to avoid being collected) */ + setclLvalue(L, L->top, cl); + incr_top(L); + funcstate.f = cl->l.p = luaF_newproto(L); + funcstate.f->source = luaS_new(L, name); /* create and anchor TString */ + lexstate.buff = buff; + lexstate.dyd = dyd; + dyd->actvar.n = dyd->gt.n = dyd->label.n = 0; + luaX_setinput(L, &lexstate, z, funcstate.f->source, firstchar); + mainfunc(&lexstate, &funcstate); + lua_assert(!funcstate.prev && funcstate.nups == 1 && !lexstate.fs); + /* all scopes should be correctly finished */ + lua_assert(dyd->actvar.n == 0 && dyd->gt.n == 0 && dyd->label.n == 0); + return cl; /* it's on the stack too */ +} + diff --git a/radio/src/lua/src/lparser.h b/radio/src/lua/src/lparser.h new file mode 100644 index 000000000..301167d4f --- /dev/null +++ b/radio/src/lua/src/lparser.h @@ -0,0 +1,119 @@ +/* +** $Id: lparser.h,v 1.70 2012/05/08 13:53:33 roberto Exp $ +** Lua Parser +** See Copyright Notice in lua.h +*/ + +#ifndef lparser_h +#define lparser_h + +#include "llimits.h" +#include "lobject.h" +#include "lzio.h" + + +/* +** Expression descriptor +*/ + +typedef enum { + VVOID, /* no value */ + VNIL, + VTRUE, + VFALSE, + VK, /* info = index of constant in `k' */ + VKNUM, /* nval = numerical value */ + VNONRELOC, /* info = result register */ + VLOCAL, /* info = local register */ + VUPVAL, /* info = index of upvalue in 'upvalues' */ + VINDEXED, /* t = table register/upvalue; idx = index R/K */ + VJMP, /* info = instruction pc */ + VRELOCABLE, /* info = instruction pc */ + VCALL, /* info = instruction pc */ + VVARARG /* info = instruction pc */ +} expkind; + + +#define vkisvar(k) (VLOCAL <= (k) && (k) <= VINDEXED) +#define vkisinreg(k) ((k) == VNONRELOC || (k) == VLOCAL) + +typedef struct expdesc { + expkind k; + union { + struct { /* for indexed variables (VINDEXED) */ + short idx; /* index (R/K) */ + lu_byte t; /* table (register or upvalue) */ + lu_byte vt; /* whether 't' is register (VLOCAL) or upvalue (VUPVAL) */ + } ind; + int info; /* for generic use */ + lua_Number nval; /* for VKNUM */ + } u; + int t; /* patch list of `exit when true' */ + int f; /* patch list of `exit when false' */ +} expdesc; + + +/* description of active local variable */ +typedef struct Vardesc { + short idx; /* variable index in stack */ +} Vardesc; + + +/* description of pending goto statements and label statements */ +typedef struct Labeldesc { + TString *name; /* label identifier */ + int pc; /* position in code */ + int line; /* line where it appeared */ + lu_byte nactvar; /* local level where it appears in current block */ +} Labeldesc; + + +/* list of labels or gotos */ +typedef struct Labellist { + Labeldesc *arr; /* array */ + int n; /* number of entries in use */ + int size; /* array size */ +} Labellist; + + +/* dynamic structures used by the parser */ +typedef struct Dyndata { + struct { /* list of active local variables */ + Vardesc *arr; + int n; + int size; + } actvar; + Labellist gt; /* list of pending gotos */ + Labellist label; /* list of active labels */ +} Dyndata; + + +/* control of blocks */ +struct BlockCnt; /* defined in lparser.c */ + + +/* state needed to generate code for a given function */ +typedef struct FuncState { + Proto *f; /* current function header */ + Table *h; /* table to find (and reuse) elements in `k' */ + struct FuncState *prev; /* enclosing function */ + struct LexState *ls; /* lexical state */ + struct BlockCnt *bl; /* chain of current blocks */ + int pc; /* next position to code (equivalent to `ncode') */ + int lasttarget; /* 'label' of last 'jump label' */ + int jpc; /* list of pending jumps to `pc' */ + int nk; /* number of elements in `k' */ + int np; /* number of elements in `p' */ + int firstlocal; /* index of first local var (in Dyndata array) */ + short nlocvars; /* number of elements in 'f->locvars' */ + lu_byte nactvar; /* number of active local variables */ + lu_byte nups; /* number of upvalues */ + lu_byte freereg; /* first free register */ +} FuncState; + + +LUAI_FUNC Closure *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff, + Dyndata *dyd, const char *name, int firstchar); + + +#endif diff --git a/radio/src/lua/src/lstate.c b/radio/src/lua/src/lstate.c new file mode 100644 index 000000000..207a106d5 --- /dev/null +++ b/radio/src/lua/src/lstate.c @@ -0,0 +1,322 @@ +/* +** $Id: lstate.c,v 2.99 2012/10/02 17:40:53 roberto Exp $ +** Global State +** See Copyright Notice in lua.h +*/ + + +#include +#include + +#define lstate_c +#define LUA_CORE + +#include "lua.h" + +#include "lapi.h" +#include "ldebug.h" +#include "ldo.h" +#include "lfunc.h" +#include "lgc.h" +#include "llex.h" +#include "lmem.h" +#include "lstate.h" +#include "lstring.h" +#include "ltable.h" +#include "ltm.h" + + +#if !defined(LUAI_GCPAUSE) +#define LUAI_GCPAUSE 200 /* 200% */ +#endif + +#if !defined(LUAI_GCMAJOR) +#define LUAI_GCMAJOR 200 /* 200% */ +#endif + +#if !defined(LUAI_GCMUL) +#define LUAI_GCMUL 200 /* GC runs 'twice the speed' of memory allocation */ +#endif + + +#define MEMERRMSG "not enough memory" + + +/* +** a macro to help the creation of a unique random seed when a state is +** created; the seed is used to randomize hashes. +*/ +#if !defined(luai_makeseed) +#include +#define luai_makeseed() cast(unsigned int, time(NULL)) +#endif + + + +/* +** thread state + extra space +*/ +typedef struct LX { +#if defined(LUAI_EXTRASPACE) + char buff[LUAI_EXTRASPACE]; +#endif + lua_State l; +} LX; + + +/* +** Main thread combines a thread state and the global state +*/ +typedef struct LG { + LX l; + global_State g; +} LG; + + + +#define fromstate(L) (cast(LX *, cast(lu_byte *, (L)) - offsetof(LX, l))) + + +/* +** Compute an initial seed as random as possible. In ANSI, rely on +** Address Space Layout Randomization (if present) to increase +** randomness.. +*/ +#define addbuff(b,p,e) \ + { size_t t = cast(size_t, e); \ + memcpy(buff + p, &t, sizeof(t)); p += sizeof(t); } + +static unsigned int makeseed (lua_State *L) { + char buff[4 * sizeof(size_t)]; + unsigned int h = luai_makeseed(); + int p = 0; + addbuff(buff, p, L); /* heap variable */ + addbuff(buff, p, &h); /* local variable */ + addbuff(buff, p, luaO_nilobject); /* global variable */ + addbuff(buff, p, &lua_newstate); /* public function */ + lua_assert(p == sizeof(buff)); + return luaS_hash(buff, p, h); +} + + +/* +** set GCdebt to a new value keeping the value (totalbytes + GCdebt) +** invariant +*/ +void luaE_setdebt (global_State *g, l_mem debt) { + g->totalbytes -= (debt - g->GCdebt); + g->GCdebt = debt; +} + + +CallInfo *luaE_extendCI (lua_State *L) { + CallInfo *ci = luaM_new(L, CallInfo); + lua_assert(L->ci->next == NULL); + L->ci->next = ci; + ci->previous = L->ci; + ci->next = NULL; + return ci; +} + + +void luaE_freeCI (lua_State *L) { + CallInfo *ci = L->ci; + CallInfo *next = ci->next; + ci->next = NULL; + while ((ci = next) != NULL) { + next = ci->next; + luaM_free(L, ci); + } +} + + +static void stack_init (lua_State *L1, lua_State *L) { + int i; CallInfo *ci; + /* initialize stack array */ + L1->stack = luaM_newvector(L, BASIC_STACK_SIZE, TValue); + L1->stacksize = BASIC_STACK_SIZE; + for (i = 0; i < BASIC_STACK_SIZE; i++) + setnilvalue(L1->stack + i); /* erase new stack */ + L1->top = L1->stack; + L1->stack_last = L1->stack + L1->stacksize - EXTRA_STACK; + /* initialize first ci */ + ci = &L1->base_ci; + ci->next = ci->previous = NULL; + ci->callstatus = 0; + ci->func = L1->top; + setnilvalue(L1->top++); /* 'function' entry for this 'ci' */ + ci->top = L1->top + LUA_MINSTACK; + L1->ci = ci; +} + + +static void freestack (lua_State *L) { + if (L->stack == NULL) + return; /* stack not completely built yet */ + L->ci = &L->base_ci; /* free the entire 'ci' list */ + luaE_freeCI(L); + luaM_freearray(L, L->stack, L->stacksize); /* free stack array */ +} + + +/* +** Create registry table and its predefined values +*/ +static void init_registry (lua_State *L, global_State *g) { + TValue mt; + /* create registry */ + Table *registry = luaH_new(L); + sethvalue(L, &g->l_registry, registry); + luaH_resize(L, registry, LUA_RIDX_LAST, 0); + /* registry[LUA_RIDX_MAINTHREAD] = L */ + setthvalue(L, &mt, L); + luaH_setint(L, registry, LUA_RIDX_MAINTHREAD, &mt); + /* registry[LUA_RIDX_GLOBALS] = table of globals */ + sethvalue(L, &mt, luaH_new(L)); + luaH_setint(L, registry, LUA_RIDX_GLOBALS, &mt); +} + + +/* +** open parts of the state that may cause memory-allocation errors +*/ +static void f_luaopen (lua_State *L, void *ud) { + global_State *g = G(L); + UNUSED(ud); + stack_init(L, L); /* init stack */ + init_registry(L, g); + luaS_resize(L, MINSTRTABSIZE); /* initial size of string table */ + luaT_init(L); + luaX_init(L); + /* pre-create memory-error message */ + g->memerrmsg = luaS_newliteral(L, MEMERRMSG); + luaS_fix(g->memerrmsg); /* it should never be collected */ + g->gcrunning = 1; /* allow gc */ +} + + +/* +** preinitialize a state with consistent values without allocating +** any memory (to avoid errors) +*/ +static void preinit_state (lua_State *L, global_State *g) { + G(L) = g; + L->stack = NULL; + L->ci = NULL; + L->stacksize = 0; + L->errorJmp = NULL; + L->nCcalls = 0; + L->hook = NULL; + L->hookmask = 0; + L->basehookcount = 0; + L->allowhook = 1; + resethookcount(L); + L->openupval = NULL; + L->nny = 1; + L->status = LUA_OK; + L->errfunc = 0; +} + + +static void close_state (lua_State *L) { + global_State *g = G(L); + luaF_close(L, L->stack); /* close all upvalues for this thread */ + luaC_freeallobjects(L); /* collect all objects */ + luaM_freearray(L, G(L)->strt.hash, G(L)->strt.size); + luaZ_freebuffer(L, &g->buff); + freestack(L); + lua_assert(gettotalbytes(g) == sizeof(LG)); + (*g->frealloc)(g->ud, fromstate(L), sizeof(LG), 0); /* free main block */ +} + + +LUA_API lua_State *lua_newthread (lua_State *L) { + lua_State *L1; + lua_lock(L); + luaC_checkGC(L); + L1 = &luaC_newobj(L, LUA_TTHREAD, sizeof(LX), NULL, offsetof(LX, l))->th; + setthvalue(L, L->top, L1); + api_incr_top(L); + preinit_state(L1, G(L)); + L1->hookmask = L->hookmask; + L1->basehookcount = L->basehookcount; + L1->hook = L->hook; + resethookcount(L1); + luai_userstatethread(L, L1); + stack_init(L1, L); /* init stack */ + lua_unlock(L); + return L1; +} + + +void luaE_freethread (lua_State *L, lua_State *L1) { + LX *l = fromstate(L1); + luaF_close(L1, L1->stack); /* close all upvalues for this thread */ + lua_assert(L1->openupval == NULL); + luai_userstatefree(L, L1); + freestack(L1); + luaM_free(L, l); +} + + +LUA_API lua_State *lua_newstate (lua_Alloc f, void *ud) { + int i; + lua_State *L; + global_State *g; + LG *l = cast(LG *, (*f)(ud, NULL, LUA_TTHREAD, sizeof(LG))); + if (l == NULL) return NULL; + L = &l->l.l; + g = &l->g; + L->next = NULL; + L->tt = LUA_TTHREAD; + g->currentwhite = bit2mask(WHITE0BIT, FIXEDBIT); + L->marked = luaC_white(g); + g->gckind = KGC_NORMAL; + preinit_state(L, g); + g->frealloc = f; + g->ud = ud; + g->mainthread = L; + g->seed = makeseed(L); + g->uvhead.u.l.prev = &g->uvhead; + g->uvhead.u.l.next = &g->uvhead; + g->gcrunning = 0; /* no GC while building state */ + g->GCestimate = 0; + g->strt.size = 0; + g->strt.nuse = 0; + g->strt.hash = NULL; + setnilvalue(&g->l_registry); + luaZ_initbuffer(L, &g->buff); + g->panic = NULL; + g->version = lua_version(NULL); + g->gcstate = GCSpause; + g->allgc = NULL; + g->finobj = NULL; + g->tobefnz = NULL; + g->sweepgc = g->sweepfin = NULL; + g->gray = g->grayagain = NULL; + g->weak = g->ephemeron = g->allweak = NULL; + g->totalbytes = sizeof(LG); + g->GCdebt = 0; + g->gcpause = LUAI_GCPAUSE; + g->gcmajorinc = LUAI_GCMAJOR; + g->gcstepmul = LUAI_GCMUL; + for (i=0; i < LUA_NUMTAGS; i++) g->mt[i] = NULL; + if (luaD_rawrunprotected(L, f_luaopen, NULL) != LUA_OK) { + /* memory allocation error: free partial state */ + close_state(L); + L = NULL; + } + else + luai_userstateopen(L); + return L; +} + + +LUA_API void lua_close (lua_State *L) { + L = G(L)->mainthread; /* only the main thread can be closed */ + lua_lock(L); + luai_userstateclose(L); + close_state(L); +} + + diff --git a/radio/src/lua/src/lstate.h b/radio/src/lua/src/lstate.h new file mode 100644 index 000000000..c8a31f5c0 --- /dev/null +++ b/radio/src/lua/src/lstate.h @@ -0,0 +1,228 @@ +/* +** $Id: lstate.h,v 2.82 2012/07/02 13:37:04 roberto Exp $ +** Global State +** See Copyright Notice in lua.h +*/ + +#ifndef lstate_h +#define lstate_h + +#include "lua.h" + +#include "lobject.h" +#include "ltm.h" +#include "lzio.h" + + +/* + +** Some notes about garbage-collected objects: All objects in Lua must +** be kept somehow accessible until being freed. +** +** Lua keeps most objects linked in list g->allgc. The link uses field +** 'next' of the CommonHeader. +** +** Strings are kept in several lists headed by the array g->strt.hash. +** +** Open upvalues are not subject to independent garbage collection. They +** are collected together with their respective threads. Lua keeps a +** double-linked list with all open upvalues (g->uvhead) so that it can +** mark objects referred by them. (They are always gray, so they must +** be remarked in the atomic step. Usually their contents would be marked +** when traversing the respective threads, but the thread may already be +** dead, while the upvalue is still accessible through closures.) +** +** Objects with finalizers are kept in the list g->finobj. +** +** The list g->tobefnz links all objects being finalized. + +*/ + + +struct lua_longjmp; /* defined in ldo.c */ + + + +/* extra stack space to handle TM calls and some other extras */ +#define EXTRA_STACK 5 + + +#define BASIC_STACK_SIZE (2*LUA_MINSTACK) + + +/* kinds of Garbage Collection */ +#define KGC_NORMAL 0 +#define KGC_EMERGENCY 1 /* gc was forced by an allocation failure */ +#define KGC_GEN 2 /* generational collection */ + + +typedef struct stringtable { + GCObject **hash; + lu_int32 nuse; /* number of elements */ + int size; +} stringtable; + + +/* +** information about a call +*/ +typedef struct CallInfo { + StkId func; /* function index in the stack */ + StkId top; /* top for this function */ + struct CallInfo *previous, *next; /* dynamic call link */ + short nresults; /* expected number of results from this function */ + lu_byte callstatus; + ptrdiff_t extra; + union { + struct { /* only for Lua functions */ + StkId base; /* base for this function */ + const Instruction *savedpc; + } l; + struct { /* only for C functions */ + int ctx; /* context info. in case of yields */ + lua_CFunction k; /* continuation in case of yields */ + ptrdiff_t old_errfunc; + lu_byte old_allowhook; + lu_byte status; + } c; + } u; +} CallInfo; + + +/* +** Bits in CallInfo status +*/ +#define CIST_LUA (1<<0) /* call is running a Lua function */ +#define CIST_HOOKED (1<<1) /* call is running a debug hook */ +#define CIST_REENTRY (1<<2) /* call is running on same invocation of + luaV_execute of previous call */ +#define CIST_YIELDED (1<<3) /* call reentered after suspension */ +#define CIST_YPCALL (1<<4) /* call is a yieldable protected call */ +#define CIST_STAT (1<<5) /* call has an error status (pcall) */ +#define CIST_TAIL (1<<6) /* call was tail called */ +#define CIST_HOOKYIELD (1<<7) /* last hook called yielded */ + + +#define isLua(ci) ((ci)->callstatus & CIST_LUA) + + +/* +** `global state', shared by all threads of this state +*/ +typedef struct global_State { + lua_Alloc frealloc; /* function to reallocate memory */ + void *ud; /* auxiliary data to `frealloc' */ + lu_mem totalbytes; /* number of bytes currently allocated - GCdebt */ + l_mem GCdebt; /* bytes allocated not yet compensated by the collector */ + lu_mem GCmemtrav; /* memory traversed by the GC */ + lu_mem GCestimate; /* an estimate of the non-garbage memory in use */ + stringtable strt; /* hash table for strings */ + TValue l_registry; + unsigned int seed; /* randomized seed for hashes */ + lu_byte currentwhite; + lu_byte gcstate; /* state of garbage collector */ + lu_byte gckind; /* kind of GC running */ + lu_byte gcrunning; /* true if GC is running */ + int sweepstrgc; /* position of sweep in `strt' */ + GCObject *allgc; /* list of all collectable objects */ + GCObject *finobj; /* list of collectable objects with finalizers */ + GCObject **sweepgc; /* current position of sweep in list 'allgc' */ + GCObject **sweepfin; /* current position of sweep in list 'finobj' */ + GCObject *gray; /* list of gray objects */ + GCObject *grayagain; /* list of objects to be traversed atomically */ + GCObject *weak; /* list of tables with weak values */ + GCObject *ephemeron; /* list of ephemeron tables (weak keys) */ + GCObject *allweak; /* list of all-weak tables */ + GCObject *tobefnz; /* list of userdata to be GC */ + UpVal uvhead; /* head of double-linked list of all open upvalues */ + Mbuffer buff; /* temporary buffer for string concatenation */ + int gcpause; /* size of pause between successive GCs */ + int gcmajorinc; /* pause between major collections (only in gen. mode) */ + int gcstepmul; /* GC `granularity' */ + lua_CFunction panic; /* to be called in unprotected errors */ + struct lua_State *mainthread; + const lua_Number *version; /* pointer to version number */ + TString *memerrmsg; /* memory-error message */ + TString *tmname[TM_N]; /* array with tag-method names */ + struct Table *mt[LUA_NUMTAGS]; /* metatables for basic types */ +} global_State; + + +/* +** `per thread' state +*/ +struct lua_State { + CommonHeader; + lu_byte status; + StkId top; /* first free slot in the stack */ + global_State *l_G; + CallInfo *ci; /* call info for current function */ + const Instruction *oldpc; /* last pc traced */ + StkId stack_last; /* last free slot in the stack */ + StkId stack; /* stack base */ + int stacksize; + unsigned short nny; /* number of non-yieldable calls in stack */ + unsigned short nCcalls; /* number of nested C calls */ + lu_byte hookmask; + lu_byte allowhook; + int basehookcount; + int hookcount; + lua_Hook hook; + GCObject *openupval; /* list of open upvalues in this stack */ + GCObject *gclist; + struct lua_longjmp *errorJmp; /* current error recover point */ + ptrdiff_t errfunc; /* current error handling function (stack index) */ + CallInfo base_ci; /* CallInfo for first level (C calling Lua) */ +}; + + +#define G(L) (L->l_G) + + +/* +** Union of all collectable objects +*/ +union GCObject { + GCheader gch; /* common header */ + union TString ts; + union Udata u; + union Closure cl; + struct Table h; + struct Proto p; + struct UpVal uv; + struct lua_State th; /* thread */ +}; + + +#define gch(o) (&(o)->gch) + +/* macros to convert a GCObject into a specific value */ +#define rawgco2ts(o) \ + check_exp(novariant((o)->gch.tt) == LUA_TSTRING, &((o)->ts)) +#define gco2ts(o) (&rawgco2ts(o)->tsv) +#define rawgco2u(o) check_exp((o)->gch.tt == LUA_TUSERDATA, &((o)->u)) +#define gco2u(o) (&rawgco2u(o)->uv) +#define gco2lcl(o) check_exp((o)->gch.tt == LUA_TLCL, &((o)->cl.l)) +#define gco2ccl(o) check_exp((o)->gch.tt == LUA_TCCL, &((o)->cl.c)) +#define gco2cl(o) \ + check_exp(novariant((o)->gch.tt) == LUA_TFUNCTION, &((o)->cl)) +#define gco2t(o) check_exp((o)->gch.tt == LUA_TTABLE, &((o)->h)) +#define gco2p(o) check_exp((o)->gch.tt == LUA_TPROTO, &((o)->p)) +#define gco2uv(o) check_exp((o)->gch.tt == LUA_TUPVAL, &((o)->uv)) +#define gco2th(o) check_exp((o)->gch.tt == LUA_TTHREAD, &((o)->th)) + +/* macro to convert any Lua object into a GCObject */ +#define obj2gco(v) (cast(GCObject *, (v))) + + +/* actual number of total bytes allocated */ +#define gettotalbytes(g) ((g)->totalbytes + (g)->GCdebt) + +LUAI_FUNC void luaE_setdebt (global_State *g, l_mem debt); +LUAI_FUNC void luaE_freethread (lua_State *L, lua_State *L1); +LUAI_FUNC CallInfo *luaE_extendCI (lua_State *L); +LUAI_FUNC void luaE_freeCI (lua_State *L); + + +#endif + diff --git a/radio/src/lua/src/lstring.c b/radio/src/lua/src/lstring.c new file mode 100644 index 000000000..8b5af0b2e --- /dev/null +++ b/radio/src/lua/src/lstring.c @@ -0,0 +1,185 @@ +/* +** $Id: lstring.c,v 2.26 2013/01/08 13:50:10 roberto Exp $ +** String table (keeps all strings handled by Lua) +** See Copyright Notice in lua.h +*/ + + +#include + +#define lstring_c +#define LUA_CORE + +#include "lua.h" + +#include "lmem.h" +#include "lobject.h" +#include "lstate.h" +#include "lstring.h" + + +/* +** Lua will use at most ~(2^LUAI_HASHLIMIT) bytes from a string to +** compute its hash +*/ +#if !defined(LUAI_HASHLIMIT) +#define LUAI_HASHLIMIT 5 +#endif + + +/* +** equality for long strings +*/ +int luaS_eqlngstr (TString *a, TString *b) { + size_t len = a->tsv.len; + lua_assert(a->tsv.tt == LUA_TLNGSTR && b->tsv.tt == LUA_TLNGSTR); + return (a == b) || /* same instance or... */ + ((len == b->tsv.len) && /* equal length and ... */ + (memcmp(getstr(a), getstr(b), len) == 0)); /* equal contents */ +} + + +/* +** equality for strings +*/ +int luaS_eqstr (TString *a, TString *b) { + return (a->tsv.tt == b->tsv.tt) && + (a->tsv.tt == LUA_TSHRSTR ? eqshrstr(a, b) : luaS_eqlngstr(a, b)); +} + + +unsigned int luaS_hash (const char *str, size_t l, unsigned int seed) { + unsigned int h = seed ^ cast(unsigned int, l); + size_t l1; + size_t step = (l >> LUAI_HASHLIMIT) + 1; + for (l1 = l; l1 >= step; l1 -= step) + h = h ^ ((h<<5) + (h>>2) + cast_byte(str[l1 - 1])); + return h; +} + + +/* +** resizes the string table +*/ +void luaS_resize (lua_State *L, int newsize) { + int i; + stringtable *tb = &G(L)->strt; + /* cannot resize while GC is traversing strings */ + luaC_runtilstate(L, ~bitmask(GCSsweepstring)); + if (newsize > tb->size) { + luaM_reallocvector(L, tb->hash, tb->size, newsize, GCObject *); + for (i = tb->size; i < newsize; i++) tb->hash[i] = NULL; + } + /* rehash */ + for (i=0; isize; i++) { + GCObject *p = tb->hash[i]; + tb->hash[i] = NULL; + while (p) { /* for each node in the list */ + GCObject *next = gch(p)->next; /* save next */ + unsigned int h = lmod(gco2ts(p)->hash, newsize); /* new position */ + gch(p)->next = tb->hash[h]; /* chain it */ + tb->hash[h] = p; + resetoldbit(p); /* see MOVE OLD rule */ + p = next; + } + } + if (newsize < tb->size) { + /* shrinking slice must be empty */ + lua_assert(tb->hash[newsize] == NULL && tb->hash[tb->size - 1] == NULL); + luaM_reallocvector(L, tb->hash, tb->size, newsize, GCObject *); + } + tb->size = newsize; +} + + +/* +** creates a new string object +*/ +static TString *createstrobj (lua_State *L, const char *str, size_t l, + int tag, unsigned int h, GCObject **list) { + TString *ts; + size_t totalsize; /* total size of TString object */ + totalsize = sizeof(TString) + ((l + 1) * sizeof(char)); + ts = &luaC_newobj(L, tag, totalsize, list, 0)->ts; + ts->tsv.len = l; + ts->tsv.hash = h; + ts->tsv.extra = 0; + memcpy(ts+1, str, l*sizeof(char)); + ((char *)(ts+1))[l] = '\0'; /* ending 0 */ + return ts; +} + + +/* +** creates a new short string, inserting it into string table +*/ +static TString *newshrstr (lua_State *L, const char *str, size_t l, + unsigned int h) { + GCObject **list; /* (pointer to) list where it will be inserted */ + stringtable *tb = &G(L)->strt; + TString *s; + if (tb->nuse >= cast(lu_int32, tb->size) && tb->size <= MAX_INT/2) + luaS_resize(L, tb->size*2); /* too crowded */ + list = &tb->hash[lmod(h, tb->size)]; + s = createstrobj(L, str, l, LUA_TSHRSTR, h, list); + tb->nuse++; + return s; +} + + +/* +** checks whether short string exists and reuses it or creates a new one +*/ +static TString *internshrstr (lua_State *L, const char *str, size_t l) { + GCObject *o; + global_State *g = G(L); + unsigned int h = luaS_hash(str, l, g->seed); + for (o = g->strt.hash[lmod(h, g->strt.size)]; + o != NULL; + o = gch(o)->next) { + TString *ts = rawgco2ts(o); + if (h == ts->tsv.hash && + l == ts->tsv.len && + (memcmp(str, getstr(ts), l * sizeof(char)) == 0)) { + if (isdead(G(L), o)) /* string is dead (but was not collected yet)? */ + changewhite(o); /* resurrect it */ + return ts; + } + } + return newshrstr(L, str, l, h); /* not found; create a new string */ +} + + +/* +** new string (with explicit length) +*/ +TString *luaS_newlstr (lua_State *L, const char *str, size_t l) { + if (l <= LUAI_MAXSHORTLEN) /* short string? */ + return internshrstr(L, str, l); + else { + if (l + 1 > (MAX_SIZET - sizeof(TString))/sizeof(char)) + luaM_toobig(L); + return createstrobj(L, str, l, LUA_TLNGSTR, G(L)->seed, NULL); + } +} + + +/* +** new zero-terminated string +*/ +TString *luaS_new (lua_State *L, const char *str) { + return luaS_newlstr(L, str, strlen(str)); +} + + +Udata *luaS_newudata (lua_State *L, size_t s, Table *e) { + Udata *u; + if (s > MAX_SIZET - sizeof(Udata)) + luaM_toobig(L); + u = &luaC_newobj(L, LUA_TUSERDATA, sizeof(Udata) + s, NULL, 0)->u; + u->uv.len = s; + u->uv.metatable = NULL; + u->uv.env = e; + return u; +} + diff --git a/radio/src/lua/src/lstring.h b/radio/src/lua/src/lstring.h new file mode 100644 index 000000000..d312ff3d2 --- /dev/null +++ b/radio/src/lua/src/lstring.h @@ -0,0 +1,46 @@ +/* +** $Id: lstring.h,v 1.49 2012/02/01 21:57:15 roberto Exp $ +** String table (keep all strings handled by Lua) +** See Copyright Notice in lua.h +*/ + +#ifndef lstring_h +#define lstring_h + +#include "lgc.h" +#include "lobject.h" +#include "lstate.h" + + +#define sizestring(s) (sizeof(union TString)+((s)->len+1)*sizeof(char)) + +#define sizeudata(u) (sizeof(union Udata)+(u)->len) + +#define luaS_newliteral(L, s) (luaS_newlstr(L, "" s, \ + (sizeof(s)/sizeof(char))-1)) + +#define luaS_fix(s) l_setbit((s)->tsv.marked, FIXEDBIT) + + +/* +** test whether a string is a reserved word +*/ +#define isreserved(s) ((s)->tsv.tt == LUA_TSHRSTR && (s)->tsv.extra > 0) + + +/* +** equality for short strings, which are always internalized +*/ +#define eqshrstr(a,b) check_exp((a)->tsv.tt == LUA_TSHRSTR, (a) == (b)) + + +LUAI_FUNC unsigned int luaS_hash (const char *str, size_t l, unsigned int seed); +LUAI_FUNC int luaS_eqlngstr (TString *a, TString *b); +LUAI_FUNC int luaS_eqstr (TString *a, TString *b); +LUAI_FUNC void luaS_resize (lua_State *L, int newsize); +LUAI_FUNC Udata *luaS_newudata (lua_State *L, size_t s, Table *e); +LUAI_FUNC TString *luaS_newlstr (lua_State *L, const char *str, size_t l); +LUAI_FUNC TString *luaS_new (lua_State *L, const char *str); + + +#endif diff --git a/radio/src/lua/src/lstrlib.c b/radio/src/lua/src/lstrlib.c new file mode 100644 index 000000000..e60d2ba29 --- /dev/null +++ b/radio/src/lua/src/lstrlib.c @@ -0,0 +1,1017 @@ +/* +** $Id: lstrlib.c,v 1.178 2012/08/14 18:12:34 roberto Exp $ +** Standard library for string operations and pattern-matching +** See Copyright Notice in lua.h +*/ + + +#include +#include +#include +#include + +#define lstrlib_c + +#include "lua.h" + +#include "lauxlib.h" +#include "lualib.h" + + +/* +** maximum number of captures that a pattern can do during +** pattern-matching. This limit is arbitrary. +*/ +#if !defined(LUA_MAXCAPTURES) +#define LUA_MAXCAPTURES 32 +#endif + + +/* macro to `unsign' a character */ +#define uchar(c) ((unsigned char)(c)) + + + +static int str_len (lua_State *L) { + size_t l; + luaL_checklstring(L, 1, &l); + lua_pushinteger(L, (lua_Integer)l); + return 1; +} + + +/* translate a relative string position: negative means back from end */ +static size_t posrelat (ptrdiff_t pos, size_t len) { + if (pos >= 0) return (size_t)pos; + else if (0u - (size_t)pos > len) return 0; + else return len - ((size_t)-pos) + 1; +} + + +static int str_sub (lua_State *L) { + size_t l; + const char *s = luaL_checklstring(L, 1, &l); + size_t start = posrelat(luaL_checkinteger(L, 2), l); + size_t end = posrelat(luaL_optinteger(L, 3, -1), l); + if (start < 1) start = 1; + if (end > l) end = l; + if (start <= end) + lua_pushlstring(L, s + start - 1, end - start + 1); + else lua_pushliteral(L, ""); + return 1; +} + + +static int str_reverse (lua_State *L) { + size_t l, i; + luaL_Buffer b; + const char *s = luaL_checklstring(L, 1, &l); + char *p = luaL_buffinitsize(L, &b, l); + for (i = 0; i < l; i++) + p[i] = s[l - i - 1]; + luaL_pushresultsize(&b, l); + return 1; +} + + +static int str_lower (lua_State *L) { + size_t l; + size_t i; + luaL_Buffer b; + const char *s = luaL_checklstring(L, 1, &l); + char *p = luaL_buffinitsize(L, &b, l); + for (i=0; i> 1) + +static int str_rep (lua_State *L) { + size_t l, lsep; + const char *s = luaL_checklstring(L, 1, &l); + int n = luaL_checkint(L, 2); + const char *sep = luaL_optlstring(L, 3, "", &lsep); + if (n <= 0) lua_pushliteral(L, ""); + else if (l + lsep < l || l + lsep >= MAXSIZE / n) /* may overflow? */ + return luaL_error(L, "resulting string too large"); + else { + size_t totallen = n * l + (n - 1) * lsep; + luaL_Buffer b; + char *p = luaL_buffinitsize(L, &b, totallen); + while (n-- > 1) { /* first n-1 copies (followed by separator) */ + memcpy(p, s, l * sizeof(char)); p += l; + if (lsep > 0) { /* avoid empty 'memcpy' (may be expensive) */ + memcpy(p, sep, lsep * sizeof(char)); p += lsep; + } + } + memcpy(p, s, l * sizeof(char)); /* last copy (not followed by separator) */ + luaL_pushresultsize(&b, totallen); + } + return 1; +} + + +static int str_byte (lua_State *L) { + size_t l; + const char *s = luaL_checklstring(L, 1, &l); + size_t posi = posrelat(luaL_optinteger(L, 2, 1), l); + size_t pose = posrelat(luaL_optinteger(L, 3, posi), l); + int n, i; + if (posi < 1) posi = 1; + if (pose > l) pose = l; + if (posi > pose) return 0; /* empty interval; return no values */ + n = (int)(pose - posi + 1); + if (posi + n <= pose) /* (size_t -> int) overflow? */ + return luaL_error(L, "string slice too long"); + luaL_checkstack(L, n, "string slice too long"); + for (i=0; i= ms->level || ms->capture[l].len == CAP_UNFINISHED) + return luaL_error(ms->L, "invalid capture index %%%d", l + 1); + return l; +} + + +static int capture_to_close (MatchState *ms) { + int level = ms->level; + for (level--; level>=0; level--) + if (ms->capture[level].len == CAP_UNFINISHED) return level; + return luaL_error(ms->L, "invalid pattern capture"); +} + + +static const char *classend (MatchState *ms, const char *p) { + switch (*p++) { + case L_ESC: { + if (p == ms->p_end) + luaL_error(ms->L, "malformed pattern (ends with " LUA_QL("%%") ")"); + return p+1; + } + case '[': { + if (*p == '^') p++; + do { /* look for a `]' */ + if (p == ms->p_end) + luaL_error(ms->L, "malformed pattern (missing " LUA_QL("]") ")"); + if (*(p++) == L_ESC && p < ms->p_end) + p++; /* skip escapes (e.g. `%]') */ + } while (*p != ']'); + return p+1; + } + default: { + return p; + } + } +} + + +static int match_class (int c, int cl) { + int res; + switch (tolower(cl)) { + case 'a' : res = isalpha(c); break; + case 'c' : res = iscntrl(c); break; + case 'd' : res = isdigit(c); break; + case 'g' : res = isgraph(c); break; + case 'l' : res = islower(c); break; + case 'p' : res = ispunct(c); break; + case 's' : res = isspace(c); break; + case 'u' : res = isupper(c); break; + case 'w' : res = isalnum(c); break; + case 'x' : res = isxdigit(c); break; + case 'z' : res = (c == 0); break; /* deprecated option */ + default: return (cl == c); + } + return (islower(cl) ? res : !res); +} + + +static int matchbracketclass (int c, const char *p, const char *ec) { + int sig = 1; + if (*(p+1) == '^') { + sig = 0; + p++; /* skip the `^' */ + } + while (++p < ec) { + if (*p == L_ESC) { + p++; + if (match_class(c, uchar(*p))) + return sig; + } + else if ((*(p+1) == '-') && (p+2 < ec)) { + p+=2; + if (uchar(*(p-2)) <= c && c <= uchar(*p)) + return sig; + } + else if (uchar(*p) == c) return sig; + } + return !sig; +} + + +static int singlematch (MatchState *ms, const char *s, const char *p, + const char *ep) { + if (s >= ms->src_end) + return 0; + else { + int c = uchar(*s); + switch (*p) { + case '.': return 1; /* matches any char */ + case L_ESC: return match_class(c, uchar(*(p+1))); + case '[': return matchbracketclass(c, p, ep-1); + default: return (uchar(*p) == c); + } + } +} + + +static const char *matchbalance (MatchState *ms, const char *s, + const char *p) { + if (p >= ms->p_end - 1) + luaL_error(ms->L, "malformed pattern " + "(missing arguments to " LUA_QL("%%b") ")"); + if (*s != *p) return NULL; + else { + int b = *p; + int e = *(p+1); + int cont = 1; + while (++s < ms->src_end) { + if (*s == e) { + if (--cont == 0) return s+1; + } + else if (*s == b) cont++; + } + } + return NULL; /* string ends out of balance */ +} + + +static const char *max_expand (MatchState *ms, const char *s, + const char *p, const char *ep) { + ptrdiff_t i = 0; /* counts maximum expand for item */ + while (singlematch(ms, s + i, p, ep)) + i++; + /* keeps trying to match with the maximum repetitions */ + while (i>=0) { + const char *res = match(ms, (s+i), ep+1); + if (res) return res; + i--; /* else didn't match; reduce 1 repetition to try again */ + } + return NULL; +} + + +static const char *min_expand (MatchState *ms, const char *s, + const char *p, const char *ep) { + for (;;) { + const char *res = match(ms, s, ep+1); + if (res != NULL) + return res; + else if (singlematch(ms, s, p, ep)) + s++; /* try with one more repetition */ + else return NULL; + } +} + + +static const char *start_capture (MatchState *ms, const char *s, + const char *p, int what) { + const char *res; + int level = ms->level; + if (level >= LUA_MAXCAPTURES) luaL_error(ms->L, "too many captures"); + ms->capture[level].init = s; + ms->capture[level].len = what; + ms->level = level+1; + if ((res=match(ms, s, p)) == NULL) /* match failed? */ + ms->level--; /* undo capture */ + return res; +} + + +static const char *end_capture (MatchState *ms, const char *s, + const char *p) { + int l = capture_to_close(ms); + const char *res; + ms->capture[l].len = s - ms->capture[l].init; /* close capture */ + if ((res = match(ms, s, p)) == NULL) /* match failed? */ + ms->capture[l].len = CAP_UNFINISHED; /* undo capture */ + return res; +} + + +static const char *match_capture (MatchState *ms, const char *s, int l) { + size_t len; + l = check_capture(ms, l); + len = ms->capture[l].len; + if ((size_t)(ms->src_end-s) >= len && + memcmp(ms->capture[l].init, s, len) == 0) + return s+len; + else return NULL; +} + + +static const char *match (MatchState *ms, const char *s, const char *p) { + if (ms->matchdepth-- == 0) + luaL_error(ms->L, "pattern too complex"); + init: /* using goto's to optimize tail recursion */ + if (p != ms->p_end) { /* end of pattern? */ + switch (*p) { + case '(': { /* start capture */ + if (*(p + 1) == ')') /* position capture? */ + s = start_capture(ms, s, p + 2, CAP_POSITION); + else + s = start_capture(ms, s, p + 1, CAP_UNFINISHED); + break; + } + case ')': { /* end capture */ + s = end_capture(ms, s, p + 1); + break; + } + case '$': { + if ((p + 1) != ms->p_end) /* is the `$' the last char in pattern? */ + goto dflt; /* no; go to default */ + s = (s == ms->src_end) ? s : NULL; /* check end of string */ + break; + } + case L_ESC: { /* escaped sequences not in the format class[*+?-]? */ + switch (*(p + 1)) { + case 'b': { /* balanced string? */ + s = matchbalance(ms, s, p + 2); + if (s != NULL) { + p += 4; goto init; /* return match(ms, s, p + 4); */ + } /* else fail (s == NULL) */ + break; + } + case 'f': { /* frontier? */ + const char *ep; char previous; + p += 2; + if (*p != '[') + luaL_error(ms->L, "missing " LUA_QL("[") " after " + LUA_QL("%%f") " in pattern"); + ep = classend(ms, p); /* points to what is next */ + previous = (s == ms->src_init) ? '\0' : *(s - 1); + if (!matchbracketclass(uchar(previous), p, ep - 1) && + matchbracketclass(uchar(*s), p, ep - 1)) { + p = ep; goto init; /* return match(ms, s, ep); */ + } + s = NULL; /* match failed */ + break; + } + case '0': case '1': case '2': case '3': + case '4': case '5': case '6': case '7': + case '8': case '9': { /* capture results (%0-%9)? */ + s = match_capture(ms, s, uchar(*(p + 1))); + if (s != NULL) { + p += 2; goto init; /* return match(ms, s, p + 2) */ + } + break; + } + default: goto dflt; + } + break; + } + default: dflt: { /* pattern class plus optional suffix */ + const char *ep = classend(ms, p); /* points to optional suffix */ + /* does not match at least once? */ + if (!singlematch(ms, s, p, ep)) { + if (*ep == '*' || *ep == '?' || *ep == '-') { /* accept empty? */ + p = ep + 1; goto init; /* return match(ms, s, ep + 1); */ + } + else /* '+' or no suffix */ + s = NULL; /* fail */ + } + else { /* matched once */ + switch (*ep) { /* handle optional suffix */ + case '?': { /* optional */ + const char *res; + if ((res = match(ms, s + 1, ep + 1)) != NULL) + s = res; + else { + p = ep + 1; goto init; /* else return match(ms, s, ep + 1); */ + } + break; + } + case '+': /* 1 or more repetitions */ + s++; /* 1 match already done */ + /* go through */ + case '*': /* 0 or more repetitions */ + s = max_expand(ms, s, p, ep); + break; + case '-': /* 0 or more repetitions (minimum) */ + s = min_expand(ms, s, p, ep); + break; + default: /* no suffix */ + s++; p = ep; goto init; /* return match(ms, s + 1, ep); */ + } + } + break; + } + } + } + ms->matchdepth++; + return s; +} + + + +static const char *lmemfind (const char *s1, size_t l1, + const char *s2, size_t l2) { + if (l2 == 0) return s1; /* empty strings are everywhere */ + else if (l2 > l1) return NULL; /* avoids a negative `l1' */ + else { + const char *init; /* to search for a `*s2' inside `s1' */ + l2--; /* 1st char will be checked by `memchr' */ + l1 = l1-l2; /* `s2' cannot be found after that */ + while (l1 > 0 && (init = (const char *)memchr(s1, *s2, l1)) != NULL) { + init++; /* 1st char is already checked */ + if (memcmp(init, s2+1, l2) == 0) + return init-1; + else { /* correct `l1' and `s1' to try again */ + l1 -= init-s1; + s1 = init; + } + } + return NULL; /* not found */ + } +} + + +static void push_onecapture (MatchState *ms, int i, const char *s, + const char *e) { + if (i >= ms->level) { + if (i == 0) /* ms->level == 0, too */ + lua_pushlstring(ms->L, s, e - s); /* add whole match */ + else + luaL_error(ms->L, "invalid capture index"); + } + else { + ptrdiff_t l = ms->capture[i].len; + if (l == CAP_UNFINISHED) luaL_error(ms->L, "unfinished capture"); + if (l == CAP_POSITION) + lua_pushinteger(ms->L, ms->capture[i].init - ms->src_init + 1); + else + lua_pushlstring(ms->L, ms->capture[i].init, l); + } +} + + +static int push_captures (MatchState *ms, const char *s, const char *e) { + int i; + int nlevels = (ms->level == 0 && s) ? 1 : ms->level; + luaL_checkstack(ms->L, nlevels, "too many captures"); + for (i = 0; i < nlevels; i++) + push_onecapture(ms, i, s, e); + return nlevels; /* number of strings pushed */ +} + + +/* check whether pattern has no special characters */ +static int nospecials (const char *p, size_t l) { + size_t upto = 0; + do { + if (strpbrk(p + upto, SPECIALS)) + return 0; /* pattern has a special character */ + upto += strlen(p + upto) + 1; /* may have more after \0 */ + } while (upto <= l); + return 1; /* no special chars found */ +} + + +static int str_find_aux (lua_State *L, int find) { + size_t ls, lp; + const char *s = luaL_checklstring(L, 1, &ls); + const char *p = luaL_checklstring(L, 2, &lp); + size_t init = posrelat(luaL_optinteger(L, 3, 1), ls); + if (init < 1) init = 1; + else if (init > ls + 1) { /* start after string's end? */ + lua_pushnil(L); /* cannot find anything */ + return 1; + } + /* explicit request or no special characters? */ + if (find && (lua_toboolean(L, 4) || nospecials(p, lp))) { + /* do a plain search */ + const char *s2 = lmemfind(s + init - 1, ls - init + 1, p, lp); + if (s2) { + lua_pushinteger(L, s2 - s + 1); + lua_pushinteger(L, s2 - s + lp); + return 2; + } + } + else { + MatchState ms; + const char *s1 = s + init - 1; + int anchor = (*p == '^'); + if (anchor) { + p++; lp--; /* skip anchor character */ + } + ms.L = L; + ms.matchdepth = MAXCCALLS; + ms.src_init = s; + ms.src_end = s + ls; + ms.p_end = p + lp; + do { + const char *res; + ms.level = 0; + lua_assert(ms.matchdepth == MAXCCALLS); + if ((res=match(&ms, s1, p)) != NULL) { + if (find) { + lua_pushinteger(L, s1 - s + 1); /* start */ + lua_pushinteger(L, res - s); /* end */ + return push_captures(&ms, NULL, 0) + 2; + } + else + return push_captures(&ms, s1, res); + } + } while (s1++ < ms.src_end && !anchor); + } + lua_pushnil(L); /* not found */ + return 1; +} + + +static int str_find (lua_State *L) { + return str_find_aux(L, 1); +} + + +static int str_match (lua_State *L) { + return str_find_aux(L, 0); +} + + +static int gmatch_aux (lua_State *L) { + MatchState ms; + size_t ls, lp; + const char *s = lua_tolstring(L, lua_upvalueindex(1), &ls); + const char *p = lua_tolstring(L, lua_upvalueindex(2), &lp); + const char *src; + ms.L = L; + ms.matchdepth = MAXCCALLS; + ms.src_init = s; + ms.src_end = s+ls; + ms.p_end = p + lp; + for (src = s + (size_t)lua_tointeger(L, lua_upvalueindex(3)); + src <= ms.src_end; + src++) { + const char *e; + ms.level = 0; + lua_assert(ms.matchdepth == MAXCCALLS); + if ((e = match(&ms, src, p)) != NULL) { + lua_Integer newstart = e-s; + if (e == src) newstart++; /* empty match? go at least one position */ + lua_pushinteger(L, newstart); + lua_replace(L, lua_upvalueindex(3)); + return push_captures(&ms, src, e); + } + } + return 0; /* not found */ +} + + +static int gmatch (lua_State *L) { + luaL_checkstring(L, 1); + luaL_checkstring(L, 2); + lua_settop(L, 2); + lua_pushinteger(L, 0); + lua_pushcclosure(L, gmatch_aux, 3); + return 1; +} + + +static void add_s (MatchState *ms, luaL_Buffer *b, const char *s, + const char *e) { + size_t l, i; + const char *news = lua_tolstring(ms->L, 3, &l); + for (i = 0; i < l; i++) { + if (news[i] != L_ESC) + luaL_addchar(b, news[i]); + else { + i++; /* skip ESC */ + if (!isdigit(uchar(news[i]))) { + if (news[i] != L_ESC) + luaL_error(ms->L, "invalid use of " LUA_QL("%c") + " in replacement string", L_ESC); + luaL_addchar(b, news[i]); + } + else if (news[i] == '0') + luaL_addlstring(b, s, e - s); + else { + push_onecapture(ms, news[i] - '1', s, e); + luaL_addvalue(b); /* add capture to accumulated result */ + } + } + } +} + + +static void add_value (MatchState *ms, luaL_Buffer *b, const char *s, + const char *e, int tr) { + lua_State *L = ms->L; + switch (tr) { + case LUA_TFUNCTION: { + int n; + lua_pushvalue(L, 3); + n = push_captures(ms, s, e); + lua_call(L, n, 1); + break; + } + case LUA_TTABLE: { + push_onecapture(ms, 0, s, e); + lua_gettable(L, 3); + break; + } + default: { /* LUA_TNUMBER or LUA_TSTRING */ + add_s(ms, b, s, e); + return; + } + } + if (!lua_toboolean(L, -1)) { /* nil or false? */ + lua_pop(L, 1); + lua_pushlstring(L, s, e - s); /* keep original text */ + } + else if (!lua_isstring(L, -1)) + luaL_error(L, "invalid replacement value (a %s)", luaL_typename(L, -1)); + luaL_addvalue(b); /* add result to accumulator */ +} + + +static int str_gsub (lua_State *L) { + size_t srcl, lp; + const char *src = luaL_checklstring(L, 1, &srcl); + const char *p = luaL_checklstring(L, 2, &lp); + int tr = lua_type(L, 3); + size_t max_s = luaL_optinteger(L, 4, srcl+1); + int anchor = (*p == '^'); + size_t n = 0; + MatchState ms; + luaL_Buffer b; + luaL_argcheck(L, tr == LUA_TNUMBER || tr == LUA_TSTRING || + tr == LUA_TFUNCTION || tr == LUA_TTABLE, 3, + "string/function/table expected"); + luaL_buffinit(L, &b); + if (anchor) { + p++; lp--; /* skip anchor character */ + } + ms.L = L; + ms.matchdepth = MAXCCALLS; + ms.src_init = src; + ms.src_end = src+srcl; + ms.p_end = p + lp; + while (n < max_s) { + const char *e; + ms.level = 0; + lua_assert(ms.matchdepth == MAXCCALLS); + e = match(&ms, src, p); + if (e) { + n++; + add_value(&ms, &b, src, e, tr); + } + if (e && e>src) /* non empty match? */ + src = e; /* skip it */ + else if (src < ms.src_end) + luaL_addchar(&b, *src++); + else break; + if (anchor) break; + } + luaL_addlstring(&b, src, ms.src_end-src); + luaL_pushresult(&b); + lua_pushinteger(L, n); /* number of substitutions */ + return 2; +} + +/* }====================================================== */ + + + +/* +** {====================================================== +** STRING FORMAT +** ======================================================= +*/ + +/* +** LUA_INTFRMLEN is the length modifier for integer conversions in +** 'string.format'; LUA_INTFRM_T is the integer type corresponding to +** the previous length +*/ +#if !defined(LUA_INTFRMLEN) /* { */ +#if defined(LUA_USE_LONGLONG) + +#define LUA_INTFRMLEN "ll" +#define LUA_INTFRM_T long long + +#else + +#define LUA_INTFRMLEN "l" +#define LUA_INTFRM_T long + +#endif +#endif /* } */ + + +/* +** LUA_FLTFRMLEN is the length modifier for float conversions in +** 'string.format'; LUA_FLTFRM_T is the float type corresponding to +** the previous length +*/ +#if !defined(LUA_FLTFRMLEN) + +#define LUA_FLTFRMLEN "" +#define LUA_FLTFRM_T double + +#endif + + +/* maximum size of each formatted item (> len(format('%99.99f', -1e308))) */ +#define MAX_ITEM 512 +/* valid flags in a format specification */ +#define FLAGS "-+ #0" +/* +** maximum size of each format specification (such as '%-099.99d') +** (+10 accounts for %99.99x plus margin of error) +*/ +#define MAX_FORMAT (sizeof(FLAGS) + sizeof(LUA_INTFRMLEN) + 10) + + +static void addquoted (lua_State *L, luaL_Buffer *b, int arg) { + size_t l; + const char *s = luaL_checklstring(L, arg, &l); + luaL_addchar(b, '"'); + while (l--) { + if (*s == '"' || *s == '\\' || *s == '\n') { + luaL_addchar(b, '\\'); + luaL_addchar(b, *s); + } + else if (*s == '\0' || iscntrl(uchar(*s))) { + char buff[10]; + if (!isdigit(uchar(*(s+1)))) + sprintf(buff, "\\%d", (int)uchar(*s)); + else + sprintf(buff, "\\%03d", (int)uchar(*s)); + luaL_addstring(b, buff); + } + else + luaL_addchar(b, *s); + s++; + } + luaL_addchar(b, '"'); +} + +static const char *scanformat (lua_State *L, const char *strfrmt, char *form) { + const char *p = strfrmt; + while (*p != '\0' && strchr(FLAGS, *p) != NULL) p++; /* skip flags */ + if ((size_t)(p - strfrmt) >= sizeof(FLAGS)/sizeof(char)) + luaL_error(L, "invalid format (repeated flags)"); + if (isdigit(uchar(*p))) p++; /* skip width */ + if (isdigit(uchar(*p))) p++; /* (2 digits at most) */ + if (*p == '.') { + p++; + if (isdigit(uchar(*p))) p++; /* skip precision */ + if (isdigit(uchar(*p))) p++; /* (2 digits at most) */ + } + if (isdigit(uchar(*p))) + luaL_error(L, "invalid format (width or precision too long)"); + *(form++) = '%'; + memcpy(form, strfrmt, (p - strfrmt + 1) * sizeof(char)); + form += p - strfrmt + 1; + *form = '\0'; + return p; +} + + +/* +** add length modifier into formats +*/ +static void addlenmod (char *form, const char *lenmod) { + size_t l = strlen(form); + size_t lm = strlen(lenmod); + char spec = form[l - 1]; + strcpy(form + l - 1, lenmod); + form[l + lm - 1] = spec; + form[l + lm] = '\0'; +} + + +static int str_format (lua_State *L) { + int top = lua_gettop(L); + int arg = 1; + size_t sfl; + const char *strfrmt = luaL_checklstring(L, arg, &sfl); + const char *strfrmt_end = strfrmt+sfl; + luaL_Buffer b; + luaL_buffinit(L, &b); + while (strfrmt < strfrmt_end) { + if (*strfrmt != L_ESC) + luaL_addchar(&b, *strfrmt++); + else if (*++strfrmt == L_ESC) + luaL_addchar(&b, *strfrmt++); /* %% */ + else { /* format item */ + char form[MAX_FORMAT]; /* to store the format (`%...') */ + char *buff = luaL_prepbuffsize(&b, MAX_ITEM); /* to put formatted item */ + int nb = 0; /* number of bytes in added item */ + if (++arg > top) + luaL_argerror(L, arg, "no value"); + strfrmt = scanformat(L, strfrmt, form); + switch (*strfrmt++) { + case 'c': { + nb = sprintf(buff, form, luaL_checkint(L, arg)); + break; + } + case 'd': case 'i': { + lua_Number n = luaL_checknumber(L, arg); + LUA_INTFRM_T ni = (LUA_INTFRM_T)n; + lua_Number diff = n - (lua_Number)ni; + luaL_argcheck(L, -1 < diff && diff < 1, arg, + "not a number in proper range"); + addlenmod(form, LUA_INTFRMLEN); + nb = sprintf(buff, form, ni); + break; + } + case 'o': case 'u': case 'x': case 'X': { + lua_Number n = luaL_checknumber(L, arg); + unsigned LUA_INTFRM_T ni = (unsigned LUA_INTFRM_T)n; + lua_Number diff = n - (lua_Number)ni; + luaL_argcheck(L, -1 < diff && diff < 1, arg, + "not a non-negative number in proper range"); + addlenmod(form, LUA_INTFRMLEN); + nb = sprintf(buff, form, ni); + break; + } + case 'e': case 'E': case 'f': +#if defined(LUA_USE_AFORMAT) + case 'a': case 'A': +#endif + case 'g': case 'G': { + addlenmod(form, LUA_FLTFRMLEN); + nb = sprintf(buff, form, (LUA_FLTFRM_T)luaL_checknumber(L, arg)); + break; + } + case 'q': { + addquoted(L, &b, arg); + break; + } + case 's': { + size_t l; + const char *s = luaL_tolstring(L, arg, &l); + if (!strchr(form, '.') && l >= 100) { + /* no precision and string is too long to be formatted; + keep original string */ + luaL_addvalue(&b); + break; + } + else { + nb = sprintf(buff, form, s); + lua_pop(L, 1); /* remove result from 'luaL_tolstring' */ + break; + } + } + default: { /* also treat cases `pnLlh' */ + return luaL_error(L, "invalid option " LUA_QL("%%%c") " to " + LUA_QL("format"), *(strfrmt - 1)); + } + } + luaL_addsize(&b, nb); + } + } + luaL_pushresult(&b); + return 1; +} + +/* }====================================================== */ + + +static const luaL_Reg strlib[] = { + {"byte", str_byte}, + {"char", str_char}, + {"dump", str_dump}, + {"find", str_find}, + {"format", str_format}, + {"gmatch", gmatch}, + {"gsub", str_gsub}, + {"len", str_len}, + {"lower", str_lower}, + {"match", str_match}, + {"rep", str_rep}, + {"reverse", str_reverse}, + {"sub", str_sub}, + {"upper", str_upper}, + {NULL, NULL} +}; + + +static void createmetatable (lua_State *L) { + lua_createtable(L, 0, 1); /* table to be metatable for strings */ + lua_pushliteral(L, ""); /* dummy string */ + lua_pushvalue(L, -2); /* copy table */ + lua_setmetatable(L, -2); /* set table as metatable for strings */ + lua_pop(L, 1); /* pop dummy string */ + lua_pushvalue(L, -2); /* get string library */ + lua_setfield(L, -2, "__index"); /* metatable.__index = string */ + lua_pop(L, 1); /* pop metatable */ +} + + +/* +** Open string library +*/ +LUAMOD_API int luaopen_string (lua_State *L) { + luaL_newlib(L, strlib); + createmetatable(L); + return 1; +} + diff --git a/radio/src/lua/src/ltable.c b/radio/src/lua/src/ltable.c new file mode 100644 index 000000000..305149d6b --- /dev/null +++ b/radio/src/lua/src/ltable.c @@ -0,0 +1,589 @@ +/* +** $Id: ltable.c,v 2.72 2012/09/11 19:37:16 roberto Exp $ +** Lua tables (hash) +** See Copyright Notice in lua.h +*/ + + +/* +** Implementation of tables (aka arrays, objects, or hash tables). +** Tables keep its elements in two parts: an array part and a hash part. +** Non-negative integer keys are all candidates to be kept in the array +** part. The actual size of the array is the largest `n' such that at +** least half the slots between 0 and n are in use. +** Hash uses a mix of chained scatter table with Brent's variation. +** A main invariant of these tables is that, if an element is not +** in its main position (i.e. the `original' position that its hash gives +** to it), then the colliding element is in its own main position. +** Hence even when the load factor reaches 100%, performance remains good. +*/ + +#include + +#define ltable_c +#define LUA_CORE + +#include "lua.h" + +#include "ldebug.h" +#include "ldo.h" +#include "lgc.h" +#include "lmem.h" +#include "lobject.h" +#include "lstate.h" +#include "lstring.h" +#include "ltable.h" +#include "lvm.h" + + +/* +** max size of array part is 2^MAXBITS +*/ +#if LUAI_BITSINT >= 32 +#define MAXBITS 30 +#else +#define MAXBITS (LUAI_BITSINT-2) +#endif + +#define MAXASIZE (1 << MAXBITS) + + +#define hashpow2(t,n) (gnode(t, lmod((n), sizenode(t)))) + +#define hashstr(t,str) hashpow2(t, (str)->tsv.hash) +#define hashboolean(t,p) hashpow2(t, p) + + +/* +** for some types, it is better to avoid modulus by power of 2, as +** they tend to have many 2 factors. +*/ +#define hashmod(t,n) (gnode(t, ((n) % ((sizenode(t)-1)|1)))) + + +#define hashpointer(t,p) hashmod(t, IntPoint(p)) + + +#define dummynode (&dummynode_) + +#define isdummy(n) ((n) == dummynode) + +static const Node dummynode_ = { + {NILCONSTANT}, /* value */ + {{NILCONSTANT, NULL}} /* key */ +}; + + +/* +** hash for lua_Numbers +*/ +static Node *hashnum (const Table *t, lua_Number n) { + int i; + luai_hashnum(i, n); + if (i < 0) { + if (cast(unsigned int, i) == 0u - i) /* use unsigned to avoid overflows */ + i = 0; /* handle INT_MIN */ + i = -i; /* must be a positive value */ + } + return hashmod(t, i); +} + + + +/* +** returns the `main' position of an element in a table (that is, the index +** of its hash value) +*/ +static Node *mainposition (const Table *t, const TValue *key) { + switch (ttype(key)) { + case LUA_TNUMBER: + return hashnum(t, nvalue(key)); + case LUA_TLNGSTR: { + TString *s = rawtsvalue(key); + if (s->tsv.extra == 0) { /* no hash? */ + s->tsv.hash = luaS_hash(getstr(s), s->tsv.len, s->tsv.hash); + s->tsv.extra = 1; /* now it has its hash */ + } + return hashstr(t, rawtsvalue(key)); + } + case LUA_TSHRSTR: + return hashstr(t, rawtsvalue(key)); + case LUA_TBOOLEAN: + return hashboolean(t, bvalue(key)); + case LUA_TLIGHTUSERDATA: + return hashpointer(t, pvalue(key)); + case LUA_TLCF: + return hashpointer(t, fvalue(key)); + default: + return hashpointer(t, gcvalue(key)); + } +} + + +/* +** returns the index for `key' if `key' is an appropriate key to live in +** the array part of the table, -1 otherwise. +*/ +static int arrayindex (const TValue *key) { + if (ttisnumber(key)) { + lua_Number n = nvalue(key); + int k; + lua_number2int(k, n); + if (luai_numeq(cast_num(k), n)) + return k; + } + return -1; /* `key' did not match some condition */ +} + + +/* +** returns the index of a `key' for table traversals. First goes all +** elements in the array part, then elements in the hash part. The +** beginning of a traversal is signaled by -1. +*/ +static int findindex (lua_State *L, Table *t, StkId key) { + int i; + if (ttisnil(key)) return -1; /* first iteration */ + i = arrayindex(key); + if (0 < i && i <= t->sizearray) /* is `key' inside array part? */ + return i-1; /* yes; that's the index (corrected to C) */ + else { + Node *n = mainposition(t, key); + for (;;) { /* check whether `key' is somewhere in the chain */ + /* key may be dead already, but it is ok to use it in `next' */ + if (luaV_rawequalobj(gkey(n), key) || + (ttisdeadkey(gkey(n)) && iscollectable(key) && + deadvalue(gkey(n)) == gcvalue(key))) { + i = cast_int(n - gnode(t, 0)); /* key index in hash table */ + /* hash elements are numbered after array ones */ + return i + t->sizearray; + } + else n = gnext(n); + if (n == NULL) + luaG_runerror(L, "invalid key to " LUA_QL("next")); /* key not found */ + } + } +} + + +int luaH_next (lua_State *L, Table *t, StkId key) { + int i = findindex(L, t, key); /* find original element */ + for (i++; i < t->sizearray; i++) { /* try first array part */ + if (!ttisnil(&t->array[i])) { /* a non-nil value? */ + setnvalue(key, cast_num(i+1)); + setobj2s(L, key+1, &t->array[i]); + return 1; + } + } + for (i -= t->sizearray; i < sizenode(t); i++) { /* then hash part */ + if (!ttisnil(gval(gnode(t, i)))) { /* a non-nil value? */ + setobj2s(L, key, gkey(gnode(t, i))); + setobj2s(L, key+1, gval(gnode(t, i))); + return 1; + } + } + return 0; /* no more elements */ +} + + +/* +** {============================================================= +** Rehash +** ============================================================== +*/ + + +static int computesizes (int nums[], int *narray) { + int i; + int twotoi; /* 2^i */ + int a = 0; /* number of elements smaller than 2^i */ + int na = 0; /* number of elements to go to array part */ + int n = 0; /* optimal size for array part */ + for (i = 0, twotoi = 1; twotoi/2 < *narray; i++, twotoi *= 2) { + if (nums[i] > 0) { + a += nums[i]; + if (a > twotoi/2) { /* more than half elements present? */ + n = twotoi; /* optimal size (till now) */ + na = a; /* all elements smaller than n will go to array part */ + } + } + if (a == *narray) break; /* all elements already counted */ + } + if (n - *narray > 1024) + *narray += 1024; + else + *narray = n; + lua_assert(*narray/2 <= na && na <= *narray); + return na; +} + + +static int countint (const TValue *key, int *nums) { + int k = arrayindex(key); + if (0 < k && k <= MAXASIZE) { /* is `key' an appropriate array index? */ + nums[luaO_ceillog2(k)]++; /* count as such */ + return 1; + } + else + return 0; +} + + +static int numusearray (const Table *t, int *nums) { + int lg; + int ttlg; /* 2^lg */ + int ause = 0; /* summation of `nums' */ + int i = 1; /* count to traverse all array keys */ + for (lg=0, ttlg=1; lg<=MAXBITS; lg++, ttlg*=2) { /* for each slice */ + int lc = 0; /* counter */ + int lim = ttlg; + if (lim > t->sizearray) { + lim = t->sizearray; /* adjust upper limit */ + if (i > lim) + break; /* no more elements to count */ + } + /* count elements in range (2^(lg-1), 2^lg] */ + for (; i <= lim; i++) { + if (!ttisnil(&t->array[i-1])) + lc++; + } + nums[lg] += lc; + ause += lc; + } + return ause; +} + + +static int numusehash (const Table *t, int *nums, int *pnasize) { + int totaluse = 0; /* total number of elements */ + int ause = 0; /* summation of `nums' */ + int i = sizenode(t); + while (i--) { + Node *n = &t->node[i]; + if (!ttisnil(gval(n))) { + ause += countint(gkey(n), nums); + totaluse++; + } + } + *pnasize += ause; + return totaluse; +} + + +static void setarrayvector (lua_State *L, Table *t, int size) { + int i; + luaM_reallocvector(L, t->array, t->sizearray, size, TValue); + for (i=t->sizearray; iarray[i]); + t->sizearray = size; +} + +static void setnodevector (lua_State *L, Table *t, int size) { + int lsize; + if (size == 0) { /* no elements to hash part? */ + t->node = cast(Node *, dummynode); /* use common `dummynode' */ + lsize = 0; + } + else { + int i; + lsize = luaO_ceillog2(size); + if (lsize > MAXBITS) + luaG_runerror(L, "table overflow"); + size = twoto(lsize); + t->node = luaM_newvector(L, size, Node); + for (i=0; ilsizenode = cast_byte(lsize); + t->lastfree = gnode(t, size); /* all positions are free */ +} + +void luaH_resize (lua_State *L, Table *t, int nasize, int nhsize) { + int i; + int oldasize = t->sizearray; + int oldhsize = t->lsizenode; + Node *nold = t->node; /* save old hash ... */ + if (nasize > oldasize) /* array part must grow? */ + setarrayvector(L, t, nasize); + /* create new hash part with appropriate size */ + setnodevector(L, t, nhsize); + if (nasize < oldasize) { /* array part must shrink? */ + t->sizearray = nasize; + /* re-insert elements from vanishing slice */ + for (i=nasize; iarray[i])) + luaH_setint(L, t, i + 1, &t->array[i]); + } + /* shrink array */ + luaM_reallocvector(L, t->array, oldasize, nasize, TValue); + } + /* re-insert elements from hash part */ + for (i = twoto(oldhsize) - 1; i >= 0; i--) { + Node *old = nold+i; + if (!ttisnil(gval(old))) { + /* doesn't need barrier/invalidate cache, as entry was + already present in the table */ + setobjt2t(L, luaH_set(L, t, gkey(old)), gval(old)); + } + } + if (!isdummy(nold)) + luaM_freearray(L, nold, cast(size_t, twoto(oldhsize))); /* free old array */ +} + + +void luaH_resizearray (lua_State *L, Table *t, int nasize) { + int nsize = isdummy(t->node) ? 0 : sizenode(t); + luaH_resize(L, t, nasize, nsize); +} + + +static void rehash (lua_State *L, Table *t, const TValue *ek) { + int nasize, na; + int nums[MAXBITS+1]; /* nums[i] = number of keys with 2^(i-1) < k <= 2^i */ + int i; + int totaluse; + for (i=0; i<=MAXBITS; i++) nums[i] = 0; /* reset counts */ + nasize = numusearray(t, nums); /* count keys in array part */ + totaluse = nasize; /* all those keys are integer keys */ + totaluse += numusehash(t, nums, &nasize); /* count keys in hash part */ + /* count extra key */ + nasize += countint(ek, nums); + totaluse++; + /* compute new size for array part */ + na = computesizes(nums, &nasize); + /* resize the table to new computed sizes */ + luaH_resize(L, t, nasize, totaluse - na); +} + + + +/* +** }============================================================= +*/ + + +Table *luaH_new (lua_State *L) { + Table *t = &luaC_newobj(L, LUA_TTABLE, sizeof(Table), NULL, 0)->h; + t->metatable = NULL; + t->flags = cast_byte(~0); + t->array = NULL; + t->sizearray = 0; + setnodevector(L, t, 0); + return t; +} + + +void luaH_free (lua_State *L, Table *t) { + if (!isdummy(t->node)) + luaM_freearray(L, t->node, cast(size_t, sizenode(t))); + luaM_freearray(L, t->array, t->sizearray); + luaM_free(L, t); +} + + +static Node *getfreepos (Table *t) { + while (t->lastfree > t->node) { + t->lastfree--; + if (ttisnil(gkey(t->lastfree))) + return t->lastfree; + } + return NULL; /* could not find a free place */ +} + + + +/* +** inserts a new key into a hash table; first, check whether key's main +** position is free. If not, check whether colliding node is in its main +** position or not: if it is not, move colliding node to an empty place and +** put new key in its main position; otherwise (colliding node is in its main +** position), new key goes to an empty position. +*/ +TValue *luaH_newkey (lua_State *L, Table *t, const TValue *key) { + Node *mp; + if (ttisnil(key)) luaG_runerror(L, "table index is nil"); + else if (ttisnumber(key) && luai_numisnan(L, nvalue(key))) + luaG_runerror(L, "table index is NaN"); + mp = mainposition(t, key); + if (!ttisnil(gval(mp)) || isdummy(mp)) { /* main position is taken? */ + Node *othern; + Node *n = getfreepos(t); /* get a free place */ + if (n == NULL) { /* cannot find a free place? */ + rehash(L, t, key); /* grow table */ + /* whatever called 'newkey' take care of TM cache and GC barrier */ + return luaH_set(L, t, key); /* insert key into grown table */ + } + lua_assert(!isdummy(n)); + othern = mainposition(t, gkey(mp)); + if (othern != mp) { /* is colliding node out of its main position? */ + /* yes; move colliding node into free position */ + while (gnext(othern) != mp) othern = gnext(othern); /* find previous */ + gnext(othern) = n; /* redo the chain with `n' in place of `mp' */ + *n = *mp; /* copy colliding node into free pos. (mp->next also goes) */ + gnext(mp) = NULL; /* now `mp' is free */ + setnilvalue(gval(mp)); + } + else { /* colliding node is in its own main position */ + /* new node will go into free position */ + gnext(n) = gnext(mp); /* chain new position */ + gnext(mp) = n; + mp = n; + } + } + setobj2t(L, gkey(mp), key); + luaC_barrierback(L, obj2gco(t), key); + lua_assert(ttisnil(gval(mp))); + return gval(mp); +} + + +/* +** search function for integers +*/ +const TValue *luaH_getint (Table *t, int key) { + /* (1 <= key && key <= t->sizearray) */ + if (cast(unsigned int, key-1) < cast(unsigned int, t->sizearray)) + return &t->array[key-1]; + else { + lua_Number nk = cast_num(key); + Node *n = hashnum(t, nk); + do { /* check whether `key' is somewhere in the chain */ + if (ttisnumber(gkey(n)) && luai_numeq(nvalue(gkey(n)), nk)) + return gval(n); /* that's it */ + else n = gnext(n); + } while (n); + return luaO_nilobject; + } +} + + +/* +** search function for short strings +*/ +const TValue *luaH_getstr (Table *t, TString *key) { + Node *n = hashstr(t, key); + lua_assert(key->tsv.tt == LUA_TSHRSTR); + do { /* check whether `key' is somewhere in the chain */ + if (ttisshrstring(gkey(n)) && eqshrstr(rawtsvalue(gkey(n)), key)) + return gval(n); /* that's it */ + else n = gnext(n); + } while (n); + return luaO_nilobject; +} + + +/* +** main search function +*/ +const TValue *luaH_get (Table *t, const TValue *key) { + switch (ttype(key)) { + case LUA_TSHRSTR: return luaH_getstr(t, rawtsvalue(key)); + case LUA_TNIL: return luaO_nilobject; + case LUA_TNUMBER: { + int k; + lua_Number n = nvalue(key); + lua_number2int(k, n); + if (luai_numeq(cast_num(k), n)) /* index is int? */ + return luaH_getint(t, k); /* use specialized version */ + /* else go through */ + } + default: { + Node *n = mainposition(t, key); + do { /* check whether `key' is somewhere in the chain */ + if (luaV_rawequalobj(gkey(n), key)) + return gval(n); /* that's it */ + else n = gnext(n); + } while (n); + return luaO_nilobject; + } + } +} + + +/* +** beware: when using this function you probably need to check a GC +** barrier and invalidate the TM cache. +*/ +TValue *luaH_set (lua_State *L, Table *t, const TValue *key) { + const TValue *p = luaH_get(t, key); + if (p != luaO_nilobject) + return cast(TValue *, p); + else return luaH_newkey(L, t, key); +} + + +void luaH_setint (lua_State *L, Table *t, int key, TValue *value) { + const TValue *p = luaH_getint(t, key); + TValue *cell; + if (p != luaO_nilobject) + cell = cast(TValue *, p); + else { + TValue k; + setnvalue(&k, cast_num(key)); + cell = luaH_newkey(L, t, &k); + } + setobj2t(L, cell, value); +} + + +static int unbound_search (Table *t, unsigned int j) { + unsigned int i = j; /* i is zero or a present index */ + j++; + /* find `i' and `j' such that i is present and j is not */ + while (!ttisnil(luaH_getint(t, j))) { + i = j; + j *= 2; + if (j > cast(unsigned int, MAX_INT)) { /* overflow? */ + /* table was built with bad purposes: resort to linear search */ + i = 1; + while (!ttisnil(luaH_getint(t, i))) i++; + return i - 1; + } + } + /* now do a binary search between them */ + while (j - i > 1) { + unsigned int m = (i+j)/2; + if (ttisnil(luaH_getint(t, m))) j = m; + else i = m; + } + return i; +} + + +/* +** Try to find a boundary in table `t'. A `boundary' is an integer index +** such that t[i] is non-nil and t[i+1] is nil (and 0 if t[1] is nil). +*/ +int luaH_getn (Table *t) { + unsigned int j = t->sizearray; + if (j > 0 && ttisnil(&t->array[j - 1])) { + /* there is a boundary in the array part: (binary) search for it */ + unsigned int i = 0; + while (j - i > 1) { + unsigned int m = (i+j)/2; + if (ttisnil(&t->array[m - 1])) j = m; + else i = m; + } + return i; + } + /* else must find a boundary in hash part */ + else if (isdummy(t->node)) /* hash part is empty? */ + return j; /* that is easy... */ + else return unbound_search(t, j); +} + + + +#if defined(LUA_DEBUG) + +Node *luaH_mainposition (const Table *t, const TValue *key) { + return mainposition(t, key); +} + +int luaH_isdummy (Node *n) { return isdummy(n); } + +#endif diff --git a/radio/src/lua/src/ltable.h b/radio/src/lua/src/ltable.h new file mode 100644 index 000000000..2f6f5c2dc --- /dev/null +++ b/radio/src/lua/src/ltable.h @@ -0,0 +1,41 @@ +/* +** $Id: ltable.h,v 2.16 2011/08/17 20:26:47 roberto Exp $ +** Lua tables (hash) +** See Copyright Notice in lua.h +*/ + +#ifndef ltable_h +#define ltable_h + +#include "lobject.h" + + +#define gnode(t,i) (&(t)->node[i]) +#define gkey(n) (&(n)->i_key.tvk) +#define gval(n) (&(n)->i_val) +#define gnext(n) ((n)->i_key.nk.next) + +#define invalidateTMcache(t) ((t)->flags = 0) + + +LUAI_FUNC const TValue *luaH_getint (Table *t, int key); +LUAI_FUNC void luaH_setint (lua_State *L, Table *t, int key, TValue *value); +LUAI_FUNC const TValue *luaH_getstr (Table *t, TString *key); +LUAI_FUNC const TValue *luaH_get (Table *t, const TValue *key); +LUAI_FUNC TValue *luaH_newkey (lua_State *L, Table *t, const TValue *key); +LUAI_FUNC TValue *luaH_set (lua_State *L, Table *t, const TValue *key); +LUAI_FUNC Table *luaH_new (lua_State *L); +LUAI_FUNC void luaH_resize (lua_State *L, Table *t, int nasize, int nhsize); +LUAI_FUNC void luaH_resizearray (lua_State *L, Table *t, int nasize); +LUAI_FUNC void luaH_free (lua_State *L, Table *t); +LUAI_FUNC int luaH_next (lua_State *L, Table *t, StkId key); +LUAI_FUNC int luaH_getn (Table *t); + + +#if defined(LUA_DEBUG) +LUAI_FUNC Node *luaH_mainposition (const Table *t, const TValue *key); +LUAI_FUNC int luaH_isdummy (Node *n); +#endif + + +#endif diff --git a/radio/src/lua/src/ltablib.c b/radio/src/lua/src/ltablib.c new file mode 100644 index 000000000..c61903b08 --- /dev/null +++ b/radio/src/lua/src/ltablib.c @@ -0,0 +1,282 @@ +/* +** $Id: ltablib.c,v 1.65 2013/03/07 18:17:24 roberto Exp $ +** Library for Table Manipulation +** See Copyright Notice in lua.h +*/ + + +#include + +#define ltablib_c + +#include "lua.h" + +#include "lauxlib.h" +#include "lualib.h" + + +#define aux_getn(L,n) (luaL_checktype(L, n, LUA_TTABLE), luaL_len(L, n)) + + + +#if defined(LUA_COMPAT_MAXN) +static int maxn (lua_State *L) { + lua_Number max = 0; + luaL_checktype(L, 1, LUA_TTABLE); + lua_pushnil(L); /* first key */ + while (lua_next(L, 1)) { + lua_pop(L, 1); /* remove value */ + if (lua_type(L, -1) == LUA_TNUMBER) { + lua_Number v = lua_tonumber(L, -1); + if (v > max) max = v; + } + } + lua_pushnumber(L, max); + return 1; +} +#endif + + +static int tinsert (lua_State *L) { + int e = aux_getn(L, 1) + 1; /* first empty element */ + int pos; /* where to insert new element */ + switch (lua_gettop(L)) { + case 2: { /* called with only 2 arguments */ + pos = e; /* insert new element at the end */ + break; + } + case 3: { + int i; + pos = luaL_checkint(L, 2); /* 2nd argument is the position */ + luaL_argcheck(L, 1 <= pos && pos <= e, 2, "position out of bounds"); + for (i = e; i > pos; i--) { /* move up elements */ + lua_rawgeti(L, 1, i-1); + lua_rawseti(L, 1, i); /* t[i] = t[i-1] */ + } + break; + } + default: { + return luaL_error(L, "wrong number of arguments to " LUA_QL("insert")); + } + } + lua_rawseti(L, 1, pos); /* t[pos] = v */ + return 0; +} + + +static int tremove (lua_State *L) { + int size = aux_getn(L, 1); + int pos = luaL_optint(L, 2, size); + if (pos != size) /* validate 'pos' if given */ + luaL_argcheck(L, 1 <= pos && pos <= size + 1, 1, "position out of bounds"); + lua_rawgeti(L, 1, pos); /* result = t[pos] */ + for ( ; pos < size; pos++) { + lua_rawgeti(L, 1, pos+1); + lua_rawseti(L, 1, pos); /* t[pos] = t[pos+1] */ + } + lua_pushnil(L); + lua_rawseti(L, 1, pos); /* t[pos] = nil */ + return 1; +} + + +static void addfield (lua_State *L, luaL_Buffer *b, int i) { + lua_rawgeti(L, 1, i); + if (!lua_isstring(L, -1)) + luaL_error(L, "invalid value (%s) at index %d in table for " + LUA_QL("concat"), luaL_typename(L, -1), i); + luaL_addvalue(b); +} + + +static int tconcat (lua_State *L) { + luaL_Buffer b; + size_t lsep; + int i, last; + const char *sep = luaL_optlstring(L, 2, "", &lsep); + luaL_checktype(L, 1, LUA_TTABLE); + i = luaL_optint(L, 3, 1); + last = luaL_opt(L, luaL_checkint, 4, luaL_len(L, 1)); + luaL_buffinit(L, &b); + for (; i < last; i++) { + addfield(L, &b, i); + luaL_addlstring(&b, sep, lsep); + } + if (i == last) /* add last value (if interval was not empty) */ + addfield(L, &b, i); + luaL_pushresult(&b); + return 1; +} + + +/* +** {====================================================== +** Pack/unpack +** ======================================================= +*/ + +static int pack (lua_State *L) { + int n = lua_gettop(L); /* number of elements to pack */ + lua_createtable(L, n, 1); /* create result table */ + lua_pushinteger(L, n); + lua_setfield(L, -2, "n"); /* t.n = number of elements */ + if (n > 0) { /* at least one element? */ + int i; + lua_pushvalue(L, 1); + lua_rawseti(L, -2, 1); /* insert first element */ + lua_replace(L, 1); /* move table into index 1 */ + for (i = n; i >= 2; i--) /* assign other elements */ + lua_rawseti(L, 1, i); + } + return 1; /* return table */ +} + + +static int unpack (lua_State *L) { + int i, e, n; + luaL_checktype(L, 1, LUA_TTABLE); + i = luaL_optint(L, 2, 1); + e = luaL_opt(L, luaL_checkint, 3, luaL_len(L, 1)); + if (i > e) return 0; /* empty range */ + n = e - i + 1; /* number of elements */ + if (n <= 0 || !lua_checkstack(L, n)) /* n <= 0 means arith. overflow */ + return luaL_error(L, "too many results to unpack"); + lua_rawgeti(L, 1, i); /* push arg[i] (avoiding overflow problems) */ + while (i++ < e) /* push arg[i + 1...e] */ + lua_rawgeti(L, 1, i); + return n; +} + +/* }====================================================== */ + + + +/* +** {====================================================== +** Quicksort +** (based on `Algorithms in MODULA-3', Robert Sedgewick; +** Addison-Wesley, 1993.) +** ======================================================= +*/ + + +static void set2 (lua_State *L, int i, int j) { + lua_rawseti(L, 1, i); + lua_rawseti(L, 1, j); +} + +static int sort_comp (lua_State *L, int a, int b) { + if (!lua_isnil(L, 2)) { /* function? */ + int res; + lua_pushvalue(L, 2); + lua_pushvalue(L, a-1); /* -1 to compensate function */ + lua_pushvalue(L, b-2); /* -2 to compensate function and `a' */ + lua_call(L, 2, 1); + res = lua_toboolean(L, -1); + lua_pop(L, 1); + return res; + } + else /* a < b? */ + return lua_compare(L, a, b, LUA_OPLT); +} + +static void auxsort (lua_State *L, int l, int u) { + while (l < u) { /* for tail recursion */ + int i, j; + /* sort elements a[l], a[(l+u)/2] and a[u] */ + lua_rawgeti(L, 1, l); + lua_rawgeti(L, 1, u); + if (sort_comp(L, -1, -2)) /* a[u] < a[l]? */ + set2(L, l, u); /* swap a[l] - a[u] */ + else + lua_pop(L, 2); + if (u-l == 1) break; /* only 2 elements */ + i = (l+u)/2; + lua_rawgeti(L, 1, i); + lua_rawgeti(L, 1, l); + if (sort_comp(L, -2, -1)) /* a[i]= P */ + while (lua_rawgeti(L, 1, ++i), sort_comp(L, -1, -2)) { + if (i>=u) luaL_error(L, "invalid order function for sorting"); + lua_pop(L, 1); /* remove a[i] */ + } + /* repeat --j until a[j] <= P */ + while (lua_rawgeti(L, 1, --j), sort_comp(L, -3, -1)) { + if (j<=l) luaL_error(L, "invalid order function for sorting"); + lua_pop(L, 1); /* remove a[j] */ + } + if (j + +#define ltm_c +#define LUA_CORE + +#include "lua.h" + +#include "lobject.h" +#include "lstate.h" +#include "lstring.h" +#include "ltable.h" +#include "ltm.h" + + +static const char udatatypename[] = "userdata"; + +LUAI_DDEF const char *const luaT_typenames_[LUA_TOTALTAGS] = { + "no value", + "nil", "boolean", udatatypename, "number", + "string", "table", "function", udatatypename, "thread", + "proto", "upval" /* these last two cases are used for tests only */ +}; + + +void luaT_init (lua_State *L) { + static const char *const luaT_eventname[] = { /* ORDER TM */ + "__index", "__newindex", + "__gc", "__mode", "__len", "__eq", + "__add", "__sub", "__mul", "__div", "__mod", + "__pow", "__unm", "__lt", "__le", + "__concat", "__call" + }; + int i; + for (i=0; itmname[i] = luaS_new(L, luaT_eventname[i]); + luaS_fix(G(L)->tmname[i]); /* never collect these names */ + } +} + + +/* +** function to be used with macro "fasttm": optimized for absence of +** tag methods +*/ +const TValue *luaT_gettm (Table *events, TMS event, TString *ename) { + const TValue *tm = luaH_getstr(events, ename); + lua_assert(event <= TM_EQ); + if (ttisnil(tm)) { /* no tag method? */ + events->flags |= cast_byte(1u<metatable; + break; + case LUA_TUSERDATA: + mt = uvalue(o)->metatable; + break; + default: + mt = G(L)->mt[ttypenv(o)]; + } + return (mt ? luaH_getstr(mt, G(L)->tmname[event]) : luaO_nilobject); +} + diff --git a/radio/src/lua/src/ltm.h b/radio/src/lua/src/ltm.h new file mode 100644 index 000000000..89bdc19a1 --- /dev/null +++ b/radio/src/lua/src/ltm.h @@ -0,0 +1,57 @@ +/* +** $Id: ltm.h,v 2.11 2011/02/28 17:32:10 roberto Exp $ +** Tag methods +** See Copyright Notice in lua.h +*/ + +#ifndef ltm_h +#define ltm_h + + +#include "lobject.h" + + +/* +* WARNING: if you change the order of this enumeration, +* grep "ORDER TM" +*/ +typedef enum { + TM_INDEX, + TM_NEWINDEX, + TM_GC, + TM_MODE, + TM_LEN, + TM_EQ, /* last tag method with `fast' access */ + TM_ADD, + TM_SUB, + TM_MUL, + TM_DIV, + TM_MOD, + TM_POW, + TM_UNM, + TM_LT, + TM_LE, + TM_CONCAT, + TM_CALL, + TM_N /* number of elements in the enum */ +} TMS; + + + +#define gfasttm(g,et,e) ((et) == NULL ? NULL : \ + ((et)->flags & (1u<<(e))) ? NULL : luaT_gettm(et, e, (g)->tmname[e])) + +#define fasttm(l,et,e) gfasttm(G(l), et, e) + +#define ttypename(x) luaT_typenames_[(x) + 1] +#define objtypename(x) ttypename(ttypenv(x)) + +LUAI_DDEC const char *const luaT_typenames_[LUA_TOTALTAGS]; + + +LUAI_FUNC const TValue *luaT_gettm (Table *events, TMS event, TString *ename); +LUAI_FUNC const TValue *luaT_gettmbyobj (lua_State *L, const TValue *o, + TMS event); +LUAI_FUNC void luaT_init (lua_State *L); + +#endif diff --git a/radio/src/lua/src/lua.c b/radio/src/lua/src/lua.c new file mode 100644 index 000000000..c2c1e547d --- /dev/null +++ b/radio/src/lua/src/lua.c @@ -0,0 +1,496 @@ +/* +** $Id: lua.c,v 1.206 2012/09/29 20:07:06 roberto Exp $ +** Lua stand-alone interpreter +** See Copyright Notice in lua.h +*/ + + +#include +#include +#include + +#define lua_c + +#include "lua.h" + +#include "lauxlib.h" +#include "lualib.h" + + +#if !defined(LUA_PROMPT) +#define LUA_PROMPT "> " +#define LUA_PROMPT2 ">> " +#endif + +#if !defined(LUA_PROGNAME) +#define LUA_PROGNAME "lua" +#endif + +#if !defined(LUA_MAXINPUT) +#define LUA_MAXINPUT 512 +#endif + +#if !defined(LUA_INIT) +#define LUA_INIT "LUA_INIT" +#endif + +#define LUA_INITVERSION \ + LUA_INIT "_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR + + +/* +** lua_stdin_is_tty detects whether the standard input is a 'tty' (that +** is, whether we're running lua interactively). +*/ +#if defined(LUA_USE_ISATTY) +#include +#define lua_stdin_is_tty() isatty(0) +#elif defined(LUA_WIN) +#include +#include +#define lua_stdin_is_tty() _isatty(_fileno(stdin)) +#else +#define lua_stdin_is_tty() 1 /* assume stdin is a tty */ +#endif + + +/* +** lua_readline defines how to show a prompt and then read a line from +** the standard input. +** lua_saveline defines how to "save" a read line in a "history". +** lua_freeline defines how to free a line read by lua_readline. +*/ +#if defined(LUA_USE_READLINE) + +#include +#include +#include +#define lua_readline(L,b,p) ((void)L, ((b)=readline(p)) != NULL) +#define lua_saveline(L,idx) \ + if (lua_rawlen(L,idx) > 0) /* non-empty line? */ \ + add_history(lua_tostring(L, idx)); /* add it to history */ +#define lua_freeline(L,b) ((void)L, free(b)) + +#elif !defined(lua_readline) + +#define lua_readline(L,b,p) \ + ((void)L, fputs(p, stdout), fflush(stdout), /* show prompt */ \ + fgets(b, LUA_MAXINPUT, stdin) != NULL) /* get line */ +#define lua_saveline(L,idx) { (void)L; (void)idx; } +#define lua_freeline(L,b) { (void)L; (void)b; } + +#endif + + + + +static lua_State *globalL = NULL; + +static const char *progname = LUA_PROGNAME; + + + +static void lstop (lua_State *L, lua_Debug *ar) { + (void)ar; /* unused arg. */ + lua_sethook(L, NULL, 0, 0); + luaL_error(L, "interrupted!"); +} + + +static void laction (int i) { + signal(i, SIG_DFL); /* if another SIGINT happens before lstop, + terminate process (default action) */ + lua_sethook(globalL, lstop, LUA_MASKCALL | LUA_MASKRET | LUA_MASKCOUNT, 1); +} + + +static void print_usage (const char *badoption) { + luai_writestringerror("%s: ", progname); + if (badoption[1] == 'e' || badoption[1] == 'l') + luai_writestringerror("'%s' needs argument\n", badoption); + else + luai_writestringerror("unrecognized option '%s'\n", badoption); + luai_writestringerror( + "usage: %s [options] [script [args]]\n" + "Available options are:\n" + " -e stat execute string " LUA_QL("stat") "\n" + " -i enter interactive mode after executing " LUA_QL("script") "\n" + " -l name require library " LUA_QL("name") "\n" + " -v show version information\n" + " -E ignore environment variables\n" + " -- stop handling options\n" + " - stop handling options and execute stdin\n" + , + progname); +} + + +static void l_message (const char *pname, const char *msg) { + if (pname) luai_writestringerror("%s: ", pname); + luai_writestringerror("%s\n", msg); +} + + +static int report (lua_State *L, int status) { + if (status != LUA_OK && !lua_isnil(L, -1)) { + const char *msg = lua_tostring(L, -1); + if (msg == NULL) msg = "(error object is not a string)"; + l_message(progname, msg); + lua_pop(L, 1); + /* force a complete garbage collection in case of errors */ + lua_gc(L, LUA_GCCOLLECT, 0); + } + return status; +} + + +/* the next function is called unprotected, so it must avoid errors */ +static void finalreport (lua_State *L, int status) { + if (status != LUA_OK) { + const char *msg = (lua_type(L, -1) == LUA_TSTRING) ? lua_tostring(L, -1) + : NULL; + if (msg == NULL) msg = "(error object is not a string)"; + l_message(progname, msg); + lua_pop(L, 1); + } +} + + +static int traceback (lua_State *L) { + const char *msg = lua_tostring(L, 1); + if (msg) + luaL_traceback(L, L, msg, 1); + else if (!lua_isnoneornil(L, 1)) { /* is there an error object? */ + if (!luaL_callmeta(L, 1, "__tostring")) /* try its 'tostring' metamethod */ + lua_pushliteral(L, "(no error message)"); + } + return 1; +} + + +static int docall (lua_State *L, int narg, int nres) { + int status; + int base = lua_gettop(L) - narg; /* function index */ + lua_pushcfunction(L, traceback); /* push traceback function */ + lua_insert(L, base); /* put it under chunk and args */ + globalL = L; /* to be available to 'laction' */ + signal(SIGINT, laction); + status = lua_pcall(L, narg, nres, base); + signal(SIGINT, SIG_DFL); + lua_remove(L, base); /* remove traceback function */ + return status; +} + + +static void print_version (void) { + luai_writestring(LUA_COPYRIGHT, strlen(LUA_COPYRIGHT)); + luai_writeline(); +} + + +static int getargs (lua_State *L, char **argv, int n) { + int narg; + int i; + int argc = 0; + while (argv[argc]) argc++; /* count total number of arguments */ + narg = argc - (n + 1); /* number of arguments to the script */ + luaL_checkstack(L, narg + 3, "too many arguments to script"); + for (i=n+1; i < argc; i++) + lua_pushstring(L, argv[i]); + lua_createtable(L, narg, n + 1); + for (i=0; i < argc; i++) { + lua_pushstring(L, argv[i]); + lua_rawseti(L, -2, i - n); + } + return narg; +} + + +static int dofile (lua_State *L, const char *name) { + int status = luaL_loadfile(L, name); + if (status == LUA_OK) status = docall(L, 0, 0); + return report(L, status); +} + + +static int dostring (lua_State *L, const char *s, const char *name) { + int status = luaL_loadbuffer(L, s, strlen(s), name); + if (status == LUA_OK) status = docall(L, 0, 0); + return report(L, status); +} + + +static int dolibrary (lua_State *L, const char *name) { + int status; + lua_getglobal(L, "require"); + lua_pushstring(L, name); + status = docall(L, 1, 1); /* call 'require(name)' */ + if (status == LUA_OK) + lua_setglobal(L, name); /* global[name] = require return */ + return report(L, status); +} + + +static const char *get_prompt (lua_State *L, int firstline) { + const char *p; + lua_getglobal(L, firstline ? "_PROMPT" : "_PROMPT2"); + p = lua_tostring(L, -1); + if (p == NULL) p = (firstline ? LUA_PROMPT : LUA_PROMPT2); + return p; +} + +/* mark in error messages for incomplete statements */ +#define EOFMARK "" +#define marklen (sizeof(EOFMARK)/sizeof(char) - 1) + +static int incomplete (lua_State *L, int status) { + if (status == LUA_ERRSYNTAX) { + size_t lmsg; + const char *msg = lua_tolstring(L, -1, &lmsg); + if (lmsg >= marklen && strcmp(msg + lmsg - marklen, EOFMARK) == 0) { + lua_pop(L, 1); + return 1; + } + } + return 0; /* else... */ +} + + +static int pushline (lua_State *L, int firstline) { + char buffer[LUA_MAXINPUT]; + char *b = buffer; + size_t l; + const char *prmt = get_prompt(L, firstline); + int readstatus = lua_readline(L, b, prmt); + lua_pop(L, 1); /* remove result from 'get_prompt' */ + if (readstatus == 0) + return 0; /* no input */ + l = strlen(b); + if (l > 0 && b[l-1] == '\n') /* line ends with newline? */ + b[l-1] = '\0'; /* remove it */ + if (firstline && b[0] == '=') /* first line starts with `=' ? */ + lua_pushfstring(L, "return %s", b+1); /* change it to `return' */ + else + lua_pushstring(L, b); + lua_freeline(L, b); + return 1; +} + + +static int loadline (lua_State *L) { + int status; + lua_settop(L, 0); + if (!pushline(L, 1)) + return -1; /* no input */ + for (;;) { /* repeat until gets a complete line */ + size_t l; + const char *line = lua_tolstring(L, 1, &l); + status = luaL_loadbuffer(L, line, l, "=stdin"); + if (!incomplete(L, status)) break; /* cannot try to add lines? */ + if (!pushline(L, 0)) /* no more input? */ + return -1; + lua_pushliteral(L, "\n"); /* add a new line... */ + lua_insert(L, -2); /* ...between the two lines */ + lua_concat(L, 3); /* join them */ + } + lua_saveline(L, 1); + lua_remove(L, 1); /* remove line */ + return status; +} + + +static void dotty (lua_State *L) { + int status; + const char *oldprogname = progname; + progname = NULL; + while ((status = loadline(L)) != -1) { + if (status == LUA_OK) status = docall(L, 0, LUA_MULTRET); + report(L, status); + if (status == LUA_OK && lua_gettop(L) > 0) { /* any result to print? */ + luaL_checkstack(L, LUA_MINSTACK, "too many results to print"); + lua_getglobal(L, "print"); + lua_insert(L, 1); + if (lua_pcall(L, lua_gettop(L)-1, 0, 0) != LUA_OK) + l_message(progname, lua_pushfstring(L, + "error calling " LUA_QL("print") " (%s)", + lua_tostring(L, -1))); + } + } + lua_settop(L, 0); /* clear stack */ + luai_writeline(); + progname = oldprogname; +} + + +static int handle_script (lua_State *L, char **argv, int n) { + int status; + const char *fname; + int narg = getargs(L, argv, n); /* collect arguments */ + lua_setglobal(L, "arg"); + fname = argv[n]; + if (strcmp(fname, "-") == 0 && strcmp(argv[n-1], "--") != 0) + fname = NULL; /* stdin */ + status = luaL_loadfile(L, fname); + lua_insert(L, -(narg+1)); + if (status == LUA_OK) + status = docall(L, narg, LUA_MULTRET); + else + lua_pop(L, narg); + return report(L, status); +} + + +/* check that argument has no extra characters at the end */ +#define noextrachars(x) {if ((x)[2] != '\0') return -1;} + + +/* indices of various argument indicators in array args */ +#define has_i 0 /* -i */ +#define has_v 1 /* -v */ +#define has_e 2 /* -e */ +#define has_E 3 /* -E */ + +#define num_has 4 /* number of 'has_*' */ + + +static int collectargs (char **argv, int *args) { + int i; + for (i = 1; argv[i] != NULL; i++) { + if (argv[i][0] != '-') /* not an option? */ + return i; + switch (argv[i][1]) { /* option */ + case '-': + noextrachars(argv[i]); + return (argv[i+1] != NULL ? i+1 : 0); + case '\0': + return i; + case 'E': + args[has_E] = 1; + break; + case 'i': + noextrachars(argv[i]); + args[has_i] = 1; /* go through */ + case 'v': + noextrachars(argv[i]); + args[has_v] = 1; + break; + case 'e': + args[has_e] = 1; /* go through */ + case 'l': /* both options need an argument */ + if (argv[i][2] == '\0') { /* no concatenated argument? */ + i++; /* try next 'argv' */ + if (argv[i] == NULL || argv[i][0] == '-') + return -(i - 1); /* no next argument or it is another option */ + } + break; + default: /* invalid option; return its index... */ + return -i; /* ...as a negative value */ + } + } + return 0; +} + + +static int runargs (lua_State *L, char **argv, int n) { + int i; + for (i = 1; i < n; i++) { + lua_assert(argv[i][0] == '-'); + switch (argv[i][1]) { /* option */ + case 'e': { + const char *chunk = argv[i] + 2; + if (*chunk == '\0') chunk = argv[++i]; + lua_assert(chunk != NULL); + if (dostring(L, chunk, "=(command line)") != LUA_OK) + return 0; + break; + } + case 'l': { + const char *filename = argv[i] + 2; + if (*filename == '\0') filename = argv[++i]; + lua_assert(filename != NULL); + if (dolibrary(L, filename) != LUA_OK) + return 0; /* stop if file fails */ + break; + } + default: break; + } + } + return 1; +} + + +static int handle_luainit (lua_State *L) { + const char *name = "=" LUA_INITVERSION; + const char *init = getenv(name + 1); + if (init == NULL) { + name = "=" LUA_INIT; + init = getenv(name + 1); /* try alternative name */ + } + if (init == NULL) return LUA_OK; + else if (init[0] == '@') + return dofile(L, init+1); + else + return dostring(L, init, name); +} + + +static int pmain (lua_State *L) { + int argc = (int)lua_tointeger(L, 1); + char **argv = (char **)lua_touserdata(L, 2); + int script; + int args[num_has]; + args[has_i] = args[has_v] = args[has_e] = args[has_E] = 0; + if (argv[0] && argv[0][0]) progname = argv[0]; + script = collectargs(argv, args); + if (script < 0) { /* invalid arg? */ + print_usage(argv[-script]); + return 0; + } + if (args[has_v]) print_version(); + if (args[has_E]) { /* option '-E'? */ + lua_pushboolean(L, 1); /* signal for libraries to ignore env. vars. */ + lua_setfield(L, LUA_REGISTRYINDEX, "LUA_NOENV"); + } + /* open standard libraries */ + luaL_checkversion(L); + lua_gc(L, LUA_GCSTOP, 0); /* stop collector during initialization */ + luaL_openlibs(L); /* open libraries */ + lua_gc(L, LUA_GCRESTART, 0); + if (!args[has_E] && handle_luainit(L) != LUA_OK) + return 0; /* error running LUA_INIT */ + /* execute arguments -e and -l */ + if (!runargs(L, argv, (script > 0) ? script : argc)) return 0; + /* execute main script (if there is one) */ + if (script && handle_script(L, argv, script) != LUA_OK) return 0; + if (args[has_i]) /* -i option? */ + dotty(L); + else if (script == 0 && !args[has_e] && !args[has_v]) { /* no arguments? */ + if (lua_stdin_is_tty()) { + print_version(); + dotty(L); + } + else dofile(L, NULL); /* executes stdin as a file */ + } + lua_pushboolean(L, 1); /* signal no errors */ + return 1; +} + + +int main (int argc, char **argv) { + int status, result; + lua_State *L = luaL_newstate(); /* create state */ + if (L == NULL) { + l_message(argv[0], "cannot create state: not enough memory"); + return EXIT_FAILURE; + } + /* call 'pmain' in protected mode */ + lua_pushcfunction(L, &pmain); + lua_pushinteger(L, argc); /* 1st argument */ + lua_pushlightuserdata(L, argv); /* 2nd argument */ + status = lua_pcall(L, 2, 1, 0); + result = lua_toboolean(L, -1); /* get result */ + finalreport(L, status); + lua_close(L); + return (result && status == LUA_OK) ? EXIT_SUCCESS : EXIT_FAILURE; +} + diff --git a/radio/src/lua/src/lua.h b/radio/src/lua/src/lua.h new file mode 100644 index 000000000..d9ae5c9ea --- /dev/null +++ b/radio/src/lua/src/lua.h @@ -0,0 +1,455 @@ +/* +** $Id: lua.h,v 1.285 2013/03/15 13:04:22 roberto Exp $ +** Lua - A Scripting Language +** Lua.org, PUC-Rio, Brazil (http://www.lua.org) +** See Copyright Notice at the end of this file +*/ + + +#ifndef lua_h +#define lua_h + +#include +#include + + +#include "luaconf.h" + + +#define LUA_VERSION_MAJOR "5" +#define LUA_VERSION_MINOR "2" +#define LUA_VERSION_NUM 502 +#define LUA_VERSION_RELEASE "2" + +#define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR +#define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE +#define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2013 Lua.org, PUC-Rio" +#define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo, W. Celes" + + +/* mark for precompiled code ('Lua') */ +#define LUA_SIGNATURE "\033Lua" + +/* option for multiple returns in 'lua_pcall' and 'lua_call' */ +#define LUA_MULTRET (-1) + + +/* +** pseudo-indices +*/ +#define LUA_REGISTRYINDEX LUAI_FIRSTPSEUDOIDX +#define lua_upvalueindex(i) (LUA_REGISTRYINDEX - (i)) + + +/* thread status */ +#define LUA_OK 0 +#define LUA_YIELD 1 +#define LUA_ERRRUN 2 +#define LUA_ERRSYNTAX 3 +#define LUA_ERRMEM 4 +#define LUA_ERRGCMM 5 +#define LUA_ERRERR 6 + + +typedef struct lua_State lua_State; + +typedef int (*lua_CFunction) (lua_State *L); + + +/* +** functions that read/write blocks when loading/dumping Lua chunks +*/ +typedef const char * (*lua_Reader) (lua_State *L, void *ud, size_t *sz); + +typedef int (*lua_Writer) (lua_State *L, const void* p, size_t sz, void* ud); + + +/* +** prototype for memory-allocation functions +*/ +typedef void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize); + + +/* +** basic types +*/ +#define LUA_TNONE (-1) + +#define LUA_TNIL 0 +#define LUA_TBOOLEAN 1 +#define LUA_TLIGHTUSERDATA 2 +#define LUA_TNUMBER 3 +#define LUA_TSTRING 4 +#define LUA_TTABLE 5 +#define LUA_TFUNCTION 6 +#define LUA_TUSERDATA 7 +#define LUA_TTHREAD 8 + +#define LUA_NUMTAGS 9 + + + +/* minimum Lua stack available to a C function */ +#define LUA_MINSTACK 20 + + +/* predefined values in the registry */ +#define LUA_RIDX_MAINTHREAD 1 +#define LUA_RIDX_GLOBALS 2 +#define LUA_RIDX_LAST LUA_RIDX_GLOBALS + + +/* type of numbers in Lua */ +typedef LUA_NUMBER lua_Number; + + +/* type for integer functions */ +typedef LUA_INTEGER lua_Integer; + +/* unsigned integer type */ +typedef LUA_UNSIGNED lua_Unsigned; + + + +/* +** generic extra include file +*/ +#if defined(LUA_USER_H) +#include LUA_USER_H +#endif + + +/* +** RCS ident string +*/ +extern const char lua_ident[]; + + +/* +** state manipulation +*/ +LUA_API lua_State *(lua_newstate) (lua_Alloc f, void *ud); +LUA_API void (lua_close) (lua_State *L); +LUA_API lua_State *(lua_newthread) (lua_State *L); + +LUA_API lua_CFunction (lua_atpanic) (lua_State *L, lua_CFunction panicf); + + +LUA_API const lua_Number *(lua_version) (lua_State *L); + + +/* +** basic stack manipulation +*/ +LUA_API int (lua_absindex) (lua_State *L, int idx); +LUA_API int (lua_gettop) (lua_State *L); +LUA_API void (lua_settop) (lua_State *L, int idx); +LUA_API void (lua_pushvalue) (lua_State *L, int idx); +LUA_API void (lua_remove) (lua_State *L, int idx); +LUA_API void (lua_insert) (lua_State *L, int idx); +LUA_API void (lua_replace) (lua_State *L, int idx); +LUA_API void (lua_copy) (lua_State *L, int fromidx, int toidx); +LUA_API int (lua_checkstack) (lua_State *L, int sz); + +LUA_API void (lua_xmove) (lua_State *from, lua_State *to, int n); + + +/* +** access functions (stack -> C) +*/ + +LUA_API int (lua_isnumber) (lua_State *L, int idx); +LUA_API int (lua_isstring) (lua_State *L, int idx); +LUA_API int (lua_iscfunction) (lua_State *L, int idx); +LUA_API int (lua_isuserdata) (lua_State *L, int idx); +LUA_API int (lua_type) (lua_State *L, int idx); +LUA_API const char *(lua_typename) (lua_State *L, int tp); + +LUA_API lua_Number (lua_tonumberx) (lua_State *L, int idx, int *isnum); +LUA_API lua_Integer (lua_tointegerx) (lua_State *L, int idx, int *isnum); +LUA_API lua_Unsigned (lua_tounsignedx) (lua_State *L, int idx, int *isnum); +LUA_API int (lua_toboolean) (lua_State *L, int idx); +LUA_API const char *(lua_tolstring) (lua_State *L, int idx, size_t *len); +LUA_API size_t (lua_rawlen) (lua_State *L, int idx); +LUA_API lua_CFunction (lua_tocfunction) (lua_State *L, int idx); +LUA_API void *(lua_touserdata) (lua_State *L, int idx); +LUA_API lua_State *(lua_tothread) (lua_State *L, int idx); +LUA_API const void *(lua_topointer) (lua_State *L, int idx); + + +/* +** Comparison and arithmetic functions +*/ + +#define LUA_OPADD 0 /* ORDER TM */ +#define LUA_OPSUB 1 +#define LUA_OPMUL 2 +#define LUA_OPDIV 3 +#define LUA_OPMOD 4 +#define LUA_OPPOW 5 +#define LUA_OPUNM 6 + +LUA_API void (lua_arith) (lua_State *L, int op); + +#define LUA_OPEQ 0 +#define LUA_OPLT 1 +#define LUA_OPLE 2 + +LUA_API int (lua_rawequal) (lua_State *L, int idx1, int idx2); +LUA_API int (lua_compare) (lua_State *L, int idx1, int idx2, int op); + + +/* +** push functions (C -> stack) +*/ +LUA_API void (lua_pushnil) (lua_State *L); +LUA_API void (lua_pushnumber) (lua_State *L, lua_Number n); +LUA_API void (lua_pushinteger) (lua_State *L, lua_Integer n); +LUA_API void (lua_pushunsigned) (lua_State *L, lua_Unsigned n); +LUA_API const char *(lua_pushlstring) (lua_State *L, const char *s, size_t l); +LUA_API const char *(lua_pushstring) (lua_State *L, const char *s); +LUA_API const char *(lua_pushvfstring) (lua_State *L, const char *fmt, + va_list argp); +LUA_API const char *(lua_pushfstring) (lua_State *L, const char *fmt, ...); +LUA_API void (lua_pushcclosure) (lua_State *L, lua_CFunction fn, int n); +LUA_API void (lua_pushboolean) (lua_State *L, int b); +LUA_API void (lua_pushlightuserdata) (lua_State *L, void *p); +LUA_API int (lua_pushthread) (lua_State *L); + + +/* +** get functions (Lua -> stack) +*/ +LUA_API void (lua_getglobal) (lua_State *L, const char *var); +LUA_API void (lua_gettable) (lua_State *L, int idx); +LUA_API void (lua_getfield) (lua_State *L, int idx, const char *k); +LUA_API void (lua_rawget) (lua_State *L, int idx); +LUA_API void (lua_rawgeti) (lua_State *L, int idx, int n); +LUA_API void (lua_rawgetp) (lua_State *L, int idx, const void *p); +LUA_API void (lua_createtable) (lua_State *L, int narr, int nrec); +LUA_API void *(lua_newuserdata) (lua_State *L, size_t sz); +LUA_API int (lua_getmetatable) (lua_State *L, int objindex); +LUA_API void (lua_getuservalue) (lua_State *L, int idx); + + +/* +** set functions (stack -> Lua) +*/ +LUA_API void (lua_setglobal) (lua_State *L, const char *var); +LUA_API void (lua_settable) (lua_State *L, int idx); +LUA_API void (lua_setfield) (lua_State *L, int idx, const char *k); +LUA_API void (lua_rawset) (lua_State *L, int idx); +LUA_API void (lua_rawseti) (lua_State *L, int idx, int n); +LUA_API void (lua_rawsetp) (lua_State *L, int idx, const void *p); +LUA_API int (lua_setmetatable) (lua_State *L, int objindex); +LUA_API void (lua_setuservalue) (lua_State *L, int idx); + + +/* +** 'load' and 'call' functions (load and run Lua code) +*/ +LUA_API void (lua_callk) (lua_State *L, int nargs, int nresults, int ctx, + lua_CFunction k); +#define lua_call(L,n,r) lua_callk(L, (n), (r), 0, NULL) + +LUA_API int (lua_getctx) (lua_State *L, int *ctx); + +LUA_API int (lua_pcallk) (lua_State *L, int nargs, int nresults, int errfunc, + int ctx, lua_CFunction k); +#define lua_pcall(L,n,r,f) lua_pcallk(L, (n), (r), (f), 0, NULL) + +LUA_API int (lua_load) (lua_State *L, lua_Reader reader, void *dt, + const char *chunkname, + const char *mode); + +LUA_API int (lua_dump) (lua_State *L, lua_Writer writer, void *data); + + +/* +** coroutine functions +*/ +LUA_API int (lua_yieldk) (lua_State *L, int nresults, int ctx, + lua_CFunction k); +#define lua_yield(L,n) lua_yieldk(L, (n), 0, NULL) +LUA_API int (lua_resume) (lua_State *L, lua_State *from, int narg); +LUA_API int (lua_status) (lua_State *L); + +/* +** garbage-collection function and options +*/ + +#define LUA_GCSTOP 0 +#define LUA_GCRESTART 1 +#define LUA_GCCOLLECT 2 +#define LUA_GCCOUNT 3 +#define LUA_GCCOUNTB 4 +#define LUA_GCSTEP 5 +#define LUA_GCSETPAUSE 6 +#define LUA_GCSETSTEPMUL 7 +#define LUA_GCSETMAJORINC 8 +#define LUA_GCISRUNNING 9 +#define LUA_GCGEN 10 +#define LUA_GCINC 11 + +LUA_API int (lua_gc) (lua_State *L, int what, int data); + + +/* +** miscellaneous functions +*/ + +LUA_API int (lua_error) (lua_State *L); + +LUA_API int (lua_next) (lua_State *L, int idx); + +LUA_API void (lua_concat) (lua_State *L, int n); +LUA_API void (lua_len) (lua_State *L, int idx); + +LUA_API lua_Alloc (lua_getallocf) (lua_State *L, void **ud); +LUA_API void (lua_setallocf) (lua_State *L, lua_Alloc f, void *ud); + + + +/* +** =============================================================== +** some useful macros +** =============================================================== +*/ + +#define lua_tonumber(L,i) lua_tonumberx(L,i,NULL) +#define lua_tointeger(L,i) lua_tointegerx(L,i,NULL) +#define lua_tounsigned(L,i) lua_tounsignedx(L,i,NULL) + +#define lua_pop(L,n) lua_settop(L, -(n)-1) + +#define lua_newtable(L) lua_createtable(L, 0, 0) + +#define lua_register(L,n,f) (lua_pushcfunction(L, (f)), lua_setglobal(L, (n))) + +#define lua_pushcfunction(L,f) lua_pushcclosure(L, (f), 0) + +#define lua_isfunction(L,n) (lua_type(L, (n)) == LUA_TFUNCTION) +#define lua_istable(L,n) (lua_type(L, (n)) == LUA_TTABLE) +#define lua_islightuserdata(L,n) (lua_type(L, (n)) == LUA_TLIGHTUSERDATA) +#define lua_isnil(L,n) (lua_type(L, (n)) == LUA_TNIL) +#define lua_isboolean(L,n) (lua_type(L, (n)) == LUA_TBOOLEAN) +#define lua_isthread(L,n) (lua_type(L, (n)) == LUA_TTHREAD) +#define lua_isnone(L,n) (lua_type(L, (n)) == LUA_TNONE) +#define lua_isnoneornil(L, n) (lua_type(L, (n)) <= 0) + +#define lua_pushliteral(L, s) \ + lua_pushlstring(L, "" s, (sizeof(s)/sizeof(char))-1) + +#define lua_pushglobaltable(L) \ + lua_rawgeti(L, LUA_REGISTRYINDEX, LUA_RIDX_GLOBALS) + +#define lua_tostring(L,i) lua_tolstring(L, (i), NULL) + + + +/* +** {====================================================================== +** Debug API +** ======================================================================= +*/ + + +/* +** Event codes +*/ +#define LUA_HOOKCALL 0 +#define LUA_HOOKRET 1 +#define LUA_HOOKLINE 2 +#define LUA_HOOKCOUNT 3 +#define LUA_HOOKTAILCALL 4 + + +/* +** Event masks +*/ +#define LUA_MASKCALL (1 << LUA_HOOKCALL) +#define LUA_MASKRET (1 << LUA_HOOKRET) +#define LUA_MASKLINE (1 << LUA_HOOKLINE) +#define LUA_MASKCOUNT (1 << LUA_HOOKCOUNT) + +typedef struct lua_Debug lua_Debug; /* activation record */ + + +/* Functions to be called by the debugger in specific events */ +typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar); + + +LUA_API int (lua_getstack) (lua_State *L, int level, lua_Debug *ar); +LUA_API int (lua_getinfo) (lua_State *L, const char *what, lua_Debug *ar); +LUA_API const char *(lua_getlocal) (lua_State *L, const lua_Debug *ar, int n); +LUA_API const char *(lua_setlocal) (lua_State *L, const lua_Debug *ar, int n); +LUA_API const char *(lua_getupvalue) (lua_State *L, int funcindex, int n); +LUA_API const char *(lua_setupvalue) (lua_State *L, int funcindex, int n); + +LUA_API void *(lua_upvalueid) (lua_State *L, int fidx, int n); +LUA_API void (lua_upvaluejoin) (lua_State *L, int fidx1, int n1, + int fidx2, int n2); + +LUA_API int (lua_sethook) (lua_State *L, lua_Hook func, int mask, int count); +LUA_API lua_Hook (lua_gethook) (lua_State *L); +LUA_API int (lua_gethookmask) (lua_State *L); +LUA_API int (lua_gethookcount) (lua_State *L); + + +struct lua_Debug { + int event; + const char *name; /* (n) */ + const char *namewhat; /* (n) 'global', 'local', 'field', 'method' */ + const char *what; /* (S) 'Lua', 'C', 'main', 'tail' */ + const char *source; /* (S) */ + int currentline; /* (l) */ + int linedefined; /* (S) */ + int lastlinedefined; /* (S) */ + unsigned char nups; /* (u) number of upvalues */ + unsigned char nparams;/* (u) number of parameters */ + char isvararg; /* (u) */ + char istailcall; /* (t) */ + char short_src[LUA_IDSIZE]; /* (S) */ + /* private part */ + struct CallInfo *i_ci; /* active function */ +}; + +#if defined(USE_FATFS) + #include "FatFs/ff.h" + int lua__getc(FIL *f); + #define lua_getc(f) lua__getc(&f) + #define lua_fclose f_close +#else + #include + #define lua_getc getc + #define lua_fclose fclose +#endif + +/* }====================================================================== */ + + +/****************************************************************************** +* Copyright (C) 1994-2013 Lua.org, PUC-Rio. +* +* Permission is hereby granted, free of charge, to any person obtaining +* a copy of this software and associated documentation files (the +* "Software"), to deal in the Software without restriction, including +* without limitation the rights to use, copy, modify, merge, publish, +* distribute, sublicense, and/or sell copies of the Software, and to +* permit persons to whom the Software is furnished to do so, subject to +* the following conditions: +* +* The above copyright notice and this permission notice shall be +* included in all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +******************************************************************************/ + + +#endif diff --git a/radio/src/lua/src/lua.hpp b/radio/src/lua/src/lua.hpp new file mode 100644 index 000000000..ec417f594 --- /dev/null +++ b/radio/src/lua/src/lua.hpp @@ -0,0 +1,9 @@ +// lua.hpp +// Lua header files for C++ +// <> not supplied automatically because Lua also compiles as C++ + +extern "C" { +#include "lua.h" +#include "lualib.h" +#include "lauxlib.h" +} diff --git a/radio/src/lua/src/luac.c b/radio/src/lua/src/luac.c new file mode 100644 index 000000000..b8e179381 --- /dev/null +++ b/radio/src/lua/src/luac.c @@ -0,0 +1,431 @@ +/* +** $Id: luac.c,v 1.69 2011/11/29 17:46:33 lhf Exp $ +** Lua compiler (saves bytecodes to files; also list bytecodes) +** See Copyright Notice in lua.h +*/ + +#include +#include +#include + +#define luac_c +#define LUA_CORE + +#include "lua.h" +#include "lauxlib.h" + +#include "lobject.h" +#include "lstate.h" +#include "lundump.h" + +static void PrintFunction(const Proto* f, int full); +#define luaU_print PrintFunction + +#define PROGNAME "luac" /* default program name */ +#define OUTPUT PROGNAME ".out" /* default output file */ + +static int listing=0; /* list bytecodes? */ +static int dumping=1; /* dump bytecodes? */ +static int stripping=0; /* strip debug information? */ +static char Output[]={ OUTPUT }; /* default output file name */ +static const char* output=Output; /* actual output file name */ +static const char* progname=PROGNAME; /* actual program name */ + +static void fatal(const char* message) +{ + fprintf(stderr,"%s: %s\n",progname,message); + exit(EXIT_FAILURE); +} + +static void cannot(const char* what) +{ + fprintf(stderr,"%s: cannot %s %s: %s\n",progname,what,output,strerror(errno)); + exit(EXIT_FAILURE); +} + +static void usage(const char* message) +{ + if (*message=='-') + fprintf(stderr,"%s: unrecognized option " LUA_QS "\n",progname,message); + else + fprintf(stderr,"%s: %s\n",progname,message); + fprintf(stderr, + "usage: %s [options] [filenames]\n" + "Available options are:\n" + " -l list (use -l -l for full listing)\n" + " -o name output to file " LUA_QL("name") " (default is \"%s\")\n" + " -p parse only\n" + " -s strip debug information\n" + " -v show version information\n" + " -- stop handling options\n" + " - stop handling options and process stdin\n" + ,progname,Output); + exit(EXIT_FAILURE); +} + +#define IS(s) (strcmp(argv[i],s)==0) + +static int doargs(int argc, char* argv[]) +{ + int i; + int version=0; + if (argv[0]!=NULL && *argv[0]!=0) progname=argv[0]; + for (i=1; itop+(i)) + +static const Proto* combine(lua_State* L, int n) +{ + if (n==1) + return toproto(L,-1); + else + { + Proto* f; + int i=n; + if (lua_load(L,reader,&i,"=(" PROGNAME ")",NULL)!=LUA_OK) fatal(lua_tostring(L,-1)); + f=toproto(L,-1); + for (i=0; ip[i]=toproto(L,i-n-1); + if (f->p[i]->sizeupvalues>0) f->p[i]->upvalues[0].instack=0; + } + f->sizelineinfo=0; + return f; + } +} + +static int writer(lua_State* L, const void* p, size_t size, void* u) +{ + UNUSED(L); + return (fwrite(p,size,1,(FILE*)u)!=1) && (size!=0); +} + +static int pmain(lua_State* L) +{ + int argc=(int)lua_tointeger(L,1); + char** argv=(char**)lua_touserdata(L,2); + const Proto* f; + int i; + if (!lua_checkstack(L,argc)) fatal("too many input files"); + for (i=0; i1); + if (dumping) + { + FILE* D= (output==NULL) ? stdout : fopen(output,"wb"); + if (D==NULL) cannot("open"); + lua_lock(L); + luaU_dump(L,f,writer,D,stripping); + lua_unlock(L); + if (ferror(D)) cannot("write"); + if (fclose(D)) cannot("close"); + } + return 0; +} + +int main(int argc, char* argv[]) +{ + lua_State* L; + int i=doargs(argc,argv); + argc-=i; argv+=i; + if (argc<=0) usage("no input files given"); + L=luaL_newstate(); + if (L==NULL) fatal("cannot create state: not enough memory"); + lua_pushcfunction(L,&pmain); + lua_pushinteger(L,argc); + lua_pushlightuserdata(L,argv); + if (lua_pcall(L,2,0,0)!=LUA_OK) fatal(lua_tostring(L,-1)); + lua_close(L); + return EXIT_SUCCESS; +} + +/* +** $Id: print.c,v 1.68 2011/09/30 10:21:20 lhf Exp $ +** print bytecodes +** See Copyright Notice in lua.h +*/ + +#include +#include + +#define luac_c +#define LUA_CORE + +#include "ldebug.h" +#include "lobject.h" +#include "lopcodes.h" + +#define VOID(p) ((const void*)(p)) + +static void PrintString(const TString* ts) +{ + const char* s=getstr(ts); + size_t i,n=ts->tsv.len; + printf("%c",'"'); + for (i=0; ik[i]; + switch (ttype(o)) + { + case LUA_TNIL: + printf("nil"); + break; + case LUA_TBOOLEAN: + printf(bvalue(o) ? "true" : "false"); + break; + case LUA_TNUMBER: + printf(LUA_NUMBER_FMT,nvalue(o)); + break; + case LUA_TSTRING: + PrintString(rawtsvalue(o)); + break; + default: /* cannot happen */ + printf("? type=%d",ttype(o)); + break; + } +} + +#define UPVALNAME(x) ((f->upvalues[x].name) ? getstr(f->upvalues[x].name) : "-") +#define MYK(x) (-1-(x)) + +static void PrintCode(const Proto* f) +{ + const Instruction* code=f->code; + int pc,n=f->sizecode; + for (pc=0; pc0) printf("[%d]\t",line); else printf("[-]\t"); + printf("%-9s\t",luaP_opnames[o]); + switch (getOpMode(o)) + { + case iABC: + printf("%d",a); + if (getBMode(o)!=OpArgN) printf(" %d",ISK(b) ? (MYK(INDEXK(b))) : b); + if (getCMode(o)!=OpArgN) printf(" %d",ISK(c) ? (MYK(INDEXK(c))) : c); + break; + case iABx: + printf("%d",a); + if (getBMode(o)==OpArgK) printf(" %d",MYK(bx)); + if (getBMode(o)==OpArgU) printf(" %d",bx); + break; + case iAsBx: + printf("%d %d",a,sbx); + break; + case iAx: + printf("%d",MYK(ax)); + break; + } + switch (o) + { + case OP_LOADK: + printf("\t; "); PrintConstant(f,bx); + break; + case OP_GETUPVAL: + case OP_SETUPVAL: + printf("\t; %s",UPVALNAME(b)); + break; + case OP_GETTABUP: + printf("\t; %s",UPVALNAME(b)); + if (ISK(c)) { printf(" "); PrintConstant(f,INDEXK(c)); } + break; + case OP_SETTABUP: + printf("\t; %s",UPVALNAME(a)); + if (ISK(b)) { printf(" "); PrintConstant(f,INDEXK(b)); } + if (ISK(c)) { printf(" "); PrintConstant(f,INDEXK(c)); } + break; + case OP_GETTABLE: + case OP_SELF: + if (ISK(c)) { printf("\t; "); PrintConstant(f,INDEXK(c)); } + break; + case OP_SETTABLE: + case OP_ADD: + case OP_SUB: + case OP_MUL: + case OP_DIV: + case OP_POW: + case OP_EQ: + case OP_LT: + case OP_LE: + if (ISK(b) || ISK(c)) + { + printf("\t; "); + if (ISK(b)) PrintConstant(f,INDEXK(b)); else printf("-"); + printf(" "); + if (ISK(c)) PrintConstant(f,INDEXK(c)); else printf("-"); + } + break; + case OP_JMP: + case OP_FORLOOP: + case OP_FORPREP: + case OP_TFORLOOP: + printf("\t; to %d",sbx+pc+2); + break; + case OP_CLOSURE: + printf("\t; %p",VOID(f->p[bx])); + break; + case OP_SETLIST: + if (c==0) printf("\t; %d",(int)code[++pc]); else printf("\t; %d",c); + break; + case OP_EXTRAARG: + printf("\t; "); PrintConstant(f,ax); + break; + default: + break; + } + printf("\n"); + } +} + +#define SS(x) ((x==1)?"":"s") +#define S(x) (int)(x),SS(x) + +static void PrintHeader(const Proto* f) +{ + const char* s=f->source ? getstr(f->source) : "=?"; + if (*s=='@' || *s=='=') + s++; + else if (*s==LUA_SIGNATURE[0]) + s="(bstring)"; + else + s="(string)"; + printf("\n%s <%s:%d,%d> (%d instruction%s at %p)\n", + (f->linedefined==0)?"main":"function",s, + f->linedefined,f->lastlinedefined, + S(f->sizecode),VOID(f)); + printf("%d%s param%s, %d slot%s, %d upvalue%s, ", + (int)(f->numparams),f->is_vararg?"+":"",SS(f->numparams), + S(f->maxstacksize),S(f->sizeupvalues)); + printf("%d local%s, %d constant%s, %d function%s\n", + S(f->sizelocvars),S(f->sizek),S(f->sizep)); +} + +static void PrintDebug(const Proto* f) +{ + int i,n; + n=f->sizek; + printf("constants (%d) for %p:\n",n,VOID(f)); + for (i=0; isizelocvars; + printf("locals (%d) for %p:\n",n,VOID(f)); + for (i=0; ilocvars[i].varname),f->locvars[i].startpc+1,f->locvars[i].endpc+1); + } + n=f->sizeupvalues; + printf("upvalues (%d) for %p:\n",n,VOID(f)); + for (i=0; iupvalues[i].instack,f->upvalues[i].idx); + } +} + +static void PrintFunction(const Proto* f, int full) +{ + int i,n=f->sizep; + PrintHeader(f); + PrintCode(f); + if (full) PrintDebug(f); + for (i=0; ip[i],full); +} diff --git a/radio/src/lua/src/luaconf.h b/radio/src/lua/src/luaconf.h new file mode 100644 index 000000000..2459e6933 --- /dev/null +++ b/radio/src/lua/src/luaconf.h @@ -0,0 +1,562 @@ +/* +** $Id: luaconf.h,v 1.176 2013/03/16 21:10:18 roberto Exp $ +** Configuration file for Lua +** See Copyright Notice in lua.h +*/ + + +#ifndef lconfig_h +#define lconfig_h + +#include +#include + +#define USE_FATFS + +/* +** ================================================================== +** Search for "@@" to find all configurable definitions. +** =================================================================== +*/ + + +/* +@@ LUA_ANSI controls the use of non-ansi features. +** CHANGE it (define it) if you want Lua to avoid the use of any +** non-ansi feature or library. +*/ +#if !defined(LUA_ANSI) && defined(__STRICT_ANSI__) +#define LUA_ANSI +#endif + + +#if !defined(LUA_ANSI) && defined(_WIN32) && !defined(_WIN32_WCE) +#define LUA_WIN /* enable goodies for regular Windows platforms */ +#endif + +#if defined(LUA_WIN) +#define LUA_DL_DLL +#define LUA_USE_AFORMAT /* assume 'printf' handles 'aA' specifiers */ +#endif + + + +#if defined(LUA_USE_LINUX) +#define LUA_USE_POSIX +#define LUA_USE_DLOPEN /* needs an extra library: -ldl */ +#define LUA_USE_READLINE /* needs some extra libraries */ +#define LUA_USE_STRTODHEX /* assume 'strtod' handles hex formats */ +#define LUA_USE_AFORMAT /* assume 'printf' handles 'aA' specifiers */ +#define LUA_USE_LONGLONG /* assume support for long long */ +#endif + +#if defined(LUA_USE_MACOSX) +#define LUA_USE_POSIX +#define LUA_USE_DLOPEN /* does not need -ldl */ +#define LUA_USE_READLINE /* needs an extra library: -lreadline */ +#define LUA_USE_STRTODHEX /* assume 'strtod' handles hex formats */ +#define LUA_USE_AFORMAT /* assume 'printf' handles 'aA' specifiers */ +#define LUA_USE_LONGLONG /* assume support for long long */ +#endif + + + +/* +@@ LUA_USE_POSIX includes all functionality listed as X/Open System +@* Interfaces Extension (XSI). +** CHANGE it (define it) if your system is XSI compatible. +*/ +#if defined(LUA_USE_POSIX) +#define LUA_USE_MKSTEMP +#define LUA_USE_ISATTY +#define LUA_USE_POPEN +#define LUA_USE_ULONGJMP +#define LUA_USE_GMTIME_R +#endif + + + +/* +@@ LUA_PATH_DEFAULT is the default path that Lua uses to look for +@* Lua libraries. +@@ LUA_CPATH_DEFAULT is the default path that Lua uses to look for +@* C libraries. +** CHANGE them if your machine has a non-conventional directory +** hierarchy or if you want to install your libraries in +** non-conventional directories. +*/ +#if defined(_WIN32) /* { */ +/* +** In Windows, any exclamation mark ('!') in the path is replaced by the +** path of the directory of the executable file of the current process. +*/ +#define LUA_LDIR "!\\lua\\" +#define LUA_CDIR "!\\" +#define LUA_PATH_DEFAULT \ + LUA_LDIR"?.lua;" LUA_LDIR"?\\init.lua;" \ + LUA_CDIR"?.lua;" LUA_CDIR"?\\init.lua;" ".\\?.lua" +#define LUA_CPATH_DEFAULT \ + LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll;" ".\\?.dll" + +#else /* }{ */ + +#define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/" +#define LUA_ROOT "/usr/local/" +#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR +#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR +#define LUA_PATH_DEFAULT \ + LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \ + LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" "./?.lua" +#define LUA_CPATH_DEFAULT \ + LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so" +#endif /* } */ + + +/* +@@ LUA_DIRSEP is the directory separator (for submodules). +** CHANGE it if your machine does not use "/" as the directory separator +** and is not Windows. (On Windows Lua automatically uses "\".) +*/ +#if defined(_WIN32) +#define LUA_DIRSEP "\\" +#else +#define LUA_DIRSEP "/" +#endif + + +/* +@@ LUA_ENV is the name of the variable that holds the current +@@ environment, used to access global names. +** CHANGE it if you do not like this name. +*/ +#define LUA_ENV "_ENV" + + +/* +@@ LUA_API is a mark for all core API functions. +@@ LUALIB_API is a mark for all auxiliary library functions. +@@ LUAMOD_API is a mark for all standard library opening functions. +** CHANGE them if you need to define those functions in some special way. +** For instance, if you want to create one Windows DLL with the core and +** the libraries, you may want to use the following definition (define +** LUA_BUILD_AS_DLL to get it). +*/ +#if defined(LUA_BUILD_AS_DLL) /* { */ + +#if defined(LUA_CORE) || defined(LUA_LIB) /* { */ +#define LUA_API __declspec(dllexport) +#else /* }{ */ +#define LUA_API __declspec(dllimport) +#endif /* } */ + +#else /* }{ */ + +#define LUA_API extern + +#endif /* } */ + + +/* more often than not the libs go together with the core */ +#define LUALIB_API LUA_API +#define LUAMOD_API LUALIB_API + + +/* +@@ LUAI_FUNC is a mark for all extern functions that are not to be +@* exported to outside modules. +@@ LUAI_DDEF and LUAI_DDEC are marks for all extern (const) variables +@* that are not to be exported to outside modules (LUAI_DDEF for +@* definitions and LUAI_DDEC for declarations). +** CHANGE them if you need to mark them in some special way. Elf/gcc +** (versions 3.2 and later) mark them as "hidden" to optimize access +** when Lua is compiled as a shared library. Not all elf targets support +** this attribute. Unfortunately, gcc does not offer a way to check +** whether the target offers that support, and those without support +** give a warning about it. To avoid these warnings, change to the +** default definition. +*/ +#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \ + defined(__ELF__) /* { */ +#define LUAI_FUNC __attribute__((visibility("hidden"))) extern +#define LUAI_DDEC LUAI_FUNC +#define LUAI_DDEF /* empty */ + +#else /* }{ */ +#define LUAI_FUNC extern +#define LUAI_DDEC extern +#define LUAI_DDEF /* empty */ +#endif /* } */ + + + +/* +@@ LUA_QL describes how error messages quote program elements. +** CHANGE it if you want a different appearance. +*/ +#define LUA_QL(x) "'" x "'" +#define LUA_QS LUA_QL("%s") + + +/* +@@ LUA_IDSIZE gives the maximum size for the description of the source +@* of a function in debug information. +** CHANGE it if you want a different size. +*/ +#define LUA_IDSIZE 60 + + +/* +@@ luai_writestring/luai_writeline define how 'print' prints its results. +** They are only used in libraries and the stand-alone program. (The #if +** avoids including 'stdio.h' everywhere.) +*/ + +/* +@@ luai_writestringerror defines how to print error messages. +** (A format string with one argument is enough for Lua...) +*/ + +#if defined(LUA_LIB) || defined(lua_c) +#include +#define luai_writestring(s,l) fwrite((s), sizeof(char), (l), stdout) +#define luai_writeline() (luai_writestring("\n", 1), fflush(stdout)) +#define luai_writestringerror(s,p) \ + (fprintf(stderr, (s), (p)), fflush(stderr)) +#else +#define luai_writestring(s,l) +#define luai_writeline() +#define luai_writestringerror(s,p) +#endif + + + +/* +@@ LUAI_MAXSHORTLEN is the maximum length for short strings, that is, +** strings that are internalized. (Cannot be smaller than reserved words +** or tags for metamethods, as these strings must be internalized; +** #("function") = 8, #("__newindex") = 10.) +*/ +#define LUAI_MAXSHORTLEN 40 + + + +/* +** {================================================================== +** Compatibility with previous versions +** =================================================================== +*/ + +/* +@@ LUA_COMPAT_ALL controls all compatibility options. +** You can define it to get all options, or change specific options +** to fit your specific needs. +*/ +#if defined(LUA_COMPAT_ALL) /* { */ + +/* +@@ LUA_COMPAT_UNPACK controls the presence of global 'unpack'. +** You can replace it with 'table.unpack'. +*/ +#define LUA_COMPAT_UNPACK + +/* +@@ LUA_COMPAT_LOADERS controls the presence of table 'package.loaders'. +** You can replace it with 'package.searchers'. +*/ +#define LUA_COMPAT_LOADERS + +/* +@@ macro 'lua_cpcall' emulates deprecated function lua_cpcall. +** You can call your C function directly (with light C functions). +*/ +#define lua_cpcall(L,f,u) \ + (lua_pushcfunction(L, (f)), \ + lua_pushlightuserdata(L,(u)), \ + lua_pcall(L,1,0,0)) + + +/* +@@ LUA_COMPAT_LOG10 defines the function 'log10' in the math library. +** You can rewrite 'log10(x)' as 'log(x, 10)'. +*/ +#define LUA_COMPAT_LOG10 + +/* +@@ LUA_COMPAT_LOADSTRING defines the function 'loadstring' in the base +** library. You can rewrite 'loadstring(s)' as 'load(s)'. +*/ +#define LUA_COMPAT_LOADSTRING + +/* +@@ LUA_COMPAT_MAXN defines the function 'maxn' in the table library. +*/ +#define LUA_COMPAT_MAXN + +/* +@@ The following macros supply trivial compatibility for some +** changes in the API. The macros themselves document how to +** change your code to avoid using them. +*/ +#define lua_strlen(L,i) lua_rawlen(L, (i)) + +#define lua_objlen(L,i) lua_rawlen(L, (i)) + +#define lua_equal(L,idx1,idx2) lua_compare(L,(idx1),(idx2),LUA_OPEQ) +#define lua_lessthan(L,idx1,idx2) lua_compare(L,(idx1),(idx2),LUA_OPLT) + +/* +@@ LUA_COMPAT_MODULE controls compatibility with previous +** module functions 'module' (Lua) and 'luaL_register' (C). +*/ +#define LUA_COMPAT_MODULE + +#endif /* } */ + +/* }================================================================== */ + + + +/* +@@ LUAI_BITSINT defines the number of bits in an int. +** CHANGE here if Lua cannot automatically detect the number of bits of +** your machine. Probably you do not need to change this. +*/ +/* avoid overflows in comparison */ +#if INT_MAX-20 < 32760 /* { */ +#define LUAI_BITSINT 16 +#elif INT_MAX > 2147483640L /* }{ */ +/* int has at least 32 bits */ +#define LUAI_BITSINT 32 +#else /* }{ */ +#error "you must define LUA_BITSINT with number of bits in an integer" +#endif /* } */ + + +/* +@@ LUA_INT32 is an signed integer with exactly 32 bits. +@@ LUAI_UMEM is an unsigned integer big enough to count the total +@* memory used by Lua. +@@ LUAI_MEM is a signed integer big enough to count the total memory +@* used by Lua. +** CHANGE here if for some weird reason the default definitions are not +** good enough for your machine. Probably you do not need to change +** this. +*/ +#if LUAI_BITSINT >= 32 /* { */ +#define LUA_INT32 int +#define LUAI_UMEM size_t +#define LUAI_MEM ptrdiff_t +#else /* }{ */ +/* 16-bit ints */ +#define LUA_INT32 long +#define LUAI_UMEM unsigned long +#define LUAI_MEM long +#endif /* } */ + + +/* +@@ LUAI_MAXSTACK limits the size of the Lua stack. +** CHANGE it if you need a different limit. This limit is arbitrary; +** its only purpose is to stop Lua to consume unlimited stack +** space (and to reserve some numbers for pseudo-indices). +*/ +#if LUAI_BITSINT >= 32 +#define LUAI_MAXSTACK 1000000 +#else +#define LUAI_MAXSTACK 15000 +#endif + +/* reserve some space for error handling */ +#define LUAI_FIRSTPSEUDOIDX (-LUAI_MAXSTACK - 1000) + + + + +/* +@@ LUAL_BUFFERSIZE is the buffer size used by the lauxlib buffer system. +** CHANGE it if it uses too much C-stack space. +*/ +#if defined(USE_FATFS) +#define LUAL_BUFFERSIZE 512 +#else +#define LUAL_BUFFERSIZE BUFSIZ +#endif + + + + +/* +** {================================================================== +@@ LUA_NUMBER is the type of numbers in Lua. +** CHANGE the following definitions only if you want to build Lua +** with a number type different from double. You may also need to +** change lua_number2int & lua_number2integer. +** =================================================================== +*/ + +#define LUA_NUMBER_DOUBLE +#define LUA_NUMBER double + +/* +@@ LUAI_UACNUMBER is the result of an 'usual argument conversion' +@* over a number. +*/ +#define LUAI_UACNUMBER double + + +/* +@@ LUA_NUMBER_SCAN is the format for reading numbers. +@@ LUA_NUMBER_FMT is the format for writing numbers. +@@ lua_number2str converts a number to a string. +@@ LUAI_MAXNUMBER2STR is maximum size of previous conversion. +*/ +#define LUA_NUMBER_SCAN "%lf" +#define LUA_NUMBER_FMT "%.14g" +#define lua_number2str(s,n) sprintf((s), LUA_NUMBER_FMT, (n)) +#define LUAI_MAXNUMBER2STR 32 /* 16 digits, sign, point, and \0 */ + + +/* +@@ l_mathop allows the addition of an 'l' or 'f' to all math operations +*/ +#define l_mathop(x) (x) + + +/* +@@ lua_str2number converts a decimal numeric string to a number. +@@ lua_strx2number converts an hexadecimal numeric string to a number. +** In C99, 'strtod' does both conversions. C89, however, has no function +** to convert floating hexadecimal strings to numbers. For these +** systems, you can leave 'lua_strx2number' undefined and Lua will +** provide its own implementation. +*/ +#define lua_str2number(s,p) strtod((s), (p)) + +#if defined(LUA_USE_STRTODHEX) +#define lua_strx2number(s,p) strtod((s), (p)) +#endif + + +/* +@@ The luai_num* macros define the primitive operations over numbers. +*/ + +/* the following operations need the math library */ +//#if defined(lobject_c) || defined(lvm_c) +#include +#define luai_nummod(L,a,b) ((a) - l_mathop(floor)((a)/(b))*(b)) +#define luai_numpow(L,a,b) (l_mathop(pow)(a,b)) +//#endif + +/* these are quite standard operations */ +// #if defined(LUA_CORE) +#define luai_numadd(L,a,b) ((a)+(b)) +#define luai_numsub(L,a,b) ((a)-(b)) +#define luai_nummul(L,a,b) ((a)*(b)) +#define luai_numdiv(L,a,b) ((a)/(b)) +#define luai_numunm(L,a) (-(a)) +#define luai_numeq(a,b) ((a)==(b)) +#define luai_numlt(L,a,b) ((a)<(b)) +#define luai_numle(L,a,b) ((a)<=(b)) +#define luai_numisnan(L,a) (!luai_numeq((a), (a))) +// #endif + + + +/* +@@ LUA_INTEGER is the integral type used by lua_pushinteger/lua_tointeger. +** CHANGE that if ptrdiff_t is not adequate on your machine. (On most +** machines, ptrdiff_t gives a good choice between int or long.) +*/ +#define LUA_INTEGER int + +/* +@@ LUA_UNSIGNED is the integral type used by lua_pushunsigned/lua_tounsigned. +** It must have at least 32 bits. +*/ +#define LUA_UNSIGNED unsigned LUA_INT32 + + + +/* +** Some tricks with doubles +*/ + +#if defined(LUA_NUMBER_DOUBLE) && !defined(LUA_ANSI) /* { */ +/* +** The next definitions activate some tricks to speed up the +** conversion from doubles to integer types, mainly to LUA_UNSIGNED. +** +@@ LUA_MSASMTRICK uses Microsoft assembler to avoid clashes with a +** DirectX idiosyncrasy. +** +@@ LUA_IEEE754TRICK uses a trick that should work on any machine +** using IEEE754 with a 32-bit integer type. +** +@@ LUA_IEEELL extends the trick to LUA_INTEGER; should only be +** defined when LUA_INTEGER is a 32-bit integer. +** +@@ LUA_IEEEENDIAN is the endianness of doubles in your machine +** (0 for little endian, 1 for big endian); if not defined, Lua will +** check it dynamically for LUA_IEEE754TRICK (but not for LUA_NANTRICK). +** +@@ LUA_NANTRICK controls the use of a trick to pack all types into +** a single double value, using NaN values to represent non-number +** values. The trick only works on 32-bit machines (ints and pointers +** are 32-bit values) with numbers represented as IEEE 754-2008 doubles +** with conventional endianess (12345678 or 87654321), in CPUs that do +** not produce signaling NaN values (all NaNs are quiet). +*/ + +/* Microsoft compiler on a Pentium (32 bit) ? */ +#if defined(LUA_WIN) && defined(_MSC_VER) && defined(_M_IX86) /* { */ + +#define LUA_MSASMTRICK +#define LUA_IEEEENDIAN 0 +#define LUA_NANTRICK + + +/* pentium 32 bits? */ +#elif defined(__i386__) || defined(__i386) || defined(__X86__) /* }{ */ + +#define LUA_IEEE754TRICK +#define LUA_IEEELL +#define LUA_IEEEENDIAN 0 +#define LUA_NANTRICK + +/* pentium 64 bits? */ +#elif defined(__x86_64) /* }{ */ + +#define LUA_IEEE754TRICK +#define LUA_IEEEENDIAN 0 + +#elif defined(__POWERPC__) || defined(__ppc__) /* }{ */ + +#define LUA_IEEE754TRICK +#define LUA_IEEEENDIAN 1 + +#else /* }{ */ + +/* assume IEEE754 and a 32-bit integer type */ +#define LUA_IEEE754TRICK + +#endif /* } */ + +#endif /* } */ + +/* }================================================================== */ + + + + +/* =================================================================== */ + +/* +** Local configuration. You can use this space to add your redefinitions +** without modifying the main part of the file. +*/ + + + +#endif + diff --git a/radio/src/lua/src/lualib.h b/radio/src/lua/src/lualib.h new file mode 100644 index 000000000..9fd126bf7 --- /dev/null +++ b/radio/src/lua/src/lualib.h @@ -0,0 +1,55 @@ +/* +** $Id: lualib.h,v 1.43 2011/12/08 12:11:37 roberto Exp $ +** Lua standard libraries +** See Copyright Notice in lua.h +*/ + + +#ifndef lualib_h +#define lualib_h + +#include "lua.h" + + + +LUAMOD_API int (luaopen_base) (lua_State *L); + +#define LUA_COLIBNAME "coroutine" +LUAMOD_API int (luaopen_coroutine) (lua_State *L); + +#define LUA_TABLIBNAME "table" +LUAMOD_API int (luaopen_table) (lua_State *L); + +#define LUA_IOLIBNAME "io" +LUAMOD_API int (luaopen_io) (lua_State *L); + +#define LUA_OSLIBNAME "os" +LUAMOD_API int (luaopen_os) (lua_State *L); + +#define LUA_STRLIBNAME "string" +LUAMOD_API int (luaopen_string) (lua_State *L); + +#define LUA_BITLIBNAME "bit32" +LUAMOD_API int (luaopen_bit32) (lua_State *L); + +#define LUA_MATHLIBNAME "math" +LUAMOD_API int (luaopen_math) (lua_State *L); + +#define LUA_DBLIBNAME "debug" +LUAMOD_API int (luaopen_debug) (lua_State *L); + +#define LUA_LOADLIBNAME "package" +LUAMOD_API int (luaopen_package) (lua_State *L); + + +/* open all previous libraries */ +LUALIB_API void (luaL_openlibs) (lua_State *L); + + + +#if !defined(lua_assert) +#define lua_assert(x) ((void)0) +#endif + + +#endif diff --git a/radio/src/lua/src/lundump.c b/radio/src/lua/src/lundump.c new file mode 100644 index 000000000..54de011a4 --- /dev/null +++ b/radio/src/lua/src/lundump.c @@ -0,0 +1,258 @@ +/* +** $Id: lundump.c,v 2.22 2012/05/08 13:53:33 roberto Exp $ +** load precompiled Lua chunks +** See Copyright Notice in lua.h +*/ + +#include + +#define lundump_c +#define LUA_CORE + +#include "lua.h" + +#include "ldebug.h" +#include "ldo.h" +#include "lfunc.h" +#include "lmem.h" +#include "lobject.h" +#include "lstring.h" +#include "lundump.h" +#include "lzio.h" + +typedef struct { + lua_State* L; + ZIO* Z; + Mbuffer* b; + const char* name; +} LoadState; + +static l_noret error(LoadState* S, const char* why) +{ + luaO_pushfstring(S->L,"%s: %s precompiled chunk",S->name,why); + luaD_throw(S->L,LUA_ERRSYNTAX); +} + +#define LoadMem(S,b,n,size) LoadBlock(S,b,(n)*(size)) +#define LoadByte(S) (lu_byte)LoadChar(S) +#define LoadVar(S,x) LoadMem(S,&x,1,sizeof(x)) +#define LoadVector(S,b,n,size) LoadMem(S,b,n,size) + +#if !defined(luai_verifycode) +#define luai_verifycode(L,b,f) /* empty */ +#endif + +static void LoadBlock(LoadState* S, void* b, size_t size) +{ + if (luaZ_read(S->Z,b,size)!=0) error(S,"truncated"); +} + +static int LoadChar(LoadState* S) +{ + char x; + LoadVar(S,x); + return x; +} + +static int LoadInt(LoadState* S) +{ + int x; + LoadVar(S,x); + if (x<0) error(S,"corrupted"); + return x; +} + +static lua_Number LoadNumber(LoadState* S) +{ + lua_Number x; + LoadVar(S,x); + return x; +} + +static TString* LoadString(LoadState* S) +{ + size_t size; + LoadVar(S,size); + if (size==0) + return NULL; + else + { + char* s=luaZ_openspace(S->L,S->b,size); + LoadBlock(S,s,size*sizeof(char)); + return luaS_newlstr(S->L,s,size-1); /* remove trailing '\0' */ + } +} + +static void LoadCode(LoadState* S, Proto* f) +{ + int n=LoadInt(S); + f->code=luaM_newvector(S->L,n,Instruction); + f->sizecode=n; + LoadVector(S,f->code,n,sizeof(Instruction)); +} + +static void LoadFunction(LoadState* S, Proto* f); + +static void LoadConstants(LoadState* S, Proto* f) +{ + int i,n; + n=LoadInt(S); + f->k=luaM_newvector(S->L,n,TValue); + f->sizek=n; + for (i=0; ik[i]); + for (i=0; ik[i]; + int t=LoadChar(S); + switch (t) + { + case LUA_TNIL: + setnilvalue(o); + break; + case LUA_TBOOLEAN: + setbvalue(o,LoadChar(S)); + break; + case LUA_TNUMBER: + setnvalue(o,LoadNumber(S)); + break; + case LUA_TSTRING: + setsvalue2n(S->L,o,LoadString(S)); + break; + default: lua_assert(0); + } + } + n=LoadInt(S); + f->p=luaM_newvector(S->L,n,Proto*); + f->sizep=n; + for (i=0; ip[i]=NULL; + for (i=0; ip[i]=luaF_newproto(S->L); + LoadFunction(S,f->p[i]); + } +} + +static void LoadUpvalues(LoadState* S, Proto* f) +{ + int i,n; + n=LoadInt(S); + f->upvalues=luaM_newvector(S->L,n,Upvaldesc); + f->sizeupvalues=n; + for (i=0; iupvalues[i].name=NULL; + for (i=0; iupvalues[i].instack=LoadByte(S); + f->upvalues[i].idx=LoadByte(S); + } +} + +static void LoadDebug(LoadState* S, Proto* f) +{ + int i,n; + f->source=LoadString(S); + n=LoadInt(S); + f->lineinfo=luaM_newvector(S->L,n,int); + f->sizelineinfo=n; + LoadVector(S,f->lineinfo,n,sizeof(int)); + n=LoadInt(S); + f->locvars=luaM_newvector(S->L,n,LocVar); + f->sizelocvars=n; + for (i=0; ilocvars[i].varname=NULL; + for (i=0; ilocvars[i].varname=LoadString(S); + f->locvars[i].startpc=LoadInt(S); + f->locvars[i].endpc=LoadInt(S); + } + n=LoadInt(S); + for (i=0; iupvalues[i].name=LoadString(S); +} + +static void LoadFunction(LoadState* S, Proto* f) +{ + f->linedefined=LoadInt(S); + f->lastlinedefined=LoadInt(S); + f->numparams=LoadByte(S); + f->is_vararg=LoadByte(S); + f->maxstacksize=LoadByte(S); + LoadCode(S,f); + LoadConstants(S,f); + LoadUpvalues(S,f); + LoadDebug(S,f); +} + +/* the code below must be consistent with the code in luaU_header */ +#define N0 LUAC_HEADERSIZE +#define N1 (sizeof(LUA_SIGNATURE)-sizeof(char)) +#define N2 N1+2 +#define N3 N2+6 + +static void LoadHeader(LoadState* S) +{ + lu_byte h[LUAC_HEADERSIZE]; + lu_byte s[LUAC_HEADERSIZE]; + luaU_header(h); + memcpy(s,h,sizeof(char)); /* first char already read */ + LoadBlock(S,s+sizeof(char),LUAC_HEADERSIZE-sizeof(char)); + if (memcmp(h,s,N0)==0) return; + if (memcmp(h,s,N1)!=0) error(S,"not a"); + if (memcmp(h,s,N2)!=0) error(S,"version mismatch in"); + if (memcmp(h,s,N3)!=0) error(S,"incompatible"); else error(S,"corrupted"); +} + +/* +** load precompiled chunk +*/ +Closure* luaU_undump (lua_State* L, ZIO* Z, Mbuffer* buff, const char* name) +{ + LoadState S; + Closure* cl; + if (*name=='@' || *name=='=') + S.name=name+1; + else if (*name==LUA_SIGNATURE[0]) + S.name="binary string"; + else + S.name=name; + S.L=L; + S.Z=Z; + S.b=buff; + LoadHeader(&S); + cl=luaF_newLclosure(L,1); + setclLvalue(L,L->top,cl); incr_top(L); + cl->l.p=luaF_newproto(L); + LoadFunction(&S,cl->l.p); + if (cl->l.p->sizeupvalues != 1) + { + Proto* p=cl->l.p; + cl=luaF_newLclosure(L,cl->l.p->sizeupvalues); + cl->l.p=p; + setclLvalue(L,L->top-1,cl); + } + luai_verifycode(L,buff,cl->l.p); + return cl; +} + +#define MYINT(s) (s[0]-'0') +#define VERSION MYINT(LUA_VERSION_MAJOR)*16+MYINT(LUA_VERSION_MINOR) +#define FORMAT 0 /* this is the official format */ + +/* +* make header for precompiled chunks +* if you change the code below be sure to update LoadHeader and FORMAT above +* and LUAC_HEADERSIZE in lundump.h +*/ +void luaU_header (lu_byte* h) +{ + int x=1; + memcpy(h,LUA_SIGNATURE,sizeof(LUA_SIGNATURE)-sizeof(char)); + h+=sizeof(LUA_SIGNATURE)-sizeof(char); + *h++=cast_byte(VERSION); + *h++=cast_byte(FORMAT); + *h++=cast_byte(*(char*)&x); /* endianness */ + *h++=cast_byte(sizeof(int)); + *h++=cast_byte(sizeof(size_t)); + *h++=cast_byte(sizeof(Instruction)); + *h++=cast_byte(sizeof(lua_Number)); + *h++=cast_byte(((lua_Number)0.5)==0); /* is lua_Number integral? */ + memcpy(h,LUAC_TAIL,sizeof(LUAC_TAIL)-sizeof(char)); +} diff --git a/radio/src/lua/src/lundump.h b/radio/src/lua/src/lundump.h new file mode 100644 index 000000000..2b8accecb --- /dev/null +++ b/radio/src/lua/src/lundump.h @@ -0,0 +1,28 @@ +/* +** $Id: lundump.h,v 1.39 2012/05/08 13:53:33 roberto Exp $ +** load precompiled Lua chunks +** See Copyright Notice in lua.h +*/ + +#ifndef lundump_h +#define lundump_h + +#include "lobject.h" +#include "lzio.h" + +/* load one chunk; from lundump.c */ +LUAI_FUNC Closure* luaU_undump (lua_State* L, ZIO* Z, Mbuffer* buff, const char* name); + +/* make header; from lundump.c */ +LUAI_FUNC void luaU_header (lu_byte* h); + +/* dump one chunk; from ldump.c */ +LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip); + +/* data to catch conversion errors */ +#define LUAC_TAIL "\x19\x93\r\n\x1a\n" + +/* size in bytes of header of binary files */ +#define LUAC_HEADERSIZE (sizeof(LUA_SIGNATURE)-sizeof(char)+2+6+sizeof(LUAC_TAIL)-sizeof(char)) + +#endif diff --git a/radio/src/lua/src/lvm.c b/radio/src/lua/src/lvm.c new file mode 100644 index 000000000..657d5c456 --- /dev/null +++ b/radio/src/lua/src/lvm.c @@ -0,0 +1,867 @@ +/* +** $Id: lvm.c,v 2.155 2013/03/16 21:10:18 roberto Exp $ +** Lua virtual machine +** See Copyright Notice in lua.h +*/ + + +#include +#include +#include + +#define lvm_c +#define LUA_CORE + +#include "lua.h" + +#include "ldebug.h" +#include "ldo.h" +#include "lfunc.h" +#include "lgc.h" +#include "lobject.h" +#include "lopcodes.h" +#include "lstate.h" +#include "lstring.h" +#include "ltable.h" +#include "ltm.h" +#include "lvm.h" + + + +/* limit for table tag-method chains (to avoid loops) */ +#define MAXTAGLOOP 100 + + +const TValue *luaV_tonumber (const TValue *obj, TValue *n) { + lua_Number num; + if (ttisnumber(obj)) return obj; + if (ttisstring(obj) && luaO_str2d(svalue(obj), tsvalue(obj)->len, &num)) { + setnvalue(n, num); + return n; + } + else + return NULL; +} + + +int luaV_tostring (lua_State *L, StkId obj) { + if (!ttisnumber(obj)) + return 0; + else { + char s[LUAI_MAXNUMBER2STR]; + lua_Number n = nvalue(obj); + int l = lua_number2str(s, n); + setsvalue2s(L, obj, luaS_newlstr(L, s, l)); + return 1; + } +} + + +static void traceexec (lua_State *L) { + CallInfo *ci = L->ci; + lu_byte mask = L->hookmask; + int counthook = ((mask & LUA_MASKCOUNT) && L->hookcount == 0); + if (counthook) + resethookcount(L); /* reset count */ + if (ci->callstatus & CIST_HOOKYIELD) { /* called hook last time? */ + ci->callstatus &= ~CIST_HOOKYIELD; /* erase mark */ + return; /* do not call hook again (VM yielded, so it did not move) */ + } + if (counthook) + luaD_hook(L, LUA_HOOKCOUNT, -1); /* call count hook */ + if (mask & LUA_MASKLINE) { + Proto *p = ci_func(ci)->p; + int npc = pcRel(ci->u.l.savedpc, p); + int newline = getfuncline(p, npc); + if (npc == 0 || /* call linehook when enter a new function, */ + ci->u.l.savedpc <= L->oldpc || /* when jump back (loop), or when */ + newline != getfuncline(p, pcRel(L->oldpc, p))) /* enter a new line */ + luaD_hook(L, LUA_HOOKLINE, newline); /* call line hook */ + } + L->oldpc = ci->u.l.savedpc; + if (L->status == LUA_YIELD) { /* did hook yield? */ + if (counthook) + L->hookcount = 1; /* undo decrement to zero */ + ci->u.l.savedpc--; /* undo increment (resume will increment it again) */ + ci->callstatus |= CIST_HOOKYIELD; /* mark that it yielded */ + ci->func = L->top - 1; /* protect stack below results */ + luaD_throw(L, LUA_YIELD); + } +} + + +static void callTM (lua_State *L, const TValue *f, const TValue *p1, + const TValue *p2, TValue *p3, int hasres) { + ptrdiff_t result = savestack(L, p3); + setobj2s(L, L->top++, f); /* push function */ + setobj2s(L, L->top++, p1); /* 1st argument */ + setobj2s(L, L->top++, p2); /* 2nd argument */ + if (!hasres) /* no result? 'p3' is third argument */ + setobj2s(L, L->top++, p3); /* 3rd argument */ + /* metamethod may yield only when called from Lua code */ + luaD_call(L, L->top - (4 - hasres), hasres, isLua(L->ci)); + if (hasres) { /* if has result, move it to its place */ + p3 = restorestack(L, result); + setobjs2s(L, p3, --L->top); + } +} + + +void luaV_gettable (lua_State *L, const TValue *t, TValue *key, StkId val) { + int loop; + for (loop = 0; loop < MAXTAGLOOP; loop++) { + const TValue *tm; + if (ttistable(t)) { /* `t' is a table? */ + Table *h = hvalue(t); + const TValue *res = luaH_get(h, key); /* do a primitive get */ + if (!ttisnil(res) || /* result is not nil? */ + (tm = fasttm(L, h->metatable, TM_INDEX)) == NULL) { /* or no TM? */ + setobj2s(L, val, res); + return; + } + /* else will try the tag method */ + } + else if (ttisnil(tm = luaT_gettmbyobj(L, t, TM_INDEX))) + luaG_typeerror(L, t, "index"); + if (ttisfunction(tm)) { + callTM(L, tm, t, key, val, 1); + return; + } + t = tm; /* else repeat with 'tm' */ + } + luaG_runerror(L, "loop in gettable"); +} + + +void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) { + int loop; + for (loop = 0; loop < MAXTAGLOOP; loop++) { + const TValue *tm; + if (ttistable(t)) { /* `t' is a table? */ + Table *h = hvalue(t); + TValue *oldval = cast(TValue *, luaH_get(h, key)); + /* if previous value is not nil, there must be a previous entry + in the table; moreover, a metamethod has no relevance */ + if (!ttisnil(oldval) || + /* previous value is nil; must check the metamethod */ + ((tm = fasttm(L, h->metatable, TM_NEWINDEX)) == NULL && + /* no metamethod; is there a previous entry in the table? */ + (oldval != luaO_nilobject || + /* no previous entry; must create one. (The next test is + always true; we only need the assignment.) */ + (oldval = luaH_newkey(L, h, key), 1)))) { + /* no metamethod and (now) there is an entry with given key */ + setobj2t(L, oldval, val); /* assign new value to that entry */ + invalidateTMcache(h); + luaC_barrierback(L, obj2gco(h), val); + return; + } + /* else will try the metamethod */ + } + else /* not a table; check metamethod */ + if (ttisnil(tm = luaT_gettmbyobj(L, t, TM_NEWINDEX))) + luaG_typeerror(L, t, "index"); + /* there is a metamethod */ + if (ttisfunction(tm)) { + callTM(L, tm, t, key, val, 0); + return; + } + t = tm; /* else repeat with 'tm' */ + } + luaG_runerror(L, "loop in settable"); +} + + +static int call_binTM (lua_State *L, const TValue *p1, const TValue *p2, + StkId res, TMS event) { + const TValue *tm = luaT_gettmbyobj(L, p1, event); /* try first operand */ + if (ttisnil(tm)) + tm = luaT_gettmbyobj(L, p2, event); /* try second operand */ + if (ttisnil(tm)) return 0; + callTM(L, tm, p1, p2, res, 1); + return 1; +} + + +static const TValue *get_equalTM (lua_State *L, Table *mt1, Table *mt2, + TMS event) { + const TValue *tm1 = fasttm(L, mt1, event); + const TValue *tm2; + if (tm1 == NULL) return NULL; /* no metamethod */ + if (mt1 == mt2) return tm1; /* same metatables => same metamethods */ + tm2 = fasttm(L, mt2, event); + if (tm2 == NULL) return NULL; /* no metamethod */ + if (luaV_rawequalobj(tm1, tm2)) /* same metamethods? */ + return tm1; + return NULL; +} + + +static int call_orderTM (lua_State *L, const TValue *p1, const TValue *p2, + TMS event) { + if (!call_binTM(L, p1, p2, L->top, event)) + return -1; /* no metamethod */ + else + return !l_isfalse(L->top); +} + + +static int l_strcmp (const TString *ls, const TString *rs) { + const char *l = getstr(ls); + size_t ll = ls->tsv.len; + const char *r = getstr(rs); + size_t lr = rs->tsv.len; + for (;;) { + int temp = strcoll(l, r); + if (temp != 0) return temp; + else { /* strings are equal up to a `\0' */ + size_t len = strlen(l); /* index of first `\0' in both strings */ + if (len == lr) /* r is finished? */ + return (len == ll) ? 0 : 1; + else if (len == ll) /* l is finished? */ + return -1; /* l is smaller than r (because r is not finished) */ + /* both strings longer than `len'; go on comparing (after the `\0') */ + len++; + l += len; ll -= len; r += len; lr -= len; + } + } +} + + +int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r) { + int res; + if (ttisnumber(l) && ttisnumber(r)) + return luai_numlt(L, nvalue(l), nvalue(r)); + else if (ttisstring(l) && ttisstring(r)) + return l_strcmp(rawtsvalue(l), rawtsvalue(r)) < 0; + else if ((res = call_orderTM(L, l, r, TM_LT)) < 0) + luaG_ordererror(L, l, r); + return res; +} + + +int luaV_lessequal (lua_State *L, const TValue *l, const TValue *r) { + int res; + if (ttisnumber(l) && ttisnumber(r)) + return luai_numle(L, nvalue(l), nvalue(r)); + else if (ttisstring(l) && ttisstring(r)) + return l_strcmp(rawtsvalue(l), rawtsvalue(r)) <= 0; + else if ((res = call_orderTM(L, l, r, TM_LE)) >= 0) /* first try `le' */ + return res; + else if ((res = call_orderTM(L, r, l, TM_LT)) < 0) /* else try `lt' */ + luaG_ordererror(L, l, r); + return !res; +} + + +/* +** equality of Lua values. L == NULL means raw equality (no metamethods) +*/ +int luaV_equalobj_ (lua_State *L, const TValue *t1, const TValue *t2) { + const TValue *tm; + lua_assert(ttisequal(t1, t2)); + switch (ttype(t1)) { + case LUA_TNIL: return 1; + case LUA_TNUMBER: return luai_numeq(nvalue(t1), nvalue(t2)); + case LUA_TBOOLEAN: return bvalue(t1) == bvalue(t2); /* true must be 1 !! */ + case LUA_TLIGHTUSERDATA: return pvalue(t1) == pvalue(t2); + case LUA_TLCF: return fvalue(t1) == fvalue(t2); + case LUA_TSHRSTR: return eqshrstr(rawtsvalue(t1), rawtsvalue(t2)); + case LUA_TLNGSTR: return luaS_eqlngstr(rawtsvalue(t1), rawtsvalue(t2)); + case LUA_TUSERDATA: { + if (uvalue(t1) == uvalue(t2)) return 1; + else if (L == NULL) return 0; + tm = get_equalTM(L, uvalue(t1)->metatable, uvalue(t2)->metatable, TM_EQ); + break; /* will try TM */ + } + case LUA_TTABLE: { + if (hvalue(t1) == hvalue(t2)) return 1; + else if (L == NULL) return 0; + tm = get_equalTM(L, hvalue(t1)->metatable, hvalue(t2)->metatable, TM_EQ); + break; /* will try TM */ + } + default: + lua_assert(iscollectable(t1)); + return gcvalue(t1) == gcvalue(t2); + } + if (tm == NULL) return 0; /* no TM? */ + callTM(L, tm, t1, t2, L->top, 1); /* call TM */ + return !l_isfalse(L->top); +} + + +void luaV_concat (lua_State *L, int total) { + lua_assert(total >= 2); + do { + StkId top = L->top; + int n = 2; /* number of elements handled in this pass (at least 2) */ + if (!(ttisstring(top-2) || ttisnumber(top-2)) || !tostring(L, top-1)) { + if (!call_binTM(L, top-2, top-1, top-2, TM_CONCAT)) + luaG_concaterror(L, top-2, top-1); + } + else if (tsvalue(top-1)->len == 0) /* second operand is empty? */ + (void)tostring(L, top - 2); /* result is first operand */ + else if (ttisstring(top-2) && tsvalue(top-2)->len == 0) { + setobjs2s(L, top - 2, top - 1); /* result is second op. */ + } + else { + /* at least two non-empty string values; get as many as possible */ + size_t tl = tsvalue(top-1)->len; + char *buffer; + int i; + /* collect total length */ + for (i = 1; i < total && tostring(L, top-i-1); i++) { + size_t l = tsvalue(top-i-1)->len; + if (l >= (MAX_SIZET/sizeof(char)) - tl) + luaG_runerror(L, "string length overflow"); + tl += l; + } + buffer = luaZ_openspace(L, &G(L)->buff, tl); + tl = 0; + n = i; + do { /* concat all strings */ + size_t l = tsvalue(top-i)->len; + memcpy(buffer+tl, svalue(top-i), l * sizeof(char)); + tl += l; + } while (--i > 0); + setsvalue2s(L, top-n, luaS_newlstr(L, buffer, tl)); + } + total -= n-1; /* got 'n' strings to create 1 new */ + L->top -= n-1; /* popped 'n' strings and pushed one */ + } while (total > 1); /* repeat until only 1 result left */ +} + + +void luaV_objlen (lua_State *L, StkId ra, const TValue *rb) { + const TValue *tm; + switch (ttypenv(rb)) { + case LUA_TTABLE: { + Table *h = hvalue(rb); + tm = fasttm(L, h->metatable, TM_LEN); + if (tm) break; /* metamethod? break switch to call it */ + setnvalue(ra, cast_num(luaH_getn(h))); /* else primitive len */ + return; + } + case LUA_TSTRING: { + setnvalue(ra, cast_num(tsvalue(rb)->len)); + return; + } + default: { /* try metamethod */ + tm = luaT_gettmbyobj(L, rb, TM_LEN); + if (ttisnil(tm)) /* no metamethod? */ + luaG_typeerror(L, rb, "get length of"); + break; + } + } + callTM(L, tm, rb, rb, ra, 1); +} + + +void luaV_arith (lua_State *L, StkId ra, const TValue *rb, + const TValue *rc, TMS op) { + TValue tempb, tempc; + const TValue *b, *c; + if ((b = luaV_tonumber(rb, &tempb)) != NULL && + (c = luaV_tonumber(rc, &tempc)) != NULL) { + lua_Number res = luaO_arith(op - TM_ADD + LUA_OPADD, nvalue(b), nvalue(c)); + setnvalue(ra, res); + } + else if (!call_binTM(L, rb, rc, ra, op)) + luaG_aritherror(L, rb, rc); +} + + +/* +** check whether cached closure in prototype 'p' may be reused, that is, +** whether there is a cached closure with the same upvalues needed by +** new closure to be created. +*/ +static Closure *getcached (Proto *p, UpVal **encup, StkId base) { + Closure *c = p->cache; + if (c != NULL) { /* is there a cached closure? */ + int nup = p->sizeupvalues; + Upvaldesc *uv = p->upvalues; + int i; + for (i = 0; i < nup; i++) { /* check whether it has right upvalues */ + TValue *v = uv[i].instack ? base + uv[i].idx : encup[uv[i].idx]->v; + if (c->l.upvals[i]->v != v) + return NULL; /* wrong upvalue; cannot reuse closure */ + } + } + return c; /* return cached closure (or NULL if no cached closure) */ +} + + +/* +** create a new Lua closure, push it in the stack, and initialize +** its upvalues. Note that the call to 'luaC_barrierproto' must come +** before the assignment to 'p->cache', as the function needs the +** original value of that field. +*/ +static void pushclosure (lua_State *L, Proto *p, UpVal **encup, StkId base, + StkId ra) { + int nup = p->sizeupvalues; + Upvaldesc *uv = p->upvalues; + int i; + Closure *ncl = luaF_newLclosure(L, nup); + ncl->l.p = p; + setclLvalue(L, ra, ncl); /* anchor new closure in stack */ + for (i = 0; i < nup; i++) { /* fill in its upvalues */ + if (uv[i].instack) /* upvalue refers to local variable? */ + ncl->l.upvals[i] = luaF_findupval(L, base + uv[i].idx); + else /* get upvalue from enclosing function */ + ncl->l.upvals[i] = encup[uv[i].idx]; + } + luaC_barrierproto(L, p, ncl); + p->cache = ncl; /* save it on cache for reuse */ +} + + +/* +** finish execution of an opcode interrupted by an yield +*/ +void luaV_finishOp (lua_State *L) { + CallInfo *ci = L->ci; + StkId base = ci->u.l.base; + Instruction inst = *(ci->u.l.savedpc - 1); /* interrupted instruction */ + OpCode op = GET_OPCODE(inst); + switch (op) { /* finish its execution */ + case OP_ADD: case OP_SUB: case OP_MUL: case OP_DIV: + case OP_MOD: case OP_POW: case OP_UNM: case OP_LEN: + case OP_GETTABUP: case OP_GETTABLE: case OP_SELF: { + setobjs2s(L, base + GETARG_A(inst), --L->top); + break; + } + case OP_LE: case OP_LT: case OP_EQ: { + int res = !l_isfalse(L->top - 1); + L->top--; + /* metamethod should not be called when operand is K */ + lua_assert(!ISK(GETARG_B(inst))); + if (op == OP_LE && /* "<=" using "<" instead? */ + ttisnil(luaT_gettmbyobj(L, base + GETARG_B(inst), TM_LE))) + res = !res; /* invert result */ + lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_JMP); + if (res != GETARG_A(inst)) /* condition failed? */ + ci->u.l.savedpc++; /* skip jump instruction */ + break; + } + case OP_CONCAT: { + StkId top = L->top - 1; /* top when 'call_binTM' was called */ + int b = GETARG_B(inst); /* first element to concatenate */ + int total = cast_int(top - 1 - (base + b)); /* yet to concatenate */ + setobj2s(L, top - 2, top); /* put TM result in proper position */ + if (total > 1) { /* are there elements to concat? */ + L->top = top - 1; /* top is one after last element (at top-2) */ + luaV_concat(L, total); /* concat them (may yield again) */ + } + /* move final result to final position */ + setobj2s(L, ci->u.l.base + GETARG_A(inst), L->top - 1); + L->top = ci->top; /* restore top */ + break; + } + case OP_TFORCALL: { + lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_TFORLOOP); + L->top = ci->top; /* correct top */ + break; + } + case OP_CALL: { + if (GETARG_C(inst) - 1 >= 0) /* nresults >= 0? */ + L->top = ci->top; /* adjust results */ + break; + } + case OP_TAILCALL: case OP_SETTABUP: case OP_SETTABLE: + break; + default: lua_assert(0); + } +} + + + +/* +** some macros for common tasks in `luaV_execute' +*/ + +#if !defined luai_runtimecheck +#define luai_runtimecheck(L, c) /* void */ +#endif + + +#define RA(i) (base+GETARG_A(i)) +/* to be used after possible stack reallocation */ +#define RB(i) check_exp(getBMode(GET_OPCODE(i)) == OpArgR, base+GETARG_B(i)) +#define RC(i) check_exp(getCMode(GET_OPCODE(i)) == OpArgR, base+GETARG_C(i)) +#define RKB(i) check_exp(getBMode(GET_OPCODE(i)) == OpArgK, \ + ISK(GETARG_B(i)) ? k+INDEXK(GETARG_B(i)) : base+GETARG_B(i)) +#define RKC(i) check_exp(getCMode(GET_OPCODE(i)) == OpArgK, \ + ISK(GETARG_C(i)) ? k+INDEXK(GETARG_C(i)) : base+GETARG_C(i)) +#define KBx(i) \ + (k + (GETARG_Bx(i) != 0 ? GETARG_Bx(i) - 1 : GETARG_Ax(*ci->u.l.savedpc++))) + + +/* execute a jump instruction */ +#define dojump(ci,i,e) \ + { int a = GETARG_A(i); \ + if (a > 0) luaF_close(L, ci->u.l.base + a - 1); \ + ci->u.l.savedpc += GETARG_sBx(i) + e; } + +/* for test instructions, execute the jump instruction that follows it */ +#define donextjump(ci) { i = *ci->u.l.savedpc; dojump(ci, i, 1); } + + +#define Protect(x) { {x;}; base = ci->u.l.base; } + +#define checkGC(L,c) \ + Protect( luaC_condGC(L,{L->top = (c); /* limit of live values */ \ + luaC_step(L); \ + L->top = ci->top;}) /* restore top */ \ + luai_threadyield(L); ) + + +#define arith_op(op,tm) { \ + TValue *rb = RKB(i); \ + TValue *rc = RKC(i); \ + if (ttisnumber(rb) && ttisnumber(rc)) { \ + lua_Number nb = nvalue(rb), nc = nvalue(rc); \ + setnvalue(ra, op(L, nb, nc)); \ + } \ + else { Protect(luaV_arith(L, ra, rb, rc, tm)); } } + + +#define vmdispatch(o) switch(o) +#define vmcase(l,b) case l: {b} break; +#define vmcasenb(l,b) case l: {b} /* nb = no break */ + +void luaV_execute (lua_State *L) { + CallInfo *ci = L->ci; + LClosure *cl; + TValue *k; + StkId base; + newframe: /* reentry point when frame changes (call/return) */ + lua_assert(ci == L->ci); + cl = clLvalue(ci->func); + k = cl->p->k; + base = ci->u.l.base; + /* main loop of interpreter */ + for (;;) { + Instruction i = *(ci->u.l.savedpc++); + StkId ra; + if ((L->hookmask & (LUA_MASKLINE | LUA_MASKCOUNT)) && + (--L->hookcount == 0 || L->hookmask & LUA_MASKLINE)) { + Protect(traceexec(L)); + } + /* WARNING: several calls may realloc the stack and invalidate `ra' */ + ra = RA(i); + lua_assert(base == ci->u.l.base); + lua_assert(base <= L->top && L->top < L->stack + L->stacksize); + vmdispatch (GET_OPCODE(i)) { + vmcase(OP_MOVE, + setobjs2s(L, ra, RB(i)); + ) + vmcase(OP_LOADK, + TValue *rb = k + GETARG_Bx(i); + setobj2s(L, ra, rb); + ) + vmcase(OP_LOADKX, + TValue *rb; + lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_EXTRAARG); + rb = k + GETARG_Ax(*ci->u.l.savedpc++); + setobj2s(L, ra, rb); + ) + vmcase(OP_LOADBOOL, + setbvalue(ra, GETARG_B(i)); + if (GETARG_C(i)) ci->u.l.savedpc++; /* skip next instruction (if C) */ + ) + vmcase(OP_LOADNIL, + int b = GETARG_B(i); + do { + setnilvalue(ra++); + } while (b--); + ) + vmcase(OP_GETUPVAL, + int b = GETARG_B(i); + setobj2s(L, ra, cl->upvals[b]->v); + ) + vmcase(OP_GETTABUP, + int b = GETARG_B(i); + Protect(luaV_gettable(L, cl->upvals[b]->v, RKC(i), ra)); + ) + vmcase(OP_GETTABLE, + Protect(luaV_gettable(L, RB(i), RKC(i), ra)); + ) + vmcase(OP_SETTABUP, + int a = GETARG_A(i); + Protect(luaV_settable(L, cl->upvals[a]->v, RKB(i), RKC(i))); + ) + vmcase(OP_SETUPVAL, + UpVal *uv = cl->upvals[GETARG_B(i)]; + setobj(L, uv->v, ra); + luaC_barrier(L, uv, ra); + ) + vmcase(OP_SETTABLE, + Protect(luaV_settable(L, ra, RKB(i), RKC(i))); + ) + vmcase(OP_NEWTABLE, + int b = GETARG_B(i); + int c = GETARG_C(i); + Table *t = luaH_new(L); + sethvalue(L, ra, t); + if (b != 0 || c != 0) + luaH_resize(L, t, luaO_fb2int(b), luaO_fb2int(c)); + checkGC(L, ra + 1); + ) + vmcase(OP_SELF, + StkId rb = RB(i); + setobjs2s(L, ra+1, rb); + Protect(luaV_gettable(L, rb, RKC(i), ra)); + ) + vmcase(OP_ADD, + arith_op(luai_numadd, TM_ADD); + ) + vmcase(OP_SUB, + arith_op(luai_numsub, TM_SUB); + ) + vmcase(OP_MUL, + arith_op(luai_nummul, TM_MUL); + ) + vmcase(OP_DIV, + arith_op(luai_numdiv, TM_DIV); + ) + vmcase(OP_MOD, + arith_op(luai_nummod, TM_MOD); + ) + vmcase(OP_POW, + arith_op(luai_numpow, TM_POW); + ) + vmcase(OP_UNM, + TValue *rb = RB(i); + if (ttisnumber(rb)) { + lua_Number nb = nvalue(rb); + setnvalue(ra, luai_numunm(L, nb)); + } + else { + Protect(luaV_arith(L, ra, rb, rb, TM_UNM)); + } + ) + vmcase(OP_NOT, + TValue *rb = RB(i); + int res = l_isfalse(rb); /* next assignment may change this value */ + setbvalue(ra, res); + ) + vmcase(OP_LEN, + Protect(luaV_objlen(L, ra, RB(i))); + ) + vmcase(OP_CONCAT, + int b = GETARG_B(i); + int c = GETARG_C(i); + StkId rb; + L->top = base + c + 1; /* mark the end of concat operands */ + Protect(luaV_concat(L, c - b + 1)); + ra = RA(i); /* 'luav_concat' may invoke TMs and move the stack */ + rb = b + base; + setobjs2s(L, ra, rb); + checkGC(L, (ra >= rb ? ra + 1 : rb)); + L->top = ci->top; /* restore top */ + ) + vmcase(OP_JMP, + dojump(ci, i, 0); + ) + vmcase(OP_EQ, + TValue *rb = RKB(i); + TValue *rc = RKC(i); + Protect( + if (cast_int(equalobj(L, rb, rc)) != GETARG_A(i)) + ci->u.l.savedpc++; + else + donextjump(ci); + ) + ) + vmcase(OP_LT, + Protect( + if (luaV_lessthan(L, RKB(i), RKC(i)) != GETARG_A(i)) + ci->u.l.savedpc++; + else + donextjump(ci); + ) + ) + vmcase(OP_LE, + Protect( + if (luaV_lessequal(L, RKB(i), RKC(i)) != GETARG_A(i)) + ci->u.l.savedpc++; + else + donextjump(ci); + ) + ) + vmcase(OP_TEST, + if (GETARG_C(i) ? l_isfalse(ra) : !l_isfalse(ra)) + ci->u.l.savedpc++; + else + donextjump(ci); + ) + vmcase(OP_TESTSET, + TValue *rb = RB(i); + if (GETARG_C(i) ? l_isfalse(rb) : !l_isfalse(rb)) + ci->u.l.savedpc++; + else { + setobjs2s(L, ra, rb); + donextjump(ci); + } + ) + vmcase(OP_CALL, + int b = GETARG_B(i); + int nresults = GETARG_C(i) - 1; + if (b != 0) L->top = ra+b; /* else previous instruction set top */ + if (luaD_precall(L, ra, nresults)) { /* C function? */ + if (nresults >= 0) L->top = ci->top; /* adjust results */ + base = ci->u.l.base; + } + else { /* Lua function */ + ci = L->ci; + ci->callstatus |= CIST_REENTRY; + goto newframe; /* restart luaV_execute over new Lua function */ + } + ) + vmcase(OP_TAILCALL, + int b = GETARG_B(i); + if (b != 0) L->top = ra+b; /* else previous instruction set top */ + lua_assert(GETARG_C(i) - 1 == LUA_MULTRET); + if (luaD_precall(L, ra, LUA_MULTRET)) /* C function? */ + base = ci->u.l.base; + else { + /* tail call: put called frame (n) in place of caller one (o) */ + CallInfo *nci = L->ci; /* called frame */ + CallInfo *oci = nci->previous; /* caller frame */ + StkId nfunc = nci->func; /* called function */ + StkId ofunc = oci->func; /* caller function */ + /* last stack slot filled by 'precall' */ + StkId lim = nci->u.l.base + getproto(nfunc)->numparams; + int aux; + /* close all upvalues from previous call */ + if (cl->p->sizep > 0) luaF_close(L, oci->u.l.base); + /* move new frame into old one */ + for (aux = 0; nfunc + aux < lim; aux++) + setobjs2s(L, ofunc + aux, nfunc + aux); + oci->u.l.base = ofunc + (nci->u.l.base - nfunc); /* correct base */ + oci->top = L->top = ofunc + (L->top - nfunc); /* correct top */ + oci->u.l.savedpc = nci->u.l.savedpc; + oci->callstatus |= CIST_TAIL; /* function was tail called */ + ci = L->ci = oci; /* remove new frame */ + lua_assert(L->top == oci->u.l.base + getproto(ofunc)->maxstacksize); + goto newframe; /* restart luaV_execute over new Lua function */ + } + ) + vmcasenb(OP_RETURN, + int b = GETARG_B(i); + if (b != 0) L->top = ra+b-1; + if (cl->p->sizep > 0) luaF_close(L, base); + b = luaD_poscall(L, ra); + if (!(ci->callstatus & CIST_REENTRY)) /* 'ci' still the called one */ + return; /* external invocation: return */ + else { /* invocation via reentry: continue execution */ + ci = L->ci; + if (b) L->top = ci->top; + lua_assert(isLua(ci)); + lua_assert(GET_OPCODE(*((ci)->u.l.savedpc - 1)) == OP_CALL); + goto newframe; /* restart luaV_execute over new Lua function */ + } + ) + vmcase(OP_FORLOOP, + lua_Number step = nvalue(ra+2); + lua_Number idx = luai_numadd(L, nvalue(ra), step); /* increment index */ + lua_Number limit = nvalue(ra+1); + if (luai_numlt(L, 0, step) ? luai_numle(L, idx, limit) + : luai_numle(L, limit, idx)) { + ci->u.l.savedpc += GETARG_sBx(i); /* jump back */ + setnvalue(ra, idx); /* update internal index... */ + setnvalue(ra+3, idx); /* ...and external index */ + } + ) + vmcase(OP_FORPREP, + const TValue *init = ra; + const TValue *plimit = ra+1; + const TValue *pstep = ra+2; + if (!tonumber(init, ra)) + luaG_runerror(L, LUA_QL("for") " initial value must be a number"); + else if (!tonumber(plimit, ra+1)) + luaG_runerror(L, LUA_QL("for") " limit must be a number"); + else if (!tonumber(pstep, ra+2)) + luaG_runerror(L, LUA_QL("for") " step must be a number"); + setnvalue(ra, luai_numsub(L, nvalue(ra), nvalue(pstep))); + ci->u.l.savedpc += GETARG_sBx(i); + ) + vmcasenb(OP_TFORCALL, + StkId cb = ra + 3; /* call base */ + setobjs2s(L, cb+2, ra+2); + setobjs2s(L, cb+1, ra+1); + setobjs2s(L, cb, ra); + L->top = cb + 3; /* func. + 2 args (state and index) */ + Protect(luaD_call(L, cb, GETARG_C(i), 1)); + L->top = ci->top; + i = *(ci->u.l.savedpc++); /* go to next instruction */ + ra = RA(i); + lua_assert(GET_OPCODE(i) == OP_TFORLOOP); + goto l_tforloop; + ) + vmcase(OP_TFORLOOP, + l_tforloop: + if (!ttisnil(ra + 1)) { /* continue loop? */ + setobjs2s(L, ra, ra + 1); /* save control variable */ + ci->u.l.savedpc += GETARG_sBx(i); /* jump back */ + } + ) + vmcase(OP_SETLIST, + int n = GETARG_B(i); + int c = GETARG_C(i); + int last; + Table *h; + if (n == 0) n = cast_int(L->top - ra) - 1; + if (c == 0) { + lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_EXTRAARG); + c = GETARG_Ax(*ci->u.l.savedpc++); + } + luai_runtimecheck(L, ttistable(ra)); + h = hvalue(ra); + last = ((c-1)*LFIELDS_PER_FLUSH) + n; + if (last > h->sizearray) /* needs more space? */ + luaH_resizearray(L, h, last); /* pre-allocate it at once */ + for (; n > 0; n--) { + TValue *val = ra+n; + luaH_setint(L, h, last--, val); + luaC_barrierback(L, obj2gco(h), val); + } + L->top = ci->top; /* correct top (in case of previous open call) */ + ) + vmcase(OP_CLOSURE, + Proto *p = cl->p->p[GETARG_Bx(i)]; + Closure *ncl = getcached(p, cl->upvals, base); /* cached closure */ + if (ncl == NULL) /* no match? */ + pushclosure(L, p, cl->upvals, base, ra); /* create a new one */ + else + setclLvalue(L, ra, ncl); /* push cashed closure */ + checkGC(L, ra + 1); + ) + vmcase(OP_VARARG, + int b = GETARG_B(i) - 1; + int j; + int n = cast_int(base - ci->func) - cl->p->numparams - 1; + if (b < 0) { /* B == 0? */ + b = n; /* get all var. arguments */ + Protect(luaD_checkstack(L, n)); + ra = RA(i); /* previous call may change the stack */ + L->top = ra + n; + } + for (j = 0; j < b; j++) { + if (j < n) { + setobjs2s(L, ra + j, base - n + j); + } + else { + setnilvalue(ra + j); + } + } + ) + vmcase(OP_EXTRAARG, + lua_assert(0); + ) + } + } +} + diff --git a/radio/src/lua/src/lvm.h b/radio/src/lua/src/lvm.h new file mode 100644 index 000000000..07e25f9c6 --- /dev/null +++ b/radio/src/lua/src/lvm.h @@ -0,0 +1,44 @@ +/* +** $Id: lvm.h,v 2.18 2013/01/08 14:06:55 roberto Exp $ +** Lua virtual machine +** See Copyright Notice in lua.h +*/ + +#ifndef lvm_h +#define lvm_h + + +#include "ldo.h" +#include "lobject.h" +#include "ltm.h" + + +#define tostring(L,o) (ttisstring(o) || (luaV_tostring(L, o))) + +#define tonumber(o,n) (ttisnumber(o) || (((o) = luaV_tonumber(o,n)) != NULL)) + +#define equalobj(L,o1,o2) (ttisequal(o1, o2) && luaV_equalobj_(L, o1, o2)) + +#define luaV_rawequalobj(o1,o2) equalobj(NULL,o1,o2) + + +/* not to called directly */ +LUAI_FUNC int luaV_equalobj_ (lua_State *L, const TValue *t1, const TValue *t2); + + +LUAI_FUNC int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r); +LUAI_FUNC int luaV_lessequal (lua_State *L, const TValue *l, const TValue *r); +LUAI_FUNC const TValue *luaV_tonumber (const TValue *obj, TValue *n); +LUAI_FUNC int luaV_tostring (lua_State *L, StkId obj); +LUAI_FUNC void luaV_gettable (lua_State *L, const TValue *t, TValue *key, + StkId val); +LUAI_FUNC void luaV_settable (lua_State *L, const TValue *t, TValue *key, + StkId val); +LUAI_FUNC void luaV_finishOp (lua_State *L); +LUAI_FUNC void luaV_execute (lua_State *L); +LUAI_FUNC void luaV_concat (lua_State *L, int total); +LUAI_FUNC void luaV_arith (lua_State *L, StkId ra, const TValue *rb, + const TValue *rc, TMS op); +LUAI_FUNC void luaV_objlen (lua_State *L, StkId ra, const TValue *rb); + +#endif diff --git a/radio/src/lua/src/lzio.c b/radio/src/lua/src/lzio.c new file mode 100644 index 000000000..8b77054e0 --- /dev/null +++ b/radio/src/lua/src/lzio.c @@ -0,0 +1,76 @@ +/* +** $Id: lzio.c,v 1.35 2012/05/14 13:34:18 roberto Exp $ +** Buffered streams +** See Copyright Notice in lua.h +*/ + + +#include + +#define lzio_c +#define LUA_CORE + +#include "lua.h" + +#include "llimits.h" +#include "lmem.h" +#include "lstate.h" +#include "lzio.h" + + +int luaZ_fill (ZIO *z) { + size_t size; + lua_State *L = z->L; + const char *buff; + lua_unlock(L); + buff = z->reader(L, z->data, &size); + lua_lock(L); + if (buff == NULL || size == 0) + return EOZ; + z->n = size - 1; /* discount char being returned */ + z->p = buff; + return cast_uchar(*(z->p++)); +} + + +void luaZ_init (lua_State *L, ZIO *z, lua_Reader reader, void *data) { + z->L = L; + z->reader = reader; + z->data = data; + z->n = 0; + z->p = NULL; +} + + +/* --------------------------------------------------------------- read --- */ +size_t luaZ_read (ZIO *z, void *b, size_t n) { + while (n) { + size_t m; + if (z->n == 0) { /* no bytes in buffer? */ + if (luaZ_fill(z) == EOZ) /* try to read more */ + return n; /* no more input; return number of missing bytes */ + else { + z->n++; /* luaZ_fill consumed first byte; put it back */ + z->p--; + } + } + m = (n <= z->n) ? n : z->n; /* min. between n and z->n */ + memcpy(b, z->p, m); + z->n -= m; + z->p += m; + b = (char *)b + m; + n -= m; + } + return 0; +} + +/* ------------------------------------------------------------------------ */ +char *luaZ_openspace (lua_State *L, Mbuffer *buff, size_t n) { + if (n > buff->buffsize) { + if (n < LUA_MINBUFFER) n = LUA_MINBUFFER; + luaZ_resizebuffer(L, buff, n); + } + return buff->buffer; +} + + diff --git a/radio/src/lua/src/lzio.h b/radio/src/lua/src/lzio.h new file mode 100644 index 000000000..08682301e --- /dev/null +++ b/radio/src/lua/src/lzio.h @@ -0,0 +1,65 @@ +/* +** $Id: lzio.h,v 1.26 2011/07/15 12:48:03 roberto Exp $ +** Buffered streams +** See Copyright Notice in lua.h +*/ + + +#ifndef lzio_h +#define lzio_h + +#include "lua.h" + +#include "lmem.h" + + +#define EOZ (-1) /* end of stream */ + +typedef struct Zio ZIO; + +#define zgetc(z) (((z)->n--)>0 ? cast_uchar(*(z)->p++) : luaZ_fill(z)) + + +typedef struct Mbuffer { + char *buffer; + size_t n; + size_t buffsize; +} Mbuffer; + +#define luaZ_initbuffer(L, buff) ((buff)->buffer = NULL, (buff)->buffsize = 0) + +#define luaZ_buffer(buff) ((buff)->buffer) +#define luaZ_sizebuffer(buff) ((buff)->buffsize) +#define luaZ_bufflen(buff) ((buff)->n) + +#define luaZ_resetbuffer(buff) ((buff)->n = 0) + + +#define luaZ_resizebuffer(L, buff, size) \ + (luaM_reallocvector(L, (buff)->buffer, (buff)->buffsize, size, char), \ + (buff)->buffsize = size) + +#define luaZ_freebuffer(L, buff) luaZ_resizebuffer(L, buff, 0) + + +LUAI_FUNC char *luaZ_openspace (lua_State *L, Mbuffer *buff, size_t n); +LUAI_FUNC void luaZ_init (lua_State *L, ZIO *z, lua_Reader reader, + void *data); +LUAI_FUNC size_t luaZ_read (ZIO* z, void* b, size_t n); /* read next n bytes */ + + + +/* --------- Private Part ------------------ */ + +struct Zio { + size_t n; /* bytes still unread */ + const char *p; /* current position in buffer */ + lua_Reader reader; /* reader function */ + void* data; /* additional data */ + lua_State *L; /* Lua state (for reader) */ +}; + + +LUAI_FUNC int luaZ_fill (ZIO *z); + +#endif diff --git a/radio/src/maths.cpp b/radio/src/maths.cpp index 93330af1c..271aac8f3 100644 --- a/radio/src/maths.cpp +++ b/radio/src/maths.cpp @@ -167,7 +167,7 @@ void varioWakeup() int SoundVarioBeepTime; int SoundVarioBeepFreq; if (verticalSpeed > 0) { - SoundVarioBeepTime = min(5, 320 - (verticalSpeed >> 2)); + SoundVarioBeepTime = max(5, 320 - (verticalSpeed >> 2)); SoundVarioBeepFreq = 1000 + verticalSpeed; } else { diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index be6e6e11e..fed0158f4 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -954,6 +954,8 @@ enum TelemetrySource { TELEM_ACCz, TELEM_HDG, TELEM_VSPD, + TELEM_ASPD, + TELEM_DTE, TELEM_MIN_A1, TELEM_MIN_A2, TELEM_MIN_ALT, @@ -963,13 +965,13 @@ enum TelemetrySource { TELEM_MAX_T2, TELEM_MAX_SPEED, TELEM_MAX_DIST, - // TODO TELEM_MIN_CELL, - // TODO TELEM_MIN_VFAS, + TELEM_MIN_CELL, + TELEM_MIN_VFAS, TELEM_MAX_CURRENT, TELEM_MAX_POWER, TELEM_ACC, TELEM_GPS_TIME, - TELEM_CSW_MAX = TELEM_POWER, + TELEM_CSW_MAX = TELEM_MAX_POWER, TELEM_NOUSR_MAX = TELEM_A2, #if defined(FRSKY) TELEM_DISPLAY_MAX = TELEM_MAX_POWER, diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 8a08ea51f..358797f97 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -1296,9 +1296,11 @@ getvalue_t getValue(uint8_t i) else if (i==MIXSRC_FIRST_TELEM-1+TELEM_ACCz) return frskyData.hub.accelZ; else if (i==MIXSRC_FIRST_TELEM-1+TELEM_HDG) return frskyData.hub.gpsCourse_bp; else if (i==MIXSRC_FIRST_TELEM-1+TELEM_VSPD) return frskyData.hub.varioSpeed; + else if (i==MIXSRC_FIRST_TELEM-1+TELEM_ASPD) return frskyData.hub.airSpeed; + else if (i==MIXSRC_FIRST_TELEM-1+TELEM_DTE) return frskyData.hub.dTE; else if (i==MIXSRC_FIRST_TELEM-1+TELEM_MIN_A1) return frskyData.analog[0].min; else if (i==MIXSRC_FIRST_TELEM-1+TELEM_MIN_A2) return frskyData.analog[1].min; - else if (i==MIXSRC_FIRST_TELEM-1+TELEM_MAX_POWER) return *(((int16_t*)(&frskyData.hub.minAltitude))+i-(MIXSRC_FIRST_TELEM-1+TELEM_MIN_ALT)); + else if (i<=MIXSRC_FIRST_TELEM-1+TELEM_CSW_MAX) return *(((int16_t*)(&frskyData.hub.minAltitude))+i-(MIXSRC_FIRST_TELEM-1+TELEM_MIN_ALT)); #endif #endif else return 0; @@ -1504,17 +1506,18 @@ bool getSwitch(int8_t swtch) } } else { + uint8_t v1 = cs->v1; #if defined(FRSKY) // Telemetry - if (cs->v1 >= MIXSRC_FIRST_TELEM) { - if ((!TELEMETRY_STREAMING() && cs->v1 >= MIXSRC_FIRST_TELEM+TELEM_FIRST_STREAMED_VALUE-1) || IS_FAI_FORBIDDEN(cs->v1-1)) + if (v1 >= MIXSRC_FIRST_TELEM) { + if ((!TELEMETRY_STREAMING() && v1 >= MIXSRC_FIRST_TELEM+TELEM_FIRST_STREAMED_VALUE-1) || IS_FAI_FORBIDDEN(v1-1)) return swtch > 0 ? false : true; y = convertCswTelemValue(cs); #if defined(FRSKY_HUB) && defined(GAUGES) if (s == LS_FAMILY_OFS) { - uint8_t idx = cs->v1-MIXSRC_FIRST_TELEM+1-TELEM_ALT; + uint8_t idx = v1-MIXSRC_FIRST_TELEM+1-TELEM_ALT; if (idx < THLD_MAX) { // Fill the threshold array barsThresholds[idx] = 128 + cs->v2; @@ -1522,17 +1525,17 @@ bool getSwitch(int8_t swtch) } #endif } - else if (cs->v1 >= MIXSRC_GVAR1) { + else if (v1 >= MIXSRC_GVAR1) { y = cs->v2; } else { y = calc100toRESX(cs->v2); } #else - if (cs->v1 >= MIXSRC_FIRST_TELEM) { + if (v1 >= MIXSRC_FIRST_TELEM) { y = (int16_t)3 * (128+cs->v2); // it's a Timer } - else if (cs->v1 >= MIXSRC_GVAR1) { + else if (v1 >= MIXSRC_GVAR1) { y = cs->v2; // it's a GVAR } else { @@ -1543,7 +1546,7 @@ bool getSwitch(int8_t swtch) switch (cs->func) { case LS_FUNC_VEQUAL: #if defined(GVARS) - if (cs->v1 >= MIXSRC_GVAR1 && cs->v1 <= MIXSRC_LAST_GVAR) + if (v1 >= MIXSRC_GVAR1 && v1 <= MIXSRC_LAST_GVAR) result = (x==y); else #endif @@ -2039,7 +2042,7 @@ getvalue_t convert8bitsTelemValue(uint8_t channel, ls_telemetry_value_t value) switch (channel) { case TELEM_TM1: case TELEM_TM2: - result = value * 3; + result = value * 5; break; #if defined(FRSKY) case TELEM_ALT: @@ -3224,11 +3227,13 @@ PLAY_FUNCTION(playValue, uint8_t idx) } case MIXSRC_FIRST_TELEM+TELEM_CELL-1: + case MIXSRC_FIRST_TELEM+TELEM_MIN_CELL-1: PLAY_NUMBER(val/10, 1+UNIT_VOLTS, PREC1); break; case MIXSRC_FIRST_TELEM+TELEM_VFAS-1: case MIXSRC_FIRST_TELEM+TELEM_CELLS_SUM-1: + case MIXSRC_FIRST_TELEM+TELEM_MIN_VFAS-1: PLAY_NUMBER(val, 1+UNIT_VOLTS, PREC1); break; @@ -3244,6 +3249,7 @@ PLAY_FUNCTION(playValue, uint8_t idx) break; case MIXSRC_FIRST_TELEM+TELEM_VSPD-1: + case MIXSRC_FIRST_TELEM+TELEM_ASPD-1: PLAY_NUMBER(val/10, 1+UNIT_METERS_PER_SECOND, PREC1); break; diff --git a/radio/src/simpgmspace.cpp b/radio/src/simpgmspace.cpp index a502dd7f0..cd3fb4803 100644 --- a/radio/src/simpgmspace.cpp +++ b/radio/src/simpgmspace.cpp @@ -534,7 +534,9 @@ FRESULT f_chdir (const TCHAR *name) FRESULT f_opendir (DIR * rep, const TCHAR * name) { - rep->fs = (FATFS *)simu::opendir(convertSimuPath(name)); + char *path = convertSimuPath(name); + TRACE("f_opendir(%s)", path); + rep->fs = (FATFS *)simu::opendir(path); return FR_OK; } diff --git a/radio/src/telemetry/frsky.h b/radio/src/telemetry/frsky.h index 5446787f4..440e2b0e5 100644 --- a/radio/src/telemetry/frsky.h +++ b/radio/src/telemetry/frsky.h @@ -124,7 +124,7 @@ PACK(struct FrskySerialData { uint16_t currentConsumption; // 0x35 openXsensor only! Otherwise calculated by the Tx from current uint16_t currentPrescale; uint16_t power; // 0x37 openXsensor only! Otherwise calculated by the Tx from current and voltage - int16_t spare2; + int16_t airSpeed; uint16_t vfas; // 0x39 Added to FrSky protocol for home made sensors with a better precision uint16_t volts_bp; // 0x3A @@ -139,9 +139,13 @@ PACK(struct FrskySerialData { int16_t maxTemperature2; uint16_t maxGpsSpeed; uint16_t maxGpsDistance; + int16_t minCell; + int16_t minVfas; uint16_t maxCurrent; uint16_t maxPower; /* end */ + + int16_t dTE; }); #elif defined(WS_HOW_HIGH) PACK(struct FrskySerialData { diff --git a/radio/src/telemetry/frsky_sport.cpp b/radio/src/telemetry/frsky_sport.cpp index 613f30daa..1f0d53888 100644 --- a/radio/src/telemetry/frsky_sport.cpp +++ b/radio/src/telemetry/frsky_sport.cpp @@ -214,8 +214,8 @@ void processHubPacket(uint8_t id, uint16_t value) #else frskyData.hub.vfas = ((frskyData.hub.volts_bp * 100 + frskyData.hub.volts_ap * 10) * 21) / 110; #endif - /* TODO later if (!frskyData.hub.minVfas || frskyData.hub.minVfas > frskyData.hub.vfas) - frskyData.hub.minVfas = frskyData.hub.vfas; */ + if (!frskyData.hub.minVfas || frskyData.hub.vfas < frskyData.hub.minVfas) + frskyData.hub.minVfas = frskyData.hub.vfas; break; case BARO_ALT_AP_ID: @@ -268,6 +268,8 @@ void processHubPacket(uint8_t id, uint16_t value) if (!frskyData.hub.minCellVolts || cellVolts < frskyData.hub.minCellVolts || battnumber==frskyData.hub.minCellIdx) { frskyData.hub.minCellIdx = battnumber; frskyData.hub.minCellVolts = cellVolts; + if (!frskyData.hub.minCell || frskyData.hub.minCellVolts < frskyData.hub.minCell) + frskyData.hub.minCell = frskyData.hub.minCellVolts; } } break; @@ -761,6 +763,8 @@ void resetTelemetry() frskyData.rssi[1].value = 30; frskyData.hub.fuelLevel = 75; frskyData.hub.rpm = 12000; + frskyData.hub.vfas = 100; + frskyData.hub.minVfas = 90; frskyData.hub.gpsFix = 1; frskyData.hub.gpsLatitude_bp = 4401; diff --git a/radio/src/telemetry/frsky_sport.h b/radio/src/telemetry/frsky_sport.h index ac1dd94d9..489c6537f 100644 --- a/radio/src/telemetry/frsky_sport.h +++ b/radio/src/telemetry/frsky_sport.h @@ -123,6 +123,8 @@ PACK(struct FrskySerialData { int16_t maxTemperature2; uint16_t maxGpsSpeed; uint16_t maxGpsDistance; + int16_t minCell; + int16_t minVfas; uint16_t maxCurrent; uint16_t maxPower; /* end */ @@ -141,6 +143,8 @@ PACK(struct FrskySerialData { uint16_t minCellVolts; bool varioHighPrecision; + int16_t airSpeed; + int16_t dTE; }); struct FrskyData { diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 786c0c059..074c45a14 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -585,6 +585,8 @@ const pm_uchar font_5x7[] PROGMEM = { #include "font_cz_05x07.lbm" #elif defined(TRANSLATIONS_ES) #include "font_es_05x07.lbm" +#elif defined(TRANSLATIONS_FI) +#include "font_fi_05x07.lbm" #elif defined(TRANSLATIONS_FR) #include "font_fr_05x07.lbm" #elif defined(TRANSLATIONS_IT) @@ -613,6 +615,8 @@ const pm_uchar font_10x14[] PROGMEM = { #include "font_cz_10x14.lbm" #elif defined(TRANSLATIONS_ES) #include "font_es_10x14.lbm" + #elif defined(TRANSLATIONS_FI) + #include "font_fi_10x14.lbm" #elif defined(TRANSLATIONS_FR) #include "font_fr_10x14.lbm" #elif defined(TRANSLATIONS_IT) @@ -640,6 +644,8 @@ const pm_uchar font_4x6[] PROGMEM = { #include "font_cz_04x06.lbm" #elif defined(TRANSLATIONS_ES) #include "font_es_04x06.lbm" +#elif defined(TRANSLATIONS_FI) +#include "font_fi_04x06.lbm" #elif defined(TRANSLATIONS_FR) #include "font_fr_04x06.lbm" #elif defined(TRANSLATIONS_IT) @@ -661,6 +667,8 @@ const pm_uchar font_8x10[] PROGMEM = { #include "font_cz_08x10.lbm" #elif defined(TRANSLATIONS_ES) #include "font_es_08x10.lbm" +#elif defined(TRANSLATIONS_FI) +#include "font_fi_08x10.lbm" #elif defined(TRANSLATIONS_FR) #include "font_fr_08x10.lbm" #elif defined(TRANSLATIONS_IT) diff --git a/radio/src/translations.h b/radio/src/translations.h index ceeda44b7..88aa521ac 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -46,6 +46,9 @@ #elif defined(TRANSLATIONS_SE) #include "translations/se.h" #define LEN_SPECIAL_CHARS 6 +#elif defined(TRANSLATIONS_FI) +#include "translations/fi.h" +#define LEN_SPECIAL_CHARS 6 #elif defined(TRANSLATIONS_DE) #include "translations/de.h" #define LEN_SPECIAL_CHARS 6 diff --git a/radio/src/translations/.gitignore b/radio/src/translations/.gitignore index 60fa00cb3..c87e4f22e 100644 --- a/radio/src/translations/.gitignore +++ b/radio/src/translations/.gitignore @@ -1,6 +1,7 @@ /cz.h /de.h /es.h +/fi.h /fr.h /it.h /pl.h diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 3d718ec79..1fa49ad61 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -261,7 +261,7 @@ #define TR_RSSI_0 "Tx\0 " #define TR_RSSI_1 "Rx\0 " #endif -#define TR_VTELEMCHNS "---\0""Bat\0""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cur+""Pwr+""Acc\0""Time" +#define TR_VTELEMCHNS "---\0""Bat\0""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cel-""Vfs-""Cur+""Pwr+""Acc\0""Time" #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 8b0b2d5ec..909c3ab62 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -261,7 +261,7 @@ #define TR_RSSI_0 "Tx\0 " #define TR_RSSI_1 "Rx\0 " #endif -#define TR_VTELEMCHNS "---\0""Batt""Uhr1""Uhr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""H\203he""Umdr""Fuel""T1\0 ""T2\0 ""Gesc""Dist""GH\203h""Zell""Zels""Vfas""Strm""Verb""Leis""BesX""BesY""BesZ""Rich""VGes""A1-\0""A2-\0""H\203h-""H\203h+""Umd+""T1+\0""T2+\0""Ges+""Dst+""Str+""Pwr+""Besc""Zeit" +#define TR_VTELEMCHNS "---\0""Batt""Uhr1""Uhr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""H\203he""Umdr""Fuel""T1\0 ""T2\0 ""Gesc""Dist""GH\203h""Zell""Zels""Vfas""Strm""Verb""Leis""BesX""BesY""BesZ""Rich""VGes""ASpd""dTE\0""A1-\0""A2-\0""H\203h-""H\203h+""Umd+""T1+\0""T2+\0""Ges+""Dst+""Cel-""Vfs-""Str+""Pwr+""Besc""Zeit" #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h index ed29c91a3..5d8b9dedc 100644 --- a/radio/src/translations/en.h +++ b/radio/src/translations/en.h @@ -261,7 +261,7 @@ #define TR_RSSI_0 "Tx\0 " #define TR_RSSI_1 "Rx\0 " #endif -#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cur+""Pwr+""Acc\0""Time" +#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cel-""Vfs-""Cur+""Pwr+""Acc\0""Time" #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 6454a1c10..6f250d2a3 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -261,7 +261,7 @@ #define TR_RSSI_0 "Tx\0 " #define TR_RSSI_1 "Rx\0 " #endif -#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cur+""Pwr+""Acc\0""Hora" +#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cel-""Vfs-""Cur+""Pwr+""Acc\0""Hora" #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt new file mode 100644 index 000000000..41a84c5de --- /dev/null +++ b/radio/src/translations/fi.h.txt @@ -0,0 +1,800 @@ +/* + * Authors (alphabetical order) + * - Bertrand Songis + * - Bernet Andre + * - Kjell Kernen + * - Martin Hotar + * - Romolo Manfredini + * + * opentx is based on code named + * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, + * er9x by Erez Raviv: http://code.google.com/p/er9x/, + * and the original (and ongoing) project by + * Thomas Husterer, th9x: http://code.google.com/p/th9x/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * + * + * + * !!!!! DO NOT EDIT fi.h - EDIT fi.h.txt INSTEAD !!!!!!! + * + * In order to make translations easier se.h.txt is parsed and national + * characters are replaced by bitmap codes. The result is se.h. + * + * See translate.py in the util catalog for the list of character codes + * + * !!!!! DO NOT EDIT fi.h - EDIT fi.h.txt INSTEAD !!!!!!! + */ + /* Formatting octal codes available in TR_ strings: + * \037\x -sets LCD x-coord (x value in octal) + * \036 -newline + * \001 to \035 -extended spacing (value * FW/2) + * \0 -ends actual string + */ + +// NON ZERO TERMINATED STRINGS +#define LEN_OFFON "\003" +#define TR_OFFON "OFF""ON\0" + +#define LEN_MMMINV "\003" +#define TR_MMMINV "---""INV" + +#define LEN_NCHANNELS "\004" +#define TR_NCHANNELS "\0014CH\0016CH\0018CH10CH12CH14CH16CH" + +#define LEN_VBEEPMODE "\005" +#define TR_VBEEPMODE "Quiet""Alarm""NoKey""All " + +#define LEN_VBEEPLEN "\005" +#define TR_VBEEPLEN "0====""=0===""==0==""===0=""====0" + +#define LEN_VRENAVIG "\003" +#define TR_VRENAVIG "No REaREb" + +#define LEN_VBLMODE TR("\004", "\010") +#define TR_VBLMODE TR("OFF\0""Keys""Ctrl""Both""ON\0 ", "OFF\0 ""Keys\0 ""Controls""Both\0 ""ON\0 ") + +#define LEN_TRNMODE "\003" +#define TR_TRNMODE "OFF"" +="" :=" + +#define LEN_TRNCHN "\003" +#define TR_TRNCHN "CH1CH2CH3CH4" + +#define LEN_UART3MODES "\017" +#define TR_UART3MODES "OFF\0 ""S-Port Mirror\0 ""Debug\0 " + +#define LEN_POTTYPES "\017" +#define TR_POTTYPES "Pot\0 ""Multipos Switch" + +#define LEN_DATETIME "\005" +#define TR_DATETIME "DATE:""TIME:" + +#define LEN_VLCD "\006" +#define TR_VLCD "NormalOptrex" + +#define LEN_COUNTRYCODES TR("\002", "\007") +#define TR_COUNTRYCODES TR("US""JP""EU", "America""Japan\0 ""Europe\0") + +#define LEN_VTRIMINC TR("\006", "\013") +#define TR_VTRIMINC TR("Expo\0 ""ExFine""Fine\0 ""Medium""Coarse", "Exponential""Extra Fine\0""Fine\0 ""Medium\0 ""Coarse\0 ") + +#define LEN_VBEEPCOUNTDOWN "\006" +#define TR_VBEEPCOUNTDOWN "SilentBeeps\0Voice\0" + +#define LEN_RETA123 "\001" + +#if defined(PCBGRUVIN9X) + #if ROTARY_ENCODERS > 2 + #define TR_RETA123 "RETA123abcd" + #else + #define TR_RETA123 "RETA123ab" + #endif +#elif defined(PCBTARANIS) + #define TR_RETA123 "RETA12LR" +#else + #define TR_RETA123 "RETA123" +#endif + +#define LEN_VPROTOS "\006" + +#if defined(PXX) + #define TR_PXX "PXX\0 " +#elif defined(DSM2) || defined(IRPROTOS) + #define TR_PXX "[PXX]\0" +#else + #define TR_PXX +#endif + +#if defined(DSM2) + #define TR_DSM2 "LP45\0 ""DSM2\0 ""DSMX\0 " +#elif defined(IRPROTOS) + #define TR_DSM2 "[LP45]""[DSM2]""[DSMX]" +#else + #define TR_DSM2 +#endif + +#if defined(IRPROTOS) + #define TR_IRPROTOS "SILV TRAC09PICZ SWIFT\0" +#else + #define TR_IRPROTOS +#endif + +#if defined(CPUARM) + #define TR_XPPM +#else + #define TR_XPPM "PPM16\0""PPMsim" +#endif + +#define TR_VPROTOS "PPM\0 " TR_XPPM TR_PXX TR_DSM2 TR_IRPROTOS + +#define LEN_POSNEG "\003" +#define TR_POSNEG "POS""NEG" + +#define LEN_VCURVEFUNC "\003" +#define TR_VCURVEFUNC "---""x>0""x<0""|x|""f>0""f<0""|f|" + +#define LEN_VMLTPX "\010" +#define TR_VMLTPX "Add\0 ""Multiply""Replace\0" + +#define LEN_VMLTPX2 "\002" +#define TR_VMLTPX2 "+=""*="":=" + +#define LEN_VMIXTRIMS "\003" +#define TR_VMIXTRIMS "OFF""ON\0""Rud""Ele""Thr""Ail" + +#if defined(PCBTARANIS) + #define TR_CSWTIMER "Timer" + #define TR_CSWSTICKY "Stcky" + #define TR_CSWRANGE "Range" + #define TR_CSWSTAY "Edge\0" +#else + #define TR_CSWTIMER "Tim\0 " + #define TR_CSWSTICKY "Glue\0" + #if defined(CPUARM) + #define TR_CSWRANGE "Rnge\0" + #define TR_CSWSTAY "Edge\0" + #else + #define TR_CSWRANGE + #define TR_CSWSTAY + #endif +#endif + +#define LEN_VCSWFUNC "\005" +#define TR_VCSWFUNC "---\0 ""a{x\0 ""a>x\0 ""ax""|a|b\0 ""a" + +#define LEN_VTELPROTO "\007" +#define TR_VTELPROTO "None\0 ""Hub\0 ""WSHHigh" + +#define LEN_VOLTSRC "\003" +#define TR_VOLTSRC "---""A1\0""A2\0""FAS""Cel" + +#define LEN_VARIOSRC "\005" +#if defined(FRSKY_SPORT) + #define TR_VARIOSRC "Vario""A1\0 ""A2\0" +#else + #define TR_VARIOSRC "Alti\0""Alti+""Vario""A1\0 ""A2\0" +#endif + +#define LEN_VSCREEN "\004" +#define TR_VSCREEN "Nums""Bars" + +#define LEN_GPSFORMAT "\004" +#define TR_GPSFORMAT "HMS NMEA" + +#define LEN2_VTEMPLATES 13 +#define LEN_VTEMPLATES "\015" +#define TR_VTEMPLATES "Clear Mixes\0\0""Simple 4-CH \0""Sticky-T-Cut\0""V-Tail \0""Elevon\\Delta\0""eCCPM \0""Heli Setup \0""Servo Test \0" + +#define LEN_VSWASHTYPE "\004" +#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0" + +#define LEN_VKEYS "\005" +#define TR_VKEYS TR("Menu\0""Exit\0""Down\0""Up\0 ""Right""Left\0", "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus") + +#define LEN_VRENCODERS "\003" +#define TR_VRENCODERS "REa""REb" + +#define LEN_VSWITCHES "\003" +#define LEN_VSRCRAW "\004" + +#if defined(PCBTARANIS) + #define TR_POTS_VSRCRAW "S1\0 ""S2\0 ""LS\0 ""RS\0 " + #define TR_SW_VSRCRAW "SA\0 ""SB\0 ""SC\0 ""SD\0 ""SE\0 ""SF\0 ""SG\0 ""SH\0 " +#elif defined(EXTRA_3POS) + #define TR_POTS_VSRCRAW "P1\0 ""P2\0 " + #define TR_SW_VSRCRAW "3P1\0""3P2\0" + #define TR_9X_3POS_SWITCHES "ID0""ID1""ID2""ID3""ID4""ID5" +#else + #define TR_POTS_VSRCRAW "P1\0 ""P2\0 ""P3\0 " + #define TR_SW_VSRCRAW "3POS" + #define TR_9X_3POS_SWITCHES "ID0""ID1""ID2" +#endif + +#if defined(CPUARM) + #define TR_CUSTOMSW "LS1""LS2""LS3""LS4""LS5""LS6""LS7""LS8""LS9""LSA""LSB""LSC""LSD""LSE""LSF""LSG""LSH""LSI""LSJ""LSK""LSL""LSM""LSN""LSO""LSP""LSQ""LSR""LSS""LST""LSU""LSV""LSW" +#elif defined(PCBGRUVIN9X) || defined(CPUM2561) || defined(CPUM128) + #define TR_CUSTOMSW "LS1""LS2""LS3""LS4""LS5""LS6""LS7""LS8""LS9""LSA""LSB""LSC""LSD""LSE""LSF" +#else + #define TR_CUSTOMSW "LS1""LS2""LS3""LS4""LS5""LS6""LS7""LS8""LS9""LSA""LSB""LSC" +#endif + +#define TR_TRIMS_SWITCHES "tRl""tRr""tEd""tEu""tTd""tTu""tAl""tAr" + +#if defined(PCBSKY9X) + #define TR_ROTARY_ENCODERS "REa\0" + #define TR_ROTENC_SWITCHES "REa" +#elif defined(PCBGRUVIN9X) || defined(PCBMEGA2560) + #define TR_ROTARY_ENCODERS "REa\0""REb\0" + #define TR_ROTENC_SWITCHES "REa""REb" +#else + #define TR_ROTARY_ENCODERS + #define TR_ROTENC_SWITCHES +#endif + +#if defined(PCBTARANIS) + #define TR_6POS_POTS "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26" + #define TR_VSWITCHES "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF\301""SG\300""SG-""SG\301""SH\300""SH\301" TR_6POS_POTS TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_CUSTOMSW +#elif defined(CPUARM) + #define TR_VSWITCHES TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_CUSTOMSW +#else + #define TR_VSWITCHES TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_CUSTOMSW +#endif + +#if defined(HELI) + #define TR_CYC_VSRCRAW "CYC1""CYC2""CYC3" +#else + #define TR_CYC_VSRCRAW "[C1]""[C2]""[C3]" +#endif + +#define TR_VSRCRAW "---\0""Rud\0""Ele\0""Thr\0""Ail\0" TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW "TrmR" "TrmE" "TrmT" "TrmA" TR_SW_VSRCRAW + +#define LEN_VTMRMODES "\003" +#define TR_VTMRMODES "OFF""ABS""THs""TH%""THt" + +#define LEN_VTRAINERMODES "\006" +#define TR_VTRAINERMODES "Master""Slave\0" + +#define LEN_VFAILSAFE "\011" +#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses" + +#if defined(MAVLINK) + #define LEN_MAVLINK_BAUDS "\006" + #define TR_MAVLINK_BAUDS "4800 ""9600 ""14400 ""19200 ""38400 ""57600 ""76800 ""115200" + #define LEN_MAVLINK_AC_MODES "\011" + #define TR_MAVLINK_AC_MODES "Stabilize""Acro ""Alt Hold ""Auto ""Guided ""Loiter ""RTL ""Circle ""Pos Hold ""Land ""OF Loiter""Toy A ""Toy M ""INVALID " + #define LEN_MAVLINK_AP_MODES "\015" + #define TR_MAVLINK_AP_MODES "Manual ""Circle ""Stabilize ""Training ""Fly by Wire A""Fly by Wire A""Auto ""RTL ""Loiter ""Guided ""Initialising ""INVALID " +#endif + +// ZERO TERMINATED STRINGS +#define INDENT "\001" +#define LEN_INDENT 1 +#define INDENT_WIDTH (FW/2) + +#if defined(PCBTARANIS) + #define TR_ENTER "[ENTER]" +#else + #define TR_ENTER "[MENU]" +#endif + +#define TR_POPUPS TR_ENTER "\010[EXIT]" +#define OFS_EXIT sizeof(TR_ENTER) + +#define TR_MENUWHENDONE CENTER "\006" TR_ENTER " WHEN DONE" +#define TR_FREE "free" +#define TR_DELETEMODEL "DELETE MODEL" +#define TR_COPYINGMODEL "Copying model..." +#define TR_MOVINGMODEL "Moving model..." +#define TR_LOADINGMODEL "Loading model..." +#define TR_NAME "Name" +#define TR_MODELNAME "Model Name" +#define TR_PHASENAME "Mode Name" +#define TR_MIXNAME "Mix Name" +#define TR_INPUTNAME "Input Name" +#if defined(PCBTARANIS) + #define TR_EXPONAME "Line Name" +#else + #define TR_EXPONAME "Expo Name" +#endif +#define TR_BITMAP "Model Image" +#define TR_TIMER TR("Timer", "Timer ") +#define TR_ELIMITS TR("E.Limits", "Extended Limits") +#define TR_ETRIMS TR("E.Trims", "Extended Trims") +#define TR_TRIMINC "Trim Step" +#define TR_TTRACE TR("T-Source", "Throttle Source") +#define TR_TTRIM TR("T-Trim", "Throttle Trim") +#define TR_BEEPCTR TR("Ctr Beep", "Center Beep") +#define TR_PROTO TR(INDENT "Proto", INDENT "Protocol") +#define TR_PPMFRAME TR("PPM frame", INDENT "PPM frame") +#define TR_MS "ms" +#define TR_SWITCH "Switch" +#define TR_TRIMS "Trims" +#define TR_FADEIN "Fade In" +#define TR_FADEOUT "Fade Out" +#define TR_DEFAULT "(default)" +#define TR_CHECKTRIMS CENTER "\006Check\012Trims" +#define OFS_CHECKTRIMS CENTER_OFS+(9*FW) +#define TR_SWASHTYPE "Swash Type" +#define TR_COLLECTIVE TR("Collective","Collective source") +#define TR_SWASHRING "Swash Ring" +#define TR_ELEDIRECTION TR("ELE Direction","Long. cyc. direction") +#define TR_AILDIRECTION TR("AIL Direction","Lateral cyc. direction") +#define TR_COLDIRECTION TR("PIT Direction","Coll. pitch direction") +#define TR_MODE INDENT"Mode" +#define TR_NOFREEEXPO "No free expo!" +#define TR_NOFREEMIXER "No free mixer!" +#define TR_INSERTMIX "INSERT MIX " +#define TR_EDITMIX "EDIT MIX " +#define TR_SOURCE INDENT"Source" +#define TR_WEIGHT "Weight" +#define TR_EXPO TR("Expo","Exponential") +#define TR_SIDE "Side" +#define TR_DIFFERENTIAL "Differ" +#define TR_OFFSET INDENT"Offset" +#define TR_TRIM "Trim" +#define TR_DREX "DRex" +#define TR_CURVE "Curve" +#define TR_FLMODE TR("Mode","Modes") +#define TR_MIXWARNING "Warning" +#define TR_OFF "OFF" +#define TR_MULTPX "Multpx" +#define TR_DELAYDOWN "Delay Dn" +#define TR_DELAYUP "Delay Up" +#define TR_SLOWDOWN "Slow Dn" +#define TR_SLOWUP "Slow Up" +#define TR_MIXER "MIXER" +#define TR_CV "CV" +#define TR_GV "GV" +#define TR_ACHANNEL "A\004channel" +#define TR_RANGE INDENT"Range" +#define TR_BAR "Bar" +#define TR_ALARM INDENT"Alarm" +#define TR_USRDATA "UsrData" +#define TR_BLADES INDENT"Blades" +#define TR_SCREEN "Screen " +#define TR_SOUND_LABEL "Sound" +#define TR_LENGTH INDENT"Length" +#define TR_SPKRPITCH INDENT"Pitch" +#define TR_HAPTIC_LABEL "Haptic" +#define TR_HAPTICSTRENGTH INDENT"Strength" +#define TR_CONTRAST "Contrast" +#define TR_ALARMS_LABEL "Alarms" +#define TR_BATTERY_RANGE TR("Battery range","Battery meter range") +#define TR_BATTERYWARNING INDENT"Battery Low" +#define TR_INACTIVITYALARM INDENT"Inactivity" +#define TR_MEMORYWARNING INDENT"Memory Low" +#define TR_ALARMWARNING INDENT"Sound Off" +#define TR_RENAVIG "RotEnc Navig" +#define TR_THROTTLEREVERSE TR("T-Reverse", "Throttle reverse") +#define TR_MINUTEBEEP TR(INDENT"Minute",INDENT"Minute call") +#define TR_BEEPCOUNTDOWN INDENT"Countdown" +#define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistent") +#define TR_BACKLIGHT_LABEL "Backlight" +#define TR_BLDELAY INDENT"Duration" +#define TR_BLONBRIGHTNESS INDENT"ON Brightness" +#define TR_BLOFFBRIGHTNESS INDENT"OFF Brightness" +#define TR_SPLASHSCREEN "Splash screen" +#define TR_THROTTLEWARNING TR("T-Warning","Throttle Warning") +#define TR_SWITCHWARNING TR("S-Warning","Switch Warning") +#define TR_POTWARNING TR("Pot Warn.","Pot Warning") +#define TR_TIMEZONE TR("Time Zone","GPS Time zone") +#define TR_RXCHANNELORD TR("Rx Channel Ord","Default channel order") +#define TR_SLAVE "Slave" +#define TR_MODESRC "Mode\006% Source" +#define TR_MULTIPLIER "Multiplier" +#define TR_CAL "Cal" +#define TR_VTRIM "Trim- +" +#define TR_BG "BG:" +#define TR_MENUTOSTART CENTER "\010" TR_ENTER " TO START" +#define TR_SETMIDPOINT TR(CENTER "\004SET STICKS MIDPOINT",CENTER "\004CENTER STICKS/SLIDERS") +#define TR_MOVESTICKSPOTS CENTER "\006MOVE STICKS/POTS" +#define TR_RXBATT "Rx Batt:" +#define TR_TXnRX "Tx:\0Rx:" +#define OFS_RX 4 +#define TR_ACCEL "Acc:" +#define TR_NODATA CENTER "NO DATA" +#define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%" +#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us" +#define STR_US (STR_TMR1LATMAXUS+13) +#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us" +#define TR_TMR1JITTERUS "Tmr1 Jitter\037\124us" + +#if defined(CPUARM) + #define TR_TMIXMAXMS "Tmix max" + #define TR_FREESTACKMINB "Free Stack" +#else + #define TR_TMIXMAXMS "Tmix max\037\124ms" + #define TR_FREESTACKMINB "Free Stack\037\124b" +#endif + +#define TR_MENUTORESET CENTER TR_ENTER " to reset" +#define TR_PPM "PPM" +#define TR_CH "CH" +#define TR_MODEL "MODEL" +#define TR_FP "FM" +#define TR_MIX "MIX" +#define TR_EEPROMLOWMEM "FINSKA low mem" +#define TR_ALERT "\016ALERT" +#define TR_PRESSANYKEYTOSKIP "Press any key to skip" +#define TR_THROTTLENOTIDLE "Throttle not idle" +#define TR_ALARMSDISABLED "Alarms Disabled" +#define TR_PRESSANYKEY TR("\010Press any Key", "Press any Key") +#define TR_BADEEPROMDATA "Bad FINSKA Data" +#define TR_EEPROMFORMATTING "Formatting FINSKA" +#define TR_EEPROMOVERFLOW "FINSKA overflow" +#define TR_MENURADIOSETUP "RADIO SETUP" +#define TR_MENUDATEANDTIME "DATE AND TIME" +#define TR_MENUTRAINER "TRAINER" +#define TR_MENUVERSION "VERSION" +#define TR_MENUDIAG TR("SWITCHES","SWITCH TEST") +#define TR_MENUANA TR("ANAS","ANALOG INPUTS") +#define TR_MENUCALIBRATION "CALIBRATION" +#define TR_TRIMS2OFFSETS "\006Trims => Offsets" +#define TR_MENUMODELSEL TR("MODELSEL","MODEL SELECTION") +#define TR_MENUSETUP TR("SETUP","MODEL SETUP") +#define TR_MENUFLIGHTPHASE "FLIGHT MODE" +#define TR_MENUFLIGHTPHASES "FLIGHT MODES" +#define TR_MENUHELISETUP "HELI SETUP" + +#if defined(PCBTARANIS) + #define TR_MENUINPUTS "INPUTS" + #define TR_MENULIMITS "SERVOS" +#elif defined(PPM_CENTER_ADJUSTABLE) || defined(PPM_LIMITS_SYMETRICAL) // The right menu titles for the gurus ... + #define TR_MENUINPUTS "STICKS" + #define TR_MENULIMITS "SERVOS" +#else + #define TR_MENUINPUTS "DR/EXPO" + #define TR_MENULIMITS "LIMITS" +#endif + +#define TR_MENUCURVES "CURVES" +#define TR_MENUCURVE "CURVE" +#define TR_MENUCUSTOMSWITCH "CUSTOM SWITCH" +#define TR_MENUCUSTOMSWITCHES "CUSTOM SWITCHES" +#define TR_MENUCUSTOMFUNC "CUSTOM FUNCTIONS" +#define TR_MENUTELEMETRY "TELEMETRY" +#define TR_MENUTEMPLATES "TEMPLATES" +#define TR_MENUSTAT "STATS" +#define TR_MENUDEBUG "DEBUG" +#define TR_RXNUM TR("RxNum", INDENT"Receiver No.") +#define TR_SYNCMENU "[Sync]" +#define TR_LIMIT INDENT"Limit" +#define TR_MINRSSI "Min Rssi" +#define TR_LATITUDE "Latitude" +#define TR_LONGITUDE "Longitude" +#define TR_GPSCOORD TR("GPS Coords", "GPS coordinate format") +#define TR_VARIO TR("Vario", "Variometer") +#define TR_SHUTDOWN "SHUTTING DOWN" +#define TR_BATT_CALIB "Battery Calib" +#define TR_CURRENT_CALIB "Current Calib" +#define TR_VOLTAGE INDENT"Voltage" +#define TR_CURRENT INDENT"Current" +#define TR_SELECT_MODEL "Select Model" +#define TR_CREATE_MODEL "Create Model" +#define TR_COPY_MODEL "Copy Model" +#define TR_MOVE_MODEL "Move Model" +#define TR_BACKUP_MODEL "Backup Model" +#define TR_DELETE_MODEL "Delete Model" +#define TR_RESTORE_MODEL "Restore Model" +#define TR_SDCARD_ERROR "SDCARD Error" +#define TR_NO_SDCARD "No SDCARD" +#define TR_INCOMPATIBLE "Incompatible" +#define TR_WARNING "WARNING" +#define TR_EEPROMWARN "FINSKA" +#define TR_THROTTLEWARN "THROTTLE" +#define TR_ALARMSWARN "ALARMS" +#define TR_SWITCHWARN TR("SWITCH","CONTROL") +#define TR_INVERT_THR TR("Invert Thr?","Invert Throttle?") +#define TR_SPEAKER_VOLUME INDENT "Volume" +#define TR_LCD "LCD" +#define TR_BRIGHTNESS INDENT "Brightness" +#define TR_CPU_TEMP "CPU Temp.\016>" +#define TR_CPU_CURRENT "Current\022>" +#define TR_CPU_MAH "Consumpt." +#define TR_COPROC "CoProc." +#define TR_COPROC_TEMP "MB Temp. \016>" +#define TR_CAPAWARNING INDENT "Capacity Low" +#define TR_TEMPWARNING INDENT "Overheat" +#define TR_FUNC "Func" +#define TR_V1 "V1" +#define TR_V2 "V2" +#define TR_DURATION "Duration" +#define TR_DELAY "Delay" +#define TR_SD_CARD "SD CARD" +#define TR_SDHC_CARD "SD-HC CARD" +#define TR_NO_SOUNDS_ON_SD "No Sounds on SD" +#define TR_NO_MODELS_ON_SD "No Models on SD" +#define TR_NO_BITMAPS_ON_SD "No Bitmaps on SD" +#define TR_PLAY_FILE "Play" +#define TR_DELETE_FILE "Delete" +#define TR_COPY_FILE "Copy" +#define TR_RENAME_FILE "Rename" +#define TR_ASSIGN_BITMAP "Assign Bitmap" +#define TR_REMOVED " removed" +#define TR_SD_INFO "Information" +#define TR_SD_FORMAT "Format" +#define TR_NA "N/A" +#define TR_HARDWARE "HARDWARE" +#define TR_FORMATTING "Formatting..." +#define TR_TEMP_CALIB "Temp. Calib" +#define TR_TIME "Time" +#define TR_BAUDRATE "BT Baudrate" +#define TR_SD_INFO_TITLE "SD INFO" +#define TR_SD_TYPE "Type:" +#define TR_SD_SPEED "Speed:" +#define TR_SD_SECTORS "Sectors:" +#define TR_SD_SIZE "Size:" +#define TR_TYPE "Type" +#define TR_GLOBAL_VARS "Global Variables" +#define TR_GLOBAL_VAR "Global Variable" +#define TR_MENUGLOBALVARS "GLOBAL VARIABLES" +#define TR_OWN "Own" +#define TR_DATE "Date" +#define TR_ROTARY_ENCODER "R.Encs" +#define TR_CHANNELS_MONITOR "CHANNEL MONITOR" +#define TR_INTERNALRF "Internal RF" +#define TR_EXTERNALRF "External RF" +#define TR_FAILSAFE INDENT "Failsafe mode" +#define TR_FAILSAFESET "FAILSAFE SETTINGS" +#define TR_COUNTRYCODE "Country Code" +#define TR_VOICELANG "Voice Language" +#define TR_UNITSSYSTEM "Units" +#define TR_EDIT "Edit" +#define TR_INSERT_BEFORE "Insert Before" +#define TR_INSERT_AFTER "Insert After" +#define TR_COPY "Copy" +#define TR_MOVE "Move" +#define TR_PASTE "Paste" +#define TR_DELETE "Delete" +#define TR_INSERT "Insert" +#define TR_RESET_FLIGHT "Reset Flight" +#define TR_RESET_TIMER1 "Reset Timer1" +#define TR_RESET_TIMER2 "Reset Timer2" +#define TR_RESET_TELEMETRY "Reset Telemetry" +#define TR_STATISTICS "Statistics" +#define TR_ABOUT_US "About" +#define TR_AND_SWITCH "AND Switch" +#define TR_CF "CF" +#define TR_SPEAKER INDENT"Speaker" +#define TR_BUZZER INDENT"Buzzer" +#define TR_BYTES "bytes" +#define TR_MODULE_BIND "[Bind]" +#define TR_MODULE_RANGE "[Range]" +#define TR_RESET_BTN "[Reset]" +#define TR_SET "[Set]" +#define TR_TRAINER "Trainer" +#define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!" +#define TR_MODELIDUSED TR("ID already used","Model ID already used") +#define TR_MODULE INDENT "Module" +#define TR_CHANNELRANGE INDENT "Channel Range" +#define TR_LOWALARM INDENT "Low Alarm" +#define TR_CRITICALALARM INDENT "Critical Alarm" +#define TR_PERSISTENT_MAH INDENT "Store mAh" +#define TR_CHECKLIST "Display Checklist" +#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") +#define TR_UART3MODE "Serial port" +#define TR_POT1TYPE "S1 Type" +#define TR_POT2TYPE "S2 Type" + +#if defined(MAVLINK) + #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" + #define TR_MAVLINK_PC_RSSI_EN_LABEL "PC RSSI EN" + #define TR_MAVMENUSETUP_TITLE "Mavlink Setup" + #define TR_MAVLINK_BAUD_LABEL "Baudrate" + #define TR_MAVLINK_INFOS "INFOS" + #define TR_MAVLINK_MODE "MODE" + #define TR_MAVLINK_CUR_MODE "Current Mode" + #define TR_MAVLINK_ARMED "Armed" + #define TR_MAVLINK_BAT_MENU_TITLE "BAT RSSI" + #define TR_MAVLINK_BATTERY_LABEL "Flight Battery status" + #define TR_MAVLINK_RC_RSSI_LABEL "RC RSSI" + #define TR_MAVLINK_PC_RSSI_LABEL "PC RSSI" + #define TR_MAVLINK_NAV_MENU_TITLE "NAV" + #define TR_MAVLINK_COURSE "Course" + #define TR_MAVLINK_HEADING "Heading" + #define TR_MAVLINK_BEARING "Bearing" + #define TR_MAVLINK_ALTITUDE "Altitude" + #define TR_MAVLINK_GPS "GPS" + #define TR_MAVLINK_NO_FIX "NO Fix" + #define TR_MAVLINK_SAT "SAT" + #define TR_MAVLINK_HDOP "HDOP" + #define TR_MAVLINK_LAT "LAT" + #define TR_MAVLINK_LON "LON" +#endif + +// Taranis column headers +#define TR_PHASES_HEADERS { " Name ", " Switch ", " Rudder Trim ", " Elevator Trim ", " Throttle Trim ", " Aileron Trim ", " Fade In ", " Fade Out " } +#define TR_LIMITS_HEADERS { " Name ", " Subtrim ", " Min ", " Max ", " Direction ", " Curve ", " PPM Center ", " Subtrim mode " } +#define TR_CSW_HEADERS { " Function ", " V1 ", " V2 ", " V2 ", " AND Switch ", " Duration ", " Delay " } + +// About screen +#define TR_ABOUTUS TR(" ABOUT ", "ABOUT") + +#define TR_ABOUT_OPENTX_1 TR("OpenTX\001is\001open\001source,\001non", "OpenTX is open source, non-") +#define TR_ABOUT_OPENTX_2 TR("commercial,\001wo\001warranties.", "commercial and comes with no") +#define TR_ABOUT_OPENTX_3 TR("It\001was\001developed\001for\001free.", "warranties. It was developed") +#define TR_ABOUT_OPENTX_4 TR("Support through donations", "for free. Support through") +#define TR_ABOUT_OPENTX_5 TR("is welcome!", "donations is welcome!") + +#define TR_ABOUT_BERTRAND_1 "Bertrand Songis" +#define TR_ABOUT_BERTRAND_2 "OpenTX main author" +#define TR_ABOUT_BERTRAND_3 "Companion9x co-author" + +#define TR_ABOUT_MIKE_1 "Mike Blandford" +#define TR_ABOUT_MIKE_2 "Code and drivers guru" +#define TR_ABOUT_MIKE_3 TR("Arguably,\001one\001of\001the\001best", "Arguably, one of the best") +#define TR_ABOUT_MIKE_4 "Inspirational" + +#define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" +#define TR_ABOUT_ROMOLO_2 "Companion9x co-author" +#define TR_ABOUT_ROMOLO_3 "" + +#define TR_ABOUT_ANDRE_1 "Andre Bernet" +#define TR_ABOUT_ANDRE_2 "Functionality, usability," +#define TR_ABOUT_ANDRE_3 "debugging, documentation" + +#define TR_ABOUT_ROB_1 "Rob Thomson" +#define TR_ABOUT_ROB_2 "openrcforums webmaster" + +#define TR_ABOUT_MARTIN_1 "Martin Hotar" +#define TR_ABOUT_MARTIN_2 "Graphics designer" + +#if defined(PCBTARANIS) + #define TR_ABOUT_HARDWARE_1 "FrSky" + #define TR_ABOUT_HARDWARE_2 "Hardware designer/producer" + #define TR_ABOUT_HARDWARE_3 "Firmware contributor" +#else + #define TR_ABOUT_HARDWARE_1 "Brent Nelson" + #define TR_ABOUT_HARDWARE_2 "Sky9x designer/producer" + #define TR_ABOUT_HARDWARE_3 "" +#endif + +#define TR_ABOUT_PARENTS_1 "Parent projects" +#define TR_ABOUT_PARENTS_2 TR("Ersky9x (Mike Blandford)", "Ersky9x (Mike Blandford)") +#define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)" +#define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)" + +#define TR_CHR_SHORT 's' +#define TR_CHR_LONG 'l' +#define TR_CHR_TOGGLE 't' +#define TR_CHR_HOUR 'h' +#define TR_CHR_INPUT 'I' // Values between A-I will work + +#define TR_BEEP_VOLUME "Beep Volume" +#define TR_WAV_VOLUME "Wav Volume" +#define TR_VARIO_VOLUME "Vario Volume" +#define TR_BG_VOLUME "Bg Volume" + +#define TR_TOP_BAR "Top Bar" +#define TR_ALTITUDE INDENT "Altitude" +#define TR_MODS_FORBIDDEN "Modifications forbidden!" +#define TR_UNLOCKED "Unlocked" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index d568e0ccb..5baae5672 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -261,7 +261,7 @@ #define TR_RSSI_0 "Tx\0 " #define TR_RSSI_1 "Rx\0 " #endif -#define TR_VTELEMCHNS "---\0""Batt""Chr1""Chr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vit\0""Dist""AltG""Elem""Velm""Vfas""Cour""Cnsm""Puis""AccX""AccY""AccZ""Cap\0""VitV""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vit+""Dst+""Cur+""Pwr+""Acc\0""Time" +#define TR_VTELEMCHNS "---\0""Batt""Chr1""Chr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vit\0""Dist""AltG""Elem""Velm""Vfas""Cour""Cnsm""Puis""AccX""AccY""AccZ""Cap\0""VitV""ASpd""dTE\0""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vit+""Dst+""Cel-""Vfs-""Cur+""Pwr+""Acc\0""Time" #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\012") diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 9a5571c86..1a16a18b2 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -261,7 +261,7 @@ #define TR_RSSI_0 "Tx\0 " #define TR_RSSI_1 "Rx\0 " #endif -#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vel\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsm""Powr""AccX""AccY""AccZ""Dir\0""VelV""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vel+""Dst+""Cur+""Pwr+""Acc\0""Time" +#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vel\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsm""Powr""AccX""AccY""AccZ""Dir\0""VelV""ASpd""dTE\0""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vel+""Dst+""Cel-""Vfs-""Cur+""Pwr+""Acc\0""Time" #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\011") diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index fff5b7da2..a06512468 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -45,7 +45,7 @@ #define TR_OFFON "WYŁ""ZAŁ" #define LEN_MMMINV "\003" -#define TR_MMMINV "---""INV" +#define TR_MMMINV "---""REV" #define LEN_NCHANNELS "\004" #define TR_NCHANNELS "\0014KN\0016KN\0018KN10KN12KN14KN16KN" @@ -148,7 +148,7 @@ #define TR_VMLTPX2 "+=""*="":=" #define LEN_VMIXTRIMS "\004" -#define TR_VMIXTRIMS "WYł\0""ZAŁ\0""SK\0 ""SW\0 ""GAZ\0""Lotk" +#define TR_VMIXTRIMS "WYŁ\0""ZAŁ\0""SK\0 ""SW\0 ""GAZ\0""Lotk" #if defined(PCBTARANIS) #define TR_CSWTIMER "Timer" @@ -212,10 +212,10 @@ #define TR_SDCLOGS "[Logować]\0 " #endif -#ifdef GVARS - #define TR_CFN_ADJUST_GVAR "Ustaw \0 " +#if defined(GVARS) + #define TR_ADJUST_GVAR "Ustaw \0 " #else - #define TR_CFN_ADJUST_GVAR "[UstawZG]\0" + #define TR_ADJUST_GVAR "[UstawZG]\0" #endif #ifdef DEBUG @@ -224,14 +224,25 @@ #define TR_CFN_TEST #endif +//#if defined(CPUARM) +// #define TR_VFSWFUNC "Bezp.\0 ""Trener \0 ""Inst-Trim ""Reset " TR_ADJUST_GVAR "Głośność\0 " TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Podświetl. " TR_CFN_TEST +//#elif defined(PCBGRUVIN9X) +// #define TR_VFSWFUNC "Bezp.\0 ""Trener \0 ""Inst-Trim ""Reset " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Podświetl. " TR_CFN_TEST +//#else +// #define TR_VFSWFUNC "Bezp.\0 ""Trener \0 ""Inst-Trim ""Reset " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "Podświetl. " TR_CFN_TEST +//#endif + + #if defined(CPUARM) - #define TR_VFSWFUNC "Bezp.\0 ""Trener \0 ""Inst-Trim ""Reset " TR_ADJUST_GVAR "Głośność\0 " TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Podświetl. " TR_CFN_TEST + #define TR_VFSWFUNC "Safety\0 ""Trainer\0 ""Inst. Trim""Reset\0 ""Set \0 " TR_ADJUST_GVAR "Volume\0 " TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0" TR_CFN_TEST #elif defined(PCBGRUVIN9X) - #define TR_VFSWFUNC "Bezp.\0 ""Trener \0 ""Inst-Trim ""Reset " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Podświetl. " TR_CFN_TEST + #define TR_VFSWFUNC "Safety\0 ""Trainer\0 ""Inst. Trim""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0" TR_CFN_TEST #else - #define TR_VFSWFUNC "Bezp.\0 ""Trener \0 ""Inst-Trim ""Reset " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "Podświetl. " TR_CFN_TEST + #define TR_VFSWFUNC "Safety\0 ""Trainer\0 ""Inst. Trim""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "Backlight\0" TR_CFN_TEST #endif + + #define LEN_VFSWRESET TR("\004", "\012") #if defined(FRSKY) @@ -261,7 +272,7 @@ #define TR_RSSI_0 "Tx\0 " #define TR_RSSI_1 "Rx\0 " #endif -#define TR_VTELEMCHNS "---\0""Bat\0""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Wys\0""Rpm\0""Pali""T1\0 ""T2\0 ""Spd\0""Dyst""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Moc\0""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Wys-""Wys+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cur+""Moc+""Acc\0""Time" +#define TR_VTELEMCHNS "---\0""Bat\0""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Wys\0""Rpm\0""Pali""T1\0 ""T2\0 ""Spd\0""Dyst""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Moc\0""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0""A1-\0""A2-\0""Wys-""Wys+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cel-""Vfs-""Cur+""Moc+""Acc\0""Time" #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\012") diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 41ac94296..68d0a8616 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -261,7 +261,7 @@ #define TR_RSSI_0 "Tx\0 " #define TR_RSSI_1 "Rx\0 " #endif -#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VVel""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vel+""Dst+""Cur+""Pwr+""Acc\0""Hora" +#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VVel""ASpd""dTE\0""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vel+""Dst+""Cel-""Vfs-""Cur+""Pwr+""Acc\0""Hora" #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 5e117d67c..ef4d117be 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -261,7 +261,7 @@ #define TR_RSSI_0 "Tx\0 " #define TR_RSSI_1 "Rx\0 " #endif -#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Höjd""Varv""Tank""T1\0 ""T2\0 ""Fart""Avst""GHjd""Batt""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VFrt""A1-\0""A2-\0""Hjd-""Hjd+""Rpm+""T1+\0""T2+\0""Frt+""Avs+""Cur+""Pwr+""Acc\0""Tid\0" +#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Höjd""Varv""Tank""T1\0 ""T2\0 ""Fart""Avst""GHjd""Batt""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VFrt""ASpd""dTE\0""A1-\0""A2-\0""Hjd-""Hjd+""Rpm+""T1+\0""T2+\0""Frt+""Avs+""Cur+""Pwr+""Acc\0""Tid\0" #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") diff --git a/radio/util/translate.py b/radio/util/translate.py index a0535537f..a5c32b52d 100644 --- a/radio/util/translate.py +++ b/radio/util/translate.py @@ -40,6 +40,13 @@ translations = {'cz': [('\\200', u'á'), 'es': [('\\200', u'Ñ'), ('\\201', u'ñ')], + 'fi': [('\\200', u'å'), + ('\\201', u'ä'), + ('\\202', u'ö'), + ('\\203', u'Å'), + ('\\204', u'Ä'), + ('\\205', u'Ö')], + 'fr': [('\\200', u'é'), ('\\201', u'è'), ('\\202', u'à'), From c23a096a7325afe40d70e0424ca88f07ccf75fc0 Mon Sep 17 00:00:00 2001 From: Kjell Kernen Date: Mon, 17 Feb 2014 23:47:40 +0100 Subject: [PATCH 10/85] Almost all global settings wrapped in protective object to guarantee type safety and protect against tag spelling errors (I have found and corrected a lot of those!). Joystick settings and burner configuration is not yet within the global object. --- companion/src/appdata.h | 99 +-- companion/src/apppreferencesdialog.cpp | 86 +-- companion/src/burndialog.cpp | 49 +- companion/src/customizesplashdialog.cpp | 34 +- companion/src/eeprominterface.cpp | 9 +- companion/src/fwpreferencesdialog.cpp | 22 +- companion/src/helpers.cpp | 4 +- companion/src/lcdwidget.h | 6 +- companion/src/logsdialog.cpp | 12 +- companion/src/main.cpp | 14 +- companion/src/mainwindow.cpp | 65 +- companion/src/mainwindow.h | 1 - companion/src/mdichild.cpp | 44 +- companion/src/preferencesdialog.cpp | 827 ------------------------ companion/src/preferencesdialog.h | 65 -- companion/src/simulatordialog.cpp | 12 +- companion/src/splashlibrary.cpp | 7 +- companion/src/xsimulatordialog.cpp | 4 +- 18 files changed, 204 insertions(+), 1156 deletions(-) delete mode 100644 companion/src/preferencesdialog.cpp delete mode 100644 companion/src/preferencesdialog.h diff --git a/companion/src/appdata.h b/companion/src/appdata.h index 0a1d33589..044bc9b48 100644 --- a/companion/src/appdata.h +++ b/companion/src/appdata.h @@ -187,6 +187,7 @@ class Profile:DataObj QString _SplashFileName; bool _burnFirmware; bool _rename_firmware_files; + bool _patchImage; int _default_channel_order; int _default_mode; @@ -212,6 +213,7 @@ class Profile:DataObj QString SplashFileName() { return _SplashFileName; } bool burnFirmware() { return _burnFirmware; } bool rename_firmware_files() { return _rename_firmware_files; } + bool patchImage() { return _patchImage; } int default_channel_order() { return _default_channel_order; } int default_mode() { return _default_mode; } @@ -240,6 +242,7 @@ class Profile:DataObj void SplashFileName (const QString str) { store(str, _SplashFileName, "SplashFileName" ,"Profiles", QString("profile%1").arg(index));} void burnFirmware (const bool bl) { store(bl, _burnFirmware, "burnFirmware" ,"Profiles", QString("profile%1").arg(index));} void rename_firmware_files (const bool bl) { store(bl, _rename_firmware_files, "rename_firmware_files" ,"Profiles", QString("profile%1").arg(index));} + void patchImage (const bool bl) { store(bl, _patchImage, "patchImage" ,"Profiles", QString("profile%1").arg(index));} void default_channel_order (const int it) { store(it, _default_channel_order, "default_channel_order" ,"Profiles", QString("profile%1").arg(index));} void default_mode (const int it) { store(it, _default_mode, "default_mode" ,"Profiles", QString("profile%1").arg(index));} @@ -295,6 +298,7 @@ class Profile:DataObj getset( _SplashFileName, "SplashFileName" ,"" ,"Profiles", QString("profile%1").arg(index)); getset( _burnFirmware, "burnFirmware" ,false ,"Profiles", QString("profile%1").arg(index)); getset( _rename_firmware_files, "rename_firmware_files" ,false ,"Profiles", QString("profile%1").arg(index)); + getset( _patchImage, "patchImage" ,false ,"Profiles", QString("profile%1").arg(index)); getset( _default_channel_order, "default_channel_order" ,0 ,"Profiles", QString("profile%1").arg(index)); getset( _default_mode, "default_mode" ,1 ,"Profiles", QString("profile%1").arg(index)); @@ -322,6 +326,7 @@ class Profile:DataObj _SplashFileName = ""; _burnFirmware = false; _rename_firmware_files = false; + _patchImage = false; _default_channel_order = 0; _default_mode = 1; @@ -353,18 +358,16 @@ class AppData:DataObj { // All the global variables public: - Profile profile[MAX_PROFILES]; + Profile pro[MAX_PROFILES]; - private: + private: QStringList _recentFileList; QByteArray _mainWindowGeometry; QByteArray _mainWindowState; - QString _firmware; QString _locale; QString _cpu_id; - QString _Name; - QString _SplashFileName; + QString _lastFw; QString _modelEditGeometry; QString _backupPath; @@ -372,16 +375,15 @@ class AppData:DataObj QString _lastDir; QString _lastFlashDir; QString _lastImagesDir; + QString _lastLogDir; QString _libraryPath; - QString _sdPath; QString _snapshotpath; bool _backupEnable; bool _backupOnFlash; - bool _burnFirmware; bool _maximized; bool _js_support; - bool _rename_firmware_files; + bool _rev4asupport; bool _show_splash; bool _snapshot_to_clipboard; bool _startup_check_companion; @@ -390,8 +392,6 @@ class AppData:DataObj bool _wizardEnable; int _backLight; - int _default_channel_order; - int _default_mode; int _embedded_splashes; // Shouldn't this be bool ?? int _fwserver; int _generalEditTab; @@ -403,8 +403,6 @@ class AppData:DataObj int _theme; int _warningId; - // Storage functions - public: // All the get declarations @@ -412,11 +410,9 @@ public: QByteArray mainWindowGeometry(){ return _mainWindowGeometry; } QByteArray mainWindowState() { return _mainWindowState; } - QString firmware() { return _firmware; } QString locale() { return _locale; } QString cpu_id() { return _cpu_id; } - QString Name() { return _Name; } - QString SplashFileName() { return _SplashFileName; } + QString lastFw() { return _lastFw; } QString modelEditGeometry() { return _modelEditGeometry; } QString backupPath() { return _backupPath; } @@ -424,16 +420,15 @@ public: QString lastDir() { return _lastDir; } QString lastFlashDir() { return _lastFlashDir; } QString lastImagesDir() { return _lastImagesDir; } + QString lastLogDir() { return _lastLogDir; } QString libraryPath() { return _libraryPath; } - QString sdPath() { return _sdPath; } QString snapshotpath() { return _snapshotpath; } bool backupEnable() { return _backupEnable; } bool backupOnFlash() { return _backupOnFlash; } - bool burnFirmware() { return _burnFirmware; } bool js_support() { return _js_support; } + bool rev4asupport() { return _rev4asupport; } bool maximized() { return _maximized; } - bool rename_firmware_files() { return _rename_firmware_files; } bool show_splash() { return _show_splash; } bool snapshot_to_clipboard() { return _snapshot_to_clipboard; } bool startup_check_companion() { return _startup_check_companion;} @@ -442,8 +437,6 @@ public: bool wizardEnable() { return _wizardEnable; } int backLight() { return _backLight; } - int default_channel_order() { return _default_channel_order; } - int default_mode() { return _default_mode; } int embedded_splashes() { return _embedded_splashes; } int fwserver() { return _fwserver; } int generalEditTab() { return _generalEditTab; } @@ -455,16 +448,14 @@ public: int theme() { return _theme; } int warningId() { return _warningId; } - // All the set declarations +// All the set declarations void recentFileList (const QStringList l) { store(l, _recentFileList, "recentFileList" );} void mainWindowGeometry (const QByteArray a) { store(a, _mainWindowGeometry, "mainWindowGeometry");} void mainWindowState (const QByteArray a) { store(a, _mainWindowState, "mainWindowState" );} - void firmware (const QString str) { store(str, _firmware, "firmware" );} void locale (const QString str) { store(str, _locale, "locale" );} void cpu_id (const QString str) { store(str, _cpu_id, "cpu_id" );} - void Name (const QString str) { store(str, _Name, "Name" );} - void SplashFileName (const QString str) { store(str, _SplashFileName, "SplashFileName" );} + void lastFw (const QString str) { store(str, _lastFw, "lastFw" );} void modelEditGeometry (const QString str) { store(str, _modelEditGeometry, "modelEditGeometry" );} void backupPath (const QString str) { store(str, _backupPath, "backupPath" );} @@ -472,16 +463,15 @@ public: void lastDir (const QString str) { store(str, _lastDir, "lastDir" );} void lastFlashDir (const QString str) { store(str, _lastFlashDir, "lastFlashDir" );} void lastImagesDir (const QString str) { store(str, _lastImagesDir, "lastImagesDir" );} + void lastLogDir (const QString str) { store(str, _lastLogDir, "lastLogDir" );} void libraryPath (const QString str) { store(str, _libraryPath, "libraryPath" );} - void sdPath (const QString str) { store(str, _sdPath, "sdPath" );} void snapshotpath (const QString str) { store(str, _snapshotpath, "snapshotpath" );} void backupEnable (const bool bl) { store(bl, _backupEnable, "backupEnable" );} void backupOnFlash (const bool bl) { store(bl, _backupOnFlash, "backupOnFlash" );} - void burnFirmware (const bool bl) { store(bl, _burnFirmware, "burnFirmware" );} void maximized (const bool bl) { store(bl, _maximized, "maximized" );} void js_support (const bool bl) { store(bl, _js_support, "js_support" );} - void rename_firmware_files (const bool bl) { store(bl, _rename_firmware_files, "rename_firmware_files" );} + void rev4asupport (const bool bl) { store(bl, _rev4asupport, "rev4asupport" );} void show_splash (const bool bl) { store(bl, _show_splash, "show_splash" );} void snapshot_to_clipboard (const bool bl) { store(bl, _snapshot_to_clipboard, "snapshot_to_clipboard" );} void startup_check_companion (const bool bl) { store(bl, _startup_check_companion, "startup_check_companion" );} @@ -490,8 +480,6 @@ public: void wizardEnable (const bool bl) { store(bl, _wizardEnable, "wizardEnable" );} void backLight (const int it) { store(it, _backLight, "backLight" );} - void default_channel_order (const int it) { store(it, _default_channel_order, "default_channel_order" );} - void default_mode (const int it) { store(it, _default_mode, "default_mode" );} void embedded_splashes (const int it) { store(it, _embedded_splashes, "embedded_splashes" );} void fwserver (const int it) { store(it, _fwserver, "fwserver" );} void generalEditTab (const int it) { store(it, _generalEditTab, "generalEditTab" );} @@ -506,22 +494,48 @@ public: // Constructor AppData() { - // Start by hijacking all left over settings from companion9x, but only do it one time + //Initialize the profiles + for (int i=0; ichannelorderCB->currentIndex()); - glob.default_mode(ui->stickmodeCB->currentIndex()); - glob.rename_firmware_files(ui->renameFirmware->isChecked()); - glob.burnFirmware(ui->burnFirmware->isChecked()); glob.profileId(ui->profileIndexLE->text().toInt()); - glob.Name(ui->profileNameLE->text()); - glob.sdPath(ui->sdPath->text()); - glob.SplashFileName(ui->SplashFileName->text()); - glob.firmware(ui->firmwareLE->text()); + + glob.pro[glob.profileId()].default_channel_order(ui->channelorderCB->currentIndex()); + glob.pro[glob.profileId()].default_mode(ui->stickmodeCB->currentIndex()); + glob.pro[glob.profileId()].rename_firmware_files(ui->renameFirmware->isChecked()); + glob.pro[glob.profileId()].burnFirmware(ui->burnFirmware->isChecked()); + glob.pro[glob.profileId()].Name(ui->profileNameLE->text()); + glob.pro[glob.profileId()].sdPath(ui->sdPath->text()); + glob.pro[glob.profileId()].SplashFileName(ui->SplashFileName->text()); + glob.pro[glob.profileId()].firmware(ui->firmwareLE->text()); saveProfile(); } @@ -82,7 +84,7 @@ void appPreferencesDialog::on_snapshotPathButton_clicked() void appPreferencesDialog::initSettings() { ui->snapshotClipboardCKB->setChecked(glob.snapshot_to_clipboard()); - ui->burnFirmware->setChecked(glob.burnFirmware()); + ui->burnFirmware->setChecked(glob.pro[glob.profileId()].burnFirmware()); ui->snapshotPath->setText(glob.snapshotpath()); ui->snapshotPath->setReadOnly(true); if (ui->snapshotClipboardCKB->isChecked()) @@ -141,15 +143,15 @@ void appPreferencesDialog::initSettings() } #endif // Profile Tab Inits - ui->channelorderCB->setCurrentIndex(glob.default_channel_order()); - ui->stickmodeCB->setCurrentIndex(glob.default_mode()); - ui->renameFirmware->setChecked(glob.rename_firmware_files()); - ui->sdPath->setText(glob.sdPath()); + ui->channelorderCB->setCurrentIndex(glob.pro[glob.profileId()].default_channel_order()); + ui->stickmodeCB->setCurrentIndex(glob.pro[glob.profileId()].default_mode()); + ui->renameFirmware->setChecked(glob.pro[glob.profileId()].rename_firmware_files()); + ui->sdPath->setText(glob.pro[glob.profileId()].sdPath()); ui->profileIndexLE->setText(QString("%1").arg(glob.profileId())); - ui->profileNameLE->setText(glob.Name()); - ui->firmwareLE->setText(glob.firmware()); - ui->SplashFileName->setText(glob.SplashFileName()); - displayImage( glob.SplashFileName() ); + ui->profileNameLE->setText(glob.pro[glob.profileId()].Name()); + ui->firmwareLE->setText(glob.pro[glob.profileId()].firmware()); + ui->SplashFileName->setText(glob.pro[glob.profileId()].SplashFileName()); + displayImage( glob.pro[glob.profileId()].SplashFileName() ); } void appPreferencesDialog::on_libraryPathButton_clicked() @@ -230,7 +232,7 @@ void appPreferencesDialog::on_joystickcalButton_clicked() { void appPreferencesDialog::on_sdPathButton_clicked() { - QString fileName = QFileDialog::getExistingDirectory(this,tr("Select the folder replicating your SD structure"), glob.sdPath()); + QString fileName = QFileDialog::getExistingDirectory(this,tr("Select the folder replicating your SD structure"), glob.pro[glob.profileId()].sdPath()); if (!fileName.isEmpty()) { ui->sdPath->setText(fileName); } @@ -242,63 +244,41 @@ void appPreferencesDialog::saveProfile() if (ui->profileNameLE->text().isEmpty()) ui->profileNameLE->setText("----"); - glob.profile[glob.profileId()].Name( ui->profileNameLE->text() ); - glob.profile[glob.profileId()].default_channel_order( ui->channelorderCB->currentIndex()); - glob.profile[glob.profileId()].default_mode( ui->stickmodeCB->currentIndex()); - glob.profile[glob.profileId()].burnFirmware( ui->burnFirmware->isChecked()); - glob.profile[glob.profileId()].rename_firmware_files( ui->renameFirmware->isChecked()); - glob.profile[glob.profileId()].sdPath( ui->sdPath->text()); - glob.profile[glob.profileId()].SplashFileName( ui->SplashFileName->text()); - glob.profile[glob.profileId()].firmware( ui->firmwareLE->text()); -} - -void appPreferencesDialog::loadFromProfile() -{ - int i = glob.profileId(); - glob.Name( glob.profile[i].Name() ); - glob.default_channel_order( glob.profile[i].default_channel_order()); - glob.default_mode( glob.profile[i].default_mode()); - glob.burnFirmware( glob.profile[i].burnFirmware()); - glob.rename_firmware_files( glob.profile[i].rename_firmware_files()); - glob.sdPath( glob.profile[i].sdPath()); - glob.SplashFileName( glob.profile[i].SplashFileName()); - glob.firmware( glob.profile[i].firmware()); + glob.pro[glob.profileId()].Name( ui->profileNameLE->text() ); + glob.pro[glob.profileId()].default_channel_order( ui->channelorderCB->currentIndex()); + glob.pro[glob.profileId()].default_mode( ui->stickmodeCB->currentIndex()); + glob.pro[glob.profileId()].burnFirmware( ui->burnFirmware->isChecked()); + glob.pro[glob.profileId()].rename_firmware_files( ui->renameFirmware->isChecked()); + glob.pro[glob.profileId()].sdPath( ui->sdPath->text()); + glob.pro[glob.profileId()].SplashFileName( ui->SplashFileName->text()); + glob.pro[glob.profileId()].firmware( ui->firmwareLE->text()); } void appPreferencesDialog::on_removeProfileButton_clicked() { - QSettings settings; if ( glob.profileId() == 0 ) QMessageBox::information(this, tr("Not possible to remove profile"), tr("The default profile can not be removed.")); else { - glob.profile[glob.profileId()].remove(); + glob.pro[glob.profileId()].remove(); glob.profileId( 0 ); - loadFromProfile(); initSettings(); } } bool appPreferencesDialog::displayImage( QString fileName ) { - // Start by filling the pixmap with white + // Start by clearing the pixmap ui->imageLabel->setPixmap(QPixmap()); QImage image(fileName); if (image.isNull()) return false; -// This code below just figures out if the width of the latest firmware is 128 or 212. It works , but... - QString filePath1 = glob.lastFlashDir() + "/" + glob.firmware() + ".bin"; - QString filePath2 = glob.lastFlashDir() + "/" + glob.firmware() + ".hex"; - QFile file(filePath1); - if (!file.exists()) - filePath1 = filePath2; + // Use the firmware name to determine splash width int width = SPLASH_WIDTH; - FlashInterface flash(filePath1); - if (flash.hasSplash()) - width = flash.getSplashWidth(); // Returns SPLASHX9D_HEIGHT if filePath1 does not exist! -// There must be a cleaner way of finding out the width of the firmware splash! + if (glob.pro[glob.profileId()].firmware().contains("taranis")) + width = SPLASHX9D_WIDTH; ui->imageLabel->setPixmap(QPixmap::fromImage(image.scaled(width, SPLASH_HEIGHT))); if (width==SPLASHX9D_WIDTH) { diff --git a/companion/src/burndialog.cpp b/companion/src/burndialog.cpp index bfdf0bc76..05c0692d7 100644 --- a/companion/src/burndialog.cpp +++ b/companion/src/burndialog.cpp @@ -7,6 +7,7 @@ #include "splashlibrary.h" #include "flashinterface.h" #include "hexinterface.h" +#include "appdata.h" burnDialog::burnDialog(QWidget *parent, int Type, QString * fileName, bool * backupEE, QString DocName): QDialog(parent), @@ -58,15 +59,7 @@ burnDialog::burnDialog(QWidget *parent, int Type, QString * fileName, bool * bac else { setWindowTitle(tr("Write Models and Settings in %1 to TX").arg(DocName)); } - QSettings settings; - int profileid=settings.value("profileId", 1).toInt(); - settings.beginGroup("Profiles"); - QString profile=QString("profile%1").arg(profileid); - settings.beginGroup(profile); - QString Name=settings.value("Name","").toString(); - settings.endGroup(); - settings.endGroup(); - ui->profile_label->setText(tr("Current profile")+QString(": ")+Name); + ui->profile_label->setText(tr("Current profile")+QString(": ")+glob.pro[glob.profileId()].Name()); } if (!hexfileName->isEmpty()) { ui->FWFileName->setText(*hexfileName); @@ -77,9 +70,8 @@ burnDialog::burnDialog(QWidget *parent, int Type, QString * fileName, bool * bac burnraw=false; if (checkeEprom(*hexfileName)) { QSettings settings; - int profileid=settings.value("profileId", 1).toInt(); settings.beginGroup("Profiles"); - QString profile=QString("profile%1").arg(profileid); + QString profile=QString("profile%1").arg(glob.profileId()); settings.beginGroup(profile); QString Name=settings.value("Name","").toString(); QString calib=settings.value("StickPotCalib","").toString(); @@ -119,9 +111,8 @@ burnDialog::burnDialog(QWidget *parent, int Type, QString * fileName, bool * bac hexfileName->clear(); } else if (Type==2) { - QSettings settings; QString FileName; - FileName = settings.value("lastFw").toString(); + FileName = glob.lastFw(); QFile file(FileName); if (file.exists()) { checkFw(FileName); @@ -138,7 +129,7 @@ burnDialog::~burnDialog() void burnDialog::on_FlashLoadButton_clicked() { QString fileName; - QSettings settings; + ui->ImageLoadButton->setDisabled(true); ui->libraryButton->setDisabled(true); ui->InvertColorButton->setDisabled(true); @@ -155,11 +146,11 @@ void burnDialog::on_FlashLoadButton_clicked() ui->EEbackupCB->hide(); QTimer::singleShot(0, this, SLOT(shrink())); if (hexType==2) { - fileName = QFileDialog::getOpenFileName(this, tr("Open"), settings.value("lastFlashDir").toString(), FLASH_FILES_FILTER); + fileName = QFileDialog::getOpenFileName(this, tr("Open"), glob.lastFlashDir(), FLASH_FILES_FILTER); checkFw(fileName); } else { - QString fileName = QFileDialog::getOpenFileName(this,tr("Choose file to load Models and Settings from"), settings.value("lastDir").toString(), tr(EXTERNAL_EEPROM_FILES_FILTER)); + QString fileName = QFileDialog::getOpenFileName(this,tr("Choose file to load Models and Settings from"), glob.lastDir(), tr(EXTERNAL_EEPROM_FILES_FILTER)); if (checkeEprom(fileName)) { if (burnraw==false) { ui->BurnFlashButton->setEnabled(true); @@ -191,7 +182,6 @@ void burnDialog::checkFw(QString fileName) if (fileName.isEmpty()) { return; } - QSettings settings; if (!IS_TARANIS(GetEepromInterface()->getBoard())) { ui->EEbackupCB->show(); } @@ -216,8 +206,8 @@ void burnDialog::checkFw(QString fileName) ui->imageLabel->setFixedSize(flash.getSplashWidth(), flash.getSplashHeight()); ui->FwImage->show(); ui->FwImage->setPixmap(QPixmap::fromImage(flash.getSplash())); - QString ImageStr = settings.value("SplashImage", "").toString(); - bool PatchFwCB = settings.value("patchImage", false).toBool(); + QString ImageStr = glob.pro[glob.profileId()].SplashFileName(); + bool PatchFwCB = glob.pro[glob.profileId()].patchImage(); if (!ImageStr.isEmpty()) { QImage Image = qstring2image(ImageStr); ui->imageLabel->setPixmap(QPixmap::fromImage(Image.convertToFormat(flash.getSplashFormat()))); @@ -260,7 +250,7 @@ void burnDialog::checkFw(QString fileName) ui->BurnFlashButton->setEnabled(true); } QTimer::singleShot(0, this, SLOT(shrink())); - settings.setValue("lastFlashDir", QFileInfo(fileName).dir().absolutePath()); + glob.lastFlashDir( QFileInfo(fileName).dir().absolutePath() ); } bool burnDialog::checkeEprom(QString fileName) @@ -360,12 +350,11 @@ void burnDialog::on_ImageLoadButton_clicked() supportedImageFormats += QLatin1String(" *.") + QImageReader::supportedImageFormats()[formatIndex]; } - QSettings settings; QString fileName = QFileDialog::getOpenFileName(this, - tr("Open Image to load"), settings.value("lastImagesDir").toString(), tr("Images (%1)").arg(supportedImageFormats)); + tr("Open Image to load"), glob.lastImagesDir(), tr("Images (%1)").arg(supportedImageFormats)); if (!fileName.isEmpty()) { - settings.setValue("lastImagesDir", QFileInfo(fileName).dir().absolutePath()); + glob.lastImagesDir( QFileInfo(fileName).dir().absolutePath() ); QImage image(fileName); if (image.isNull()) { QMessageBox::critical(this, tr("Error"), tr("Cannot load %1.").arg(fileName)); @@ -442,11 +431,10 @@ void burnDialog::on_BurnFlashButton_clicked() if (hexType==2) { QString fileName=ui->FWFileName->text(); if (!fileName.isEmpty()) { - QSettings settings; - settings.setValue("lastFlashDir", QFileInfo(fileName).dir().absolutePath()); - settings.setValue("lastFw", fileName); + glob.lastFlashDir( QFileInfo(fileName).dir().absolutePath() ); + glob.lastFw( fileName ); if (ui->PatchFWCB->isChecked()) { - settings.setValue("patchImage", true); + glob.pro[glob.profileId()].patchImage( true ); QImage image = ui->imageLabel->pixmap()->toImage().scaled(ui->imageLabel->width(), ui->imageLabel->height()); if (!image.isNull()) { QString tempDir = QDir::tempPath(); @@ -469,7 +457,7 @@ void burnDialog::on_BurnFlashButton_clicked() QMessageBox::critical(this, tr("Warning"), tr("Custom image not found")); } } else { - settings.setValue("patchImage", false); + glob.pro[glob.profileId()].patchImage( false ); hexfileName->clear(); hexfileName->append(fileName); } @@ -480,7 +468,7 @@ void burnDialog::on_BurnFlashButton_clicked() } if (hexType==1) { QSettings settings; - int profileid=settings.value("profileId", 1).toInt(); + int profileid=glob.profileId(); settings.beginGroup("Profiles"); QString profile=QString("profile%1").arg(profileid); settings.beginGroup(profile); @@ -656,8 +644,7 @@ void burnDialog::on_PreferredImageCB_toggled(bool checked) { QString tmpFileName; if (checked) { - QSettings settings; - QString ImageStr = settings.value("SplashImage", "").toString(); + QString ImageStr = glob.pro[glob.profileId()].SplashFileName(); if (!ImageStr.isEmpty()) { QImage Image = qstring2image(ImageStr); if (ui->imageLabel->width()!=128) { diff --git a/companion/src/customizesplashdialog.cpp b/companion/src/customizesplashdialog.cpp index 420266b7a..bb86ec500 100644 --- a/companion/src/customizesplashdialog.cpp +++ b/companion/src/customizesplashdialog.cpp @@ -2,6 +2,7 @@ #include "ui_customizesplashdialog.h" #include +#include "appdata.h" #include "helpers.h" #include "burndialog.h" #include "splashlibrary.h" @@ -28,9 +29,10 @@ bool Side::displayImage( QString fileName, Source pictSource ) { QImage image; - if (fileName.isEmpty()) { + if (fileName.isEmpty()) return false; - } + + // Determine which picture format to use if (pictSource == FW ){ FlashInterface flash(fileName); if (!flash.hasSplash()) @@ -40,13 +42,16 @@ bool Side::displayImage( QString fileName, Source pictSource ) *format = (flash.getSplashWidth()==WIDTH_TARANIS ? LCDTARANIS : LCD9X); } else { - image.load(fileName); - if (pictSource== PICT) - *format = image.width()>WIDTH_9X ? LCDTARANIS : LCD9X; + image.load(fileName); + if (pictSource== PICT) + *format = image.width()>WIDTH_9X ? LCDTARANIS : LCD9X; + else if (pictSource == PROFILE) + *format = (glob.pro[glob.profileId()].firmware().contains("taranis")) ? LCDTARANIS : LCD9X; } if (image.isNull()) { return false; } + // Prepare and display image if (*format==LCDTARANIS) { image=image.convertToFormat(QImage::Format_RGB32); QRgb col; @@ -102,8 +107,6 @@ bool Side::refreshImage() bool Side::saveImage() { - QSettings settings; - if (*source == FW ) { FlashInterface flash(*saveToFileName); @@ -112,7 +115,7 @@ bool Side::saveImage() } QImage image = imageLabel->pixmap()->toImage().scaled(flash.getSplashWidth(), flash.getSplashHeight()); if (flash.setSplash(image) && (flash.saveFlash(*saveToFileName) > 0)) { - settings.setValue("lastFlashDir", QFileInfo(*saveToFileName).dir().absolutePath()); + glob.lastFlashDir( QFileInfo(*saveToFileName).dir().absolutePath() ); } else { return false; @@ -121,7 +124,7 @@ bool Side::saveImage() else if (*source == PICT) { QImage image = imageLabel->pixmap()->toImage().scaled(imageLabel->width()/2, imageLabel->height()/2).convertToFormat(QImage::Format_Indexed8); if (image.save(*saveToFileName)) { - settings.setValue("lastImagesDir", QFileInfo(*saveToFileName).dir().absolutePath()); + glob.lastImagesDir( QFileInfo(*saveToFileName).dir().absolutePath() ); } else { return false; @@ -178,13 +181,12 @@ void customizeSplashDialog::on_leftLoadFwButton_clicked() {loadFirmware(left);} void customizeSplashDialog::on_rightLoadFwButton_clicked() {loadFirmware(right);} void customizeSplashDialog::loadFirmware(Side side) { - QSettings settings; - QString fileName = QFileDialog::getOpenFileName(this, tr("Open"), settings.value("lastFlashDir").toString(), FLASH_FILES_FILTER); + QString fileName = QFileDialog::getOpenFileName(this, tr("Open"), glob.lastFlashDir(), FLASH_FILES_FILTER); if (!fileName.isEmpty()) { if (!side.displayImage( fileName, FW )) QMessageBox::critical(this, tr("Error"), tr("Cannot load embedded FW image from %1.").arg(fileName)); else - settings.setValue("lastFlashDir", QFileInfo(fileName).dir().absolutePath()); + glob.lastFlashDir( QFileInfo(fileName).dir().absolutePath() ); } } @@ -196,15 +198,14 @@ void customizeSplashDialog::loadPicture(Side side) for (int formatIndex = 0; formatIndex < QImageReader::supportedImageFormats().count(); formatIndex++) { supportedImageFormats += QLatin1String(" *.") + QImageReader::supportedImageFormats()[formatIndex]; } - QSettings settings; QString fileName = QFileDialog::getOpenFileName(this, - tr("Open Image to load"), settings.value("lastImagesDir").toString(), tr("Images (%1)").arg(supportedImageFormats)); + tr("Open Image to load"), glob.lastImagesDir(), tr("Images (%1)").arg(supportedImageFormats)); if (!fileName.isEmpty()) { if (!side.displayImage( fileName, PICT )) QMessageBox::critical(this, tr("Error"), tr("Cannot load the image file %1.").arg(fileName)); else - settings.setValue("lastImagesDir", QFileInfo(fileName).dir().absolutePath()); + glob.lastImagesDir( QFileInfo(fileName).dir().absolutePath() ); } } @@ -212,8 +213,7 @@ void customizeSplashDialog::on_leftLoadProfileButton_clicked() {loadProfile(left void customizeSplashDialog::on_rightLoadProfileButton_clicked() {loadProfile(right);} void customizeSplashDialog::loadProfile(Side side) { - QSettings settings; - QString fileName=settings.value("SplashFileName","").toString(); + QString fileName=glob.pro[glob.profileId()].SplashFileName(); if (!fileName.isEmpty()) { if (!side.displayImage( fileName, PROFILE )) diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp index bb2861cf8..63dfc096c 100644 --- a/companion/src/eeprominterface.cpp +++ b/companion/src/eeprominterface.cpp @@ -7,6 +7,7 @@ #include "firmwares/opentx/opentxinterface.h" #include "firmwares/ersky9x/ersky9xinterface.h" #include "qsettings.h" +#include "appdata.h" #include "helpers.h" QString EEPROMWarnings; @@ -734,8 +735,8 @@ GeneralSettings::GeneralSettings() QSettings settings; templateSetup = settings.value("default_channel_order", 0).toInt(); stickMode = settings.value("default_mode", 1).toInt(); - int profile_id = settings.value("profileId", 0).toInt(); - if (profile_id>0) { + int profile_id = glob.profileId(); + if (profile_id>-1) { settings.beginGroup("Profiles"); QString profile=QString("profile%1").arg(profile_id); settings.beginGroup(profile); @@ -990,14 +991,12 @@ ModelData ModelData::removeGlobalVars() QList eepromInterfaces; void RegisterEepromInterfaces() { - QSettings settings; - int rev4a = settings.value("rev4asupport",0).toInt(); eepromInterfaces.push_back(new Open9xInterface(BOARD_STOCK)); eepromInterfaces.push_back(new Open9xInterface(BOARD_M128)); eepromInterfaces.push_back(new Open9xInterface(BOARD_GRUVIN9X)); eepromInterfaces.push_back(new Open9xInterface(BOARD_SKY9X)); eepromInterfaces.push_back(new Open9xInterface(BOARD_TARANIS)); - if (rev4a) + if (glob.rev4asupport()) eepromInterfaces.push_back(new Open9xInterface(BOARD_TARANIS_REV4a)); eepromInterfaces.push_back(new Gruvin9xInterface(BOARD_STOCK)); eepromInterfaces.push_back(new Gruvin9xInterface(BOARD_GRUVIN9X)); diff --git a/companion/src/fwpreferencesdialog.cpp b/companion/src/fwpreferencesdialog.cpp index 735e18acc..0113ee3cd 100644 --- a/companion/src/fwpreferencesdialog.cpp +++ b/companion/src/fwpreferencesdialog.cpp @@ -3,6 +3,7 @@ #include "mainwindow.h" #include "eeprominterface.h" #include "helpers.h" +#include "appdata.h" #include #include @@ -213,11 +214,9 @@ void fwPreferencesDialog::firmwareChanged() void fwPreferencesDialog::writeValues() { - QSettings settings; - - settings.setValue("cpu_id", ui->CPU_ID_LE->text()); + glob.cpu_id( ui->CPU_ID_LE->text() ); current_firmware_variant = getFirmwareVariant(); - settings.setValue("firmware", current_firmware_variant.id); + glob.pro[glob.profileId()].firmware( current_firmware_variant.id ); } void fwPreferencesDialog::populateFirmwareOptions(const FirmwareInfo * firmware) @@ -275,9 +274,7 @@ void fwPreferencesDialog::populateFirmwareOptions(const FirmwareInfo * firmware) void fwPreferencesDialog::initSettings() { - QSettings settings; - - ui->CPU_ID_LE->setText(settings.value("cpu_id", "").toString()); + ui->CPU_ID_LE->setText(glob.cpu_id()); FirmwareInfo * current_firmware = GetCurrentFirmware(); foreach(FirmwareInfo * firmware, firmwares) { @@ -293,12 +290,10 @@ void fwPreferencesDialog::initSettings() void fwPreferencesDialog::on_checkFWUpdates_clicked() { - QSettings settings; - FirmwareVariant variant = getFirmwareVariant(); - if (settings.value("burnFirmware", true).toBool()) { + if (glob.pro[glob.profileId()].burnFirmware()) { current_firmware_variant = variant; - settings.setValue("firmware", variant.id); + glob.pro[glob.profileId()].firmware( variant.id ); } MainWindow * mw = (MainWindow *)this->parent(); mw->checkForUpdates(true, variant.id); @@ -307,14 +302,13 @@ void fwPreferencesDialog::on_checkFWUpdates_clicked() void fwPreferencesDialog::on_fw_dnld_clicked() { - QSettings settings; MainWindow * mw = (MainWindow *)this->parent(); FirmwareVariant variant = getFirmwareVariant(); writeValues(); if (!variant.firmware->getUrl(variant.id).isNull()) { - if (settings.value("burnFirmware", true).toBool()) { + if (glob.pro[glob.profileId()].burnFirmware()) { current_firmware_variant = getFirmwareVariant(); - settings.setValue("firmware", current_firmware_variant.id); + glob.pro[glob.profileId()].firmware( current_firmware_variant.id ); } mw->downloadLatestFW(current_firmware_variant.firmware, current_firmware_variant.id); } diff --git a/companion/src/helpers.cpp b/companion/src/helpers.cpp index 9a9f2caf4..5a74c4afc 100644 --- a/companion/src/helpers.cpp +++ b/companion/src/helpers.cpp @@ -1,4 +1,5 @@ #include +#include "appdata.h" #include "helpers.h" QString getPhaseName(int val, char * phasename) @@ -913,8 +914,7 @@ QString getCenterBeep(ModelData * g_model) QString getTheme() { - QSettings settings; - int theme_set = settings.value("theme", 1).toInt(); + int theme_set = glob.theme(); QString Theme; switch(theme_set) { case 0: diff --git a/companion/src/lcdwidget.h b/companion/src/lcdwidget.h index 9f01a0b17..7433b640d 100644 --- a/companion/src/lcdwidget.h +++ b/companion/src/lcdwidget.h @@ -18,6 +18,7 @@ #define lcd_widget_h #include +#include "appdata.h" class lcdWidget : public QWidget { public: @@ -58,11 +59,10 @@ class lcdWidget : public QWidget { QPixmap buffer(2*lcdWidth, 2*lcdHeight); QPainter p(&buffer); doPaint(p); - QSettings settings; - bool toclipboard=settings.value("snapshot_to_clipboard", false).toBool(); + bool toclipboard=glob.snapshot_to_clipboard(); QApplication::clipboard()->setPixmap( buffer ); if (!toclipboard) { - QString Path=settings.value("snapshotPath", "").toString(); + QString Path=glob.snapshotpath(); if (Path.isEmpty() || !QDir(Path).exists()) { Path="."; } diff --git a/companion/src/logsdialog.cpp b/companion/src/logsdialog.cpp index 0c9702239..874ed21d3 100644 --- a/companion/src/logsdialog.cpp +++ b/companion/src/logsdialog.cpp @@ -1,4 +1,5 @@ #include "logsdialog.h" +#include "appdata.h" #include "ui_logsdialog.h" #include "qcustomplot.h" #if defined WIN32 || !defined __GNUC__ @@ -38,8 +39,7 @@ logsDialog::logsDialog(QWidget *parent) : ui->customPlot->legend->setSelectedFont(legendFont); ui->customPlot->legend->setSelectable(QCPLegend::spItems); // legend box shall not be selectable, only legend items ui->customPlot->legend->setVisible(false); - QSettings settings; - QString Path=settings.value("gePath", "").toString(); + QString Path=glob.gePath(); if (Path.isEmpty() || !QFile(Path).exists()) { ui->mapsButton->hide(); } @@ -202,8 +202,7 @@ void logsDialog::on_mapsButton_clicked() { ,F_F,F_F,F_F,F_F,I_F,I_F,I_F,I_F\ ,I_F,I_F,I_F,I_F,I_F,I_F,I_F,I_F,I_F,I_F,I_F,I_F}; - QSettings settings; - QString gePath=settings.value("gePath", "").toString(); + QString gePath=glob.gePath(); if (gePath.isEmpty() || !QFile(gePath).exists()) { ui->FieldsTW->setDisabled(false); ui->logTable->setDisabled(false); @@ -585,10 +584,9 @@ void logsDialog::moveLegend() void logsDialog::on_fileOpen_BT_clicked() { - QSettings settings; - QString fileName = QFileDialog::getOpenFileName(this,tr("Select your log file"), settings.value("lastLogDir").toString()); + QString fileName = QFileDialog::getOpenFileName(this,tr("Select your log file"), glob.lastLogDir()); if (!fileName.isEmpty()) { - settings.setValue("lastLogDir", fileName); + glob.lastLogDir( fileName ); ui->FileName_LE->setText(fileName); if (cvsFileParse()) { ui->FieldsTW->clear(); diff --git a/companion/src/main.cpp b/companion/src/main.cpp index 93bd89123..960d06b7a 100644 --- a/companion/src/main.cpp +++ b/companion/src/main.cpp @@ -45,12 +45,12 @@ #include #include #include -#include #include #include #include #include "mainwindow.h" #include "eeprominterface.h" +#include "appdata.h" #if defined WIN32 || !defined __GNUC__ #include @@ -98,19 +98,15 @@ int main(int argc, char *argv[]) QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); - if (glob.firmware().isEmpty()) - glob.firmware(default_firmware_variant.id); - QString tmp_id = glob.firmware(); - tmp_id.replace("open9x", "opentx"); - tmp_id.replace("x9da", "taranis"); - glob.firmware(tmp_id); + if (glob.pro[glob.profileId()].firmware().isEmpty()) + glob.pro[glob.profileId()].firmware(default_firmware_variant.id); - QPixmap pixmap = QPixmap(glob.firmware().contains("taranis") ? ":/images/splasht.png" : ":/images/splash.png"); + QPixmap pixmap = QPixmap(glob.pro[glob.profileId()].firmware().contains("taranis") ? ":/images/splasht.png" : ":/images/splash.png"); QSplashScreen *splash = new QSplashScreen(pixmap); RegisterFirmwares(); - current_firmware_variant = GetFirmwareVariant(glob.firmware()); + current_firmware_variant = GetFirmwareVariant(glob.pro[glob.profileId()].firmware()); MainWindow *mainWin = new MainWindow(); if (glob.show_splash()) { diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index 8918796be..8625537e6 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -49,7 +49,6 @@ #include "avroutputdialog.h" #include "comparedialog.h" #include "logsdialog.h" -#include "preferencesdialog.h" #include "apppreferencesdialog.h" #include "fwpreferencesdialog.h" #include "flashinterface.h" @@ -63,6 +62,7 @@ #include "hexinterface.h" #include "warnings.h" #include "helpers.h" +#include "appdata.h" #include "firmwares/opentx/opentxinterface.h" // TODO get rid of this include #define DONATE_STR "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QUZ48K4SEXDP2" @@ -408,7 +408,7 @@ void MainWindow::reply1Accepted() int pos=rev.lastIndexOf("-r"); if (pos>0) { currentFWrev=rev.mid(pos+2).toInt(); - if (settings.value("rename_firmware_files", false).toBool() && needRename) { + if (glob.pro[glob.profileId()].rename_firmware_files() && needRename) { QFileInfo fi(downloadedFWFilename); QString path=fi.path()+QDir::separator (); path.append(fi.completeBaseName()); @@ -421,7 +421,7 @@ void MainWindow::reply1Accepted() downloadedFWFilename=path; } settings.setValue(downloadedFW, currentFWrev); - if (settings.value("burnFirmware", true).toBool()) { + if (glob.pro[glob.profileId()].burnFirmware()) { int ret = QMessageBox::question(this, "Companion", tr("Do you want to write the firmware to the transmitter now ?"), QMessageBox::Yes | QMessageBox::No); if (ret == QMessageBox::Yes) { writeFlash(downloadedFWFilename); @@ -558,7 +558,7 @@ void MainWindow::reply1Finished(QNetworkReply * reply) QString url = GetFirmware(fwToUpdate)->getUrl(fwToUpdate); QString ext = url.mid(url.lastIndexOf(".")); needRename=false; - bool addversion=glob.rename_firmware_files(); + bool addversion=glob.pro[glob.profileId()].rename_firmware_files(); QString fileName; if (addversion) { fileName = QFileDialog::getSaveFileName(this, tr("Save As"), glob.lastFlashDir() + "/" + fwToUpdate + newrev + ext); @@ -711,24 +711,8 @@ void MainWindow::loadProfile() //TODO Load all variables - Also HW! int profnum=action->data().toInt(); glob.profileId( profnum ); - // Upgrade old firmware names - QString firmware = glob.profile[profnum].firmware(); - firmware.replace("open9x","opentx"); - firmware.replace("x9da","taranis"); - glob.profile[profnum].firmware(firmware); - - // Copy profile data from profile to main variables - glob.Name( glob.profile[profnum].Name() ); - glob.default_channel_order( glob.profile[profnum].default_channel_order() ); - glob.default_mode( glob.profile[profnum].default_mode() ); - glob.burnFirmware( glob.profile[profnum].burnFirmware() ); - glob.rename_firmware_files( glob.profile[profnum].rename_firmware_files() ); - glob.sdPath( glob.profile[profnum].sdPath() ); - glob.SplashFileName( glob.profile[profnum].SplashFileName() ); - glob.firmware( glob.profile[profnum].firmware() ); - - // TODO Get rid of this global variable - glob.firmware is the real source - current_firmware_variant = GetFirmwareVariant(glob.firmware()); + // TODO Get rid of this global variable - The profile.firmware is the real source + current_firmware_variant = GetFirmwareVariant(glob.pro[glob.profileId()].firmware()); foreach (QMdiSubWindow *window, mdiArea->subWindowList()) { MdiChild *mdiChild = qobject_cast(window->widget()); @@ -1543,7 +1527,7 @@ void MainWindow::updateMenus() updateIconSizeActions(); updateIconThemeActions(); - setWindowTitle(tr("OpenTX Companion - FW: %1 - Profile: %2").arg(GetCurrentFirmware()->name).arg( glob.Name() )); + setWindowTitle(tr("OpenTX Companion - FW: %1 - Profile: %2").arg(GetCurrentFirmware()->name).arg( glob.pro[glob.profileId()].Name() )); } MdiChild *MainWindow::createMdiChild() @@ -1909,20 +1893,25 @@ void MainWindow::setActiveSubWindow(QWidget *window) void MainWindow::updateRecentFileActions() { - int i,j, numRecentFiles; - QSettings settings; - QStringList files = settings.value("recentFileList").toStringList(); + int i, numRecentFiles; + // Hide all document slots + for ( i=0 ; i < glob.history_size(); i++) + recentFileActs[i]->setVisible(false); + + // Fill slots with content and unhide them + QStringList files = glob.recentFileList(); numRecentFiles = qMin(files.size(), glob.history_size()); - for ( i = 0; i < numRecentFiles; ++i) { - QString text = tr("&%1 %2").arg(i + 1).arg(strippedName(files[i])); - recentFileActs[i]->setText(text); - recentFileActs[i]->setData(files[i]); - recentFileActs[i]->setVisible(true); + for ( i = 0; i < numRecentFiles; i++) { + QString text = strippedName(files[i]); + if (!text.trimmed().isEmpty()) + { + recentFileActs[i]->setText(text); + recentFileActs[i]->setData(files[i]); + recentFileActs[i]->setVisible(true); + } } - for ( j = numRecentFiles; j < glob.history_size(); ++j) - recentFileActs[j]->setVisible(false); } void MainWindow::updateIconSizeActions() @@ -1982,9 +1971,9 @@ void MainWindow::updateProfilesActions() { for (int i=0; isetText(text); profileActs[i]->setData(i); profileActs[i]->setVisible(true); @@ -2000,14 +1989,14 @@ void MainWindow::updateProfilesActions() void MainWindow::createProfile() { int i; - for (i=0; i #include #include -#include "appdata.h" #include "downloaddialog.h" #include "eeprominterface.h" diff --git a/companion/src/mdichild.cpp b/companion/src/mdichild.cpp index 97d737d09..c82e685fb 100644 --- a/companion/src/mdichild.cpp +++ b/companion/src/mdichild.cpp @@ -53,6 +53,7 @@ #include "printdialog.h" #include "burndialog.h" #include "helpers.h" +#include "appdata.h" #include #if defined WIN32 || !defined __GNUC__ @@ -179,8 +180,7 @@ void MdiChild::OpenEditWindow(bool wizard=false) } if (isNew && !wizard) { int ret; - QSettings settings; - bool wizardEnable=settings.value("wizardEnable", true).toBool(); + bool wizardEnable=glob.wizardEnable(); if (wizardEnable) { ret = QMessageBox::question(this, tr("Companion"), tr("Do you want to use model wizard? "), QMessageBox::Yes | QMessageBox::No); if (ret == QMessageBox::Yes) { @@ -189,7 +189,7 @@ void MdiChild::OpenEditWindow(bool wizard=false) qSleep(500); ret = QMessageBox::question(this, tr("Companion"), tr("Ask this question again ? "), QMessageBox::Yes | QMessageBox::No); if (ret == QMessageBox::No) { - settings.setValue("wizardEnable", false); + glob.wizardEnable( false ); } } } @@ -346,34 +346,33 @@ bool MdiChild::save() bool MdiChild::saveAs(bool isNew) { - QSettings settings; QString fileName; if (GetEepromInterface()->getBoard() == BOARD_SKY9X) { curFile.replace(".eepe", ".bin"); QFileInfo fi(curFile); #ifdef __APPLE__ - fileName = QFileDialog::getSaveFileName(this, tr("Save As"), settings.value("lastDir").toString() + "/" +fi.fileName()); + fileName = QFileDialog::getSaveFileName(this, tr("Save As"), glob.lastDir() + "/" +fi.fileName()); #else - fileName = QFileDialog::getSaveFileName(this, tr("Save As"), settings.value("lastDir").toString() + "/" +fi.fileName(), tr(BIN_FILES_FILTER)); + fileName = QFileDialog::getSaveFileName(this, tr("Save As"), glob.lastDir() + "/" +fi.fileName(), tr(BIN_FILES_FILTER)); #endif } else { QFileInfo fi(curFile); #ifdef __APPLE__ - fileName = QFileDialog::getSaveFileName(this, tr("Save As"), settings.value("lastDir").toString() + "/" +fi.fileName()); + fileName = QFileDialog::getSaveFileName(this, tr("Save As"), glob.lastDir() + "/" +fi.fileName()); #else - fileName = QFileDialog::getSaveFileName(this, tr("Save As"), settings.value("lastDir").toString() + "/" +fi.fileName(), tr(EEPROM_FILES_FILTER)); + fileName = QFileDialog::getSaveFileName(this, tr("Save As"), glob.lastDir() + "/" +fi.fileName(), tr(EEPROM_FILES_FILTER)); #endif } if (fileName.isEmpty()) return false; if (fileName.contains("rev4a")) { - settings.setValue("rev4asupport", 1); + glob.rev4asupport( true ); } if (fileName.contains("norev4a")) { - settings.setValue("rev4asupport", 0); + glob.rev4asupport( false ); } - settings.setValue("lastDir", QFileInfo(fileName).dir().absolutePath()); + glob.lastDir( QFileInfo(fileName).dir().absolutePath() ); if (isNew) return saveFile(fileName); else @@ -490,15 +489,14 @@ void MdiChild::setCurrentFile(const QString &fileName) fileChanged = false; setWindowModified(false); updateTitle(); - QSettings settings; - int MaxRecentFiles =settings.value("history_size",10).toInt(); - QStringList files = settings.value("recentFileList").toStringList(); + int MaxRecentFiles = glob.history_size(); + QStringList files = glob.recentFileList(); files.removeAll(fileName); files.prepend(fileName); while (files.size() > MaxRecentFiles) files.removeLast(); - settings.setValue("recentFileList", files); + glob.recentFileList( files ); } QString MdiChild::strippedName(const QString &fullFileName) @@ -508,9 +506,8 @@ QString MdiChild::strippedName(const QString &fullFileName) void MdiChild::writeEeprom() // write to Tx { - QSettings settings; - bool backupEnable=settings.value("backupEnable", true).toBool(); - QString backupPath=settings.value("backupPath", "").toString(); + bool backupEnable=glob.backupEnable(); + QString backupPath=glob.backupPath(); if (!backupPath.isEmpty()) { if (!QDir(backupPath).exists()) { if (backupEnable) { @@ -521,13 +518,7 @@ void MdiChild::writeEeprom() // write to Tx } else { backupEnable=false; } - int profileid=settings.value("profileId", 1).toInt(); - settings.beginGroup("Profiles"); - QString profile=QString("profile%1").arg(profileid); - settings.beginGroup(profile); - QString stickCal=settings.value("StickPotCalib","").toString(); - settings.endGroup(); - settings.endGroup(); + QString stickCal=glob.pro[glob.profileId()].StickPotCalib(); burnConfigDialog bcd; QString tempDir = QDir::tempPath(); QString tempFile = tempDir + "/temp.bin"; @@ -690,8 +681,7 @@ void MdiChild::setEEpromAvail(int eavail) bool MdiChild::loadBackup() { - QSettings settings; - QString fileName = QFileDialog::getOpenFileName(this, tr("Open"), settings.value("lastDir").toString(),tr(EEPROM_FILES_FILTER)); + QString fileName = QFileDialog::getOpenFileName(this, tr("Open"), glob.lastDir(),tr(EEPROM_FILES_FILTER)); if (fileName.isEmpty()) return false; QFile file(fileName); diff --git a/companion/src/preferencesdialog.cpp b/companion/src/preferencesdialog.cpp deleted file mode 100644 index 7b4ce1707..000000000 --- a/companion/src/preferencesdialog.cpp +++ /dev/null @@ -1,827 +0,0 @@ -#include "preferencesdialog.h" -#include "ui_preferencesdialog.h" -#include "mainwindow.h" -#include "eeprominterface.h" -#include "splashlibrary.h" -#include "helpers.h" -#ifdef JOYSTICKS -#include "joystick.h" -#include "joystickdialog.h" -#endif -#include -#include - -preferencesDialog::preferencesDialog(QWidget *parent) : - QDialog(parent), - ui(new Ui::preferencesDialog), - updateLock(false) -{ - ui->setupUi(this); - setWindowIcon(CompanionIcon("preferences.png")); - ui->splashLibraryButton->setIcon(CompanionIcon("library.png")); - ui->clearImageButton->setIcon(CompanionIcon("clear.png")); - - QCheckBox * OptionCheckBox[]= { - ui->optionCheckBox_1, ui->optionCheckBox_2, ui->optionCheckBox_3, ui->optionCheckBox_4, ui->optionCheckBox_5, ui->optionCheckBox_6, ui->optionCheckBox_7, - ui->optionCheckBox_8, ui->optionCheckBox_9, ui->optionCheckBox_10, ui->optionCheckBox_11, ui->optionCheckBox_12, ui->optionCheckBox_13, ui->optionCheckBox_14, - ui->optionCheckBox_15,ui->optionCheckBox_16, ui->optionCheckBox_17, ui->optionCheckBox_18, ui->optionCheckBox_19, ui->optionCheckBox_20, ui->optionCheckBox_21, - ui->optionCheckBox_22, ui->optionCheckBox_23, ui->optionCheckBox_24, ui->optionCheckBox_25, ui->optionCheckBox_26, ui->optionCheckBox_27, ui->optionCheckBox_28, - ui->optionCheckBox_29, ui->optionCheckBox_30, ui->optionCheckBox_31, ui->optionCheckBox_32, ui->optionCheckBox_33, ui->optionCheckBox_34, ui->optionCheckBox_35, - ui->optionCheckBox_36, ui->optionCheckBox_37, ui->optionCheckBox_38, ui->optionCheckBox_39, ui->optionCheckBox_40, ui->optionCheckBox_41, ui->optionCheckBox_42, - NULL }; - - voice=NULL; - - connect(ui->langCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(firmwareLangChanged())); - connect(ui->voiceCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(firmwareLangChanged())); - - for (int i=0; OptionCheckBox[i]; i++) { - optionsCheckBoxes.push_back(OptionCheckBox[i]); - connect(OptionCheckBox[i], SIGNAL(toggled(bool)), this, SLOT(firmwareOptionChanged(bool))); - } - - initSettings(); - connect(ui->downloadVerCB, SIGNAL(currentIndexChanged(int)), this, SLOT(baseFirmwareChanged())); - connect(this, SIGNAL(accepted()), this, SLOT(writeValues())); -#ifndef JOYSTICKS - ui->joystickCB->hide(); - ui->joystickCB->setDisabled(true); - ui->joystickcalButton->hide(); - ui->joystickChkB->hide(); - ui->label_11->hide(); -#endif - resize(0,0); -} - - -preferencesDialog::~preferencesDialog() -{ - delete ui; -} - -void preferencesDialog::baseFirmwareChanged() -{ - QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex()); - voice=NULL; - foreach(FirmwareInfo * firmware, firmwares) { - if (firmware->id == selected_firmware) { - if (firmware->voice) { - ui->voiceLabel->show(); - ui->voiceCombo->show(); - ui->voice_dnld->show(); - ui->sdPathButton->show(); - ui->sdPath->show(); - ui->sdPathLabel->show(); - ui->voiceLabel->setEnabled(true); - ui->voiceCombo->setEnabled(true); - ui->voice_dnld->setEnabled(true); - ui->sdPathButton->setEnabled(true); - ui->sdPath->setEnabled(true); - ui->ge_label->show(); - ui->ge_lineedit->show(); - ui->ge_pathButton->show(); - } else { - ui->voiceLabel->hide(); - ui->voiceCombo->hide(); - ui->voice_dnld->hide(); - ui->sdPathButton->hide(); - ui->sdPath->hide(); - ui->sdPathLabel->hide(); - ui->ge_label->hide(); - ui->ge_lineedit->hide(); - ui->ge_pathButton->hide(); - } - populateFirmwareOptions(firmware); - int width=firmware->eepromInterface->getCapability(LCDWidth); - ui->imageLabel->setFixedWidth(width); - break; - } - } - firmwareChanged(); -} - -FirmwareVariant preferencesDialog::getFirmwareVariant() -{ - QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex()); - bool voice=false; - foreach(FirmwareInfo * firmware, firmwares) { - if (firmware->id == selected_firmware) { - QString id = firmware->id; - foreach(QCheckBox *cb, optionsCheckBoxes) { - if (cb->isChecked()) { - if (cb->text()=="voice" && cb->isChecked()) - voice=true; - id += QString("-") + cb->text(); - } - } - if (! firmware->eepromInterface->getCapability(MultiLangVoice)) { - if (ui->voiceCombo->count() && (voice || firmware->voice)) - id += QString("-tts") + ui->voiceCombo->currentText(); - } - if (ui->langCombo->count()) - id += QString("-") + ui->langCombo->currentText(); - - return GetFirmwareVariant(id); - } - } - - // Should never occur... - return default_firmware_variant; -} - -void preferencesDialog::firmwareLangChanged() -{ - firmwareChanged(); -} - -void preferencesDialog::firmwareOptionChanged(bool state) -{ - QCheckBox *cb = qobject_cast(sender()); - FirmwareInfo * firmware=NULL; - if (cb && state) { - QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex()); - foreach(firmware, firmwares) { - if (firmware->id == selected_firmware) { - foreach(QList

O z@)>D7#`u@V9e``Rk4*+gY(1#jI`j`vJ46sHxVaHUX(V`#juhtWEL~=~xfAwx#JJyI z@}U9YsQTp4JKk6VHhWX(A|!;OE7^LDG25qNJD6-bnjDkxm39illZr;mLQ+p#_@*+& z05Qfsjdtdz63_^$RH*J=1L6D^9%`sX>un6mcdF(AUT{7~JuK6+A5+YpS zDE`L_iht}t;hz!C>0jX}0#U_@q?+PgPC?VGLPo@zaG{s6TUuv|RQ&>k)wBW{_CD)C zwqZunhUz^z#8iv4gJQkH+mYWP zze4{9?b=O);b$~$YByNZf~;h$&x5)(%9{muas!JA#R7I_*5wkk%GSto7!>n)4Lldg zLFZp~0KbwAP7l6IC8+hz$LLqPifCHcJ%7AvIHO@jy@p?bqT%kvV|$u|NU0ZSUOIrM zs6RKZ)^=qq@4|&5q;U<+G<**Rzy;6zSk7D1q2lHk(iJJ`W_k%58ntfz}(NX4zUGjI1DGT?DB zUj6UC{&~AKVNOT=j(KW?_{?Xxc*{~Qeo|9TeC^*YX$))$*igXk4`JUwa&jH$oxWd_ zwcz&C?QLI;57xW?Xgj+8w#_%Iqqkk^x|xc?D_$O|tT$yaW!q!%Y!8z|Y{QWs z+juLmVIJS#_=qbEP7TT&B7dhbEU@_TWaIMmQ+3L3|L=Qe0t~IV(GiJOgmW*c+ALKkqrk-;PZvkdHu*ZG@X2s9P{ z3PKXBGkHkL4s#w!heg zdjZ4dl)hth_QTF2I093agiAEQcroPja0-B|zqjHN!iaw-4O($mRjLF%$lG%?x2Y{A zGf906z_T31UnD#pwLm;4r59l6$v!S&U_?}=-)Q}P5rPe)wNE|!O+XKJY&!IPxnh7g zgWjggND2xWpfNLBLyeR~{V~~e3LvNpT;+jWL=1==p{k>Njab9k9|OM?lCw!Nn}(JY z30UTZ-$s8gmK6{n!rWCyDMd(fvj})ldJpk5nDJC)Q=5Y015WsaNg@%vDvAx(ebpM&b|73 zUXC4$Ds};3WHX{X=Q$3cJQ<4T6xTFj4{smK^A;0ag59Js|P%6ZL@P%>U7l5*DMk1)&ZM3SeW9e}J0Lwjd;ykIoMh z0l*Fao8QGIL~J~I%N@Rj1K3qejNq^!Y1(932fAyWfD(~?I}yE10|(9^&R5^grVoTM^DLQS%vkW;|f2a&s!|AMGB=ie*5YVi+m>VVD{MAH>Hy?{c5ihy0rm*$Mu@{JvXO1zMlXk-%Ws)?|we8Ofm5_ zV4dQ{ldq{T$+X{hd#-FSc-|X60v-W>FW?23-CvpQu~g^)3jhEBNkvXXu0mjf9P_>M delta 687 zcmV;g0#NV7z1z0x?pXbzZy8H@{9AE*xcqru#(!m!t{&u;4 z2}IS^fQ3(og9GrF0mxD4`pC{cbNJa#>N$k~D!2V_G=N*6xv3B#k&72w{uhR8;}Z;g z5n-(aP7`1X_tC)hXQE~})8fs~T6wZ*GciQdA14w(*fF3e z+H9jRa}MYD&B4~s0y??FRsYfOp*>Uvh25p2=D+%_Q~o~(H>-XLcXBtj4Dd|@NRk;o zjW#f|0F@P8XWE41IDo7Zv|K@lH`sMFyDh~l*mMa-^Ca4R1`N~$&{~6OA!6x&r5gn; z+C8<>@JE4vO7`kGd<=x5bzcemPsiBAj|x>y>2g`b)o&#E8h^?oBe|1 zG>50JApU+ou!;Yg0bxDqy9A5_oZiHb=u5vz|9cEfR1002ovPDHLkV1kt8I3oZ6 diff --git a/companion/src/images/library/20002.png b/companion/src/images/library/20002.png index 3f3d2186631fdcf065921163f7b188eed07054e7..ededfb8acacda3d639dcba302ec7db42e170be63 100644 GIT binary patch delta 546 zcmV+-0^R+w2jK*eB#|*Gf8GKZ3MwkH%6rEE00HtzL_t(&-tAb+j>9krWGepumuC;# zv^K_$Z9=MDwYR8A<^dQ8DEIy#A|)nxC-Up}M%6pf38AHOivuV{n;7U_;yWpjPM{KR zuJQ@g;yw6O0tU~8PfS7wo`RM_4uOvMo(XynJiC%L8NG(52n+*Fe}^}g6Nw?PF@}@% zLKGH&ng~yxJwRUOfc4(3`7#Jca5M{k(2!Yrr3u~-=79F@7y)o3-a^w0j)vgbwpU}c z!;V#f1dd`@cyt7hJ2bCJJe&jj=^D#{2A<35y6phGc7qWEKVA0-faQZIt>Ca2+kbU4 z`sno=PZ0+3S$E)=e{JZ#+nafY>7iTjb-Tkr2hNgn$$=t?ajZF`EWku*=)QVZ4X#y! zsmj!?y7NN4gT6qZhNm5@>g#FrX#y60m^~}-zXXV9UBMS+{H8Zs%3LFI2oNtlAn|Ud zkh9ZmeK^@FLv*JNws&C-eKH4JRbJYy!w2Vq>L9}2lo6STf28UMb}-|dACc`CuZ`D% z!elZAr($u%3s39xn(qVMk$mAS(hKFIUc+-8fL*fSM=ckt5$KJI`pU<3Fc k9QYFW68IAM7}ErP0BpL;jX^)6ssI2007*qoM6N<$g7%;Q#{d8T delta 882 zcmV-&1C9LQ1hEH@Bnkm@Qb$4nuFf3kks&O9+yM_4A`J{dzPW+aMN3aQ(ReF?&ffs8Du zMNmc`r^EK+jHYiM$She@L)E6KYNI^RW;3bFYt#13bSj>Z(Ow%vKiQr9Sqj-40y1~? zG?uSJYa9PDXn4By!((w5--g#(rE*%pENHaa4Mz;@aNU})K~=d>nnJ^5>m7$Z z|McrrCs(xtueYkLY$IGa43D@4Uq=TAdT=~8y0A9_FYXkx)Bt^UsklZUtJ27*4$^ZZa zfqW$f=I!+@GEB6&*JhqeXW>kN1W8vGNPrUYOOj5p5*emf-}AlYA<^lNz_Y*#;Q$2z z#}S|)gt-D)N!5`|E@VOgNCfbWN4yx3@D7JrvbP(UB>K#s2`J%!AQ3@-)6MP* z7;7q)+))?-@K6?Wl>vexM>UAWYZJ2qc=zfk5-%j3n4;1FX>z@I^T=Ktimq(T>$$F0 zkn$~2&}b7@osIUh4hG?hqIWqIp_B(tE0oCA#~qK$^;$C$AaMW)0U!>A7ziMQG@XjZ zy2{%Ns-O`Eanva;D|v5S5Xc?qdg#NHkOs5S2h$eK{e+R{1MHU?C_#lOg zQFY)HbCG3M@usMar6F8f%XiPdjTot-<%TuLb{dPOXa-6@Ce{O0yLHrWfF2NL)CWJk_>PJz_tfEaNA~r zLAwEzRgi{`v<>y9e=`E(HYGR#MiAgxhI-xa96%KEd8SHR z%VB_-FIAj6**}xlLcQmKV-#$T3@7P-G50om(vEx&+>3$@0ohVEFQ>9uFm(~~VuEJ! zX)RUIaYc~{JyI{7iJ62{brGEq3;szj7YCi>O1fllh8kX|z+IIQIubU7Ma(itcRTV- zM>KST!fkwo^)I(%SDW1M;K_A|`|yx;-PKEgUeLe=y*BzR)~fm-0d(`gCFc=;+KQwa zX1H6Ez1x`6=XO=q#xK=T9eTl*LV#8P|=0MZ&z4HPzoa4 zjUg3#stUD5lil?I+ntljelh!v#x!uj??*cJUo3r-B&ZfqFP7;5z(64?;DZUVHGlJd z+~xyM&H(v|Gy=*5O;{tr@}yaRSE-dEd~{$yfFkiPxdDVkT2DBRmoHm36KqQT{WKY5 zg0<_8&Wh1tqLH(7b^#1r?GYaaM67aX76a5q0k$<{02DDnkO&hw0R+WbMCfpK4MfA- zl1fhPl#qC=F&iaEwAg=+C(3%-u)xdd!M2t*Ek2GlC)?!gckYO4_SJnw^9PR};RoOc;0NH3pZ~2QInmJ_y~F?j002ovPDHLkV1iepc|QOE diff --git a/companion/src/images/library/20004.png b/companion/src/images/library/20004.png index df09efa350ea2b71f341b1c4bd86b9af7c56304a..277f9071432192f8185944ca54ec237a09a6b6da 100644 GIT binary patch delta 649 zcmV;40(SlG2FL}FB#|*Gf8GKZ3OFbvFlsme00LP_L_t(&-p!dwazh~uMAa_e|H_>O zGhbjae25p>#05`{h6aOj_wzZq8E_W>*A=)7fa^IxUIhUEK^5EtKqCph0}Igo*_(u* z^#DOoL|{fJX#MV-Rv_+cmw^z-&+i%)a7%@)%_<;-9pvY964Gl5e-S_k3{*aLC=fLu zC=d>%LK(*_K!H%_m@)GyO8{;;f?k0Z0y@XI2H*(<3<98~DXawGTsNVB@KwobJ@=n{ zU!T4j!ze(kED(&*vKKvl8`EVN21q>(sT3g0+x0X2O1&k3v`&;DNUxrHbwoA71VE7o z-PCvaK&_gW017eNe@XA6$EI1(EOj=@UXOmk4~$KDnxmU^MC^~CR?)9_LfS$fSoynC zdFpOxBS6e5n7!C;1-vipnU-hw*;$5A>y9~?n@?u1$6aNYW`rL)L_WBaAT)HFnCc=#X- zj?L@CH^;H)o`gu@cTZuq48y$31ISwxqWBOB+UGE<01eWFTtx3iJqchT@OC^3p(A|O zj-Wr13AkJUgpDqa7v73%5p;vT8=x{_C@V5uS-25EF=$#%#^$Uh<0b_(6N<7iO5PrK z1L!6g^>py@+EXaKT{Be`bx+a$IhI7~XM41u14^TV{fVE-=0Lu9w z6#@?ZYKC$?B(HSpxjr2}viB;SQ{eHw6%ybiKu(bC($QZ|kv(r6PQprr`f2ev0+$`p jLOt+xM>O=g{@d{%m*Y20HW7U)00000NkvXXu0mjfV7DN+ delta 815 zcmV+~1JL})1?~orBnkm@Qb$4nuFf3kks&O9+yM_4As}M2&&&V-01|0bSad^gZEa<4 zbN~PV002lsF*!Cl$uK4$0008iNkl#O0Xh*fClQeu2nK>fDt)d3Rv2Ugqar0IO=zit#GZo0bcX>9 zrvi*q_$uh0QI#-m^ZGv%{el53_h?6=d-NQD5QEo~{a4J>c0(ZmxvnD7wZk>1 z5%yw_+*~JAFaOfYbWB`Gof@k`tQ9%U@%QZpQeMEdNGzp2t zx<;b<(F8zQNDjzu$5!~^ZU72`MGn!9??&PJblif`y2}y;w#1&_AiiLL0c!4Cgm;bl zbP5zeQ0(}q@GT=6uJ2z+1adB5en-a(vtmtxTV}Tbz&LLdifrzc8v&?)8P-gbwK$u} zxQPMFgrYBuNtVam0BjQs-5tP@gpB~4Yh>*XqagPI@C_8@Ee+P)@XZ-*tJ541ybquo z3xJxj0|5H|kQ4+QdTWNhKQym&YFyuf4>7O8IR=LL)|~(+0Z0VRE**Vy3NhX~oP>%5 tJz6{tfnPhKFZ96I9nqs2&(Gf-{{zJoiD}fLMqdB`002ovPDHLkV1lq>Urhi2 diff --git a/companion/src/images/library/30001.png b/companion/src/images/library/30001.png index a699fad9565cd54ddefe1b2f6cf9e9734ecd2ab4..936732b2e39af666f330a515317abb1350b098d8 100644 GIT binary patch delta 853 zcmV-b1FHPL7U2ev8Gi-<007d~e}4b~00eVFNmK|32nc)#WQYI&0~kp}K~#90?VQVU z!!QU%Q775u|Gzdf>Z%<#)dQi61QutNPGW?`EyBol$~k8WOp#Lh{X7#Mj-4;D^+1Jd z&`N*L*eTfx0T`kd>`@Vn{5}L=gkI3NK^?X8U|9`Rk*0Zsjep1ho7owBq7cAVb_D

Eh0JLM= zaXbjZYVe5w0$3Gz?)cUOv3q`c3<<#c$q?Z-QV>|1uhM+nx)ZoFJ6H>T4VD1BoJ@~Z z*}>C%H3i`5M1Mxn$`0P-#flI-Ah4igdCx^6Pgrx?5h zzL^06K3)RON(ckoNH-!gn68g6A5RhF;p@s_pNr*{@YsgLC5oB1KuDL!V zU|Ik~Ap%WOO7;an6e7?f=j^8sP!mDa2{L}>(~SUX6n`t*5Ji#VTv4=wkH$p}5a{84 z39yK#n@u7E98L(p5gNs92mp+?o<#`YaN;s>F|`cwd_L*@elPZBPyn;txL(s{_I4{o zx3J|SqUj{{add3%IIJZg=iFS|df!X!b8Tw-*Yai6nqLa`s86D|gpHh_WHNfk%zlrs zh4Nv=et*X37)=2n13H@_P&U0)=~sGLKq9beCy;Bbmbyn&EqN%zx__U%UN6ycvvgk@ zM};DAR7soyWyI!av54@G`@5Mmj#>h^BIMX*_W`VLvF>_7g;ltIZru!8QT(8fmyUxh z08>g$Kc-$4t8s$`vhcF_jK7zxP-0sv*z=@WW`A^EV=urV$SgQr1E7}-iM^Au38yI) zuZtf9d6~$y&pno7XND;Oa2(QZC7;g79zhBAW)OD}>CWJ6gN2hCJqt|h_V?mDf}}fh z=#*Bn*SZGw9N-qc;FsovTMHC3fV4TG@mu8a=;Cw*+T&K2fRzE2*hGyvlUlV4z>#C6 zwN3!*J%Px(Sgyy;u4_I2BsQ(E>RCwDdjjLRJ^Mr-;BZ0!hZ6!g95n&l^_u){EX@E> f0NNv#fW!F)dB(`*NdBM^00000NkvXXu0mjfz1oQN literal 2879 zcmV-F3&8Y=P)Px#0%A)?L;(MXkIcUS000SaNLh0L01FZT01FZU(%pXi00007bV*G`2iyS<7a=Nw zW+u`A000?jR9JLFZ*6U5ZgcuIskNY#0Zp(?#1JUl!y13ib4 zLi5!l!J|}G3$agiQJ+wsM+zEQKWRlx2RYch%FPwgw)%+5T2Pd1RtUwj{VV`szeuuV z-mj9JB#&yE%_bR>w9mONb@^!k*d|{sL`i;WYtg6e&%cf=`D|fo(q(`9MI!tx0A-QF z>plA1lu}b3!efwL?{PU4knrvD^Ei<9A>EUw7B#h-#>5e8(t3aKLkc-6#Mht50qWA@ zt%lrj&u#W76)q7WN!~xT=xvgIUJ9HP^5D40Vvy8BR=Zj1l13KUr&iXVmjVSzS>@u2 z!DX`Cbsgz0v1ccE8hsr4N$VOwLXNzsp0BNJV1`slVjbc@OZ zX_8c{CD|vNa;)iV^{gt%)m1fI!Zm~>*EoyLBttZ5D1<47xE99;(#RUJ4F%D64zPp5 zXV5A(8eO{T@(%QWVzWa78at%|c%c9Xj7~SYcOFovfG!GGLB*fX7Z`0v_;$OAF`Ug{ z10G}rICkd<3cBg|=W6Pl)j6Pp!%+ZeG#qR=uv4^XmPGFxwE@G}&5J<+nqZP-Kp|?0 z0$SAMtwN&@MMX{JtM$C&j62q`jvWIIS~HN87Ez&{!8+i;VFzdqZXk+Mx?Chp(xfzN zXUnUA&yC(ex@!KHnzDlf#a~l|J4m;vkU~_H0IPJ|I5su|y6pwHj{$(}81gS(XAKIA zGy^GwH-_QBo1t9yf84yd?bv_^DRhmL6%=(wykTIYasX{maM(AfK%+pXbP136A9Zq*+{=(Sb^JaLk7R)+xACF)*{?b|yfBM&RG~t&xK848dpkIte|hF6J@0GwHaDECGoi zsZC+O%A-e(P+msHG9g^HlJg(8!~-0r2deB@aO!M|_sxN#wIkM;0My>RkVJ6-+gX zKSEGeDTLs8#FlB%40)AF+U4>?UFzz@U@^-i?}U*Rgn|rdh$czO@|Yx3*jG2yW0bm7 zhK3~X!ek~?L8wU~Ttk?ZJq|q4XMK^}3Uvc^YNLUmn)!orD&ae9W6;i~R;|LW^>ofs zRLD|tHFy}KzvDZjvO|FaHwDd-76o07Njm=fFowP~9d@7$s~ZL=X@dcSH$xg!<0;DT zr$L#;A!%aOO_CPoFjEKg0zMdY8xW;ck}k?A!?YS8hnRnBmnps;S#MYNG~10$uM^q^Z&>`;LO(f3efdzsi*5w8Dp8IKuQm*AOH| zllIG5;z;2L5rc7(c}szA>`y0r_E_Wbv}Mv~1iXcdPD(3jVZbo3cax?h!3O@J7p_`C zav_({B+beQVS!m*3Mro=Alk{l={OOI~e?L;efjR63D&U6)1&O9KL)mbL z%~6W_NWq6*q^?OxRoXjRieeW@R}mz%Qa1Dg4WnB-2e704T>uJvHY!Jh-Nbl<0gX49 zrK3T8(m09VNcf=_H|e%#fLW#$p+)(S5LeZ*W>E$>W^@LWXGWg^=(d3~&H+_tzv*B! zqxFK&gu{l-2U3%3Wx`C4zN3tFd_}@|Fzeh;y~S&1PY^zoqb61{~!X7bFO`G43reMK|4#LLxDyW z6*e$8`hdg`%b{!SD93+b)b~aJ8tm{Hno=h$hQrx#&7jt-t285@+y1J|0WEd^ z|3_fQ3Jhm7aC(30Lv2_+n~32!RkLQzN=IG`j2uq~Vbsg_ham8s2aSEQq&`V~()e^p z*Uh8KYRMGVw~P8DkB^sczq0x6v(BlIbu4r25h6mE|vY`Hc2YMEg_8fwD^XSHd8D`{DL? zN8s_&Cs`UkKj%e-xQ4&P5c{Ixv(s1KUVmN+)Ti?R%RTkm2nZW7CXdqNl3Gft%XzZ% zjhENox!xze$#V#Qn$m4B*pwEfJ*wDC*PQ5!c7>l80X+2y$z!l26g*nA6bLG7U9{ai de8)xe{{c=w3LCSt&@uo3002ovPDHLkV1hP@M>GHc diff --git a/companion/src/images/library/300011.png b/companion/src/images/library/300011.png new file mode 100644 index 0000000000000000000000000000000000000000..dab44fe5f5476ad5f7b5d32372be65aff370caeb GIT binary patch literal 2821 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 diff --git a/companion/src/images/library/30003.png b/companion/src/images/library/30003.png deleted file mode 100644 index fe4548967cd1905da62af4e5de165466da0963e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4233 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 diff --git a/companion/src/images/library/30004.png b/companion/src/images/library/30004.png deleted file mode 100644 index 4db2f79bb9cb87fcf9e811738b3ca3f53f2c7170..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3049 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 diff --git a/companion/src/images/library/30005.png b/companion/src/images/library/30005.png index ceeb0b358f1fac044d80d38649490942d28ce0bf..8761d4fcb984cb975b78e7d3febab2bff3719b8b 100644 GIT binary patch delta 2346 zcmV+_3Dx${7~2w%B#|*Gf8GKZ3Mefen2hEC00`_!L_t(o!?l^&mK!;eM9qQN$Yf@9 z&CHqq|Gw_(R+Y$Du(;oOprlN-YE+_H0$+F{c;H6!%^WcFbCxHQ=RT+#LzwAU%B(t? zB-wPG+NemkOZrLnmGL7hsSbI#C6hSjX3vX_mP~&?+o)?=FS4J-e?T83JSIs}8GAol zHgAI`!x&p1B+uG^8UraLv#Cj4`qF6D$CCUkajlLfK0!d>G!AK zS4{Q#@-HsMr-)<7*V%ra3p8Axb-QS4LY_sU4~F$@*NcuZtISgTGzNyjFRCwQ4(q5% zJ83XrHZIziOq;dof9Ej}KAsLu#lj4g*(kHoPO&XI7EJ3?m`UHkK!g-7siXe-v`8xI z3c0RQo|Z!t(V^MgF&oHJi$z*w(vyrhh3dNzxtP;#02 zWHuHXbWGWNwSV95VHbFo)W&TbRVUTy-qPLkUggF4p7FwYn%j6F}uYK&^b7Ysb?f>eGTJm$hE8?jIJ zIi_ATWVhkU)KiEX>h)&9<;9|B-DK9k^y#DP=%eXL2KYZHA0KzobCT$WBA^jC8#V8;LItPO58nO90Kf&37HQV2ec8H% zMfZlv6zU^l+LCZ8l^}rQi`^a!!ej9qmS~qAQfA)ks5+5^u|CO|-``%=cLW9dU5{$k4qV<5Qw(gstR zM?2;&?pxS;78dk#wIumq5!*$#%U{}mun=MS7mcQtwYFib$f{7`<*+)ZX+CleOAE25 zMY{B%fBaYg>Ks*C$H7m_ZCkd?ENhqO3zYCSK^|hGoZ7(3u+RFjE>NU8VLr$$d0IB5 zI?1zf|H#yHouo2*mfHA(V<3{GIwisq7@iG_L}iu_{nUoGoiSmazqPkKD0O4=i^VU= z3j>z_&W0T}EpGXEYPt9GJL#%5e|ub2;Goi-f6e2yRvun)fYkx+ZKv`qP!oy6y}#^Z zhyp}1)Lexg_ulkvO9TgO1Z;0#G~fvL8yj$Q2%;vdr*$Gx*C<>XO`M;p!;jUF2AHVEt86z2~QMKz;M~=+Z@;x^lS#?4N1DsLmf> zQAF<{AUa*T1mLyL3_*x+M}H`ij1Sofz90DKm9Ni|;FwsWM|1W!4Bw#h6$ZQm-kVHz=-PwD27Lxj1mX*(SeUJE>CT!G$^(mo!tN?vS zo^EtFuzTJ+PU8q5{Qs#i_h3{Fr@vx2DDhUF|49rK&>(l{OA(5(LeFjJLK-@BaKP#Q zC$r86Pj{3wg8h4El1`dG*_D5=*`dMi1fvoN?W_blw7k)9vpXb_B78q%OvGZdDuBOLAXQ5 zm0W_UadXgC0a^u(+JLh9V{@G25J!8F79`VfUe&eFJRuu&*y(q4>)a?EjfgULMHRU~ zJyju=4+3M~9}!v~f4emr*XfsC2-7H(7`2+v{50S0!`z)>(Imn-f5jgN-FJ{$`%p`w z_eWx&!rJd&T#F_oScHUz#q(6Q0*HbmG_;&Lo7fs6K&WNWA=vS9&;18hH0Zrj!L!h8 zQbAxF+SMmL&cK zH>zWiFlp$<&^#wk$~_X+#v|u9lbdI?a`~>CgFYX*Wz{@ke|@y6aN72h+F+5Y2E}q&}&$HCUmkX2hZ_IL;Cr?Jgl>{hap>>+u}` zaz-@R4HUA_`3f7&9bXXw?uW>yod{rM$7$?u?Kk3hs1kl8U^omRtRY5qsFWZes5GOW z8#&JFkG`?Mf83HR?XxgsNNxIZUP*OWCv)EY@GBEjN?SBdhB2-&wzQ!4e{w=XS-1~Y zKbV1<^L94U@m$`&$kYbxPjY0l#Xk&IKNdin4xQimVy)PVWnysK{_KpXmnZ%9KR@Bx zD$z&j_WX3SsT@lj=lg}~=KwrueR{ol`H^cotGC5eAZLz6w~OlZ<)PXC0XtA(h?7Mt QL;wH)07*qoM6N<$g7dJ1kpKVy delta 3107 zcmV+;4BYeE63`fsBnkm@Qb$4nuFf3kks&O9+yM_4Aqu$&1{weW02ygiSad^gZEa<4 zbN~PV003usa&Kp4VRCG5Z*yhwy~aiW01K~4L_t(o!=0Jkb{sj5go9*eR+S{Xcjx_I za8A#(+p5YRk^sKFU`Z;sJ=6B4Z*=6NBoYh+0)f;g+R0TU?H4bK>?&=6EQNBLleQ;+ z-Cp#IkLM&WHpvoGq@?3qPik|Lq_kX@J}dI=MHs9Hy8*z#-T(_??-1~Bz;S-{aofSE zz!hNIX<8OdO46T2@X8I6=lz_tJxP&oPg%!VdzlkfveXvYB)8M`)30X0CJB#4l2m82 zr&N;n$#WtxcbgaZa#Q6DF6X1Z+ptC_fYevB7xJa2w&>KgH z4d82MXNMcsvA)u(6Gnr>`ZkjIi_aEoB?99l<>Pt1A!=K8Ub^A7Eh>`N zUk|~8nxqW3$!1m(A}9hjhz2VmXyB+!Dk)1U7YTxrlrK7`oHZ>eei;Lev$UWIDo#@e952Q;q0W>i4ZC$tj;H^OQH9hYf?_&x(pgKMBP z5se0$V?cgZ!|5Aae#n6HNAIjqiALDRt14igHBCa6kPDFzTP0;{(BcPw891PVE~3Il z#i6|p2#gFT>G>mf2OMrk1n}^_*y#rn>AW*r0AIoCs)&3NLA%l)K=T%W5k|9I=3e>Q z%dCqU&h06^fYX(f%EMJ3HYYtR0si~P9T-@a5M8m)oEnE*^&Bb8JE}{_X2h~(;WXNy+aI(PVRUDovgS1P4jvsq zC0j01$sL16;K7dJA=;89m3&cyN=S$sh-JlnFv5Y#-x8Scfc>I>rK}jV3T!yi(gTeY z>_EMN8C3RX*!qi#q@^U0pG9La8D7t(NGxQepJ-yjus={5tYxsb19z55yh59mp58Ff z;mVDE6R^@2opjNX_KsKsszw{)cUN(&rvpW!Db(XSD!NID-tc3VvhW*Qw+gUB zn`Dl05h6T+3-uF!AVlV*8TKEQ-46oT>7iM1# zj{>a_xE3^@JRI#0ll(k56k^Z54X_Z;x+8LTmlAdlswAd?u+`#gAC9fHwHaW24GzFSy zanOic47v5+12Bw3DteM;O=;0A0XoSc48nrC2)GTI8<^xF=j2WWL-&73qahs_(0&2~ zRQ5OR)#HIH2md*kH;jWa)^3>$!1NgL*LoY3Kuopf{nk@v|~68dxd7L z@=6Ey)n@U3o2*d~|73+j$i#6{QRk1~HEutxoJ0c-8s=;sAD}tBjb^y|d$*cmt_kau>o+U8obR zf&M(9EF5k@sOXvEzZ613o_zKaB9lLc%gB*!La8msSxF?6d-2JNj#Fl`L|c?JbwN_< zv!o<{kwg+dJH%$G4F~K0F#zC|7+nZSsLyb96!9fWoOfXTUrBA$r*lAi_&iK{5f@XbBS8D6 zDMoX?{^tzv3ISo5^b&wKJ23?z!X158hjF&txXzb7lLs>I_q`!71>7tV!G~qbYpu_G2voZ+ntOPssve9vL z7F0SzyBj;+9W5nBOK;{r>+NgnRHVpvVG+=&s3;|=Xi5$=vBAb}+yW0UDaq!Y%KxmB zWzv@kX69O?gWbIWCKXu&2rJT#H`)sIq*>jovvPoz%wTTg*wLJmG^sR62tN>i(6L~n z!O>F@f(_NSLwEzzl`d^~91xhwG*2bz)3{Der?bI+P?0WzhTrktBynDxu$WJh_WWsE z&Xb;`l!a;E0KD(N&HGtkgvo@fvPCxuybXEng=^~)5AUzvb zLerFp9n8TThdBCY>5P;#J*_hBC!SH7bfn9l=w{rghGs-PnWBkOpot0U+7!*mdj^S)*o2}EiF2C(UB+WvZS!)tHJ)dr4m>Vg77F{BoOMGQW zUO?*o&Lv?M)<^#`3^ZdwzY_LI!lh>sY#3A;tan4nb=HCeXCa~K>}9E2y~}b(XzC>! zo7g%cK&Tgu>1@aAXp>VGxVht+$BgO+ahxTJ#7@vy!HEuLjRszXPDu(0DK5$a#|)X{ zNRb4ojo~u(jFBXJLCYrE*`C8L>w`bkK`lXT&@ zSOju$-dWM$!ulqT-_9SF?(@cqo~300i;lyekmjV$2HhQBAEf2xpHLHtNB23lrck`1OJUqzi%d`i)Ev0(4Q5CM_i^I$+H=2uYtUu&u*?`WW~XBtAERPD`YI zItjswRRYlkGoF#I69%Td3_0LD^wBq4e^P$da1@U47BLw1qO&qMw74%y-USLIGKgzd z>FQbH54h1Bg^)BUX~IY$6`Y{4H-B*F-WD4jY$r^!4gyvxw5PM~#{AohA9SxzMswer zkfnT1y0E@ERyy1u&}niT(rNE!30{|r?G;34>NgX$LZ{k=Xc`3jEVPx#0%A)?L;(MXkIcUS000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyS<7a{_j z{@v>U000?jR9JLFZ*6U5ZgcAV+7la4fcTz@&#@6G7 zN)(o+A?Jw+Bz+-Gq>knq+^?lXk)&SW3iu>~4R&uW>d2|5*+j<@l60ikQb(+@6*?N0 z!NU9Y5x`de*cW6ph1m{=_iIw;i}|r6xa9WJF0cmr8eyR;X*4;P^eR@=Q(w`E&XP$j z<9Z49&eQHSa4Jo$qsf4ucvw5&>PQ2no=>{~*sChhpk#~m^_kRFf22;Li8?w~axQfd zIZ~exK0E^0=|W?Q02P|o_iN|bV-;)82J-N!^Bcwk(R#&wbreAA^ra}$L~~80vqUeH z(}Kj$G@!0DQNJe*BtXeXq&4-P#XM1G56(S*a?KuSk&s0#APbVZWOO5kr%_j3(F_5& z8T6MlINAo3kxV5?`gX2?YH!u+pJxSy#s9OUzuj_6^Q;X_20l2i@5Bd$Dq685QZ&L~ zxP}tYZ`4DXtqlhqY*{baAcv%3_eiHw^o^jM45V&6k|xqOr@8^4d|m~M4Y$OT{~V9t zq&qnhJ;$1X4*6>jE&Rwe({2aI36woiHSmK+8HsfM`-2%Z&Z(vDSu)UYs%RXGMb)l9 z5`{~EAXzpoBCQ1S5D;wo?G0@1qWBUi&+*m%po0t+MueyvMNm;wRJfL*MtTt5z!v`z z?^`UeW*~GC=$bpfx|Vb-Ni+7Ei6x#@>(NEaCXj8t#J(s&7%3J%u>y~wA=3HF9Ci%# zrFy(06ja&s8ITQq;V9~>!6XWiNRRZZLzxLn_2=sAg~~l}O(_fimfcmMmX!*I(rCw; zirex?o^B+qD^FW%qF5R3W8qgeAd#;m&`3v7jTCY&*|z{c0#nU~nr=QoqwoF*0fQ7; zhfzRrEGd$DM}3VcHPjS5fl31Gg=HqjT6$8RX^F1 zIclh9@&*Ja>MKs7JMmUgBpJbA^*gZ-~ zkTWw%OKUX*!zE2l$-aT>6+z0NbX>E8juseE@iuV%@V%U}EK71SZgJGS;ZPSAd71;H zI8rX}-{12RNTDJiP7J79*PJSmBAsao1&JL~5LJe?*}YB%OB_@b(b2 ztN!3^1+a0U)drOuc7{7SxYr8*ztE^BY3zX&To%-hb_3K8KFClR;K6+0wq>yb{cAiB zKhoULlz-IU=_C^1xV7Bi^i8-^V3|xyaeIZ|J?44`yB#>7ko0H7(CG_W6 z#RqZ^1UHVOSP8*^wTXuL!H5}BR{+5ktUF*}4F&&oUo?xM)TuyIQM}lc7$n7Uaqw_? zFn9~-On;%g8Mf^L4P%KSPv-1FFNG_7!465n0~x$|DFZDnA%~R0a*cT)UG|Qh;)G zNdO#9`f{KaP0m&cZ`Y(CX)blxgXH(PCbYnh^IvLUfx)NJX`}*_C?bP;{V(dX#Gy{4 z?`vpbZHm)BVDT8XaD!RqhLmrVse>ZTasgXPr_ObQW_{4%(w5?`k^3{rsbIy?k&YUW z`buzVZCOi#Ldi(5fPGFN7wix1LJ2k4hEk)HulK}g$9a=_^1_`7FcL$}xU3eyo~ClY z1VB#hk@OpZbf!oRK;uYGv^oAt@s1mua~421byGKBcdX!29T7UB6)1xsH=fG(qSyw1oo3yLxIbwEIYt;Nz(#T zfY0fZqk)7ps1P(d#6U+w1EB?(3=B2i10{;}XVQrWPKg>fjbf+1obZx$nnvv`4+?TV zDK(6BbMJ!wQLSNmf)Yafg{r^QAI#TsJQuKxV zOfOXfDQk8CX{gg-4XiylERQB&Lrg05TG(i$gsJ$RvL%z|?12=WJnbg`q6r+pD{0u5 zKr{Wu?oxZ0K5u)kgyLSqCHDaCov@^}D&p6uszD=r%v%UP@ESAlnPoxC~Z+U<`J>!ry1y}^ILqXrIPXb3Hevh@XxN7F-u=V;QKDA`d}&~W-> z#(X9W%Mjoas9SPQWATUjZZ25pxBCp*fkwLr0QZRqDs&`*Z)-5VC^*b~f zHZ)Ju&a;V#$~Er|Z=kg-C9wxv;njCGFtG zSvYxY{hm$56^Gm78p1%wgS0XQ0CUMyHHM|6@*co_F`{y|Plj8-zZ0M-s3pm2VxYi! zr1ocZ_b(PBT!l3ul;F`wj!-}aPNPu+7HSmh9>9G$c2rWs0`S-zA284p*>M4vR8*6Z zqj)_3xpI7OqreSPpVCvd)a{w#4b)_iKQW!a8&V*hi;S>4bmRO)HI(FvqXW(7JK~T) z??<}2q|37aD!{5I=b_}?p$nh_78T#0J+M4IwShf&kJvXrNNbeEQ)cSU9NNPgV)fbZ z{_%hU4_Z76z|g*(NkD10up5f7y<|rQe>x21cTK5d4}YR+CR8(NrbNKiWfuL82F{fk6Xx z>ra33nC%m`t)RqrZZkbU_M)ByY+Go?{j!3M$J3-_*H1=MT|sJBICT~82)8V3)#*~k z)K0?GG!ivr_6a}t?!Zz!4{byq(IhWK9bhx3Ge8po%mf zNON|u>h2CYEguIk-lJ32AJG8lf(51`V5Ei}WUL)f{fxL=_5nj`eS>EU-Xd6@nq=I` z8`_+>XNwkFKH-{5+M#kit-Mg`r955J3>Pp$n?F?7hOAuyDwPaDHq_DD9Y9U)cZ-N}M zCz-eHQ>~0=*J#KJZeaf`fV2hoS2!wF*y~us zfd*19AzdNiP0l8#{)h&A&R^jJEj20ofCOvofgOq@ma%k-g@T#XQ!kOlBmxab^?`W% zcq00Lio`9APHLYhQQxnoV-4|;#TrP8&SV_fbQ{S%rqa&{An!_OB+$4cahB{O?G5V} zdZA8yEK%YH`Wsz8CD}gL@s$Po8YFU>D3M0eSRD!^^)yg?5=qT*BtiLT+s_8Tz$MHi z^egGt>Ie@1?Iv^STa6FDgERuWF2d*6K*1H<`sqOGzc}=7VYekZ-tQA7I@X11^)%bC zZl2PTpU(#x3ZMvjEe$)P_(1SBEod^8zE$V7MwBgk7NP$90Ga?bTMB3glJwoX65hjm zN$Snjl>ie;Dz=X*h|p(~bnc^AML$m3e%Gm+Gzk%5SgR+~@h&a~T|#W)I9^`dZ~8yi WVEP`H9_`Nn0000#%MB From 575ea504aa7aa14798f48098836eab852031b018 Mon Sep 17 00:00:00 2001 From: Kjell Kernen Date: Mon, 24 Feb 2014 14:28:19 +0100 Subject: [PATCH 79/85] Updated QT resource file with new image names --- companion/src/companion.qrc | 156 ++++++++++-------------------------- 1 file changed, 41 insertions(+), 115 deletions(-) diff --git a/companion/src/companion.qrc b/companion/src/companion.qrc index 1c4550d1a..c6246f314 100644 --- a/companion/src/companion.qrc +++ b/companion/src/companion.qrc @@ -168,131 +168,57 @@ images/library/00009.png images/library/00010.png images/library/00011.png - images/library/00012.png images/library/00013.png images/library/00014.png images/library/00015.png images/library/00016.png - images/library/01001.png - images/library/01002.png - images/library/01003.png - images/library/01004.png - images/library/01005.png - images/library/01006.png - images/library/01007.png - images/library/01008.png + images/library/00017.png + images/library/00018.png + images/library/00019.png + images/library/00020.png + images/library/00021.png + images/library/00022.png + images/library/00023.png + images/library/00024.png + images/library/00051.png + images/library/00100.png + images/library/00101.png + images/library/00102.png + images/library/00103.png + images/library/00104.png + images/library/00105.png + images/library/00106.png + images/library/00201.png + images/library/00202.png + images/library/00203.png + images/library/00204.png + images/library/00301.png + images/library/00302.png + images/library/00303.png + images/library/00304.png + images/library/00401.png + images/library/00402.png + images/library/00403.png + images/library/00404.png + images/library/00501.png images/library/10001.png images/library/10002.png images/library/10003.png - images/library/10004.png - images/library/10005.png - images/library/10006.png - images/library/10007.png - images/library/10008.png - images/library/10009.png - images/library/10010.png - images/library/10011.png - images/library/10012.png - images/library/10013.png - images/library/10014.png - images/library/10015.png - images/library/10016.png - images/library/10017.png - images/library/10018.png - images/library/10019.png - images/library/10020.png - images/library/10021.png - images/library/10022.png - images/library/10023.png - images/library/10024.png - images/library/10033.png - images/library/10034.png - images/library/10035.png - images/library/10036.png - images/library/10049.png - images/library/10050.png - images/library/10051.png - images/library/10052.png - images/library/10037.png - images/library/10038.png - images/library/10039.png - images/library/10040.png - images/library/10053.png - images/library/10054.png - images/library/10055.png - images/library/10056.png - images/library/10025.png - images/library/10026.png - images/library/10027.png - images/library/10028.png - images/library/10029.png - images/library/10030.png - images/library/10031.png - images/library/10032.png - images/library/10041.png - images/library/10042.png - images/library/10043.png - images/library/10044.png - images/library/10057.png - images/library/10058.png - images/library/10059.png - images/library/10060.png - images/library/10045.png - images/library/10046.png - images/library/10047.png - images/library/10048.png - images/library/10061.png - images/library/10062.png - images/library/10063.png - images/library/10064.png - images/library/10065.png - images/library/10066.png - images/library/10067.png - images/library/10068.png - images/library/10081.png - images/library/10082.png - images/library/10083.png - images/library/10084.png - images/library/10069.png - images/library/10070.png - images/library/10071.png - images/library/10072.png - images/library/10085.png - images/library/10086.png - images/library/10087.png - images/library/10088.png - images/library/10073.png - images/library/10074.png - images/library/10075.png - images/library/10076.png - images/library/10089.png - images/library/10090.png - images/library/10091.png - images/library/10092.png - images/library/10077.png - images/library/10078.png - images/library/10079.png - images/library/10080.png - images/library/10093.png - images/library/10094.png - images/library/10095.png - images/library/10096.png - images/library/10097.png - images/library/10098.png - images/library/10099.png - images/library/10100.png images/library/10101.png images/library/10102.png images/library/10103.png - images/library/10104.png - images/library/20001.png - images/library/20002.png - images/library/20003.png - images/library/20004.png - images/library/30001.png - images/library/30002.png - images/library/30003.png - images/library/30004.png + images/library/10501.png + images/library/10502.png + images/library/10503.png + images/library/10504.png + images/library/10505.png + images/library/10506.png + images/library/10508.png + images/library/10601.png + images/library/10701.png + images/library/10702.png + images/library/10801.png + images/library/10802.png themes/monochrome/16/paintbrush.png themes/monochrome/16/open.png themes/monochrome/16/edit.png From 91f8157f033c6df10ece8fc16bafdca29d97d2c1 Mon Sep 17 00:00:00 2001 From: Kjell Kernen Date: Mon, 24 Feb 2014 14:41:05 +0100 Subject: [PATCH 80/85] Renaming files to change order --- companion/src/images/library/00001.png | Bin 353 -> 2331 bytes companion/src/images/library/00002.png | Bin 2331 -> 4365 bytes companion/src/images/library/00003.png | Bin 764 -> 2971 bytes companion/src/images/library/00004.png | Bin 0 -> 7521 bytes companion/src/images/library/00005.png | Bin 451 -> 209 bytes companion/src/images/library/00006.png | Bin 3469 -> 209 bytes companion/src/images/library/00007.png | Bin 3760 -> 209 bytes companion/src/images/library/00008.png | Bin 3485 -> 209 bytes companion/src/images/library/00009.png | Bin 4665 -> 209 bytes companion/src/images/library/00010.png | Bin 3727 -> 353 bytes companion/src/images/library/00012.png | Bin 3151 -> 3469 bytes companion/src/images/library/00018.png | Bin 0 -> 3760 bytes companion/src/images/library/00019.png | Bin 0 -> 451 bytes companion/src/images/library/00020.png | Bin 0 -> 764 bytes companion/src/images/library/00021.png | Bin 0 -> 3151 bytes companion/src/images/library/00022.png | Bin 0 -> 3485 bytes companion/src/images/library/00023.png | Bin 0 -> 4665 bytes companion/src/images/library/00024.png | Bin 0 -> 3727 bytes companion/src/images/library/00031.png | Bin 0 -> 1040 bytes .../images/library/{10104.png => 00051.png} | Bin companion/src/images/library/00100.png | Bin 0 -> 2294 bytes .../images/library/{20004.png => 00101.png} | Bin .../images/library/{20001.png => 00102.png} | Bin .../images/library/{20002.png => 00103.png} | Bin .../images/library/{20003.png => 00104.png} | Bin .../images/library/{10030.png => 00105.png} | Bin .../images/library/{10031.png => 00106.png} | Bin companion/src/images/library/00201.png | Bin 0 -> 1654 bytes .../images/library/{10011.png => 00202.png} | Bin .../images/library/{10007.png => 00203.png} | Bin .../images/library/{10015.png => 00204.png} | Bin .../images/library/{10094.png => 00301.png} | Bin .../images/library/{10096.png => 00302.png} | Bin .../images/library/{10070.png => 00303.png} | Bin .../images/library/{30001.png => 00304.png} | Bin companion/src/images/library/00401.png | Bin 0 -> 1627 bytes .../images/library/{10036.png => 00402.png} | Bin .../images/library/{10038.png => 00403.png} | Bin .../images/library/{10039.png => 00404.png} | Bin companion/src/images/library/00501.png | Bin 682 -> 863 bytes .../images/library/{00601.png => 10001.png} | Bin .../images/library/{00602.png => 10002.png} | Bin .../images/library/{00603.png => 10003.png} | Bin companion/src/images/library/10058.png | Bin 337 -> 0 bytes companion/src/images/library/10098.png | Bin 863 -> 0 bytes .../images/library/{10085.png => 10101.png} | Bin .../images/library/{10088.png => 10102.png} | Bin .../images/library/{10090.png => 10103.png} | Bin companion/src/images/library/10501.png | Bin 0 -> 682 bytes .../images/library/{00502.png => 10502.png} | Bin .../images/library/{00503.png => 10503.png} | Bin .../images/library/{00504.png => 10504.png} | Bin .../images/library/{00505.png => 10505.png} | Bin .../images/library/{00506.png => 10506.png} | Bin .../images/library/{00508.png => 10508.png} | Bin .../images/library/{10083.png => 10601.png} | Bin .../images/library/{10092.png => 10701.png} | Bin .../images/library/{10093.png => 10702.png} | Bin .../images/library/{10026.png => 10801.png} | Bin .../images/library/{10027.png => 10802.png} | Bin companion/src/images/library/300011.png | Bin 2821 -> 0 bytes companion/src/images/library/30002.png | Bin 3381 -> 0 bytes companion/src/images/library/30005.png | Bin 2395 -> 0 bytes 63 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 companion/src/images/library/00004.png create mode 100644 companion/src/images/library/00018.png create mode 100644 companion/src/images/library/00019.png create mode 100644 companion/src/images/library/00020.png create mode 100644 companion/src/images/library/00021.png create mode 100644 companion/src/images/library/00022.png create mode 100644 companion/src/images/library/00023.png create mode 100644 companion/src/images/library/00024.png create mode 100644 companion/src/images/library/00031.png rename companion/src/images/library/{10104.png => 00051.png} (100%) create mode 100644 companion/src/images/library/00100.png rename companion/src/images/library/{20004.png => 00101.png} (100%) rename companion/src/images/library/{20001.png => 00102.png} (100%) rename companion/src/images/library/{20002.png => 00103.png} (100%) rename companion/src/images/library/{20003.png => 00104.png} (100%) rename companion/src/images/library/{10030.png => 00105.png} (100%) rename companion/src/images/library/{10031.png => 00106.png} (100%) create mode 100644 companion/src/images/library/00201.png rename companion/src/images/library/{10011.png => 00202.png} (100%) rename companion/src/images/library/{10007.png => 00203.png} (100%) rename companion/src/images/library/{10015.png => 00204.png} (100%) rename companion/src/images/library/{10094.png => 00301.png} (100%) rename companion/src/images/library/{10096.png => 00302.png} (100%) rename companion/src/images/library/{10070.png => 00303.png} (100%) rename companion/src/images/library/{30001.png => 00304.png} (100%) create mode 100644 companion/src/images/library/00401.png rename companion/src/images/library/{10036.png => 00402.png} (100%) rename companion/src/images/library/{10038.png => 00403.png} (100%) rename companion/src/images/library/{10039.png => 00404.png} (100%) rename companion/src/images/library/{00601.png => 10001.png} (100%) rename companion/src/images/library/{00602.png => 10002.png} (100%) rename companion/src/images/library/{00603.png => 10003.png} (100%) delete mode 100644 companion/src/images/library/10058.png delete mode 100644 companion/src/images/library/10098.png rename companion/src/images/library/{10085.png => 10101.png} (100%) rename companion/src/images/library/{10088.png => 10102.png} (100%) rename companion/src/images/library/{10090.png => 10103.png} (100%) create mode 100644 companion/src/images/library/10501.png rename companion/src/images/library/{00502.png => 10502.png} (100%) rename companion/src/images/library/{00503.png => 10503.png} (100%) rename companion/src/images/library/{00504.png => 10504.png} (100%) rename companion/src/images/library/{00505.png => 10505.png} (100%) rename companion/src/images/library/{00506.png => 10506.png} (100%) rename companion/src/images/library/{00508.png => 10508.png} (100%) rename companion/src/images/library/{10083.png => 10601.png} (100%) rename companion/src/images/library/{10092.png => 10701.png} (100%) rename companion/src/images/library/{10093.png => 10702.png} (100%) rename companion/src/images/library/{10026.png => 10801.png} (100%) rename companion/src/images/library/{10027.png => 10802.png} (100%) delete mode 100644 companion/src/images/library/300011.png delete mode 100644 companion/src/images/library/30002.png delete mode 100644 companion/src/images/library/30005.png diff --git a/companion/src/images/library/00001.png b/companion/src/images/library/00001.png index 0218d0570a6be5207e3bba6c272d9f3c45af1b6d..43cd387dc7b790ab437796d6464fd402a305adfa 100644 GIT binary patch literal 2331 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 literal 353 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 delta 2294 zcmZvedpOhm8^=deB1Ds#sXYuM=TuH9eul|ua{4AEkyA*qw9<-75jo_zP&{p!GqoIZ z%BE*BQPZ&GxHOw(W=TDMd!DP`f4@KP&vjq-=lZwQH>t|Y?w($GAp-)*63`BI-ic$pM{eOe+;-76 zRL?$rkq3F9W;gNUrjy&%9S-RBFMYl9z!q%q_>i{XU@RW zG;`h{9334WbFJb7Y5o1OlF|VKro~ZysG#t1wH-dYckMcAR&)z4JMe08Wq;?#7Nt^7 z^x;$>00WT+t8Uw@(GdmYYaA(HYtok|#9(Qufq?-?^riWM-Sl;KbDS2HN=;iGVY35Q z z?8!KYH4HH;a)56~-XjpnSVyzs z4S}{tp=6pMz2q97b}dvA!C8=TGw2T7=AJ6ugxpE!76r#PhCe$4)Jsbt-?o59| zCd)PWZzCLvJ;zjs!CwDb7atZ~(^i8-&3lkWC?}C9Oku67Ud>-F+7T1($V5}2_=hMe zJ|V%hE|%3OQ&UsZd|^tuX;AXmxF0JKv%<9(hDhf9B4@;TaW}c`A*(P{H4QMb+m1Ie zG4b@AH;%MQIN+z*`{e@yWw5iCix`29KXe-^kLAN$oE?| zyVboZ)P}J?SE~=)7dO#3p@+_Koq=iP@qK%GoBc{T8XYrv=WsYE$-SgUATVLp8N=@Q z2IE9uRZDHIOrwp@zU9pkI^DF3@UCX;CtllLIU|Ch#;qkThja*D2L9H6|G zThC3$5YG1tCJy!M2+h&h(YkKfE#LBPr%PQ}G z+C87RC0%7y6-yHPohPIdkZHk@3Y%`;;3W>cX=*vJ(0rR62muKeS^L}Z*Vcwd_ISRL z=__6>dJUP^bcsx`9uAty^i?vsxb<2wk(G9JpxWag!H^p?Vy=+w9D)*Whc2#r4ix6( zq^VTbDy913h0k45uV>-{5|lKoZuuL`vnJ~ejLJ-(0ZrNrq5R*T78^>b2By3DW06i6 zh~IQqUrfDUV22yw;8b6_+Q<4cDZGOk8X6xv@kfAXeMcG_@TPe(3?W4g@z!9>Me?Ed zTQ)wlhtD zIrO~a-_7IG^r)FJO^vXL0W;!A1cU0P>rv_;ksKi|EKFC(NM2v%^>$np_s<2mB2)n8 z=WIkJK3wJOi`MJ(gpo#8HJ4uzU~X>iU;4|$(()dkAG5N$YQ}wZ1iy!tsi9?8q)6fvS)VkB1g(4gd zSD(Q3Re8ud50$$;G&BT4=g2jBIR+V`RiJn%bi3Sb8|(Gf+sYn>GRCBSYisLw@87>} z|9g(EW|JrYfdn%&rFbmXjLRGytss$Tml)5E1MEHvk#m0N$Zx4J-3>?QG4FHcof)gKZ8Fj%Kc#&YBo6%|iV7!u{@{KzAF?;`7K zpITS%j=WztPb-Acx|hUlP(LGEsmrF=!4i{ZoG9{LQldwh?F*a3l*-DjlIcx9KPB2^ za!2b5L@)KyA3I?F6gC&&?TiWn>R0E*>wzBj&Dzf-fFSqCxgl0E7`@xPzm^ew5{Jal=AvsgMZ>*7sj<0E(D!= zshE_Ml)t4d>+xNmV}5>WSl(DDz>(Zf@i2m_tMB`2#sAoFrgs@sh##I4j=l4(`oPm_ zcLF57zM((6{IA#lHuwK|y(9qq&I7*#z(0B5cTaiN253C?#81wR%ScI-0ijXu4z>0{ G$^Qkmv~u?V diff --git a/companion/src/images/library/00003.png b/companion/src/images/library/00003.png index 9f3c5d78e040bf7ea81c74d87f2edabced38ae62..a179deadfdc73cbebacd24e1dc58b38a9ba9eb25 100644 GIT binary patch literal 2971 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 RR#E@}002ovPDHLkV1mg7tjqua literal 764 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 YrWpxnLoMrrGgAmoK~4URtXbgy0Hqy2mjD0& literal 0 HcmV?d00001 diff --git a/companion/src/images/library/00005.png b/companion/src/images/library/00005.png index 6d5a1d93d4cad3c168a2a5f0f46cd67c9786d9f5..802e9885a8d41bc2573134d0c875e5e07a120834 100644 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^SAf`o14uBqJF!g!Qk(@Ik;M!Q+`=Ht$S`Y;1W=H@ z#M9T6{T`D94;$Owbqp3jA<+`oh!W@g+}zZ>5{8h(qQtz+Vg=9K#Pn2YAJaCV0)I~z z$B>MBZ_hLGGB9v3FUbCXZhLz(o6qO-ZeFAVE%r(G8SAxEHyZ+tX7F_Nb6Mw<&;$V7 C>o;ov literal 451 zcmV;!0X+VRP)M?s9>M``&~-il000McNliru-2?~@A}>_EeGLEr0Z>Uq zK~y-)t&%ZL!$1&4*K*+oVdxRLM%*M6T!A`g2u)-O;oN{43B@hq3N+i&;1eK+3m_*V zB$ga6e>~1=$4-O9uSQQVKeM}5>Yp+&O^UyO<$a)sr33WHm*C-Yn(bl-q>EUB@q3(= zkpNR2N#N_~QGg&T-vme`NEZN~Vvi2cqeMq5ah48nPy2$T4AwOFjc24a3Yw31JSlY& z7=3FyE|fa;&0H9vXS}s*gsS$WF|U0#u8>I;8hsZOH1nna%VFqj%D_1bKyfx;;~Jrk zof?1BYz+W5&JpUURI;Mk8nrUA!+1t^0I+d`O!y}onyrCSY2a_AVfQ!~SX~!;$ zU_-Mta6xR$5bD4cZfUlLz4b!}fas|4P;Ahn!l>|+Gn)I~$9`|}oWV9n`bN{y8pk_& t#uw6pADSCO^XD2g#%m|abkcOV`33v%2Zo%LoI?Nr002ovPDHLkV1j1%y88eC diff --git a/companion/src/images/library/00006.png b/companion/src/images/library/00006.png index 64eca2f6622431d42cc2fe98cc671ec54334e97b..802e9885a8d41bc2573134d0c875e5e07a120834 100644 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^SAf`o14uBqJF!g!Qk(@Ik;M!Q+`=Ht$S`Y;1W=H@ z#M9T6{T`D94;$Owbqp3jA<+`oh!W@g+}zZ>5{8h(qQtz+Vg=9K#Pn2YAJaCV0)I~z z$B>MBZ_hLGGB9v3FUbCXZhLz(o6qO-ZeFAVE%r(G8SAxEHyZ+tX7F_Nb6Mw<&;$V7 C>o;ov literal 3469 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!2~2@x4h5*Qf*Zs5hX#1CLR`=Ysy8gRJ$k9D1HV7KUGkyqwI>m8@}dqp{&Z|7^4S@O9&ev2rN zV)n(_9m*RMoxkzO3bRHW*jns2Z|xkA1@fA+rNF$_uczjRP5ndetVU-MOv$` z`UFM>=J%*p$~V}1On zC3`zAn+hwS0lBFqi3%0DIeEoa6}C!XbFF}Ekg&dz0$52&wyjcxZ-9bxeo?A|iJpm` zfv#&sW|@(a9hZVlQA(Oskc%7C2q4c^DWjyMz)D}gyu4hm+*mKaC|%#s($Z4jz)0W7 zNEfI=x41H|B(Xv_uUHvm1jG!N)Z*l#%z~24{5%DanTbjHr6smXNP z3=ITeaOi_%^bPe4^pTa9WTxRz4w6AA2Whqn$gD`siEzoxP0cF?I>A=S(8vO87(zA@ zN!H8+ED18m$}=}HJvBTtr6dEW3r*M~H8VW}=nbHHeNbrWLxT$#`ugzT2ZaIc!Kfu9 zh4E-`jRqGTqK16Ns32P*U$(!%{4%=Ohe9m%cXFEE{NwI@_$E&K--4*9s zRxL1MGoKmfqi1$?Y2>xpA4?y}MsAH;duUfw?+2OOgI@XuEuD{wxmO?#~Z5CC-UzwmK!ps??>sbwl>aEW4!)Yp2?VUc7Yc z6NkL{Evwr8dgW(R|2eJR$PqdBb2#6+m@bxulNyY2?xwC#(%o|Jwm64a{_mIEl||e3 zNKaW9ohhdx7@F@Kw_HR0msCNOapkWzZKsPlr-azIyQugw-<+hhYVAyK8IOky>~?D( zF0DS_`a56i(BIz8Uf&d+exG>Q!aLf)@sCEq{fEL^-f;ImPCD>};ndkMUJjw0bI%#G z!khY1U5bi1_8Ri#wU*y_dQ?bYiTl!`&GC)iQ(p?P+ed0dZ8c_$i@s-+D(sl=vVXsW z3df(|fcV*Lu2(k*xm;$JV`bVmakNrEbpqyAOD_jerbdfXXdH0f8LW> zk1vcnzQ_56vfc4&X2w@x-XZ*QjsH$bCCuFV(Es*-e(_HqQ*J-W-r&AW;a29KbXk=K hmJ7(q&+O(u20lU0^PNAp%mk)u22WQ%mvv4FO#qlUGS2`2 diff --git a/companion/src/images/library/00007.png b/companion/src/images/library/00007.png index fa384d1e69d6717e7dc37c1f73537364befb0c16..802e9885a8d41bc2573134d0c875e5e07a120834 100644 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^SAf`o14uBqJF!g!Qk(@Ik;M!Q+`=Ht$S`Y;1W=H@ z#M9T6{T`D94;$Owbqp3jA<+`oh!W@g+}zZ>5{8h(qQtz+Vg=9K#Pn2YAJaCV0)I~z z$B>MBZ_hLGGB9v3FUbCXZhLz(o6qO-ZeFAVE%r(G8SAxEHyZ+tX7F_Nb6Mw<&;$V7 C>o;ov literal 3760 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!2~2@x4h5*Qf*Zs5hX#1CLR`=Ysy8gRJ$k9D1HV7KUGkyqwI>m8@}dqp{&Z|7^4S@O9&ev2rN zV)n(_9m*RMoxkzO3bRHW*jns2Z|xkA1@fA+rNF$_uczjRP5ndetVU-MOv$` z`UFM>=J%*p$~V}1On zC3`zAn+hwS0lBFqi3%0DIeEoa6}C!XbFF}Ekg&dz0$52&wyjcxZ-9bxeo?A|iJpm` zfv#&sW|@(a9hZVlQA(Oskc%7C2q4c^DWjyMz)D}gyu4hm+*mKaC|%#s($Z4jz)0W7 zNEfI=x41H|B(Xv_uUHvm1jG!N)Z*l#%z~24{5%DanTbjHr6smXNP z3=ITeaOi_%^bPe4^pTa9WTxRz4w6AA2Whqn$gD`siEzoxP0cF?I>A=S(8vO87(zA@ zN!H8+ED18m$}=}HJvBTtr6dEW3r*M~H8VW}=nbHHeNbrWLxT$#`ugzT2ZaIc!Kfu9 zh4E-`jRqGTqK16Ns32P*U$utUq8EKqtpj-^DjP|2ULIUp84hv*;z?pGpR!aK%+GE5bcqtFKbOWH&3+i!rr9 z=1kb-Lhf~%^Zi1)FPvt&Vsq$iLuCDqju%VLaP_kK%s)E6Bc`|HhxmDpBYbVzHEFu1 z^y?<*)*pN+r*Q7Y;*;CT1rJo?A4_lKu6*?T@Ypf6_cUv!Y)5 zKy9Sj8~4uH=fW=b@s+V{U2wl6{0}qBh4}?53jg+Rwbjhgp7i@S*Mh{P*jveUIbi_~ zkFMyx{3A9wC(!Ei+f&-DE59}c$-hsXXl3)(!DVN}?)~8z0lOn_u6M}QzEYp%xc%n6 z-N(;g2tVt>6m4^C=Tpt9Ccmw0A1}zPDg3=y+mKJ-y?w~?BR20p7zGwMo(y8>Vp5MN z4>tc}6so*oM+&R2oYaMYG|fp(H9vV(Sw8NN{IA5*UU5wC>g{*EMSoR8ooDuk%~$^u z^L*d&+Xo)b`dK3U%u;Es@STP3lfK8jdNYGZ`3u9w?N5!~YGnmy+?zTp{Xu;n_?o?bCe^KC4Rt~2zzdPHPd!IInRmZjVF9j(>&t2{8#g5O}{jvoalY+~cv zmD^_cv48(+J^fz6k@p7myx-?{EohTc^O|vR`DM)mNk67{%0}=Ch5k^|G#B~vE9|#v zG1tr5?(cKz($c*>chCJ+fBMIZfW5zG<>n|d2(R6~Y8H$3L9y@5-}sCF_Wj>2FHkF1 zSp93a;ic=xohn_c4o->BRGlVoAM>T9?s`bLUD&ZbhEwjTNCa^)6|Cf$v#I`H+RtCz zuQP*^v>VpEUU^tPGilq2S(nP*`EHmvX^HgqzWFnhCY`+Q`A+`eFLA$}S5E}7iU+cZ zXq9~bWv=V$lOJmvIBQP8UXDlV{2Lftf9%K&uiMbOFOoa!UgZ17cl2<5{8h(qQtz+Vg=9K#Pn2YAJaCV0)I~z z$B>MBZ_hLGGB9v3FUbCXZhLz(o6qO-ZeFAVE%r(G8SAxEHyZ+tX7F_Nb6Mw<&;$V7 C>o;ov literal 3485 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!2~2@x4h5*Qf*Zs5hX#1CLR`=Ysy8gRJ$k9D1HV7KUGkyqwI>m8@}dqp{&Z|7^4S@O9&ev2rN zV)n(_9m*RMoxkzO3bRHW*jns2Z|xkA1@fA+rNF$_uczjRP5ndetVU-MOv$` z`UFM>=J%*p$~V}1On zC3`zAn+hwS0lBFqi3%0DIeEoa6}C!XbFF}Ekg&dz0$52&wyjcxZ-9bxeo?A|iJpm` zfv#&sW|@(a9hZVlQA(Oskc%7C2q4c^DWjyMz)D}gyu4hm+*mKaC|%#s($Z4jz)0W7 zNEfI=x41H|B(Xv_uUHvm1jG!N)Z*l#%z~24{5%DanTbjHr6smXNP z3=ITeaOi_%^bPe4^pTa9WTxRz4w6AA2Whqn$gD`siEzoxP0cF?I>A=S(8vO87(zA@ zN!H8+ED18m$}=}HJvBTtr6dEW3r*M~H8VW}=nbHHeNbrWLxT$#`ugzT2ZaIc!Kfu9 zh4E-`jRqGTqK16Ns32P*U$qaB~dlF31b%G-9GvJKIn z!zg;uzNpg9nS*o7nnPQ}9_Pz16c^flp3RcY=2D~7ui_W4@~f&&B;Q=#l&OAal9YXPdxjBi%9pNsypr{Bs4eophB~6Hs|+iif?Dcu3(Q4O?hJ=%wVxI z>ql|R)1wm`CHP;ox_b&r@Mzw9!~DT7rtaSeqf86=qcmYSP?t}%C`))jc z*s!ijn7zj~;rQBDX_uJ*w7P@Qzjq1aifd~gc7M+`U&|1%b@q=%@@;bj z&aL~W!()=|T-a;k|5sGCuYFso+<}5~0&Vlw&RcYCyUhCwDLkR>=@MLNH_Vld{eQST zUcKwqPJ`I!`}G@YBp4$9X3E`|Sf@SZ<(!APGZ`2AU+GYlu85aSYwG*Vvd1iXo?Y<7 zgC~@01sS+Q8gBRa8f05e{mo%|^DVQfr&1E)@<(j{1wIz8VXKIKH&NAjKPB89w=GfzV(fr=l#k{znt?=g8DF?u6{1- HoD!M5{8h(qQtz+Vg=9K#Pn2YAJaCV0)I~z z$B>MBZ_hLGGB9v3FUbCXZhLz(o6qO-ZeFAVE%r(G8SAxEHyZ+tX7F_Nb6Mw<&;$V7 C>o;ov literal 4665 zcmeI0Sx^(%9>yD#EwYK=5QinkK@chI`c+0?=%wT=Uq=XE~xN^#7L|=(-{{IqtU4ZQZNW(M$kYQ$RZH{ zfHiR{%?ol5C2acfwAmGuLE(M6HK{To7+ zMdkMixOX-&?0>G#wQ{vnJ-)HP=auw!4Qbc5DYO6ipoHNM%XHPsN48ELPSjMT2*tQ_ zXE$3<#u$wsh4ytso&W%mmn2?A?sm2qe<~S)!&Ci01dB}Ll?niQhAbM+KL}*P{J;Pb zMIZk9W(OQb!t2A`wCqrJG!u|WvW%pIE|KllS`XeZ*|8Kxk^pH8AN zNmL4KCllvK4Q1-X;XEDoIedryU+EOaX9zqT$Q=c#jzA&*ZfBAR|HZzee6jB=#yFB# zV6eL>i40O0yb|=`>KZzq!oH{;e^a$JKZ!d*7%MU^0CXeanMB^I|CqJ}NdZLOXYl;U z9a_lGxOnuDf8pO@@V`I4z2vJHf5Y_+*H;nvD)YD9^$pio5%?R;-JnwkV|f4q_-6iD~Z zh%8^0)xp{+gmnqd{#cwnma(d1K-a%M)OI3DPvI9%yN|bt_eaBXf4slTR7~&DO$4A@ zmw;{PcdPqa6)6UypmNVuM(A;hDv|Vaulu20Gwck-Sy74p07N)58&Dpog^t`kC znpd1VHwE(7dgXLky&;PYg?wX~+}PSclC(%OYg+YCI_4g?1hWBWlMunCV0#hjnXOj z?viS!Q^AP0^xZe@4;RPBjmwIB-P#iJW@k*T3Pq`&%8fI>O)bRBNS^e4puyHcJq31O z{wc7NsDLOIHmXrMf7VU6oBdXw(gbVL@_) zn5u1X*J)Cj2EUSsa1PgjUGq_m3mE-eTRXCH(Bu2?ighJPovgjm{*mnmg`{6gvHP5& zA3hO5%dM$w9>iX>^$@)@A8UT<2(!hNhQ@d*HBN(+FF%B$EC|5!b6byjCIk z&`zn~Ys)>p*p{{OTQLPu?#{8|`ZcxvR*6HWXGYKUJ=>M!0C9&2T$3_sIS)Dw6bHas zCt-kq!O^$QNUR}ywhlcHyyqh_!uste3j820XQroaxsLY~DBKRcyQS^er9^Bj*%Qj) z-n;z_J2E?J7D4Eda~Mu+7)Vo5-?)fUb%||>oiWTyE^mE8mvU>BL~ydDw1gmcK>ONi zjYsS3Aw14LZYs=$PhcqTl-~a7j$=edW=K>U)u5>1PC>&Sn@qU z{j*1?EGO%g8qypm_xdvb+$~vQGf!2=(DU-s{iiPDtst}Bwl%lFfgcw>mzEh4E zIcoBgbO+rmDyBiN)6g4l;>DGZ%g#`vt{%!-8gSK{xKw(p!Nk2BN{9aLDm|v1EZ`=1 z&#P3lCD2vd>S#Z#$KPnt#3`2Hs|>;1AmUFYyIt))>hF~lhx{$Eca9I$4jc$fY;m8S z2uC|S7Rp@aZ&9ke>p|3I+kfQt_qB3}6~Sj86jfFy9WK146x%HXKr87s-A|oIz0Qqz zWZVY`mZV9CpeC}FZ=Tp(^uXjLk3(z_pKX_bzx>8|Sn^IBA zm$2=qs@^Z3YZ4M%^l(gDCZH1B^r-`g7PJ(DVehPT&2sU*TGsuDMx5+S#ZT$Zfi!?N z74(3AOHdZvosy`==@_U=QbS2L;v4x&C+aqSmDqN5nj(!K-DEVRpp}mxJ{&k>tKLoa zllj$WFzKB{Rx{ou=pLFVZraYQowU-MmD5!NV!m-nPKigt~xtI(lR3t+y@aRth=#u&b= XwlJGfv{%5+{}n4Ud(#?Y-?)DPb8?TN diff --git a/companion/src/images/library/00010.png b/companion/src/images/library/00010.png index 2b2081c886fb7876f9221ab4d9f8fcc9cf3ca492..0218d0570a6be5207e3bba6c272d9f3c45af1b6d 100644 GIT binary patch delta 338 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 literal 0 HcmV?d00001 diff --git a/companion/src/images/library/00020.png b/companion/src/images/library/00020.png new file mode 100644 index 0000000000000000000000000000000000000000..9f3c5d78e040bf7ea81c74d87f2edabced38ae62 GIT binary patch literal 764 zcmVM?s9>M``&~-il000McNliru-3ko=EDv)a6A}Ob0*OgP zK~y-)b&^47(@+@4zcs~99Lp+#V=^=FGQ4aD4`aBcLSaWwpjxmjJ{y!2l#D zW{4Y^g-b+6K|TafFffuLloSI%#nQ<5s`B-^Y>bSyc>R9LLO{tA#y1h~NgaHER$z3F zc@>8n7QfJw@u)i$7?x#r-hbpq|3e}X7+tet2?L)b0>bQK$1@Ccu zM3vB3oR*!<~O3MQ&7Py-SIpJ5q3dn4D*4lSKxEP@4!dkp`1TauKoj%`met7A0WC%n*w%s`jB0*jRE&nsiZfyXHej$qRi{hRR zzQ&cqfu`Yi4V!rg8;Xojwntg50a~CuYB|4|^Y0d;vrr_u`&4%cMudig{NQDNpyBYe z4Yxrr^NI+qP@nzc{!MJP{2`$;wtE{1b)gUmkM0z(P&gWO4DIR?BfMi#ju!f#6rQ6s zA{xJ|G9$HNKZIBi$2l0aYs4ntN8%5Ic}UP>-jW(6;~XrSM?1ASVegW7m5AttLVopo utk?UOsE5LOCLR`=Ysy8gRJ$k9D1HV7KUGkyqwI>m8@}dqp{&Z|7^4S@O9&ev2rN zV)n(_9m*RMoxkzO3bRHW*jns2Z|xkA1@fA+rNF$_uczjRP5ndetVU-MOv$` z`UFM>=J%*p$~V}1On zC3`zAn+hwS0lBFqi3%0DIeEoa6}C!XbFF}Ekg&dz0$52&wyjcxZ-9bxeo?A|iJpm` zfv#&sW|@(a9hZVlQA(Oskc%7C2q4c^DWjyMz)D}gyu4hm+*mKaC|%#s($Z4jz)0W7 zNEfI=x41H|B(Xv_uUHvm1jG!N)Z*l#%z~24{5%DanTbjHr6smXNP z3=ITeaOi_%^bPe4^pTa9WTxRz4w6AA2Whqn$gD`siEzoxP0cF?I>A=S(8vO87(zA@ zN!H8+ED18m$}=}HJvBTtr6dEW3r*M~H8VW}=nbHHeNbrWLxT$#`ugzT2ZaIc!Kfu9 zh4E-`jRqGTqK16Ns32P*U$Qfvb)v2(V0ce^;M+zg;0IWYa;5wZVT^a;wdqsVDl) zV!}$l)veAPQEqe0!u|v{ACr$;E3~(h&%r^0gE>*5r@_Dp$Wm5#<30Vb%!E}tgV!qU zD?6_B`l;1|tdf%F*8Ptb&0X5K!JdsFG1}k)<2Bg@Y)ivJk3H9UwZ&Az{nO1qrc2`@ z1rPn?pVXos;_$e~; zTJ*!8u9t9hxDnCLR`=Ysy8gRJ$k9D1HV7KUGkyqwI>m8@}dqp{&Z|7^4S@O9&ev2rN zV)n(_9m*RMoxkzO3bRHW*jns2Z|xkA1@fA+rNF$_uczjRP5ndetVU-MOv$` z`UFM>=J%*p$~V}1On zC3`zAn+hwS0lBFqi3%0DIeEoa6}C!XbFF}Ekg&dz0$52&wyjcxZ-9bxeo?A|iJpm` zfv#&sW|@(a9hZVlQA(Oskc%7C2q4c^DWjyMz)D}gyu4hm+*mKaC|%#s($Z4jz)0W7 zNEfI=x41H|B(Xv_uUHvm1jG!N)Z*l#%z~24{5%DanTbjHr6smXNP z3=ITeaOi_%^bPe4^pTa9WTxRz4w6AA2Whqn$gD`siEzoxP0cF?I>A=S(8vO87(zA@ zN!H8+ED18m$}=}HJvBTtr6dEW3r*M~H8VW}=nbHHeNbrWLxT$#`ugzT2ZaIc!Kfu9 zh4E-`jRqGTqK16Ns32P*U$qaB~dlF31b%G-9GvJKIn z!zg;uzNpg9nS*o7nnPQ}9_Pz16c^flp3RcY=2D~7ui_W4@~f&&B;Q=#l&OAal9YXPdxjBi%9pNsypr{Bs4eophB~6Hs|+iif?Dcu3(Q4O?hJ=%wVxI z>ql|R)1wm`CHP;ox_b&r@Mzw9!~DT7rtaSeqf86=qcmYSP?t}%C`))jc z*s!ijn7zj~;rQBDX_uJ*w7P@Qzjq1aifd~gc7M+`U&|1%b@q=%@@;bj z&aL~W!()=|T-a;k|5sGCuYFso+<}5~0&Vlw&RcYCyUhCwDLkR>=@MLNH_Vld{eQST zUcKwqPJ`I!`}G@YBp4$9X3E`|Sf@SZ<(!APGZ`2AU+GYlu85aSYwG*Vvd1iXo?Y<7 zgC~@01sS+Q8gBRa8f05e{mo%|^DVQfr&1E)@<(j{1wIz8VXKIKH&NAjKPB89w=GfzV(fr=l#k{znt?=g8DF?u6{1- HoD!MyD#EwYK=5QinkK@chI`c+0?=%wT=Uq=XE~xN^#7L|=(-{{IqtU4ZQZNW(M$kYQ$RZH{ zfHiR{%?ol5C2acfwAmGuLE(M6HK{To7+ zMdkMixOX-&?0>G#wQ{vnJ-)HP=auw!4Qbc5DYO6ipoHNM%XHPsN48ELPSjMT2*tQ_ zXE$3<#u$wsh4ytso&W%mmn2?A?sm2qe<~S)!&Ci01dB}Ll?niQhAbM+KL}*P{J;Pb zMIZk9W(OQb!t2A`wCqrJG!u|WvW%pIE|KllS`XeZ*|8Kxk^pH8AN zNmL4KCllvK4Q1-X;XEDoIedryU+EOaX9zqT$Q=c#jzA&*ZfBAR|HZzee6jB=#yFB# zV6eL>i40O0yb|=`>KZzq!oH{;e^a$JKZ!d*7%MU^0CXeanMB^I|CqJ}NdZLOXYl;U z9a_lGxOnuDf8pO@@V`I4z2vJHf5Y_+*H;nvD)YD9^$pio5%?R;-JnwkV|f4q_-6iD~Z zh%8^0)xp{+gmnqd{#cwnma(d1K-a%M)OI3DPvI9%yN|bt_eaBXf4slTR7~&DO$4A@ zmw;{PcdPqa6)6UypmNVuM(A;hDv|Vaulu20Gwck-Sy74p07N)58&Dpog^t`kC znpd1VHwE(7dgXLky&;PYg?wX~+}PSclC(%OYg+YCI_4g?1hWBWlMunCV0#hjnXOj z?viS!Q^AP0^xZe@4;RPBjmwIB-P#iJW@k*T3Pq`&%8fI>O)bRBNS^e4puyHcJq31O z{wc7NsDLOIHmXrMf7VU6oBdXw(gbVL@_) zn5u1X*J)Cj2EUSsa1PgjUGq_m3mE-eTRXCH(Bu2?ighJPovgjm{*mnmg`{6gvHP5& zA3hO5%dM$w9>iX>^$@)@A8UT<2(!hNhQ@d*HBN(+FF%B$EC|5!b6byjCIk z&`zn~Ys)>p*p{{OTQLPu?#{8|`ZcxvR*6HWXGYKUJ=>M!0C9&2T$3_sIS)Dw6bHas zCt-kq!O^$QNUR}ywhlcHyyqh_!uste3j820XQroaxsLY~DBKRcyQS^er9^Bj*%Qj) z-n;z_J2E?J7D4Eda~Mu+7)Vo5-?)fUb%||>oiWTyE^mE8mvU>BL~ydDw1gmcK>ONi zjYsS3Aw14LZYs=$PhcqTl-~a7j$=edW=K>U)u5>1PC>&Sn@qU z{j*1?EGO%g8qypm_xdvb+$~vQGf!2=(DU-s{iiPDtst}Bwl%lFfgcw>mzEh4E zIcoBgbO+rmDyBiN)6g4l;>DGZ%g#`vt{%!-8gSK{xKw(p!Nk2BN{9aLDm|v1EZ`=1 z&#P3lCD2vd>S#Z#$KPnt#3`2Hs|>;1AmUFYyIt))>hF~lhx{$Eca9I$4jc$fY;m8S z2uC|S7Rp@aZ&9ke>p|3I+kfQt_qB3}6~Sj86jfFy9WK146x%HXKr87s-A|oIz0Qqz zWZVY`mZV9CpeC}FZ=Tp(^uXjLk3(z_pKX_bzx>8|Sn^IBA zm$2=qs@^Z3YZ4M%^l(gDCZH1B^r-`g7PJ(DVehPT&2sU*TGsuDMx5+S#ZT$Zfi!?N z74(3AOHdZvosy`==@_U=QbS2L;v4x&C+aqSmDqN5nj(!K-DEVRpp}mxJ{&k>tKLoa zllj$WFzKB{Rx{ou=pLFVZraYQowU-MmD5!NV!m-nPKigt~xtI(lR3t+y@aRth=#u&b= XwlJGfv{%5+{}n4Ud(#?Y-?)DPb8?TN literal 0 HcmV?d00001 diff --git a/companion/src/images/library/00024.png b/companion/src/images/library/00024.png new file mode 100644 index 0000000000000000000000000000000000000000..2b2081c886fb7876f9221ab4d9f8fcc9cf3ca492 GIT binary patch literal 3727 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!2~2@x4h5*Qf*Zs5hX#1CLR`=Ysy8gRJ$k9D1HV7KUGkyqwI>m8@}dqp{&Z|7^4S@O9&ev2rN zV)n(_9m*RMoxkzO3bRHW*jns2Z|xkA1@fA+rNF$_uczjRP5ndetVU-MOv$` z`UFM>=J%*p$~V}1On zC3`zAn+hwS0lBFqi3%0DIeEoa6}C!XbFF}Ekg&dz0$52&wyjcxZ-9bxeo?A|iJpm` zfv#&sW|@(a9hZVlQA(Oskc%7C2q4c^DWjyMz)D}gyu4hm+*mKaC|%#s($Z4jz)0W7 zNEfI=x41H|B(Xv_uUHvm1jG!N)Z*l#%z~24{5%DanTbjHr6smXNP z3=ITeaOi_%^bPe4^pTa9WTxRz4w6AA2Whqn$gD`siEzoxP0cF?I>A=S(8vO87(zA@ zN!H8+ED18m$}=}HJvBTtr6dEW3r*M~H8VW}=nbHHeNbrWLxT$#`ugzT2ZaIc!Kfu9 zh4E-`jRqGTqK16Ns32P*U$ut=HA%LEXC_96duGYwtQMP$?4GV|5ukEUSBKO-`QW%d{J0dUb_0%zvBM~-~P00 zQD`#UmH5T>zW@9E_TJkon>O(L)!KLX#e4;wvOiObU(7zv;P=qW>sJi(68@*N|JKen zvZ~d8Vpl$8<6ET*{EAaFgv~F1{}*whm1CZ8%kK-9ADZmuEHo|ObHuXZj#($Oo-dfCd+F3!zl*LX{4Ry0 z>VNrPb<{80u=eHmWZjlcGSc04x~eikGc5!baOkp}-yd|s#Q$7LY+74Ue_m$_OA?E^ zyv{Ef*M6;ym8%zg>b>r`pUdQ8xZ}d}Pd2)yzIffKp`_<+yR2!sPg_)f@9KwqJnAJo z3l2n^_FOk&KE`m>STA+qnQRj?g-Mgb*jI`QEm3dw>;GURGSx~baLJo*Jk!fvT*5br z{gpbOe|hn-%opw!jR)?UWuNc-lqKwKVf@&yD&%t_PwoxFj@4Td#ZnyR81bOsSdifr3QQ*Bg>UU%X9j zShhy@mw3~KnWvW9C{SaaNEzYPxYm50i@7@uC5;xS|Ks@ZoJ zP7Tsr>6Rw8aKT1Jkty~?OZHyeaAB+3uQ^TvGPP;%ZD$kz^FRQtuDP86KaP)kfCCCstg|;E94;l zfh^j7mF>0yd4v$60Azz!Ai-+$qwurmIdK@RGJ!YDJ5P$EYu}r9PtLvX*_J#!JUl!+ zJUl!+JUl!+&K-Jd`g7KE*wTg>*w;jXB1IZF`46tGfRhM#UV#D~sgyKSvIzouP7@%N zl1i1@*G+|*DsYN`wJYExj0gyc$tai+5KwTMShovpTmhv@Nk@81rE*D^6e@Q}0sT!& zB+#J_6)4wOmn0QB(*FNw89h;=1sP)^B4CPu1UXa!8zEgoK2M!4d&e zB0%JZo>9vqG`h%)wMtsZB%B+2b*3t$kxL~|O>S%@JR>1t$dnNY36L8(7na9jF$Boa zH(sF8CScHbIzmAGZ`#!wH&Yg3xRB_;*kc9^h)Ik}>Lja(?GmaZC5;Z8A)rn(u!yK_ z38STgC|cxHBL~6-ThT#TeXTHK!8aZ>%b$xr3CXJB`nwIcBbHg~v^+TNZ1!diU0<{>-ZXsI{tu zjZd(mr#OE%_%A#U`)?nK^>nt;*Exq%1U#y=)gDs4FN9vz1-&bT-f-`Ez^bvsH3|wo zVg~_pe&j0ly#wqwOJH^EleQXM$`-eQ8ISP`aHIRT+$7+D342`TE3P4+$BX=AB`fB@ z$MlUYMTma$uW=K4eLwbqSoy{U_OO`qz%v7}0uqU`Ex{iz*&uUpM^XQBsO z=L?=>j|m4Y;kUnC;1ghODPY@DK#wO76W|{3!K&YKwFw?jQgYoiL0NnLx(Qa653L^1 zU+Mu@fRdO8Jm96qy6rvz>x^Rp_V^ii2k{y39gm;70yg$`IDM!vso4kIYl2o2o9K0Y ztLJoIPw5-&>V~eKat`PI^|;>(%frLN!^6YF!^6YF!^6Ylyy0(pb2jj3iu^wS0000< KMNUMnLSTYNUeP%K literal 0 HcmV?d00001 diff --git a/companion/src/images/library/10104.png b/companion/src/images/library/00051.png similarity index 100% rename from companion/src/images/library/10104.png rename to companion/src/images/library/00051.png diff --git a/companion/src/images/library/00100.png b/companion/src/images/library/00100.png new file mode 100644 index 0000000000000000000000000000000000000000..12fd5b70f79fceadc97360ddc52f0243e143b280 GIT binary patch literal 2294 zcmVb3q;Ln&up^;Ph#0N)DmtpMK&@T~w}*p$8dOIM?)>pe*_2spH zeMJQL;yNI?HOOCY0qD(FgupKh1QW6(nWZcBLGdLmKL=>dR|LUVEx?WBRx7!a;?L@L z#7}x_V={r(NuyV)ourpnf=MY!OP#wbF2A<5 zH_6!87_C)uKwEb3-XQB7Q79xQZw>zDovb#cuJ{~Wg{wgl2Iwyxs_G2q%y=OUXTWpHy%vU0i#N1FUgYmA_B{@)_WU+;u)PK z)CL<55=vWZrP_}+M#-#@Vg!I;`9&t&VU-VeGnO=b){5^^#r8Y%42GR{q!bvPP+wt@UX2!3XC%ol8`hGzv$B&Ni0S$NttHtV01@ z*S&p|8$9nw*61Uc7-chh*~*O{-NwIFMy0|!#-??QajK(`Iq>4BP&oxZoFQ}PJEz#~ zm91J~P)5mKu>fnwz}^C7yznebf!cfDhhnJhvYqG(gJShMV7`O$T{xd znb-f>{g+qMexGQE&l;|YmjAgF%#PY+nv*UTc94`Z`e2gtE@me)j!Id%h}%{rp)$ww zs(5PRg_i$;1$f%^$x#<(bd6bwVnOgBG~XNVC94lfR;otc{DAe!y0vASBdx0igFDWgCOa zXfW9XzbCzy&Fnr113Cu>tEI_DrM1zZiB>O6DwA5T)Ho^~{l!*iZ|l3DzF8S8-Vl&> zZt;8Xb@pz&(?r*l!5pt#fFfG($pY18S#K4fw{lPz)n>`se!*>4cG_TxA|z6l-1tBD zX0pAqX%_-do#SNk$|qox)qmWEFH+FD`M4a-9>rwY{t~OKKH% z{wJ{H?C8n`?HLw${T$Z^V8A5l+&Sp<+Gp6F{XYc(#gF1Hq9B=fPu|loH zjnaT4P8tKU6KbQRd9iNzAUk}Bc;orC!%F4RjXGk^a~uEQi1niS>Sv+XW3b3dQaO6- zC#?O`jY=}B%*sU*=1>Jg*soVIL+N)cND4#qq|om?JmZb(S;<;QZydt*-q?k5cw&W& z+Cgm$37r*Tsh)~)482hsuPBW!IvcD*yG>zdKh9TH0h(u+J=5wFI*{z#{GuGSV{}6q z_;U?!c+t_=pwgJ!|He_)9|dhWn)w`>G+K3o==n}g=BQ=Xf%h@sJ(M%(wb4*C>82R zB+tp^z1cB>y!28S@I;5h#mA=IA2w~Nc3jSynAMBv8dYu#{^j1vR%>t6EoV`KS{q5! z3l!k;-|L(W*7U)jJ-2rDXcG}?=be?Tc2XGq;HT)LS`N=Ly0gd1;d&TwouIml@cd(* zRz>8R^tN`f*V_nfj+#g%eil=WV1tF>rs14mcm3UHU5Xa<>6% zhlucpkk#iOddy3z@h2I9q|}?N9IwD8mZ()EN=4A(pq3qiIns4m;IaZd`MPOI4z8W~ zWHcTk#{DH|SFgQ%%aK_7LebZ}=!oAU>{lOwcKLzaf3EiX-`|tlFQx=9u|QLZmGKjQ z;P6>8!I$lTF^*6UuQP0QKP5=M^ literal 0 HcmV?d00001 diff --git a/companion/src/images/library/20004.png b/companion/src/images/library/00101.png similarity index 100% rename from companion/src/images/library/20004.png rename to companion/src/images/library/00101.png diff --git a/companion/src/images/library/20001.png b/companion/src/images/library/00102.png similarity index 100% rename from companion/src/images/library/20001.png rename to companion/src/images/library/00102.png diff --git a/companion/src/images/library/20002.png b/companion/src/images/library/00103.png similarity index 100% rename from companion/src/images/library/20002.png rename to companion/src/images/library/00103.png diff --git a/companion/src/images/library/20003.png b/companion/src/images/library/00104.png similarity index 100% rename from companion/src/images/library/20003.png rename to companion/src/images/library/00104.png diff --git a/companion/src/images/library/10030.png b/companion/src/images/library/00105.png similarity index 100% rename from companion/src/images/library/10030.png rename to companion/src/images/library/00105.png diff --git a/companion/src/images/library/10031.png b/companion/src/images/library/00106.png similarity index 100% rename from companion/src/images/library/10031.png rename to companion/src/images/library/00106.png diff --git a/companion/src/images/library/00201.png b/companion/src/images/library/00201.png new file mode 100644 index 0000000000000000000000000000000000000000..a5e6349a3f0c74a46f1690328ff64fcec0518064 GIT binary patch literal 1654 zcmV-+28sEJP)MtqrG5o(cC!|IYz1k$Ag( zdlXR)`@gj7xBT+#A&3=1caW)hip|~8`OF?LvP;K+h(+cpDc!Z%Kcn_}Ma*oVYA#eB zRGr7TyXe^f5Gg}|s#lF_V)k<5tB5~S2*@#IWtU@%WXSYbqhtR%n<vOz5_8vA$B^yvnMdtKk@4~oqObS<=U&7s|% zqvK)#5RE$;035!so)E`j*85pb-1GHS*i=ko{l1^i$pI=>*a-FRyPE~-VQ_$GUL3Z} zb-tcC?q!Oz(yRbus+f2SmHjylvpOoRB*zhrb84D39krhx+^Kq zOROjFsnbl9B%s0L&tHav9=p{U5?Z5mw^>9;C~Sx~DFMPPxDwO?71#k4v%XpIoiO{J<` z6-PHFYHo>_^T7BD9DQZw{>}F7me*Sh154Dj!VQ4{bCm39Y50T?5b9o3PR)zHg~L?_ zfWxorjn2>@y2i(|&{IOd7gp(jJ~?`JRJ==>?uMpa+QEdjg}|b`6CxNie><8h$)bYEuS;yw5*y7I3f8 z$>rr5*0oengNkbxhQ)_AUiSwPXb%_J_g3td&SifL0D7I+!~1P_$jJt6Jg(V;bv|5> z-v&V6It+dHE{P)@1A1EL)$5D0e_(GLp}@vh$mS(w-IIioR^^PVdmRTB7W&1lK0D0N z6S^Ils}#w*wt*|MW3Z3Z@r3|H3yZQ|9(^oFeKm?T~Gk+3nZjCSW~)1O@ag|sGER;SCbm-U%IINo1R9{!Qd*Y z-Ks1Pia=JBxO5nKoCS~E>(4^ z>eT6(kdlA&id-FVb->jDR|i}jaCN}d0apk7n5!1Fk9=SLh(?#@9Nk5F@_&Db6;PT$ zk$?a2DG;m$(MFIYqa;b6W&U@DfS}Q<4IrH;UA_ZwQz-S)S?a~JtXn%Nm#TMWZtN|B zXb~);LzLGq?-X2Fcp)%rzukx(0+yLj0vKhhq|ST3t?nbGzTU5fC24IX&U= z+K9zU!tj~2<)|V-2U81%j8}d_j8(8TP}2f)o`dlfqsSq%))7Bo6q}2&KRMtWzosN(s^W z8N0wU3_~q~!7A5}(X%{Ap9eYHBtBH3kJ)ms01P6srCH&z(| zNzw^A{F$NJ>ji_9Tjj^4kf0Wh+1x4Awvyi^lPK9gIAViYAxV#RnX@{eaxYogN%{}! zz>Nl@R)ZIqRDxiAyrrNLY(znA&=@6KlLBj^@rFnxo6pqh$R|2#7)!JPOH5 z$VD#YD5spu(Hk3$d!14zSWt=PoXy)zoEEiT1)Uv&-vrx_820;r%40&MCur7L5OAP3 z2U+XTo*KPIM~*qGoUxVhL4;zi6thB~N0~)q(&!|??4|oB8N?EnYluf&sN$?IcCM7${F|es54`qZaX)3PDn;jMi!t8Tug` zyJ#e{9*yz=h!0icYh;u32m;E}=l)uk;~KFht3M$}y!6&jwnF}v!g8G5Z97uk%1#=T1K4oxh}$ zG@_l2Sz*>1^)@Ea$`;S}!14)-;70GiR&KJoGaD@mi&10LTG?5=%3$AkZLKj$cJ39& z3gUZ3Ku}uDN^jlfT0qJ!=u`^9XcRSBu1cal&j`-EKX_(Qw2+J{!Op+jWxcQs#}d*`l>r1hb^g z15^EM7&ybez+Vj+t@G2GYhxaFJ8c#%XXS<2-&ys5>PUeP{*C$XgGfS9^l*USFBHI^gPns{{Vg Z>;Jp4bt4A>%Rm4C002ovPDHLkV1k!Q|9AiZ literal 0 HcmV?d00001 diff --git a/companion/src/images/library/10036.png b/companion/src/images/library/00402.png similarity index 100% rename from companion/src/images/library/10036.png rename to companion/src/images/library/00402.png diff --git a/companion/src/images/library/10038.png b/companion/src/images/library/00403.png similarity index 100% rename from companion/src/images/library/10038.png rename to companion/src/images/library/00403.png diff --git a/companion/src/images/library/10039.png b/companion/src/images/library/00404.png similarity index 100% rename from companion/src/images/library/10039.png rename to companion/src/images/library/00404.png diff --git a/companion/src/images/library/00501.png b/companion/src/images/library/00501.png index 51e85006a8615d554c0b7be062363b33b088ddc2..44bb7ad5a8361da7f343a8d0aecb47e151b015a2 100644 GIT binary patch delta 821 zcmV-51IqlW1>Xjc7(WOA0002@y&$6i0007FOGiWi|A&vvzW@LL32;bRa{vGf6951U z69E94oEQKA00(qQO+^RZ0vHMdF?{JQz>^ySBYy(VNklZsc767Xn0lz?G3nS?a!UZV+1on`EK$u^F#~Isk0P?sFAA^({#`jGji!}?XtP0%#$$A+= zjP$!?n~DQu1jn|01MI=isd;}=Gu+Qz?*Y_XLnUT%;VNPPHF@jhxz^qa0=#M>^2Ht= z#&o&`;CN^F&~40QAdwn86@-^V$HEDVdVi{11Gq)}LIEf~m3oxz=)i1K)7n-GutNc( zN|HHb%hN(p1tV1{+RwSn?hp|-(lLOn%)>*G!(ePshf8OAZop!i*e!G!ER1CbJFU)= z2cHnYHOr68eAwww-DG!(FAK+=Ll6@q^bbL>7i1Jb+Zfoiq--((W{f-ljg^-T27fTA z?13}{0HEp$r`)6?d9Ey3t{tfnYN5#$Pk^9mosXPxG9n%^P+orlg0gKurmK)lmd1{7C0vhyM$^45>*vBrXxqDc%24! z5{;%Mo9iou$8gU|RiwB!*~0mZ#eZIQF`Tb1K`Qs14Hd&X`_D@bD6`qegNR|$6R7qn zp7e9!OXh@7@~J*RQ)?;aPWw!-ZJXcf3ddmsn<0=zLpH?)(7MFPZxn`8pK%ZzyFhjD zC&%^PgTMzV-*-XYmdic(XKJhf_$a>j5j;8Ya=f*P@U#cw7JX4ZeANR>t!jXKVd8@O zw1-`Q`nz+>!xZ>)eJ3YRQ?RnozT$k`1HVVUX!1(?Cjft^PEDKe6#%~@^<>7j(Dj8F zm@7ESKAMlG;hYX=-T=|Q=z(FdX7M{Snwk9oAJQ^lZ{=M400000NkvXXu0mjfs}Xbi delta 638 zcmcc5wu*IvL_H$|5d2!}bO}gt7I;J!Gca%incNJFPt4cuXJBC5>FMGaVsSe5vUT1a z0|B-Ni4qPkZ{#ILgnMKjV62!bb1=1w;nJbj^+#RxobD%hiJ7Q>=GV*&*AiRpFY^4L z;K}JWF)B856?O}&M9C#CtzeobfAD%i)3fi^wJv8*me%h+FXv$R_Vh`GCxY9B&N7@= z&NEvf9`1JM$)_a-m+uRf&+TGg@;q){-hGCN&GOY<77kx+1!MI&72aKIX3=3X&vL zWaypvW!c+&Sqb;e^=f}Z9pnRBEozgQeHq_&m2dEHbT&WnYr;wX9~T(7X0Gv_%s6ZI ziMJO#nAiN4`_CY(kQcz%@}0+yaot?Ty&UBZv&0`UNqjhF&lka?$979W^WuZlcB^cb zXZGwYXBGK1xO_L4%zql*zJj&F^PgD*a!9z~x$xiJyY6}vt zZTDaNBD-g=*@|m!mJA0A_pmRi6JTHPzKFkS#zVm)r#avJ;&=1iF7W?keLXNnMM_*F zN*qf|GV+TU98-!i6Y~@tbCcLpi_+`z!=omKE9Wq%f|R5rmZVxG7o`Fz1|tJQBV7YS zT|?6lLo+Kw6Dt!lZ39Cq1A{AbWxoN|gM2TZ*Nk)DVgJVijW@4U#V{TGvQF>i|coa}x6eRDQpPQSSSAwdbKhxs? zP=P8)K}upts#S7PDv)9@GB7mKH89jQGz~E{vobWXGBMLOFtjo-xH4Dv8;XY9{FKbJ XO57Tj9$4xH)WG2B>gTe~DWM4fs_bf# diff --git a/companion/src/images/library/10098.png b/companion/src/images/library/10098.png deleted file mode 100644 index 44bb7ad5a8361da7f343a8d0aecb47e151b015a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 863 zcmV-l1EBngP)*cxD-UmK)lmd1{7C0vhyM$^45>*vBrXxqDc%24!5{;%Mo9iou z$8gU|RiwB!*~0mZ#a?zXoUblHD)*fY6~jCG&r1#{v)RXkh+)zbsP-wI^mE}$=7do4 zsXjncYboYV`%JKHo8RgR$6*7TA&^BwHpKJn4002ovPDHLkV1k75e2)MC diff --git a/companion/src/images/library/10085.png b/companion/src/images/library/10101.png similarity index 100% rename from companion/src/images/library/10085.png rename to companion/src/images/library/10101.png diff --git a/companion/src/images/library/10088.png b/companion/src/images/library/10102.png similarity index 100% rename from companion/src/images/library/10088.png rename to companion/src/images/library/10102.png diff --git a/companion/src/images/library/10090.png b/companion/src/images/library/10103.png similarity index 100% rename from companion/src/images/library/10090.png rename to companion/src/images/library/10103.png diff --git a/companion/src/images/library/10501.png b/companion/src/images/library/10501.png new file mode 100644 index 0000000000000000000000000000000000000000..51e85006a8615d554c0b7be062363b33b088ddc2 GIT binary patch literal 682 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 LNkvXXu0mjfm0HGb diff --git a/companion/src/images/library/30005.png b/companion/src/images/library/30005.png deleted file mode 100644 index 8761d4fcb984cb975b78e7d3febab2bff3719b8b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2395 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 N002ovPDHLkV1jr;h?4*S From ca4c7b4dc13cef7d8c64e273df2cfa368ddb6e56 Mon Sep 17 00:00:00 2001 From: Kjell Kernen Date: Mon, 24 Feb 2014 16:36:45 +0100 Subject: [PATCH 81/85] Corrected index error in general edit --- companion/src/generaledit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/companion/src/generaledit.cpp b/companion/src/generaledit.cpp index 6c5b6dfc9..8cccc654c 100644 --- a/companion/src/generaledit.cpp +++ b/companion/src/generaledit.cpp @@ -74,7 +74,7 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) : if (!name.isEmpty()) { ui->profile_CB->addItem(name, i); if (i==g.id()) { - ui->profile_CB->setCurrentIndex(ui->profile_CB->count()); + ui->profile_CB->setCurrentIndex(ui->profile_CB->count()-1); } } } From 0f3e6581bd86ac4e5edfa0900a14c4878b3ecc4c Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 24 Feb 2014 18:20:29 +0100 Subject: [PATCH 82/85] Update DONATIONS.txt --- DONATIONS.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DONATIONS.txt b/DONATIONS.txt index f3bf27e41..45b1c981b 100644 --- a/DONATIONS.txt +++ b/DONATIONS.txt @@ -325,3 +325,5 @@ Reginald H Millsom Emanuel Stassar Pierluigi Sommaruga Rafael Eric Suarez Nordlow +A Harris + From 9992c1f79ce63550bb1e7d8188df3d3b2d3bf4d3 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 24 Feb 2014 20:58:59 +0100 Subject: [PATCH 83/85] Update DONATIONS.txt --- DONATIONS.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DONATIONS.txt b/DONATIONS.txt index 45b1c981b..c85c6de97 100644 --- a/DONATIONS.txt +++ b/DONATIONS.txt @@ -326,4 +326,4 @@ Emanuel Stassar Pierluigi Sommaruga Rafael Eric Suarez Nordlow A Harris - +Stefan Grunenberg From 06115fdaed78193aba05f0a37f0df19c16dcf6bb Mon Sep 17 00:00:00 2001 From: Jacek Drewniak Date: Mon, 24 Feb 2014 21:44:11 +0100 Subject: [PATCH 84/85] PL translation fixes --- companion/src/translations/companion_pl.ts | 457 ++++++++++++--------- 1 file changed, 254 insertions(+), 203 deletions(-) diff --git a/companion/src/translations/companion_pl.ts b/companion/src/translations/companion_pl.ts index bd3013a8a..ab649090f 100644 --- a/companion/src/translations/companion_pl.ts +++ b/companion/src/translations/companion_pl.ts @@ -57,22 +57,22 @@ CurveGroup - + Diff Róźnicowość - + Expo Expo - + Func Funkcja - + Curve Krzywa @@ -4105,70 +4105,70 @@ p, li { white-space: pre-wrap; } QObject - + Rud SK - + Ele SW - + Thr Gaz - + Ail Lotki - - + + P1 Potencjometr 1 - - + + P2 Potencjometr 2 - - + + P3 Potencjometr 3 - + S1 Potencjometr 1 - + S2 Potencjometr 2 - + LS Lewy suwak - + RS Prawy suwak @@ -4687,26 +4687,26 @@ p, li { white-space: pre-wrap; } - + ---- - + THR THR - + ON Włącz - + OFF Wyłącz @@ -5153,7 +5153,7 @@ p, li { white-space: pre-wrap; } - + Warning Ostrzeżenie @@ -5163,94 +5163,94 @@ p, li { white-space: pre-wrap; } EEPROM zapisany z tymi ostrzeżeniami: - - + + FM%1 FP%1 FM%1 - + Input%1 Wejście %1 - + English Angielski - + French Francuski - + Italian Włoski - + German Niemiecki - + Czech Czeski - + Slovak Słowacki - + Spanish Hiszpański - + Portuguese Portugalski - + Polish Polski - + Finnish Fiński - + No Nie - + RotEnc A Pokrętło :A - + Rot Enc B Pokrętło :B - + Rot Enc C Pokrętło :C - + Rot Enc D Pokrętło :D - + Rot Enc E Pokrętło :E @@ -5572,133 +5572,133 @@ p, li { white-space: pre-wrap; } Pokrętło - + !Flight mode %1 !Faza lotu %1 - + Flight mode %1 Faza lotu %1 - + Yellow Żółty - + Orange Pomarańczowy - + Red Czerwony - + Winged Shadow How High - + Winged Shadow How High (not supported) Winged Shadow How High (nie obsługiwane) - + FrSky Sensor Hub Hub sensora FrSky - - + + None Żaden - + Imperial Imperialne - + Metric Metryczne - + Extra Fine Bardzo dokładne - + Fine Dokładne - + Medium Średni - + Coarse Gruby - + Exponential Eksponencjalny - + Count Up Licz - + Count Down Odliczaj - + %1:%2, - + : %1 Channels, %2usec Delay :Kanały %1, opóźnienie %2usX - + Flight modes(%1) Fazy lotu(%1) - + Flight mode(%1) Faza lotu (%1) - + Rudder SK - + Elevator SW - + Throttle Gaz - + Aileron Lotki @@ -5709,43 +5709,43 @@ p, li { white-space: pre-wrap; } - - + + --- - + Rud Trim Trymer SK - + Ele Trim Trymer SW - + Thr Trim Trymer gazu - + Ail Trim Trymer lotek - + Rot Enc Pokrętło - + Swedish Szwedzki - + CH%1 Kan %1 @@ -5848,46 +5848,46 @@ p, li { white-space: pre-wrap; } Zwiększanie - + Own value Własny Wartość - + Flight mode %1 value Flight phase %1 value Wartość Fazy lotu FL%1 - + Keys Przyciski - + Sticks Drążki - + Keys + Sticks Przyciski i Drążki - + -GV%1 -ZG%1 - + GV%1 ZG%1 - + Simulator for this firmware is not yet available Nie jest dostępny symulator dla tego firmware @@ -5965,17 +5965,17 @@ Zespół OpenTX/Companion. Użyj trymerów dla Fazy Lotu %1 + Własne trymery jako offset - + FW: %1 FW:%1 - + Pict: %1 Obrazek:%1 - + Profile image Obrazek Profilu @@ -7135,11 +7135,21 @@ To ustawienie jest używane przez szablony, określa jakie wyjście przypisane j SD Structure path Struktura karty SD + + + Firmware Variant + Wariant Firmware + Select Image Wybierz obrazek + + + Firmware File + Plik Firmware + Offer to write FW to Tx after download @@ -7166,9 +7176,8 @@ To ustawienie jest używane przez szablony, określa jakie wyjście przypisane j Wyczyść obrazek - Firmware - Firmware + Firmware @@ -7246,53 +7255,53 @@ To ustawienie jest używane przez szablony, określa jakie wyjście przypisane j Uaktywnij automatyczny backup przed zapisem firmware - + Select your snapshot folder Katalog zrzutów - - + + No joysticks found Brak oysticka - + Select your library folder Wybierz katalog bibliteki - + Select your Models and Settings backup folder Wybierz folder do backupowania Modeli i Ustawień - + Select Google Earth executable Wybierz wykonywalny plik Google Earth - + Select the folder replicating your SD structure Wybierz folder do zreplikowania struktury Twojej karty SD - + Not possible to remove profile Usunięcie profilu jest niemożliwe - + The default profile can not be removed. Podstawowy profil nie moze być usunięty. - + Open Image to load Otwórz obrazek do załadowania - + Images (%1) Obrazki (%1) @@ -7676,250 +7685,292 @@ m2560 dla platformy V4 Własne logo - - + Write to TX Zapisz do radia - + <html><head/><body><p>Modify calibration parameters using settings from current profile</p></body></html> <html><head/><body><p>Zmiana parametrów kalibracji przy użyciu aktualnego profilu</p></body></html> - + Patch calibration setting from profile Zamień ustawienia kalibracji wartościami z profilu - + <html><head/><body><p>Modify HW parameters using settings from current profile</p></body></html> <html><head/><body><p>Zmień ustawiania parametrów HW przy pomocy wartości z aktualnego profilu</p></body></html> - + Patch HW setting from profile Zmień ustawiania parametrów HW wartościami z profilu - + Date & Time Data i Czas - + + Use firmware start screen + Użyj ekranu startowego z firmware + + + + Use another start screen + Użyj innego ekranu startowego + + + + Use profile start screen + Użyj ekranu startowego z profilu + + + + Use library start screen + Użyj ekranu startowego z biblioteki + + + SVN - + Variant Wariant - Invert Color - Odwróć kolory + Odwróć kolory - Load Image - Otwórz logo + Otwórz logo - Open Splash Library - Otwórz bibliotekę obrazków + Otwórz bibliotekę obrazków - - ... - - - - Substitute image in firmware - Zmień logo w firmware + Zmień logo w firmware - - + + Browse for file Przeglądaj pliki - + Allows Companion to write to older version of the firmware Pozwól Companion na zapis do starszej wersji firmware - + Backup and restore Models and Settings Zbakupuj i odtwórz Modele i Ustawienia - Use image in settings - Użyj Logo w ustawieniach + Użyj Logo w ustawieniach - + Check Firmware compatibility Sprawdź kompatybilność firmware - + Current Profile Aktualny profil - + Cancel Przerwij - + Write firmware to TX Zapisz firmware do radia - + Current profile Aktualny profil - - - - - - + + + + + + Warning Ostrzeżenie - %1 is not a known firmware - %1 nie jest znanym firmware + %1 nie jest znanym firmware - Burn anyway ! - Wypiecz mimo wszystko ! + Wypiecz mimo wszystko ! - - - - - + + + + + + + - - - - + + + + + Error Błąd - + Unable to find file %1! Nie mogę odnaleźć pliku %1! - - - + + + Error opening file %1: %2. Błąd otwarcia pliku %1: %2. - + Write Models and Settings to TX Zapisz Modele i Ustawienia do radia - + Write Models and Settings in %1 to TX Zapisz Modele i Ustawienia w %1 do radia - + Open Firmware File Otwórz plik Firmware - + Choose file to load Models and Settings from Wybierz plik Modeli i Ustawien do wczytania - - - + + %1 may not be a valid firmware file + %1 moze nie być prawidłowym plikiem firmware + + + + + Invalid binary Models and Settings File %1, Proceed anyway ? Nieprawidłowy plik Modeli i Ustawień : %1. Kontynuować ? - + Error reading file %1: %2. Błąd odczytu pliku %1: %2. - - Open Image to load - Otwórz plik z logo + + The firmware file is not valid. + Plik firmware jest błedny. - + + There is no start screen image in the firmware file. + Brak obrazka ekranu startowego w firmware. + + + + The profile image %1 does not contain an image. + Obraz profilu %1 nie zawiera obrazka. + + + + Open image file to use as Tx start screen + Otwórz plik obrazka by użyć go jako ekran startowy radia + + + + Image could not be loaded from %1 + Obrazek nie moze być załadowany z %1 + + + + The library image could not be loaded + Obrazek z biblioteki nie może być załadowany + + + Open Image to load + Otwórz plik z logo + + + Images (%1) Obrazki (%1) - - Cannot load %1. - Nie mogę załadować %1. + Nie mogę załadować %1. - + Cannot save customized firmware Nie mogę zapisać przystosowanego firmware - + Custom image not found Własny obrazek nie odnaleziony - + No firmware selected Brak wyboru firmware - + Wrong radio calibration data in profile, Settings not patched Błędna kalibracja radia w profilu, Ustawienia nie spatchowane - + Wrong radio setting data in profile, Settings not patched Błędne ustawienia radia w profilu, Ustawienia nie spatchowane - - + + Cannot write file %1: %2. Nie mogę zapisać pliku %1: %2. - + Error writing file %1: %2. Błąd zapisu pliku %1: @@ -8537,75 +8588,75 @@ m2560 dla platformy V4 - - + + + - Error Błąd - + Cannot load the image file %1. Nie mogę załadować pliku obrazka %1. - + Cannot load the profile image %1. Nie mogę załadować obrazu Profilu %1. - + Cannot load the library image %1. Nie mogę załadować obrazu biblioteki %1. - + File Saved Plik Zapisany - + The image was saved to the file %1 Obraz został zapisany do pliku %1 - + Image Refresh Error Błąd odświeżenia obrazka - + Failed to refresh image from file %1 Nieudane odswieżenie obrazka z pliku %1 - + File Save Error Błąd zapisu pliku - + Failed to write image to %1 Nieudany zapis obrazka do %1 - + Open Image to load Otwórz obrazek do załadowania - + Open Firmware File Otwórz plik Firmware - + Can not load embedded image from firmware file %1. Nie mogę załądować wbudowanego obrazka z pliku Firmware %1. - + Images (%1) Obrazki (%1) @@ -10614,32 +10665,32 @@ Mode 4: splashLibrary - + ... - + Splash Library - page %1 of %2 Biblioteka obrazków - strona %1 z %2 - + Warning Ostrzeżenie - + Invalid image in library %1 Nieprawidłowy obrazek w bibliotece %1 - + Information Informacja - + No valid image found in library, check your settings Nie znaleziono prawodłowego obrazka w biblitece, sprawdź ustawienia From 2e14e5d9c84439ff84a48f6d508cfc47e44fb814 Mon Sep 17 00:00:00 2001 From: Kjell Kernen Date: Mon, 24 Feb 2014 22:50:03 +0100 Subject: [PATCH 85/85] Swedish Companion translation --- companion/src/translations/companion_sv.ts | 2031 ++++++++++++-------- 1 file changed, 1176 insertions(+), 855 deletions(-) diff --git a/companion/src/translations/companion_sv.ts b/companion/src/translations/companion_sv.ts index 9b2636f07..091cd0560 100644 --- a/companion/src/translations/companion_sv.ts +++ b/companion/src/translations/companion_sv.ts @@ -57,7 +57,7 @@ CurveGroup - + Diff Diff @@ -143,7 +143,7 @@ CustomFunctionsPanel - + Switch Brytare @@ -163,17 +163,17 @@ Effekt - + CF%1 - + - + ON På - + Error Fel @@ -183,7 +183,7 @@ Kan inte hitta ljudfilen %1! - + &Delete &Ta bort @@ -601,7 +601,7 @@ Om fältet lämnas tomt så är filtret aktivt hela tiden. Allmänna inställningar - + General settings used throught the transmitter. These will be relevant for all models in the same EEPROM. Allmänna inställningar för sändaren @@ -1541,7 +1541,7 @@ Mode 4: Spänning - + Warning Varning @@ -1557,12 +1557,12 @@ Mode 4: Felaktig information i profilen, hårdvaruinställningar lästes inte in - + Do you want to store calibration in %1 profile<br>overwriting existing calibration? Vill du skriva över existerande kalibreringsdata<br>i profilen %1 med de nuvarande? - + Calibration and HW parameters saved. Kalibrering ojch hårdvaruinställningar sparades. @@ -1677,7 +1677,7 @@ Mode 4: PPMSim - + If you enable FAI, you loose the vario, the play functions, the telemetry screen. This function cannot be disabled by the radio. Are you sure ? @@ -1844,25 +1844,25 @@ FAI-funktionen kan inte slås av i sändaren. InputsPanel - + Move Up Flytta uppåt - - + + Ctrl+Up Ctrl+Up - - + + Move Down Flytta nedåt - - + + Ctrl+Down Ctrl+Down @@ -1887,12 +1887,12 @@ FAI-funktionen kan inte slås av i sändaren. Brytare(%1) - + Clear All Settings Radera alla inställningar - + Not enough available inputs! För få filter är tillgängliga! @@ -2064,39 +2064,39 @@ FAI-funktionen kan inte slås av i sändaren. MainWindow - - - - + + + + File loaded Filen har laddats - + - - + + Save As Spara Som - - + + No updates available at this time. Inga updateringar finns tillgängliga. - - - - + + + + Unable to check for updates. Det gick inte att söka efter uppdateringar. - + Executable (*.exe) Program (*.exe) @@ -2106,110 +2106,96 @@ FAI-funktionen kan inte slås av i sändaren. Vill du starta installationsprogrammet? - + Do you want to write the firmware to the transmitter now ? Vill du skriva firmware till sändaren nu? - + A new version of %1 firmware is available (current %2 - newer %3). Do you want to download it now ? En ny version finns tillgänglig av %1 fimware (Din version %2 - Ny version %3). Vill du ladda ned den nya versionen nu ? - Open - Öppna + Öppna - + File saved Filen sparades - + Copyright Copyright - New - Ny + Ny - Open... - Öppna... + Öppna... - Save... - Spara... + Spara... - Save As... - Spara Som... + Spara Som... - + Exit Avsluta - Cut - Klipp Ut + Klipp Ut - Cut current selection to the clipboard - Klipp ut markeringens innehåll till klippbordet + Klipp ut markeringens innehåll till klippbordet - Copy... - Kopiera... + Kopiera... - Copy current selection to the clipboard - Kopiera markeringens innehåll till klippbordet + Kopiera markeringens innehåll till klippbordet - Paste... - Klistra In... + Klistra In... - Paste clipboard into current selection - Klistra in klippbokens innehåll i det valda avsnittet + Klistra in klippbokens innehåll i det valda avsnittet - + Classical Klassiskt - The classical Companion icon theme - Det klassiska Companion-temat + Det klassiska Companion-temat - The new Companion 2 icon theme - Det nya Companion2-temat + Det nya Companion2-temat - Companion2 - Companion2 + Companion2 - + Monochrome Monokromt @@ -2234,137 +2220,119 @@ Vill du ladda ned den nya versionen nu ? Använd systemspråket i menyerna - About - Om + Om - Print - Skriv ut + Skriv ut - + Print current model Skriv ut modell - Simulate - Simulera + Simulera - Simulate selected model - Simulera modell + Simulera modell loadBackup... Ladda backup från fil... - Logs - Loggar + Loggar - Setting... - Inställningar... + Inställningar... - Downloads... - Nedladdningar... + Nedladdningar... - Check for updates... - Sök efter uppdateringar... + Sök efter uppdateringar... - + Edit Tx Splash Image... Startbildsredigerare... - edit the splash screen of your TX - Editera startbilder för din sändare + Editera startbilder för din sändare - List programmers - Programmerare + Programmerare - + Fuses... Säkringar... - Configure connection software... - Inställningar för kommunikation... + Inställningar för kommunikation... - + Save Tx Models and Settings to file Spara sändarens Modeller och Inställningar till fil - Contributors - Bidragande + Bidragande - + A tribute to those who have contributed to OpenTX and Companion Ett tack till alla de som bidragit till OpenTX och Companion - + Settings Inställningar - + Read/Write Läs/Skriv - - &%1 %2 - &%1 %2 + &%1 %2 &New &Ny - Create a new file - Skapa ny fil + Skapa ny fil &Open... &Öppna... - Open an existing file - Öppna en existerande fil + Öppna en existerande fil &Save &Spara - - Save the document to disk - Spara dokumentet till fil + Spara dokumentet till fil Save &As... @@ -2379,12 +2347,12 @@ Vill du ladda ned den nya versionen nu ? &Sök efter uppdateringar... - + Display previous message again at startup ? Skall föregående varning visas igen vid uppstart ? - + Firmware does not longer fit in the Tx, due to selected firmware options Firmware får inte rum i minnet på grund av att för många funktioner aktiverats @@ -2394,12 +2362,12 @@ Vill du ladda ned den nya versionen nu ? Tillfälligt fel i byggservern. Försök igen senare - + Firmware does not fit in the Tx, due to selected firmware options Firmware får inte rum i minnet på grund av att för många funktioner aktiverats - + Firmware %1 does not seem to have ever been downloaded. Version %2 is available. Do you want to download it now ? @@ -2408,12 +2376,12 @@ Version %2 finns tillgänglig. Vill du ladda ned den nu ? - + Write Models and settings from %1 to the Tx? Skriv Modeller och Inställningar från %1 till sändaren? - + Conversion failed Konverteringen misslyckades @@ -2428,7 +2396,7 @@ Vill du ladda ned den nu ? Säkerhetskopieringen misslyckades - + OpenTX Companion - FW: %1 - Profile: %2 OpenTX Companion - FW: %1 - Profil: %2 @@ -2437,7 +2405,7 @@ Vill du ladda ned den nu ? &Inställningar... - + Edit Settings Redigera Inställningar @@ -2459,7 +2427,7 @@ Vill du ladda ned den nu ? &Avsluta - + Exit the application Avsluta programmet @@ -2496,16 +2464,15 @@ Vill du ladda ned den nu ? Ctrl+Alt+R - Configure software for reading from and writing to the transmitter - Inställningar för mjukvaran som kommunicerar med sändaren + Inställningar för mjukvaran som kommunicerar med sändaren &List programmers &Programmerare - + List available programmers Lista upp tillgängliga prorammerare @@ -2552,10 +2519,8 @@ Vill du ladda ned den nu ? Visa information om programmet - - Recent Files - Senaste Filer + Senaste Filer &File @@ -2570,22 +2535,22 @@ Vill du ladda ned den nu ? Companion - Editor för Modeller och Inställningar - %1 - + Checking for updates Letar efter uppdateringar - + A new release of Companion is available please check the OpenTX website! En ny version av Companion finns tillgänglig. Var god kontrollera OpenTX webbsida! - + Ignore this version (r%1)? Ladda inte ned versionen (r%1)? - + OpenTX Home Page: <a href='%1'>%1</a> OpenTX Hemsida: <a href='%1'>%1</a> @@ -2621,16 +2586,15 @@ Vill du ladda ned den nu ? Redigera programmets inställningar - Show Companion changelog - Visa en lista med förändringar av Companion + Visa en lista med förändringar av Companion &Write Models and Settings To Tx &Skriv Modeller och Inställningar till sändaren - + Write Models and Settings to transmitter Skriv Modeller och Inställningar till sändaren @@ -2648,8 +2612,84 @@ Vill du ladda ned den nu ? Write Firmware Skriv Firmware + + + New Models+Settings + Ny Modeller+Inställningar + + Create a new Models and Settings file + Skapa en ny Modeller och Inställningar-fil + + + + Open Models+Settings... + Öppna MOdeller+Inställningar... + + + + Save Models+Settings... + Spara Modeller+Inställningar... + + + + + Save Models and Settings file + Spara Modeller och Inställningar-fil + + + + Save Models+Settings as... + Spara Modeller+Inställningar som... + + + + Cut Model + Klipp ut Modell + + + + Cut current model to the clipboard + Klipp ut vald modell till klippbordet + + + + Copy Model... + Kopera Modell... + + + + Copy current model to the clipboard + Kopiera vald modell till klippbordet + + + + Paste Model... + Klistra in Modell... + + + + Paste model from clipboard + Klistra in modell från klippbordet + + + + The classic companion9x icon theme + Det klassiska companion9x-temat + + + + Yerico + Yerico + + + + Yellow round honey sweet icon theme + Yellow round honey sweet icon theme + + + Write firmware to transmitter Skriv firmware till sändaren @@ -2697,24 +2737,40 @@ Vill du ladda ned den nu ? - + File Arkiv - + Edit Redigera - - + + Help Hjälp - + + + Radio Settings Profile + Radioprofil + + + + Show recent Models+Settings documents + Visa senaste Modeller+Inställningar-dokument + + + + Show a selection list of radio settings profiles + Visa en lista med radioprofiler + + + Ready Redo @@ -2723,17 +2779,17 @@ Vill du ladda ned den nu ? &Bidragsgivare... - + Display previous warning again at startup ? SKall föregående varning visas igen vid uppstart ? - + - + - - + + @@ -2745,21 +2801,21 @@ Vill du ladda ned den nu ? Fel - + Cannot write file %1: %2. Filen %1 kunde inte skrivas: %2. - + New release available En ny version finns tillgänglig - - - + + + Error opening file %1: @@ -2768,68 +2824,72 @@ Vill du ladda ned den nu ? %2. - + Compilation server termporary failure, try later Tillfälligt fel i byggservern. Försök igen senare - - + + Compilation server too busy, try later Byggservern är upptagen. Försök igen senare - - + + Unknown server failure, try later Okänt server-fel. Försök igen senare - Compare... - Jämför... + Jämför... - + Compare models Jämför modeller - - + + Backup is impossible Säkerhetskopiering kan inte utföras - - + + The backup dir set in preferences does not exist Foldern för säkerhetskopior existerar inte - + Warning Varning - Firmware Profiles - Profiler för Firmware + Profiler för Firmware &Read/Write &Läs/Skriv - + Write Skriv - + + %2 + %2 + + + + Unable to find file %1! Kan inte hitta filen %1 ! @@ -2845,7 +2905,7 @@ Vill du ladda ned den nu ? ladda&Backup... - + Load backup from file Ladda backup från fil @@ -2858,46 +2918,45 @@ Vill du ladda ned den nu ? Ctrl+G - Open log file - Öppna loggfil + Öppna loggfil - - + + - + Taranis radio not found Hittade inte någon Taranis-sändare - - + + Impossible to identify the radio on your system, please verify the eeprom disk is connected. Det går inte att identifiera sändaren. Verifiera att EEPOROM-skivan är ansluteten. - + Yes Ja - + A new version of Companion is available (version %1)<br>Would you like to download it? An ny version av Companion finns tillgänglig (version %1)<br>Vill du ladda ned den? - - + + Compilation server requires registration, please check OpenTX web site Byggservern kräver registrering. Var god kontrollera OpenTX webbsida - + No Nej @@ -2915,34 +2974,40 @@ Vill du ladda ned den nu ? Vill du ladda ned firmware %1 nu ? - + Release notes contain very important informations. Do you want to see them now ? Release notes innehåller väldigt viktig information. Vill du läsa dem nu? - + The selected language will be used the next time you start Companion. Språket som valts kommer att användas nästa gång Companion startas. - - + + OK OK - + The new theme will be loaded the next time you start Companion. De nya ikonerna kommer att användas nästa gång Companion startas. - + The icon size will be used the next time you start Companion. Ikonernas storlek kommer att justeras nästa gång Companion startas. - + + + Open Models and Settings file + Öppna Modeller och Inställningar-fil + + + Firmware updates Firmware-uppdatering @@ -2954,14 +3019,14 @@ Vill du ladda ned den nu ? - + Read Models and Settings From Tx Läs Modeller och Inställningar från sändaren - + The file %1 has not been recognized as a valid Models and Settings file Write anyway ? @@ -2974,13 +3039,13 @@ Starta skrivningen i alla fall ? - + Backup Models and Settings From Tx Säkerhetskopiera Modeller och Inställningar från sändaren - + Cannot check Models and Settings compatibility! Continue anyway? Det går inte att verifiera att Modeller och Inställningar är kompatibla. Fortsätt i alla fall? @@ -2996,12 +3061,12 @@ Starta skrivningen i alla fall ? - + Write Models and Settings To Tx Skriv Modeller och Inställningar till sändaren - + Write Firmware To Tx Skriv firmware till sändaren @@ -3037,7 +3102,7 @@ Starta skrivningen i alla fall ? Det gick inte att säkerhetskopiera sändarens Modeller och Inställningar. Skrikvningen av firmware avbröts - + Save transmitter Models and Settings to File Spara sändarens Modeller och Inställningar till en fil @@ -3047,12 +3112,12 @@ Starta skrivningen i alla fall ? Det går inte att identifiera sändaren. - + Read Tx Firmware to File Läs Sändarens Firmware till Fil - + About Companion Om Companion @@ -3065,28 +3130,24 @@ Starta skrivningen i alla fall ? Ladda ned firmware och röstfiler. Definera profildata. - Check for new version of Companion - Sök efter ny version av Companion + Sök efter ny version av Companion Show Companion contributors list Visa vilka som bidragit till Companion - ChangeLog... - Förändringar... + Förändringar... - Firmware ChangeLog... - Firmware-förändringar... + Firmware-förändringar... - Show firmware changelog - Visa firmware-förändringar + Visa firmware-förändringar Configure transmitter start screen... @@ -3097,12 +3158,11 @@ Starta skrivningen i alla fall ? Inställningar för &kommunikation... - New Profile - Ny Profil + Ny Profil - + Create a new Radio Setting Profile Lägg till en ny profil med radio-inställningar @@ -3115,7 +3175,7 @@ Starta skrivningen i alla fall ? Det flerfärgade klassiska Companion-temat - + A monochrome black icon theme Ett monokromt svart tema @@ -3207,6 +3267,16 @@ Starta skrivningen i alla fall ? Use English in menus Använd Engelska i menyerna + + + Finnish + Finska + + + + Use Finnish in menus + Använd Finska i menyerna + French @@ -3278,12 +3348,102 @@ Starta skrivningen i alla fall ? Använd Ryska i menyerna - + + About... + Om... + + + + Print... + Skriv Ut... + + + + Simulate... + Simulera... + + + + Simulate current model + Simulera vald modell + + + Load Backup... Ladda backup från fil... - + + View Log File... + Visa loggfil... + + + + Open and view log file + Öppna och visa loggfil + + + + Settings... + Inställningar... + + + + Download... + Nedladdning... + + + + Check for Updates... + Sök efter uppdateringar... + + + + Check OpenTX and Companion updates + Sök efter uppdateringar av Companion och OpenTX + + + + Companion Changes... + Förändringar i Companion... + + + + Show Companion change log + Visa en lista med förändringar av Companion + + + + Firmware Changes... + OpenTX-förändringar... + + + + Show firmware change log + Visa en lista med förändringar av OpenTX + + + + Compare Models... + Jämför modeller... + + + + Edit the splash image of your TX + Editera startbilden' för din sändare + + + + List programmers... + Visa programmerare... + + + + Add Radio Profile + Lägg till Radioprofil + + + Manuals and other Documents Manualer och andra Dokument @@ -3293,7 +3453,28 @@ Starta skrivningen i alla fall ? Öppna OpenTX dokumentsida i en webbläsare - + + Configure Communications... + Kommunikations-inställningar... + + + + Configure software for communicating with the transmitter + Ställ in mjukvara för kommunikation med sändaren + + + + Contributors... + Bidragande... + + + + + Recent Models+Settings + Senaste Modell+Inställnings-filer + + + Set Icon Theme Ställ in Ikontema @@ -3307,12 +3488,11 @@ Starta skrivningen i alla fall ? &Inställningar - Radio Settings Profiles - Profiler för Radioinställningar + Profiler för Radioinställningar - + Invalid Models and Settings File %1 Filen innehåller inte Modeller och Inställningar: %1 @@ -3326,7 +3506,7 @@ Starta skrivningen i alla fall ? MdiChild - + @@ -3334,14 +3514,15 @@ Starta skrivningen i alla fall ? - + - - + + + @@ -3349,36 +3530,36 @@ Starta skrivningen i alla fall ? Fel - + Editing model %1: Redigera modell %1: - + Unable to find file %1! Kan inte hitta filen %1 ! - - + + Error reading file %1: %2. Fel vid inläsning från filen %1: %2. - + - + Error opening file %1: %2. Fel vid öppning av filen %1: %2. - + @@ -3404,12 +3585,12 @@ Starta skrivningen i alla fall ? %2. - + free bytes bytes lediga - + Invalid EEPROM File %1 Ogiltig modelldatafil %1 @@ -3420,48 +3601,48 @@ Starta skrivningen i alla fall ? Ogiltig binär modelldatafil %1 - + %1 has been modified. Do you want to save your changes? %1 har förändrats. Vill du spara förändringarna? - + Cannot write temporary file! En temporär fil kunde inte skrivas! - + Backup is impossible Säkerhetskopierin kan ej utföras - + - + Companion Companion - + The backup dir set in preferences does not exist Den katalog som konfigurerats för säkerhetskopiering existerar inte - - - + + + Backup EEPROM From Tx Säkerhetskopiera modelldata från sändaren - + Cannot check eeprom compatibility! Continue anyway? Det går inte att veriifiera att modelldata är kompatibla. Fortsätt i alla fall? - + Warning Varning @@ -3477,9 +3658,13 @@ Vill du spara förändringarna? Firmware i flashminnet är föråldrat. Var god uppgradera! - + + Open backup Models and Settings file + Öppna Modeller och Inställningar-fil + + Open - Öppna + Öppna @@ -3487,16 +3672,16 @@ Vill du spara förändringarna? Den binära backupfilen är felaktig %1 - - - + + + Taranis radio not found Taranis-sändaren hittades ej - - - + + + Impossible to identify the radio on your system, please verify the eeprom disk is connected. Det går inte att identifiera sändaren. Verifiera att EEPOROM-skivan är ansluteten. @@ -3506,7 +3691,7 @@ Vill du spara förändringarna? Skriv EEPROM till sändaren - + Do you want to use model wizard? Vill du använda modell-guiden? @@ -4295,7 +4480,7 @@ p, li { white-space: pre-wrap; } ModulePanel - + Trainer Output TrainerUttag @@ -4313,7 +4498,7 @@ p, li { white-space: pre-wrap; } QObject - + P1 @@ -4359,17 +4544,15 @@ p, li { white-space: pre-wrap; } T2 - th9x - th9x + th9x - er9x - er9x + er9x - + Trainer Trainer @@ -4457,10 +4640,8 @@ p, li { white-space: pre-wrap; } Timer2 - - - - + + Warning Varning @@ -4470,19 +4651,16 @@ p, li { white-space: pre-wrap; } Modelldata sparades, men med dessa varningar: - ersky9x - ersky9x + ersky9x - - - + Simulator for this firmware is not yet available Det finns ännu ingen simulator för denna typ av firmware - + REa @@ -4738,7 +4916,7 @@ p, li { white-space: pre-wrap; } PPM%1 - + THR GAS @@ -4972,7 +5150,7 @@ p, li { white-space: pre-wrap; } Det går inte att använda Expo på en specialkurva i open9x - + Support for frsky telemetry mod Stöd för FrSky telemeri @@ -5088,12 +5266,12 @@ p, li { white-space: pre-wrap; } Stöd för FrSky PXX-protokoll - + OpenTX for FrSky Taranis Rev4a OpenTX för FrSky Taranis Rev4a - + @@ -5232,21 +5410,21 @@ p, li { white-space: pre-wrap; } X%1 - + + - GV%1 GV%1 - - + + --- ---- - + Rud Trim Rod.Trim @@ -5316,8 +5494,8 @@ p, li { white-space: pre-wrap; } Eget värde - - + + -GV%1 -GV%1 @@ -5334,18 +5512,18 @@ p, li { white-space: pre-wrap; } - + PPM values displayed in us PPM-värden visade i ms - + Bluetooth interface Blåtandsinterface - - + + S1 S1 @@ -5697,7 +5875,7 @@ p, li { white-space: pre-wrap; } Ökning - + Yellow Gul @@ -5933,7 +6111,7 @@ p, li { white-space: pre-wrap; } !Kurva(%1) - + FM%1 FM%1 @@ -5983,6 +6161,11 @@ p, li { white-space: pre-wrap; } Portuguese Portugisiska + + + Finnish + Finska + !Flight mode %1 @@ -5999,7 +6182,7 @@ p, li { white-space: pre-wrap; } Flygläge %1 värde - + openTx only accepts %1 points in all curves openTX accepterar bar %1 punkter i alla kurvor @@ -6023,14 +6206,14 @@ p, li { white-space: pre-wrap; } OpenTX accepterar inte detta antal kanaler - + Your radio probably uses a wrong firmware, eeprom size is 4096 but only the first 2048 are used Din sändare har antagligen laddats med felaktig programvara. eeprom-storleken är 4096, men enbart den första hälften används - + Support for MAVLINK devices Stöd för MAVLINK-enheter @@ -6063,12 +6246,12 @@ eeprom-storleken är 4096, men enbart den första hälften används - + Use alternative SQT5 font Använd SQT5-typsnittet - + @@ -6121,24 +6304,24 @@ eeprom-storleken är 4096, men enbart den första hälften används - + Disable HELI menu and cyclic mix support Slå av HELI-menyn och stöd för cykliska mixar - - + + Disable TEMPLATES menu Slå av menyn för Mallar - - + + Disable Global variables Slå av Globala Variabler - + Possibility to enable FAI MODE at field Möjlighet att slå på FAI-LÄGE före pflygning @@ -6181,7 +6364,7 @@ Gruppen bakom OpenTX/Companion. Använd trim från flygläge %1 + Eget trim som offset - + FW: %1 FW: %1 @@ -6342,6 +6525,296 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga Automatiska + + SimulatorDialog + + + + Warning + Varning + + + + Joystick enabled but not configured correctly + Joysticken påslagen, men ej rätt inställd + + + + Cannot open joystick, joystick disabled + Joysticken kan inte hittas. Joysticken stängs av + + + + Simulating Tx (%1) + Simulerar sändare (%1) + + + + Firmware %1 error: %2 + Firmware %1 fel: %2 + + + + SimulatorDialog9X + + + Companion Simulator + Companion Simulator + + + + + + + Right Double Click to Reset + Höger dubbelklick nollställer + + + + THR + GAS + + + + RUD + ROD + + + + ELE + HÖJ + + + + AIL + SKE + + + + + Hold X + Håll X + + + + + Fix X + Fixera X + + + + + Fix Y + Fixera Y + + + + + Hold Y + Håll Y + + + + + + + TextLabel + Textettikett + + + + TRN + TRN + + + + GEA + LAN + + + + ID0 + ID0 + + + + ID1 + ID1 + + + + ID2 + ID2 + + + + BEEP + Summer + + + + P1 + P1 + + + + + + 0 % + 0 % + + + + P2 + P2 + + + + P3 + P3 + + + + 9x Simulator + Simulator för 9x + + + + Outputs + Utgångar + + + + SimulatorDialogTaranis + + + Companion Simulator + Companion Simulator + + + + + Hold Y + Håll Y + + + + + Fix Y + Fixera Y + + + + + Fix X + Fixera X + + + + + Hold X + Håll X + + + + + SD + SD + + + + + SC + SC + + + + + + + Right Double Click to Reset + Höger dubbelklick nollställer + + + + + S2 + S2 + + + + + SG + SG + + + + + RS + RS + + + + + SH + SH + + + + + + + TextLabel + Textettikett + + + + + S1 + S1 + + + + + SB + SB + + + + + SA + SA + + + + + SE + SE + + + + + + SF + SF + + + + + LS + LS + + + + Taranis Simulator + Taranissimulator + + + + Outputs + Utgångar + + Telemetry @@ -6685,7 +7158,7 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga mAmpere (mA) - + Range Räckvidd @@ -6741,7 +7214,7 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga Telemetriskärm %1 - + Winged Shadow How High Winged Shadow How High @@ -6809,7 +7282,7 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga Programmets Inställningar - + Simulator capture folder Lagra simulatorbilder i @@ -6822,27 +7295,37 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga - + Open Folder Öppna katalog - + User Splash Screens Egna Startbilder - + Edit Settings Redigera Inställningar - + Application Settings Programmet - + + Only show user splash images + Enbart användarens bilder + + + + Show user and companion splash images + Både användarens bilder och Companion-bilder + + + Simulator Settings Simulatorn @@ -6872,12 +7355,11 @@ Gasen reverseras om alternativet väljs. Tomgång ligger då uppåt. Trim och ga Gul - Radio Settings - Radion + Radion - + Mode selection: Mode 1: @@ -7067,17 +7549,21 @@ Detta används av mallen för att koppla kanal till output-nummer. S G H R - + Default Stick Mode Spaktilldelning - - Settings Profile - Profil + + Firmware File + Firmware - + Settings Profile + Profil + + + Splash Screen Startbild @@ -7097,42 +7583,54 @@ Detta används av mallen för att koppla kanal till output-nummer. Sökväg till SD-struktur - + + Firmware Variant + Firmware-typ + + + Select Image Välj Bild - + Offer to write FW to Tx after download Skriv FW till Tx efter nedladdning - + + Radio Settings Profile + Radioprofile + + + + Profile Name + Profilnamn + + + Remove Profile Ta bort Profil - + Clear Image Ta bort Bild - Firmware - Firmware + Firmware - Include companion splashes - Användarens bilder och Companion-bilder + Användarens bilder och Companion-bilder - Only user defined splashes - Enbart användarens bilder + Enbart användarens bilder - + Splash Screen Library Bibliotek för startbilder @@ -7207,38 +7705,38 @@ Detta används av mallen för att koppla kanal till output-nummer. Säkerhetskopiera innan firmware-skrivning - + Select your snapshot folder Välj katalog för snapshots av Tx-simulatorn - - + + No joysticks found Ingen joystick hittades - + Select your library folder Välj bibliotekskatalog - + Select your Models and Settings backup folder Välj folder för automatisk säkerhetskopiering - + Select Google Earth executable Sökväg till Google Earth - + Select the folder replicating your SD structure Välj katalog med en kopia av din SD-struktur - + Not possible to remove profile Det går inte att ta bort profilen @@ -7256,7 +7754,7 @@ Detta används av mallen för att koppla kanal till output-nummer. Det går inte att ladda %1. - + Open Image to load Öppna bild för laddning @@ -7531,7 +8029,7 @@ OBS. Fyll enbart i detta fällt om du är säker på vad du gör. Ingen kontroll Sökväg till AVRDUDE - + Select Location @@ -7617,7 +8115,7 @@ m2560 för v4.1-kort Inställningar för Programmerare - + DFU-UTIL Configuration Inställningar för DFU-UTIL @@ -7632,7 +8130,7 @@ m2560 för v4.1-kort Inställningar för AVRDUDE - + Companion Companion @@ -7646,12 +8144,12 @@ m2560 för v4.1-kort Välj Sändarens Startbild - + Date & Time Dag & Tid - + SVN Subversion @@ -7661,102 +8159,95 @@ m2560 för v4.1-kort Tillåter Companon att skriva till äldre firmware-versioner - Load Image - Ladda Bild + Ladda Bild - Open Splash Library - Öppna bildbibliotek + Öppna bildbibliotek - ... - ... + ... - Substitute image in firmware - Byt ut bilden i firmware-filen + Byt ut bilden i firmware-filen - - + Write to TX Skriv till sändaren - Use image in settings - Använd bilden från inställningarna + Använd bilden från inställningarna - Invert Color - Invertera Bilden + Invertera Bilden - + Check Firmware compatibility Kontrollera att firmware-filen är kompatibel - + Cancel Avbryt - + Write firmware to TX Skriv firmware till sändaren - Open - Öppna + Öppna - - + + - - + + Warning Varning - Burn anyway ! - Starta bränningen! + Starta bränningen! - Open Image to load - Öppna bilden som skall laddas + Öppna bilden som skall laddas - + Images (%1) Bilder (%1) - + - - - + + + + + + Error Fel - + Write Models and Settings to TX Skriv Modeller och Inställningar till sändaren @@ -7766,25 +8257,23 @@ m2560 för v4.1-kort Skriv Modeller och Inställningar från %1 till sändaren - + Choose file to load Models and Settings from Välj fil att ladda Modeller och Inställningar från - + Invalid binary Models and Settings File %1, Proceed anyway ? Ogiltig binärfil med Modeller och Inställningar: %1. Fortsätt i alla fall ? - - Cannot load %1. - Det går inte att ladda %1. + Det går inte att ladda %1. - + Cannot save customized firmware Det gick inte att spara den modifierade firmware-filen @@ -7794,12 +8283,12 @@ m2560 för v4.1-kort Bildfilen hittades inte - + No firmware selected Ingen firmware har valts - + Wrong radio calibration data in profile, Settings not patched Felaktig information i profilen, sändarens-kalibrering kunde inte läsas in @@ -7809,12 +8298,11 @@ m2560 för v4.1-kort Felaktig information i profilen, sändarens inställningar kunde inte läsas in - %1 is not a known firmware - %1 är inte en fimware-fil + %1 är inte en fimware-fil - + <html><head/><body><p>Modify calibration parameters using settings from current profile</p></body></html> <html><head/><body><p>Uppdatera kalibrerings-parametrarna med data från nuvarande profil</p></body></html> @@ -7834,8 +8322,8 @@ m2560 för v4.1-kort Uppdatera med HW-inställningar från profilen - - + + Browse for file Välj fil @@ -7850,12 +8338,42 @@ m2560 för v4.1-kort Nuvarande Profil - + + Use firmware start screen + Använd firmware-startskärmen + + + + Use another start screen + Använd en annan startskärm + + + + Use profile start screen + Använd profilens startskärm + + + + Use library start screen + Använd biblioteks-startskärm + + + Current profile Nuvarande profil - + + Open Firmware File + Öppna firmware-fil + + + + %1 may not be a valid firmware file + %1 är kanske inte en giltig firmware-fil + + + Unable to find file %1! Kan inte hitta filen %1 ! @@ -7876,7 +8394,37 @@ m2560 för v4.1-kort %2. - + + The firmware file is not valid. + Firmware-filen är inte giltig. + + + + There is no start screen image in the firmware file. + Firmware-filen innehåller inte någon startbild. + + + + The profile image %1 does not contain an image. + Profil-bilden %1 innehåller inte någon startbild. + + + + Open image file to use as Tx start screen + Öppna bildfil för användning som radions startsskärm + + + + Image could not be loaded from %1 + Det gick inte att ladda en bild från %1 + + + + The library image could not be loaded + Bild-biblioteket kunde inte öppnas + + + Cannot write file %1: %2. @@ -7891,7 +8439,7 @@ m2560 för v4.1-kort %2. - + Variant Variant @@ -7899,12 +8447,16 @@ m2560 för v4.1-kort compareDialog - Dialog - Dialog + Dialog - + + Compare Models + Jämför Modeller + + + Drag first model here Dra hit första modellen @@ -7929,7 +8481,7 @@ m2560 för v4.1-kort Skriv till fil - + General Model Settings Generella modell-inställningar @@ -8418,7 +8970,7 @@ m2560 för v4.1-kort Dialog - + People who have contributed to this project De som har bidragit till detta projekt @@ -8428,12 +8980,12 @@ m2560 för v4.1-kort Programmerare - + Companion Release Notes Companion Release Notes - + Thank you all !!! Tack till er alla !!! @@ -8448,7 +9000,7 @@ m2560 för v4.1-kort Bidragande - + OpenTX Release Notes OpenTX Release Notes @@ -8461,58 +9013,66 @@ m2560 för v4.1-kort Startbildsredigerare - - + + Invert Invertera - - + + Load FW Ladda FW - - + + Load Pict Ladda Bild - - + + Load Profile Ladda Profil - - + + Save Spara - - + + Open Splash Library Öppna bildbibliotek - Open - Öppna + Öppna - + - + Error Fel - Cannot load embedded FW image from %1. - Det gick inte att ladda bild från FW-filen %1. + Det gick inte att ladda bild från FW-filen %1. + + + + Open Firmware File + Öppna firmware-fil + + + + Can not load embedded image from firmware file %1. + Det gick inte att ladda bild från firmware-filen %1. @@ -8525,7 +9085,7 @@ m2560 för v4.1-kort Det gick inte att ladda profilbilden %1. - + Cannot load the library image %1. Det gick inte att ladda biblioteks-bilden %1. @@ -8564,7 +9124,7 @@ m2560 för v4.1-kort Det finns ingen bild att byta i firmware-filen - + Open Image to load Öppna bild för laddning @@ -8586,9 +9146,10 @@ m2560 för v4.1-kort Det gick inte att spara bilden i filen %1 - - - + + + + ... ... @@ -8601,7 +9162,7 @@ m2560 för v4.1-kort Nedladdning: - + Unable to save the file %1: %2. Kan ej spara filen %1: %2. @@ -8624,7 +9185,7 @@ m2560 för v4.1-kort Säkringar - + Read Fuses Läs in säkringarna @@ -8760,7 +9321,12 @@ p, li { white-space: pre-wrap; } fwPreferencesDialog - + + Downloads + Nedladdningar + + + @@ -8907,16 +9473,15 @@ Används av mallarna för att koppla ihop kanaler med numrerade utgångar.Skriv FW till Tx efter nedladdning - Downloads and Profiles - Nedladdning och Profiler + Nedladdning och Profiler Save Profile Spara Profil - + Menu Language Menyspråk @@ -8967,7 +9532,7 @@ Används av mallarna för att koppla ihop kanaler med numrerade utgångar.Sök efter uppdateringar - + Last downloaded release: %1 Senast nedladdade release: %1 @@ -9009,7 +9574,7 @@ Används av mallarna för att koppla ihop kanaler med numrerade utgångar. joystickDialog - + Configure Joystick Ställ in Joystick @@ -9158,7 +9723,7 @@ Används av mallarna för att koppla ihop kanaler med numrerade utgångar.OK - + Move sticks and pots in every direction making full movement Press next when finished Rör spakar och pottentiometrar. Ge fulla utslag. @@ -9209,7 +9774,7 @@ Tryck på Avbryt för att avburyta kalibreringen Dubblerad koppling av spak - + @@ -9241,7 +9806,7 @@ Tryck på Avbryt för att avburyta kalibreringen Companion Logg-läsare - + Filename Filnamn @@ -9251,7 +9816,7 @@ Tryck på Avbryt för att avburyta kalibreringen Öppna Loggfil - + Zoom Zoom @@ -9266,7 +9831,7 @@ Tryck på Avbryt för att avburyta kalibreringen Y - + Telemetry logs Telemetriloggar @@ -9276,7 +9841,7 @@ Tryck på Avbryt för att avburyta kalibreringen Tid - + Error Fel @@ -9288,7 +9853,7 @@ Tryck på Avbryt för att avburyta kalibreringen %2. - + Select your log file Välj loggfil @@ -9311,7 +9876,7 @@ Tryck på Avbryt för att avburyta kalibreringen mdiChild - + Simulate Tx Simulera sändare @@ -9324,7 +9889,7 @@ Tryck på Avbryt för att avburyta kalibreringen Guide för modellkonfiguaration - + Engine Motor @@ -9738,7 +10303,7 @@ Tryck på Avbryt för att avburyta kalibreringen Dubbla Sidoroder (med 2 servon) - + Apply configuration ? Tillämpa inställningarna? @@ -10155,62 +10720,48 @@ Mode 4: Firmware-info - Last downloaded release: %1 - Senast nedladdade release: %1 + Senast nedladdade release: %1 - - No joysticks found - Ingen joystick hittades + Ingen joystick hittades - Select your Models and Settings backup folder - Välj folder för automatisk säkerhetskopiering + Välj folder för automatisk säkerhetskopiering - Select Google Earth executable - Sökväg till Google Earth + Sökväg till Google Earth - Open Image to load - Öppna bild för laddning + Öppna bild för laddning - Images (%1) - Bilder (%1) + Bilder (%1) - - Error - Fel + Fel - The selected firmware has never been downloaded by Companion. - Firmware-filen har aldrig laddats ned av Companion. + Firmware-filen har aldrig laddats ned av Companion. - The selected firmware cannot be downloaded by Companion. - Firmware-filen kan inte laddas ned av Companion. + Firmware-filen kan inte laddas ned av Companion. - - Cannot load %1. - %1 kunde inte laddas. + %1 kunde inte laddas. - Image stored in settings - Bilden lagras i inställningar + Bilden lagras i inställningar @@ -10261,12 +10812,11 @@ Mode 4: säkerhetskopiera innan skrivning - Select your library folder - Välj bibliotekskatalog + Välj bibliotekskatalog - + Export Profile Exportera Profil @@ -10293,19 +10843,16 @@ May be different from firmware language Får skilja från språket för mjukvaran - Export profile As - Exportera profil som + Exportera profil som - Profile slot is not empty, profile slot %1 will we overwritten.<br>Are you sure ? - Det finns redan en profil i position %1,. Den kommer att skrivas över.<br> Är du säker ? + Det finns redan en profil i position %1,. Den kommer att skrivas över.<br> Är du säker ? - Open Profile to import - Öppna profil för import + Öppna profil för import @@ -10331,14 +10878,12 @@ Får skilja från språket för mjukvaran Använd bara clipboard - Select your snapshot folder - Välj katalog för snapshots + Välj katalog för snapshots - Profile name is empty, profile slot %1 will be deleted.<br>Are you sure ? - Profilnamn saknas, profilplats %1 kommer att raderas.<br> Är du säker? + Profilnamn saknas, profilplats %1 kommer att raderas.<br> Är du säker? @@ -10361,9 +10906,8 @@ Får skilja från språket för mjukvaran Sökväg till SD-struktur - Select the folder replicating your SD structure - Välj katalog som härmar din SD-struktur + Välj katalog som härmar din SD-struktur @@ -10374,7 +10918,7 @@ Får skilja från språket för mjukvaran Dialog - + Close Stäng @@ -10389,7 +10933,7 @@ Får skilja från språket för mjukvaran Skriv till fil - + Setup for: Inställningar för: @@ -10816,434 +11360,327 @@ Får skilja från språket för mjukvaran simulatorDialog - P1 - P1 + P1 - P2 - P2 + P2 - P3 - P3 + P3 - THR - GAS + GAS - RUD - ROD + ROD - ELE - HÖJ + HÖJ - AIL - SKE + SKE - - Hold X - Håll X + Håll X - - Fix X - Fixera X + Fixera X - - Fix Y - Fixera Y + Fixera Y - - Hold Y - Håll Y + Håll Y - - - - TextLabel - Textettikett + Textettikett - TRN - TRN + TRN - GEA - LAN + LAN - ID0 - ID0 + ID0 - ID1 - ID1 + ID1 - ID2 - ID2 + ID2 - BEEP - Summer + Summer - - - - Right Double Click to Reset - Höger dubbelklick nollställer + Höger dubbelklick nollställer - Companion Simulator - Companion Simulator + Companion Simulator - 9x Simulator - Simulator för 9x + Simulator för 9x - Outputs - Utgångar + Utgångar - LS1 - LB1 + LB1 - LS2 - LB2 + LB2 - LS3 - LB3 + LB3 - LS4 - LB4 + LB4 - LS5 - LB5 + LB5 - LS6 - LB6 + LB6 - LS7 - LB7 + LB7 - LS8 - LB8 + LB8 - LS9 - LB9 + LB9 - LSA - LBA + LBA - LSB - LBB + LBB - LSC - LBC + LBC - LSD - LBD + LBD - LSE - LBE + LBE - LSF - LBF + LBF - LSG - LBG + LBG - LSH - LBH + LBH - LSI - LBI + LBI - LSJ - LBJ + LBJ - LSK - LBK + LBK - LSL - LBL + LBL - LSM - LBM + LBM - LSN - LBN + LBN - LSO - LBO + LBO - LSP - LBP + LBP - LSQ - LBQ + LBQ - LSR - LBR + LBR - LSS - LBS + LBS - LST - LBT + LBT - LSU - LBU + LBU - LSV - LBV + LBV - LSW - LBW + LBW - CH1 - KN1 + KN1 - CH9 - KN9 + KN9 - CH2 - KN2 + KN2 - CH10 - KN10 + KN10 - CH3 - KN3 + KN3 - CH11 - KN11 + KN11 - CH4 - KN4 + KN4 - CH12 - KN12 + KN12 - CH5 - KN5 + KN5 - CH13 - KN13 + KN13 - CH6 - KN6 + KN6 - CH14 - KN14 + KN14 - CH7 - KN7 + KN7 - CH15 - KN15 + KN15 - CH8 - KN8 + KN8 - CH16 - KN16 + KN16 - - - - - - - - - - - - - - - - -100.1 - -100.1 + -100.1 - - Warning - Varning + Varning - Joystick enabled but not configured correctly - Joysticken påslagen, men ej rätt inställd + Joysticken påslagen, men ej rätt inställd - Cannot open joystick, joystick disabled - Joysticken kan inte hittas. Joysticken stängs av + Joysticken kan inte hittas. Joysticken stängs av - Firmware %1 error: %2 - Firmware %1 fel: %2 + Firmware %1 fel: %2 - Simulating Tx (%1) - Simulerar sändare (%1) + Simulerar sändare (%1) - Simulating - Simulerar + Simulerar - - - 0 % - 0 % + 0 % - - Flight mode: %1(%2) - - Fligmod: %1(%2) + - Fligmod: %1(%2) splashLibrary - - + + ... ... @@ -11253,7 +11690,7 @@ Får skilja från språket för mjukvaran Bildbibliotek - Sida %1 av %2 - + Warning Varning @@ -11276,428 +11713,312 @@ Får skilja från språket för mjukvaran xsimulatorDialog - - SE - SE + SE - - SA - SA + SA - - SB - SB + SB - - - - Right Double Click to Reset - Höger dubbelklick nollställer + Höger dubbelklick nollställer - - - - TextLabel - Textettikett + Textettikett - - Hold X - Håll X + Håll X - - Fix X - Fixera X + Fixera X - - Fix Y - Fixera Y + Fixera Y - - Hold Y - Håll Y + Håll Y - - SH - SH + SH - - SG - SG + SG - Companion Simulator - Companion Simulator + Companion Simulator - - SD - SD + SD - - SC - SC + SC - Outputs - Utgångar + Utgångar - CH1 - KN1 + KN1 - - - - - - - - - - - - - - - - -100.1 - -100.1 + -100.1 - CH9 - KN9 + KN9 - CH2 - KN2 + KN2 - CH10 - KN10 + KN10 - CH3 - KN3 + KN3 - CH11 - KN11 + KN11 - CH4 - KN4 + KN4 - CH12 - KN12 + KN12 - CH5 - KN5 + KN5 - CH13 - KN13 + KN13 - CH6 - KN6 + KN6 - CH14 - KN14 + KN14 - CH7 - KN7 + KN7 - CH15 - KN15 + KN15 - CH8 - KN8 + KN8 - CH16 - KN16 + KN16 - LSK - LBK + LBK - LSC - LBC + LBC - LSD - LBD + LBD - LS7 - LB7 + LB7 - LSL - LBL + LBL - LSB - LBB + LBB - LS1 - LB1 + LB1 - LSH - LBH + LBH - LSG - LBG + LBG - LSE - LBE + LBE - LSF - LBF + LBF - LS8 - LB8 + LB8 - LS9 - LB9 + LB9 - LSA - LBA + LBA - LSM - LBM + LBM - LSJ - LBJ + LBJ - LSI - LBI + LBI - LS4 - LB4 + LB4 - LS5 - LB5 + LB5 - LS2 - LB2 + LB2 - LS3 - LB3 + LB3 - LS6 - LB6 + LB6 - LSN - LBN + LBN - LSO - LBO + LBO - LSP - LBP + LBP - LSQ - LBQ + LBQ - LSR - LBR + LBR - LSS - LBS + LBS - LST - LBT + LBT - LSU - LBU + LBU - LSV - LBV + LBV - LSW - LBW + LBW - - Warning - Varning + Varning - Joystick enabled but not configured correctly - Joysticken påslagen, men ej rätt inställd + Joysticken påslagen, men ej rätt inställd - Cannot open joystick, joystick disabled - Joysticken kan inte hittas. Joysticken stängs av + Joysticken kan inte hittas. Joysticken stängs av - Firmware %1 error: %2 - Firmware %1 fel: %2 + Firmware %1 fel: %2 - Simulating Tx (%1) - Simulerar sändare (%1) + Simulerar sändare (%1) - Simulating - Simulerar + Simulerar - - - SF - SF + SF - - S2 - S2 + S2 - - RS - RS + RS - - S1 - S1 + S1 - - LS - LS + LS - Taranis Simulator - Taranissimulator + Taranissimulator - - Flight mode: %1(%2) - - Fligmod: %1(%2) + - Fligmod: %1(%2)

YuqK%^lpKXc*OM_yCc1@716k=seveCb zvYY`2#In+?G8jPcBahEhl|}_n9Y6bpUM|Pj=^W&JG7w4ZDn^bF@aN>yA+C(qm=*6)ce5)PNOwx4{^#aHmTXrKq^|~o5 zX@sk7epzZR3cS;vD(vtMfV8vJu!_Y+MX);mS48h`;h1&9q6V%`N+;RTwy!*df7VQD z*`Dr(vLrS(HUGOGNEC5~;kJi<;!`4Ar{1xPBDKe~uV1Lh?e z)H+?z^DA)~p_kj6VpqOXNHi^MBI@f$TJp_Xjo?f7 zO}iS&Kp6^Bd67L!z?LG{KnYRD)D?BG*pJsD0+PC!X(1pWJr z7EULyE*lz1F9T%-hrZf;a=MzCcJ3*Dc<@AC$xK8-QlyGR)YE+CcsNaERdC^9ZtkOA zu3n*90gR1Au#%uG+3gL4#fz4%j19)iXT*>QAj%QD1tU(uIkNhkefSf`R)y7RI?&-D z+pNkkGe=6nj5tDC=}J>^qHT0c%%V}ToMicu11Z57i+DyS-3L#afE92F&gl}gGZ?-( zJ3C3cE)kajq9s6Fqve^IqRxl-$SNdkllJW10WuO2!S+!RK4mPbr*&sU0g+vjo*iom ztQZ-H!f7%9sI*()`!D@C5}TdiL@P-yD)>Bg}u zVC0YwgHc?~YOJ#GuY@L8bT|@1Bc!PF=@HGY+5(n5STCm~nVmNd``q=szNx}En`5Rj zOu$LGB$)__^JJmh5F}QfP`aeZF+*ntl~%PbFnfrP%Z}HdB%OF~36K$9|6D}iMs$3w z`BaM!GfA+7JvSY+cBC|Y-V!jfbt%TBBGLq-v_$0L(H-6R8K}Vg;&x&1rV&SDn>VMd z9dK+p*hr+tD$(Wx#1Vedscqybh1it>HCH|)2A$tLj+rpmpK;)I5RmH}GS6@u2^jLp zO7sy;i!XLwpg9I_Uh{YEQTc%k#!>!+S>p3PI1lA3erWtc?$@BTh#j`h16?59CIs>~FeRGro9~SY&uOz(L?}=m zv!zk{O4Cv&{Ghj(f?7Y3d&zB`uj;0<@uP1EwAOrIgvw>80NTXE9Kkn5FI1w!_5LR? z%p6AMuq1#F>TEmoE>s6ZtuQX?vd(Ekec)}@i8C~z%dgh(rK!@!A(#Y{vWIx@ecV_9 zMkOWdapU&>@M$z<+H>yQ+35(N7Q;u0-GQ&q@BX=V5&Q~;chHMpn}9_2L;DBEq+C}& z5@psTHJpo!TOl(FYZCo}#&&xRm+$i}r4JdVuJ!RvO_uHI-O|R55QIXd$nU{>QREau z>7d66tvL0wi5fC40hB5im?1`&x=CwyNiO$S)w zELd?zX#N?>UmCh&cfnuffAW;0A295~6J>z*!{M>B3&j=kmgiSn&>6RgiA4|wWo2b8 zH(7rto6Ux_noo5c$?>m|IG3+hKB8BGHt(owV3GtWYLkX1DBv;QS6NjUif|Fc_Z@9D zV&X(d0x7#PrsAl80EM;$$V?LwRB1J6)c48h$|EQ+FwiSyHp4tOveeSm=_mEz_z#}| zpd?XF_Ti&Xyhfj!*mFiCH?%~ASByTCgB)bBtO)^`@y)=wN-xD<58KIC28#qW=C3zL z))-*KVtQywBQ1#_@q#R!FM)i~NvQD7y?2*4t7VYJA80n2J60U)R(t_1`#Hwi!FEz; z$f)l50n&9E((cw7^ucUj@r8Zr9mY+_w6KOZ%*%(83z7lZhX{AL;Ee4Kq68d!S*RCQ zpnz8U?`&*F%w~(-yfDdWKSe_%w(&GJhFnFg$PrZlzVu>{o-nn=5(J#+kUsk!A&Nb; zzLZyEwntQj#nLi9@ffKUR?x~w!YY6T(saG)2c8%*kbXcZ2Kv7YV+n_2K%ymfZfDDq z8@*7KhGDL6&=OjZ1_FSuq%okXDZa?9KE@}Ec#j<|Ee1+&@t`V^ho?zE3Xugts+5IL zm>t|MDM%yOQwYp`*c~)`o;jWzV-b~Fawy?F#(uAJIgVzON8Di># zA1+J63z>;BhtJ6bVK(v$0!_zLx1L2Jfy_eHsKu3(^YLg~&xZ9N<s0urwD? zW-Q>i3U{6`y23Fz1TstfH<2VIgV8WCIc!&eUf!7S>~0H2ecRF#x}6b~Cs@{Ym4q`8 z^OSUvE;C}WDPL782f+0%gY~MU#%Eg>GRfB0lYwkUeBSw4*;!)_GCzjIk8mFT)#{4? zMWIESxp^t3U$0Fp(Xp`@scibOSV6<3^qD`jVKsZvmvEv808UPo=ZG)+yvFWvm%YYavS9-k+ z9GMErU0jE7QluY%=oJugihk~Im^oq$#pgYF-P>J9ST$F& zMOUmSiTVl-p>0;>_PT@yFn_qtm+)I*h~&8yzR1pLFzuLvzJZqH#!#9_hLrZgn1GI4DCf z3TdnZKc$vB9chkS1T0jw7{fZW`H9zr^x^FvU+Y@?e`WZ^BYD-S{=RR)?5*Cg5m%#w zh=RCP(0EGdhnm+GROWR+lvv}66<`z{B&+zJ3{A#2>zXsp){~9@`CI;pKx7!+S(3ov zVYUIEtponz4P1{C%5Dr)z^qIk`ZLFy6{7k~o5YP+3>u)6c7!k4ymAakT?iW*+vfxw+^ zkIgbC28GDPl&;{3@=hY1LhEx=Z3$CSL0d^^1($ieV%dqN+!?4a z05T>;r0ckzWepg`;K0JdN)@SO??&VfTnx`4HZ!G%C)Cs+=x)2|IfJ{_)&@(*fckE#FPdS*gUNZ}; zpt>2Ti$25xRDv&h6H)k|f3u)Ut1+g?pRRXxOgTX)bYn{k7sLm&r|?579&{#MzrJsA zG|A6{D5?;V&%9bQ@MMXoQXW7&1W-aiMEFEXOq(^y$s-VT#^;f%apATyJuOz+ma(r$ zvZ(8welq1jU5@F&K_g7!f%i?%mDt-Cl+jkdu(aj_=^ z5X&;m#L6f~3~FIsEu~kyz6z8{OyYUNZD06dz}8?69#&8GvM1GD%;2`>v0fDETkrB- zZgXbH_=`59nQQ?FtAzJOux@i)ZDvZ9mjdAGBcsS6hKC2i(z)cANTMLytkvV!suywy zIUoLN0Gphx2%j$3a_&%|M)Xhyg!`uv5YNf4eS z3f9|295~}98;QfjsSDW6?~#07;j(+U0-U!}dp>P711@fPws zt>kU$pOh9YGx<}fYNPfaM@+8km#JiAWzz+D89%Y@jxhc-opH@kbml@o0)&+s$xy%E zZ@C7>;4>qM1BmxdZ>FRd005;T^`=8%pY-=W5&D*vMZ-l1_CwU;)~BA9n-Z`vavmzD zPft>uD$?|T6fr`*_~^kShRl4gvu!<%q*T95vfA8WeWgduU{a73h#HhsH^aHubtix` z#+SuoyIm*yeW#6lNCKOyaE`kq>1)O}9F2B}m)y15(qMfsB{m+qWd`BSGAt1D&ycN; z5}T)~BdF%__q{Y+KGG|Z-`yr!uFtF_wm|IJmKTq+*`x?OO#X>xROrQc(eBibFnb+@ z+I#KaLAmugb!@us;d9#o!|Ky*>r`zQ9Mp=q-#4Rpkk9dU8`A zIN#Z!)00C|ymv6ow}sNtOljl5DuOYS?E8DS!URSX=rqn8moGNgsMes#h-!rhrvuJ=MVF_61ZE> zdR;GO0Aln%b&}dYSO{hsnR$I(5!~NzEqCRyR9<7(aG~2U*WaebOk~aTE5(!5qUDAg z+>Vb<96OP~sO@Q1?RpofIP*clh8BZ6b@~6++$`)S<}uqFSrI2y9nUUpU<+pF=Yh55 zC=)+|c)OUwbq=Vudx8gHBJ%qEecYM$oM09w;X?si=?qGlfGZe-ut*I3XIH@Z!&{Na z{0)*=%whcaUOKb2hjtAl*>!M0?26+-hM%lGpQoM7-Ez9-9vsswt!l z2~DdqtE0Pvs(pVJGD1Qxo9%XMVe40Nk|F3h3c7LH>CC8uGJrVT|fV}jk8b;kv*~Ci;^!< z|72}x$!|z`81fZ#Uiy^XAD;QGe0dB~5o=B$8)lP*V!Tk3CG7s1@m-G# zKg9voWt%u;X8bJEaW8|<;Jur_0CDGO$-|MBFEW3I+f~#Naf59tUjj*L@;uPl zP5s}{{HWqFX3!_=oNP1_W>jF zsBazgr$AV!#fJs?+D!ARqWbkXu;C>7UBdK)8zXP09ny#FEV)gW@#9cs%v*k&H6-L7 zySzktdy{prrBFgIH%^e-P4^palB>{UqL4;>V>JJT^g>FXD{Bo37%>?COKM+)F~s5QzPNhCo#V4r6a7rS7Me}i zY$S}~O}G&{3?|fSbifpJoAOZWHfs7&-O`lB>o0;lDK!V55*2zNSg?=EoZ8-Ay4gnF zHY1cG9|}Rb(`g^o+)7fJIm%fzX_%>Ukn{1mWvTMU2c9^6p0hGCa~(`AY3NG{Y;dp%r>y~BdTH#1cfkgZ zi}kG}Clf-t3>=7m1#g@^Ms*3cZxKxx&m*)&w}ol+{SGQ-CwBqiX>8LZG0UzqQIS6Q zmP&t=i=92n))p=8Ez9%PaO34@Mu-fU za(jNd3*qZ{_)V*?-$W48H`^i#2lqP%mcZB%IV~u|G%*uMfJVRnfh17T&V?k5HE7l} zO5^Qp4u;v@<5O)2ln>g?Tw@&oEKZj#9Evk@#UwASiRTW2uFJOsZ0<$e;>f&_i^7LMU5b1>apMag+SPPP7=z8I1c{UGDjXR)l@bYO2WS zxY#S4$o-YH(7OqZl2VM+1ks)oUAbbacuUia4FL#=cKx!ZT3ef52NqI^!nnP*8LLc5 zbG$#gbEn&8e%q1^u*cy-1q#I;YJDcG;%9fGJLHO&r}uQa!6oH$$nT!!E)8Qa(G2j! zvo1G8!S9f7vl$RisSfwHu(R85sm+_LJ^weli%wu~h8Wd?yT3_h%u3 z$WJCvGJDf1#M*;oou7Pi_Z7K{f@yZchU4{^ru7TPW+n6j@x*lY=u;4^)@?(qv zujkVP_V@Sm%hlkNNutVwX`qpCBs%YVeemsHZEjMoHrwqy za&{0>kIc76eHE)DeoQ<~5UH1a#ws2AH^jWkgHn1LA2G-0^~)M&_rPFyN@(oRSm-|e zljZc^i$dzzQa#92 zP(1=$c}SCQl!G>vPF52p5-EmN3=M4+jq7;1?7{D1%{|Ro`JL}!-A_2U3dRWdL}P!v z;G*K%<9V^Z!GF-=L&#~Kk(nvL1+7}8yV>~+im|Q|jdzKnemI+_wF}0L(XahJ;Z!Ex zb+T*vs;^y5fZIiWju$UGgsO#HSr;RpC=s&oYYWu&nHH>*z73uvr7g zaXU%ii1&!z`tV@3+&WW+Qre#`N5%11jcDT@!$nMOzsXBSqu@z7|Ca-q-th!}YM)Ww zKsaWD^TAXpx=8n%xmFZMP?lY0SlqY3jNlHu!J$#3(c>CgOW~MxANnvco87?~Fjs5S?{@uUJAGhaY8U3eBk$hI) z0d913bc~X+u=p=;CULAN#ETyNHMfHt`&W$LkRSoV#Ybf^x*@ZrR1dYh@u8B(<}mJt zUv|+PBGb)+*mQA@!~L>0-$mz5KA@N<{L1Tf{!LGu?^B@{m4-GCN7k3Qa~CG1uY&TL ze115-e~D8M4vrKR6EWTfovfS^leoA-3`gVq)o)&&INq;l6k0JKo7p*9-Fw-5Klwe( zxRQ#-WpAKk7`}hnk?p!P{ zYn7Ik{+AXJz3H~6&V|AV=pY$9*j#^Ub^>=D%pQqh(N9cHHb5w4>1)&9m_3{tt)GVQ zqW+ifFB^|gkA$Lc;K@6C&l6-gk`SyiC;_r5d}9G#I)kN-hfjKbM|3)tDx#zCKV_KM zx*j=S9?r~H?`^aFx4!7FmK{|H{`*6z_`@luFo??2AVF9`?T3xg*EyKArg;2fTnrio z9scd~WGsxY9Z`H39vcU|S23{2A4e^5MfULP+UW7!@cJL%n^P|^-k0m#PziY*Jhd=b z3+ZGUMnPFT(ORw96UWU?8>5n@QeEXXzr-%JBK?C z;I8kNO(S16gLL0Z$prud4tyq7R#v~XEwdtR)|?Y0utsWi*{`_qW40C$T`BQwfJ&*EqpB4FiL{#w?IW@3HO_X{N>JiitYOzHY#2`YkG zbdGTAoi>F#VIZ;$q%mM*vC&l+5s2c(O*fKC4;ggCq@!ETjEpjbD`54woFUNnKmUiY z2nB^F|KI-t9FumxTgxs9=x*D=U-7hV7H>(qr@j7_gjUx?A(i>Dv{W!C&f6D4jNhy( zAkz*fFRq8?z-e9TTE>%jyi?b0cw{k%sSA*j4}WC8bbB0%(;b@I(1o4gsiIYCFjHg= z(P@f0){>@#)lWsNU31^(#{MPvHCnGF{5KX-sDuYgKvRggqL${bK=b$gPxn6Nn7r#Q z!qPor0>49R6Oz$-ktN8CQNACI%DbKa8#1s9EOQqfTUn>&{pUc&mw8=T5uFBKgH|UU znHV+5Cs0DeM8*N#=9&*{LR8Qn@lRlOR+XA4B}_ckxMY}Va?EeECXYW&-`4`=3aK@` zZw;a63X`z)e*st%r|f=5Ny`PaT}WaST@}-n30)Nv8%eCY1Ug0sAwmh9$&t>#*A|MF z3_!zUk3GtPBZmlE391s364ntb%|HD|-}U02H)-B`*R4G9#CoLY5`}BYvykCH;+$#b z1wo)!bt{DsL^{M47A-WbxV`&~20$2wNFke*S@+AFgJZ|MY2ob53@2w!uz%lv`pbPT zyX+FIqZy<)XV6+P8l??8X4|%{Y~H+y#~=R|^YgPj{q)mxIvs?7va|$&s=A4%9tl+s z!GT;6Bwjg+#7dE9os({hb|aZOia>~+U! z>%J^@U?8&wXA0sH!rb!AV^8qlAN~<@M~@RKORPg719iDdy(px#Z#tDarz^)v9TsQj(oJy`bV_k3EKzo;CEn?@eQj;j+svt-z8M zh(cDnd1F%axUs)o-4hUv>bP*eoRf&^>(kE_AsmNhHCKFaJ3sm9vp6sl(25-o|GPt^ zrCbrQ9(xK-VKLY0-`X#f2^n*a>axZKY*a1Qg)I*4J3tr&3^T)BcTIEOeP?ssb&e+< ze~Oo1e4gn8uW)exKAwMe4=?V0j-~mzmGL+<=I5)7R}w`5hYlSk&r5E&;rdnEm=Lgi`!?b@m~vk8k16p6GDt_RM!M zrEH!~%2oM^tR&(EAhpL%OtvQw#t@?s&JyXsYbqK;7&@N#>$CWezjq$#a1m>AFb3f) zffV2@)|3QlMMTq!ZB`Y98xz*9{%EOQ6AlkmuQtLdZ^r|}rY zcw$;<f*!S>LXI=!^!ydFP!M96x!&$?7h-N&>Vf3L-6-o1FteBlKLaTmc+B zIL+eH67PKHKVbj<{VXjl^U5m+t2SmpmKD`D=c;4Y6En2dD{^tw79Ruwxhv69Qr444 zA(5tnMOm||^lEestDQhb!D-p~s*6(PE4BuLjOiCQbgb%#an|3^6`}z+Yw2TIsF6j0 zEn!XUr-4P56YGH4e2CJrqTD$&(tmy_2&6;>P!^_|IIg_s8ieZ{21+V`E6Ayh=90BW>$m^>_<+I9z6!4hTZc;Um+u+9AVX zj&_Ohoh*>C0oDr+6;fxwPs(gQ%!ElHx4AMAme9KL2JJ%14YFobA zAGy`?CYs-Va?h$jJ{@-{R_QCBu>g3_owoz9e*FfP2d|6`aaJ&cQ&Us)7nT@r*H_0E zO2c*6UCW+5&#<_-$h+Qk8xKGHFi|AQGD{GEQbBXGl@enm&sgG9I$Ym3Ws1c`7DfSN z1Vkrtj zv{H>?%NacaKJm#<@$NfsZ~xo}J}?l~nK!O^w{HD4+ zXVF^l&_fUL)|+qU;XnHlonDL(Fd7!CO3u?(zknc87-1ob!5SvlOi?bUjLH(3v`E5$ zEcbi@s!?@NS=7}|Wg-q&H5v0P8yh*p;^M%YKN$lRRa}hk63!7#O|H%XO5@$1R=U;% zW_1h%cxgBhXy*G%xDy3sQF7?W_YhJxMjS#227>|X)~;=mU%vy`CgrX6M$$B8Vq%hW z&pr2b1;A^n0)Fuq{tY|NJ$I;_MGLTHL79z+14Vyfk+r=Edc96P4j|DAVd2JWuj9~* zuP`_;>QP!l7)gRqaq-0$d(?3{!a0Fb8XR7=D~_PZ zaB;-q%pyfzqBAIF`ea#wvy##{R1}l+CeU%h!eGdJe*kfetgPFl17)D4BPQEjCgV0T z_ZL|TNxL^eXJQhR_KBs^$RH$0+PK9f@|igX`;L$wU4nQGf(V4SFtSoNr-74xsRfZ{ zFd8rzE)%pPT4F6^399U11_5)2heU1yGYIJh>lw^Ba5=3+k&XH|o8xQ-E=Q6hT#oL> z4D5(QCy(Cq$k!h~vpc}4cz;oYL+}wh(eoMrOG_^i$DUqw(+$`2%rnohu&_w11f_Ab z+X;g~N~@jlCl7v+AG`JKJp83EgM>V@bh-&^)~sRAo;}SOZH%elS@>bBRZVtP8i6xD zX-m@)CQVVj4q2Ad?z9`|c>Uf>=MMo{RWVL0K(H`3izy1Q0ujfA6${yoMt&<^Nlu^` zfYzWSXaSk?$wIaIBk5T{u4)mK)|aUDNLLEM(PKxMo}Okj$~^C|EGugs%Z3f>*>=vh zv1zLq+X+B4!?k?#Z+0_E3ogC%Vn(A8)6<8? zKo4HhdqrKN1Z(IfEg0n#&f%mcndmTYa*{Y?aekhl*CvPp95L2dLM<6sgK&-#=cl?+ zh*T08NQ_h{p%FM17iZ96M0>IWqSK&noO2jCfi(_g6mD3ME-!*BQPo(#8^uf{3gaw= zF%;7OU(PvX;E$9eM-OrA*x@QiQa*7U)bjf|Th2bKs)#D2fshS`&eA4-Bf3!4&IHuj6U~ypqQ~JRc!y$QMiB!}OUzAd4sjBnes8Co4)1#7!&4Lz*+QwA@q& zN=f>ooNi^xAcW-T(c`PSb;gvaKoJT@IxHbjuvAb;Lu4g^Zc(}bx0KThx(tsl&=oQH ziDh)4F+fmV#L;rzGw+3}smm zNA0Ss=;(GkOioU+zSH|(Kd=DUxN#%>!GJ8!5mI{DIN>~$yVCO=q$$_ka2>~wALse! z_R_DIzblzhH9INcoNZ@w{`u!OweYLgv;tdLveH3nVNj9a*5Uiy-syvhM4 zCpz5m6Yt>A(TdF^B@^uq7hSZA0|yQ?z}6b>rL`uGV_L2FG>v5;WYc5OS`$dgg%|AP z^*&y60Q|{=|BXin84 zb-hHZ)|#Z#X1KW6v_4ONI0PE)9C=aY1SweK$Q>XHkOim76pL5K6@b?VveM_2QiGXG zQNsHXoc12%t9)NuoLWOED@Ye$Bv>U8q2ls4U&i|N>v?|POC+t9AKoAclxEki3)r${ zb5rd|>E|F56Fssl^Jbi5DB^nXQ@^<&2pDA}4jee}FaPIXewn}jci(>I1K_7_dlz5* zt4BWi;1|Dmm&LKPynMP>0Dux`p^z4wa7<24t#ZYv;pDZQ>hTjN=*4kGtPp<-i9w(V zJYG**FdjmtfWiVo5<0tT+ZC+5w`L8Gt!7pC7Ye@{A^p8I?(_ve-U_bKIn5E(l<3mC zhB!wn35mLG21Q2HX;s<2Z=VmA`y3d~`<32~>Gs-8^m;5TEHF1e%kuJ4HUDs{u9;M_ zQE3l?fOb3Pj@#dDuD$Xaeqcwy+unNfq0fHqb6@K(_ixP7kz8I{LbpA)PfOk4-<-2J z<<&1ukyoM;f)(D4!`YH_Sdc^k#`+JHrlaaLd@tsbOMi%kg#|XO-M|ZbU*z0#wy=5Y zS&Y&F(+3W+W%F4q4F>ExIL*!-+ek;=sBx5KY~Q|}qsNZ2cHKI!D>O5MjzUac&}+95 z#_-C%16;6eI}_a=yPtjv6@;u^x1M&pg{t4UsnF}5+#+_7T^hYuenP7-V- z95EcFI15sViW9j^uhS(6H5RYpF)C78DqwlJ&+?LYVO82&@9Bzy7lkoG4=Ai3tXUjN zs0xM-anfaK?d0dLz4DsRyxt?=bz3g{v-iF4tyf)f#kX5gOsE5d6LdR0lvEgFDB3_l2CzFg0L0Q>a_^sh{0&UiJ2L~NRt;CYu8O-g(Ygms6ex3-Fm{nPt+8G z7}&I7Jy8@ew=lvH2_F!whCvgo(DN9$u)LlbJSzWUFKyqV48vMN> zP@cmj4J1)Ouhn94ezB1ms(&R3HECX=rGK3uRE%;%w-vEGT!FA_;fn(_1G{lI_ugRB1h ztB>(xZ@b|Kmjs^rc<#C9(gz-RKz!t*zi{j?zw+gcK^QRX_g$d1@bW5VWwUW(g)XvU z+paV^Mx!A@c(shJTeq-n+u0OF*|>%(rHEr6AcMgGrF6qqPE#-N?3qcPV%EsB{RBx8(rUFUkKAM&#^juH zqMpLl301cfH%U(zhRn^)HKq*RZkPG_dGFvYeSI7RL8IB9BuQg#t+j3xO=@M24I4Ia z?AWnJ%B~&`nJT+Z(-a+rmF$dd^nz;%n%Wh$ZV1(_&8Z)gAj zeDGiW9J_b#{`up_kN;Xx<`v7wqlK+?^ap*?e*PEExm!Q>%m4PQZ+zn$Oixeq;`96F zK7Ze5)1{>)PM$o;!oou1OI&N|Wm(oZaRaZ)=Wn;$r{U&KNByku8l0f%U(}U?Y!HPj zZYlLPE`-E6>uK6!c!gFgS=Fu6QqhVM+U+*oZkH&Envrc$6kq$$hdy-sz4zXGJP3lX z+Ia?MrO34qJr z{H6nY_UzdfMoXw_=TRy^Nz^$Pes}-A dm(JM2_&+Poa;sT552gSB002ovPDHLkV1ndD{?`Bi literal 0 HcmV?d00001 diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index 2f126e48b..5a9ec02ab 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -1776,9 +1776,12 @@ void MainWindow::createActions() createProfileAct->setStatusTip(tr("Create a new Radio Setting Profile")); connect(createProfileAct, SIGNAL(triggered()), this, SLOT(createProfile())); - classicThemeAct = new QAction(tr("Classic"), this); - classicThemeAct->setStatusTip(tr("The multicolor classical Companion icon theme")); + classicThemeAct = new QAction(tr("Classical"), this); + classicThemeAct->setStatusTip(tr("The classical Companion icon theme")); connect(classicThemeAct, SIGNAL(triggered()), this, SLOT(setClassicTheme())); + newThemeAct = new QAction(tr("New"), this); + newThemeAct->setStatusTip(tr("The Companion 2.0 colored icon theme")); + connect(newThemeAct, SIGNAL(triggered()), this, SLOT(setNewTheme())); monoThemeAct = new QAction("Monochrome",this); monoThemeAct->setStatusTip(tr("A monochrome black icon theme")); connect(monoThemeAct, SIGNAL(triggered()), this, SLOT(setMonochromeTheme())); @@ -1903,6 +1906,7 @@ void MainWindow::createMenus() languageMenu->addAction(russianLanguageAct); settingsMenu->addMenu(themeMenu); themeMenu->addAction(classicThemeAct); + themeMenu->addAction(newThemeAct); themeMenu->addAction(monoThemeAct); themeMenu->addAction(monoBlueThemeAct); themeMenu->addAction(monoWhiteThemeAct); diff --git a/companion/src/mainwindow.h b/companion/src/mainwindow.h index d6150b06b..2881d70d0 100644 --- a/companion/src/mainwindow.h +++ b/companion/src/mainwindow.h @@ -98,9 +98,10 @@ private slots: void setTheme(int index); void setClassicTheme() {setTheme(0);}; - void setMonochromeTheme(){setTheme(1);}; + void setNewTheme() {setTheme(1);}; void setMonoWhiteTheme() {setTheme(2);}; - void setMonoBlueTheme() {setTheme(3);}; + void setMonochromeTheme(){setTheme(3);}; + void setMonoBlueTheme() {setTheme(4);}; void setIconThemeSize(int index); void setSmallIconThemeSize() {setIconThemeSize(0);}; @@ -251,6 +252,7 @@ private: QAction *profileActs[MAX_PROFILES]; QAction *createProfileAct; QAction *classicThemeAct; + QAction *newThemeAct; QAction *monoThemeAct; QAction *monoBlueThemeAct; QAction *monoWhiteThemeAct; diff --git a/companion/src/themes/classic/16/add.png b/companion/src/themes/classic/16/add.png index 6cb5042f2be71e2fbc5bc1beef88d79df0003c0b..7976174fd581dca3f8effca51c005e54658c1eed 100644 GIT binary patch literal 876 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl-tmOGnnF#-9E#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP+xX{ zPlzi}0fQfi@SN>fv8%XzSCPjI2O!sXxu@3xSNG*kE(`2DR#`hQHs{D?;HhQct!3b= zW#9**N(PU0#*WK$`Rf_@8W?yQ8MvDmIDsgSfvtdnEsuewP%Z}&JDjpalQ9`bqntKcWF3vJzmVN@DYNBDTI;psvP(Xt zmpqFvx>a5dthpRfc0MfsbV&N~K(}pXZfkf$cJN2<=Z`zg7k7v+>%3O!HS6N57OAHd zV-NAf9O4Pz%k96F+hzqv#ckcvTUt4H*>dl)mp@~e_(5jEdzrpF4!yS>{{R2)qFN~q zbh>RxkRLD}84ujQzl8bCc@Si>b#QQS`gj{iI#`*iSg2d5%WU4ZZQJ&rAAsaWAy%Lg zh{_!|=CiY0Gmw-38pN37?e0=>?e-HlAcwQSBeEDsdw{Xq$!t3yW0|LmV~E7%FA!!qZsMIg(LH?lhdSt?}aRxHf1t7CLjOcYEP4>T;~^we}?%M3R!=l9po zmyfsq-*7-dlI`Y$2^The=s2o=IO>_+mbqy^;49%>JEv-zA xv<(cc3=F1NHaVea$jwj5OshoEU}|MzYGq&w(eUiup5O^tpz!nOFy<9;tEb0O(8wUs!#t9rkHtQQrmY@s)^dd>F zHy_>vM3#`s90|_})-Lq8{oop9c)FfFAKXhPF9sim?2jhp*Dwlma6Cg2dtb)9J)D$C zEtHJ(!Ek$-{FxaHeXivnhG98X{h zTw1Nz|2if|P_3OO^-P3|u|S*iLP7I%Yp0e29LRxeuHV1Pn;#QK6OoeHd-rLc&b*lj zIXXl^fs&0N zN(e5d2{<6#K-9QN5gZfP06|y~7!}5=&=v~P0)78}cR%J|p5*(^J?FdUCf_X&4GD7C z?X(*J9QeF|aDw-3*Df2PySnX-Ajmd}9n1!pw4J&yCli{K6&}QaJI~%y6XHlbFFY6^ zp9WC;9e|mzid6vFbbw_M0IL?@VEV20Fh2nDzR=Gixx@uUHLTZz?k8BU19dG7=E8ad zm}D-NKR?wrzw^8V#37(>wKsR4nyMggwAfgBS;LoL;0M5akFGW!{G0|#DKy8zQVTpT z0L5LB>|4@oy^SP{)Kv;8o^Zk$UN-M~5WBqtfto}x%JvTB?-YKxEvsTd^NUS)CWsi@ zl7N5#_r);RK>Di~Dnr2a%~$qzwg!0?W-;iL9bAjzwCP{=V!IGoSI|l|QdZ(a4CDAk!|F7q z@kLsuVb%}FEc(7vnznZrI?7c2b%y0eqdL@}`og&O`19`uv8 z2F=Xo+zq4xGy~Xk8#GEmNDwGaHw>QmoU5Hzq$?9d|*<+iFb0F#|#&2)U}CI-BGk*2Rwzo@_N%EcI3? z`zjEA6>WW~>v3Q2cGM0XTkEGTwUSZ<_)+3p{l(!S5kQN{5l0^u3}WqGp0!@Sa7Xxvd(c>I@&l~%M=Jp*-^oT`dhLMKjn!t zZC~9hqm9I#m9qpj?&luIE&e>#o^L+VDSeh&9!5p7IH?Ek))dq$iPD?ZPP&pb~Mc+eSMZghqlgBi*2VRKYU p%`D-(7D&68kerzJTELs-<;|jdzX~j^-IyQ(z~_bp+~J5y{sX1c8*l&s delta 864 zcmV-m1E2ij2Xe9xtglST zTI!_CT|O#zFmv&!tffxM`pT4uh@^izC6$c}NdP62`gr`2fsvow||0d{DNh@LN2?>V)7$~A|XJS zk5@Q2{yw1)G>mTvJn6S27fa-_Dnkc4Sxmmmk@3BVA|Nmr?O^%F zS$YnAMK-IV<$QEK)Qvx2zubO(&1o1;i;JPM+>I9Yg<% zH{M>rAAdg0m3W;!E~DLzU7(<~6EUHq0}usqbg&zMf*`G^oE=*6f@y-LgV=docD=AY z@pOVM^*GaC_R`ls!rI><#3>?90h}V@6e(8Q>FgTi!r5N7)Yo}yB0;0BmE3hpyX^Ni z-i-7qDAchmgXbpBv9kOg-Ja_Jlp6bZZ2vhb6@P=#Xq`ykHe&Cfi2DlW>Ts-*_R3bu zD>welxm?yoL`2uFi>|5n+>q+a01N|yPp(ikVQX=iNEoVBNUy@d zXIcEWf@8Jl17oT#wM|RYeC-bZQGEwZgA*@)_TTzk!I{8V<@o=u5x`vTjWrvk4?$i= q>_=NFPY(FOTZFpn;Zv8(yVz&v;naX7V0000<$87rVsvV>RI z90nB_8Oj6}9!mrU3`baCV=6irV?+tVZ3&B05Qd;-P#m;(cU|^}$-VcS^SS4HALrf+ zNh&#uxt|FDETux4g6*DvJDrS2Zs;3oY$!S6L@~fa%5MX|kZ|l$lp>cv@AQFX9QYa) zDTx5*0|Cma0RG0P>?uGA4`4+PAo>Krv#|N=Me~8nlRJ+Mkff0Z| zKmq2lv38wK?<9EG4`2Z>I79582gn2P25572t)Wn?o}PB8bT=$)oz32KcX#;sID&(% z0Rc95cf@8pc)ZP^Agi0(7=`jaz$F00=dW`(BUI{L3Z>M!=0^bcsMIf+%r1aQGP(Hw zeaiuUpir&@gaCX2FhwHeJEzWK-_^Clc?LE>yRWa_$@560>jw|wM?igjsJ|Z#4sIqV zqxN>x)`pAF0I;D{qJ{=kSBEZNejFNF2k@6zjH;?oWhE*vf6V3L(qF|;AV4K0$YNPK zbm$_!CMJA7%FRV)Gs?+X_Va55ut_9HuSW(0G8)&89z{AGI(-^tW}>t-6da6VVvs_y zOc2k7LUiH;!U+U{4j)F*(MTp+5(^AmENM!Ry7)w zl!V0Mm;U}pAXro?S9H29f#63P%_fsQ)oM4j+Iw{RuhG$S;o%6O&%PfV!4=3TPEo0W z_IWSOZ$6Jcc$49`;5ZvQv>+q7N6c>Tg|8FywQn|5aVHk;FPiel(u&wm(~fwyuoB*>+` z!}<02$$(L)c)JK&g|o*^$O+jA?L zSX*6LTYmOui{8L|bgk)RbL6?nS@VOOsnvnLEPdbAsQ0#-hvx)eZ7dFjr{(7S^m||K zi;J9E6)_#wn~j5`! z4_3b_I8adQ0&UmiqT^R?;Li@6Vp&>oR%WqDWVD#D0fNVm4CV1d`9cj}Ac_!*qKG3r tzKF+b5LQTD5fr?eWzIhLiXci9871OH{U=yltN$4bKq*s6dnNjce*nC2vL^rl delta 720 zcmV;>0x$iA3Ec&d8Gi-<001BJ|6u?C0;EYqK~#90b(2j`6G0rtpPB!x+gH04Xj!zT zCB_%PWG)mFPx}op@Bt(}al=o7-=JRQ0KSl3AlV>Z2$v<^2~jA5p>FAm+nU+&;Ia{; z|KlXT-!n7M3_~h)| zc6Nm`HlG?Db>EDSTmOMw>)yS2-D<6DJ$h6J0Or+dtA*LwmFCtKhOHK~Qs|zad;NCX zd3Jj01Hk&kgk@K&Zhmr7UhM8dD+K`P_j)hI(D%#D?d=$bQb_0X5@G1B0}dF2U9GzL zN=07m>;OuEMSr^rl`6Bh#iErQ9d*+qBN9qMhasR85QgZs+g@&J3b!g1dGX=H?{%%g z09^L_Ubo+O7y!H(AGea0<)-s_c?GjD1i}!vo;-oSw-+Zft>O3kUN;Dwg_9GX{dq~L zY}QTRyeY3>rZx0n038HiQF2!Z?=lFS#gh{sKztkkz<;`JTd7RO%_Ngjeg6*CZi55h zoP&taF$}LOgtK^j9M>$ab;TI6l?qa(iPqsEC<2KH#5p(-^k4PzKhp~{Gj7_lzZIAf-||C{MKlIhaos)u|x;~!!Te7f!n4ji-r+P*oJLe zV^Q*XqkjReb)48UO^=9BAd*)CLkJKNJ_mt!90ZOSo1U(xayj{Ra}!)^Fd{I<&@~LN zCxoK`5M%D0NOB_*JxC-Z?{w^L@E(F~<~CUX0000we5Z7%7zpdNzC$s)OgG3cjYT^1n46>7rt#XUo zzA?*BFurFH{=(1ZxI2qX3s6?&q6PzB(4(!wKsM_EULLXN-=A9lJ8$j~nEJsxBV9Q?ehVFpwT1HoA@lpJ@dIiF-wUhGu1Rm1H7 zqrzOKrTmN&1z5|BnN^lC%FSjtEW$8TNU+hGOKk}QcNNn*5r!6i?)q{EQNwMVveP}o zYX05y{y&53e>)>XpMYlC6w`pKnr;ZYO=%RMH>tIP~1xEXc| zGb|HkDCP~x3HUji_gyZ-{A14g|L^JjKP~%z8|VL-41bCl{-0L(zfbP}VvhgQ8UHsi z{4Zhn|Np<2+^W4mzcQ8t`2{mLJiCzw;v{*yyD)UH%6d#xl&EJf@$_|NzsD%dZ!9-Y zL^1%VpvKe1F+}2Wa)JVXLGj{GKj+T<8OYLNYtzy=WyK7O5QkIO!?`?I+gqGiQw|?W zk(4M}l$;c*!1SrG@DmTuNzIj+TnYOo6;-x$gTe~DWM4f D9_QW4 delta 988 zcmV<210(#E1?LBl8Gi-<001BJ|6u?C010qNS#tmY3ljhU3ljkVnw%H_000DMK}|sb z0I`mI`%#ks001CkNK#Dz0D2_=0Dyx40Qvs_0D$QL0Cg|`0P0`>06Lfe02gnPU&TfM z00Uh~L_t(|+G4y=#Q+EY|1mHyu`rr)NedVM|NHOH_g5e0{eS=cZyysA1H;dM%nZIy zvKZd~v8JHOVGav(i0AhkM{{CfP;FA&w=HVCM`up)4!@tiz7&zFu**Uq{65jt|Wtj58 zf#Ju076wKJRDS~i0*D2f!_36Y{_pD#hW~&5FfcMQGBEu6%fR{n$DiWo&I}j6h%<1q zerI4{LD9kh5I}Gq6HxuHFW=t(`wmp}??2dpzdyeIU-8vk=(JYCWC>PQiJwoO9Q^U@ z*-A!c=GQQN009Iy;6KoS&u=~+{qgQ&3_B+~11sY%hJS;vr5L9g%?uY5m1bc1_k-b| z5ktuHtt<4tJ-M64#LNoT2M|EuF!=Y6fs2EWHC#Z7$NB%SZww4SegN@jhO7UT8GbPF zGyH%5isAQ%j|~5R{$k*ils5#rkQrt%Kmf4-1DjP)lw*yQjG!mOA7+MszyC4(`vx?G z@jJu6AAi3Y{(bqt@R#j3(24&U{{IE?e|-B14j(802p|?_X2uY49!}4H?|%VZ0u5o1 zJkSe5Kc6!&fB(qv_YaT@OeFu9e=z)f`|=Smfd0Y^00@zrTH9`0?u536N{R34aHu2_S%&(`^`7IT-&1vHkzc#0X3b zZ2$f+{P_8gVd_^mhK1ab46pz3F);iAy6zVwdRc|UB^X&*P5yrU@&IViD}VrE1SMsl z<+hwGi~)Si|2=?)%jJAa<=)Bb&B(^|kAeO7XGj_cSqMziOswocCo(hq`uySDw}-cb z0e=DrYye0OD9rHm4?p{wFZw=gJSjHw^iRif35-uAQq7P2Vhn`|3j969T;^$sXKpu z{jgAiw|&VNz>TlfnZ40000< KMNUMnLSTXh>(o;K diff --git a/companion/src/themes/classic/16/copy.png b/companion/src/themes/classic/16/copy.png index f348604335b132b090582a42ecbf7a89bf66a0ac..0d016ee10897b35f3809b09a03e9ffa371151cac 100644 GIT binary patch literal 877 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl;=8&~`zjDUQ`;vjb? zhIQv;UIIA^$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBsLw0F zC&U$~z`(yQzis8L)yHP9IW}j_vH9zcONV|Ni}F&z>z= zw(`N#w-2AafBN+4`t|E~?AXyiY5JSb{~y2o|M&0TFJHcV{ra`DZ^pwn|8Kwe|L@bu9b-AZXdw+g)y)r8m1A*aX+OJq7A!O!9Vjv00v# zcpk{%Ebxdd2GSm2>~=ES4#-&N>Eak7aXC4GfzeGZO)Si;jE_y?!4o4RGegtI&lo>f z{QSYna#mMo?V8q>gG@?h4hh-m?;pHS=@KZ|R#;eCEbh!vQBhU-`$v~D%b!2YOwCQI z0!)f^3lkp-PV&%lQeM0$dC3DN#f6OjHWpsIWY9R_M?=ezB`K1T9S!kbSy5GPyXNd+ zI!Ss7benHp&u7+M(^OtEZoLeY?$ zpOTqYiK4;O%EZ*lz!ak4*}KWtff^)1HU#IVm6RtIr7}3C^G)?s@5gzf>X7&kFn>o1wV*j^5N)%sR00000NkvXXu0mjfkN$zj diff --git a/companion/src/themes/classic/16/currentmodel.png b/companion/src/themes/classic/16/currentmodel.png index 6ea21cb4c2d22c40c33e01ee7af9cc47543bc749..691f8f92d7bce4588e8e1d110652a4179ee110d9 100644 GIT binary patch literal 961 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5)E5xo z6XFU~z{JF4WT=1V(jfr>!H@ShrN;%leR1R8tK~~3X8eA4q_j&rS1XtipDDeSOsL^9hH(JXJ|yZbnANoH&6y*cU4)A^P#<`G5BcPp{8Nk8-_sprtz1>d*7Vvm2a^^fV+TC6$$w_AD>@ zb~$D9Wc!O7lM}sU#KgpTd3k5HMIBn;!^g|z>0|-4IyKV6(Z=-ulkWcytN-84{(CF) z|IMiXH>3aGjQM{n_W!Mze^=fAUGw>O&G+9`uYcEr{@n=weU6i)9(TZb+MRC@9wyy-@`k$(ZEr?vfwMk=O|2a29w( z76WMyFm^kcZ3kp5@^oghR?-P>tDUy84Yx;YKdz^NpewYVo9oQ3Xoth zGBB{v1tKGp5Ca1%BU39=OI-s~D+7ZKDamXw4Iq_P5M4kGh9>o5%vwP;Q<2r)FaGBU6Nxe(+e U;rUWCff^V*UHx3vIVCg!0JOY>+5i9m delta 655 zcmV;A0&xAo2b=|v8Gi-<001BJ|6u?C0%J);K~#90os(ZkQ(+j!pYQw5nLEwtamSUo z%}p2NrmcUp6$pVMmC$um6ciN^c@YLBl0gvtx#+ShK?n?_D1`807(q7~1VR2mLZU(^ zlDW;z?d+WIoUaR^6r51c<@-MG@8W%*7uZ4}l~#vTTD6s@tbYiA=RF69U-ax7BL4%3 z`=wxN?3TGOdftfpC4V^|E!Q~P-q@`*ge0xbDW7W(T>B?LQw?<=I~u!4i2=eh=;{bw z3VWz)Gp|&;jYv&3ETp-p&#OA?choq2iKuqO*V0;TXD1=_Wz+?z=iwROv+D%PDHLkV1jisD_;Nr diff --git a/companion/src/themes/classic/16/cut.png b/companion/src/themes/classic/16/cut.png index 2701f6896e636eb10ddd7300353f2a501a6b0f6b..600e320c693378e3bd2a4243e903982ed64886fa 100644 GIT binary patch literal 947 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl;=8&~`zjDUQ`;vjb? zhIQv;UIIA^$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBs4qUi zC&U$~fI&c*!7YTr*cQb0i)F}dVu&pOv4J2Yg~Q2@fsLKLX*P(PQLEK3k=&c)l)&j*Z0%mWLQq8=$n}bj>sYX~ zXWERN$409lV?+Ms`=EbYm-@bjje*Jn>RMgI0yNVXCy>#U&=Zvl5 zb9YG3+wuSZf5QxEP!MO71o;Is`0kx$e(~K4DZ%UOGQN7g{dnNBgMdA|=DA3R11`l~X7r9Xc+amMW#9LN$Zd`$~zCu5SgyGzOa+!eV%4rhT!WHFHT z0Ash4*>*t2N>3NZ5Q)pl2?y9DX3mHVV2QYSnC}Q!>*kQ8buZnV4D`m_jr> zdpG$yP=h4MhT#0PlJdl&R0hYC{G?O`&)mfH)S%SFl*+=Bsldzwbdsx|%Q~loCIEOx BM$Z5M delta 496 zcmV{f0fnomZH}Cj~ zGJt`BffHTxvlnk}<%ByH5^Dg8=BF=SKar9UF^7p0Z2$uU!+-oI&tHF+mJqcKch>(v zlmRREUKHTvWM%mB#qy{{`_-1ImO_^z9!WN42)b1Y`jthDxM3@E4$4! z!0LtXAHILE%)j*i_xIli{{R2)cxsv zCew^_3MT1iQA~#c?T91r+@|Wi1SRLeU2uAa5!OILGQ{BD?=KF&K0icJ$AUvWI+*b9 m&)4&RzQ6jwz`)>$ECB#`G}jUy(u*hn0000aYallC_xlTOM_S_2wJSB zsVv1E60o3vU=l!)q7aElBnbh6fI?X$bz~?M`b($nc;DQ6-nnzmeKT*~yo~U$VDkm| z1pr_k8p1?SwE8a^1=$2bQ+9UyjT_36lFqU+bwx#2 zRaJLQO|L|vtE=m4XlNA(qA(bav2lGy#?yiV)RIOd?!sb^U@*Iljky3j0Ac`k0vrc8 z34k7)10V!o16%`$0=Q#hf(i=E%w&rfYZ%_E(GdVwU7VkKkk!HKlkm3ljsMG&{QTCu zytcx^_A6JE*RQK?-O`9e+Oo2q^77uhcXid(gN=nLXLr zy7TAza&ucboZBpxEGp_@baZoavZlOTapHu&txYEu4?K9#lbSlf=f6rzYhf@%Or|s< zqLIUSH$FZ)GowmM`n{#)O>M1St$xMh4YAoRhK3?5W=M{{!rtu3Ef;6$#j_x=5+CnxoCxtzgx9u%aPNPatewm&Rvc>DI*$;o#z>1+H# zrGt&g$w}txJ0up%sniZnPmPa{&d+bq%WKen>9krs-KiWVE>o>pE?%_go`b{m#KeR` zAtw-&M54ygvB%o_rGY{JGW?%YQ&ZB~5wf$EN)(%#R^o6k1p-ZMtOAQw0rUd&;mjsV ziuG}vQLj}xU)NHAN`QJx%eQT9qZJkXT<%ap!aIdxQd~Sjavt+@9a!gn8=wk62GDG7 zK9rR;Gdeoct<@*Sk5C9>{%%7IN;N*sG}4Ii#uw>}_{!3^3E91^;5 z(?VFZc}v(Q;aibytWQ7N9?0TGORndj=YvN~4o#{}=|xa$leZ2n`BjmIg-h{{o4=7Zm^i delta 1135 zcmV-#1d#iM3i$|-8Gi-<001BJ|6u?C010qNS#tmY3ljhU3ljkVnw%H_000DMK}|sb z0I`mI`%#ks001CkNK#Dz0D2_=0Dyx40Qvs_0D$QL0Cg|`0P0`>06Lfe02gnPU&TfM z00ZwyL_t(|+G4zDD9r!||Nk>E{QV=v$j;%w#3x|SDkf<7@2C zTUTCxJ-nm&-`CHR8CluD+5iHG39gx&w}nB+deJuyF{zJ_Uow1s^n`(1Ns)m|L4o1N ztJe&_{xLCdSbw{T3a6J(VilK~{QvhaMvzv30Ad0;n~{w@>94GI_51rT7=FKb%^+fD z%fQ6M$iQ!C$iSzo3$)-L1FyO|!=DfD8UFK%FbKxyNh8^a+D}LIT*5d#AUk2yd9F)^@mSTg_o#lR~m$-pKq&hX>> zc?Oo3FBv$Qm>3vA-T>OpbnP0$pWV9|z8^Wl0E|WkHlWx3J$=T&z|1BI5I`(IC;nz* zXJ=qzghU7nPyr`1GXo3I1wUrY0EYt`&;?9vY<~;==3_L(*a{m0uzpTz(H06_r0{{trp z2LSl}{n`@r>*NX>8b<{h9|QpN^Z)?i;Q#>N-~a&D)&Ky}&;S7E=l}o>4FLK6^Zo49 z#(C54^Ow=~{Qv?8oSxZ$ws;7zGdS{d+BxdzG|Ox1+XyIYFfm9-GJtd5n^z29?r7d% zcyj&H`7>88R;_*gdB@fdKN)@ly$KLNj7Yf>6h}XKfcEHcvzY0K2%0Mk3dpc9F)`hK z_x|b4ckj<$|ML69>wgSyfuX|zR15Sg!*7590|3_mR&hJ2cK-kX002ovPDHLkV1kXu B59t5^ diff --git a/companion/src/themes/classic/16/information.png b/companion/src/themes/classic/16/information.png index 1a3cfc53572230787c1745fe960c00014600d64f..aca1565dd4df3ba815abcc2e40fa176f54f1a294 100644 GIT binary patch literal 1129 zcmY+AX;70_6ozjUT4X5>)q+w73Z){HlCZT&Wd;xgltm%7Akq>@ppil#39<|*TVz;d zRdy=KmcT#+iUmXwt7T-6Edf!179=RCK*VApU%q?$G5zI_bIyI=dERs9-t1F8?mC(W zH30xRo*u4##N4}68oP;ZZl&u_47CVnZ)X5H3ba%VbwZPPe(o-yee}~6LKug6_;~}6 z^aTK^nE)sWEA8tj^wP{R0yXZh!7kp40p?w`q|u^}o%j?N!|9UDq}L zVV_-6ZnLcQzEXJmU0(B|?%^N;FgsbpE0UDmTq+YUaSJC*ju#W=!+AI`2k*_np+Di^ zEc|r_b>50z6#u?JMZcnos#c|Sz=%4?tbvRw$gIM*G1Txo{H{RdpQk#V zjrm;0ek#LC`tXnnJh&7;TY~3x;RvDgl`7vX%qtV~OjEjFR0>2`K#^)d3K!%sq7?JE zq;yMBx+H8l#%^Y{t4^e2&zIri-;i0Pbc*};X!P4}A{6o0-e!m}*JPz<@|J7dCM|Nq zfw@LGC+8I?F8%T@AVqN|VJ)Fpk#Fd9fcQrm-_OS%m?vCMwA8J~@kTw}vB`Z6qFoj^ zZkv=*E36gnPR=4(<2bEFyhmR;Wpc0$$Hk`V)U1}4Y)8#)%e{5P7EuUfQ54o7e2C#Gz{|jDq7=u)|1is z!NG|~PXz@=UmE`Oh$dc{9c4o?^Q(K#B-yOH9bH)3yRa?~R zhNiZ5&WS^^{WZaJj(1YSBqO#t@y<{9ZUOvbTo!}R z=0qFQ*-bgrxrm)}AMW delta 723 zcmV;^0xbRM2;c>f8Gi-<001BJ|6u?C0;fqtK~y-6U6Va;TvZT;pLfo=_wMz2H%@Sb zkONpki$U39X;P)IB`SzgFDo(YSGUQPL{1<@rnXR(}x!hrO&LX&c$r?)_VP zZ}zJce*XO&()xP~^J`a^t}rPgj)oIn=O+*X!(qmY!ydydYa?wuyLYo&0#3z0UB9-} zs@CRs^8A=A57cHHAo`;MXOKD=WkY(ygAUTl(;q(T+SG^EuU}hgSzPDQ(;-*I<0BhX1yZHXX{Mu}7jwgR-Q%@3@${EcY@`iZ_-Vs&n zM3w4V^Y+6 zc1&+Z^Y+645bDP46hOx7_4S6Fo+k-*%fF5)K?qe z6XFU~@a4;wuV24@`0(M~yLTr~o_zA;$wx4F@ZiClH*bK>@RU~%ks;YF9Stx+_>@f*1lKg znzs0f9H@!`8Ui#QXwj`(w_cuV+8!=*usq^qv){oy>q~Q*mn>N_dGh4>^XKo`vuD<< zSwMS%%AP)b`uzFxXV0Di^{!a4V)g3P8#Zj1GGz+Tg+R9fy$Li8=!M6RA1_?E@X(<{ zKsO&geE9nH>-X;6yL0Cb&;b)CPP}&Q+S#*bfmY9(H?Oz1_sEeWbLY<8w{IWN{Us$O zd-v|0GiT1snKRFvIdlH}`K3#j?%cVvzrTO??%mtBZ{M|R*R6%lQ}bdvIy#Dqie}HA zy>a8lJB!_R?AWn#<;putz3wdY{r~^JEwf-cFajJ(g8YIRA}d&w-|v@YIsQ6^NhV?b z{o@i6_f>9r^j8EF2>jJKesVf9$NJ4IEIhl9^BnxW`h2z!&*ASr0?#L#PX6wyan|G7 z+i*spS&T{E?k;uqI~!v9)1sb*M?y&zFz4|KD(6!2eTHJRFp+9Xzh9XQ!m5bkJEyMPcfUDQ_k`5_mOBYOWfu(1eM;=L=4JDLZqj ztba0d^kL2Q6J`p}d_C#;GLDVmo{_3X`xh8&_Xy=Z5uBcI;ew8yrmpt+wHKN+E?irA zJ)^6W_;16it=k+wu2?(Q)<~S;Sf=_qO&dm4pqErjTq89a-nP0x~uSI>kVZW{a60n+U-~MV%iPa|&Z#6ur|6 zMPne53r!>>Cd(3yUx^okf1oB40@(#@I)+R_#syu|jS1Zb)w6bMdp>&3@nS@?L88y~ z^YOlU-dE*6@J#H$oeQP4-Qmp*hblL2dBa~FO=Tx9Bp!PCEv}87Mcz*I$dIQA8DL!;%u1l(cstWa)ailwjMnBS#Km13}IRpscaIdXt@kze zd(DIN9T_1N*vQq$9IiHtTW10P7G@h7j1$_~2Kcf3^+}9;PeMNh;x^YlmRZ z^@|M4gJkZnz_jME9TQD0K?sjr){hY2Is#=)I3zbUtYuf{KHO-GRh1UmY!fq&4)AMr zf+Od8v9a)O9)o3SSjOV`LU^bTwzhTl|8iknP89L4Z9-Z94t=)H(RdF=F-tzHusT%3 z^uiTXp)xlce?(CslZNSd;Jmz{>*ABW&GdXf!qBKk`?KpAi65tY#R}%G2QYFDrZbN~ zF#l%|eOBShC7)ABmw%Kz)w^F_PNe$|eL2wb%1gBr>;jf!l1Z217!}M+K>W9ovGllp zpDio-YbrRM)3pz$2EOS1rxAe7FT@&iX7=dQ&)w0`OY+DX4u5-stCy;BUcS6L{&UZF z&%ga~*s|@wPoIB~xb4eE+hYKPTRL8QqI>UT&0`%0_@DS2aPc@nRkEh@00000NkvXX Hu0mjfwW^)4 diff --git a/companion/src/themes/classic/16/movedown.png b/companion/src/themes/classic/16/movedown.png index 0c1e7b2bbca4a8a2e68131be7daf28d0d61af1f0..f609f5581b7c4870175c2457c5b5c688128a4d52 100644 GIT binary patch literal 998 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5)VDdn zC&U$~fYWN1i2Gr&z?0&UXC>k+pA#H4m8h zgrz&TSv~k?aON|wV<=EcZOwJ3dw(PfdVy?qRXw?`r4sqAKsFF;JoI|g@pqfgeB6Bg z^Oj3rwp{tT|u|+qzXR+75i_Jo2sk%&(q{e|xX~@4NQD@B07VYyW$%{O>;ft6}HIz?m;J^x|HFU%5B>e$|M&lZm;Zr)+0zb`Fq}$){DK)&YU+_d zwQO5yM@@TW_#bbMoy&O@pIlS%`TfzIk-7742^;s}W&G-|E-FR*dFRA3w`4<2+>WL%i|P>E-e;Kaa- zh8qhDKXP8|oamXv^XR1J%FLINGiOS^%v>2MG>IqZ(oM^ql|NZoe^$1-9yQv;!&CH0 zb!qBTQPHQVQ$xAB6uPHQS)HBr`c>9z>5!1C4ot74dVSC8>aI1N6?IEs`^y*Cwr$;B zUh?YY;h5}%8&~gM&Pw4a-#4o>Gk^Zfol=LK#isoYyJmJGZp+rqUO_QmvAUQh^kMk%6I!u7RPhp=F4nnU%4nm8p@ofuWUw!4%6T oCln32`6-!cl_(latxQa<3``*!p1qrV9jJl9)78&qol`;+0K?X{tpET3 delta 485 zcmVeSaefwW^{L9a%BKPWN%_+AW3auXJt}l zVPtu6$z?nM00EXsL_t(|+G1d!5HMmBj9hX4KQ{5@5r!D*S#X)GAi@u(VJ1C%^AW2$ zoCf^+_n+b3%Qp=Fp(e1hu@P?oBhcRe|Nk-k{qqM&jFor;n16wq|NjFT@b@o@7|{lB z{Qm>=!as(8Ko|T+62t1+{6+ic|Nr+l0mEbwDTW&lpF(;68C1BLFf}tVFJL~oe&I$L zV|#^HpT8T3DyT9raq@sMDD+;v{{Rk)|3J2wq%;E~P@IvIn}L~$iQ)0R+Y9FB1tr4c z)hfGXJ`=Y<0)MBZ0>X;_Fba_@zQ1_L@c-+F1;?h=B!a^RCh_?6zK#4UdJ4b4e=}g? z6#xe!#CC`aK=|XMTMXaczFcs2c2goeaFPA=>f(`&yh=I>e|~&7VB-@>hljTq zz5+F0Thg6~5@YBA^Y+Sdh#^0J7_jqzT=Jjc!=u{_-(KFmT5xMce=ES4 zz)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;1`l8Q z?yz^;#>iKqm+bFRP%Z_@Q1Yv#C8cKbO|MO2`6_6#&-$Cbn%6>al4i?3#$NKHE;F9nJXSt z&VF#<;>Y@fmp+!ydAQ=#r+v47?78)0#hEYDPXE~V_^-~=A9~Aw?tl7k+J#@87yfQ~ z{NHxZf91{pmACwN-2Z>e)Bhb;{?}gozu>`t?-Tzu_W##7^k4Jvf6YVxgU_R0UcXaDP6_^)^IzwWvJaX0>V-v3{4^?%aI|HbuJ|A$@vuXp~x z!PWmpxBeU7{cm#bztPSA@wfh$-uj<>@NdwO|LS}GYoGeBb@+eO>HpD3|NAcaps?_# z;=2FJTmP%={;v+S``~}|eg9Q={a0J}&u7Dr|NsAQKfgy2=u_j8AU|NtvTt0@I{F z;3Sa4S>O>_45U54*zIJt9gwlX)5S4F;&O7r0lpbCA|odL?8!N%_D05oY0k2=XJRoN zcIN#{r*7rdm+v{RpOBsY{=o|s4VH)8-4?rd?AlpfQB~jB)%fF)&^^0-b^jO}9S8i-Cq43qNk+;VI(m^gOA#GV^7oq~^@XPh31*H!XKERvKQs7&uYz zCu^%0&nefVs!LO!iZ+T)4SjdjREuX-)+?!5QMatDtZwb9`o-49!{esW&eSaefwW^{L9a%BKPWN%_+AW3auXJt}l zVPtu6$z?nM00E9kL_t(|+G1e919CRsoe#ncB$|2 zOONj`fY`VUVMG_m1u9e)kxsbq=oZ80A78;@yc}E%26E~QcYohJSuojGB@w3qd7Ey} zR}z&?IQQT>!{_fn&HurO0Yvg~ax)kyYBAh@{dmDdKh;DG1By4@oG&XXmvH9pRfbRB zzF;^NWDv*@QxzSCXRjVC=VlbwU%@6YcH z-+z2t!1D3a#|8iX|6joH{|#6H2>U%!4a{QdhEB~~1M{r-hDAz?KDr1|fkKPYkV z@83V-4FG|EfB#^M1mX>Nb@dccc?Me`N&&Gj5VIo5gB$`1lutnX2+F1o00=MumZ-VQ TB_A`{00000NkvXXu0mjf4j$eo diff --git a/companion/src/themes/classic/16/new.png b/companion/src/themes/classic/16/new.png index bf119555758ce08ea0c192ac458c04dcb774e63f..b40281b643da32870c18001295150f61cc2ce014 100644 GIT binary patch literal 739 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl;=8&~`zjDUQ`;vjb? zhIQv;UIIA^$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBDDgJH zC&U#1C6$(z*45SV@bL8Z_N`vM8YtD%(^ped)7{gTmsil$-PhL9)zQ`0 z*4fwE(bwGG*VxwA(Aw9~)>qrockAibl^b^Z1q9Z$_FaDPb?(v)894>QA|gOT`~rj1 zvkQQXfB*jf`t|$WyLZ3;{Qvsx=aVN-|NQy$;}?+q=fI((%U7)W{QduzAOF96|Nr*m z&)4t1e)#(T-IxC#zx{vz<^StX|KEK2|LWuammmK>efR&_yZ_JM|9|x6|J|4WpS=D5 z`0f9Pum9hA@&67Gz5IXu+5cP5|6hIb|MKJiS04Yr@$CQ2=l_8~M^3;T=nj>VAirRS z#I|L74+lTJZ~FB7(-%*lJ%xfl@7F*5^JZI$+L3Lthd1tv2C8RF@^*LelT0kU59Dwb zctjQhX%8@VJDF_7apx!^5EJvKy;iIhv##FLi%|D zD^nwF14AnVgDI9xPAD33^HVa@Dp53;TA7$y8JI#eJbO3!I#7co$cEtjw370~qErUQ il>DSr1<%~X^wgl##FWaylc}J@#^CAd=d#Wzp$Pz=YFfPj delta 223 zcmV<503iS41@Hlo8Gi-<001BJ|6u?C0Jlj*K~y-6t&*_~gD@0C&sIcDMNLPW71DY# zMCEBdWmd=nR1DyB(3ndTTbKe2$*cTj-SgMUiX{5JCysdoco<_|06=~tBq1W)Lqs?X z14YD%$UWppLT9`T0I2I4P1BSBo(Rzbg-rC zI-c%ejrTsDFA3KCEJ#X>pJNB5)OEo&{QnJ>WjPFMoz`}GgDr`mD2i)>X_{cI#XQfa Z1s{&Lp-zn0|HA+P002ovPDHLkV1kEfVDbO} diff --git a/companion/src/themes/classic/16/paste.png b/companion/src/themes/classic/16/paste.png index 91bf4afd6364c3b611778516dbc67ffd69ebdf07..7f1b0a7a846bfe540b4e7ea04e900a643b9cb80f 100644 GIT binary patch literal 1075 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5)b}#L zC&U$G03%~oR@VCU>w#WO;k$S5 zPM$m&CTvclYt|4?`=dvX zf)p_@EDm8Wuwu292l+5GH1y)di~armUS3{cNe~ed8gk>tjpfUir>3R~2?+s3%+1XU z3JUb~^?~f;CxGzyfddETShIwgD7sjgIGP(c8EJT!YBd|N%(7wW_1CWT(y8{;?hP?2 z@-S$tDw$``x-iywT9oPJNRv5n=H>B$@87?F_3G8bhY$b${kznabzPcyf0RXUR%m}g zVpeR}&6_vx-Ma_$?DOZ(4<0=_tP=Bmt()KB{*G-td{>6(I zM~)m>vSi6jSJt%)r_U{qo>P&~*FQhL@uXG!E^WWfrHxBpzI^%g>C;U?YrkJh@Z z$+a#lX>-p#pcAyEqGj2O=P#ZE(Tf*b!`P2j+ni`{nOYvdaNCWNDHr4GPIOIPvm=WA zc%AL3W|yVe=83*m8#Zj%wQJYo$B%c%a-68OI9jfMFk5y{0#9Y6_1*-I`}gkyBk1<+ z+yDRn-|%@>BQU%iN`m}?8FXjt%oGg#_~%z$+5}}wAC>g4@4o!HD3^Xt_?KVWPyZjj zKYsl9`SkG*&&Y2NrU@+j^J+GqGv~5@ANM7Sk@bn8d=^G!l}Z10%2G(UT_50_)v7cI~XL z`1Ik^NA3m|mc4swYySRWZfS9KIeMg#NvP5BpyI+rV6+HM44f3?pnK79W8p{6PS2B? zD^FfB;^Enp`BHLb8 zdbf~$z=Fk_SFhf^eEa(S%a*w@su(0bTH-l*xzAjy++SZ_o>FL(G)_M|&)8guC&Yp2 z^Ru(Tp~3U{*`#Li@I>9R+V!dG7k9&f0~b!rXl%TCMC3)>=GJFo)55Ot6eJ{Pr}L*V zFzoDc`a8+#Y$4F!swJ)wB`Jv|saDBFsX&Us$iUD<*T7KM&@#l(%*xo(%G5~Pz|hLT sV2Wjv6N-l1{FKbJN)!#IRwkxa2Br`V&)!YG4%EQl>FVdQ&MBb@07kI4wEzGB delta 454 zcmV;%0XhD&2-O3S8Gi-<001BJ|6u?C0h~!hK~y-6g_6%p8$lGuKgz}*m(-gFks?hf z^wb25ph6==O7bW4kVZTdqk1I;o{R?cI=^@^Axz8}SZ}uc4bAU1tDAeMO$L<1TrRgU3=ly?1DdJH2msk^cIc!= zqd_K?lz&nTAmadnfOw#Fe-2S35+RjJ5sgL*N~wb(2WSt_AUYJ#Y&QMaw(SD2 zaSza-UE~4a*lhdp^lY4)`#8N6qf)5^dVof>(=QGH(#cq;8_)9s0MVdt5s{%D1RVqw z1RMQ&&HUov>4d8veaO4St563%z;T45gDSn-|DWaM+CL`%PEOB9I(Sk_DG?EI9Ouz+ wT~|az%H^{7R|vIdJe%fOK&@88vaFGSJMNIh3UZa64*&oF07*qoM6N<$g7-Yupa1{> diff --git a/companion/src/themes/classic/16/play.png b/companion/src/themes/classic/16/play.png index fdefe966beb3bcd5d508880b1f643ab391f204de..d4720f2d8733bbbb625605aef3cb1a136c76cbf5 100644 GIT binary patch literal 371 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpafHr zx4R3&|Mvbf`++>p0*}aIAngIhZYQ(tfDCs}7sn8d^T`Pdlsl3Vj;w!Re>jjW_z%}V z<3Fi0&MS2KAFOZt&of`*l;n+%nm^8enE#N^nZaj9XGOd~Dl4PA&>lq z@w*>Q0ou->TH+c}l9E`GYL#4+3Zxi}3=BPsvQHMA2YsWnyY&U<%Rj?A_$+Kn;>08-nxGO3D+9QW+dm@{>{(JaZG%Q-e|y VQz{Ejrh+`r;OXk;vd$@?2>`i&Zr=a^ delta 598 zcmV-c0;&D;0^|gc8Gi-<001BJ|6u?C0xL;GK~y-6m6JhBlu;ChpL6d0?x>{BWQ~MW zlWCbbV6-Zt`~fXo1QirH|3H6&+aQ!^(;{rqULjf()VME_0?ATxTtrC2H0jJZI`e(E z#Z*cP+1bAj&wCC>y!V{C`ea%}hf#ejs$(B#t{2(oD1fLLzJGM(0;%rQh;?qc@7nap z{{f6;y<7*|PET)NysbSx)qmq@w*Tg{!F>V@VI+Jn)mSaoY47MFdE~^9bxm_;Z#|zF zxcwsjuL^`7L=`W>dbLIkOJ`R%i9^XzV}s@NotJyo+BWcls31lWqj-f%ZHwmCc8;A) z#ar6irqY>gHh-PT4(kKw97^{dhbeo!VyQUic08pV?^Qcj5&Pwd{ z9XfOfsPgvh+eeNZ*|u#PQ2h7r-zQF-c=YJe{rmUtfx%@kIDY&%P<+pxJ^S|UTe4)y z)~#E2?AQThOr1IvNCM3Vf|Qh$8#itMZG>C>lyaUmuqCMqf_ zA|fIzEF2URbne`_^XJb4L-POs|1kmLrNH1YFA4GsW)OGu%wbHq#Votd&Fz-kEu%?q zQ#Dfld2gDxcMS;cUNiU0mw&$|@yhx9yR5)%*bD--Z09_3b^wiFO!9Vj>1$%$oDbx1 z7I;J!18EO1b~~AE2V^|=ba4!kxSX5-1Sw4nX<}h)1_{ROOx)hu*=2kN^CxqwBqV32 z^NT*%#{5ZEX6~HW1xz;U92m{D%d`38IvD0J-#LAI|N8m$4E7NY4h9Aq7Aht>HcCMr z5iO05R}R@|S*e-n*(n;Hyc6Ry$MMh|8%tGFU0Y>iZRw0@D$P?`UH$Un>KqdT3p-m| zTTPmKCI@FmR=TE!min%p96VR2dCuP2T4oUwGt<+?8e6t(+ge^yQo`gIUf!?NJZV!` zmcGaeP3_gj85vob=BB2VX18wNe*Gfr6=UqO{Dh2*jFg%`c#cDB==AQcTR$hSJ7FMWYBhsF2nm7||jchY<1A z7kMAJ!#zCDk8=(j53jVcS*X3Pz0~+{*z@u)oJ?b1dK|;6nSY%(HAleB-Tiw_ybmb; z%pm?(=VLKi6!V2Q0ME?aylv*Ydk^gai}rwJGaet6I6f+&efAXzpAcA9Cje8E z6Rz5x`?df;skD!fQsVV`0Wik60yO+mN`z7hA?mB}`~9u}4Zl(fp|wIu9{{0H$Q7XB z*IFTr*6ikU41YvE5sSrK0i;#{7_AY;7(Ra;1)!zrgDb$*^)1%!Cmf2|AV%qc}$`@xuqfr17i3DAdQ99b19fOA_=j{DRQMvrff;G#p-+4skUzubw z2|%@4rMq{Kk)a?5r)66>*xH259gzFJ{_Jp0*}aI1_o|n5N2eUHAey{Xz1zU7@~1LIbnfiLdzvho@*IK?vl?G zik}<*ac};tDCEal zkQtJJ3`t-H5<(z>U|mi>oV`8?07=_-Z(k7+EDfe5nHIR2;eTdMb~mt_lIsZ~AgpnI z{&5Qw05c+j_g^l_gqF}yW&Y1nUYdCNWI*nB6=cTJ;Lp`U-q)0>hFJAQD%tdg>^?xo zwB-IJ5VE_W>m`xFZA;vQxeg7GF)ggSi{&=?d)3%Y$&%nukOu|` zBI?sgx&ygzFHix3u6H&M0EjM<7tfzDj?Oq5!{`iy?>4g^oxU%Ngrf>@`upeS?S&Uv n9+g(7UC#~^*(rb?`#b*wuts{AbcDAb00000NkvXXu0mjf9%jiO diff --git a/companion/src/themes/classic/16/wizard.png b/companion/src/themes/classic/16/wizard.png index 9608315b62184de38a87021651c78c8504742fb6..6bb4d070b2d34cb13d099c9d8e27d287028ae3ec 100644 GIT binary patch literal 1155 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLlCRYF2SMMVYZK_ED=+YG{((9c_tB?e)`$yYBd7cTS=65+S8$&CT`j@VI{M+Rp9U@87@wFMc#0Rj2>`Bha_K0ZFOva&#r07Eq^TLl;hzyJvh4Aj)rWMX3C;o(tMR(|;+DLL6D zG0`hDGzjP;W@ct!(Ea@3@$X;Zj~}(0w)jRwhFMuzDJm*{`lR;jm-@4(y3Wovv9Ynh z5EB&@m6nzUdZA~Y+GijYUJ~R7N*-=ZTJ=mS+jW|lxSTXvm{r?Ybegi77A)$&wliCUuh-sr`|r#9w=eFUU#`K#$|Yj0 zBPztt&6cj}nhP|VG0EHAg`tC0)&t1lEbxdd2GSt52ZP(mY&#(1sHcl#h{WaO1O}!w zF}9Ecr;haFwd=dHTdDN7g5Ym6aARN=|w# zA~JP~Ba_yukDQ&JCpA~D%*=Wvr6B0L_Dj#1HE-tJvB{O~P`mr5>CmD_lP($A)-rEs zNUU^C4K4M}ojY-3rzSJ=*gl$3l2hG_t)w1VgYYA`g> zH89jQv_;leTV=6 delta 717 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 Ef_FPZ{r~^~ diff --git a/companion/src/themes/classic/24/apppreferences.png b/companion/src/themes/classic/24/apppreferences.png index f979f3c96b217fbafde644bc42ff489cd35627ef..ebca2028c30848c31d6d90edbbcbad88194e105c 100644 GIT binary patch delta 1608 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 KMNUMnLSTaS@cuUd diff --git a/companion/src/themes/classic/24/contributors.png b/companion/src/themes/classic/24/contributors.png index 0ba8ecfa566719fb28206fd214fad23b6d5a7c5b..c35d8737eaf8350e88458d9aa5b552f228a0ad14 100644 GIT binary patch delta 1255 zcmV004R= z004l4008tQ004y1003=Y008K0002CT000|UgXaf$00006VoOIv0RI600RN!9r<0K( z7k>l;NklIXyd3j{%Q z;H4rA?}o4|MGz4gUWuse!l9F)yK&uz;#k$L>uP1~T-P?sk~Ybk^%d`Zvbc40Qk1^_LC8HH zE!pd~9eAnT$F)-wJv8Euo%~JT@cT@W+581gPfVBV`R{TpeOhXDS#N`2MWq(W{W?+O z{9K-y`FR>{m_jv&fR+SmD}~#J-(58|?Rl3=6$+&y^{R!60->2{XGAwtux4WQeSgEf zJ3g+}!;ODV9<}qQA2n+>q>?IyypI~y2*a@V%82Ey5q#OPb}%{c?UA_?T~;AP)+5nh z?B~h4AL82;kO5LSmuY-1QIL>ilm_Zh*MYtT8yAPHBMNa z12}&u8*{3*-1tJxX~zR4JS)YlKYs&TfF2D}Dxh#@dI&Xaz~U6xRU7adr8jr?J-EBP ze(P)X;P~dR#@->>Qi1Rkt!e16q=O$oU4RCTUPF&2@I(|fmU(2`_E-0tX7A(b#cwn& z7SSwg=TL$=@G>C&?x$U+Nh8iW^EoW^NL?ZpLexltF$>mEp3`vLLm%0n-H20Mmq+sWO-;p-=+d z2VsB&S%FO%(*I>Lq=;OIjemB8gK|0LbxFk-MKvutVhX0A5QzkA>>LBD3_^ix@-vv^ zjvJb+pP`dg>=HtGo-9d_sH$meMhmLy{6y4`y z0oHay+NA%VmI9nobF!ObQfSXgPwm3j00pE5-8z^GXcD322@)gJ9DhM#KFt<=8mB2( z7>D^hWV5&jr}_NgG-s|Ik%~0lkoArM-I3^Sfa1HLIgs=r4rEm5(_uh|9+m6^BY6E; z*xb#Em`axkxjvYzkYA<2Q+-#rv;sspoIXHG8&+k2uGt_x0uO|vK{E;s1F8xv3ZCfe z004R=004l4008;_004mL004C`008P>0026e000+nl3&F}000G~NklWsF{(;OVUnriIA3}Ame{VhX0KJ8Girx5%+Y@h49Z0-*_{zFnjYjjHwI<~ z76vwMPHQfpvYWs77$&}RV)zRTC`ORCaR7h-!U!TpMg~DfCMK4Dzksg#^A|~h3Km%C6 zy!$u(wW-Wzh2*ue3R1?5e}Dh^@%+Vuuea|k0{VC{Pz{D>00IbGD!TLiK>`XYra!+JzJL10u=Kkf(;qoA=Ks%LGW>e^4vc?1e$BuwqsquB zA)ERC?;ngb3lKmoNXe6dk%iHVTbw#{#_#G6bX&-3I^x!~zuO;NfFkq@W~V z%YXcfnc>&RpI}#m^+V10&-jml`Okj_u3sM+zI+GfhyTBjLzRK)FAKw;ub)A=`y;vq z00G1TOdQ@40-UytpZ+p@|M?q>8-SqzEGqaIelf`We#G$T>vskgmOl_jfKx9M!=K+@ z82)_ucpk{X$kG4-#KOYNWXt>;Sk?f&4S#m zzwh6c0e$ukWDY<8F`lntUwS1eu&fBD-y&d$nY6hLc!8LBLjMF1=mopNM~bXVB+9r`11Jfu#V+s{tPqc{lC9| zgMNMgmcqo$l)%KuBnOOKc1A{AE(Q~Sfrh^UhW|PsJqajs10aClLBz%gDo%f+JMtA! zw(Z~FKU0CN2R$HP8;F&FKH`IxoJ`R2=M&JtM?m^I5MKu3=P&~R0u~Ga?ZZHix4`5# P00000NkvXXu0mjf?l$|2 diff --git a/companion/src/themes/classic/24/copy.png b/companion/src/themes/classic/24/copy.png index 3f2072268f8fcfc6007290fe372a722535ffa911..714a0d590d7d960636e8dbf1c50058036fd386d5 100644 GIT binary patch delta 1137 zcmV-%1djXV2agGm8Gi!+007si&B_1(0+=2D;Ok?0pD<5;Fi(Dtp}xV&+e>DTFi(B}001E&AuKE`GBPqfJv}== zMPFxg=IQaRxz0~&lP)eUi;Ih_tgN)Ow8_cI$jQmd%gnyW*?(SkoUFFRTXdPd$k|+V zo5RoKU3Q(l%j8;howmp1S#+JZ$mCaZovp&;RdSuAyyR1Gou9hoP;Q-`x#Ui5ortO5 zO>CQ!uicBSgIzuCA_s ze}6PIGynhq00000001>LHLtI)%*@Q9qN0C)e_UK#78Vu&0000002><{IyyQ$JUlNi zFAon700000008gx|MU0%^!Wex`TzCz{qgqy^Z5Vu`G5cR`TzCy{OIiU=Iir;gNA;8 zfQ*fg!^O$-_51Mh_t)Iy-|G6@-QC{a-pb0#h=_{L&(rVm_R!Vd-RJk=>iPfw|N8p+ z;NalI#l@49mfG9k#mCKDNYzIAtd(%I$U?Emoa@b2#J^78U^ zczw*(<=^Z7+v)%Q{{C}!e#Fq`-0A<_>Hq!x{c(1EzRl*<<^R;=|M>X$_V)H~b$+tN z=D^th%ijO=^z>?SeW<_Yxzqo_*#GnM^YQWVXk~DHt;6QU+yA%H|7LG}nz!by%>S~_ z|Mm6t>+9=eZG89l_v-5E?Ck95=;-h7@9pjFuz*>FMd`=jY(y-vFPy z&;S4c0d!JMQvg8b*k%9#00Cl4M??UK1szC{AsBxLbV*G`2i^e_5)1`cQOctL00CA> zL_t(2&tqVK0Y)fbV?YCpTt&sjC8agoJm?bT6_r(`)jhQWf-oU*5Rj0pt8Zv*YF^zc zB@LI5lUGnwQf_PS=TTDWNOlBLU*YiXlOtXREj_3E|jmao^*MV08EwPE9?&0Dr^)6++j=-<9#!j7H0 zb{iO?No?OUYsTJv`wtiyqe=k94<0&vXlb?3puM}Gdu5`jUFAK$z6#r$08vW=10000A3FQZn8Gi-<007{3J@^0s010qNS#tmY3ljhU3ljkVnw%H_000DMK}|sb z0I`mI`%#ks001CkNK#Dz0D2_=0Dyx40Qvs_0D$QL0Cg|`0P0`>06Lfe02gnPU&TfM z00Ub|L_t(|+G70w|33o=oH%jfuDH0k)Zf2FyH||2QaX)vH3SPHuB}= z<%NCt@Zk+U^#B3HgiGSjpFa#gfBrKi4!NTQ&CYdfXM*_5QY!_0$udu=db^d9zP~Jh=2*=|EEu%{y%&6?ElM` zul}!Iz4{_EGqWhjTz~*#L3hoMpMMx$zyHke@6TVj1AhMcgWn6lguuqZ#UReZ!@vY& zb8>P@1ApUD94PY|Ab>C|;9zHAkPzl&c=hTVB)I~E>g}g*1cM3W5Mh3922OTXhHu}# zfs!6L`2hqF79ad(c=Zn90~Tf`1~EY%qT+&?86`@==^r3~Ff3qagZSX}tM70hyn6qI zBp)CHfB?cB2Y)H{0T=)T5EdUWGl&cEFuZwC?0|XF;1>c}PU<9Y4|6m`83UHI; z1LOh{Ab?oVUBL-VMY3Z246k1Q0`q?ZEqVUSy^^zX=$dPzkZYC16Eel zR0I$}a0|l1!t8(l{tc>dK*{GXu)tcPrKP0@a+S0QA5lKQR;vL75ZnTw;g5h62r~eS zTLyV~`ERhIm{foq$p8U_k%}ZGB^iJ%22%!LW&U-~o;~2KL5krV92{)G*2WK*B>({g zuajW{Kn384{{H>DIM7#;(1yW(Qak{xe1Ij*-^aipdkYX?0G2s1E^+_Yh5!Hn07*qo IM6N<$f=g_y-T(jq diff --git a/companion/src/themes/classic/24/currentmodel.png b/companion/src/themes/classic/24/currentmodel.png index 91658fa442d4b5a4259fb4e895094f10e9677fc7..192a227fe3488731fa163e429beda80e391ab4b3 100644 GIT binary patch literal 1423 zcmZ9Lc~H|w6vsCSH{q(mfCmzkW58e%2%{-dxg-(fOgm5p3?v3o@ZxX)VGs}nYk?|` zMXB}>Q4l$*oWeMx6&*1kcSyv9Btk4GmBbp!Z@bj-k9OwmzIi*}&wJn9nJtS953w*? zV+H`Q;IM?EqQQ<5ASu_CDJOEf10U#f~+!f^u06rozj2nyujW=qg6Cykw-_?0nKGH$m z?EcrhL?ds=+8>9*;dF0B*QySfo16FDYuEqTKG>eOZtdE)>M=Nbbz!g|HUe1zx`qCV z+!zA`gXOvUo~sE&B2hZpKQC$0D(bb$2CcG5qiohF+cc`XOUiakRy_Ae&~^LFJ7w3B zs!OvHotjr&+S#s!7k6%6E;BSVJYSroc(CtfXH+`Z-O7@PM#RSiK561NmwPc?R~Z`{ zZ&+tn_kG;L!(FNl=AlTkHPHn5N3tv-XYww$v(laEWQ@uHU;1lNPRIG}_9P2rZ(j8b zlb4D+65L&#KECeG;Q1j+ulPYdkl#|XPb)cFUmlF6FV2bJboSFmetbB~)6=uIGE+TR zGSM1Aaj^TSZu_Y)*oW>;p-|8@ZEbBc(-OvebJOB{&^W!U@)tw`fq-NO z62n6LS*RiQsurrM;LIr~FNU)GWoaIq&VZ7A*kl3}qez6}Jy6Vp;v_hgq#NeK@hCVR zjg3d^hQhJo0R1ROKN_kZ4Z}tPmxp&@V-eVR6gC#Ad(MH9R47e@(sU@@52yHW`Y4na z!kLqBrWDGH(DmWVT&O6A%1WsC4$2C&Luf=YlpTkPGHfaZN>Z@t9QZO1PJFEy+@qgN z(L9a7Fib4F9*%sMXGVv|0N`YRYo|GW$ib)enB#h0yV+^=JY3Q>qgKfpxAIdb^0E)7 z3N^ZtJ-p;(zCb`XOr6*F?;!X*UcBsKTk!!K5m*~V$(HIEE>nxyB&#=C-?$TmR%}-P z$eQ&2?-su!i%UMj*%S6S!j7>5eBbhu7*m`>gZ>XoNA(pCJn`5Z!!6Q=5Xd&nzBOQi zT;Y;KLxLWVh-+o2Fg?tU%Rrg^@7nqJfFBb0aDx1~ZX!N!2XGM@H5Q(%w&*ta(%6;! zjp>4?Lt>iz__7pVG_k3qBrhoFVKe*md#xsvom^E}LrW_9omjNR!}a#n`rjIVx#@F6 z9+YLVo0`5pVS7G-ZWOq2hI8(ESS>4^VG?$Qp08UZiZcyUa_3Ng-sI6^RuLH`<_~&$QW|4B_m8TX ze!T^51&da(-3RkUrDreUizBz&_#Sz8;Z}V6!KvPjn@GVG_0I+ZPkX7zq}8?rd*^F=mA2I;WjEC|VwOo; z@6Ro!lp)D;vy}Eb#~gi~N(GyXV_gY}08na#<(NKt<;OW^2FGUdkM2#%+)EXp4KQf5 ztyB~YZ!V3-VlY|EZB!bQMWZzf_(q?B6(#Evg#fxYl}4x1w{ht{EU#@SJZN+TL`F@2 z^&cSpkRVl<^B;i8@)s;0rA^>oL!-JXv Hct!sJnOtw= delta 1164 zcmV;71ate33zZ3w8Gi-<007{3J@^0s1YAi(K~#90wU$e4lvNbR|L1$nH;;DO>GU-N zGqh!>rL-i_N3cyuFvcRmSR`SgMq?Ehigh6ySg?YH#voA>O$;POV+@k`fS9;ZA%Y4O zG&G_q4Hc)Mg))83_s#dX_qZq+v6YqtPI8l*n{)2(Y|<{O$|{+QHi9D)T*Urk2i&%xhH^{5=Gt6 znb{GECs-CnS$}#KA|aO_>R8rWQ@U_Y-4UQEz_#Y#6HA-wYE`oYY+VL>GaxyQRAc#y zZB6E5+5#?8ae&a8)Y4@kO2vXovOF3{RFs;@s+gIGmzat2n(CIib?ZZ_VL*M24UEr>4p07keZtL-=G>972`_tn+8?=L%aL)5hkwsx{XeN^t+{E(bDdw7rP2t5 zbkcQZMPX7^Vnx%T>Ol|$v7KdUUjeZouwbx+l!AmWSPB8*3-Ue5uH%zq`E1()`#;P* zqV;FJQ&$Hsok}kcJQ#{5L0T9rJwSQ@=K&`N>04lH7?2(q0$>5K1f&Di&qI|CbatT> zC!i(Tz<RDFmADbYS2285>{1J zgAp!yN~E6ChC_mJUPOfSV)ulg!cw5r2rn%h^ai3^fk2XU_3wub+SS)xPUJ zLpkXKz&~AO%3(e+=p3u|JXFVdeI(?9*a4(7>%Bh>7I_d0V!oLnW)jkdh(L-0GJlE*flLMI^=Z=MDgqIZrnm%u3hYZVOJcM- zMeXz5rTzCHr~{b<+6)7%nSfRm1uE+(J0PsD4iCR23x?XU*6XdU_XDOrLeh&dMJmvk zzT6(tXJdFrX{uDsA9v|a;keFxseyB6+vM?`)t_w4=;>QCd1FSe`SjV~(V+v1bbmir zSpL$K6n6KrDFo ef0O^S`5Wm$>2m3hXn_C#002ovP6b4+LSTX%vnc}r diff --git a/companion/src/themes/classic/24/cut.png b/companion/src/themes/classic/24/cut.png index 29ca2122f639921c43a79bb0a7a2a8dcf601ca62..33b947198deec4457897d3db2097c286896b832b 100644 GIT binary patch literal 1623 zcmZ8hc{r3?7=K;K&?GZraJdmGYcn#oFwdZnvW>mPFou+AFt*`Z%9gr9Xt=UOx>++t z1}$1|B}=kK8_}&SEo7bCZ_*#Pd!BQ?_q@ON_j}L#p7T6ks)L=?T5)-C09b2dZRvzq zS;0aHBj3LAwnvCrd?A*Tl{wV3E4)J-C7QL<9)PG#0P%?c3kVed z4?q|m;5`+2tZ9e2ulOyEugp&7{>$%GEA&cQJJC|1P~TpFg#avu?DiTywR174J ziE_F5`m2#QU8C#1|ec%4#>Pyexj1@Orlh@zAqLSU^5_P+i zlAI}lm2wMUE0*LRLdZeJkN&&83FcPImI~n!5VzOLYWO5?WsIhgMl7 zJTayB*w3Cq9{<>1csKtNQ8`PNG*f7JY06QgkR(;?0O`Fn2a1XIg5|P z)^_$ka*C{mZ6?4-fUH_bDFNh$?GL~fyz23@qB&e(odA-ccM`=dF*CdQW=q43mVLf{ zYmk!Ev{4AbKN>s(K}`#A3YddYIz?B7kY_!TxC(_**3_mPX4W+}yLnN;cqf(`1XyW6 ziGiw?RLp6~qykkv16EQhm)GcV_=unweX>&i6`jm742>o1c~~wnPwv!tAy+>nBC}b; z+RfAT(0AHaLsUqz6o-pVzbLeifs`kPky@|1MUcVP18Ct8cvMgor(V6JQT1FS`YaD$ zac5#;a%k%F@bK`=%uIK8cSqOL*x1#8mY0{S^Gp|!;|4;V>?k0jVMAEE>)OEGOpD92 z(=&5JvUfjK=S;e8e){E%UiX(E+SKAmN&lw+v@-S=`HaW&Ul%{_-Ff0x9LBY8A(>e4 zVvc`f%^%ZE(he8L`P1d%D%Y3#W6n)3Ep#P&j?RuR&Q{p0{`J5E{>N>J$G@*#$De!mcKVr%Qc!QZ0kLuMwTCFtLQE|pnI-0H z&%2K_Ddb~oW%+ezaF;jYhy_`Dun=qgeeHaB*bE`K+E|jEw{*~`E$d|Say{I+Hnm(< zP)IN>^VRFo5uD`u+u4#b7-=aSr$v&JefmshPL^9shJ&+{tD_60FFu4=Ul*pNwcj*G z*g}OSb-cDbuQ5sAIjt;brfskORiz6B*Aq&!uE;#bA zHcTgbW6XK(CFkp^mU=#%cvNA~L#(e2s;*=n3_NrsAZD=l#gl;^e$8JEmo}&pyob*} zq+GDeH=~VJ4WRF_#@h35QeSV(xa-rPX3Np`;)e9RCn`-o3;Xbr*`K@Cm$6XGZtZ0Z zk|yJm*k9ZCH_wjKsr?PhEw?OENQy?{5v|;j&31)8RKu9D@wZ#OItp&a2bGQ8v*nPd zb1M64UQ&w{04P>$QoIey0J&ilfzTTm9V_FCuF`$bl=xO5#+5{tKg1+%KBV=mg z3C4K5gX2rmPXY$hH^7hmlYnTfM>NJ0R|I2|S$&8=PH+N+=@%N|9YP1PFVlyvWW(_G Zr#sQTec8be>BtWrz-EV?WsN!Y*uUtVf7<{6 delta 1583 zcmV+~2GIG}47Ci98Gi-<007{3J@^0s010qNS#tmY3ljhU3ljkVnw%H_000DMK}|sb z0I`mI`%#ks001CkNK#Dz0D2_=0Dyx40Qvs_0D$QL0Cg|`0P0`>06Lfe02gnPU&TfM z00pZ_L_t(|+G70w|3AZ$-B%b00Txy^rl$|@wKV2MuKN7x!+!;2Ij`VohRpIdhWmGK zGn6L!GW_`d4K4=|KulnQi7;kiW(?%yU@Q91z$k!hIKO}pgMUOK10y3N1IV%H03d)^ zzyuQ`Uf2Ko_n$$4mm`HqgrEH%h=T+?10xs|RMZ*1eEp79FF*i+EnsC~#%safzyBnK z__!_qeq~`mHh*1AQi{PhB#PnJ&z~SJ8v_GlDv(|a#4liK00IbX0Xqvgq=1^S`{WNJ zBQp;t8^=d9hXjPhGDyoQGQ55F9vF^ny?=iGi248T-(F-300IbX@?RzvFy;VS#|FgA z%#0YAgN+#|#|U-?2*@cYF?a`t10(c1GZPcjR7nxOoPURRt{wgL>*oh#M*sv6*atg4 z$piKMV~}J0%%IEtfq{qhAH(l|2;VRQAsf&VRv>18Mr3eQ0)vRSB*(jV@26`iN+mpc z^8C+^jVspyrCuXj01!Z6AN>B$#PExOnc>P;0fx=@co@F?VrJk1dWRVp`7jJjML-Nx z_v;sfoPVM+gR6HS_pcw{7wfCaBz*t&m0?0p$AVi|&Taz*2(kqL0mKAxAqf9x;AH;K z@caui!@L8Z7#=)+1vD6_8klH6_|M<}48Q;U114Ff?*S1B93rBkE43BGLf(J)$k5W# zvV8mcCG9|CUZTezKmaizb3mTwU}a`_^x`8!Uw_{uhEHFAGOz%{{Vyz=_dYy=kN`jcv0zIz+`!u?PXBHKgU=kJnsc_-St-rk;%@YsrTHlSFB(VX2079_< znB8R=nV5}$$^H!^6WcLn76v|U7N-15_nE@&4A|NE*_j#6T)F#W&9ZqtXO8Tegq~us z0e}EvfrR~kP~;^uvi$4%|L>v0Hb#XP^bcITZPrGA-sj`nNnjKC$KBpYL};r8S3uG=ow6at1bT z5yl@MUo(7qdi^mI3lE=+dC{`(?{0hj_;7naE(-tx2<(G<2j?~aXAn_lW|s)Rx-NU_ z!^54WK*R5V39f4)D=z{vFD z_qTVKSvZA6fyy|67;B9K5I~Sf{`Z&R-|sIEfrj6ODum}sNuvY?MixE>V8O=l=hyF# zES$n@pz=}KZ7LVHsIJkMXMZPefcUt401!Yd_`Jt0s?8v%Gtl+_{{l1OpK~G_ zevOPQTyr=C)#SdszQX7$ngK~Z*YCV$i&Jj zsuR7OjYmHC^YgR!UYwm=`ThN^EkLE;Pzp_?${!$r@LGU1Oj$U%fha|Z(!akyz5#>w hDKx$qa9IElU;s;OB-mduiU$Ay002ovPDHLkV1f~d?h60_ diff --git a/companion/src/themes/classic/24/exit.png b/companion/src/themes/classic/24/exit.png index 3884d2a7dbd619adbd6a5578f849304ba3580e37..ba91c7bfc0beb5282d822a35f04184682697e484 100644 GIT binary patch delta 1561 zcmV+!2Il$a52_51B!2{FK}|sb0NDiGvf2Uw0004VQb$4nuFf3k0000WV@Og>004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00006VoOIv0RI600RN!9r;`8x z010qNS#tmY07w7;07w8v$!k6U00kdOL_t(Y$CZ{{h*eb-$A5oo?|sghJLAmFk91}l z2Lm;S$S@kDQAns>h8{#ApF~O|BPOlz~dM&UL0?APP=*1X}h)NV9KgUXanQWXX z(_tKS=HBc1xaVW{aL%0>vmV;;=j?Mh{Qv8}*4m3L6zd6)m%F>WJ9>H^HOBhDd{g>VIE<)qgv8?$@0Y6V=8y1F+4Q=Jl_=wr9z@b(>2I78s=zO6wd-A+z_z z`vU_wGFcSOMhV#*H5?>+gS~UaO%1trY5?5SiZp8#zjW2&Pm* zx3<>5eEaQnZ=F8 zr@8=R5>U0VF|6B=M<2}ySc~hrbZ^>(h)`R#it&B>X!iZwkqDJz$MCELKmkaa<|!&*y1ICB+cvc0 zkVO$PF>#**d+Qed`SSqG>F8kLmMvsagzX&{-&ncl=OQ=G?Xuz?StmvY7 zkAFX&^VI9yK7Jg60HqX_29;H$=&7BKCGC4^yK8`86Dj6N+)(0P8l)@Cnw6|{)e)|nA+qZ)V&f+eT+hZu# zAhlpdz%6Q!DMfnsE&x(0K^!A#Iz8ALZGUL1Rg#-GA&$_io}6jlC_p?1?K&u}@)|T8 z*dTx)pmOnIexO=gDXmm-*hkqr$&=p&BCdGW=(_O%+>jXx3BL3;+7 zE#O+4JGgg`TLS|mlal~+zw-`p5Ri9Xkkr`Gv*1cViYUqTJUh9{r${YyB4Rj z6RFophkqwJ`2*>dONeW7a*F5xM3H)>5Woz;o%hP+K~JgG_RgId7X@ss#(&h&qXb8f zVgN@3GSge(KXmbZ0zO!B~qaM(qO-K{*ET zoE)w}+!yuUXd{V2EJ!YgQd58 zv;Y7AC3HntbYx+4WjbSWWnpw>05UK!G%YYOEipM%F*Z6gIXW{rD=;xSFfdS2-#-8V z03~!qSaf7zbY(hiZ)9m^c>ppnF*GeOF)cAUR53L=G&MRfH7hVNIubB2=I)c%00000 LNkvXXu0mjfYd^xN delta 2009 zcmWladsLDM8pb~aKQIxQyusus=IA)(C}`WoF@c;&jm*@U%&Gjih}FzVUAv7MA83-6 zDWj>B7VOEclHqNXjFl_-~Q*+1U%ocGV?cb?~cZ{R20rC-A? zIdQx40KnDb|APX~H;@1Tz+^GEF#+IaMWJO!wPUC7;*z%kKz8JV5pn1=0349#5@gOTwsW<+Sg@-S0#OVK^8+XgKCS)WE^nP)BiiN@uCC&(pR6%27=X(ym zd#efgXSZo)W}RXbR-gmI_=dL-Y=3h5Z2H2)OquP8lJc`g3FHzP04<>8c0{#e%9pk0=bPK%@ZpHU`*59p z;iNkrv0DY^h52t@LSJC9AZNvj7CkKHB8WZHJU^i!_E%{s+Td)x>-DJxjPVaIt>H)$B4NF=TC zLf18gs$j)%1_K)r-%ZQeN9H?ul>0geqEbqG=xf8qjg@}rJxlfCl9Cdp)70UddmyN? zY%Czj+6y@lGlAU8$ORQIAEU7(ySNaIDU6E3hx+>B%Nbh{;bOOPWl%T)e(t}F$Ou)M z+{``dPLt8b1A`&8%bV8`rKn;oX87PsrRl-#I&qC$F7|rjgfSNV+NYTt~a=rkOC6?KtqQT0uFfR9^#88y0f=bMzo;Z zpiJ(jIh5-_4FV58V>Tl zw6-EQj`Nkn1Tr};0hNDY&Q<^t6fAE=NvQHHx?-QA2N}7iQJPEv=)i#-sOrQu=Nsdx z$=p$IuS~NGTinYyNo#G*Ltzx>%5wo6lTr$U#+jJ2-S&i<`cK@=wcJ)^(ana6W4^?) zRZbVSdgmY9nlp_nC_ug;sa9Eri%fm%+9L+0E~h=ea5n~}{(ucD)hyL{oq)||jqf^ARiZj(7Q@bd$zszyVjqVlM>u5rv8GMA~4ES)G{)Oo2 zQ19Aha|w~u;fH8K-Vrn!6hJ#VDc_c*qL|5FXu0cwE4Sb_0nG{qPmd@}bv0RLt@(`p z{q*r&jN6G=9L2znkAXV7&8EqjtE^v_KfMuM*oE&^QXue(CksmE1NRzGvO=;*1EQ}D zpgAzn{IN`|Upfp*epFVGNoy#%EM|ZtJ318Ktn*)QL3GA1S;1GD0hIb!52@g-sN&Sn&%@6IkB1C z?vg|M_eh(e3)yabC~_Iypxy1j3BP#D4UU|fQd6_DG7B_`%|Y$GUZjj`F)rdf4=eUp4R^MOrw=>7A$4E#~p%5l{1 z*tWjMy=rNApKkPt?vb`nI}m!kaqqX>NtIf=8plp-l0r_w+gsdWAu2MEs-s$$Ttbi2 zBOlQ3RqH1{xjt*R+EeaKKQm@{$c23KN1x=UP8ecBiioToN2NEaG>;m4KV%H0C$D*( z_+t=zcLM8TEJG^Z5$Cxa>px7h79zF!!TGDr;Uo9&b0&+go|apAQNnSHoW1~C!9i*c zKxCB1tqIwm+`^=-?*mTb1bbPaOO~JDmt1eww*6rQp#ZvT8naY3hr_mqhs`q`f#G&q pwA0e0PgP9Pu6fr}2pU5IZp!Nakzf1jjpIiH@tYHW_;V9f^gq)yz;gfq diff --git a/companion/src/themes/classic/24/information.png b/companion/src/themes/classic/24/information.png index f94c8d7c1aab9bea8dd266a1e1135a88cad32b92..ccf17132be1fd90fb27a8be31d1a97fac6184e0a 100644 GIT binary patch delta 1583 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 diff --git a/companion/src/themes/classic/24/library.png b/companion/src/themes/classic/24/library.png index cbd6c1461073df014d2e5153320b89c40d406d22..97e9bf5967238d7354a8e9c3810e754d81bd01cf 100644 GIT binary patch literal 1430 zcmY*YdpMM76n{yCr;B=86&_t4X=}41=`y?fSeB&=O|rRkn}|uZ85vWtxs*$GU1G#A z!;||hj4?7sE<>2?xSOHD3}MD#21#Nod#b-W&-b18JLf&;yub51?-zx0uwARQO$#Bk z_L!ZuBdl9KziU>3?ki|(g++~EX>W;8S)BHV%d5dw@pH7bLM83`axk`g*g4uG6tEki zkT8Un!4)!rkUs{YNjySWDnhzMI_LDy2&snSPCD5@!0hbo!otGjU@rl+Sti^byc@o@-KDwXr|^Y6aM>n}1kHa0Rc0$Zb_qcWKc zD$C{afq?-C0S$Hf`ud;(pU;O}kcNf^s8Cc?1kS3eDlV5hF);x!q*Ced@bJ*kP+eVJ zN=nN6_wP&My{g!ijg5^E4Aox0jFUCof#V=@c9<*Ug}}Lr{xUi5uf}LUi9`aq{r&xl zfeP@{2fM>A02GNt0Df?A5CAAdwbGWm&j~g%vFO#SR}cWZU0q!h&E&dUj&qAk;_^HH z#`*Cgh;>9;!IKDnF1@|IJu53KK0dyztgODiJ~1(oN~IPQ6g+zLsHv%`r>6&sL*qbO zR8&-YdU|JPClrJ>fkS8tSOsQ)gu=o?3WbuJo9pA_!{hO~ySoAK*OsHBqcbxz84L#S z78)7~4Fc@m-d+3XiDUZka^LCY;IEv>Ds0)Zeu zKcC5DayT5|u(r0grly8OA`ywin3$OI^78QTa3D4*DG5dy8yoBE>l+vt7!eUsQBhG{ zT@6%pbab#-EIOSIUPe zd3kv=odGt2ihmQpM2neHIoZGFaXS~ESNFK_FY*{$Q zG4Dy?B6^Y>9nK)<%c_QR#X75-$E+ehL~883z9ewojL#VQ_$gx*rgEeDq8BUhO7WgL zH5o1Ig8PX2u6LZ^wk52FcJs7_rcTq8n%;o5fsp_Dp|OFeOttsFXJ^5aq;YkOY|xve z-jKPzC|2d~7Lx`zP{sX(t+h~AajgIhO`@HvA41xjKEEm`l@5QNO6)OfOQ$^@9{69; z@4LO!Z-j)KKaMf@=ZFTuEkIrOaIV@ZuYj}Ubw3(f6f#1d;BJyH23cBWFxH&MIh{Oj z#mr}Cvz|WBWEQ#|cT?YKa*pDBF8PwAv)}0tr`|yr`d;JpNjTh%>oXJ6g&k8jm2$aa zA5t}X_}%!YWz9{-kL}aD4_8!|lSGN~p}iY41zY{S%?S3iA+sFcTU>h8($M2;8#EX0 z`pf6@5=~s#SLYI*Gi@ktTISm~rn;R-ws);{_k33e(JvmSyuDY%%O|hvF{t~gta3?Z@ObEhKwU%8K?zq!C(NNeGEV%$1P7-&;g9; z!TlK1{ia8qOb=nrj>5AKV~WLKaHk~}-z5C$bH&^1?l%eM*n{R+jQQ6DsglwM3Fw%O KgLR1&{{H`|gd^kt delta 1343 zcmV-F1;F~23&#qO8Gi-<007{3J@^0s00v@9M??Vs0RI60puMM)00009a7bBm000XU z000XU0RWnu7ytkO2XskIMF-vj2MjqH`3o_E0000PbVXQnLvL+uWo~o;Lvm$dbY)~9 zcWHEJAV*0}P*;Ht7XSbRuSrBfR7l62m1#^=XB38?I}6M(Gk<`{J}ki&DM%DiY6V42 z(<-*9ZCo(%2R1coQ?+RtyZWO|x};UpRuda*jrErrFpX&i6OD>M69hM4WPlMEPgy4CW$zr9Vx=wWW4N|l$Pg=8V@w7PUSp-ZL zE2l41ii)Z_`hQ0HNlG6_7ZISNQA<=U~(`XyI#f{$c4EqBBs2-P%ECMKm5~ZXfC1Nh`<$jIBXQSGB zj>f)fvg7i}Gp=UX-A_}04d={9CSrvg^JIY`=L4?Qwv#zGhH!%tUtk=k*T%xQLY5@1 z;cW9^>VF=592DmppQL@PK-XX=<=1ZTSFI6!xWuvrDpHb^)VI{KG_#N%`@L!70)EBB zvtlOl{G2Rqx3;l)a{|#3_h@J^bMRObx7#e3J6lmJLuX9P=T$#l1w-}$B7GY23e;pS z3@|e4L80^Dlf8th!e$nDq(wm$*qkm7{81)M7Jn;RrH-=|7pZHyg+ufr83q{h_u!Mg zXw>>?$^Bj>azGhefyrX!x3Y3kQB_Y;d^A6=)6jM23i9A=%)=g9EhhA{6&UA);SYo% zi|Kzlw^K9aU3H>|0~3LoZ5*n0)TQ3`Y^YO*5T7;UZ0 zTJ;HzxNMGBeM>+D3wRtFgqYfO1;D7o!IA~(ocQ4o_Q+i1G!>e(P~0{NOQV;Nj4ue^ zT+Mm6nf=w@G zvJK7<0Pc^qO&+Wxbc*+T?kVUpE6CrL^`DDY6r@mDYvxi_2bb%jcs18b$r~Y@`hVvr z38}gXVwYWu#}z;mro=gJoA~Y=(@hY!H!6uS#B%(r5-C3?3srtj7M0iUQuNv!mb@HI zOZx!f;h<6L@wfu`##Oj%+KCKD2ULXWbol%}JkAhC2K02BmGrbLh%va7C4K2hfj(z zhjR+{Y4@}v^H^DhXzlD~aMaG;tsA6yFQ)Rm>tDnWQFp%L%=G{O002ovPDHLkV1jNk BgiQbd diff --git a/companion/src/themes/classic/24/movedown.png b/companion/src/themes/classic/24/movedown.png index 1b2395232a145091511ac7e375be7852e4bbfc0e..47f210256686d528bebb10fd4eb142e37eb8194e 100644 GIT binary patch delta 1246 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 W>OWv^DQge~kVDR%PG$QkH~s~Fo$E6I delta 695 zcmV;o0!aP63&aJG8Gi-<007{3J@^0s02y>eSaefwW^{L9a%BKPWN%_+AW3auXJt}l zVPtu6$z?nM00L%7L_t(|+RRod`6gC-i| z%AJYb8soByChDRyI~Pq%TpC>%7aHTEEw%WpHk48ej1&&oau_HnA*%AlF<-20fyoyci6eVN4tim3=^c`aAIT*4->+wG^el9s;Z>qFZ5 zppBgyr`{vSExSlrcm}gm*P8P1R>f*nHO;ilQB})zOM#kRGrPnpbY1^_0oEO8RMWFb z>N#BrSZxvQR={l27F*OR+7=*xOCXnc-qjN{x-c;p!jIUCaMa&dq?rW>4N+!C0#W$q d|3rQWFaU}rV$9a2&@})6002ovPDHLkV1n_^Ju?6R diff --git a/companion/src/themes/classic/24/new.png b/companion/src/themes/classic/24/new.png index 192f3a238c01c13b170e60faa4aa0cb305c58a75..0181a1ca2d27a1bf7e3104d2a20f1f205168f12e 100644 GIT binary patch delta 639 zcmV-_0)YLQ1gr&+Bo78+OGiWi{{a60|De66laV19e+P6)O+^RZ0TU7sEsK*s1ONa6 zIY~r8R7l6omOpG0F%-ss_MI99wJK6X6<}ei)PasH*%=yUhDvD%RyGDQqysA(LpK&$ zDGac8D`G`J6<|TY07_vfRfncm!r6Wdc9csYmp=jtOHb#s<@de!eed}W{_#*bdow^O z%r9luf6oI&zyPm+gQ);kYilxWPef44A8l@LT?W2RoLaS7eeaw|)|6a zm7SfP{iUU)I#3?wN9Tcv44QMGlqN||vDQ$jRLYG;WBuy#^390>M8E~7Sp$tR7UzW7 z*;&1^QeC`QF4umlFHrWCY}Xl&f$ zM`}?b#F64g^}3xZ1M9qL?SZrcCkiS6N?o5|t-_l1U|QvudoD$(9TeFLNO0KG#>x3&_csb5xWe;iWxKcc+wIpA1E|37OboH=x_7M?$4{FN=Yhi8 zR_oTMk017uB>4s$0_ns6r^)f*o0q!>PaZ$I5Tc!LZf{)yKL3@!fz{fYgzxe-;2i(! Z_yusiJRX>O#_j+B002ovPDHLkV1g&WCM^H} delta 511 zcmV004R=004l4008;_004mL004C`008P>0026e000+nl3&F}0004xNkla03d+C91y;7=3! z1=)+Bl)%o;PPSp#QW8J_!7aFO;lkI44IvSANKD=JR>I zQx_K(b1CMnhoCJ$WFQ3hzM2Yd0pdXbINT=M z?kmktKVIR|ovq4p?|{4~W< zfIwpdT~ULGDfx0@y5`qe9oP1VE1K>AAeo4BGI5xK2c91Q(B5Vt1;8|Ob92oj3PCoT zWoc>Yui@cgT>}XLNE4(buwoWQ1AuKBEN!^^a;>!nU}$LQxZ^mvk&zJ%L?l2uod&>? ze*)W-bVN;#Bup$*;%iM&`ILSCK&@z+CWC{6&r~0egmz#WU|QRaarxo%_4)ICNrvCt zJFpNHzwz;L0IRwjZ)`Jt;Z=(@`%%`8rnqXJ<*he*0QmO%nNYAVK6;W&_9|abBw3!h z!EfK4AqawyO?P)Uz_YS(u@nf@W5+|me}VeEEib^?R9xc}Pzupg18Ue!7@*yT)A@HuzwiWy;?eEeL@MJ& z$K_i76qapp_ilk$%&cc_n%kio=?b^01lyLxVir<{v%hpFiQV@y&Qi2nZm&*$gozgbvVSP7j))iDM9-n1V< zPfbnLYN1zGS5+#NiZr}`8<+%^`H!M=xtyQLT->Z({yjZC9|A7|G5!asBL7u%b#=W4 e90el#Is6MldU=9EQ{c-00000004R=004l4008;_004mL004C`008P>0026e000+nl3&F}000C?Nklf`w|~Xezexmz@^Q2O`uFc210y3N!+(DUCXV&Xrti}dczVRf zP>SvMpTA5WK7RRLF!|Elr*D70V!#3Z|NqYb5I`(anvV5i%7#MUKR#pNU}Ispa`!#M z$FDybKK%a4`S;&n1_nk31~v{}20dkd&rlC@&wtDu44gcI3=i+UV)*&v%q5^XTN&^G zfBH<*^l0ibH{z%%kADE{rkmyIweIlEN6d#raI;$x~ zzUa=1%dc#6qO}G&dQu)JqHJ~IoI^wiA^Zlf0Bn#k3V<*Wz@pcJqoX2%oBtE>C4HZt zkXmWW)w(-m4v8s6zZe=ZByCv+OW&P%f7fAwRLO0|u73p)0nL>MO@SEo8mF0K-*C?T z3SI%kf)rw4#K7>EK}e8;L0FKL;RmxG!+%y`1}26-!0-h51ZepGzYM=wSs54wco?GM z;*uTRJZ<@SdG7rD`Ew~)Ga3L0AQotB09^&dOc3Av{rjKc{~w?$MKl@oY(jt*K$IXk z1t|89!GF;|B^(qqw{G2Hh>MHUo-koT)wgfoP%HrmASQ?opuvp)!Lbg)3}E^n0~6z4 z24J)>umUkK{^1xHJq)ZY5UrqK6Bid}$j;6#i;azKME3ze0I`4#13_q#gt+e?)XD!D zhym>E>6vj0dH{P_7Bw+)OCf|ZpG%mqd?6EN~QL2Q5k!fF8+g8Bc!djA50 z?0?V=5b6hJCPoHP0d6AV zf(b(mAb`L=0Hq)XP`SedvjECR^1uIG~ab00IaS2VmEN z${1#-D?z^c1JAyH{{CZl_5KS{KH%bDLw^wm2p|@468QfcX#O`~5HTZs@b??IXaN@s zKqVl}gnht>AqEgYESzji41$to4BxmVfw9j7clH0jKNvo72tkS|a2ycl0~StZ6mft6 zVyW$3)%*1qr|O@7jDL{r|MvCE@1#5>4}B{JMNmwL@N*IL0TUCZ4*&v)WzC@{ZGX5l z_NS%G}U;vjb? zhIQv;UIIA^$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE z?e4J2P?yapOUI^TrutbeEaerxNatrx8o?&xe`<9L{|$jpJmx|#XVVXyQC0lhRS z=9U73I^C(=AFoe-a#<@Zbk3YMxp>7Y#up1bCh6|(Q3YD3TH+c}l9E`GYL#4+3Zxi} z3=BoUHx3vIVCg!09jOa!2kdN delta 1234 zcmV;@1TFiI1KSCZ8Gi-<007{3J@^0s010qNS#tmY3ljhU3ljkVnw%H_000DMK}|sb z0I`mI`%#ks001CkNK#Dz0D2_=0Dyx40Qvs_0D$QL0Cg|`0P0`>06Lfe02gnPU&TfM z00dDzFbJ7*QqH!fj)hZ*pHvF~0tn3lCWik& z3qZCoGBGmz{(tkA;q#Yo3`}gi{0e4CjXGhgPKoKqg)y=65N!cK0HIlcFq{!a16BO~ z`xO!X?Uz%>sY`!eRj=XqcEGmM{SgWnyLmv;P7k=;!bMpvY(V z`0W?N>knTU7`VjbHQY<*>PIcyE2!#e!@$UbVgWz^p(axXXt*;YEcx?~f#ECAz|TMa zf$3lWfPWT&A_izFBM|@i^@ripmmduLa{9KWu`~DSL@b!gDWWM4GZP?yaQfi)Uj~Lx z-~Tau`SBmj2Kj=8m6?H+4GBZ}j4X^`OTPa4$0}#&nq-l>=Crs$oG-{sfB?d<0GQVp zz5)&Y48(tdY-UzQupum946=j?%m$0GL&RBuG=D1xGs7>ShIgO7GYHDai;Ai{L<5av z0|+3L00Sm_hOb}$0$uzcYyc=yL6`;TdM2PNnW6CkPF+l}6bC5*n1GJq=VM{uWM^l1 zdFSHuN5^LE2AK&EK&Tb~75)KgU;!D-3^9-yY&gW_OfWt(EQLYx4mZ#-JX{ zaeraQw-90hGuUSk-vABfV`pGxW@UJA z;ncm$o4cmHyS{l9(1@qt#E1j{0tnRyjDN5qf&rRbnc&G494tV?d4UG=a&t1gee(3n zg-w$eK0ZEo?*CsOuY!UDTSfy2AhaNYUeVe>Q$F3_zkd-Z z^%6ZeumOMoLW=`%%7YhrJlt%+u;ya;@Z{c`YdfdTdvRgKqW^!s-UKB$VvB2l0AfKG z09MTm?7)m8BErM)@5iTKm$ok0bpODlDSy7bI1QBkMrwrv5I`svu&}T)2=ns*Q^!As zrx*8}yR)}%!q?|#wgIKy!Kw>V0ZTvtp;++!)5~YSzC8PT|LCmgZ?11z%<%8`15$zm w8vqC(2IOW76DyZE0~5O@P@Ic_N&q0h0AK}Ns^>Mjng9R*07*qoM6N<$f)36o0RR91 diff --git a/companion/src/themes/classic/24/print.png b/companion/src/themes/classic/24/print.png index d7e15e59cc311501a86b9f656b2dc869fb6c64a9..edb7bcfb16515d9a448db8cc4e3057d9632b8ce7 100644 GIT binary patch literal 1524 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 P00000NkvXXu0mjf_i-=ES4 zz)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15==?n?k)`f+xyS#pQtEN zZ|3RZ7-DfcIYFYaL9p|0L!*5As(v0W12yhR2KLPiiPAGXN-wQwo4AP4Qn&WV%2&#X z&26R(42RuV6!V+@xdRPUEpd$~Nl7e8wMs5Z1yT$~28JfO28OzZmLY~_R>qbR|A6^>bP0l+XkKDc4g~ delta 1151 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 delta 1305 zcmV+!1?KvU4XX-}BYy<)Nkl7{;IX^t9czUBLmH84d*97$ZY7Gm;Sk z0htCekVpi?B_tA~M2v|sQ-dE-azL?8iK7J-B>qR1rKjKOU#I?IN#;W`%C+77yI zJ?-h~x&2>1Y!h}9cs`x{^Uv=&&wDusxJNl8;ACwMZk;P|>wiu2E5CfrN3*gB85tR< zudk=BuCARO9UbQ{Uc6XUQ&U4k1OSkygAoC9d_aZ^xDf$td-S~WQSqRx$A3o=lc1|*jo zPi=gL1RNhFRCQe>5+TzxVqo5K=FI6K{~zsO=9x=${U+o09!uF+3e~oeYuot1wxBg% zv;Y1x$bZ z8mxC10Yz-ju8NeN7L|)!JtX#P=Yh+~PY+GB~TusviGylfSyCac^=<5fHy+R?u zL=NFFEp&GOGeeUnD=RAt>({TB48u6q($ca#9*+Y+h?$?&G%aaaHeNpt6z#>yJTGz> zR)3=@$f=wE(}QuzvW)8LYRbvUd8f6t_1$1FNX(pK=C!)6x1>_3Q3wH5CBPgHaOoOw zGXW%0qm`J^fQYbq^=c|CEZo%D*?A@q2soHo2qAV^mQ|;!Do?n7M|mf_VOcUE}2YD=1c*POMjZ~Fh4&ZrKP30;c)ou)vH&tg%Hfl7laVC zs;csxi*z?lN#ON*QBhIhQWWL1-|sIpO%u%A1>pH)GHD4R?ioHMfy?E>iWMu!vaHYj ze*Y@NFeCuOM6@N9N)20g<>lmZxn8<*<;reVRSAH}%sUOk=+<@pzJK8p z3`$B$$mjE|4g><9MWaz-X2Hz0wryX~H0|DtK1mV)WM^k1FE6h!7z}Hlu0z*#D2f7R zhP;3Oet0|{xuKzo!03M208(RM6+i;OAb@UWJ|z=T zA2S~#qFEk~#{(c6KpKFoF)#thAtHIwf>{7Y#!Pq&oB|LBpa6&xQRH9X-V%z3`h(ei P00000NkvXXu0mjfkY8?N diff --git a/companion/src/themes/classic/32/add.png b/companion/src/themes/classic/32/add.png index e83f4c1a067027d5521f69f5d8476455f560a6e0..9b1e2ebf37154261a460fa3285c6264867c01a55 100644 GIT binary patch delta 1236 zcmV;_1S|X82j>ZpBYyw{XF*Lt007wp+_KsN00001b5ch_0Itp)=>Px#AY({UO#lFT zCIA3{ga82g0001h=l}q9FaQARU;qF*m;eA5aGbhPJOBUy24YJ`L;(K){{a7>y{D4^ z000SaNLh0L002k;002k;M#*bF000BrNklZAadF?gO#GP{m>_r`_g&tFx##n~_j}Hr2mkjbA4hZ_~}X zC|W^m^f&0{y`)strUifrq?#fkm{|pp`+R~8od5s_na>a;h;NEvxaKotYYCI@J|#!S>?Ng`$e z#DbxRrk3HYAdc&tFv(CEl|KNuW1O8|W*NbZkTH~_jgHFZ;0o{aF)9Evuk+&LPd{<- z+=J&30Vjr39YhQW&%4DoyLkr@_OrkYk%*J^doe%_)C{kN8hEv;XTD(N>I$tNThF9# z^JNTRIe*Rh#w@?~*KlqaSVthjGZ=`1(}M;S!<%tyuv!Mz5YUW5mBJf^8iiMKZ!{an z*vwkZY75LE=5h*BoGDHW#~&dS!NUFwWiNsDOLA#SF;o<_Fr%V)i~_@>;Cxjxh5($I zJI&(UVx_>rZ3tZ{SnFSfPz6c|1v6?==f1`x2Y=-EWH<*Rgts+_qT|$)~8L`0haf zBIs;wGT4J8fjAEN9z_HIO7|MrUAKAoo+okQ%2`Fs82BEy+BXq3TV*pW3LSCLU3_}#fIr*aQA{DE=61kU;#kL*w`}ibf{RBa;SnYL3{zb z9@Q3|3c$a|r#GMCB@$-;_CPZ*!#%dd8}d-L;6y49h#8S&TwCRaHg;P<4LOgMkpY$^C^6&o#O7|Wt#d?U! z>Ejr4QHr>cl`OoO#8{Oghins_1@$C&Lq^P|N(D7e8ympIP%DjE0VsF_j^s3SP%i~BHg_kpGgAewN0e3m4RLO=@usbo05Cs<&b3UnXfWbauT4IwHe_a1tEBk}7%Yk#@` zH#)0)_`?O}n$T#3xj`RxwxQD>ceM!sx;^rC3;I1s%8#Qgg}ptC`k>&|JO zNA^8ufO)dw3YQq82Eat05+uOPU(6e@$KeXvf2aKpSXf|3xJP*R0000bbVXQnWMOn= zI%9HWVRU5xGB7bTEif@HF*#H*HcdJ+IXW{iD=;xSFfhf*n(P1o03~!qSaf7zbY(hi yZ)9m^c>ppnF*GeOF)cAUR53L=G&MRfH7hVNIxsNi?vvL50000oIxpDW7h-@JO2%!gwJtB1Vbm!5xH-EQ*W1w4PT)!xR@wxHV z2e;qj%y=~XBjQ)Hn%z&n+XOxX_JPSOC4dNL#v}HA-sj(gy2p+L&R$&yQGhkz=_@Bt zS1ka4{&h$~7m>{3{N)Z&1sDOk=(vk3pc=q3u%tBTrI3YjmnR@`a8b#LmlcR)q5`WS zP-cAs77a8K)4&VMPU1xT8C1XR@s9?Ea;_a{6k z^I>ixW?&RZv%e$9ymZn>JVuQL#ux1!4{1Bv;f3 zP~U5oW}TQ1>pc-bgt~*SGpq^Esv{DM3Lw#+Br|AY2qduVldxn8f=TgmVK!A`v}Uv> zIIpM^oPQJ4Yv`Q@0tFGGQCbRt*JrB553(k&Et0QijWL@xL4L0|9{|+p06dXW4FD+& zJpseK(&=!`@I?d)9iVBA$)v+X&;*(eCmAe*&nuAmz==_jjy806@Nhmbgq0m12v;*+MxnnGu_$!^xmes zbTMRoHXaStP~3a->O1_D3`mPmxG=MW2aiJn=J=;1upEZj!4Z>x_I809==`H^KHMgl z!dfhi|7{z$ez>1JLW`Z#dfT9d6Nam#Lfcz&bB>%;azj pf1EBuK!LNsnCB;Nb~qMP;Xk004R> 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 jIaDz1Bmq?b00?7A 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 P00007hC8GxUev6I*)A;Ag8lZ5<0Vkf&~E7V@t z(!$bI${rBaW=jv1_}QvGEp1h)_o~t!D)rDyyRFm!d#F?uNFo;P(q{L>uIOcf5>Ta0 z3S<-i=xa$@^^p6`9XdEZZ=W`B)GA{T)3LdrYeUtIh( zU;|$5_jX!0qS0STII-b*f4GoNj|1XGF|=BE*T~4&(4|XVisv0ao=Odj8^-NY0J%%} zmFVlQ|MZo2-sx&k)zKrVROTbod;qxH#i$6B;oYZCBeGdUE{BrM4xSPsHnB^I8`0>M z{YQ_U>pguMnSalt0--|TyGIOT{qLrEA8=}8XtnUd>MHX$Zz3`onhqVpm(LHp;W)7g z!}xe7iR;nmmA0XwbB9Mq5zEWW-?)Ke7z85`TKxXup?rQ@32i(Q`QCwJ$NtiL<_z}w zI`bcXh}hV`vn)Iz$`bLDt{a9^F)$b?R)<&bE3=de= zSD%>X5o<*2u1&);9d5BB~E0Lh}$Pqd^JI`E>M8<%o>e5};^-cKF5(^U( zc!feShLjW%31mJ`YflgDKHralFyJr$-Y2BI^YqrOZv|Rgi~lLXWt9Y;N88{aNO@)q zxR_2~1b;TJ>-wMDhKA1dzx5V&8E)Gs<70HFQNFg`z? zN)6Ph>R_m&11SWqWfdhn52VDiETnDI)ZLBGapEUEFLt)E@pN=(=!gBIqu5JJBqk=1 zWq4`%_wJ=Z*IAjH36^?uu(b-Xn%k=ZWy;uF9X1e{>X4f_t`&A|(o-l;HKc&hp$Gk7j45-d$XL4@d(`fLT5R zTIr3LFpS&ZHjG%Xp&=g9^m6kRw9A3zFx_K0^m3( zb#?fILCl#MT+;;CE$&=V@Q1?$y1K}2Z17-VVd~N*JXuP;OAWNVBp@aYR$z<7H%&9P zr=cP4udgTnLTd6!>_>l%Oti4T#H64JGWCQo?f}KEj-lMM_o9KGz?VFtCT`hRa7BR9EY~gG5Q3)mb}-FNiPB3I0?qS?baxYQoZ*2TB!9GOc<;yv z(lnWQ|NX5sR}_4~UxgKRMGZHknlFy^nIaTiF5sL#6UzFi5bJ_HBCm8nE`GMB?JT+1ZKZwKeK`de8!a%~JS$)PL>Uhd&(V-!n6$ zix-j*;H#A2S}ynb$y{#0TU{O8Q#E|bHP7esJWM8E)Y~N>Zf3I|f8DlYEum1nxuXNs zvd{p3IE=r&oi83f$JE?RtAf z;;3!MnnR&@b9;L+3xAOaUrbMP_vzEApC=MKUq~hm%j-#zT<^mTB@Roqieo zIf<_o3bB@8Fy0i2aR2e+TKIDplIo=aEq{tcuHMjf`P;U(ao_|n2(+-n+^CK5`}X#$ ze?53m{^r1em&Qp-U_ZsfVgQRJ>n%H%ahqTQpp=Z00000NkvXXu0mjfxO|hb diff --git a/companion/src/themes/classic/32/contributors.png b/companion/src/themes/classic/32/contributors.png index 5793b3e21941a62b3a065d742b2d79d0468a6e8e..d90cc70decbf7c876449e4bb08ee7863e6f97735 100644 GIT binary patch delta 1779 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 D8}$F% diff --git a/companion/src/themes/classic/32/copy.png b/companion/src/themes/classic/32/copy.png index 4f4ca1f70514bcd8e516aa3887a100208e620e18..a24bb4b1d66f251d97d332ad76deedffab3501fd 100644 GIT binary patch literal 1703 zcmZ7%2~d;A`j?ie@*Z^tdrVP$>J)rx9mAooU@4%aKq-jaAVhM}M`=qm5k-Pf22rV` z0$vFAA<{5%1d)*{sNpC-=HN8Ogb)%E^Cu)B7(&R2`+kO*&a~g`e%J1I?C!U_m*Qe0 z+}%9gAP91giVTlO>9*Cr{v8yDH&wtWdH36}m@o(uiUdbe{ZM%wH9q1H#2Vc)w>py; z86N{dXMG^3qzr=WsH#K*L8mYfq|Jh$pqmi%F{Qre=ob*=qKNw@5eopo969&57LsvM zp|iF=8bS5{Eor(?+nsr;4t0gXKRmn+MrP<2EU`J&=;)d|fIzJ3p`X2MlW_)-JRXoAoG3YXTy^ji4zbvXYTeC9fQXTX|BZK5|y zf2@2Kl~ad}iu3*=>(7)bD=WjX5fv2`p`oE;V`DpZ>_CH-mzVeT^;K0>1q1}F<#6G` zh3@WdDwVn>qL@yn(`dA!J-9N?Z9FKdJ{0) zz>*a#TO9L7`_i&Qt6Pw1mX+!Sv&C6JFCmb!iKOg23blV=SR$Q$Iiph=fJ&|J?0mrC za>pko;NjtrkdUtK9-(M@RH&5e92%_=-CnEJIyX1xbUHa44v|P69~Zn5OW~0z;k0^b zX-OauI2?|)_V&V};?Z$|d=_b9-pfBzSXO?i_t~JyWa9C7ELI1-sMu(-ils{an1DMf zl*lz)F4t@}XWx|PvaYVKhK7cgmX?f6 z+#@zm^9IZrfm90=dhqt`TfJVd(P(r!-J3UWj^l~lPkGaGK&%EUD=T;cne~`2*8{u5 zVYAtAS)>6wJa z2mD?EcrXT@2|+rJRCABtF#_1HfWcr$%^=)r=RcQ%`=g*=1m@@G7Z(@PaHL za01j1faGKNio5(@2SM|5piyg*((uhMbR;!gtrL(iM z5{YDLN-PqI6bi-E)Rg5#X*qi2@wE8Z1SpryKeN?+%sJ;TmI?i{%QVhOPmeQVMCU-V z*ZiR_*T5-WR0!?D+H@a8iHL2Jo``u)_yC8P70i=9h+;Aw4@>-?u(>K5^*&q@HmX;nqbm;Kl zz~JX;_x~+dFxGEiT&{52_zUBb3g6G%_Gy5h-Ru8vi`CYl`cPc$DoN~qGfNKJC>}Fu@ za{c45eiO2XkTCuzYqoLd#f{H0yXiw;dw=hie61bVl`plsn^L}?Zn_+^E{=m#z&@OOixSl-~7>{_>n%YEPL%acnYBT<|B zL0kIE)DwzvPD1loeel`Xcj`)EuY>Q$1fF<1Fm(3@BZsgXN~0{kR_#h*;d=8|%0KEs z10>IjCz6UyLY3sSVWyXMd~-~HOVWpx2buL5MW#QlzPGU>2(cn zXG%yBvpKJ??CNW)_wL=hJ@+uL1{ZhsIBmR?@~>bY=JQ?EvNpo-9k0yRBdn)RySep0 z`}nr;YJWCXd}mj#Ft)&9Sn1u^A*0{_BazaWYwl&8)^Yb0(+d`FUwi1@<04V-6Sf7~ zz8h(_bm;Y7TW*h2|H-C`c^~J>&YhcAd^e96eyaV=8qB8C*?prt$;fc|y3KOSidOxv zlIV}>yIf9iU7$^}o#x)bqv(qbdDF0|G!mXh4kDf;qXhE9_y+97`0n)$O!PeviCIJfkFG58^ml#^ZX7lZvl0sDh6`_~K*L(MDH;FHw|33=JH)A*BQD2$Xx gAa9HM0sk#Io{T3IoZyhr4+Datu(9E+Ls_N&2LYa?#{d8T delta 681 zcmV;a0#^N}4Ymc48Gi-<0047(dh`GQ0)0tDK~z|Uy_a8W+E5tApQtSvjFcGN-B`PJ zI2cRU-gvQf?X8n7A0c1KOTkazogyYhcCpRvb{mc{q}xz-(?$%4NCPou7j4|pCMP+@ z?twt^=KT5PeV=nU;at~+CtcV7Jut{|oNvu$^HsTAz5rm;+JBPsaU6FQ@Gec$Tvi!| z;kMgtw^pnDP!#16fQ>K!@=C1o#iT@0L?)AgBuS4|Rc$DWvKY#D~}rhi_q_Yh#t*d_22i!W{kfW;To61@BTGZus(2#{qNolYmGs%itkYmVc3 zuItXrLCwI);oiys$z&44;Si>2LJ)*`CIE;W$IUYl$%Ly&5Ci~#BuTI=3zNwNs2Mog-$AQ&wh&|W z#qq%|fa}u_D*$c4b%|=ikDcE9o(2`Bpsx=E@Fsiy^a0*pEUp4pU%Y(wkow*iU^bft zLLKezFnku;umkCfD0(4pM+dNN8`WwRj^oT@q9_7b^aYE;GPeMr zD9RRq`vA7Qn5Jo;0DoUZRU#3*-z}Hm62Kn-=gSRgODRl#eZAN+fQ^9T^XBH}$^bNl zo(F8(MyXVSWm*3hfLOmbd=XP45LsUMH6v?903vJvxC4eC&Jfuk4yAtq*T+G#dju(J P00000NkvXXu0mjf7h^sa diff --git a/companion/src/themes/classic/32/currentmodel.png b/companion/src/themes/classic/32/currentmodel.png index c52a1595f36c29287d6e6a4dfac11ab6631af399..6fde618efe2fb6cf20bee6d0e1c6aa948a451452 100644 GIT binary patch literal 1756 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 LAYj@1Nmu>_2@JuW delta 1410 zcmV-|1%3LZ42lbo8Gi-<0047(dh`GQ1yM;vK~z|Uy_Z{TR7Duaf3xkjTvpp!Zl+>w zfglmBfI`&7TYS*?Kro7mK{OhpXhf5$kSLJ{iAF;WiI)dcZ$V;^ViQ_~id3OcYY_uV zTd^y&OKMQ^Jw5-c^(VGl41pE5Mige|tICn_cEg7hneedj^!+Fn3lSxGq30ATo8` zU4JS+wOuLo-vPcla6I25RB@hf3LyD6aVcdzu`Ti@#9;y%h-wibl*`NlA40hq`z6G+ zuy)ZW$!7o00Dn(EaQm=8;ms1j=+%=D&&{H&udlZaxPla)OvD2U<>Jlqz$h6=h!@Sc ztnAw2nRK4}`*&j7Bqs|1aPek|v@J*$U%GHEbw^Hcyy1rffDYJ`2cTTCJpz>kkSu=d z4W-l^YT}R6t*096Yfl5=Nd>TNiQ_74#{ppFBTtSH-+%pG1BZ_O;@|!G_RYX>9KcD8 z7eY)7z_J}I$HlTFB?}h$9$fca^_7Lb5#qZ(*;d}y)o~W+1)?fm0z$;9HhW?K5?d-P z$Kk1$Hh*x{%!2tV7MHSX-w}R1)*KV>?mP>00mDiuCs}+F030moV%d_S*@g3OUR=UA z`;Kt9v47dWyRsr7ejXSizW2%EFaZyIwg31MEfVE$<4H`@VDW;hsM_B^{n2LsH6%C)<+RYpi(5*Zxs>}zSP zZmwM0f77$gE2SkXrsufD_b=#B@= z$8z_W5wm2dqwS+W^WIl1-OyY|U5?1P&y_B&bhJ?5@O%4rZha;&=k}h^tTJ-*N>>5~ z5PuzO<*7HXG!GbI{Y{i8{kpK8rxmT2w#3mx{xh}DmFoj-UBF;4 z&{k0}ciuZfczi(4Xp71OGU|`W2pUfWy8~4xc5G}Xmdb$0E+}wJ2P+zEKU2HDTpwsV zODxraTwlSdDVJYHc5V(u%U@kf>|%1s)qj=NQ4bq=;ojapzygL=Jm0hcmGh_-4Y!@C zd45B5p!F;6i|-VPk|Mw0?gOeSa{p z{oGHR-T*XU#BrI>6he&Rfsoc9g!i_*;(IDx>0(C0P5!#_a;^K7#|@m2H_JJHe{ zZbnRkou@xJ_TjocK>zg*e>OvSynmYjA2Cl{1W3(z8bC|cnkHZkvFlSd5Q(o^Bk3qj z4l82O|JR8oU=ZkbB}bB)voeW~3J@0=iVKVQifvN%aRflr!gYj@uiiU0rr diff --git a/companion/src/themes/classic/32/exit.png b/companion/src/themes/classic/32/exit.png index bc9e301bd53a9d46d9123815d90f380ec8e66c02..7eb24a66669e00800df561fb7885269be9baab9a 100644 GIT binary patch delta 2104 zcmV-82*>xL7sU{eB!2{FK}|sb0NDiGvf2Uw0004VQb$4nuFf3k0000WV@Og>004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00006VoOIv0RI600RN!9r;`8x z010qNS#tmY07w7;07w8v$!k6U00%lrL_t(o!?l-NY!ufS$A5p{nc1D)_4?8fa}9yS zqTy0pS{f9jAQu!RtspdNr4$JSRi!A3gw#GzDS7Bang?1%iI8X;)V?H9+=>(-L1)93N9>V`;=>G&H z2Ue{3?$>whcz?Nd*|I0HO-&h53Z)csKM`rTCcYMdNJNCd_ohRGw-+b+m z*5fk?s6!h!?%TL`?=Q`k7I7;T1VV5TR7@lSNY7{Kxriu5rcj`;a3NPuoVfPe7hnAL z?|uJvLf|La?8YCw`syj8x!DNnbyN%*X%T6dOL`uyBY*WQ0guUupd)fEk3Pz0@4ffI zcV2(}`+#QxW=Ch|OM!?HOirSr#X6;luTwx}*G0FsLa9WXWua2wq}IhGVv! z_15ho9mlo4Yy#Hg*w`wsT*gQNrAfrD)Tx&~^4xRG@93abD$(EFjq<$dxX%a;X>TY+ zbznd}D1Xw4)>llx93L7oymA@IW)tRm4o{>ln%~g@K)$(|wgn5QUcWv&C+)tbTsnw|e`2>u8iGRvxF>=}21maBAjsuRv;%A=0%;mxp#P{jn zzn}WhP?+sALr|}yY#Ze`l;3|J=kw2#XAg9BQ8{~tVB`x_-a-mF)SLu7FA0IRZ5BNF zWU^@D)F~<#FNT&!Uh?8Z)EfWx?Sz;(4wZM`P4*huEY`QyqjFhPJ`}^6CSU?&V}Cc= zcG&HTMOv3FnR*l_ z857AEsJfR_K|(-zUTC2Rxy6ecTx<^xCePxARKIeC@oU#GL@?rmO9b&e+<|`Fe_coj zn2Q%7RtCwKsEk3njU@z<5Qw0w)qe&8+V?}(&p2uu8jaQj!^3!Ajv$5*WHQq^5(J_3 z*@!@(8wprZB5B(O5$qc`(7ult1^`w^2lbwwxlcRKBN!hi7#+nxBiRgrX<~MECLqBV zw~&kxdB8+@L1PleA<$731f>#F=g&`P^7ifcwjEZ8Z9}a_FgAvF{W@N6FMq-CFe(VZ zFu+i-c{ABX(_wVae}8?=hC)mO!%&T_I1_~+s8;dIWr9+P z+lLNO>+erqwCasFP+PX(JAV#JYlN_aDhNYiDD1X2+Wv5u!pc?2zUrZa5Cn*!A`wi( z2xA`;umI)zXxD{Ef>MdTJ$umgdbrTCSay@PIl{D;5d%{D>u|&(gYi zO9Ea$`8Vt%e*`6wC=i9I6mg20u?K?4qO?qX@(F#_fT(0{h$I9O56FFF;@B~IH*KPJ@nQpjwP+D7 z8#Yi_v!)T;bE&@dYbJlZ6Ybd1&t3^X(GhPdX$(QJr3F%;N&QB;a_$^`>(+5&*DlH* zewc(MJ^WikRNndxcYii*q_qFFFr3jFB?gc4#>!zve^N|98zMuw_V#ahV`H<3#B=R= z-0SY9+}%yavdDFGkZo^AY#Tj%o8azU#4?d=*zp<~8GzQ|OlvB>sXv9G*aOa=CMS=7 zb@}qZEEF0x%6;bAaj5t9VxK%o{mdEs;gM;i7%0A>b#y-zS%3Nn7p~qsdlCi#Z2-YP zU~)sX)c(z`uC;D+3)Jfv*(_!*hmp(8(y^#WOFoYj@{Ky5M{>DP@;TIl?HDW9(0BU6 z=+CZP|M@7K2i({&3;5d0&H3FwT($ChiGv`tIkiRt9q9mxEEgSF9E3U$ z!BYxf33u;~mw!+8T0rR8k{9g?Xlz{=@DsYdm@@M@G z7sAeL&GGEN9UkCBIvM{4I#)Dj^Bs9b0000bbVXQnWMOn=I%9HWVRU5xGB7bTEif@H zF*#H*HaasoIx{dUFflqXFvZE5>;M1&C3HntbYx+4WidK!Z)9m^c>ppnF*GeOF)cAU iR53L=G&MRfH7hVNIxsNi?vvL500008d1W- zf(S|_+E(c&6+{%p)0!8UWZj{}&)|wi2-%GWLo#ivZwSVb;vH zlK*bRhiu;r0GXZufae0hG-bgT0C1QK0535BSX&MNt|{Newr#LHf@};Hg=ak6W27j7 z%F}}b<>)ABJ0+zMp3xMq?&wS=JKC?_B{e>pj*bp9rByB$8a}6*q)JA3TG^?B{Q?jE z8xIKDkkd|Mux;bcaS)0!e`K?QTM@DSpRx$i_a*B$ohPEBqGD<1= z(wsfrYVK404hxcZXUz=%*|kg_s=0?mM{m{h=b|`bkdaF1ONydK5>H3G7xU{9FsG8l zDRl?jFuF=bNu?aTX)myoBsF*LkeaqOvZYH+wzStxbZ|Z)d-huS5 z*@>SN#9gPM_yK=iw|fd?U-)9wtFT`F`X#IsNW@bnJ>A9q8giyS0t&XbF-qB>y?nNyd=$G)* z_*qgT+xz`-g0pY+gFwYo)b`l^B;-MGFcJ{^d;7%5t6h2PI^xjd0Pjkjb(Fd5ydCV` zx2%Z~y7UxTeOs2~Dg@##5lU%b#q=?8eN+ZlnoXV7t4nslavvWopOTntLLKF>rAcC4 z@85fh-%c{W)|ZxvGj8v5R0+h`TjPwHWV9-tPn*V;sg$t-PR8S04nFViBaPVWO){zU zF)`l&i`|3(??T(JPTZzTesdo1q?sSi>bu@u5z-|*9xPDrJpNiN7;Gb7Z#e$6CnM}PyAdVR%72|NF#Pe#btst>wZvJYZ{4* zT;*hXZT43+p6lb7DN`4q*{Qn~*{MkgyHb;Y4GqOlIn1J8attm7dxKz&MDnYG*P$qI;e*4U3Tn;%f%V^3&QccVUFaFjJss((hhRLf@H>u9rI8e z?JutAmlOF_`tBf%ZDM|S(kF!^n9(pBA?-c@E2f4D-E_end7g~&xGdCUAVFx0;wQAL zxj%eMq5g%O18ZY%V^i-89`ws6m(b@dTJ9QljUxnzApF#^2)E~nigBeMm(R=1R$abg z>l=zSQFY()SC7}xf*4P}5;qLya>|7jqQ3yR+5PesUe?1KwvIM58mz2Z2fB2-awLLG z27K%cET21oF1Evg92t;5%fo{kMWnVe;0?w4%Ga+C&?U;uwux~=JhU?GSBKB!8coPH zJ2-c^n`5TkQ)|1cIOf|&)DxR`SBktBGWM)Bc^HFC_v#qs4_+v^j6U7VAZ zHR@8$8jzz^)L!6Brs7tD{@I4ot-_!RQ6YWWDX-Zu{mhPDjWDCluI0YSn3m~pvrx?l zJtP-?(t)2obB3_;c385kLUbDGpv&cz0N6?^Xmr%$|$NRmsBL4zJgEC*UrWRhvIo zjk^JdrUYR$tF=diwmO{JC_E3!kfqfD;7=^fKS%F=Ym=187KZjb9Je3RR_SKlrQL@k zGe%r)H_+GHy4EGcgEAm$9%Cm>&ULH@ z-8yOE>h>&d980eX1C3kbJVhi5MJhYlCZ^J<~B*CxgN+(tb`P#G)OgHXiTWAH3oh#GK72n22A6rzewvba1{f{XllX~8rlEPVC8i9JwsXk%V@FaHcBD$*odiAB; zO&eJ(2;y);yF`UMe=pNhx4$j+VV?8~3$*%2UNs&IMTW$B(Q-|WA&Z5;g$5SU-*UF% z+&5<$f>77tE0Zu>8{=1p&#qJ?F?~Xi-MbN_@_Wmt`<<2o(OJXxbUODWf^TCadlL04 zLgq%9l{4>U`rf}@sX3gA0sMm5>PIUS=g$6#G8^yeN{heu{d!168f=i(+E`-FSsezQ zjzMFu{LhbzpZp5D3a)3-tADZHssP~8{gq9PPi|(V<|Ul>di6z3u1Gv z+4MmVZA#=4L%NF}A4-D4emH4Z<6FT97nVKhN9I6wol1Za!xijYCUBIhCZFC)Dc`}>N&*%6bzD*}wk zj!B-k7z~J6iN&={%?uYwQv{L^<`*MX8B6iA sroq;bmy}0b@iFCvDcAcv7yuz)?_z;J>o?yy7C#MaT)!pwY9N;Lf6Y`#M*si- diff --git a/companion/src/themes/classic/32/information.png b/companion/src/themes/classic/32/information.png index 48bf9f6f38c404d86774de95515513c97609bafb..47fa8f3fef8f819494b0a14e0bc8dbdb70aec8fd 100644 GIT binary patch delta 2167 zcmV--2#EKt4ucVpBYyw{XF*Lt006O%3;baP00001b5ch_0Itp)=>Px#AY({UO#lFT zCIA3{ga82g0001h=l}q9FaQARU;qF*m;eA5aGbhPJOBUy24YJ`L;(K){{a7>y{D4^ z000SaNLh0L01FZT01FZU(%pXi000LvNkl7u=U(4y``+to4A@{W z_!@)5<^ly06;WuzmJ%o+(WY%m3aD*_)Tp8lZB#X?g!0lwO4q!Uw4`|`DWNPOs00LU z0-->|CcxOn*k&|8LF={J%fe$C*>Q zaC=2~%-mS0xPQ15G>JrFFy3*ZedyG;y8!RMLSX#b_iJLY*v6^Vq0dhqS2(?@ydW4U zG}9A~=60_X&A03;msB^cqwC%E&HoVs zESlb(fRuo?dl2+NNf3g56D$KfG7O{3On)COf^g7c*BOnH22gw8N*G8&_kbp0Yovn4 z4ydn<)CDK58}HuO(+}t@fk@@2W7T51)aiV?ZXsYz^Cy6^QtXkqs`pw zJoi5D7=4#TM-eNZKY-rGL^g zOPwn|4_domLK#^Cf4!o)-j&uHZCs+$z!?{5O<&w1TH_-WDU0@-oN@%T)>xK>BOsYF z*%&~bb3)dFnmH3qp?Vt5Tr&f_`v6UCWQb&(WA+qnWt@;D5FhFvO4uHSK0mgTlP()T z=Q68|LPe>W*V3u!?9&wZ^T+G^h<|tj-Zy7c4D z%dN@ADPzD>IvX%UBojyo&AdrD@1D4-(Vor&%#D@G5LXI3shL%6aq(KbNq=@6>IT$< z8<9NMaOaQ(RE@|Lp~)znm4eX`i&(i)psice-lg$d22`erE19Q&s}YW3a)lxgusD68 z^%#&GZYT7b&mVgI(1(um^lY=MW#lwOKnl(L+T73SWTU2b3@oX)5Q1#BQfQ>>AyN`y z3z9>EuPqDk&S}SKIPuyaAAd%GzEj_A-1%Z4(xcZxGfSrl);P2SGJ0LEqk&B*rVO3G& z#8piqm8oJ=$rH;h>Z=Wj!6f|f4S^IIB|Ma?P(qZW1Th|pw=G0oWcSt(AB~D5qMH)~jTt{Ii71EJRkNMfQCCV3{itv-& zLw8>J#c#LVKJxV=z_53QM;*(Hizj_~(!7=5e{sXA+ApkrqJOB+aWv-|1y@=nJ-rg` zX-19kF+Enm+!;YaAwLIB+0Kr)TXvn<`@Nspw+`M)XFlwO<=?rO6adl4^lwd__NlLa z>517jPtK_;nNl-05DXU?6D4eqwl3kGYZ_`kd9L+n!}0CA6OG%i1NVT$zY6|Qu4Vxs z0)+jQ%f^PQSAUNSm5eSyYm$R^4KcM-fZ0c^w7d#q zua9&${GUJn0I1M%HoemVP5=M^7IZ~ebVG7wVRUJ4ZXi@?ZDjy4F)uPRFEBY}siNIx{dUFflqXFvZE5>;M1& zC3HntbYx+4WjbwdWNBu305UK!G%YYOEipM%F*Q0gH99agD=;xSFfiuslh*(M02p*d tSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjaPtA5H)O002ovPDHLkV1lcS_Nf2> delta 1824 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 delta 2535 zcmVeSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{ z00~@4L_t(&-tC!dP*mp`$A4$9u)DC_7C}S>0ga-Qsks<4L1U&-OqwPdtLe1nGL5!2 z+G#pTC($O8PBKZ%bjC(&J37_af0=ev%ykklv13J|MiE8ux*#CnvVgF_-p=lx_ndw} zX^5bUU?!RRd_3oU&-4F3xAQ#j3%BH!{C|t|Z7bYVRIF_;Ddl8sL*KJ`_f6*?Z@egd zX9;{0v^8FkHB}}qIYeu{o#q-HVOe74?UVWF-B+dW1c5c{w`nD19;m4>v2|Ca8_7`Ohmewpc5PsvZe+ZlN-irSFXGNMu-fXz}l@lwH+nV$uv!%o%)EyP2f)Ag(&=Rcj5yQDlw*lRgH!Ihk2m z3wdPHGFp9&>}%LXwY!X<;vW*|{M38NPo2qR$4shP%J{PJed>Eoe-oDVsH$baeTLy$ zORqB!ACrtC!gK~&k^_U#l+5h$k262-X=*MV#~1Fw)l(<8C5k8`fgYR!XkiA_E1!O41mlGE7K;Y zqpH1RdKKvD2)J;2>wCRqjOXLC8;7JvMD&Bc(+xKVd?62qf2&SY(-frSu#dO4R#0~Q z6uwXwKDh&L$U{g8u5{Re~6g7gTsc1&QgxfSSCs+xFBA8-=_(MU`M*mVKqod z4M*((e^p3CWaIEW@bwAn(DAb@DV)W#3kzwg-9!4mJ4kQ4z=kmvb~cS+$L2hYX``8b z*91(~4k}O9qMQvgDl>+REZb#J5mIa!QHGBZRn^@Xfu*b0YP-uS*i=+Ze$IGacRO`w6)TH z-iJNTKv)f6(#1waAkbrpYTZ=?QVSMqr)nBmQaFnjo?b*_OBH*kt^s2v_}U~U8anu`y&X8hrx)_DwJztUk37c-cNyo}4igl?sFODu>kml4 ze{QpKbjNxC4pyG#snvgC%IJDltkNMm^@tWhvO9oW1s;=xIZ-3lE@6t*F?M1sA)kb+ z&CJr}FOfFwDS{CnRjmhT>*&Ou5EG^Ktx+esVW3Itip;!yGUeOfWyc4v0j21Z1bUkR zeY!^HMF_eh^fX7H8RD%H_GA;5iL03Kf6&WFrUXiy?@?M`L`P>2s;tLqzkbn^{ibX7 zK2ha>P!$w4f~pB(V)ZP0axKA@*#zre!7QHuAjx4S$zh_iJxsGp!DBDLG4DO}3FA4^ zw40Ket$nSsEDL;|AoeuFbt_M_v42eh!H5@CQ;DcyRMA`Z;vM&slzx<8OEJN!e^*gG z)x9AXmrcroHAvY%qqd`xkM{p!zzIyKDneBdLJZy<_E@5h{c92^`LcqBCJzpWnFnT0 zMAZcTa2E!hiR6?5lIE5ZzOWNXZpAopB^SGEdH>*VIPW=eJY`-d=6UTASs zRog*)S2`aa`hvo{)0lnNScIz3e;IUPk8v<2a{*m)J0Bi+o$9WCM?ahl-~m-g_&jlg z?y0NNl9L}9@<&!T?apFKV_R(2<)gCH*_ffZw>bFQv~L*)&4x;udsLQ0^oE%tVYqXOPH zf(Cs9f{%ou>8!r*s68{ye?i604N@Dhta!`NlK9ioO6J^?jnD+>1-UsE#*WX%?^iGy zb;u&nuPIZ7gull!U=jv>aOSW9o87@(^L#XVPxk}geM#bCjh;&`iLfk@pEI6iiwap% zI9s}*DwLlyp1*9a;OMaymMqL8A<@v+&ms&f)&qqY$b< z)f7}sML{qpdkMQv{h5Dl-^+yj+^>y*y`fN7t?zd5qVAm%H$;{3Kpz*AZhEw`$UQTQ( zD%OBOlXArG$Tk%fYwv8`MYqpS{!|-tAF^Xl)G;^rDYl*XBW0z{#F*1KQEKRye0)oC z-LC11rLK&U&KfT>?zM8K!-Ly%iKa7lx>}9bEqC7;d34olJz8qPVr})hEm~^9VlA~` xv9@OYHjVF_tX{W8TlMC~?;r46a!dNle*t$1#004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00006VoOIv0RI600RN!9r;`8x z010qNS#tmY07w7;07w8v$!k6U00qlQL_t(o!|jz_h@58?$A5q4dEa+F_M_9ZwU|n( zsj;Disz?h`g$Bi<7cqi@(hH&Dg&T;{quKi;3V#bk1_=WQU6nu}Fo-c=#HE0Utp18Bs(@9nidqY)MH59+3rUJ57WygL zPf5G|YP;EdxcmCJH=PhemQU9i(s-W(S z4oK+=!P!#0>BoED{6QD~5NfTQB^L(smA>mVG>EZ7U4N@1WCTRP2!c8?7ZLC(c<^CB zO%<#~Q>RF|VId=TJZ z1V}CdAb-?S9cz^(8(>Tb3ZelJAQB+rtPmL*z>6_g_$Yt`U=&qF)uJ{eE1)v=OYU?k*D>r=Yi|uBx#oT%WT@kthJp*0iYR|CxY^V-02D-Q!16_5sqtHnp zwtvv>B$SWM(4BgIe}C%PLqIWb)cdg}OQ&Syj$OeuBcqv{#$5N2&v2a_DCDaccgA>| z-0ThZgVr1KbY~|{w2uB_A8Jnny}+wywRNr{;~!sAyY(BntpyW~dn>XKL|`H?9@wlQ zVgi>d)_MB|mWYA)Y>oK*{6hWEeGh79>3>zAj^{gwe!6h%eE6xIn=~%mF}l5gM1nC8 zFlNmhRa-}X^t+_7_*(O1 z1>@yMAjr5hSzrBm@OkjvfG9esmiBb4ozpKo7r*|@Vc>$(#YM1&fRe^d8!t_STYtXt zt*DUAXRePBGX#1W1PukQcuBd9&)XO#5_0N8YKvK(&SUSsUG zd-9*im@x15F3b;+@UyT2?xnYVcioDC&VmxpmFLR)c0Fht<>Le2hr@9BXx9$@~qayUTyR|FNWa=08An&E@^R1QfJf+5i1L zz2(Y8YZk-;cq{V>cm>#ua*En+JBomUd(L! zY*z|9zB;lQ3A2y@H-<1KkQZpA(DM7uY2XCciXd&3&0A@ ztGiKh0hk1uGpe;0pM0wM&wqpe0Or>7eIpjEkVuzHb)xL~@Rl#_y0#ER*W?_D5Qr2O z-iG=c$6k8xf$#htIEDLfx?)@{0f4mg*30wx+wZh?)AqYJZ$idG$Ov3G56d(2Gt)o2 zXOC?+P5_M!{O*QABs+4`w!cgs{=%E8yJl6t{I=?je>a=sJ9qya*nh&++4_ML@H+I{ zozo}Y%75<8?UjXcqrFrrmY;q6K=sg*e+Q<4bVD6|KqYd(r-6_8&n4h2@3Zg!YXSrH z26EetcK)G>{{mx^+v?yFikbib03~!qSaf7zbY(hYa%Ew3WdJfTF*GeOF)cAUR53O> zGdVglFe@-IIxsNB$v>Lx0000bbVXQnWMOn=I&E)cX=Zrr=WB>pF delta 764 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 NLJ?unBz7qE+P_70V0Qoj delta 470 zcmV;{0V)2K3FQNj8Gi-<0047(dh`GQ0jxf|(3O}S` zmliX)i8ytuOMfrn;OGm8FW^h`0otJy9ejlj&JJRS3I?1S2M?lNhY|@Ig`YKXs2>P~ z@9 zZZsPAz#l+(+w*erlb-sKNF<0xqvZ2>qgX6H*X#8=Ai7Cn?*j3794RHqWD?UfjZ&%f z!Sw_2^fXqxs<2=T6z za@@LsBoK?m7=Mq)42MGog8@=Xvf1oSrBZnX;z9_`ts6)Jxm<4fKAB9IPNz7IgJoH_ zKnj@hy*z_Sz>8rRq*5u;=`^-&1DpfP1OgZEVp*2k=5jTJDj=m?D+^V?kE6g*VCzQY zcUIUHcY9vt;0YXDAe1546hDNNz_yMYJb}^up#eHe;>uCE>A_l~c? zXf&ePY_eD^0v8Z|<1B=@0Iq<`0NVTnJ^*{0fCil5IX>?Z2hY9W3xeO(zHR1xlK=n! M07*qoM6N<$f`w|=ivR!s diff --git a/companion/src/themes/classic/32/paste.png b/companion/src/themes/classic/32/paste.png index d5c13a9b6fdee054eb4a6b313c81880b95cb3836..17c82102ac55ee79d5f6622c670b19bad730c7dd 100644 GIT binary patch delta 1912 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 diff --git a/companion/src/themes/classic/32/stop.png b/companion/src/themes/classic/32/stop.png index c055e548c2c56b87424f64b899a982ccc93ebe53..a0338d13986570ac6b9e666882f45b60ac469e73 100644 GIT binary patch literal 319 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyacIC_6YK2V5m}KU}$JzVE6?TYIwoGP-?)y@G60U!DFJ+aAEb1$+3%}_0IjVMV; zEJ?LWE=mPb3`PcqCb|ZOx`vh^hGtgAmR80F+6IPJ1_nn@&U%BQAvZrIGp!OugQ=B? asg;2#M8mUpldl6cFnGH9xvX}rD8Gi-<0047(dh`GQ1CL2WK~z|U&6mB7BsCO;zjN&tKSB_YAR-c8 zg9ji*BH%?fTM4p#1wsNM9)@J4k&wt(&@RJjhV9wusj^MrTUB=TPZ6*ytgbHGRq{Fa z+#kDCN?~e}c-zh1I^zG0Kx_w}fBD0=m_3#ZB#;nV`hEx1-+$b9*ZE!k-2av)k%#@0 ztDnC94!8$$M*y?O-+c82aTh2>lme+h&V`gAXBaaizs3Y97sdobs^c*gh7pDla)DqF z0)!w`5?5DG9|7M3e*kx}Cuqc7;OVb>05U*U7PZyPQ7Fwq!9ZpJJ3RhQ5a0;Bv;e32n&31~w`Z{4XWeouq1a?6IN#u!u+zk!5RzTByE`KnLg$xX1_Ij~a334fD%LQYu z_ceHH(U{=%L*nj`8B(ngGGSIFmN{7oc?3%0ekhlN5E>Vpu>5vEvOi?*?lTI)%rFxc z9NZRgdF5P+rHIj{G(4|B$~1vj4ZnGnxV{}o83(j#u>()wJ&A?L6en@Fkp&W@v>+cI z3cvq(;D2E(idEL_!~sW`?Y0#}vpR+C~;g zygrnrpqS=G*1&V$!NZD#CiQGlAx3Rv0d+rL(tl@)W_N>nB9qULl;~7&637*}lm&<( z(d03+d~J@eU9ygaFq5#FHNHlTfr~DvRj$q9j>JSnCtMQLfEyNTzYWMu1)$dTd4o|; zW_F1QYYBBh*%Jw2AshZp3y0;l~DnMO{5H|J#08{3(Pd{Q8Mch@{Vysnc z=i}hxxHErV-w8e!qKLr=I|q&xd>BhDOy>yXVgKai^Iskz-!|o?bJee|FdzH8%&VTy z%L7jSzSa3x&wl<981PfSRv)MD1D{aO?KZo$I{#4{fNT82WKF<;cY$|!bKi{_IN+aV fYXWZw^L+aUqDlu|chpCu00000NkvXXu0mjfu#3A+ diff --git a/companion/src/themes/classic/32/wizard.png b/companion/src/themes/classic/32/wizard.png index 4ec873ee94af0cb3bcebc9e7f0d5557bd9f2c559..ff51614989f2c50d48b175eceddce1c9a753b391 100644 GIT binary patch literal 2195 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 delta 1909 zcmV-*2a5QU5rYqqBYy`Zdu&w46~@1F@80#U7ce$9egHNg0tAR#5en4d zQDXCms7fJVC6q`JDy5G!RaKyEL?2QgL5|c&Nr=>@5lSI}q)q}9B`B#|h0xkOOzRli zH~|ytfHB_p?tR}or+@5TgTb%~aHP@h%u4h9=FE3yW(l_$Q-3N5+twFh`By_!Q6k^x zx=#DrpZD>*#~lbJ6crU=&z?P)IC0`+BHEfxr;S)F_S>eWrbt6W1B4I&04bLc0gwnF z8aiGvhOlmdG-FJ@^eab8yl<;w?yfE4=-bN_`27lY?AU>-s;W{VYSJ|AJMnn@NnO_) zDl038%;dYJIDY}F7s{A5$%nMgc;PJzwww9Qv>0YWKWDq)jbJW@GV%cAz=MS&q|R+y zx1gq`CQp*2Hw?q5j7FoBOeR?fQNheZG;RqX5wLATF}^&#=s_0v=e<>*@vHBt5Q5Rt z#YjhlUq)V-Z3B=}zfQB!Rd(-cEPG@Na)%$lG`WG7#SZ%pH(%c`D#bg39^>9LQ>9`3`Zm+jO@zkC1aAc}}++Gw%~ZY}mVZ zFCRE?U?eXH<@X<51O#WAaDn{c@xX>il-qZRGY&RhmIFNO}FUod`lC=T@QNAmLb12pI4F7nIR`K-*@@e5L$+RsOvc$L?%_i_>06@l! zn->8-8R!WEhfim=2LOtTOR%oKo@7~Ge}Cb^g;!czTP0OhK}1|wSorM2YreU)w(y!*vwPl4o_%7cfZ!YegM^exiI=)iD1`d@dW1ruxsgcZAI;6p z`H4irOWa`qtAuMi-OstcywIqpiPi73n+|~d%#dnd|Iqy42QM-N=QxPG8L!^C zeED(&gTV?_RU1#7IN^zdnY#gOux;BhbQPARIIcd>1y}e15Xr1M!u?ls+tmqk-UUOl zL4+ksmY}q>G~hT+P! z(BAf`3*C14LgZ>vb9%sw@#Dv1<;s=B%v(A;J9nHpbB0{k%`Tp|G4mf(Rb|It?Y}9p~O@Gt;yz3c^ zoE}gV1+}%cAfoBvaCpz@)2BUgFmnrl@0q4~TjDtZhzN@pFGesJEYx-V?Ng^tjn;MD z6YmAE&T$;W8@sCjM1<<gXm4*{7L7(dzX$-En1A`Cs;W2KZg&Nsu&@xbXU`_baUMT^{``;n`uaR^X66O} z`!r4CY!%#5+)xF9KmfJ1web7>4-5A!Y&cYESs<_-XlS(bIz#BTtouCB(25hL<#+kUgXy??#TJ5-oCjLb2c z%se#iUJL?Em@on5<>e%Vc)6paW42e<%xnW#FN8REr;Z;k22B_Wglw+OGNa!Z_aEueDxJ7vW>k@!!U5=$`#P=-Md2orZMw)(=;a>KYn}zfWVwNb6SGI zAZ1e?B%)Eslx?m(;A~3*@XlxzKqA|ZF!KO_ivYTPL{tD^A#Q*ffk2>Q(V|5*fM9kk zkBIWF6V5}%yw`(xt23|ZbGB~+u(MD}BDw^i6ToF3fJ*>g%nAhn_yOc+MFLqEPmBN* v08nnSdON#P&v~3(wULF>09e_+3Bdk8HWKxI9)f8A00000NkvXXu0mjf2OgTH diff --git a/companion/src/themes/classic/48/add.png b/companion/src/themes/classic/48/add.png index 31e4124cd7b164b37adb7697e459c62bd0ea36c1..fe8a280971144a554696ce7239244399ef55bf1d 100644 GIT binary patch delta 1803 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 diff --git a/companion/src/themes/classic/48/apppreferences.png b/companion/src/themes/classic/48/apppreferences.png index 8a94b21f816e5e4c7639162b281b43f0ae35a67e..713e2cbeb5845edaa2a1b90759a36d9cd215fd77 100644 GIT binary patch delta 3855 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 Rlh*(M002ovPDHLkV1l8aCJO)n delta 4252 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 TeIto-00000NkvXXu0mjf>lbY> diff --git a/companion/src/themes/classic/48/copy.png b/companion/src/themes/classic/48/copy.png index 91f0647e736f23063e1011c1fd9bf49b783adfc7..9bc5c654c05aac68b8b962fe271507439aa0df46 100644 GIT binary patch delta 2627 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 delta 876 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 delta 3231 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 Vzr(zFGVTBX002ovPDHLkV1h#VuYdpm diff --git a/companion/src/themes/classic/48/exit.png b/companion/src/themes/classic/48/exit.png index cd779a40263c66f139876c84986ececbf5564938..159dccb93163e25c6ec5036cf037e411eedca1f1 100644 GIT binary patch delta 3445 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 diff --git a/companion/src/themes/classic/48/library.png b/companion/src/themes/classic/48/library.png index 59122cf0e5640c30c31fd172a90a4a938daa5665..df4cf1e0c6119819ae2739df8a70c2c786a88004 100644 GIT binary patch literal 4055 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 O$lUm%QKg|v^nU^S6n|j= delta 1948 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 delta 587 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 delta 1351 zcmV-N1-Sa98rcevBYy=TNklFNx!qMGqtlVaO`HrN)9Q@LyA1D+G%+Aibb~Z9H!j&sm zcx~`Li$7ijjHU=OhBhkRXtQ7HqWO1=)OCHnjONhA_XPEI!L zu)n{b5ceJJ0kX??(DxrK}3e$$w;$yLaz4?J${4QvBtHvo9eq zD#hAmV6X~sA&(He{?r2Z{#v9^C{ieFQ7mq;wN;|DRiacXQ!ZC1mn#^RinOZPnFh#Q zDL_fyEIE+qm6kBEJ(X_XhBO~?U%`sd)Wxa+g=Bk)tfO5`gnW;pZZL4SfP;MP&aCs# zV{f!P;D6GuMUGFLE!fD8h6hVRsAD6@*Ze4+^@j6NyBK$K!+JUD!o9Cx0xA?HR)ALU#92=0hr1dw6gW;1nVpZlo6Q z?N7f4LhQsdeV*!BW5AL&R6i^ks3V=;`M^QJ_C#h#^J*2+&ScIHEG{IJOQhQ#@Mwsz z#eiYCwFEGD+Q=Sm45)(Gkyc38J_Zg7?iO%}um