From be26ba46528810a630961ca6ec19d0aad8d233af Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Thu, 23 Jul 2009 00:19:36 +0000 Subject: [PATCH] Surgically remove Automation 3. Going to break UNIX build and Windows buildbot for now. Originally committed to SVN as r3196. --- .../automation/auto3/line-per-syllable.auto3 | 158 - aegisub/automation/auto3/multi-template.auto3 | 171 - .../automation/auto3/simple-k-replacer.auto3 | 147 - aegisub/automation/automation3.txt | 548 -- aegisub/automation/demos/auto3/1-minimal.lua | 33 - .../automation/demos/auto3/10-furigana.ass | 23 - .../automation/demos/auto3/10-furigana.lua | 65 - aegisub/automation/demos/auto3/2-dump.lua | 63 - aegisub/automation/demos/auto3/3-include.lua | 25 - .../automation/demos/auto3/4-text_extents.lua | 56 - .../demos/auto3/5-configuration.lua | 96 - .../demos/auto3/6-simple-effect.lua | 89 - .../demos/auto3/7-advanced-effect.lua | 201 - aegisub/automation/demos/auto3/8-skeleton.lua | 26 - .../demos/auto3/9-advanced-skeleton.lua | 49 - aegisub/automation/demos/auto3/readme.txt | 22 - aegisub/automation/include/karaskel-adv.auto3 | 74 - aegisub/automation/include/karaskel-adv.lua | 39 - .../automation/include/karaskel-base.auto3 | 438 -- aegisub/automation/include/karaskel-base.lua | 39 - aegisub/automation/include/karaskel.auto3 | 134 - aegisub/automation/include/karaskel.lua | 8 +- aegisub/automation/include/utils.auto3 | 233 - aegisub/automation/include/utils.lua | 8 +- .../automation/tests/test-auto3-parsing.auto3 | 10 - .../aegisub_vs2008/aegisub_vs2008.vcproj | 12 +- aegisub/packages/win_installer/aegisub2.iss | 14 - aegisub/src/auto4_auto3.cpp | 760 --- aegisub/src/auto4_auto3.h | 171 - aegisub/src/auto4_auto3_factory.h | 57 - aegisub/src/config/config_windows0.h | 5 - aegisub/src/plugin_manager.cpp | 3 - aegisub/src/plugin_manager.h | 3 - contrib/lua50/COPYRIGHT | 34 - contrib/lua50/DIFFS | 294 -- contrib/lua50/HISTORY | 159 - contrib/lua50/README | 44 - contrib/lua50/README.Aegisub | 17 - contrib/lua50/UPDATE | 23 - contrib/lua50/doc/contents.html | 123 - contrib/lua50/doc/logo.gif | Bin 4232 -> 0 bytes contrib/lua50/doc/manual.html | 4612 ----------------- contrib/lua50/doc/readme.html | 35 - contrib/lua50/include/lauxlib.h | 145 - contrib/lua50/include/lua.h | 391 -- contrib/lua50/include/lualib.h | 56 - contrib/lua50/includedirs.vsprops | 12 - contrib/lua50/lua50_vc9.vcproj | 487 -- contrib/lua50/src/lapi.c | 922 ---- contrib/lua50/src/lapi.h | 16 - contrib/lua50/src/lcode.c | 718 --- contrib/lua50/src/lcode.h | 74 - contrib/lua50/src/ldebug.c | 585 --- contrib/lua50/src/ldebug.h | 31 - contrib/lua50/src/ldo.c | 471 -- contrib/lua50/src/ldo.h | 60 - contrib/lua50/src/ldump.c | 170 - contrib/lua50/src/lfunc.c | 127 - contrib/lua50/src/lfunc.h | 32 - contrib/lua50/src/lgc.c | 505 -- contrib/lua50/src/lgc.h | 25 - contrib/lua50/src/lib/lauxlib.c | 591 --- contrib/lua50/src/lib/lbaselib.c | 677 --- contrib/lua50/src/lib/ldblib.c | 299 -- contrib/lua50/src/lib/liolib.c | 762 --- contrib/lua50/src/lib/lmathlib.c | 246 - contrib/lua50/src/lib/loadlib.c | 205 - contrib/lua50/src/lib/lstrlib.c | 770 --- contrib/lua50/src/lib/ltablib.c | 250 - contrib/lua50/src/llex.c | 417 -- contrib/lua50/src/llex.h | 75 - contrib/lua50/src/llimits.h | 185 - contrib/lua50/src/lmem.c | 91 - contrib/lua50/src/lmem.h | 44 - contrib/lua50/src/lobject.c | 195 - contrib/lua50/src/lobject.h | 336 -- contrib/lua50/src/lopcodes.c | 102 - contrib/lua50/src/lopcodes.h | 238 - contrib/lua50/src/lparser.c | 1333 ----- contrib/lua50/src/lparser.h | 71 - contrib/lua50/src/lstate.c | 220 - contrib/lua50/src/lstate.h | 195 - contrib/lua50/src/lstring.c | 102 - contrib/lua50/src/lstring.h | 33 - contrib/lua50/src/ltable.c | 509 -- contrib/lua50/src/ltable.h | 31 - contrib/lua50/src/ltests.c | 852 --- contrib/lua50/src/ltm.c | 70 - contrib/lua50/src/ltm.h | 51 - contrib/lua50/src/lundump.c | 286 - contrib/lua50/src/lundump.h | 34 - contrib/lua50/src/lvm.c | 781 --- contrib/lua50/src/lvm.h | 35 - contrib/lua50/src/lzio.c | 81 - contrib/lua50/src/lzio.h | 64 - 95 files changed, 4 insertions(+), 24175 deletions(-) delete mode 100644 aegisub/automation/auto3/line-per-syllable.auto3 delete mode 100644 aegisub/automation/auto3/multi-template.auto3 delete mode 100644 aegisub/automation/auto3/simple-k-replacer.auto3 delete mode 100644 aegisub/automation/automation3.txt delete mode 100644 aegisub/automation/demos/auto3/1-minimal.lua delete mode 100644 aegisub/automation/demos/auto3/10-furigana.ass delete mode 100644 aegisub/automation/demos/auto3/10-furigana.lua delete mode 100644 aegisub/automation/demos/auto3/2-dump.lua delete mode 100644 aegisub/automation/demos/auto3/3-include.lua delete mode 100644 aegisub/automation/demos/auto3/4-text_extents.lua delete mode 100644 aegisub/automation/demos/auto3/5-configuration.lua delete mode 100644 aegisub/automation/demos/auto3/6-simple-effect.lua delete mode 100644 aegisub/automation/demos/auto3/7-advanced-effect.lua delete mode 100644 aegisub/automation/demos/auto3/8-skeleton.lua delete mode 100644 aegisub/automation/demos/auto3/9-advanced-skeleton.lua delete mode 100644 aegisub/automation/demos/auto3/readme.txt delete mode 100644 aegisub/automation/include/karaskel-adv.auto3 delete mode 100644 aegisub/automation/include/karaskel-adv.lua delete mode 100644 aegisub/automation/include/karaskel-base.auto3 delete mode 100644 aegisub/automation/include/karaskel-base.lua delete mode 100644 aegisub/automation/include/karaskel.auto3 delete mode 100644 aegisub/automation/include/utils.auto3 delete mode 100644 aegisub/automation/tests/test-auto3-parsing.auto3 delete mode 100644 aegisub/src/auto4_auto3.cpp delete mode 100644 aegisub/src/auto4_auto3.h delete mode 100644 aegisub/src/auto4_auto3_factory.h delete mode 100644 contrib/lua50/COPYRIGHT delete mode 100644 contrib/lua50/DIFFS delete mode 100644 contrib/lua50/HISTORY delete mode 100644 contrib/lua50/README delete mode 100644 contrib/lua50/README.Aegisub delete mode 100644 contrib/lua50/UPDATE delete mode 100644 contrib/lua50/doc/contents.html delete mode 100644 contrib/lua50/doc/logo.gif delete mode 100644 contrib/lua50/doc/manual.html delete mode 100644 contrib/lua50/doc/readme.html delete mode 100644 contrib/lua50/include/lauxlib.h delete mode 100644 contrib/lua50/include/lua.h delete mode 100644 contrib/lua50/include/lualib.h delete mode 100644 contrib/lua50/includedirs.vsprops delete mode 100644 contrib/lua50/lua50_vc9.vcproj delete mode 100644 contrib/lua50/src/lapi.c delete mode 100644 contrib/lua50/src/lapi.h delete mode 100644 contrib/lua50/src/lcode.c delete mode 100644 contrib/lua50/src/lcode.h delete mode 100644 contrib/lua50/src/ldebug.c delete mode 100644 contrib/lua50/src/ldebug.h delete mode 100644 contrib/lua50/src/ldo.c delete mode 100644 contrib/lua50/src/ldo.h delete mode 100644 contrib/lua50/src/ldump.c delete mode 100644 contrib/lua50/src/lfunc.c delete mode 100644 contrib/lua50/src/lfunc.h delete mode 100644 contrib/lua50/src/lgc.c delete mode 100644 contrib/lua50/src/lgc.h delete mode 100644 contrib/lua50/src/lib/lauxlib.c delete mode 100644 contrib/lua50/src/lib/lbaselib.c delete mode 100644 contrib/lua50/src/lib/ldblib.c delete mode 100644 contrib/lua50/src/lib/liolib.c delete mode 100644 contrib/lua50/src/lib/lmathlib.c delete mode 100644 contrib/lua50/src/lib/loadlib.c delete mode 100644 contrib/lua50/src/lib/lstrlib.c delete mode 100644 contrib/lua50/src/lib/ltablib.c delete mode 100644 contrib/lua50/src/llex.c delete mode 100644 contrib/lua50/src/llex.h delete mode 100644 contrib/lua50/src/llimits.h delete mode 100644 contrib/lua50/src/lmem.c delete mode 100644 contrib/lua50/src/lmem.h delete mode 100644 contrib/lua50/src/lobject.c delete mode 100644 contrib/lua50/src/lobject.h delete mode 100644 contrib/lua50/src/lopcodes.c delete mode 100644 contrib/lua50/src/lopcodes.h delete mode 100644 contrib/lua50/src/lparser.c delete mode 100644 contrib/lua50/src/lparser.h delete mode 100644 contrib/lua50/src/lstate.c delete mode 100644 contrib/lua50/src/lstate.h delete mode 100644 contrib/lua50/src/lstring.c delete mode 100644 contrib/lua50/src/lstring.h delete mode 100644 contrib/lua50/src/ltable.c delete mode 100644 contrib/lua50/src/ltable.h delete mode 100644 contrib/lua50/src/ltests.c delete mode 100644 contrib/lua50/src/ltm.c delete mode 100644 contrib/lua50/src/ltm.h delete mode 100644 contrib/lua50/src/lundump.c delete mode 100644 contrib/lua50/src/lundump.h delete mode 100644 contrib/lua50/src/lvm.c delete mode 100644 contrib/lua50/src/lvm.h delete mode 100644 contrib/lua50/src/lzio.c delete mode 100644 contrib/lua50/src/lzio.h diff --git a/aegisub/automation/auto3/line-per-syllable.auto3 b/aegisub/automation/auto3/line-per-syllable.auto3 deleted file mode 100644 index 7cc704e63..000000000 --- a/aegisub/automation/auto3/line-per-syllable.auto3 +++ /dev/null @@ -1,158 +0,0 @@ ---[[ - Copyright (c) 2005, Niels Martin Hansen - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of the Aegisub Group nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - ]] - --- Aegisub Automation factory-brewed script --- "Line-per-syllable effects" - --- Use karaskel.lua for skeleton code -include("karaskel-adv.lua") - --- Define the name of the script -name = "Line-per-syllable effects" --- Define a description of the script -description = "Makes line-per-syllable effects, that is, each syllable in the script gets its own line. This allows for more advanced effects, such as syllables moving about separately, or overlapping each other." --- Define the script variables that can be configured graphically --- This is the primary point of the script, being able to configure it graphically -configuration = { - -- First a label to descript what special variables can be used - [1] = { - name = "label1"; - kind = "label"; - label = [[Variable-names are prefixed with $, -expressions are enclosed in % pairs. -Variables: - $START = Start-time of syllable (ms) - $END = End-time of syllable (ms) - $MID = Time midways through the syllable (ms) - $DUR = Duration of syllable (cs) - $X = X-position of syllable (center) - $WIDTH = width of syllable - $HEIGHT = height of syllable - (There is no $Y) -Calculation example: - \t($start,%$start+10,\fscx110\fscy110) - \move($x,40,%$x-$width+10%,40) -Remember you should always have a \pos or \move in your effect.]]; - hint = "" - -- No "default", since a label doesn't have a value - }, - -- Then a text field to input the string to replace \k's with - -- Make the default a "NOP" string - [2] = { - name = "k_repstr"; - kind = "text"; - label = "Effect"; - hint = "The string to place at the start of every syllable line."; - default = "{\\an5\\pos($X,40)\\t($START,$END,\\fry360)}" - }, - -- Allow the user to specify whether to strip tags or not - [3] = { - name = "striptags"; - kind = "bool"; - label = "Strip all tags"; - hint = "Strip all formatting tags apart from the processed karaoke tags?"; - default = false - }, - [4] = { - name = "workstyle"; - kind = "style"; - label = "Line style"; - hint = "Only apply the effect to lines with this style. Empty means apply to all lines."; - default = "" - } -} --- Mandatory values -version, kind= 3, 'basic_ass' - -function do_syllable(meta, styles, config, line, syl) - -- text is the replacement text for the syllable - -- ktext is the karaoke effect string - local text, ktext - - -- Prepare the stripped or unstripped main text - if config.striptags then - text = syl.text_stripped - else - text = syl.text - end - - -- Don't bother with empty syllables - if syl.text == "" or syl.n == 0 then - return { n=0 } - end - - -- Add the variable names to the syllable data - syl["dur"] = syl.duration - syl["start"] = syl.start_time - syl["end"] = syl.end_time - syl["mid"] = syl.start_time + syl.duration*5 - syl["x"] = syl.center + line.centerleft - - -- Prepare the karaoke effect string - ktext = config.k_repstr - - -- Function for replacing the variables - local function var_replacer(varname) - varname = string.lower(varname) - if syl[varname] ~= nil then - return syl[varname] - else - aegisub.output_debug(string.format("Unknown variable name: %s", varname)) - return "$" .. varname - end - end - -- Replace the variables in the ktext - ktext = string.gsub(ktext, "$(%a+)", var_replacer) - - -- Function for evaluating expressions - local function expression_evaluator(expression) - chunk, err = loadstring(string.format("return (%s)", expression)) - if (err) ~= nil then - aegisub.output_debug(string.format("Error parsing expression:\n%s", expression, err)) - return "%" .. expression .. "%" - else - return chunk() - end - end - -- Find and evaluate expressions - ktext = string.gsub(ktext, "%%([^%%]*)%%", expression_evaluator) - - local newline = copy_line(line) - newline.text = ktext .. text - - return { n=1, [1]=newline } -end - -function do_line(meta, styles, config, line) - if config.workstyle == "" or config.workstyle == line.style then - return karaskel.do_line(meta, styles, config, line) - else - return { n=1, [1]=line } - end -end diff --git a/aegisub/automation/auto3/multi-template.auto3 b/aegisub/automation/auto3/multi-template.auto3 deleted file mode 100644 index 678068c88..000000000 --- a/aegisub/automation/auto3/multi-template.auto3 +++ /dev/null @@ -1,171 +0,0 @@ ---[[ - Copyright (c) 2005, Niels Martin Hansen - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of the Aegisub Group nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - ]] - --- Aegisub Automation factory-brewed script --- "Template-based multiple-lines-per-syllable karaoke effects" - --- Use karaskel.lua for skeleton code -include("karaskel-adv.lua") - --- Define the name of the script -name = "Template-based effects" --- Define a description of the script -description = "Makes advanced effects using templates embedded into the subtitle script. Please see the help for information on how to use this script." --- Only one config option here. --- Everything else is defined in the subtitle script -configuration = { - -- Allow the user to specify whether to strip tags or not - [1] = { - name = "striptags"; - kind = "bool"; - label = "Strip all tags"; - hint = "Strip all formatting tags apart from the processed karaoke tags?"; - default = false - }, - [2] = { - name = "skipunknown"; - kind = "bool"; - label = "Remove unknown lines"; - hint = "Removes all lines without a defined template"; - default = false - } -} --- Mandatory values -version, kind= 3, 'basic_ass' - -function do_syllable(meta, styles, config, line, syl) - -- text is the replacement text for the syllable - -- ktext is the karaoke effect string - local text, ktext - - -- Prepare the stripped or unstripped main text - if config.striptags then - text = syl.text_stripped - else - text = syl.text - end - - local result = { n=0 } - - -- Don't bother with empty syllables - if syl.text == "" or syl.n == 0 then - return result - end - - -- Add the variable names to the syllable data - syl["dur"] = syl.duration - syl["start"] = syl.start_time - syl["end"] = syl.end_time - syl["mid"] = syl.start_time + syl.duration*5 - syl["x"] = syl.center + line.centerleft - - -- Prepare the karaoke effect string - for templateid, template in template_data[line.style] do - local ktext = template.text - - -- do_repeat is global on purpose - _G.do_repeat = false - - repeat - -- Function for replacing the variables - local function var_replacer(varname) - varname = string.lower(varname) - if syl[varname] ~= nil then - return syl[varname] - else - aegisub.output_debug(string.format("Unknown variable name: %s", varname)) - return "$" .. varname - end - end - -- Replace the variables in the ktext - ktext = string.gsub(ktext, "$(%a+)", var_replacer) - - local skipline = false - local newline = copy_line(line) - newline.layer = template.layer - A = { meta = meta, styles = styles, line = line, syl = syl, newline = newline } - - -- Function for evaluating expressions - local function expression_evaluator(expression) - if string.find(expression, "return") then - chunk, err = loadstring(expression) - else - chunk, err = loadstring(string.format("return (%s)", expression)) - end - if (err) ~= nil then - aegisub.output_debug(string.format("Error parsing expression:\n%s", expression, err)) - return "%" .. expression .. "%" - else - local result = chunk(meta, styles, line, syl, newline) - if result then - return result - else - skipline = true - return "" - end - end - end - -- Find and evaluate expressions - ktext = string.gsub(ktext, "%%([^%%]*)%%", expression_evaluator) - - newline.text = ktext .. text - if not (kline == "" or skipline) then - table.insert(result, newline) - end - until not do_repeat - end - - return result -end - -function do_line(meta, styles, config, line) - if line.kind == "comment" and line.name == "template" then - if not template_data[line.style] then - template_data[line.style] = {} - end - table.insert(template_data[line.style], line) - return { n=0 } - elseif line.kind == "dialogue" and template_data[line.style] then - return karaskel.do_line(meta, styles, config, line) - elseif not config.skipunknown then - return { n=1, [1]=line } - else - return { n=0 } - end - if config.workstyle == "" or config.workstyle == line.style then - return adv_do_line(meta, styles, config, line) - else - return { n=1, [1]=line } - end -end - -function process_lines(meta, styles, lines, config) - template_data = {} - return karaskel.process_lines(meta, styles, lines, config) -end diff --git a/aegisub/automation/auto3/simple-k-replacer.auto3 b/aegisub/automation/auto3/simple-k-replacer.auto3 deleted file mode 100644 index b62d13078..000000000 --- a/aegisub/automation/auto3/simple-k-replacer.auto3 +++ /dev/null @@ -1,147 +0,0 @@ ---[[ - Copyright (c) 2005, Niels Martin Hansen - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of the Aegisub Group nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - ]] - --- Aegisub Automation factory-brewed script --- "Basic \k replacer" - --- Use karaskel.lua for skeleton code -include("karaskel.lua") - --- Define the name of the script -name = "Basic \\k replacer" --- Define a description of the script -description = "Makes basic karaoke effects. Replace all \\k tags (and variations) with a custom string, where some variables can be substituted in." --- Define the script variables that can be configured graphically --- This is the primary point of the script, being able to configure it graphically -configuration = { - -- First a label to descript what special variables can be used - [1] = { - name = "label1"; - kind = "label"; - label = [[Variable-names are prefixed with $, -expressions are enclosed in % pairs. -Variables: - $START = Start-time of syllable (ms) - $END = End-time of syllable (ms) - $MID = Time midways through the syllable (ms) - $DUR = Duration of syllable (cs) -Calculation example: - \t($start,%$start+$dur*2%,\fscx110) - \t(%$start+$dur*2%,$end,\fscx90)]]; - hint = "" - -- No "default", since a label doesn't have a value - }, - -- Then a text field to input the string to replace \k's with - -- Make the default a "NOP" string - [2] = { - name = "k_repstr"; - kind = "text"; - label = "\\k replacement"; - hint = "The string to replace \\k tags with. Should start and end with { } characters."; - default = "{\\k$DUR}" - }, - -- Allow the user to specify whether to strip tags or not - [3] = { - name = "striptags"; - kind = "bool"; - label = "Strip all tags"; - hint = "Strip all formatting tags apart from the processed karaoke tags?"; - default = false - }, - [4] = { - name = "workstyle"; - kind = "style"; - label = "Line style"; - hint = "Only apply the effect to lines with this style. Empty means apply to all lines."; - default = "" - } -} --- Mandatory values -version, kind= 3, 'basic_ass' - -function do_syllable(meta, styles, config, line, syl) - -- text is the replacement text for the syllable - -- ktext is the karaoke effect string - local text, ktext - - -- Prepare the stripped or unstripped main text - if config.striptags then - text = syl.text_stripped - else - text = syl.text - end - - if syl.n == 0 then - return text - end - - -- Add the variable names to the syllable data - syl["dur"] = syl.duration - syl["start"] = syl.start_time - syl["end"] = syl.end_time - syl["mid"] = syl.start_time + syl.duration*5 - - ktext = config.k_repstr - - -- Function for replacing the variables - local function var_replacer(varname) - varname = string.lower(varname) - if syl[varname] ~= nil then - return syl[varname] - else - aegisub.output_debug(string.format("Unknown variable name: %s", varname)) - return "$" .. varname - end - end - -- Replace the variables in the ktext - ktext = string.gsub(ktext, "$(%a+)", var_replacer) - - -- Function for evaluating expressions - local function expression_evaluator(expression) - chunk, err = loadstring(string.format("return (%s)", expression)) - if (err) ~= nil then - aegisub.output_debug(string.format("Error parsing expression:\n%s", expression, err)) - return "%" .. expression .. "%" - else - return chunk() - end - end - -- Find and evaluate expressions - ktext = string.gsub(ktext, "%%([^%%]*)%%", expression_evaluator) - - return ktext .. text -end - -function do_line(meta, styles, config, line) - if config.workstyle == "" or config.workstyle == line.style then - return karaskel.do_line(meta, styles, config, line) - else - return { n=1, [1]=line } - end -end diff --git a/aegisub/automation/automation3.txt b/aegisub/automation/automation3.txt deleted file mode 100644 index b4c63c88a..000000000 --- a/aegisub/automation/automation3.txt +++ /dev/null @@ -1,548 +0,0 @@ -Aegisub Automation documentation -Version 3 -Copyright 2005 Niels Martin Hansen. - ---- - -This document describes version 3 of the automation system used in Aegisub. -The automation system uses the Lua language for scripting engine. -See for more information. - ---- - -What is Automation? - -Aegisub Automation is a scripting system designed to automate many processing -tasks of ASS subtitles, instead of using tedious, error-prone manual -processing. The primary purpose is creating karaoke effects for anime fansubs. - -The Automation script is given the complete subtitle data from a subtitle -file, in a format suited for creating special effects. -The script will return a complete substiture for the original subtitle -data, allowing full freedom of processing. - -A number of helper functions are provided, to aid in finding errors in -scripts, as well as retrieve further data about the subtitles, needed to -created advanced effects. - ---- - -Scripts, files, functions: - -A script is a file containing Lua code. One file can define just one script, -but several scripts can share code by the help of including other files. - -All scripts are run in a separate interpreter, and as such don't have any way -of interacting with other loaded scripts. - -All strings in a script should be in UTF-8 encoding, without byte-order mark. -All strings input to a script are encoded as UTF-8. -Script files may start with an UTF-8 BOM (byte-order mark) or not, but this -is currently not well tested. - -A script must define certain global variables: - -version - Number. Version of the scripting interface used. - The version described in this file is 3. - To comply with version 3, version must be: 3 <= version < 4 -kind - String. Not used, but mandatory. Set it to "basic_ass" for now. -name - String. Displayed name of the script. -description - String. Optional. Long description of the script. -process_lines - Function. The main script function. -configuration - Table. Optional. Configuration options for the script. - -The functions are described in detail in the following. - -The script may define further global variables, but they do not have any -special meaning. Be aware, however, that later versions of the scripting -system might define further global variables with special meanings, so be -careful choosing names for private use globals. -It's recommended to prefix private global variables with "p_"; the scripting -system will never assign special meanings to global variables with that -prefix. - -The scripting system defines a global variable with name "aegisub", which -contains important values. You should not hide the "aegisub" variable. - ---- - -The processing function: - -The processing function is the heart of the script. - -It takes as input some meta-information about the subtitles, the styles -used in the subtitles, as well as the actual subtitle data to process. - -The output is a set of subtitle data in the same format as the input. -The output subtitle data will be used as a complete replacement of the -input data. -Future versions might allow modifying style data and meta data as well. - - -The processing function is defined as follows: - -function process_lines(meta, styles, lines, config) - -The arguments are: - -@meta - Table. Meta information about the script. (Script Info section.) -@styles - Table. Style definitions. (V4+ Styles section.) -@lines - Table. Subtitle events. (Events section.) -@config - Table. Values set for the configuration options provided. If no - configuration options were provided, this will be an empty table. - -Returns: One value. -This value must be a table, using the same format as @lines. -Note that the indexes in the return value may be either zero-based or -one-based, to allow for greater compatibility. You are encouraged to -use one-based indexes. - - -Description of @meta: - -This is a table with the following keys: - -res_x - Horizontal resolution of the script. -res_y - Vertical resolution of the script. - - -Description of @styles: - -This is a table with the following keys: - --1 - Number. The amount of styles defined, called "n". -0 -> n-1 - Table. The actual style definitions. - - Table. The style definition with the specified name. - -The key -1 is used for count rather than "n", since one might have a style -definition with the name "n". - -A style definition is a table with the following keys: - -name - String. Name of the style. -fontname - String. Name of the font used. -fontsize - Number. Size of the font used. -color1 - String. Primary color. - All color fields use raw hexadecimal format, that is, no special characters - before or after the hex string. -color2 - String. Secondary color. -color3 - String. Outline color. -color4 - String. Shadow color. -bold - Boolean. Bold text or not. -italic - Boolean. Italic text or not. -underline - Boolean. Underlined text or not. -strikeout - Boolean. Striked-out text or not. -scale_x - Number. Horizontal scale. -scale_y - Number. Vertical scale. -spacing - Number. Spacing between characters. -angle - Number. Rotation angle in degrees. -borderstyle - Number. 1=Outline + drop shadow, 3=Opaque box (not really used???) -outline - Number. Thickness of outline. -shadow - Number. Distance of shadow from text. -align - Number. Numpad style alignment. -margin_l - Number. Left margin in pixels. -margin_r - Number. Right margin in pixels. -margin_v - Number. Vertical margin in pixels. -encoding - Number. Font encoding used. - - -Description of @lines: - -This is a table with the following keys: - -n - Number. The amount of lines. -0 -> n-1 - Table. The actual lines. - -A line is a table with the following key: - -kind - String. Can be "blank", "scomment", "comment" or "dialogue". - -The keys otherwise defined depends on the kind of the line. - -If the kind if "blank", no further fields are defined. - -If the kind is "scomment", the line is a "semicolon comment", and the -following key is defined: - -text - String. Text following the semicolon until end of line. EOL not included. - -If the kind is "comment" or "dialogue", the line is either a Comment: or -a Dialogue: line. In both cases, the following keys are defined: - -layer - Number. -start_time - Number. Start time of line in centiseconds. - (Might change to userdata later.) -end_time - Number. End time of line in centiseconds. - (Might change to userdata later.) -style - String. Style used for this line. -name - String. Character name speaking this line. -margin_l - Number. Left margin override, in pixels. (0=no override) -margin_r - Number. Right margin override, in pixels. (0=no override) -margin_v - Number. Right margin override, in pixels. (0=no override) -effect - String. Effect to apply to the line. (No error checking done.) -text - String. Text to display. -text_stripped - String. Same as text, but stripped for all tags, and newline/hardspace - tags are converted to real newlines/spaces. Non-hard spaces at the start/ - end of lines are stripped. -karaoke - Table. Line split into karaoke syllables. See below for more information. - -Note about output: -Neither text_stripped nor karaoke are used when the results are parsed, they -are only passed to simplify processing. You should set text to the final text -of the line, you want in the output. -It is encouraged to entirely leave text_stripped and karaoke out of the -tables in the result. - - -Karaoke tables: - -A karaoke table has a number of values indexed by numbers. Each value -represents a karaoke syllable. -Key "n" holds the number of syllables. The syllables can be accessed from -index 0 and up. The syllables are indexed chronologically. -A karaoke table always has at least one syllable. The first syllable (index -0) contains all data before the first timed syllable. -Each syllable is a table containing the following keys: - -duration - Number. Duration of the syllable in centiseconds. Always 0 for first - syllable. -kind - String. "Kind" of the karaoke, the name of the tag. For a \k type syllable, - kind is "k", for a \kf syllable kind is "kf". Freeform tags can be used, as - long as they start with the letter "k" or "K". - Always the empty string ("") for the first syllable. -text - String. Text of the syllable. This includes formatting tags. - For the first syllable, this contains everything before the first karaoke - timing tag. -text_stripped - String. Same as text, but with all formatting tags stripped. - - -Description of @config: - -This is a table. The keys are the names for the options defined in the global -"configuration" table. The values are the values provided by the user. - ---- - -Script configuration: - -An automation script can provide a configuration set, allowing the user to -set certain options before the script is called. - -This is performed through the "configuration" value. - -Scripts can define configuration options of the following types: - -label - A static, non-editable text displayed to the user. (Useful for adding - additional explanations for some options.) -text - Freeform text entry. -int - Integer numbers. A range of valid values can be specified. -float - Any kind of number. A range of valid values can be specified. -bool - A boolean on/off value. -colour - An RGB colour value. -style - The name of a style defined in the subtitles. - - -The "configuration" table: - -The "configuration" table contains a number of values indexed by numbers. -Each value defines a configuration option. -The configuration options must be in keys numbered from 1 to n, where n -is the number of options. No "n" key is required. -The configuration options will be presented to the user in the order defined. -Each configuration option is a table containing the following keys: - -name - String. The internal name used to refer to the configuration option. - Must not contain the colon or pipe characters. (ASCII 58 and 124.) -kind - String. One of "label", "text", "int", "float", "bool", "colour" and - "style". Defines what kind of option this is. -label - String. Name of the option, presented to the user. Should be very short. -hint - String. Longer description of the option, presented to the user as a - tooltip. Ignored for "label" kind options. -min - Number. Optional. Lowest value allowed. Only used for "int" and "float" kinds. -max - Number. Optional. Highest value allowed. Only used for "int" and "float" kinds. -default. - Type depends on "kind". The value given to this configuration option before - the user has entered another value. Ignored for "label" kind options. - -Data types for the different kinds: - -label - None. A label doesn't have a value, and won't be present in the @config - table in the process_lines function. -text - String. You might want to do some kind of extra validation on text input, as - it might be anything. -int - Number. Guaranteed to always be integer. -float - Number. Can be integer or not. -bool - Boolean. -colour - String. An ASS hex colourcode in "&HBBGGRR&" format. -style - String. The name of the style. The style can't be guaranteed to exist, as - another export filter in Aegisub might have removed it before your script - gets to run. - ---- - -Script environment and registration: - -A script is assigned to a subtitle file by adding it to the -"Automation Scripts" extra header in the [Script Info] section. This header -contains a list of script filenames, separated by pipe characters. Example: - - Automation Scripts: test1.lua|test2.lua - -All scripts run in their own separate interpreter. This means there is no -risk of name collisions, though also that scripts can't easily share code. - -If you need to share code between several scripts, you should create a -subdirectory to the script directory, and place include files there. - - -The settings for the configuration options for a script are stored in the ASS -file in the following way: - -Each script gets one line for configuration, named "Automation Settings" plus -a space plus the filename of the script. The filename used is stripped of all -path specifiers. (Use unique filenames for your scripts!) - -The value of the line is a pipe-separated list of "name:value" pairs. The name -is the internal name given by the "name" key. It is not mangled in any way. - -The way the value is stored depends on the kind of the option. - -label - Not stored. -text - The string is stored in an URL-encoding like manner. Some unsafe characters - are replaced with escape-sequences of the form #xx, where xx is a two-digit - hexadecimal number for the ASCII code of the escaped character. Only ASCII- - characters can be escaped this way, Unicode characters aren't supported. -int - Stored in ASCII base 10 without any group separators. -float - Stored in exponential notation, using ASCII base 10. (As the %e sprintf() - argument.) -bool - True is stored as "1", false as "0". -colour - Stored as in ASS hex format without any mangling. -style - Stored in the same manner as "text" kind options. - ---- - -Helper functions: - -There is a gloabl variable names "aegisub". This is a table containing -various helper functions. - -The following helper functions are defined: - - -function aegisub.set_status(text) - -Sets the current status-message. (Used for progress-reporting.) - -@text - String. The status message. - -Returns: nothing. - - -function aegisub.output_debug(text) - -Output text to a debug console. - -@text - String. The text to output. - -Returns: nothing. - - -function aegisub.colorstring_to_rgb(colorstring) - -Convert an ASS color-string to a set of RGB values. - -@colorstring - String. The color-string to convert. - -Returns: Four values, all numbers, being the color components in this -order: Red, Green, Blue, Alpha-channel - - -function aegisub.report_progress(percent) - -Report the progress of the processing. - -@percent - Number. How much of the data have been processed so far. (Percent) - -Returns: nothing. - - -function aegisub.text_extents(style, text) - -Calculate the on-screen pixel size of the given text using the given style. - -@style - Table. A single style definition like those passed to process_lines. -@text - String. The text to calculate the extents for. This should not contain - formatting codes, as they will be treated as part of the text. - -Returns 4 values: -1: Number. Width of the text, in pixels. -2: Number. Height of the text, in pixels. -3: Number. Descent of the text, in pixels. -4: Number. External leading for the text, in pixels. - -Short description of the values returned: -Width: The X advance of the text, how much the "cursor" moves forward when -this text is rendered. -Height: The total height of the text, including internal leading. -Descent: How far below the baseline a character can extend. The ascent of -the text can be calculated as (height - descent). -External leading: How much vertical spacing will be added between the lines -of text rendered with this font. The total height of a line is -(height + external_leading). - - -function aegisub.frame_from_ms(ms) - -Return the video frame-number for the given time. - -@ms - Number. Time in miliseconds to get the frame number for. - -Returns: A number, the frame numer. If there is no framerate data, returns -nil. - - -function aegisub.ms_from_frame(frame) - -Returns the start-time for the given video frame-number. - -@frame - Number. Frame-number to get start-time from. - -Returns: A number, the start-time of the frame. If there is no framerate -data, returns nil. - - -function include(filename) - -Include the named script. The script search-path defined in Aegisub will be -used, searching for the script. -If the filename is relative, the regular search path will not be used, but -instead the filename will be taken as relative to the directory the current -script is located in. -Note that if you use include() inside an included script, relative paths -will still be taken relative to the original script, and not relative to the -current included script. This is a design limitation. -The included script is loaded as an anonymous function, which is executed in -the current environment. This has two implications: You can include files -based on conditional statements, and even in loops, and included files can -return values using the "return" statement. - -@filename - String. Name of the file to include. - -Returns: Depends on the script included. - -Note that if the file couldn't be found, the script will be terminated -(or fail to load.) - ---- - -Versions of the scripting interface: - -Here's a quick history of the scripting interface: - -Version 1 - Using Lua as engine. - The scripts used in the Karaoke Effector application, avaible at: - - -Version 2 - Using Python as engine. - The first draft for an Aegisub automation engine. - Never implemented. - -Version 3 - Using Lua as engine. - The current version. diff --git a/aegisub/automation/demos/auto3/1-minimal.lua b/aegisub/automation/demos/auto3/1-minimal.lua deleted file mode 100644 index c2b4d1cf0..000000000 --- a/aegisub/automation/demos/auto3/1-minimal.lua +++ /dev/null @@ -1,33 +0,0 @@ --- Aegisub Automation demonstration script --- Original written by Niels Martin Hansen --- Given into the public domain - --- Comment lines (like this line) start with two hyphens, these are ignored when the script is interpreted. --- This script does not do anything useful, it merely displays a message. Think of it as a kind of "hello world" script. - --- The following lines define some values identifying the script --- This script is written for Automation version 3 -version = 3 --- And it's a "basic ass" processing script. There are no other kinds of scripts though... but this is still required. -kind = "basic_ass" --- This is the name of the script that shows up in Aegisub -name = "Minimal demonstration" --- This is a longer description of the script -description = "A very minimal demonstration of the strucrure of an Automation script." --- This defines any configuration that can be done of the script. This is demonstrated in demo 5. --- The empty braces denote an empty table (associative array) -configuration = {} - --- This is the main function of the script. --- This function is run whenever the script is run -function process_lines(meta, styles, lines, config) - -- The function aegisub-report_progress changes the position of the progress bar shown while the script is running - -- The value given is in percent. - aegisub.report_progress(50) - -- The aegisub,.output_debug function shows some text - aegisub.output_debug("Test script 1 running") - aegisub.report_progress(100) - -- It is very important that the process_lines function returns an array of lines, otherwise an error will occur - -- If an empty array is returned, the entire file is cleared! - return lines -end diff --git a/aegisub/automation/demos/auto3/10-furigana.ass b/aegisub/automation/demos/auto3/10-furigana.ass deleted file mode 100644 index 4faa5f9da..000000000 --- a/aegisub/automation/demos/auto3/10-furigana.ass +++ /dev/null @@ -1,23 +0,0 @@ -[Script Info] -; Demonstration script for Aegisub Automation 3 demo script '10-furigana.lua' -; http://www.aegisub.net -Title: Furigana demonstration -ScriptType: v4.00+ -PlayResX: 640 -PlayResY: 480 -Automation Scripts: 10-furigana.lua -Export Encoding: UTF-8 -Export filters: Automation: Furigana demo -WrapStyle: 0 - -[V4+ Styles] -Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding -Style: Default,MS Gothic,36,&H00FFFFFF,&H0000FFFF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,2,10,10,30,0 - -[Events] -Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 0,0:00:00.00,0:00:10.00,Default,,0000,0000,0000,,{\k20}意|い{\k5}味|み{\k7}の{\k14}な{\k6}い{\k30}test|テスト{\k2}を{\k14}魂|た{\k12}#|ま{\k4}#|し{\k8}#|い{\k10}に{\k4}頂|ちょ{\k5}#|う{\k18}戴|だ{\k14}#|い - - - - diff --git a/aegisub/automation/demos/auto3/10-furigana.lua b/aegisub/automation/demos/auto3/10-furigana.lua deleted file mode 100644 index 2de53e186..000000000 --- a/aegisub/automation/demos/auto3/10-furigana.lua +++ /dev/null @@ -1,65 +0,0 @@ --- Aegisub Automation demonstration script --- Original written by Niels Martin Hansen --- Given into the public domain - --- Furigana is handled by the advanced karaskel -include("karaskel-adv.lua") --- But it requires some additional functionality to be enabled as well. Do that here -karaskel.engage_furigana = true --- Enabling trace isn't really required, but it's nice for debugging -karaskel.engage_trace = true - -version = 3 -kind = "basic_ass" -name = "Furigana demo" -description = "Demonstrates how to use the Furigana feature in karaskel-adv" - -function do_syllable(meta, styles, config, line, syl) - -- First prepare a table to add the resulting lines of this syllable to - local result = {n=0} - -- Actually, make a function that does some stuff for us - -- Calling result.add will create another copy of the current line, add it to the result table, and return a reference to the new line - -- The result from this function can just be modified, and the line in the result table changes along (since it's just a reference) - function result.add() - local l = copy_line(line) - result.n = result.n + 1 - result[result.n] = l - return l - end - -- Place the main text - -- So far no magic, just a regular line placed - local l = result.add() - l.text = string.format("{\\an8\\pos(%d,%d)\\k%d\\kf%d}%s", line.centerleft+syl.center, line.height*1.5, syl.start_time/10, syl.duration, syl.text_stripped) - l.layer = 5 - -- Now for some "magic" stuff, loop over the highlights array to add possibly multiple highlights to each syllable - -- For example, kanji spanning multiple syllables can "flash" multiple times this way - for i = 0, syl.highlights.n-1 do - local hl = syl.highlights[i] - l = result.add() - l.start_time = l.start_time + hl.start_time/10 - l.end_time = l.start_time + 25 - l.text = string.format("{\\an8\\k10000\\k0\\move(%d,%d,%d,%d)\\t(\\1a&HFF&\\2a&HFF&\\3a&HFF&\\4a&HFF&)}%s", line.centerleft+syl.center, line.height*1.5, line.centerleft+syl.center, line.height*3, syl.text_stripped) - -- Put each highlight in a layer for itself, because they might overlap. This creates a possibly slightly nicer effect - l.layer = 10+i - end - -- Now for the real magic, ,loop over the furigana array - -- This contains a lot of pre-calculated info about how each furigana syllable should be placed relatively to the beginning of the line - -- With this info, it's really not much different from making a "main" effect. You just have to be aware that you're working with much smaller font sizes - for i = 0, syl.furigana.n-1 do - local furi = syl.furigana[i] - l = result.add() - -- Be sure to include the \fscx%f\fs%f tags here! Otherwise the text will be incorrectly scaled. - -- The \fscx is also important, because long stretches of furigana might be squished together so it all fits over the main text - l.text = string.format("{\\an2\\k%d\\k%d\\bord2\\fscx%.1f\\fs%.1f\\t(%d,%d,\\bord0)\\pos(%d,%d)}%s", furi.start_time/10, furi.duration, syl.furigana.scale, syl.furigana.fontsize, furi.start_time, furi.end_time, line.centerleft+furi.center, line.height*1.5, furi.text) - l.layer = 3 - end - -- The additional 'add' function in the result is ignored when it's read back by the caller - return result -end - --- Trick: The script includes itself on apply, meaning it's automatically reloaded -function process_lines(meta, styles, lines, config) - include("10-furigana.lua") - -- Make sure to call the karaskel.process_lines function to do the work - return karaskel.process_lines(meta, styles, lines, config) -end diff --git a/aegisub/automation/demos/auto3/2-dump.lua b/aegisub/automation/demos/auto3/2-dump.lua deleted file mode 100644 index 1e624debc..000000000 --- a/aegisub/automation/demos/auto3/2-dump.lua +++ /dev/null @@ -1,63 +0,0 @@ --- Aegisub Automation demonstration script --- Original written by Niels Martin Hansen --- Given into the public domain - --- For an explanation of these, see the documentation, or demo 1 -version = 3 -kind = "basic_ass" -name = "Reading data demonstration" -description = "This is a demonstration of how to access the various data passed to an Automation script. It loops over the data structures provided, and dumps them to the debug console." -configuration = {} - -include "karaskel-base.auto3" - -function process_lines(meta, styles, lines, config) - karaskel.parse_syllable_data(meta, styles, lines) - - -- This makes an alias for the aegisub.output_debug function. Remember that functions are first-class values in Lua. - -- The 'local' keyword makes the 'out' variable local to this function - local out = aegisub.output_debug - - -- Use the string.format function to form a string showing some metadata about the subtitles and output it - out(string.format("Metadata: res_x=%d res_s=%d", meta.res_x, meta.res_y)) - - -- The number of styles is stored in index -1, because there might be a style named "n" - local numstyles = styles[-1] - out("Number of styles: " .. numstyles) - -- Loop over the styles with a for loop, printing some info about each style - for i = 0, numstyles-1 do - out(string.format("Style %d: name='%s' fontname='%s'", i, styles[i].name, styles[i].fontname)) - end - - -- Do the same, but for the actual subtitle lines - out("Number of subtitle lines: " .. lines.n) - for i = 0, lines.n-1 do - -- Use the report_progress function to show the progress of the loop - aegisub.report_progress(i/lines.n*100) - -- Check if the line is a dialogue line, otherwise it won't have much interesting data - -- Also, the script will crash if you try to access a field that doesn't exist - if lines[i].kind == "dialogue" then - -- Again, output some info about the line - out(string.format("Line %d: dialogue start=%d end=%d style=%s", i, lines[i].start_time, lines[i].end_time, lines[i].style)) - out(" Text: " .. lines[i].text) - out(" Stripped text: " .. lines[i].text_stripped) - out(" Number of karaoke syllables: " .. lines[i].karaoke.n) - -- Also loop over the karaoke syllables, if any, in the line. - -- Note that there will actually always be at least one syllable, number zero, which is everything before the first \k tag - for j = 0, lines[i].karaoke.n-1 do - syl = lines[i].karaoke[j] - -- Use the aegisub.text_extents function to calculate the rendered size of the syllable text - -- Note that the styles[lines[i].style] construct can be dangerous, in case the line refers to a non-existant style - extx, exty, extd, extl = aegisub.text_extents(styles[lines[i].style], syl.text_stripped) - out(string.format(" Syllable %d: dur=%d kind=%s text='%s' text_stripped='%s' extx=%d exty=%d extd=%d extl=%d", j, syl.duration, syl.kind, syl.text, syl.text_stripped, extx, exty, extd, extl)) - end - else - -- For non-dialogue lines, output a lot less info - out(string.format("Line %d: %s", i, lines[i].kind)) - end - end - out("Finished dumping") - - -- In the end, no modifications were done, so just return the original subtitle data - return lines -end diff --git a/aegisub/automation/demos/auto3/3-include.lua b/aegisub/automation/demos/auto3/3-include.lua deleted file mode 100644 index 448ed8463..000000000 --- a/aegisub/automation/demos/auto3/3-include.lua +++ /dev/null @@ -1,25 +0,0 @@ --- Aegisub Automation demonstration script --- Original written by Niels Martin Hansen --- Given into the public domain - --- This script demonstrated using include scripts in Automation. --- You include a file simply by calling the include function with a filename. --- Depending on whether the filename contains a path or not, it is interpreted in slightly different ways, --- see the documentation for more information. -include("utils.lua") - --- The usual info -name = "Include demo" -description = "Simple demonstration of the include function." --- Here several values are set in one line -version, kind, configuration = 3, 'basic_ass', {} - -function process_lines(meta, styles, lines, config) - -- Copy the first line (line 0) and store it as as a new last line - -- The last line has index lines.n-1, so lines.n is one past the last line - lines[lines.n] = copy_line(lines[0]) - -- Make sure to increment 'n', so the correct number of lines are read out - lines.n = lines.n + 1 - -- Then return the modified lines table - return lines -end diff --git a/aegisub/automation/demos/auto3/4-text_extents.lua b/aegisub/automation/demos/auto3/4-text_extents.lua deleted file mode 100644 index f751dd80b..000000000 --- a/aegisub/automation/demos/auto3/4-text_extents.lua +++ /dev/null @@ -1,56 +0,0 @@ --- Aegisub Automation demonstration script --- Original written by Niels Martin Hansen --- Given into the public domain - -include("utils.lua") - -name = "Text placement demo" -description = "Demonstration of the text_extents function, to do per-syllable placement of text." -version, kind, configuration = 3, 'basic_ass', {} - -function process_lines(meta, styles, lines, config) - -- Prepare local variables - local output = { n=0 } - -- Loop through every line - for i = 0, lines.n-1 do - aegisub.report_progress(i/lines.n*100) - -- Only process dialogue lines - if lines[i].kind ~= "dialogue" then - output.n = output.n + 1 - output[output.n] = lines[i] - else - -- This is just for making the code a bit easier to read - local line = lines[i] - -- Get the rendered size of the entire line. (Won't work if there's line breaks in it.) - local totalx, totaly = aegisub.text_extents(styles[line.style], line.text_stripped) - -- Calculate where the first syllable should be positioned, if the line is to appear centered on screen - local curx, cury = (meta.res_x - totalx) / 2, meta.res_y / 2 - -- And more preparations for per-syllable placement - local startx = curx - local tstart, tend = 0, 0 - -- Now process each stllable - for j = 1, line.karaoke.n-1 do - -- A shortcut variable, and, most important: a copy of the original line - local syl, syllin = line.karaoke[j], copy_line(line) - -- Calculate the ending time of this syllable - tend = tstart + syl.duration*10 - -- Get the rendered size of this syllable - local extx, exty, extd, extl = aegisub.text_extents(styles[line.style], syl.text_stripped) - -- Some debug stuff... - aegisub.output_debug(string.format("text_extents returned: %d, %d, %d, %d", extx, exty, extd, extl)); - -- Replace the text of the copy of the line with this syllable, moving around - syllin.text = string.format("{\\an4\\move(%d,%d,%d,%d,%d,%d)\\kf%d\\kf%d}%s", curx, cury, curx, cury-exty, tstart, tend, tstart/10, syl.duration, syl.text) - -- Add the line to the output - output.n = output.n + 1 - output[output.n] = syllin - -- And prepare for next iteration - curx = curx + extx - tstart = tend - end - -- More debug stuff - aegisub.output_debug(string.format("after syllable loop: totalx=%d curx-startx=%d", totalx, curx-startx)) - end - end - -- And remember to return something :) - return output -end diff --git a/aegisub/automation/demos/auto3/5-configuration.lua b/aegisub/automation/demos/auto3/5-configuration.lua deleted file mode 100644 index 1510bfdcf..000000000 --- a/aegisub/automation/demos/auto3/5-configuration.lua +++ /dev/null @@ -1,96 +0,0 @@ --- Aegisub Automation demonstration script --- Original written by Niels Martin Hansen --- Given into the public domain - -name = "Configuration demo" -description = "This script allows the user to input some data in the Aegisub Export window. Some of these data are used during the processing, to change the subtitles. (The strings is prepended every dialogue line.)" -version, kind = 3, 'basic_ass' --- The configuration table defines a number of controls to show in the config window --- The controls must be numbered from 1 and up with no "holes", the number of controls is automatically detected -configuration = { - [1] = { - -- There are some mandatory fields for evry control defined - -- 'name' is the internal name of the control, it's used to refer to the value the user entered later on - name = "thelabel"; - -- 'kind' is the class of control, this is a label which only displays text and can't be edited - kind = "label"; - -- 'label' is a short description of the control, displayed ot the left of it. - -- In the case of a label control, it's the entire text displayed - label = "This is a label control. Just for shows."; - -- 'hint' is a tooltip for the control. It doesn't actually work for label controls though - hint = "Tooltip for label?!?"; - }; - [2] = { - name = "thestring"; - -- the "text" class is a regular text input field - kind = "text"; - label = "String:"; - hint = "The string to insert at the beginning of each line"; - -- The 'default' is required for everything but 'label' controls, it simply specifies the default value - default = "foobar " - }; - [3] = { - name = "theint"; - -- 'int' is a text control that only allows inputting whole numbers (integers) - kind = "int"; - label = "Integer:"; - hint = "An integer number to display in debug output"; - default = 50; - -- If the 'min' and 'max' fields are specified, the control will get a "spin control" attached, - -- which can be used to change the value with the mouse - min = 0; - max = 100; - }; - [4] = { - name = "thefloat"; - -- 'float' is like int, except you can also put decimal numbers in it - kind = "float"; - label = "Float number:"; - hint = "Just a random float number"; - default = 3.1415927; - -- There are no working spin controls for floats, unfortunately - }; - [5] = { - name = "thebool"; - -- 'bool' makes a checkbox, which can either be checked or unchecked - kind = "bool"; - label = "I accept"; - hint = "Check if you accept the terms of the license agreement"; - -- false means unchecked, true means checked - default = false; - }; - [6] = { - name = "thecolour"; - -- 'colour' is currently just a text edit box which allows you to input an ASS format color - -- The idea was to have some kind of graphical control, but that probably won't happen in auto3 - kind = "colour"; - label = "Favourite color:"; - hint = "What color do you want your pantsu?"; - default = "&H8080FF"; - }; - [7] = { - name = "thestyle"; - -- 'style' produces a drop down list, where the user can select one of the styles in the file, or no style at all - kind = "style"; - label = "Style:"; - hint = "Pick a style the effects will apply to, or none to apply to everything"; - -- An empty string means that nothing is selected - -- Be careful about assuming any style names that might be available in the subtitle file - default = ""; - } -} - -function process_lines(meta, styles, lines, config) - -- All the values selected by the user are stored in the 'config' variable - -- For example, control 2 in this example has name "thestring", so you can access the value input by config.thestring - aegisub.output_debug("The string entered is: " .. config.thestring) - for i = 0, lines.n-1 do - aegisub.report_progress(i/lines.n*100) - if lines[i].kind == "dialogue" then - -- So loop over all dialogue lines and append thestring to them all - lines[i].text = config.thestring .. lines[i].text - end - end - return lines -end - diff --git a/aegisub/automation/demos/auto3/6-simple-effect.lua b/aegisub/automation/demos/auto3/6-simple-effect.lua deleted file mode 100644 index 85ea87810..000000000 --- a/aegisub/automation/demos/auto3/6-simple-effect.lua +++ /dev/null @@ -1,89 +0,0 @@ --- Aegisub Automation demonstration script --- Original written by Niels Martin Hansen --- Given into the public domain - --- Define some required constants --- version and kind are required to have the given values for the script to work. --- configuration is not needed in this script, so it's just left as an empty table -version, kind, configuration = 3, "basic_ass", {} - --- Define the displayed name of the script -name = "Simple karaoke effect" --- A longer description of the script -description = "A simple karaoke effect, with the source code heavily commented. Provided as a starting point for a useful effect." - --- The actual script function -function process_lines(meta, styles, lines, config) - -- Create a local variable to store the output subtitles in - local output = { n=0 } - - -- Start to loop over the lines, one by one - -- The lines are numbered 0..n-1 - for i = 0, lines.n-1 do - -- Show the user how far the script has got - aegisub.report_progress(i/lines.n*100) - -- First check if the line is even a dialogue line. If it's not, no need to process it. - if lines[i].kind ~= "dialogue" then - output.n = output.n + 1 - output[output.n] = lines[i] - else - -- This is a dialogue line, so process is - -- Make a nicer name for the line we're processing - newline = lines[i] - -- Also show the line to the user - aegisub.set_status(newline.text_stripped) - - -- The text of the new line will be build little by little - -- Each line has 700 ms fadein, 300 ms fadeout, - -- is positioned at the center of the screen (\an8) - -- and the highlighting should be delayed by 1000 ms (100 cs) - newline.text = string.format("{\\fad(700,300)\\pos(%d,30)\\k100}", meta.res_x/2) - -- Make the line start 1000 ms (100 cs) earlier than original - newline.start_time = newline.start_time - 100 - - -- Now it's time to loop through the syllables one by one, processing them - -- The first syllable is usually a "null" syllable, not containing real data, so that one should be skipped. - -- This variable is used to keep track of when the last syllable ended - -- It's initialised to 1000, since the start of the line was pushed 1000 ms back - local cursylpos = 1000 - for j = 1, lines[i].karaoke.n-1 do - local syl = lines[i].karaoke[j] - -- Call another function to process the syllable - newline.text = newline.text .. doSyllable(syl.text, cursylpos, cursylpos+syl.duration*10, syl.duration, syl.kind) - -- Calculate the start time of the next syllable - cursylpos = cursylpos + syl.duration*10 - end - - -- The entire line has been calculated - -- Add it to the output - output.n = output.n + 1 - output[output.n] = newline - end - end - - -- All lines processed, and output filled - -- Just return it - -- (This is important! If you don't return anything, the output file will be empty!) - return output -end - --- This effect was originally written in the "Effector" program, which can be considered the first version of Automation. --- This following function is almost verbatimly copied from that original script. --- This is done in order to show how you can make sub-functions to make your script more readable. --- The contents of this function could also just be pasted into the middle of the main loop in process_lines, --- but that generally makes scripts harder to read. -function doSyllable(text, t_start, t_end, t_dur, ktype) - -- Declare two local variables needed here - -- (If they're not declared local, they will be global.) - local a, b - -- If it's a "long" syllable, let the effect be different - if t_dur > 75 then - a = t_start + 500 - b = t_end - else - a = t_start + 100 - b = t_start + 500 - end - -- Return the replacement for the syllable, including some ASS tags for format it - return string.format("{\\r\\t(%d,%d,\\1c&H808080&\\2c&H808080&)\\kf%d}%s", a, b, t_dur, text) -end diff --git a/aegisub/automation/demos/auto3/7-advanced-effect.lua b/aegisub/automation/demos/auto3/7-advanced-effect.lua deleted file mode 100644 index daf6364f2..000000000 --- a/aegisub/automation/demos/auto3/7-advanced-effect.lua +++ /dev/null @@ -1,201 +0,0 @@ --- Aegisub Automation demonstration script --- Original written by Niels Martin Hansen --- Given into the public domain --- But still, please don't use the effect generated by this script --- (unchanged) for your own works. - --- Note that many of the techniques used in this script are heavily deprecated, much of the processing done --- is also done by the karaskel scripts. --- In fact, this can almost be viewed as an example of how *not* to do things... - --- Since this script assumes some rather specific things about the ASS input, it might not be very useful at first. --- The original ASS file this was written for is available upon request. - -include("utils.lua") - -name = "Advanced karaoke effect" -description = "An advanced karaoke effect, making heavy use of both line-copying and per-syllable text placement. Also demonstrates how to treat lines differently, based on their style, and syllables differently based on the timing tag used." -version, kind, configuration = 3, 'basic_ass', {} - -function process_lines(meta, styles, lines, config) - local output = { n=0 } - math.randomseed(5922) -- just to make sure it's initialised the same every time - for curline = 0, lines.n-1 do - aegisub.report_progress(curline/lines.n*100) - local lin = lines[curline] - if lin.kind == "dialogue" and lin.style == "op romaji" then - doromaji(lin, output, styles["op romaji"], 30) - elseif lin.kind == "dialogue" and lin.style == "op kanji" then - -- Just one of these lines should be uncommented. - -- This script was written before configuration worked, otherwise it would use configuration - -- to select which of the two effects to use for "op kanji" style lines. - --doromaji(lin, output, styles["op kanji"], 20) - dokanji(lin, output, styles["op kanji"]) - else - -- Unknown lines are copied verbatim - output.n = output.n + 1 - output[output.n] = lin - end - end - return output -end - -function doromaji(lin, output, sty, linetop) - aegisub.set_status(lin.text_stripped) - - --local linetop = 50 - - -- prepare syllable data - local linewidth = 0 - local syltime = 0 - local syls = {n=0} - for i = 1, lin.karaoke.n-1 do - local syl = lin.karaoke[i] - syl.width, syl.height, syl.descent, syl.extlead = aegisub.text_extents(sty, syl.text_stripped) - syl.left = linewidth - syl.start_time = syltime - syl.end_time = syltime + syl.duration - syltime = syltime + syl.duration - if syl.kind == "kf" and (syl.text == " " or syl.text == " ") then - -- The font this effect was made to work with has too wide spaces, so make those half width - syl.width = math.floor(syl.width / 2) - syl.kind = "space" - elseif syl.kind == "kf" then - syl.kind = "deco" - elseif syl.kind == "k" then - syl.kind = "reg" - elseif syl.kind == "ko" then - syl.kind = "dance" - else - syl.kind = "ignore" - end - if syl.text == "#" then - syls[syls.n-1].duration = syls[syls.n-1].duration + syl.duration - syls[syls.n-1].end_time = syls[syls.n-1].end_time + syl.duration - else - linewidth = linewidth + syl.width - syls[syls.n] = syl - syls.n = syls.n + 1 - end - end - local lineofs = math.floor((640 - linewidth) / 2) - - for i = 0, syls.n-1 do - local syl = syls[i], copy_line(lin) - if syl.kind == "space" then - -- Spaces are skipped. Since the width of them is already incorporated in the position calculations - -- for the following syllables, they can safely be stripped from output, without losing the spaces. - elseif syl.kind == "ignore" then - -- These are actually syllable kinds we don't know what to do about. They are not included in the output. - else - local startx, starty, shakex, shakey, enterangle - -- angle to enter from - enterangle = math.rad((180 / lin.karaoke.n) * i - 90) - -- position to enter from (350 pixels from (320, 50)) - startx = math.sin(enterangle)*350 + 320 - starty = linetop - math.cos(enterangle)*350 - if syl.kind == "reg" then - shakex = (syl.left+lineofs) + math.random(-5, 5) - shakey = linetop + math.random(-5, 5) - elseif syl.kind == "deco" then - shakex, shakey = syl.left+lineofs, linetop - elseif syl.kind == "dance" then - shakex = (syl.left+lineofs) + math.random(-5, 5) - shakey = linetop + math.random(-5, 5) - end - -- origin for rotation - local orgx = syl.left + lineofs + syl.width/2 - local orgy = linetop + syl.height/2 - -- entry effect - local enterlin = copy_line(lin) - enterlin.start_time = lin.start_time - 40 - enterlin.end_time = lin.start_time - enterlin.text = string.format("{\\move(%d,%d,%d,%d)\\fr%d\\t(\\fr0)\\an7}%s", startx, starty, shakex, shakey, -math.deg(enterangle), syl.text) - output.n = output.n + 1 - output[output.n] = enterlin - -- main highlight effect - local newlin = copy_line(lin) - local hilistart, hilimid, hiliend = syl.start_time*10, (syl.start_time+syl.duration/2)*10, (syl.start_time+syl.duration)*10 - newlin.text = string.format("\\move(%d,%d,%d,%d,%d,%d)\\an7}%s", shakex, shakey, syl.left+lineofs, linetop, hilistart, hiliend, syl.text) - newlin.layer = 1 - if syl.kind == "dance" then - local fx = string.format("\\org(%d,%d)\\t(%d,%d,\\fr30)\\t(%d,%d,\\fr-30)\\t(%d,%d,\\3c&H0000ff&)\\t(%d,%d,\\3c&H000080&)\\t(%d,%d,\\fr0)", orgx, orgy, hilistart, hilistart+20, hilistart+20, hiliend, hilistart, hilimid, hilimid, hiliend, hiliend, hiliend+syl.duration*10) - newlin.text = fx .. newlin.text - else - local fx = string.format("\\t(%d,%d,\\3c&H0000ff&)\\t(%d,%d,\\3c&H000080&)", hilistart, hilimid, hilimid, hiliend) - newlin.text = fx .. newlin.text - end - local bord = copy_line(newlin) - bord.layer = 0 - bord.text = "{" .. bord.text - newlin.text = "{\\bord0" .. newlin.text - output.n = output.n + 2 - output[output.n-1] = bord - output[output.n] = newlin - -- leave effect - -- cut the line over in two, lower half "drops down", upper just fades away - local tophalf = copy_line(lin) - tophalf.start_time = lin.end_time - tophalf.end_time = lin.end_time + 100 - tophalf.text = string.format("\\3c&H000080&\\fad(0,700)\\pos(%d,%d)\\an7}%s", syl.left+lineofs, linetop, syl.text_stripped) - local bottomhalf = copy_line(tophalf) - tophalf.text = string.format("{\\t(0,200,\\1c&H000080&)\\clip(0,0,640,%d)%s", linetop+syl.height/2, tophalf.text) - bottomhalf.text = string.format("{\\org(%d,%d)\\clip(0,%d,640,480)\\t(0,200,\\1c&H000080&)\\t(200,1000,1.2,\\frx90\\clip(0,%d,640,480)%s", 320, linetop+syl.height, linetop+syl.height/2, linetop+syl.height, bottomhalf.text) - output.n = output.n + 2 - output[output.n-1] = tophalf - output[output.n] = bottomhalf - end - end -end - -function dokanji(lin, output, sty) - aegisub.set_status(lin.text_stripped) - - local fontname = "@HGSHigemoji" - - local lineheight = 0 - local syltime = 0 - local syls = {n=0} - for i = 1, lin.karaoke.n-1 do - local syl = lin.karaoke[i] - syl.height, syl.width, syl.descent, syl.extlead = aegisub.text_extents(sty, syl.text_stripped) - syl.start_time = syltime - syl.end_time = syltime + syl.duration - syltime = syltime + syl.duration - if syl.text == "#" then - syls[syls.n-1].duration = syls[syls.n-1].duration + syl.duration - syls[syls.n-1].end_time = syls[syls.n-1].end_time + syl.duration - --elseif syl.text == "" then - -- skip - else - lineheight = lineheight + syl.height - syls[syls.n] = syl - syls.n = syls.n + 1 - end - end - - for i = 0, syls.n-1 do - local syl = syls[i] - local top = 170 - for j = 0, 8 do - if i+j >= syls.n then - break - end - local newlin = copy_line(lin) - newlin.start_time = lin.start_time + syl.start_time - newlin.end_time = newlin.start_time + syl.duration - local startalpha, targetalpha - if j == 0 then - startalpha = 0 - targetalpha = 255 - else - startalpha = j * 255 / 8 - targetalpha = (j-1) * 255 / 8 - end - newlin.text = string.format("{\\fn%s\\an7\\fr-90\\move(%d,%d,%d,%d)\\1a&H%2x&\\3a&H%2x&\\t(\\1a&H%2x&\\3a&H%2x&)}%s", fontname, 620, top, 620, top-syl.height, startalpha, startalpha, targetalpha, targetalpha, syls[i+j].text) - top = top + syls[i+j].height - output.n = output.n + 1 - output[output.n] = newlin - end - end -end diff --git a/aegisub/automation/demos/auto3/8-skeleton.lua b/aegisub/automation/demos/auto3/8-skeleton.lua deleted file mode 100644 index 998805aa8..000000000 --- a/aegisub/automation/demos/auto3/8-skeleton.lua +++ /dev/null @@ -1,26 +0,0 @@ --- Aegisub Automation demonstration script --- Original written by Niels Martin Hansen --- Given into the public domain - -name = "Karaoke skeleton demo" -description = "This script demonstrates the use of the karaskel.lua include file, to avoid writing almost identical code for every karaoke effect script." -version, kind, configuration = 3, 'basic_ass', {} - --- Include the "magic" karaskel.lua file. It also includes utils.lua for you. --- karaskel.lua defines the process_lines function, so you'll usually not have to write that yourself -include("karaskel.lua") - --- Instead, a do_syllable function is written. This is called by karaskel for every syllable, to get the text replacement for that syllable. -function do_syllable(meta, styles, config, line, syl) - -- First check if it's the first syllable on the line; if it is don't bother doing anything special - if syl.i == 0 then - -- Remember you have to return the text of the syllable as well as any formatting tags you want - return syl.text - else - -- For other syllables, apply a little effect - return string.format("{\\r\\k%d\\t(%d,%d,\\1c&H%s&)}%s", syl.duration, syl.start_time, syl.end_time, line.styleref.color2, syl.text) - end -end - --- Exercise for the reader: Rewrite this script in "classic style", ie. the same way as demo 6. --- See how few lines you can get it down to, while still producing the same effect. diff --git a/aegisub/automation/demos/auto3/9-advanced-skeleton.lua b/aegisub/automation/demos/auto3/9-advanced-skeleton.lua deleted file mode 100644 index ac251500c..000000000 --- a/aegisub/automation/demos/auto3/9-advanced-skeleton.lua +++ /dev/null @@ -1,49 +0,0 @@ --- Aegisub Automation demonstration script --- Original written by Niels Martin Hansen --- Given into the public domain - -name = "Advanced skeleton demo" -description = "This script demonstrates using the karaskel-adv.lua include file to make rceation of per-syllable positioning effects easier." - -version, kind, configuration = 3, 'basic_ass', {} - -include("karaskel-adv.lua") - --- What kind of effect this makes: --- Each syllable "jumps" up and down once during its duration --- This is achieved using two \move operations, and as known, gabest's TextSub can only handle one \move per line --- So we need two lines per syllable, split exactly in the middle of the duration of the syllable - -function do_syllable(meta, styles, config, line, syl) - -- Make two copies of the original line (having the right timings etc) - local half1, half2 = copy_line(line), copy_line(line) - -- Make the first half line end halfway into the duration of the syllable - half1.end_time = half1.start_time + syl.start_time/10 + syl.duration/2 - -- And make the second half line start where the first one ends - half2.start_time = half1.end_time - -- Where to move the syllable to/from - local fromx, fromy = line.centerleft+syl.center, line.height*2 + 20 - local tox, toy = fromx, fromy - 10 - -- Generate some text for the syllable - half1.text = string.format("{\\an8\\move(%d,%d,%d,%d,%d,%d)}%s", fromx, fromy, tox, toy, syl.start_time, syl.start_time+syl.duration*5, syl.text_stripped) - half2.text = string.format("{\\an8\\move(%d,%d,%d,%d,%d,%d)}%s", tox, toy, fromx, fromy, 0, syl.duration*5, syl.text_stripped) - -- Things will look bad with overlapping borders and stuff unless - -- we manually layer borders lower than text, - -- and shadows lower than borders, so let's do that - local half1b, half1s = copy_line(half1), copy_line(half1) - half1b.text = "{\\1a&HFF&\\shad0}" .. half1b.text - half1s.text = "{\\1a&HFF&\\bord0}" .. half1s.text - half1.text = "{\\bord0\\shad0}" .. half1.text - half1.layer = 2 - half1b.layer = 1 - half1s.layer = 0 - local half2b, half2s = copy_line(half2), copy_line(half2) - half2b.text = "{\\1a&HFF&\\shad0}" .. half2b.text - half2s.text = "{\\1a&HFF&\\bord0\\shad2}" .. half2s.text - half2.text = "{\\bord0\\shad0}" .. half2.text - half2.layer = 2 - half2b.layer = 1 - half2s.layer = 0 - -- Done, return the two new lines - return {n=6, [1]=half1, [2]=half2b, [3]=half1s, [4]=half2, [5]=half2b, [6]=half2s} -end diff --git a/aegisub/automation/demos/auto3/readme.txt b/aegisub/automation/demos/auto3/readme.txt deleted file mode 100644 index 6939d8505..000000000 --- a/aegisub/automation/demos/auto3/readme.txt +++ /dev/null @@ -1,22 +0,0 @@ -This directory contains various Aegisub Automation scripts provided for demonstration -purposes. Most of these were originally written for testing the various functions -in Automation durings its development, but they hopefully can also serve as good -places to learn how to do things. -All of these scripts are written by Niels Martin Hansen. - -They are given into the public domain, but if you use a substantial part of any of -the more advanced ones, I'd really like a bit of credit where it's due. - -And remember, it's cheap to use someone else's advanced karaoke effect, especially -without any changes at all. It also gives bad karma. Like, *really* bad :) - -Apart from just the .lua files, there's also a few .ass files, used for eg. showing -how some special feature is implemented in the ASS itself. It should be obvious -what .lua and .ass files are related. - - -WARNING! -DO NOT ADD YOUR OWN FILES TO THIS DIRECTORY, -they will be deleted when you uninstall/upgrade Aegisub. -This also means it's unwise to modify these files, if you want to keep your -changes to them. diff --git a/aegisub/automation/include/karaskel-adv.auto3 b/aegisub/automation/include/karaskel-adv.auto3 deleted file mode 100644 index fd40ed3a1..000000000 --- a/aegisub/automation/include/karaskel-adv.auto3 +++ /dev/null @@ -1,74 +0,0 @@ ---[[ - Copyright (c) 2005, Niels Martin Hansen - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of the Aegisub Group nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - ]] - --- Aegisub Automation include file --- This include file is an extension of karaskel.lua providing out-of-the-box support for per-syllable --- positioning of karaoke. - --- It automatically includes and re-setups karaskel.lua, so you should not include that yourself! -include("karaskel-base.auto3") -karaskel.engage_positioning = true - --- The interface here has been greatly simplified, there is only one function to override, do_syllable --- The format for that one has changed. --- The rest of the functions can be "emulated" through the do_syllable function. --- Though you can still also override do_line and get an effect our of it, it's not advisable, since that --- defeats the entire purpose of using this include file. - --- The arguments here mean the same as in karaskel.lua, and all tables have the same members --- The return value is different now, though. --- It is required to be in the same format as the do_line function: --- A table with an "n" key, and keys 1..n with line structures. -function karaskel.do_syllable(meta, styles, config, line, syl) - karaskel.trace("default_do_syllable") - return {n=0} -end -do_syllable = karaskel.do_syllable - -function karaskel.do_line(meta, styles, config, line) - karaskel.trace("adv_do_line") - if line.kind ~= "dialogue" then - return {n=1, [1]=line} - end - local result = {n=0} - for i = 0, line.karaoke.n-1 do - karaskel.trace("adv_do_line:2:"..i) - local out = do_syllable(meta, styles, config, line, line.karaoke[i]) - karaskel.trace("adv_do_line:produced " .. out.n) - for j = 1, out.n do - karaskel.trace("adv_do_line:produced:" .. out[j].kind) - result.n = result.n + 1 - result[result.n] = out[j] - end - karaskel.trace("adv_do_line:3:"..result.n) - end - karaskel.trace("adv_do_line:4") - return result -end -do_line = karaskel.do_line diff --git a/aegisub/automation/include/karaskel-adv.lua b/aegisub/automation/include/karaskel-adv.lua deleted file mode 100644 index 28eb6e6ab..000000000 --- a/aegisub/automation/include/karaskel-adv.lua +++ /dev/null @@ -1,39 +0,0 @@ ---[[ - Copyright (c) 2007, Niels Martin Hansen, Rodrigo Braz Monteiro - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of the Aegisub Group nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. -]] - --- Aegisub Automation 4 Lua --- Nothing different between "regular" and "advanced" karaskel now, but auto3 will expect it - --- Compatibility hatch -if aegisub.lua_automation_version < 4 then - include("karaskel-adv.auto3") - return -end - -include("karaskel.lua") diff --git a/aegisub/automation/include/karaskel-base.auto3 b/aegisub/automation/include/karaskel-base.auto3 deleted file mode 100644 index eedc9066d..000000000 --- a/aegisub/automation/include/karaskel-base.auto3 +++ /dev/null @@ -1,438 +0,0 @@ ---[[ - Copyright (c) 2005, Niels Martin Hansen - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of the Aegisub Group nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - ]] - --- Aegisub Automation include file --- This file is meant as a support file for the various karaoke skeleton --- scripts, to avoid including unneeded code - -include("utils.auto3") - --- karaskel --- This is a gloabl table defining various parameters, controlling what the --- skeleton will do. Not all parameters are defined in this base. -karaskel = { - -- Does this script need positioning information? - engage_positioning = false, - -- Syllable precalc parameters - precalc_start_progress = 0, -- progress precalc starts at - precalc_end_progress = 50, -- and where it ends at - -- Does this script use furigana information? (has no effect without positioning) - engage_furigana = false, - -- Furigana parameters - furigana_scale = 0.4, -- relative size of furigana - -- Default effect-name for inline effects (read manual) - inline_fx_default = "regular", - -- Set this to the name of the style used for out-of-line effect specifications, if any (read manual on this!) - ool_fx_style = false, - -- Show tracing messages? - engage_trace = false -} - -function karaskel.warning(s) - aegisub.output_debug("WARNING! " .. s) -end - -function karaskel.trace(s) - if karaskel.engage_trace then - aegisub.output_debug(s) - else - -- A little optimisation - karaskel.trace = function() end - end -end - --- parse_syllable_data --- Generates the line.karaoke table --- This was moved to Lua code from the C++ code for various technical reasons -function karaskel.parse_syllable_data(meta, styles, lines) - for i = 0, lines.n-1 do - local l = lines[i] - local ltext = l.text - local indrawing = false - - l.karaoke = { n = 0 } - - local cursyl = { - duration = 0, - kind = "", - text = "", - text_stripped = "" - } - - l.text_stripped = "" - - local function report(misc) - karaskel.trace("l.text_stripped = " .. l.text_stripped) - karaskel.trace(string.format("cursyl: dur=%d kind=%s text='%s' text_stripped='%s'", cursyl.duration, cursyl.kind, cursyl.text, cursyl.text_stripped)) - karaskel.trace(misc) - end - - report("starting parsing") - - while ltext ~= "" do - -- Find text part up until next tag start - local tagstart = string.find(ltext, "{") - - local textpart - if not tagstart then - -- No tag start was found, rest of line is text - textpart = ltext - ltext = "" - else - -- Tag start was found, cut text part out - textpart = string.sub(ltext, 1, tagstart-1) - ltext = string.sub(ltext, tagstart+1) -- skip over opening brace - end - - -- Append text to relevant strings - if not indrawing then - l.text_stripped = l.text_stripped .. textpart - cursyl.text_stripped = cursyl.text_stripped .. textpart - end - cursyl.text = cursyl.text .. textpart - - report(string.format("tagstart=%d, textpart='%s', ltext='%s'", tagstart or -1, textpart, ltext)) - - -- If we're out of line text, we're done - if ltext == "" then - break - end - - -- Now find the tag group end - local tagend = string.find(ltext, "}") - - local tagpart - if not tagend then - -- Technically wrong, unclosed tag group - tagpart = ltext - ltext = "" - else - -- Take tag group and rest of text - tagpart = string.sub(ltext, 1, tagend-1) - ltext = string.sub(ltext, tagend+1) - end - - karaskel.trace(string.format("tagend=%d, tagpart='%s', ltext='%s'", tagend or -1, tagpart, ltext)) - - -- Look for interesting tags (karaoke and drawing) - while tagpart ~= "" do - local tagstart, tagend, tag, param = string.find(tagpart, "\\([kKp]%a*)(%d+)") - - karaskel.trace(string.format("tagstart=%d, tagend=%d, tag=%s, param=%s", tagstart or -1, tagend or -1, tag or "", param or "")) - - param = param and tonumber(param) or 0 - - if tag and string.find(tag, "^[kK]") then - -- Karaoke tag, split stuff up - - -- If the kara tag wasn't the first thing in the group, prepend previous stuff - if tagstart > 1 then - cursyl.text = cursyl.text .. "{" .. string.sub(tagpart, 1, tagstart) .. "}" - end - - -- Store last tag to table and prepare new one - l.karaoke[l.karaoke.n] = cursyl - l.karaoke.n = l.karaoke.n + 1 - cursyl = { - duration = tonumber(param), - kind = tag, - text = "", - text_stripped = "" - } - - -- Remove up to and including this tag from the tagpart - tagpart = string.sub(tagpart, tagend+1) - - elseif tag and tag == "p" then - -- Switch drawing-mode on/off - indrawing = param > 0 - - else - -- No more interesting tags here - if tagpart ~= "" then - cursyl.text = cursyl.text .. "{" .. tagpart .. "}" - end - break - end - - report(string.format("indrawing=%s", indrawing and "t" or "f")) - end - end - - l.karaoke[l.karaoke.n] = cursyl - l.karaoke.n = l.karaoke.n + 1 - end -end - --- precalc_syllable_data --- Adds various extra fields to the line and syllable tables --- See the implementation and/or Aegisub help file for more information -function karaskel.precalc_syllable_data(meta, styles, lines) - karaskel.trace("precalc_syllable_data") - aegisub.set_status("Preparing syllable-data") - - -- Fix missing resolution data - if meta.res_x == 0 and meta_res_y == 0 then - meta.res_x = 384 - meta.res_y = 288 - elseif meta.res_x == 0 then - -- This is braindead, but it's how TextSub does things... - if meta.res_y == 1024 then - meta.res_x = 1280 - else - meta.res_x = meta.res_y / 3 * 4 - end - elseif meta.res_y == 0 then - -- As if 1280x960 didn't exist - if meta.res_x == 1280 then - meta.res_y = 1024 - else - meta.res_y = meta.res_x * 3 / 4 - end - end - - for i = 0, lines.n-1 do - karaskel.trace("precalc_syllable_data:2:"..i) - aegisub.report_progress(karaskel.precalc_start_progress + i/lines.n*(karaskel.precalc_end_progress-karaskel.precalc_start_progress)) - local line, style = lines[i] - -- Index number of the line - line.i = i - -- Linked list-style access - line.prev = lines[i-1] - line.next = lines[i+1] - karaskel.trace("precalc_syllable_data:3:") - if line.kind == "dialogue" or line.kind == "comment" then - karaskel.trace("precalc_syllable_data:4:") - local style = styles[line.style] - if not style then - -- ok, so the named style does not exist... well there MUST be at least ONE style (assume this) - -- pick the first one - style = styles[0] - karaskel.warning(string.format("You have a line using a style named \"%s\", but that style does not exist! Using the first defined style (\"%s\") instead.", line.style, style.name)) - end - if karaskel.engage_furigana then - karaskel.split_furigana_data(line) - line.text_stripped = "" - for k = 0, line.karaoke.n-1 do - line.text_stripped = line.text_stripped .. line.karaoke[k].text_stripped - end - end - -- This should make things more predictable - line.text_stripped = trim(line.text_stripped) - if karaskel.engage_positioning then - -- Line dimensions - line.width, line.height, line.ascent, line.extlead = aegisub.text_extents(style, line.text_stripped) - karaskel.trace(string.format("precalc_syllable_data:5: text_stripped='%s', width=%d", line.text_stripped, line.width)) - -- Line position - line.centerleft = math.floor((meta.res_x - line.width) / 2) - line.centerright = meta.res_x - line.centerleft - end - -- Line duration, in miliseconds - line.duration = (line.end_time - line.start_time) * 10 - -- Style reference - line.styleref = style - karaskel.trace("precalc_syllable_data:6:") - -- Process the syllables - local curtime = 0 - local sumtext = "" - local inline_fx = karaskel.inline_fx_default - for j = 0, line.karaoke.n-1 do - karaskel.trace("precalc_syllable_data:7::"..j) - local syl = line.karaoke[j] - -- Syllable index - syl.i = j - -- Check for inline-effect - karaskel.trace("testing for inline_fx in: " .. syl.text) - local a, b, new_inline_fx = string.find(syl.text, "{%\\?%-(.*)}") - if new_inline_fx then - karaskel.trace("caught new inline_fx: " .. new_inline_fx) - inline_fx = new_inline_fx - end - syl.inline_fx = inline_fx - -- Do positioning calculations, if applicable - sumtext = sumtext .. syl.text_stripped - karaskel.trace("new sumtext = " .. sumtext) - if karaskel.engage_positioning then - -- Summed text dimensions - local sumwidth = aegisub.text_extents(style, sumtext) - karaskel.trace("sumwidth = " .. sumwidth) - -- Strip some spaces - local tmp1, tmp2, prespc, syltxt, postspc = string.find(syl.text_stripped, "^([ \t]*)(.-)([ \t]*)$") - -- Pre/post space dimensions - local prespc_width = aegisub.text_extents(style, prespc) - local postspc_width = aegisub.text_extents(style, postspc) - karaskel.trace("space capture lengths = " .. string.len(prespc) .. ", " .. string.len(syltxt) .. ", " .. string.len(postspc)) - karaskel.trace("space widths = " .. prespc_width .. ", " .. postspc_width) - -- Syllable dimensions - syl.width, syl.height, syl.ascent, syl.extlead = aegisub.text_extents(style, syltxt) - karaskel.trace("syllable text, width = " .. syltxt .. ", " .. syl.width) - karaskel.trace("precalc_syllable_data:8::") - -- Syllable positioning - syl.right = sumwidth - postspc_width - syl.left = sumwidth - syl.width + prespc_width - syl.center = math.floor(syl.left + (syl.right - syl.left) / 2) - karaskel.trace("syllable left, center, right = " .. syl.left .. ", " .. syl.center .. ", " .. syl.right) - if syl.furigana then - karaskel.calc_furigana_sizes(line, syl) - end - end - -- Start and end times in miliseconds - syl.start_time = curtime - syl.end_time = curtime + syl.duration*10 - curtime = syl.end_time - end - end - end -end - --- Rebuild the entire karaoke data list, splitting out and adding furigana data --- This also does joining of syllables with "#" as text --- (Joining of furigana syllables with # as text seems useless for now, so it's not done.) -function karaskel.split_furigana_data(line) - if line.kind ~= "dialogue" then - karaskel.trace("skipping line, not dialogue") - return - end - karaskel.trace("split_furigana_data:1") - line.furigana = {n=0} - local newkara = {n=0} - local curtime = 0 - for i = 0, line.karaoke.n-1 do - karaskel.trace("split_furigana_data:2:"..i) - local syl = line.karaoke[i] - local a, b, maintext, furitext = string.find(syl.text_stripped, "^(.*)|(.*)$") - if not maintext then - maintext = syl.text_stripped - end - karaskel.trace("split_furigana_data:3:"..i..":"..maintext) - local highlight = { duration = syl.duration, start_time = curtime*10, end_time = curtime*10+syl.duration*10 } - curtime = curtime + syl.duration - if maintext == "#" then - karaskel.trace("split_furigana_data:4:"..i..":a") - -- repeat character - newkara[newkara.n-1].duration = newkara[newkara.n-1].duration + syl.duration - syl = newkara[newkara.n-1] - else - karaskel.trace("split_furigana_data:4:"..i..":b") - syl.furigana = {n=0, text=""} -- essentially a list of syllables in the syllable :o - syl.highlights = {n=0} - syl.text_stripped = maintext - newkara[newkara.n] = syl - newkara.n = newkara.n + 1 - end - karaskel.trace("split_furigana_data:5:"..i) - syl.highlights[syl.highlights.n] = highlight - syl.highlights.n = syl.highlights.n + 1 - if a then - karaskel.trace("split_furigana_data:6:"..i) - local furi = { text = furitext, duration = highlight.duration, start_time = highlight.start_time, end_time = highlight.end_time } - syl.furigana[syl.furigana.n] = furi - syl.furigana.n = syl.furigana.n + 1 - syl.furigana.text = syl.furigana.text .. furitext - end - end - line.karaoke = newkara -end - -function karaskel.calc_furigana_sizes(line, syl) - -- assume the sizes for the main syllable itself has been calculated already - local ls = line.styleref - local style = { -- only copy what's needed for text_extents - fontname = ls.fontname, - fontsize = ls.fontsize * karaskel.furigana_scale, - bold = ls.bold, - italic = ls.italic, - underline = ls.underline, - strikeout = ls.strikeout, - scale_x = ls.scale_x, - scale_y = ls.scale_y, - spacing = ls.spacing, - encoding = ls.encoding - } - syl.furigana.width, syl.furigana.height = aegisub.text_extents(style, syl.furigana.text) - syl.furigana.scale = syl.width / syl.furigana.width * 100 - syl.furigana.fontsize = style.fontsize - if syl.furigana.scale > 100 then - syl.furigana.scale = 100 - else - syl.furigana.width = syl.width - end - style.scale_x = style.scale_x * syl.furigana.scale / 100 - local left = syl.left + (syl.width - syl.furigana.width)/2 - for i = 0, syl.furigana.n-1 do - local f = syl.furigana[i] - f.width, f.height = aegisub.text_extents(style, f.text) - f.left = left - f.center = f.left + f.width/2 - f.right = f.left + f.width - left = f.right - end -end - --- Everything else is done in the process_lines function -function karaskel.process_lines(meta, styles, lines, config) - karaskel.trace("new skeleton") - karaskel.trace("skel_process_lines") - -- Do a little pre-calculation for each line and syllable - karaskel.parse_syllable_data(meta, styles, lines) - karaskel.precalc_syllable_data(meta, styles, lines) - karaskel.trace("skel_process_lines:2") - -- A var for the new output - local result = {n=0} - local ool_fx = {} - aegisub.set_status("Running main-processing") - -- Now do the usual processing - for i = 0, lines.n-1 do - karaskel.trace("skel_process_lines:3:"..i) - aegisub.report_progress(50+i/lines.n*50) - if (lines[i].kind == "dialogue" or lines[i].kind == "comment") and lines[i].style == karaskel.ool_fx_style then - karaskel.trace("skel_process_lines: parsing ool fx: " .. lines[i].text) - local fx = {} - fx.head, fx.tail = string.headtail(lines[i].text) - karaskel.trace("--- head: '" .. fx.head .. "'") - karaskel.trace("--- tail: '" .. fx.tail .. "'") - fx.line = lines[i] - fx.start_time, fx.end_time = fx.line.start_time, fx.line.end_time - ool_fx[fx.head] = fx - else - -- Get replacement lines - lines[i].ool_fx = ool_fx - repl = do_line(meta, styles, config, lines[i]) - karaskel.trace("skel_process_lines:4:"..i..":"..repl.n) - -- Append to result table - for j = 1, repl.n do - result.n = result.n + 1 - result[result.n] = repl[j] - end - end - end - -- Done, return the stuff - return result -end -process_lines = karaskel.process_lines diff --git a/aegisub/automation/include/karaskel-base.lua b/aegisub/automation/include/karaskel-base.lua deleted file mode 100644 index 899aed5c9..000000000 --- a/aegisub/automation/include/karaskel-base.lua +++ /dev/null @@ -1,39 +0,0 @@ ---[[ - Copyright (c) 2007, Niels Martin Hansen, Rodrigo Braz Monteiro - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of the Aegisub Group nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. -]] - --- Aegisub Automation 4 Lua --- No "base" karaskel any longer, but auto3 scripts might expect it - --- Compatibility hatch -if aegisub.lua_automation_version < 4 then - include("karaskel-base.auto3") - return -end - -include("karaskel.lua") diff --git a/aegisub/automation/include/karaskel.auto3 b/aegisub/automation/include/karaskel.auto3 deleted file mode 100644 index afadcaeed..000000000 --- a/aegisub/automation/include/karaskel.auto3 +++ /dev/null @@ -1,134 +0,0 @@ ---[[ - Copyright (c) 2005, Niels Martin Hansen - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of the Aegisub Group nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - ]] - --- Aegisub Automation include file --- The purpose of this include file is to provide a default skeleton for Automation scripts, --- where you, as a scripter, can just override the functions you need to override. - --- The following functions can be overridden: --- do_syllable - called for each syllable in a line --- do_line_decide - called to decide whether to process a line or not --- do_line_start - called at the beginning of each line --- do_line_end - called at the end of each line --- do_line - Process an entire line --- By default, these functions are all assigned to the following default functions --- Your functions should obviously use the same parameter lists etc. --- Note that if you override do_line, none of the other functions will be called! - - --- All the functions mentioned here are, however, wrapped in some code that pre-calculates some --- extra data for the lines and syllables. - --- The following fields are added to lines: --- i - The index of the line in the file, 0 being the first --- width - Rendered width of the line in pixels (using the line style, overrides are not taken into account) --- height - Rendered height of the line in pixels (note that rotation isn't taken into account either) --- ascent - Height of the ascenders, in pixels (notice that this looks like the output of text_extents?) --- extlead - External leading of the font, in pixels (well, it is!) --- centerleft - Pixel position of the left edge of the line, when horisontally centered on screen --- centerright - Pixel pisition of the right edge of the line, when horisontally centered on screen --- duration - Duration of the line in miliseconds --- styleref - The actual style table for the style this line has - --- The following fields are added to syllables: --- i - The index of the syllable in the line, 0 being the first (and usually empty) one --- width, height, ascent, extlead - Same as for lines --- left - Left pixel position of the syllable, relative to the start of the line --- center - Center pixel position of the syllable, also relative to the start of the line --- right - Right pixel position of the syllable, relative again --- start_time - Start time of the syllable, in miliseconds, relative to the start of the line --- end_time - End time of the syllable, similar to start_time - -include("karaskel-base.auto3") - --- Return a replacement text for a syllable -function karaskel.do_syllable(meta, styles, config, line, syl) - karaskel.trace("default_do_syllable") - return syl.text -end - --- Decide whether or not to process a line -function karaskel.do_line_decide(meta, styles, config, line) - karaskel.trace("default_do_line_decide") - return line.kind == "dialogue" -end - --- Return a text to prefix the line -function karaskel.do_line_start(meta, styles, config, line) - karaskel.trace("default_do_line_start") - return "" -end - --- Return a text to suffix the line -function karaskel.do_line_end(meta, styles, config, line) - karaskel.trace("default_do_line_end") - return "" -end - --- Process an entire line (which has pre-calculated extra data in it already) --- Return a table of replacement lines -function karaskel.do_line(meta, styles, config, line) - karaskel.trace("default_do_line") - - -- Check if the line should be processed at all - if not do_line_decide(meta, styles, config, line) then - return {n=0} - end - karaskel.trace("default_do_line:2") - - -- Create a new local var for the line replacement text, set it to line prefix - -- This is to make sure the actual line text isn't replaced before the line has been completely processed - local newtext = do_line_start(meta, styles, config, line) - karaskel.trace("default_do_line:3") - - -- Loop over the syllables - for i = 0, line.karaoke.n-1 do - karaskel.trace("default_do_line:4:"..i) - -- Append the replacement for each syllable onto the line - newtext = newtext .. do_syllable(meta, styles, config, line, line.karaoke[i]) - end - karaskel.trace("default_do_line:5") - - -- Append line suffix - newtext = newtext .. do_line_end(meta, styles, config, line) - karaskel.trace("default_do_line:6") - - -- Now replace the line text - line.text = newtext - - -- And return a table with one entry - return {n=1; [1]=line} -end - --- Now assign all the default functions to the names that are actually called -do_syllable = karaskel.do_syllable -do_line_decide = karaskel.do_line_decide -do_line_start = karaskel.do_line_start -do_line_end = karaskel.do_line_end -do_line = karaskel.do_line diff --git a/aegisub/automation/include/karaskel.lua b/aegisub/automation/include/karaskel.lua index 5c9c903fb..3dea6b8cb 100644 --- a/aegisub/automation/include/karaskel.lua +++ b/aegisub/automation/include/karaskel.lua @@ -27,10 +27,4 @@ POSSIBILITY OF SUCH DAMAGE. ]] --- Include the right file, depending on Automation version --- The Auto4 version has to be in a separate include to avoid parser problems with Lua 5.0 -if aegisub.lua_automation_version < 4 then - include "karaskel.auto3" -else - include "karaskel-auto4.lua" -end +include "karaskel-auto4.lua" diff --git a/aegisub/automation/include/utils.auto3 b/aegisub/automation/include/utils.auto3 deleted file mode 100644 index 09b2c7c67..000000000 --- a/aegisub/automation/include/utils.auto3 +++ /dev/null @@ -1,233 +0,0 @@ ---[[ - Copyright (c) 2005, Niels Martin Hansen, Rodrigo Braz Monteiro - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of the Aegisub Group nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - ]] - --- Variables with tables only hold references to the actual tables --- Since a line is a table, a line needs to be copied, otherwise things break in bad ways -function copy_line(input) - local output = {} - output.kind = input.kind - if input.kind == "scomment" then - output.text = input.text - elseif input.kind == "comment" or input.kind == "dialogue" then - output.layer = input.layer - output.start_time = input.start_time - output.end_time = input.end_time - output.style = input.style - output.name = input.name - output.margin_l = input.margin_l - output.margin_r = input.margin_r - output.margin_v = input.margin_v - output.effect = input.effect - output.text = input.text - output.text_stripped = input.text_stripped - output.karaoke = input.karaoke -- Don't bother copying the karaoke table, it shouldn't be changed anyway - end - return output -end - - --- Generates ASS hexadecimal string from R,G,B integer components, in &HBBGGRR& format -function ass_color(r,g,b) - return string.format("&H%02X%02X%02X&",b,g,r) -end --- Format an alpha-string for \Xa style overrides -function ass_alpha(a) - return string.format("&H%02X&", a) -end --- Format an ABGR string for use in style definitions (these don't end with & either) -function ass_style_color(r,g,b,a) - return string.format("&H%02X%02X%02X%02X",a,b,g,r) -end - --- Extract colour components of an ASS colour -function extract_color(s) - local a, b, g, r, d1, d2 - - -- Try a style first - d1, d2, a, b, g, r = string.find(s, "&H(%x%x)(%x%x)(%x%x)(%x%x)") - if a then - return tonumber(r, 16), tonumber(g, 16), tonumber(b, 16), tonumber(a, 16) - end - - -- Then a colour override - d1, d2, b, g, r = string.find(s, "&H(%x%x)(%x%x)(%x%x)&") - if b then - return tonumber(r, 16), tonumber(g, 16), tonumber(b, 16), 0 - end - - -- Then an alpha override - d1, d2, a = string.find(s, "&H(%x%x)&") - if a then - return 0, 0, 0, tonumber(a, 16) - end - - -- Ok how about HTML format then? - d1, d2, r, g, b, a = string.find(s, "#(%x%x)(%x%x)?(%x%x)?(%x%x)?") - if r then - return tonumber(r or 0, 16), tonumber(g or 0, 16), tonumber(b or 0, 16), tonumber(a or 0, 16) - end - - -- Failed... - return nil -end -aegisub.colorstring_to_rgb = extract_color - --- Create an alpha override code from a style definition colour code -function alpha_from_style(scolor) - local r, g, b, a = extract_color(scolor) - return ass_alpha(a) -end - --- Create an colour override code from a style definition colour code -function color_from_style(scolor) - local r, g, b = extract_color(scolor) - return ass_color(r, g, b) -end - - --- Converts HSV (Hue, Saturation, Value) to RGB -function HSV_to_RGB(H,S,V) - local r,g,b; - - -- Saturation is zero, make grey - if S == 0 then - r = V*255 - if r < 0 then - r = 0 - end - if r > 255 then - r = 255 - end - g = r - b = r - - -- Else, calculate color - else - -- Calculate subvalues - local Hi = math.floor(H/60) - local f = H/60.0 - Hi - local p = V*(1-S) - local q = V*(1-f*S) - local t = V*(1-(1-f)*S) - - -- Do math based on hue index - if Hi == 0 then - r = V*255.0 - g = t*255.0 - b = p*255.0 - elseif Hi == 1 then - r = q*255.0 - g = V*255.0 - b = p*255.0 - elseif Hi == 2 then - r = p*255.0 - g = V*255.0 - b = t*255.0 - elseif Hi == 3 then - r = p*255.0 - g = q*255.0 - b = V*255.0 - elseif Hi == 4 then - r = t*255.0 - g = p*255.0 - b = V*255.0 - elseif Hi == 5 then - r = V*255.0 - g = p*255.0 - b = q*255.0 - end - end - - r = math.floor(r) - g = math.floor(g) - b = math.floor(b) - return r,g,b -end - - --- Removes spaces at the start and end of string -function trim (s) - return (string.gsub(s, "^%s*(.-)%s*$", "%1")) -end - - --- UTF-8 string handling functions --- Contributed by roxfan - --- Get the offset for the next character in the string, given the current offset -function next_utf_char(str, off) - local leadb = string.byte(str, off) - if leadb < 128 then - return off+1 - elseif leadb < 224 then - return off+2 - elseif leadb < 240 then - return off+3 - elseif leadb < 248 then - return off+4 - end - aegisub.output_debug(string.format("bad utf-8 in %q at %d",str,off)) - return -1 -end - --- Get the number of characters in the UTF-8 string (not the number of bytes) -function utf_len(str) - local i = 1 - local len = 0 - while i<=string.len(str) do - i = next_utf_char(str, i) - len = len + 1 - end - -- aegisub.output_debug(string.format("utf_len(%q)=%d",str,len)) - return len -end - - --- Get the "head" and "tail" of a string, treating it as a sequence of words separated by one or more space-characters -function string.headtail(s) - local a, b, head, tail = string.find(s, "(.-)%s+(.*)") - if a then - return head, tail - else - return s, "" - end -end - - --- Exclusive or of two boolean values -function xor(a, b) - if a and not b then - return a - elseif b and not a then - return b - else - return false - end -end - diff --git a/aegisub/automation/include/utils.lua b/aegisub/automation/include/utils.lua index c08374426..f9b70157a 100644 --- a/aegisub/automation/include/utils.lua +++ b/aegisub/automation/include/utils.lua @@ -27,10 +27,4 @@ POSSIBILITY OF SUCH DAMAGE. ]] --- Include the right file, depending on Automation version --- The Auto4 version has to be in a separate include to avoid parser problems with Lua 5.0 -if aegisub.lua_automation_version < 4 then - include "utils.auto3" -else - include "utils-auto4.lua" -end +include "utils-auto4.lua" diff --git a/aegisub/automation/tests/test-auto3-parsing.auto3 b/aegisub/automation/tests/test-auto3-parsing.auto3 deleted file mode 100644 index b80881bd9..000000000 --- a/aegisub/automation/tests/test-auto3-parsing.auto3 +++ /dev/null @@ -1,10 +0,0 @@ -name = "Test auto3 parsing" -description = "Make sure it works" -version, kind = 3, "basic_ass" - -include "karaskel-base.auto3" - -function process_lines(meta, styles, lines, config) - karaskel.parse_syllable_data(meta, styles, lines) - return lines -end diff --git a/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj b/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj index e28a5c90a..698e34031 100644 --- a/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj +++ b/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj @@ -527,14 +527,6 @@ - - - - @@ -1538,7 +1530,7 @@ - + @@ -1546,7 +1538,7 @@ - + diff --git a/aegisub/packages/win_installer/aegisub2.iss b/aegisub/packages/win_installer/aegisub2.iss index bc5f307dc..7db6a2d28 100644 --- a/aegisub/packages/win_installer/aegisub2.iss +++ b/aegisub/packages/win_installer/aegisub2.iss @@ -86,8 +86,6 @@ DestDir: {tmp}; Source: src\vcredist_x86.exe; Flags: nocompression deleteafterin DestDir: {app}; Source: src\aegisub32.exe; Flags: ignoreversion; Components: main DestDir: {app}; Source: src\aegisub32.pdb; Flags: ignoreversion; Components: main/pdb DestDir: {app}; Source: license.txt; Flags: ignoreversion; Tasks: ; Languages: ; Components: main -DestDir: {app}; Source: src\libauto3_32.dll; Flags: ignoreversion; Components: main -DestDir: {app}; Source: src\libauto3_32.pdb; Flags: ignoreversion; Components: main/pdb ; avisynth DestDir: {app}; Source: src\devil.dll; Flags: ignoreversion; Components: codec DestDir: {app}; Source: src\avisynth.dll; Flags: ignoreversion; Components: codec @@ -110,17 +108,6 @@ DestDir: {app}\automation\demos; Source: src\automation\demos\future-windy-blur. DestDir: {app}\automation\autoload; Source: src\automation\autoload\macro-1-edgeblur.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Components: auto/lua/samples; Attribs: readonly DestDir: {app}\automation\autoload; Source: src\automation\autoload\macro-2-mkfullwitdh.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Components: auto/lua/samples; Attribs: readonly DestDir: {app}\automation\autoload; Source: src\automation\autoload\cleantags-autoload.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Components: auto/lua/samples; Attribs: readonly -; auto3 -DestDir: {app}\automation\include; Source: src\automation\include\utils.auto3; Flags: ignoreversion overwritereadonly uninsremovereadonly; Components: auto/auto3; Attribs: readonly -DestDir: {app}\automation\include; Source: src\automation\include\karaskel.auto3; Flags: ignoreversion overwritereadonly uninsremovereadonly; Components: auto/auto3; Attribs: readonly -DestDir: {app}\automation\include; Source: src\automation\include\karaskel-adv.auto3; Flags: ignoreversion overwritereadonly uninsremovereadonly; Components: auto/auto3; Attribs: readonly -DestDir: {app}\automation\include; Source: src\automation\include\karaskel-adv.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Components: auto/auto3; Attribs: readonly -DestDir: {app}\automation\include; Source: src\automation\include\karaskel-base.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Components: auto/auto3; Attribs: readonly -DestDir: {app}\automation\include; Source: src\automation\include\karaskel-base.auto3; Flags: ignoreversion overwritereadonly uninsremovereadonly; Components: auto/auto3; Attribs: readonly -DestDir: {app}\automation\auto3; Source: src\automation\auto3\line-per-syllable.auto3; Flags: ignoreversion overwritereadonly uninsremovereadonly; Components: auto/auto3; Attribs: readonly -DestDir: {app}\automation\auto3; Source: src\automation\auto3\multi-template.auto3; Flags: ignoreversion overwritereadonly uninsremovereadonly; Components: auto/auto3; Attribs: readonly -DestDir: {app}\automation\auto3; Source: src\automation\auto3\simple-k-replacer.auto3; Flags: ignoreversion overwritereadonly uninsremovereadonly; Components: auto/auto3; Attribs: readonly -DestDir: {app}\automation\docs; Source: src\automation\docs\automation3.txt; Flags: ignoreversion overwritereadonly uninsremovereadonly; Components: auto/auto3; Attribs: readonly ; dictionaries Source: src\dictionaries\en_GB.aff; DestDir: {app}\dictionaries; Flags: skipifsourcedoesntexist ignoreversion solidbreak; Components: dic/en_GB Source: src\dictionaries\en_GB.dic; DestDir: {app}\dictionaries; Flags: skipifsourcedoesntexist ignoreversion; Components: dic/en_GB @@ -226,7 +213,6 @@ Name: codec/vsfilter; Description: VSFilter 2.39e; Types: compact full custom; F Name: auto; Description: Automation 4 scripting support; Types: compact full Name: auto/lua; Description: Lua; Types: compact full; Flags: checkablealone; Languages: Name: auto/lua/samples; Description: Lua sample scripts; Types: full -Name: auto/auto3; Description: Automation 3 backwards compatibility; Types: full ; Docs Name: docs; Description: User manual; Types: custom compact full ; Translations (commented out ones are out of date) diff --git a/aegisub/src/auto4_auto3.cpp b/aegisub/src/auto4_auto3.cpp deleted file mode 100644 index a97005c85..000000000 --- a/aegisub/src/auto4_auto3.cpp +++ /dev/null @@ -1,760 +0,0 @@ -// Copyright (c) 2005, 2006, 2007, Niels Martin Hansen -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// * Neither the name of the Aegisub Group nor the names of its contributors -// may be used to endorse or promote products derived from this software -// without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. -// -// ----------------------------------------------------------------------------- -// -// AEGISUB -// -// Website: http://aegisub.cellosoft.com -// Contact: mailto:jiifurusu@gmail.com -// - - -#include "config.h" - -#ifdef WITH_AUTOMATION -#ifdef WITH_AUTO3 - -#include -#include -#include "auto4_auto3.h" -#include "auto4_auto3_factory.h" -#include "libauto3/auto3.h" -#include "options.h" -#include "string_codec.h" -#include "vfr.h" -#include "ass_override.h" - -namespace Automation4 { - - // Auto3ProgressSink - - void Auto3ProgressSink::SetStatus(void *cbdata, const char *msg) - { - Auto3ProgressSink *ps = (Auto3ProgressSink*)cbdata; - ps->SetTask(wxString(msg, wxConvUTF8)); - } - - void Auto3ProgressSink::OutputDebug(void *cbdata, const char *msg) - { - Auto3ProgressSink *ps = (Auto3ProgressSink*)cbdata; - ps->AddDebugOutput(wxString(msg, wxConvUTF8)); - ps->AddDebugOutput(_T("\n")); - } - - void Auto3ProgressSink::ReportProgress(void *cbdata, float progress) - { - Auto3ProgressSink *ps = (Auto3ProgressSink*)cbdata; - ps->SetProgress(progress); - } - - Auto3ProgressSink::Auto3ProgressSink(Auto3Interpreter *_script, wxWindow *parent) - : ProgressSink(parent) - , script(_script) - { - script->cb.logdata = this; - script->cb.log_error = OutputDebug; - script->cb.log_message = OutputDebug; - script->cb.set_progress = ReportProgress; - script->cb.set_status = SetStatus; - } - - Auto3ProgressSink::~Auto3ProgressSink() - { - script->cb.logdata = 0; - script->cb.log_error = 0; - script->cb.log_message = 0; - script->cb.set_progress = 0; - script->cb.set_status = 0; - } - - - // Auto3ConfigDialog - - wxWindow* Auto3ConfigDialog::CreateWindow(wxWindow *parent) - { - if (options->name == 0) - return 0; - - wxPanel *res = new wxPanel(parent, -1); - - wxFlexGridSizer *sizer = new wxFlexGridSizer(2, 5, 5); - - for (Auto3ConfigOption *opt = options; opt->name; opt++) { - if (opt->kind == COK_INVALID) - continue; - - Control control; - control.option = opt; - - switch (opt->kind) { - case COK_LABEL: - control.control = new wxStaticText(res, -1, wxString(opt->label, wxConvUTF8)); - break; - - case COK_TEXT: - control.control = new wxTextCtrl(res, -1, wxString(opt->value.stringval, wxConvUTF8)); - break; - - case COK_INT: - control.control = new wxSpinCtrl(res, -1); - if (opt->min.valid && opt->max.valid) { - ((wxSpinCtrl*)control.control)->SetRange(opt->min.intval, opt->max.intval); - } else if (opt->min.valid) { - ((wxSpinCtrl*)control.control)->SetRange(opt->min.intval, 0x7fff); - } else if (opt->max.valid) { - ((wxSpinCtrl*)control.control)->SetRange(-0x7fff, opt->max.intval); - } else { - ((wxSpinCtrl*)control.control)->SetRange(-0x7fff, 0x7fff); - } - ((wxSpinCtrl*)control.control)->SetValue(opt->value.intval); - break; - - case COK_FLOAT: - control.control = new wxTextCtrl(res, -1, wxString::Format(_T("%f"), opt->value.floatval)); - break; - - case COK_BOOL: - control.control = new wxCheckBox(res, -1, wxString(opt->label, wxConvUTF8)); - ((wxCheckBox*)control.control)->SetValue(!!opt->value.intval); - break; - - case COK_COLOUR: - // *FIXME* what to do here? - // just put a stupid edit box for now - control.control = new wxTextCtrl(res, -1, wxString(opt->value.stringval, wxConvUTF8)); - break; - - case COK_STYLE: - control.control = new wxChoice(res, -1, wxDefaultPosition, wxDefaultSize, AssFile::top->GetStyles()); - ((wxChoice*)control.control)->Insert(_T(""), 0); - break; - - case COK_INVALID: - break; - } - - if (opt->kind != COK_LABEL && opt->kind != COK_BOOL) { - control.label = new wxStaticText(res, -1, wxString(opt->label, wxConvUTF8)); - sizer->Add(control.label, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL); - } else { - control.label = 0; - sizer->AddSpacer(0); - } - control.control->SetToolTip(wxString(opt->hint, wxConvUTF8)); - sizer->Add(control.control, 1, wxEXPAND); - - controls.push_back(control); - } - - res->SetSizerAndFit(sizer); - - return res; - } - - Auto3ConfigDialog::Auto3ConfigDialog(Auto3Interpreter *script) - { - options = script->config; - } - - Auto3ConfigDialog::~Auto3ConfigDialog() - { - // Nothing to do here - } - - void Auto3ConfigDialog::ReadBack() - { - for (std::vector::iterator ctl = controls.begin(); ctl != controls.end(); ctl++) { - switch (ctl->option->kind) { - case COK_TEXT: - Auto3Free(ctl->option->value.stringval); - ctl->option->value.stringval = Auto3Strdup(((wxTextCtrl*)ctl->control)->GetValue().mb_str(wxConvUTF8)); - break; - - case COK_INT: - ctl->option->value.intval = ((wxSpinCtrl*)ctl->control)->GetValue(); - break; - - case COK_FLOAT: { - double v; - if (!((wxTextCtrl*)ctl->control)->GetValue().ToDouble(&v)) { - wxLogWarning( - _T("The value entered for field '%s' (%s) could not be converted to a floating-point number. Default value (%f) substituted for the entered value."), - wxString(ctl->option->label, wxConvUTF8).c_str(), - ((wxTextCtrl*)ctl->control)->GetValue().c_str(), - ctl->option->default_val.floatval); - ctl->option->value.floatval = ctl->option->default_val.floatval; - } - ctl->option->value.floatval = v; - break; } - - case COK_BOOL: - ctl->option->value.intval = (int)((wxCheckBox*)ctl->control)->GetValue(); - break; - - case COK_COLOUR: - // *FIXME* needs to be updated to use a proper color control - Auto3Free(ctl->option->value.stringval); - ctl->option->value.stringval = Auto3Strdup(((wxTextCtrl*)ctl->control)->GetValue().mb_str(wxConvUTF8)); - break; - - case COK_STYLE: - Auto3Free(ctl->option->value.stringval); - ctl->option->value.stringval = Auto3Strdup(((wxChoice*)ctl->control)->GetStringSelection().mb_str(wxConvUTF8)); - break; - - case COK_LABEL: - case COK_INVALID: - break; - } - } - } - - wxString Auto3ConfigDialog::Serialise() - { - if (options->name == 0) - return _T(""); - - wxString result; - for (Auto3ConfigOption *opt = options; opt->name; opt++) { - wxString optname(opt->name, wxConvUTF8); - switch (opt->kind) { - case COK_TEXT: - case COK_STYLE: - case COK_COLOUR: { - wxString optstrval(opt->value.stringval, wxConvUTF8); - result << wxString::Format(_T("%s:%s|"), optname.c_str(), inline_string_encode(optstrval).c_str()); - break; } - case COK_INT: - case COK_BOOL: - result << wxString::Format(_T("%s:%d|"), optname.c_str(), opt->value.intval); - break; - case COK_FLOAT: - result << wxString::Format(_T("%s:%e|"), optname.c_str(), opt->value.floatval); - break; - default: - // The rest aren't stored - break; - } - } - if (!result.IsEmpty() && result.Last() == _T('|')) - result.RemoveLast(); - return result; - } - - void Auto3ConfigDialog::Unserialise(const wxString &settings) - { - wxStringTokenizer toker(settings, _T("|"), wxTOKEN_STRTOK); - while (toker.HasMoreTokens()) { - // get the parts of this setting - wxString setting = toker.GetNextToken(); - - wxString optname = setting.BeforeFirst(_T(':')); - wxString optval = setting.AfterFirst(_T(':')); - - // find the setting in the list loaded from the script - Auto3ConfigOption *opt = options; - while (opt->name && wxString(opt->name, wxConvUTF8) != optname) - opt ++; - - if (opt->name) { - // ok, found the option! - switch (opt->kind) { - case COK_TEXT: - case COK_STYLE: - case COK_COLOUR: - Auto3Free(opt->value.stringval); - opt->value.stringval = Auto3Strdup(inline_string_decode(optval).mb_str(wxConvUTF8)); - break; - - case COK_INT: - case COK_BOOL: { - long n; - optval.ToLong(&n, 10); - opt->value.intval = n; - break; } - - case COK_FLOAT: { - double v; - optval.ToDouble(&v); - opt->value.floatval = (float)v; - break; } - - case COK_LABEL: - case COK_INVALID: - break; - } - } - } - } - - - // Auto3Filter - - Auto3Filter::Auto3Filter(const wxString &_name, const wxString &_description, Auto3Interpreter *_script) - : Feature(SCRIPTFEATURE_FILTER, _name) - , FeatureFilter(_name, _description, 0) - , script(_script) - { - // Nothing more to do - } - - ScriptConfigDialog* Auto3Filter::GenerateConfigDialog(wxWindow *parent) - { - config = new Auto3ConfigDialog(script); - return config; - } - - void Auto3Filter::Init() - { - // Nothing to do here - } - - void Auto3Filter::ProcessSubs(AssFile *subs, wxWindow *export_dialog) - { - Auto3ProgressSink *sink = new Auto3ProgressSink(script, export_dialog); - sink->SetTitle(GetName()); - Auto3ThreadedProcessor thread(script, subs, config, sink); - - sink->ShowModal(); - thread.Wait(); - - delete sink; - } - - - // Auto3ThreadedProcessor - - Auto3ThreadedProcessor::Auto3ThreadedProcessor(Auto3Interpreter *_script, AssFile *_file, Auto3ConfigDialog *_config, Auto3ProgressSink *_sink) - : wxThread(wxTHREAD_JOINABLE) - , script(_script) - , file(_file) - , config(_config) - , sink(_sink) - { - // Pure copypasta - int prio = Options.AsInt(_T("Automation Thread Priority")); - if (prio == 0) prio = 50; // normal - else if (prio == 1) prio = 30; // below normal - else if (prio == 2) prio = 10; // lowest - else prio = 50; // fallback normal - Create(); - SetPriority(prio); - Run(); - } - - wxThread::ExitCode Auto3ThreadedProcessor::Entry() - { - script->cb.rwdata = this; - script->cb.reset_style_pointer = ResetStylePointer; - script->cb.reset_subs_pointer = ResetSubsPointer; - script->cb.get_meta_info = GetMetaInfo; - script->cb.get_next_style = GetNextStyle; - script->cb.get_next_sub = GetNextSub; - script->cb.start_subs_write = StartSubsWrite; - script->cb.write_sub = WriteSub; - - int res = RunAuto3Script(script); - - script->cb.rwdata = 0; - script->cb.reset_style_pointer = 0; - script->cb.reset_subs_pointer = 0; - script->cb.get_meta_info = 0; - script->cb.get_next_style = 0; - script->cb.get_next_sub = 0; - script->cb.start_subs_write = 0; - script->cb.write_sub = 0; - - sink->script_finished = true; - wxWakeUpIdle(); - - if (res) return (wxThread::ExitCode) 1; - else return 0; - } - - - void Auto3ThreadedProcessor::ResetStylePointer(void *cbdata) - { - Auto3ThreadedProcessor *self = (Auto3ThreadedProcessor*)cbdata; - self->style_pointer = self->file->Line.begin(); - } - - - void Auto3ThreadedProcessor::ResetSubsPointer(void *cbdata) - { - Auto3ThreadedProcessor *self = (Auto3ThreadedProcessor*)cbdata; - self->subs_pointer = self->file->Line.begin(); - } - - - void Auto3ThreadedProcessor::GetMetaInfo(void *cbdata, int *res_x, int *res_y) - { - Auto3ThreadedProcessor *self = (Auto3ThreadedProcessor*)cbdata; - self->file->GetResolution(*res_x, *res_y); - } - - - int Auto3ThreadedProcessor::GetNextStyle( - void *cbdata, char **name, char **fontname, int *fontsize, char **color1, char **color2, char **color3, char **color4, - int *bold, int *italic, int *underline, int *strikeout, float *scale_x, float *scale_y, float *spacing, float *angle, - int *borderstyle, float *outline, float *shadow, int *align, int *margin_l, int *margin_r, int *margin_v, int *encoding) - { - Auto3ThreadedProcessor *self = (Auto3ThreadedProcessor*)cbdata; - - while (self->style_pointer != self->file->Line.end()) { - AssStyle *style = AssEntry::GetAsStyle(*self->style_pointer); - // Increase iterator before we test for and return style data, since it needs to be done either way - // The iterator should always point to the next line to be examined - self->style_pointer++; - if (style) { - // Put strings into buffers - self->stylename = style->name.mb_str(wxConvUTF8); - self->stylefont = style->font.mb_str(wxConvUTF8); - self->stylecolor[0] = style->primary.GetASSFormatted(true, false, true).mb_str(wxConvUTF8); - self->stylecolor[1] = style->secondary.GetASSFormatted(true, false, true).mb_str(wxConvUTF8); - self->stylecolor[2] = style->outline.GetASSFormatted(true, false, true).mb_str(wxConvUTF8); - self->stylecolor[3] = style->shadow.GetASSFormatted(true, false, true).mb_str(wxConvUTF8); - - // Store data to lib - *name = self->stylename.data(); - *fontname = self->stylefont.data(); - *fontsize = (int)style->fontsize; - *color1 = self->stylecolor[0].data(); - *color2 = self->stylecolor[1].data(); - *color3 = self->stylecolor[2].data(); - *color4 = self->stylecolor[3].data(); - *bold = (int)style->bold; - *italic = (int)style->italic; - *underline = (int)style->italic; - *strikeout = (int)style->strikeout; - *scale_x = style->scalex; - *scale_y = style->scaley; - *spacing = style->spacing; - *angle = style->angle; - *borderstyle = style->borderstyle; - *outline = style->outline_w; - *shadow = style->shadow_w; - *align = style->alignment; - *margin_l = style->Margin[0]; - *margin_r = style->Margin[1]; - *margin_v = style->Margin[2]; - *encoding = style->encoding; - - // and return success - return 1; - } - } - - return 0; - } - - - int Auto3ThreadedProcessor::GetNextSub(void *cbdata, int *layer, int *start_time, int *end_time, char **style, char **actor, - int *margin_l, int *margin_r, int *margin_v, char **effect, char **text, int *comment) - { - Auto3ThreadedProcessor *self = (Auto3ThreadedProcessor*)cbdata; - - while (self->subs_pointer != self->file->Line.end()) { - AssDialogue *dia = AssEntry::GetAsDialogue(*self->subs_pointer); - self->subs_pointer++; - if (dia) { - // Put strings into buffers - self->diagstyle = dia->Style.mb_str(wxConvUTF8); - self->diagactor = dia->Actor.mb_str(wxConvUTF8); - self->diageffect = dia->Effect.mb_str(wxConvUTF8); - self->diagtext = dia->Text.mb_str(wxConvUTF8); - - // Store data to lib - *comment = (int)dia->Comment; - *layer = dia->Layer; - *start_time = dia->Start.GetMS()/10; - *end_time = dia->End.GetMS()/10; - *style = self->diagstyle.data(); - *actor = self->diagactor.data(); - *margin_l = dia->Margin[0]; - *margin_r = dia->Margin[1]; - *margin_v = dia->Margin[2]; - *effect = self->diageffect.data(); - *text = self->diagtext.data(); - - // return success - return 1; - } - } - - return 0; - } - - - void Auto3ThreadedProcessor::StartSubsWrite(void *cbdata) - { - Auto3ThreadedProcessor *self = (Auto3ThreadedProcessor*)cbdata; - - // clear all dialogue lines - std::list::iterator line = self->file->Line.begin(); - while (line != self->file->Line.end()) { - std::list::iterator cur = line; - line++; - if (AssEntry::GetAsDialogue(*cur)) { - delete *cur; - self->file->Line.erase(cur); - } - } - } - - - void Auto3ThreadedProcessor::WriteSub(void *cbdata, int layer, int start_time, int end_time, const char *style, const char *actor, - int margin_l, int margin_r, int margin_v, const char *effect, const char *text, int comment) - { - Auto3ThreadedProcessor *self = (Auto3ThreadedProcessor*)cbdata; - - // Construct dialogue object - AssDialogue *dia = new AssDialogue(); - dia->Comment = !!comment; - dia->Layer = layer; - dia->Start.SetMS(start_time*10); - dia->End.SetMS(end_time*10); - dia->Style = wxString(style, wxConvUTF8); - dia->Actor = wxString(actor, wxConvUTF8); - dia->Margin[0] = margin_l; - dia->Margin[1] = margin_r; - dia->Margin[2] = dia->Margin[3] = margin_v; - dia->Effect = wxString(effect, wxConvUTF8); - dia->Text = wxString(text, wxConvUTF8); - - // Append to file - self->file->Line.push_back(dia); - } - - - // Auto3Script - - Auto3Script::Auto3Script(const wxString &filename) - : Script(filename) - , filter(0) - , script(0) - { - try { - Create(); - } - catch (wxChar *e) { - description = e; - loaded = false; - } - } - - Auto3Script::~Auto3Script() - { - if (script) Destroy(); - } - - void Auto3Script::TextExtents(void *cbdata, const char *text, const char *fontname, int fontsize, int bold, int italic, int spacing, - float scale_x, float scale_y, int encoding, float *out_width, float *out_height, float *out_descent, float *out_extlead) - { - double resx, resy, resd, resl; - - wxString intext(text, wxConvUTF8); - - AssStyle st; - - st.font = wxString(fontname, wxConvUTF8); - st.fontsize = fontsize; - st.bold = !!bold; - st.italic = !!italic; - st.underline = false; - st.strikeout = false; - st.scalex = scale_x; - st.scaley = scale_y; - st.spacing = spacing; - st.encoding = encoding; - - CalculateTextExtents(&st, intext, resx, resy, resd, resl); - // So no error checking here... FIXME? - - *out_width = resx; - *out_height = resy; - *out_descent = resd; - *out_extlead = resl; - } - - filename_t Auto3Script::ResolveInclude(void *cbdata, const char *incname) - { - Auto3Script *s = (Auto3Script*)cbdata; - - wxString fnames(incname, wxConvUTF8); - - wxFileName fname(fnames); - if (fname.GetDirCount() == 0) { - // filename only - fname = s->include_path.FindAbsoluteValidPath(fnames); - } else if (fname.IsRelative()) { - // relative path - wxFileName sfname(s->GetFilename()); - fname.MakeAbsolute(sfname.GetPath(true)); - } else { - // absolute path, do nothing - } - if (!fname.IsOk() || !fname.FileExists()) { - return 0; - } - -#ifdef WIN32 - // Get number of widechars in filename string - size_t wfnlen = wcslen(fname.GetFullPath().wc_str()); - // Alloc memory to hold string - filename_t wfn = (filename_t)Auto3Malloc((wfnlen+1) * sizeof(wchar_t)); - // And copy string into memory - wcsncpy(wfn, fname.GetFullPath().wc_str(), wfnlen); - wfn[wfnlen] = 0; - return wfn; -#else - return Auto3Strdup(fname.GetFullPath().fn_str()); -#endif - } - - int Auto3Script::FrameFromMs(void *cbdata, int ms) - { - if (VFR_Output.IsLoaded()) { - return VFR_Output.GetFrameAtTime(ms, true); - } else { - return 0; - } - } - - int Auto3Script::MsFromFrame(void *cbdata, int frame) - { - if (VFR_Output.IsLoaded()) { - return VFR_Output.GetTimeAtFrame(frame, true); - } else { - return 0; - } - } - - void Auto3Script::Create() - { - Destroy(); - - // Fill callbacks struct - Auto3Callbacks cb; - // Logging, implemented only during script execution - cb.logdata = 0; - cb.log_error = 0; - cb.log_message = 0; - cb.set_progress = 0; - cb.set_status = 0; - // Read/write, also only during execution - cb.rwdata = 0; - cb.get_meta_info = 0; - cb.get_next_style = 0; - cb.get_next_sub = 0; - cb.reset_style_pointer = 0; - cb.reset_subs_pointer = 0; - cb.start_subs_write = 0; - cb.write_sub = 0; - // Misc, implemented all the time - cb.rundata = this; - cb.resolve_include = ResolveInclude; - cb.text_extents = TextExtents; - cb.frame_from_ms = FrameFromMs; - cb.ms_from_frame = MsFromFrame; - - char *errormsg = 0; - // Why oh why... GCC wants fn_str() to be dereffed with .data() but MSVC hates that... - // If anyone can FIXME to something more sensible, please do so -#ifdef WIN32 - script = CreateAuto3Script((const filename_t)GetFilename().fn_str(), GetPrettyFilename().mb_str(wxConvUTF8), &cb, &errormsg); -#else - script = CreateAuto3Script((const filename_t)GetFilename().fn_str().data(), GetPrettyFilename().mb_str(wxConvUTF8).data(), &cb, &errormsg); -#endif - - if (script) { - assert(errormsg == 0); - loaded = true; - - name = wxString(script->name, wxConvUTF8); - description = wxString(script->description, wxConvUTF8); - author = _T(""); - version = _T(""); - - filter = new Auto3Filter(name, description, script); - - } else { - loaded = false; - name = GetPrettyFilename(); - if (errormsg) { - description = wxString(errormsg, wxConvUTF8); - Auto3Free(errormsg); - } else { - description = _T("Unknown error (auto3 library returned NULL error message)"); - } - } - } - - void Auto3Script::Destroy() - { - if (!script) return; - - if (filter) { - delete filter; - filter = 0; - } - - DestroyAuto3Script(script); - script = 0; - - loaded = false; - } - - void Auto3Script::Reload() - { - Destroy(); - Create(); - } - - Auto3ScriptFactory::Auto3ScriptFactory() - { - engine_name = _T("Legacy Automation 3"); - filename_pattern = _T("*.auto3"); - Register(this); - } - - Auto3ScriptFactory::~Auto3ScriptFactory() { } - - Script* Auto3ScriptFactory::Produce(const wxString &filename) const - { - if (filename.Right(6).Lower() == _T(".auto3")) { - return new Auto3Script(filename); - } else { - return 0; - } - } - - -}; - -#endif // WITH_AUTO3 -#endif // WITH_AUTOMATION diff --git a/aegisub/src/auto4_auto3.h b/aegisub/src/auto4_auto3.h deleted file mode 100644 index 36b67343c..000000000 --- a/aegisub/src/auto4_auto3.h +++ /dev/null @@ -1,171 +0,0 @@ -// Copyright (c) 2007, Niels Martin Hansen -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// * Neither the name of the Aegisub Group nor the names of its contributors -// may be used to endorse or promote products derived from this software -// without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. -// -// ----------------------------------------------------------------------------- -// -// AEGISUB -// -// Website: http://aegisub.cellosoft.com -// Contact: mailto:jiifurusu@gmail.com -// - -// Scripting engine for legacy Automation 3 compatibility - -#pragma once - -#ifndef _AUTO4_AUTO3_H -#define _AUTO4_AUTO3_H - -#include -#include -#include "auto4_base.h" -#include "libauto3/auto3.h" -#include "ass_file.h" -#include "ass_entry.h" -#include "ass_dialogue.h" -#include "ass_style.h" - -namespace Automation4 { - - class Auto3ProgressSink : public ProgressSink { - private: - Auto3Interpreter *script; - - static void SetStatus(void *cbdata, const char *msg); - static void OutputDebug(void *cbdata, const char *msg); - static void ReportProgress(void *cbdata, float progress); - - public: - Auto3ProgressSink(Auto3Interpreter *_script, wxWindow *parent); - virtual ~Auto3ProgressSink(); - }; - - - class Auto3ConfigDialog : public ScriptConfigDialog { - private: - Auto3ConfigOption *options; - - struct Control { - wxStaticText *label; - wxControl *control; - Auto3ConfigOption *option; - Control() : label(0), control(0), option(0) {} - }; - std::vector controls; - - protected: - wxWindow* CreateWindow(wxWindow *parent); - - public: - Auto3ConfigDialog(Auto3Interpreter *script); - virtual ~Auto3ConfigDialog(); - - void ReadBack(); // from auto4 base - - wxString Serialise(); // make a string from the option name+value pairs - void Unserialise(const wxString &settings); // set the option values from a serialized string - }; - - - class Auto3Filter : public FeatureFilter { - private: - Auto3ConfigDialog *config; - AssFile *_file; - Auto3Interpreter *script; - - protected: - ScriptConfigDialog* GenerateConfigDialog(wxWindow *parent); - - void Init(); - public: - Auto3Filter(const wxString &_name, const wxString &_description, Auto3Interpreter *_script); - - void ProcessSubs(AssFile *subs, wxWindow *export_dialog); - - virtual ~Auto3Filter() { } - }; - - - class Auto3ThreadedProcessor : public wxThread { - private: - Auto3Interpreter *script; - AssFile *file; - Auto3ConfigDialog *config; - Auto3ProgressSink *sink; - - // Iterators used for read/write callbacks - std::list::iterator style_pointer; - std::list::iterator subs_pointer; - - // Char buffers holding data used in callbacks - wxCharBuffer stylename, stylefont, stylecolor[4], diagstyle, diagactor, diageffect, diagtext; - - // Read/write callback functions - static void ResetStylePointer(void *cbdata); - static void ResetSubsPointer(void *cbdata); - static void GetMetaInfo(void *cbdata, int *res_x, int *res_y); - static int GetNextStyle( - void *cbdata, char **name, char **fontname, int *fontsize, char **color1, char **color2, char **color3, char **color4, - int *bold, int *italic, int *underline, int *strikeout, float *scale_x, float *scale_y, float *spacing, float *angle, - int *borderstyle, float *outline, float *shadow, int *align, int *margin_l, int *margin_r, int *margin_v, int *encoding); - static int GetNextSub(void *cbdata, int *layer, int *start_time, int *end_time, char **style, char **actor, - int *margin_l, int *margin_r, int *margin_v, char **effect, char **text, int *comment); - static void StartSubsWrite(void *cbdata); - static void WriteSub(void *cbdata, int layer, int start_time, int end_time, const char *style, const char *actor, - int margin_l, int margin_r, int margin_v, const char *effect, const char *text, int comment); - - public: - Auto3ThreadedProcessor(Auto3Interpreter *_script, AssFile *_file, Auto3ConfigDialog *_config, Auto3ProgressSink *_sink); - virtual ExitCode Entry(); - }; - - - class Auto3Script : public Script { - private: - Auto3Filter *filter; - Auto3Interpreter *script; - - static filename_t ResolveInclude(void *cbdata, const char *incname); - static void TextExtents(void *cbdata, const char *text, const char *fontname, int fontsize, int bold, int italic, - int spacing, float scale_x, float scale_y, int encoding, - float *out_width, float *out_height, float *out_descent, float *out_extlead); - static int FrameFromMs(void *cbdata, int ms); - static int MsFromFrame(void *cbdata, int frame); - - void Create(); - void Destroy(); - - public: - Auto3Script(const wxString &filename); - virtual ~Auto3Script(); - - virtual void Reload(); - }; - -}; - -#endif diff --git a/aegisub/src/auto4_auto3_factory.h b/aegisub/src/auto4_auto3_factory.h deleted file mode 100644 index df7246a83..000000000 --- a/aegisub/src/auto4_auto3_factory.h +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright (c) 2007, Niels Martin Hansen -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// * Neither the name of the Aegisub Group nor the names of its contributors -// may be used to endorse or promote products derived from this software -// without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. -// -// ----------------------------------------------------------------------------- -// -// AEGISUB -// -// Website: http://aegisub.cellosoft.com -// Contact: mailto:jiifurusu@gmail.com -// - -// Scripting engine for legacy Automation 3 compatibility - -#pragma once - -#ifndef _AUTO4_AUTO3_FACTORY_H -#define _AUTO4_AUTO3_FACTORY_H - -#include "auto4_base.h" - -namespace Automation4 { - - // Auto3ScriptFactory - class Auto3ScriptFactory : public ScriptFactory { - public: - Auto3ScriptFactory(); - ~Auto3ScriptFactory(); - Script* Produce(const wxString &filename) const; - }; - -}; - -#endif diff --git a/aegisub/src/config/config_windows0.h b/aegisub/src/config/config_windows0.h index 14b1b55ed..7039913a8 100644 --- a/aegisub/src/config/config_windows0.h +++ b/aegisub/src/config/config_windows0.h @@ -60,11 +60,6 @@ #define WITH_AUTO4_LUA -// Enable Automation 3 -// Requires: auto3 dll (in repository), Lua (in repository) -#define WITH_AUTO3 - - // Enable DirectSound audio player // Requires: DirectX SDK #define WITH_DIRECTSOUND diff --git a/aegisub/src/plugin_manager.cpp b/aegisub/src/plugin_manager.cpp index 89bb15e61..ea8ac3036 100644 --- a/aegisub/src/plugin_manager.cpp +++ b/aegisub/src/plugin_manager.cpp @@ -127,9 +127,6 @@ void PluginManager::RegisterBuiltInPlugins() { perl = new Automation4::PerlScriptFactory(); perl->RegisterFactory(); #endif -#ifdef WITH_AUTO3 - auto3 = new Automation4::Auto3ScriptFactory(); -#endif #ifdef WITH_RUBY ruby = new Automation4::RubyScriptFactory(); #endif diff --git a/aegisub/src/plugin_manager.h b/aegisub/src/plugin_manager.h index d4e652d88..312fe248e 100644 --- a/aegisub/src/plugin_manager.h +++ b/aegisub/src/plugin_manager.h @@ -42,9 +42,6 @@ #ifdef WITH_PERL #include "auto4_perl_factory.h" #endif -#ifdef WITH_AUTO3 -#include "auto4_auto3_factory.h" -#endif #ifdef WITH_RUBY #include "auto4_ruby_factory.h" #endif diff --git a/contrib/lua50/COPYRIGHT b/contrib/lua50/COPYRIGHT deleted file mode 100644 index 2cd57d3b4..000000000 --- a/contrib/lua50/COPYRIGHT +++ /dev/null @@ -1,34 +0,0 @@ -Lua License ------------ - -Lua is licensed under the terms of the MIT license reproduced below. -This means that Lua is free software and can be used for both academic -and commercial purposes at absolutely no cost. - -For details and rationale, see http://www.lua.org/license.html . - -=============================================================================== - -Copyright (C) 2003-2006 Tecgraf, 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. - -=============================================================================== - -(end of COPYRIGHT) diff --git a/contrib/lua50/DIFFS b/contrib/lua50/DIFFS deleted file mode 100644 index c236ff8b9..000000000 --- a/contrib/lua50/DIFFS +++ /dev/null @@ -1,294 +0,0 @@ -diff -r lua-5.0.2/COPYRIGHT lua-5.0.3/COPYRIGHT -12c12 -< Copyright (C) 2003-2004 Tecgraf, PUC-Rio. ---- -> Copyright (C) 2003-2006 Tecgraf, PUC-Rio. -diff -r lua-5.0.2/include/lua.h lua-5.0.3/include/lua.h -2c2 -< ** $Id: lua.h,v 1.175b 2003/03/18 12:31:39 roberto Exp $ ---- -> ** $Id: lua.h,v 1.175c 2003/03/18 12:31:39 roberto Exp $ -17,18c17,18 -< #define LUA_VERSION "Lua 5.0.2" -< #define LUA_COPYRIGHT "Copyright (C) 1994-2004 Tecgraf, PUC-Rio" ---- -> #define LUA_VERSION "Lua 5.0.3" -> #define LUA_COPYRIGHT "Copyright (C) 1994-2006 Tecgraf, PUC-Rio" -368c368 -< * Copyright (C) 1994-2004 Tecgraf, PUC-Rio. All rights reserved. ---- -> * Copyright (C) 1994-2006 Tecgraf, PUC-Rio. All rights reserved. -diff -r lua-5.0.2/src/lapi.c lua-5.0.3/src/lapi.c -2c2 -< ** $Id: lapi.c,v 1.235 2003/04/07 14:36:08 roberto Exp $ ---- -> ** $Id: lapi.c,v 1.235a 2003/04/07 14:36:08 roberto Exp $ -882c882 -< if (n > f->c.nupvalues) return NULL; ---- -> if (!(1 <= n && n <= f->c.nupvalues)) return NULL; -888c888 -< if (n > p->sizeupvalues) return NULL; ---- -> if (!(1 <= n && n <= p->sizeupvalues)) return NULL; -diff -r lua-5.0.2/src/lcode.c lua-5.0.3/src/lcode.c -2c2 -< ** $Id: lcode.c,v 1.117 2003/04/03 13:35:34 roberto Exp $ ---- -> ** $Id: lcode.c,v 1.117a 2003/04/03 13:35:34 roberto Exp $ -105c105,108 -< if (GET_OPCODE(i) != OP_TEST || GETARG_C(i) != cond) return 1; ---- -> if (GET_OPCODE(i) != OP_TEST || -> GETARG_A(i) != NO_REG || -> GETARG_C(i) != cond) -> return 1; -117,118c120,130 -< static void luaK_patchlistaux (FuncState *fs, int list, -< int ttarget, int treg, int ftarget, int freg, int dtarget) { ---- -> static void removevalues (FuncState *fs, int list) { -> for (; list != NO_JUMP; list = luaK_getjump(fs, list)) { -> Instruction *i = getjumpcontrol(fs, list); -> if (GET_OPCODE(*i) == OP_TEST) -> patchtestreg(i, NO_REG); -> } -> } -> -> -> static void luaK_patchlistaux (FuncState *fs, int list, int vtarget, int reg, -> int dtarget) { -122,136c134,136 -< if (GET_OPCODE(*i) != OP_TEST) { -< lua_assert(dtarget != NO_JUMP); -< luaK_fixjump(fs, list, dtarget); /* jump to default target */ -< } -< else { -< if (GETARG_C(*i)) { -< lua_assert(ttarget != NO_JUMP); -< patchtestreg(i, treg); -< luaK_fixjump(fs, list, ttarget); -< } -< else { -< lua_assert(ftarget != NO_JUMP); -< patchtestreg(i, freg); -< luaK_fixjump(fs, list, ftarget); -< } ---- -> if (GET_OPCODE(*i) == OP_TEST && GETARG_A(*i) == NO_REG) { -> patchtestreg(i, reg); -> luaK_fixjump(fs, list, vtarget); -137a138,139 -> else -> luaK_fixjump(fs, list, dtarget); /* jump to default target */ -144c146 -< luaK_patchlistaux(fs, fs->jpc, fs->pc, NO_REG, fs->pc, NO_REG, fs->pc); ---- -> luaK_patchlistaux(fs, fs->jpc, fs->pc, NO_REG, fs->pc); -154c156 -< luaK_patchlistaux(fs, list, target, NO_REG, target, NO_REG, target); ---- -> luaK_patchlistaux(fs, list, target, NO_REG, target); -357,358c359,360 -< luaK_patchlistaux(fs, e->f, p_f, NO_REG, final, reg, p_f); -< luaK_patchlistaux(fs, e->t, final, reg, p_t, NO_REG, p_t); ---- -> luaK_patchlistaux(fs, e->f, final, reg, p_f); -> luaK_patchlistaux(fs, e->t, final, reg, p_t); -476c478 -< return luaK_condjump(fs, OP_TEST, NO_REG, GETARG_B(ie), !cond); ---- -> return luaK_condjump(fs, OP_TEST, GETARG_B(ie), GETARG_B(ie), !cond); -566a569,570 -> removevalues(fs, e->f); -> removevalues(fs, e->t); -diff -r lua-5.0.2/src/lfunc.c lua-5.0.3/src/lfunc.c -2c2 -< ** $Id: lfunc.c,v 1.67 2003/03/18 12:50:04 roberto Exp $ ---- -> ** $Id: lfunc.c,v 1.67a 2003/03/18 12:50:04 roberto Exp $ -19,26d18 -< -< -< #define sizeCclosure(n) (cast(int, sizeof(CClosure)) + \ -< cast(int, sizeof(TObject)*((n)-1))) -< -< #define sizeLclosure(n) (cast(int, sizeof(LClosure)) + \ -< cast(int, sizeof(TObject *)*((n)-1))) -< -diff -r lua-5.0.2/src/lfunc.h lua-5.0.3/src/lfunc.h -2c2 -< ** $Id: lfunc.h,v 1.21 2003/03/18 12:50:04 roberto Exp $ ---- -> ** $Id: lfunc.h,v 1.21a 2003/03/18 12:50:04 roberto Exp $ -11a12,18 -> -> -> #define sizeCclosure(n) (cast(int, sizeof(CClosure)) + \ -> cast(int, sizeof(TObject)*((n)-1))) -> -> #define sizeLclosure(n) (cast(int, sizeof(LClosure)) + \ -> cast(int, sizeof(TObject *)*((n)-1))) -diff -r lua-5.0.2/src/lgc.c lua-5.0.3/src/lgc.c -2c2 -< ** $Id: lgc.c,v 1.171a 2003/04/03 13:35:34 roberto Exp $ ---- -> ** $Id: lgc.c,v 1.171b 2003/04/03 13:35:34 roberto Exp $ -221,224c221,222 -< if (!u->marked) { -< markobject(st, &u->value); -< u->marked = 1; -< } ---- -> markobject(st, u->v); -> u->marked = 1; -261c259,260 -< static void propagatemarks (GCState *st) { ---- -> static lu_mem propagatemarks (GCState *st) { -> lu_mem mf = 0; -267a267,268 -> mf += sizeof(Table) + sizeof(TObject) * h->sizearray + -> sizeof(Node) * sizenode(h); -273a275,276 -> mf += (cl->c.isC) ? sizeCclosure(cl->c.nupvalues) : -> sizeLclosure(cl->l.nupvalues); -279a283,284 -> mf += sizeof(lua_State) + sizeof(TObject) * th->stacksize + -> sizeof(CallInfo) * th->size_ci; -285a291 -> /* do not need 'mf' for this case (cannot happen inside a udata) */ -290a297 -> return mf; -371c378 -< if (curr->gch.marked > limit) { ---- -> if ((curr->gch.marked & ~(KEYWEAK | VALUEWEAK)) > limit) { -473c480 -< propagatemarks(&st); /* remark, to propagate `preserveness' */ ---- -> deadmem += propagatemarks(&st); /* remark, to propagate `preserveness' */ -diff -r lua-5.0.2/src/lib/lbaselib.c lua-5.0.3/src/lib/lbaselib.c -2c2 -< ** $Id: lbaselib.c,v 1.130b 2003/04/03 13:35:34 roberto Exp $ ---- -> ** $Id: lbaselib.c,v 1.130c 2003/04/03 13:35:34 roberto Exp $ -175a176 -> lua_settop(L, 2); -183a185 -> lua_settop(L, 3); -diff -r lua-5.0.2/src/lib/liolib.c lua-5.0.3/src/lib/liolib.c -2c2 -< ** $Id: liolib.c,v 2.39a 2003/03/19 21:16:12 roberto Exp $ ---- -> ** $Id: liolib.c,v 2.39b 2003/03/19 21:16:12 roberto Exp $ -22a23,28 -> typedef struct FileHandle { -> FILE *f; -> int ispipe; -> } FileHandle; -> -> -89,92c95,98 -< static FILE **topfile (lua_State *L, int findex) { -< FILE **f = (FILE **)luaL_checkudata(L, findex, FILEHANDLE); -< if (f == NULL) luaL_argerror(L, findex, "bad file"); -< return f; ---- -> static FileHandle *topfile (lua_State *L, int findex) { -> FileHandle *fh = (FileHandle *)luaL_checkudata(L, findex, FILEHANDLE); -> if (fh == NULL) luaL_argerror(L, findex, "bad file"); -> return fh; -97,99c103,105 -< FILE **f = (FILE **)luaL_checkudata(L, 1, FILEHANDLE); -< if (f == NULL) lua_pushnil(L); -< else if (*f == NULL) ---- -> FileHandle *fh = (FileHandle *)luaL_checkudata(L, 1, FILEHANDLE); -> if (fh == NULL) lua_pushnil(L); -> else if (fh->f == NULL) -107,109c113,117 -< static FILE *tofile (lua_State *L, int findex) { -< FILE **f = topfile(L, findex); -< if (*f == NULL) ---- -> #define tofile(L,i) (tofileh(L,i)->f) -> -> static FileHandle *tofileh (lua_State *L, int findex) { -> FileHandle *fh = topfile(L, findex); -> if (fh->f == NULL) -111c119 -< return *f; ---- -> return fh; -115a124,125 -> #define newfile(L) (&(newfileh(L)->f)) -> -121,123c131,134 -< static FILE **newfile (lua_State *L) { -< FILE **pf = (FILE **)lua_newuserdata(L, sizeof(FILE *)); -< *pf = NULL; /* file handle is currently `closed' */ ---- -> static FileHandle *newfileh (lua_State *L) { -> FileHandle *fh = (FileHandle *)lua_newuserdata(L, sizeof(FileHandle)); -> fh->f = NULL; /* file handle is currently `closed' */ -> fh->ispipe = 0; -126c137 -< return pf; ---- -> return fh; -148c159,160 -< FILE *f = tofile(L, 1); ---- -> FileHandle *fh = tofileh(L, 1); -> FILE *f = fh->f; -152,154c164,165 -< int ok = (pclose(f) != -1) || (fclose(f) == 0); -< if (ok) -< *(FILE **)lua_touserdata(L, 1) = NULL; /* mark file as closed */ ---- -> int ok = fh->ispipe ? (pclose(f) != -1) : (fclose(f) == 0); -> fh->f = NULL; /* mark file as closed */ -170,171c181,182 -< FILE **f = topfile(L, 1); -< if (*f != NULL) /* ignore closed files */ ---- -> FileHandle *fh = topfile(L, 1); -> if (fh->f != NULL) /* ignore closed files */ -179,180c190,191 -< FILE **f = topfile(L, 1); -< if (*f == NULL) ---- -> FileHandle *fh = topfile(L, 1); -> if (fh->f == NULL) -205,207c216,219 -< FILE **pf = newfile(L); -< *pf = popen(filename, mode); -< return (*pf == NULL) ? pushresult(L, 0, filename) : 1; ---- -> FileHandle *fh = newfileh(L); -> fh->f = popen(filename, mode); -> fh->ispipe = 1; -> return (fh->f == NULL) ? pushresult(L, 0, filename) : 1; -diff -r lua-5.0.2/src/lvm.c lua-5.0.3/src/lvm.c -2c2 -< ** $Id: lvm.c,v 1.284b 2003/04/03 13:35:34 roberto Exp $ ---- -> ** $Id: lvm.c,v 1.284c 2003/04/03 13:35:34 roberto Exp $ -324,325c324 -< lu_mem tl = cast(lu_mem, tsvalue(top-1)->tsv.len) + -< cast(lu_mem, tsvalue(top-2)->tsv.len); ---- -> size_t tl = tsvalue(top-1)->tsv.len; -328,330c327,331 -< while (n < total && tostring(L, top-n-1)) { /* collect total length */ -< tl += tsvalue(top-n-1)->tsv.len; -< n++; ---- -> /* collect total length */ -> for (n = 1; n < total && tostring(L, top-n-1); n++) { -> size_t l = tsvalue(top-n-1)->tsv.len; -> if (l >= MAX_SIZET - tl) luaG_runerror(L, "string length overflow"); -> tl += l; -332d332 -< if (tl > MAX_SIZET) luaG_runerror(L, "string size overflow"); diff --git a/contrib/lua50/HISTORY b/contrib/lua50/HISTORY deleted file mode 100644 index cf6e1c019..000000000 --- a/contrib/lua50/HISTORY +++ /dev/null @@ -1,159 +0,0 @@ -This is Lua 5.0. - -* Changes from version 4.0 to 5.0 - ------------------------------- - Language: - + lexical scoping. - + Lua coroutines. - + standard libraries now packaged in tables. - + tags replaced by metatables and tag methods replaced by metamethods, - stored in metatables. - + proper tail calls. - + each function can have its own global table, which can be shared. - + new __newindex metamethod, called when we insert a new key into a table. - + new block comments: --[[ ... ]]. - + new generic for. - + new weak tables. - + new boolean type. - + new syntax "local function". - + (f()) returns the first value returned by f. - + {f()} fills a table with all values returned by f. - + \n ignored in [[\n . - + fixed and-or priorities. - + more general syntax for function definition (e.g. function a.x.y:f()...end). - + more general syntax for function calls (e.g. (print or write)(9)). - + new functions (time/date, tmpfile, unpack, require, load*, etc.). - API: - + chunks are loaded by using lua_load; new luaL_loadfile and luaL_loadbuffer. - + introduced lightweight userdata, a simple "void*" without a metatable. - + new error handling protocol: the core no longer prints error messages; - all errors are reported to the caller on the stack. - + new lua_atpanic for host cleanup. - + new, signal-safe, hook scheme. - Implementation: - + new license: MIT. - + new, faster, register-based virtual machine. - + support for external multithreading and coroutines. - + new and consistent error message format. - + the core no longer needs "stdio.h" for anything (except for a single - use of sprintf to convert numbers to strings). - + lua.c now runs the environment variable LUA_INIT, if present. It can - be "@filename", to run a file, or the chunk itself. - + support for user extensions in lua.c. - sample implementation given for command line editing. - + new dynamic loading library, active by default on several platforms. - + safe garbage-collector metamethods. - + precompiled bytecodes checked for integrity (secure binary dostring). - + strings are fully aligned. - + position capture in string.find. - + read('*l') can read lines with embedded zeros. - -* Changes from version 3.2 to 4.0 - ------------------------------- - Language: - + new "break" and "for" statements (both numerical and for tables). - + uniform treatment of globals: globals are now stored in a Lua table. - + improved error messages. - + no more '$debug': full speed *and* full debug information. - + new read form: read(N) for next N bytes. - + general read patterns now deprecated. - (still available with -DCOMPAT_READPATTERNS.) - + all return values are passed as arguments for the last function - (old semantics still available with -DLUA_COMPAT_ARGRET) - + garbage collection tag methods for tables now deprecated. - + there is now only one tag method for order. - API: - + New API: fully re-entrant, simpler, and more efficient. - + New debug API. - Implementation: - + faster than ever: cleaner virtual machine and new hashing algorithm. - + non-recursive garbage-collector algorithm. - + reduced memory usage for programs with many strings. - + improved treatment for memory allocation errors. - + improved support for 16-bit machines (we hope). - + code now compiles unmodified as both ANSI C and C++. - + numbers in bases other than 10 are converted using strtoul. - + new -f option in Lua to support #! scripts. - + luac can now combine text and binaries. - -* Changes from version 3.1 to 3.2 - ------------------------------- - + redirected all output in Lua's core to _ERRORMESSAGE and _ALERT. - + increased limit on the number of constants and globals per function - (from 2^16 to 2^24). - + debugging info (lua_debug and hooks) moved into lua_state and new API - functions provided to get and set this info. - + new debug lib gives full debugging access within Lua. - + new table functions "foreachi", "sort", "tinsert", "tremove", "getn". - + new io functions "flush", "seek". - -* Changes from version 3.0 to 3.1 - ------------------------------- - + NEW FEATURE: anonymous functions with closures (via "upvalues"). - + new syntax: - - local variables in chunks. - - better scope control with DO block END. - - constructors can now be also written: { record-part; list-part }. - - more general syntax for function calls and lvalues, e.g.: - f(x).y=1 - o:f(x,y):g(z) - f"string" is sugar for f("string") - + strings may now contain arbitrary binary data (e.g., embedded zeros). - + major code re-organization and clean-up; reduced module interdependecies. - + no arbitrary limits on the total number of constants and globals. - + support for multiple global contexts. - + better syntax error messages. - + new traversal functions "foreach" and "foreachvar". - + the default for numbers is now double. - changing it to use floats or longs is easy. - + complete debug information stored in pre-compiled chunks. - + sample interpreter now prompts user when run interactively, and also - handles control-C interruptions gracefully. - -* Changes from version 2.5 to 3.0 - ------------------------------- - + NEW CONCEPT: "tag methods". - Tag methods replace fallbacks as the meta-mechanism for extending the - semantics of Lua. Whereas fallbacks had a global nature, tag methods - work on objects having the same tag (e.g., groups of tables). - Existing code that uses fallbacks should work without change. - + new, general syntax for constructors {[exp] = exp, ... }. - + support for handling variable number of arguments in functions (varargs). - + support for conditional compilation ($if ... $else ... $end). - + cleaner semantics in API simplifies host code. - + better support for writing libraries (auxlib.h). - + better type checking and error messages in the standard library. - + luac can now also undump. - -* Changes from version 2.4 to 2.5 - ------------------------------- - + io and string libraries are now based on pattern matching; - the old libraries are still available for compatibility - + dofile and dostring can now return values (via return statement) - + better support for 16- and 64-bit machines - + expanded documentation, with more examples - -* Changes from version 2.2 to 2.4 - ------------------------------- - + external compiler creates portable binary files that can be loaded faster - + interface for debugging and profiling - + new "getglobal" fallback - + new functions for handling references to Lua objects - + new functions in standard lib - + only one copy of each string is stored - + expanded documentation, with more examples - -* Changes from version 2.1 to 2.2 - ------------------------------- - + functions now may be declared with any "lvalue" as a name - + garbage collection of functions - + support for pipes - -* Changes from version 1.1 to 2.1 - ------------------------------- - + object-oriented support - + fallbacks - + simplified syntax for tables - + many internal improvements - -(end of HISTORY) diff --git a/contrib/lua50/README b/contrib/lua50/README deleted file mode 100644 index 4aaaba528..000000000 --- a/contrib/lua50/README +++ /dev/null @@ -1,44 +0,0 @@ -This is Lua 5.0. -See HISTORY for a summary of changes since the last released version. - -* What is Lua? - ------------ - Lua is a powerful, light-weight programming language designed for extending - applications. Lua is also frequently used as a general-purpose, stand-alone - language. Lua is free software. - - For complete information, visit Lua's web site at http://www.lua.org/ . - For an executive summary, see http://www.lua.org/about.html . - - Lua has been used in many different projects around the world. - For a short list, see http://www.lua.org/uses.html . - -* Availability - ------------ - Lua is freely available for both academic and commercial purposes. - See COPYRIGHT and http://www.lua.org/license.html for details. - Lua can be downloaded from its official site http://www.lua.org/ and - several other sites aroung the world. For a complete list of mirror sites, - see http://www.lua.org/mirrors.html . - -* Installation - ------------ - Lua is implemented in pure ANSI C, and compiles unmodified in all known - platforms that have an ANSI C compiler. Under Unix, simply typing "make" - should work. See INSTALL for detailed instructions. - -* Contacting the authors - ---------------------- - Send your comments, questions, and bug reports to lua@tecgraf.puc-rio.br. - For more information about the authors, see http://www.lua.org/authors.html . - For reporting bugs, try also the mailing list: lua-l@tecgraf.puc-rio.br. - For more information about this list, including instructions on how to - subscribe and access the archives, see http://www.lua.org/lua-l.html . - -* Origin - ------ - Lua is developed at Tecgraf, the Computer Graphics Technology Group - of PUC-Rio (the Pontifical Catholic University of Rio de Janeiro in Brazil). - Tecgraf is a laboratory of the Department of Computer Science. - -(end of README) diff --git a/contrib/lua50/README.Aegisub b/contrib/lua50/README.Aegisub deleted file mode 100644 index d3c432ad3..000000000 --- a/contrib/lua50/README.Aegisub +++ /dev/null @@ -1,17 +0,0 @@ -This directory contains a stripped-down version of the Lua 5.0.3 source. -Nothing has changed in functionality, just some files not needed for Auto3 -have been removed. - -When building the Auto3 shared library, you are encouraged to use this version -of Lua. While it's unlikely, it might get some Auto3-specific patches in the -future. - -Be sure to build this as a static library for linking into the Auto3 shared -library. While lualib is usually meant to be built as a separate library, -there is no need to do that, and it slightly simplifies things if it's built -right into the main library. -Remember to use MSVC 2003 .NET (MSVC 7.1) on Windows! - - -TODO: -- Write new Makefile for non-MSVC systems diff --git a/contrib/lua50/UPDATE b/contrib/lua50/UPDATE deleted file mode 100644 index f0921887d..000000000 --- a/contrib/lua50/UPDATE +++ /dev/null @@ -1,23 +0,0 @@ -This is Lua 5.0.2, an update of Lua 5.0 that includes the following changes, -which fix all known bugs in Lua 5.0. For the exact differences, see DIFFS. - -src/ldo.c - Attempt to resume running coroutine crashed Lua -src/lgc.c - C functions also may have stacks larger than current top - Userdata to be collected still counted into new GC threshold -src/lgc.h - Userdata to be collected still counted into new GC threshold -src/lparser.c - Syntax `local function' did not increment stack size -src/lvm.c - `pc' address was invalidated when a coroutine was suspended - Count hook might be called without being set -src/lib/lbaselib.c - Buffer overflow for unusual %p representation - Wrong number of returns from chunks loaded from stdin -src/lib/liolib.c - `file.close()' could not be called without arguments - Buffer overflow for unusual %p representation -src/luac/luac.c - Missing lock/unlock diff --git a/contrib/lua50/doc/contents.html b/contrib/lua50/doc/contents.html deleted file mode 100644 index 06bd6fb4c..000000000 --- a/contrib/lua50/doc/contents.html +++ /dev/null @@ -1,123 +0,0 @@ - - -Lua: 5.0 reference manual - contents - - - - -
-

-Lua -Reference manual for Lua 5.0 -

- -Lua 5.0 Reference Manual -[ -top -| -ps -| -pdf -] -

- - -Copyright -© 2003 Tecgraf, PUC-Rio. All rights reserved. -

- - - -
- -Last update: -Wed May 7 18:34:34 EST 2003 - - - - diff --git a/contrib/lua50/doc/logo.gif b/contrib/lua50/doc/logo.gif deleted file mode 100644 index 2f5e4ac2e742fbb7675e739879211553758aea9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4232 zcmeH``9G8i;K!fm@ywWE@XWZzZ5SF?A>^uN#>^O6HI%DVL*tw8h1>$H%uPC0$QQ=txe!o}PX)Ev+jn>*nFZ-TC=<^76WcLZL(=DJm)| zEiIKwrInSHXU?3duCC_u@5try#>U2`rlw1mF15F}U%!66tE;QKyIUmcDJ<+QF77*W zFJd#&)VAl)kJ6K zi<>tmZ{3>g>+2gB7#JQNe(>OdLh;A=`1q42PbMZNCMPF*dXxhLZw3aYhlZwyhu@Bj z%#4n{d-Q1b$&i4QMce4L#8^!oMdw{PDnm4D66&3*dxX=-YIX6DQL_g`jbzkd4k zZDCoLf=%jL&vIeE zO=XcZ9fxt`f}-DQ^%H*PHMUs(JN%UWkI|Y8h9#6~I$Cw@{RqzO4&P-x;jHCPJ6Ks2 zoU%foi)nXd_sdkiuJa@@5J4RrreKfWSnz5>eMa5yTP=)16uu)TIdx~Fhho))6jZl) z($*i>QrIX4u}u3>m{WSn_ehkUGQ& zs})aUlTH1Cj1g3ZE3=MPXsSniEwJ{e6C3N#HjD=B4`8rWIsz!a7ecYpec?WuH+y?Wsm18^$cS4WmHhH3_=r zh*ILlm*X1dB^E5($KVl&zT524%l}vpHg%;Y+LezV_&TAJCmH`idhuj-n$4FZ)UE|jXLayXa-&O3Q z?Iyo!x*$5hD_HfFnDfGYj-RD|eIb7I?%>Y_kf%}Nbd`BXb4l1(Pc+}zoUR|9%_!7f zum2T;wbx&pohtI+&@~wm3nH9xLbOYkg*`phY~TK5iC#3tZNXo9s`cahx+8j2)rh5C zQgZh6D7Ekgib|hpdhxYf{r!PTJc z!vsYG@{hA}l5kL)g)0N_)(nC<*L0qdUi*3fD5<0sn58>zklX@6Tyv3*X^}m=Cqc40 zQ6GfjG@kd1mFIm`qaubWunm_?P>WUZ`9|f_z%gGHi{n|uu(N8!L=aw5(qAcDj$-QK zu;D#j6e42OXTQD>)i zlvM$LX`$n9EEjxM$_QDF&a z7cme_rat}aXmiN&7`6Q98}dh4Z@8L_uAb#nK&GQiZOOUnA9kAEVb-csuN1AWL=sXt z{z9GCN%%l0N9QvJM;tl1nf?rrhT{*sE%4WqR?{0~aIrfCcCPxf4eh_*jjQ=`$p53Y z@_|Rsx2i}|3dNFetMQQ5y8agTK-E0D&7;@3-LUxfvZ7 z7~!p@&mFe^oca2^F|CBt+4Ly?^ViUVSAhAH>JH1GN{^TQb3QnM*x0ZiZgDyNI@_c3 z@{}(WH4*e3T~}n_^0}da4ElIxAf9B!IaL7z9X0Icvj@cIkE*~W--17&WN`Ea5)Gn> z#gpfRb#44;jVTOS{FuaZgd(-ZD848=fQzgST2MxR>wSLc1P=2HDvByz$B$IsNCC6L zCM?nK*OHj6JA9gz4|b<~2%RqelN^1Y)jIqnRs!mDKV^BQTfo@hOtz7*Ug}Ee^cbsj zNNlumRgAmt`1$b5MO;&X#5-EP<}AaY;52ihIpem&MTea$?3!DrwbYa?V`NjEfWF3z zUq5JY8Ch;L{kx&J<1K&Fe_Vn;8gk{%c;n?nA2(%(f%DCRHko3uT~VI7RE^JWEqaCq z)i|%nfj(*4|V*XhY3W%M# z*yn6SN4eUOHFxAD7B&9E_PO`G5bqgs^@J{9bk>&;PlUAiqo`j3rjQDgD!}mqLUtb` zCB}ZD@m@s#pf7bV4jreOC*JVfHZ|hyHkX!rauVdd_I9FL45d{gWH!DNYu;i(|8wVx z!)eLY6YXxZ2{Coae0xuTnxo1ACb5wtED?VJAz&@114$Ao6uG9YSy*!K;m5_mj=0^j zw%?b%AOs}ql@$TGC-!^^*_#RT5+y_kTzQG9?LPPZNAtt6cJ%d2$q(I)ws21*?xF%p zN+NeGnWRQ<5w70Rc(bl|S0Xr&5@WrmdurS|IgPB|EyuZO#=tf!35)G!HJ`E1jh^lH zTBu~rL#DhQO*XAWtBt}JHH$lc>3%r0yD|maW_(W=B_J+y164F>O4dO|@&@N3Z3p=B zmVl{|^Z&#atHY|9n&la)SBo}=3AFIF=_~LDJk6MTlA73CXtX+4bnn+c!}N}IPa5pp zwyqbqIkN|I3j_3vD6$zlu{Ps(N-J|*qzEt<$5Soh;s^AuKv_ z-Tz+O1_~6*9CJh4r}`}mbUtjbf#fX58RIIkP6&@*y9kI|5fK*_eZ%jv3U$5*x<>D_ za2M(TV8?XY+9xy>0En#Te<6X4$0&dbyd(go$~eq4u(u)EA2msyF<5ssLZ zDP|I}=~Bi_q)whWv=Ri~L1TYaNrR;5cMB@s78HF1{w&r(6GJ;_2@bD?#1p&P4n_?n0#9Vx~$qjMX=Lk?*!@aKo8m&$iPO7S{g3sFUwr`*<53(68xx7?z`2xf# zGSicy_zI(PJ|%qc2VxT+6bOE--a{k&aq7$<<= zFt)C<@|TPs`+eycPGoGL1Wn9|Ed&a2JyAmjnkm3DQBECX&`bt~odH9cUPq4M{#$-q?G3!)qO-it*&YHw+j-O* zYy78V*`4Q=kQ@^Yz*b6Tal4(Me7BGeS^;phWAW8+L^5A(=D)t?k!rLIwVAKtq=f7h z&^n&VX1-T$ScvN~639QLZ^d@niMaS{C-Q)8oHHBhwD*r~-1Ze#Q)GFOFptW32a-uF z;M@ux%i%a25NwIgXt*=GHX$3~aZfwovGL!}sf?j9TsVo^cn(%&a<--0mIXYqGe>c PWz_J}_#7St0k8iB@FZjZ diff --git a/contrib/lua50/doc/manual.html b/contrib/lua50/doc/manual.html deleted file mode 100644 index 2a92d2aaf..000000000 --- a/contrib/lua50/doc/manual.html +++ /dev/null @@ -1,4612 +0,0 @@ - - - - -Lua: 5.0 reference manual - - - - -
-

-Lua -Lua 5.0 Reference Manual -

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

- -Copyright -© 2003 Tecgraf, PUC-Rio. All rights reserved. - -

- -

-

- - - - -

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, light-weight -configuration language for any program that needs one. -Lua is implemented as a library, written in clean C -(that is, in the common subset of ANSI 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. -This 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 stand-alone embedding program, -lua, that uses the Lua library to offer a complete Lua interpreter. - -

Lua is free software, -and is provided as usual with no guarantees, -as stated in its copyright notice. -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 papers below, -which are available at Lua's web site. -

    -
  • -R. Ierusalimschy, L. H. de Figueiredo, and W. Celes. -Lua---an extensible extension language. -Software: Practice & Experience 26 #6 (1996) 635-652. -
  • -L. H. de Figueiredo, R. Ierusalimschy, and W. Celes. -The design and implementation of a language for extending applications. -Proceedings of XXI Brazilian Seminar on Software and Hardware (1994) 273-283. -
  • -L. H. de Figueiredo, R. Ierusalimschy, and W. Celes. -Lua: an extensible embedded language. -Dr. Dobb's Journal 21 #12 (Dec 1996) 26-33. -
  • -R. Ierusalimschy, L. H. de Figueiredo, and W. Celes. -The evolution of an extension language: a history of Lua, -Proceedings of V Brazilian Symposium on Programming Languages (2001) B-14-B-28. -
- -

Lua means "moon" in Portuguese and is pronounced LOO-ah. - -

-

2 - 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. - -

The language constructs will be explained using the usual extended BNF, -in which -{a} means 0 or more a's, and -[a] means an optional a. -Non-terminals are shown in italics, -keywords are shown in bold, -and other terminal symbols are shown in typewriter font, -enclosed in single quotes. - -

2.1 - Lexical Conventions

- -

Identifiers in Lua can be any string of letters, -digits, and underscores, -not beginning with a digit. -This coincides with the definition of identifiers in most languages. -(The definition of letter depends on the current locale: -any character considered alphabetic by the current locale -can be used in an identifier.) - -

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

-       and       break     do        else      elseif
-       end       false     for       function  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 identifiers. -As a convention, identifiers starting with an underscore followed by -uppercase letters (such as _VERSION) -are reserved for internal 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 -
  • \' --- apostrophe -
  • \[ --- left square bracket -
  • \] --- right square bracket -
-Moreover, a `\newline´ -(that is, a backslash followed by a real newline) -results in a newline in the string. -A character in a string may also be specified by its numerical value -using the escape sequence `\ddd´, -where ddd is a sequence of up to three decimal digits. -Strings in Lua may contain any 8-bit value, including embedded zeros, -which can be specified as `\0´. - -

Literal strings can also be delimited by matching double square brackets -[[ · · · ]]. -Literals in this bracketed form may run for several lines, -may contain nested [[ · · · ]] pairs, -and do not interpret any escape sequences. -For convenience, -when the opening `[[´ 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 four literals below denote the same string: -

-      (1)   "alo\n123\""
-      (2)   '\97lo\10\04923"'
-      (3)   [[alo
-            123"]]
-      (4)   [[
-            alo
-            123"]]
-
- -

Numerical constants may be written with an optional decimal part -and an optional decimal exponent. -Examples of valid numerical constants are -

-       3     3.0     3.1416  314.16e-2   0.31416E1
-
- -

Comments start anywhere outside a string with a -double hyphen (--). -If the text immediately after -- is different from [[, -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 ]]. -Long comments may run for several lines -and may contain nested [[ · · · ]] pairs. - -

For convenience, -the first line of a chunk is skipped if it starts with #. -This facility allows the use of Lua as a script interpreter -in Unix systems (see 6). - -

2.2 - Values and Types

- -

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

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; -usually it represents the absence of a useful value. -Boolean is the type of the values false and true. -In Lua, both nil and false make a condition false; -any other value makes it true. -Number represents real (double-precision floating-point) numbers. -(It is easy to build Lua interpreters that use other -internal representations for numbers, -such as single-precision float or long integers.) -String represents arrays of characters. - -Lua is 8-bit clean: -Strings may contain any 8-bit character, -including embedded zeros ('\0') (see 2.1). - -

Functions are first-class values in Lua. -That means that functions can be stored in variables, -passed as arguments to other functions, and returned as results. -Lua can call (and manipulate) functions written in Lua and -functions written in C -(see 2.5.7). - -

The type userdata is provided to allow arbitrary C data to -be stored in Lua variables. -This type corresponds to a block of raw memory -and has no pre-defined operations in Lua, -except assignment and identity test. -However, by using metatables, -the programmer can define operations for userdata values -(see 2.8). -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. - -

The type table implements associative arrays, -that is, arrays that can be indexed not only with numbers, -but with any value (except nil). -Moreover, -tables can be heterogeneous, -that is, they can contain values of all types (except nil). -Tables are the sole data structuring mechanism in Lua; -they may be used to represent ordinary arrays, -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 2.5.6). - -

Like indices, -the value of a table field can be of any type (except nil). -In particular, -because functions are first class values, -table fields may contain functions. -Thus tables may also carry methods (see 2.5.8). - -

Tables, functions, and 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 5.1). - -

2.2.1 - Coercion

- -

Lua provides automatic conversion between -string and number values at run time. -Any arithmetic operation applied to a string tries to convert -that string to a number, following the usual rules. -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 of how numbers are converted to strings, -use the format function from the string library (see 5.3). - -

2.3 - 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 formal parameter of a function, -which is a particular form of local variable): -

-	var ::= Name
-
-Variables are assumed to be global unless explicitly declared local -(see 2.4.7). -Local variables are lexically scoped: -Local variables can be freely accessed by functions -defined inside their scope (see 2.6). - -

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

Square brackets are used to index a table: -

-	var ::= prefixexp `[´ exp `]´
-
-The first expression (prefixexp)should result in a table value; -the second expression (exp) -identifies a specific entry inside that table. -The expression denoting the table to be indexed has a restricted syntax; -see 2.5 for details. - -

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

-	var ::= prefixexp `.´ Name
-
- -

The meaning of accesses to global variables -and 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.8 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.) - -

All global variables live as fields in ordinary Lua tables, -called environment tables or simply environments. -Functions written in C and exported to Lua (C functions) -all share a common global environment. -Each function written in Lua (a Lua function) -has its own reference to an environment, -so that all global variables in that function -will refer to that environment table. -When a function is created, -it inherits the environment from the function that created it. -To change or get the environment table of a Lua function, -you call setfenv or getfenv (see 5.1). - -

An access to a global variable x -is equivalent to _env.x, -which in turn is equivalent to -

-       gettable_event(_env, "x")
-
-where _env is the environment of the running function. -(The _env variable is not defined in Lua. -We use it here only for explanatory purposes.) - -

2.4 - Statements

- -

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

2.4.1 - Chunks

- -

The unit of execution of Lua is called a chunk. -A chunk is simply a sequence of statements, -which are executed sequentially. -Each statement can be optionally followed by a semicolon: -

-	chunk ::= {stat [`;´]}
-
- -

Lua handles a chunk as the body of an anonymous function (see 2.5.8). -As such, chunks can define local variables and return values. - -

A chunk may be stored in a file or in a string inside the host program. -When a chunk is executed, first it is pre-compiled into opcodes for -a virtual machine, -and then the compiled code is executed -by an interpreter for the virtual machine. - -

Chunks may also be pre-compiled 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. - - -

2.4.2 - Blocks

-A block is a list of statements; -syntactically, a block is equal to a chunk: -
-	block ::= chunk
-
- -

A block may 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 or break statement in the middle -of another block (see 2.4.4). - - -

2.4.3 - Assignment

- -

Lua allows multiple assignment. -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 ::= varlist1 `=´ explist1
-	varlist1 ::= var {`,´ var}
-	explist1 ::= exp {`,´ exp}
-
-Expressions are discussed in 2.5. - -

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 function call enter in the list of values, -before the adjustment -(except when the call is enclosed in parentheses; see 2.5). - -

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. - -

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.8 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, -which in turn is equivalent to -

-       settable_event(_env, "x", val)
-
-where _env is the environment of the running function. -(The _env variable is not defined in Lua. -We use it here only for explanatory purposes.) - -

2.4.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 2.4.5). - -

The condition expression exp of a -control structure may 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). - -

The return statement is used to return values -from a function or from a chunk. - -Functions and chunks may return more than one value, -so the syntax for the return statement is -

-	stat ::= return [explist1]
-
- -

The break statement can be used to terminate 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. - -

For syntactic reasons, return and break -statements can only be written as the last statement of a block. -If it is really necessary to return or break in the -middle of a block, -then an explicit inner block can be used, -as in the idioms -`do return end´ and -`do break end´, -because now return and break are the last statements in -their (inner) blocks. -In practice, -those idioms are only used during debugging. - -

2.4.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 var = 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
-           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. -
  • _limit and _step are invisible variables. -The names are here for explanatory purposes only. -
  • The behavior is undefined if you assign to var inside -the block. -
  • 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 var is local to the statement; -you cannot use its value after the for ends or is broken. -If you need the value of the loop variable var, -then assign it to another variable before breaking or exiting the loop. -
- -

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

-	stat ::= for Name {`,´ Name} in explist1 do block end
-
-A for statement like -
-       for var_1, ..., var_n in explist do block end
-
-is equivalent to the code: -
-       do
-         local _f, _s, var_1 = explist
-         local var_2, ... , var_n
-         while true do
-           var_1, ..., var_n = _f(_s, var_1)
-           if var_1 == nil then break end
-           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 and _s are invisible variables. -The names are here for explanatory purposes only. -
  • The behavior is undefined if you assign to -var_1 inside the block. -
  • You can use break to exit a for loop. -
  • The loop variables var_i are local to the statement; -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. -
- -

2.4.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 2.5.7. - -

2.4.7 - Local Declarations

-Local variables may be declared anywhere inside a block. -The declaration may include an initial assignment: -
-	stat ::= local namelist [`=´ explist1]
-	namelist ::= Name {`,´ Name}
-
-If present, an initial assignment has the same semantics -of a multiple assignment (see 2.4.3). -Otherwise, all variables are initialized with nil. - -

A chunk is also a block (see 2.4.1), -so local variables can be declared in a chunk outside any explicit block. -Such local variables die when the chunk ends. - -

The visibility rules for local variables are explained in 2.6. - -

2.5 - Expressions

- -

-The basic expressions in Lua are the following: -

-	exp ::= prefixexp
-	exp ::= nil | false | true
-	exp ::= Number
-	exp ::= Literal
-	exp ::= function
-	exp ::= tableconstructor
-	prefixexp ::= var | functioncall | `(´ exp `)´
-
- -

Numbers and literal strings are explained in 2.1; -variables are explained in 2.3; -function definitions are explained in 2.5.8; -function calls are explained in 2.5.7; -table constructors are explained in 2.5.6. - - -

An 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.) - -

Expressions can also be built with arithmetic operators, relational operators, -and logical operators, all of which are explained below. - -

2.5.1 - Arithmetic Operators

-Lua supports the usual arithmetic operators: -the binary + (addition), -- (subtraction), * (multiplication), -/ (division), and ^ (exponentiation); -and unary - (negation). -If the operands are numbers, or strings that can be converted to -numbers (see 2.2.1), -then all operations except exponentiation have the usual meaning. -Exponentiation calls a global function __pow; -otherwise, an appropriate metamethod is called (see 2.8). -The standard mathematical library defines function __pow, -giving the expected meaning to exponentiation -(see 5.5). - -

2.5.2 - 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. -Objects (tables, userdata, threads, and functions) -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 function), -this new object is different from any previously existing object. - -

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

The conversion rules of 2.2.1 -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.8). - -

2.5.3 - Logical Operators

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

The operator not always return 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. -For example, -

-       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
-
- -

2.5.4 - 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 2.2.1. -Otherwise, the "concat" metamethod is called (see 2.8). - -

2.5.5 - Precedence

-Operator precedence in Lua follows the table below, -from lower to higher priority: -
-       or
-       and
-       <     >     <=    >=    ~=    ==
-       ..
-       +     -
-       *     /
-       not   - (unary)
-       ^
-
-You can use parentheses to change the precedences in an expression. -The concatenation (`..´) and exponentiation (`^´) -operators are right associative. -All other binary operators are left associative. - -

2.5.6 - Table Constructors

-Table constructors are expressions that create tables. -Every time a constructor is evaluated, a new table is created. -Constructors can be used to create empty tables, -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 temp = {}
-         temp[f(1)] = g
-         temp[1] = "x"         -- 1st exp
-         temp[2] = "y"         -- 2nd exp
-         temp.x = 1            -- temp["x"] = 1
-         temp[3] = f(x)        -- 3rd exp
-         temp[30] = 23
-         temp[4] = 45          -- 4th exp
-         a = temp
-       end
-
- -

If the last field in the list has the form exp -and the expression is a function call, -then all values returned by the call enter the list consecutively -(see 2.5.7). -To avoid this, -enclose the function call in parentheses (see 2.5). - -

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

2.5.7 - 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 that function is called -with the given arguments. -Otherwise, its "call" metamethod is called, -having as first parameter the value of prefixexp, -followed by the original call arguments -(see 2.8). - -

The form -

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

Arguments have the following syntax: -

-	args ::= `(´ [explist1] `)´
-	args ::= tableconstructor
-	args ::= Literal
-
-All argument expressions are evaluated before the call. -A call of the form f{...} is syntactic sugar for -f({...}), that is, -the argument list is a single new table. -A call of the form f'...' -(or f"..." or f[[...]]) is syntactic sugar for -f('...'), that is, -the argument list is a single literal string. - -

Because a function can return any number of results -(see 2.4.4), -the number of results must be adjusted before they are used. -If the function is called as a statement (see 2.4.6), -then its return list is adjusted to zero elements, -thus discarding all returned values. -If the function is called inside another expression -or in the middle of a list of expressions, -then its return list is adjusted to one element, -thus discarding all returned values except the first one. -If the function is called as the last element of a list of expressions, -then no adjustment is made -(unless the call is enclosed in parentheses). - -

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 values returned by f()
-       a,b,c = f(), x     -- f() is adjusted to 1 result (and c gets nil)
-       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 values returned by f()
-       return x,y,f()     -- returns x, y, and all values returned by f()
-       {f()}              -- creates a list with all values returned by f()
-       {f(), nil}         -- f() is adjusted to 1 result
-
- -

If you enclose a function call in parentheses, -then it is adjusted to return exactly one value: -

-       return x,y,(f())   -- returns x, y, and the first value from f()
-       {(f())}            -- creates a table with exactly one element
-
- -

As an exception to the free-format syntax of Lua, -you cannot put a line break before the `(´ in a function call. -That restriction avoids some ambiguities in the language. -If you write -

-       a = f
-       (g).x(a)
-
-Lua would read that as a = f(g).x(a). -So, if you want two statements, you must add a semi-colon between them. -If you actually want to call f, -you must remove the line break before (g). - -

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 returns exactly -the returns of the called function. -So, all the following examples are not tails 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
-
- -

2.5.8 - Function Definitions

- -

The syntax for function definition is -

-	function ::= function funcbody
-	funcbody ::= `(´ [parlist1] `)´ 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 () ... end
-
-translates to -
-       f = function () ... end
-
-The statement -
-       function t.a.b.c.f () ... end
-
-translates to -
-       t.a.b.c.f = function () ... end
-
-The statement -
-       local function f () ... end
-
-translates to -
-       local f; f = function () ... end
-
- -

A function definition is an executable expression, -whose value has type function. -When Lua pre-compiles a chunk, -all its function bodies are pre-compiled 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. -Different instances of the same function -may refer to different external local variables -and may have different environment tables. - -

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

-	parlist1 ::= namelist [`,´ `...´]
-	parlist1 ::= `...´
-
-When a function is called, -the list of arguments is adjusted to -the length of the list of parameters, -unless the function is a variadic or 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 into an implicit parameter, -called arg. -The value of arg is a table, -with a field n that holds the number of extra arguments -and with the extra arguments at positions 1, 2, ..., n. - -

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: -
-       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, arg={n=0}
-       g(3, 4)          a=3, b=4,   arg={n=0}
-       g(3, 4, 5, 8)    a=3, b=4,   arg={5, 8; n=2}
-       g(5, r())        a=5, b=1,   arg={2, 3; n=2}
-
- -

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

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 (...) ... end
-
-is syntactic sugar for -
-       t.a.b.c.f = function (self, ...) ... end
-
- -

2.6 - Visibility Rules

- - -

Lua is a lexically scoped language. -The scope of variables begins at the first statement after -their declaration and lasts until the end of the innermost block that -includes the declaration. -For instance: -

-  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. -For instance: -

-  local counter = 0
-  function inc (x)
-    counter = counter + x
-    return counter
-  end
-
-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. - -

2.7 - Error Handling

- -

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

Lua code can explicitly generate an error by calling the -error function (see 5.1). -If you need to catch errors in Lua, -you can use the pcall function (see 5.1). - -

2.8 - Metatables

- -

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

We call the keys in a metatable events -and the values metamethods. -In the previous example, the event is "add" -and the metamethod is the function that performs the addition. - -

You can query and change the metatable of an object -through the set/getmetatable -functions (see 5.1). - -

A metatable may control how an object behaves in arithmetic operations, -order comparisons, concatenation, and indexing. -A metatable can also define a function to be called when a userdata -is garbage collected. -For each of those operations Lua associates a specific key -called an event. -When Lua performs one of those operations over a table or a userdata, -it checks whether that object 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 that 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 5.1. -In particular, to retrieve the metamethod of a given object, -we use the expression -

-  metatable(obj)[event]
-
-This should be read as -
-  rawget(metatable(obj) or {}, event)
-
-That is, the access to a metamethod does not invoke other metamethods, -and the access to objects with no metatables does not fail -(it simply results in nil). - -

    - -

  • "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
-
    -Using that 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. - -

  • "pow": -the ^ (exponentiation) operation. -
    - function pow_event (op1, op2)
-   local o1, o2 = tonumber(op1), tonumber(op2)
-   if o1 and o2 then  -- both operands are numeric?
-     return __pow(o1, o2)   -- call global `__pow'
-   else  -- at least one of the operands is not numeric
-     local h = getbinhandler(op1, op2, "__pow")
-     if h then
-       -- call the handler with both operands
-       return h(op1, op2)
-     else  -- no handler available: default behavior
-       error("...")
-     end
-   end
-  end
-
    - -

  • "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 and nil
-       return h(op, nil)
-     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
-
    - -

  • "eq": -the == operation. -The function getcomphandler defines how Lua chooses a metamethod -for comparison operators. -A metamethod only is selected when both objects -being compared have the same type -and the same metamethod for the selected operation. -
    - function getcomphandler (op1, op2, event)
-   if type(op1) ~= type(op2) then return nil end
-   local mm1 = metatable(op1)[event]
-   local mm2 = metatable(op2)[event]
-   if mm1 == mm2 then return mm1 else return nil end
- end
-
    -The "eq" event is defined as follows: -
    - function eq_event (op1, op2)
-   if type(op1) ~= type(op2) then  -- different types?
-     return false   -- different objects
-   end
-   if op1 == op2 then   -- primitive equal?
-     return true   -- objects are equal
-   end
-   -- try metamethod
-   local h = getcomphandler(op1, op2, "__eq")
-   if h then
-     return h(op1, op2)
-   else
-     return false
-   end
- end
-
    -a ~= b is equivalent to not (a == b). - -

  • "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 = getcomphandler(op1, op2, "__lt")
-     if h then
-       return h(op1, op2)
-     else
-       error("...");
-     end
-   end
- end
-
    -a > b is equivalent to b < a. - -

  • "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 = getcomphandler(op1, op2, "__le")
-     if h then
-       return h(op1, op2)
-     else
-       h = getcomphandler(op1, op2, "__lt")
-       if h then
-         return not h(op2, op1)
-       else
-         error("...");
-       end
-     end
-   end
- end
-
    -a >= b is equivalent to b <= a. -Note that, in the absence of a "le" metamethod, -Lua tries the "lt", assuming that a <= b is -equivalent to not (b < a). - -

  • "index": -The indexing access table[key]. -
    - function gettable_event (table, key)
-   local h
-   if type(table) == "table" then
-     local v = rawget(table, key)
-     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
-
    - -

  • "newindex": -The indexing assignment table[key] = value. -
    - function settable_event (table, key, value)
-   local h
-   if type(table) == "table" then
-     local v = rawget(table, key)
-     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
-     return h(table, key,value)    -- call the handler
-   else h[key] = value             -- or repeat operation on it
- end
-
    - -

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

- -

2.9 - Garbage Collection

- -

Lua does automatic memory management. -That means that -you do not have to worry about allocating memory for new objects -and freeing it when the objects are no longer needed. -Lua manages memory automatically by running -a garbage collector from time to time -to collect all dead objects -(that is, those objects that are no longer accessible from Lua). -All objects in Lua are subject to automatic management: -tables, userdata, functions, threads, and strings. - -

Lua uses two numbers to control its garbage-collection cycles. -One number counts how many bytes of dynamic memory Lua is using; -the other is a threshold. -When the number of bytes crosses the threshold, -Lua runs the garbage collector, -which reclaims the memory of all dead objects. -The byte counter is adjusted, -and then the threshold is reset to twice the new value of the byte counter. - -

Through the C API, you can query those numbers -and change the threshold (see 3.7). -Setting the threshold to zero actually forces an immediate -garbage-collection cycle, -while setting it to a huge number effectively stops the garbage collector. -Using Lua code you have a more limited control over garbage-collection cycles, -through the gcinfo and collectgarbage functions -(see 5.1). - -

2.9.1 - Garbage-Collection Metamethods

- -

Using the C API, -you can set garbage-collector metamethods for userdata (see 2.8). -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). - -

Free userdata with a field __gc in their metatables are not -collected immediately by the garbage collector. -Instead, Lua puts them in a list. -After the collection, -Lua does the equivalent of the following function -for each userdata in that list: -

- function gc_event (udata)
-   local h = metatable(udata).__gc
-   if h then
-     h(udata)
-   end
- end
-
- -

At the end of each garbage-collection cycle, -the finalizers for userdata are called in reverse -order of their creation, -among those collected in that cycle. -That is, the first finalizer to be called is the one associated -with the userdata created last in the program. - -

2.9.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 value of 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. - -

After you use a table as a metatable, -you should not change the value of its field __mode. -Otherwise, the weak behavior of the tables controlled by this -metatable is undefined. - -

2.10 - Coroutines

- -

Lua supports coroutines, -also called semi-coroutines -or 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 with a call to 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 execution. - -

When you first call coroutine.resume, -passing as its first argument the 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 given as -parameters for 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. - -

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

As an example, -consider the next code: -

-function foo1 (a)
-  print("foo", a)
-  return coroutine.yield(2*a)
-end
-
-co = coroutine.create(function (a,b)
-      print("co-body", a, b)
-      local r = foo1(a+1)
-      print("co-body", r)
-      local r, s = coroutine.yield(a+b, a-b)
-      print("co-body", r, s)
-      return b, "end"
-end)
-       
-a, b = coroutine.resume(co, 1, 10)
-print("main", a, b)
-a, b, c = coroutine.resume(co, "r")
-print("main", a, b, c)
-a, b, c = coroutine.resume(co, "x", "y")
-print("main", a, b, c)
-a, b = coroutine.resume(co, "x", "y")
-print("main", a, b)
-
-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
-
- -

-

3 - 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. -All such macros use each of its arguments exactly once -(except for the first argument, which is always a Lua state), -and so do not generate hidden side-effects. - -

3.1 - States

- -

The Lua library is fully reentrant: -it has no global variables. - -The whole state of the Lua interpreter -(global variables, stack, etc.) -is stored in a dynamically allocated structure of type lua_State. - -A pointer to this state must be passed as the first argument to -every function in the library, except to lua_open, -which creates a Lua state from scratch. - -

Before calling any API function, -you must create a state by calling lua_open: -

-       lua_State *lua_open (void);
-
- - -

To release a state created with lua_open, call lua_close: -

-       void lua_close (lua_State *L);
-
- -This function destroys all objects in the given Lua state -(calling the corresponding garbage-collection metamethods, if any) -and frees all dynamic memory used by that 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, -such as a daemon or a web server, -might need to release states as soon as they are not needed, -to avoid growing too large. - -

3.2 - The Stack and Indices

- -

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. -That 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 3.16) -to be returned to the caller. - -

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 from 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. -We say that an index is valid -if it lies between 1 and the stack top -(that is, if 1 <= abs(index) <= top). - - -

At any time, you can get the index of the top element by calling -lua_gettop: -

-       int lua_gettop (lua_State *L);
-
-Because indices start at 1, -the result of lua_gettop is equal to the number of elements in the stack -(and so 0 means an empty stack). - -

When you interact with Lua API, -you are responsible for controlling stack overflow. -The function -

-       int lua_checkstack (lua_State *L, int extra);
-
- -grows the stack size to top + extra elements; -it returns false if it cannot grow the stack to that size. -This function never shrinks the stack; -if the stack is already larger than the new size, -it is left unchanged. - -

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

Most query functions accept as indices any value inside the -available stack space, that is, indices up to the maximum stack size -you have set through lua_checkstack. -Such indices are called acceptable indices. -More formally, we define an acceptable index -as follows: -

-     (index < 0 && abs(index) <= top) || (index > 0 && index <= stackspace)
-
-Note that 0 is never an acceptable index. - -

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

3.3 - Stack Manipulation

-The API offers the following functions for basic stack manipulation: -
-       void lua_settop    (lua_State *L, int index);
-       void lua_pushvalue (lua_State *L, int index);
-       void lua_remove    (lua_State *L, int index);
-       void lua_insert    (lua_State *L, int index);
-       void lua_replace   (lua_State *L, int index);
-
- - - -

lua_settop accepts any acceptable index, -or 0, -and sets the stack top to that 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. -A useful macro defined in the lua.h is -

-       #define lua_pop(L,n)   lua_settop(L, -(n)-1)
-
- -which pops n elements from the stack. - -

lua_pushvalue pushes onto the stack a copy of the element -at the given index. -lua_remove removes the element at the given position, -shifting down the elements above that position to fill the gap. -lua_insert moves the top element into the given position, -shifting up the elements above that position to open space. -lua_replace moves the top element into the given position, -without shifting any element (therefore replacing the value at -the given position). -All these functions accept only valid indices. -(You cannot call lua_remove or lua_insert with -pseudo-indices, as they do not represent a stack position.) - -

As an example, if the stack starts as 10 20 30 40 50* -(from bottom to top; the `*´ marks the top), -then -

-       lua_pushvalue(L, 3)    --> 10 20 30 40 50 30*
-       lua_pushvalue(L, -1)   --> 10 20 30 40 50 30 30*
-       lua_remove(L, -3)      --> 10 20 30 40 30 30*
-       lua_remove(L,  6)      --> 10 20 30 40 30*
-       lua_insert(L,  1)      --> 30 10 20 30 40*
-       lua_insert(L, -1)      --> 30 10 20 30 40*  (no effect)
-       lua_replace(L, 2)      --> 30 40 20 30*
-       lua_settop(L, -3)      --> 30 40*
-       lua_settop(L,  6)      --> 30 40 nil nil nil nil*
-
- -

3.4 - Querying the Stack

- -

To check the type of a stack element, -the following functions are available: -

-       int lua_type            (lua_State *L, int index);
-       int lua_isnil           (lua_State *L, int index);
-       int lua_isboolean       (lua_State *L, int index);
-       int lua_isnumber        (lua_State *L, int index);
-       int lua_isstring        (lua_State *L, int index);
-       int lua_istable         (lua_State *L, int index);
-       int lua_isfunction      (lua_State *L, int index);
-       int lua_iscfunction     (lua_State *L, int index);
-       int lua_isuserdata      (lua_State *L, int index);
-       int lua_islightuserdata (lua_State *L, int index);
-
- - - - - -These functions can be called with any acceptable index. - -

lua_type returns the type of a value in the stack, -or LUA_TNONE for a non-valid index -(that is, if that stack position is "empty"). -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, -LUA_TLIGHTUSERDATA. -The following function translates these constants to strings: -

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

The lua_is* functions return 1 if the object is compatible -with the given type, and 0 otherwise. -lua_isboolean is an exception to this rule: -It succeeds only for boolean values -(otherwise it would be useless, -as any value has a boolean value). -They always return 0 for a non-valid index. -lua_isnumber accepts numbers and numerical strings; -lua_isstring accepts strings and numbers (see 2.2.1); -lua_isfunction accepts both Lua functions and C functions; -and lua_isuserdata accepts both full and light userdata. -To distinguish between Lua functions and C functions, -you can use lua_iscfunction. -To distinguish between full and light userdata, -you can use lua_islightuserdata. -To distinguish between numbers and numerical strings, -you can use lua_type. - -

The API also contains functions to compare two values in the stack: -

-       int lua_equal    (lua_State *L, int index1, int index2);
-       int lua_rawequal (lua_State *L, int index1, int index2);
-       int lua_lessthan (lua_State *L, int index1, int index2);
-
- -lua_equal and lua_lessthan -are equivalent to their counterparts in Lua (see 2.5.2). -lua_rawequal compares the values for primitive equality, -without metamethods. -These functions return 0 (false) if any of the indices are non-valid. - -

3.5 - Getting Values from the Stack

- -

To translate a value in the stack to a specific C type, -you can use the following conversion functions: -

-       int            lua_toboolean   (lua_State *L, int index);
-       lua_Number     lua_tonumber    (lua_State *L, int index);
-       const char    *lua_tostring    (lua_State *L, int index);
-       size_t         lua_strlen      (lua_State *L, int index);
-       lua_CFunction  lua_tocfunction (lua_State *L, int index);
-       void          *lua_touserdata  (lua_State *L, int index);
-       lua_State     *lua_tothread    (lua_State *L, int index);
-       void          *lua_topointer   (lua_State *L, int index);
-
- - - -These functions can be called with any acceptable index. -When called with a non-valid index, -they act as if the given value had an incorrect type. - -

lua_toboolean converts the Lua value at the given index -to a C "boolean" value (0 or 1). -Like all tests in Lua, lua_toboolean returns 1 for any Lua value -different from false and nil; -otherwise it returns 0. -It also returns 0 when called with a non-valid index. -(If you want to accept only real boolean values, -use lua_isboolean to test the type of the value.) - -

lua_tonumber converts the Lua value at the given index -to a number (by default, lua_Number is double). - -The Lua value must be a number or a string convertible to number -(see 2.2.1); otherwise, lua_tonumber returns 0. - -

lua_tostring converts the Lua value at the given index to a string -(const char*). -The Lua value must be a string or a number; -otherwise, the function returns NULL. -If the value is a number, -then lua_tostring also -changes the actual value in the stack to a string. -(This change confuses lua_next -when lua_tostring is applied to keys.) -lua_tostring 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 may contain other zeros in its body. -If you do not know whether a string may contain zeros, -you can use lua_strlen to get its actual length. -Because Lua has garbage collection, -there is no guarantee that the pointer returned by lua_tostring -will be valid after the corresponding value is removed from the stack. -If you need the string after the current function returns, -then you should duplicate it or put it into the registry (see 3.18). - -

lua_tocfunction converts a value in the stack to a C function. -This value must be a C function; -otherwise, lua_tocfunction returns NULL. -The type lua_CFunction is explained in 3.16. - -

lua_tothread converts a value in the stack to a Lua thread -(represented as lua_State *). -This value must be a thread; -otherwise, lua_tothread returns NULL. - -

lua_topointer converts a value in the stack to a generic -C pointer (void *). -The value may be a userdata, a table, a thread, or a function; -otherwise, lua_topointer returns NULL. -Lua ensures that different objects of the -same type return different pointers. -There is no direct way to convert the pointer back to its original value. -Typically this function is used for debug information. - -

lua_touserdata is explained in 3.8. - -

3.6 - Pushing Values onto the Stack

- -

The API has the following functions to -push C values onto the stack: -

-       void lua_pushboolean       (lua_State *L, int b);
-       void lua_pushnumber        (lua_State *L, lua_Number n);
-       void lua_pushlstring       (lua_State *L, const char *s, size_t len);
-       void lua_pushstring        (lua_State *L, const char *s);
-       void lua_pushnil           (lua_State *L);
-       void lua_pushcfunction     (lua_State *L, lua_CFunction f);
-       void lua_pushlightuserdata (lua_State *L, void *p);
-
- -

- - -These functions receive a C value, -convert it to a corresponding Lua value, -and push the result onto the stack. -In particular, lua_pushlstring and lua_pushstring -make an internal copy of the given string. -lua_pushstring can only be used to push proper C strings -(that is, strings that end with a zero and do not contain embedded zeros); -otherwise, you should use the more general lua_pushlstring, -which accepts an explicit size. - -

You can also push "formatted" strings: -

-       const char *lua_pushfstring  (lua_State *L, const char *fmt, ...);
-       const char *lua_pushvfstring (lua_State *L, const char *fmt, va_list argp);
-
- -These functions push onto the stack a formatted string -and return a pointer to that string. -They are similar to sprintf and vsprintf, -but with some important differences: -
    -
  • You do not have to allocate the 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 be simply -`%%´ (inserts a `%´ in the string), -`%s´ (inserts a zero-terminated string, with no size restrictions), -`%f´ (inserts a lua_Number), -`%d´ (inserts an int), and -`%c´ (inserts an int as a character). -
- -

The function -

-       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 that single string -(that is, the function does nothing); -if n is 0, the result is the empty string. -Concatenation is done following the usual semantics of Lua -(see 2.5.4). - -

3.7 - Controlling Garbage Collection

- -

Lua uses two numbers to control its garbage collection: -the count and the threshold (see 2.9). -The first counts the amount of memory in use by Lua; -when the count reaches the threshold, -Lua runs its garbage collector. -After the collection, the count is updated -and the threshold is set to twice the count value. - -

You can access the current values of these two numbers through the -following functions: -

-       int  lua_getgccount     (lua_State *L);
-       int  lua_getgcthreshold (lua_State *L);
-
- -Both return their respective values in Kbytes. -You can change the threshold value with -
-       void  lua_setgcthreshold (lua_State *L, int newthreshold);
-
- -Again, the newthreshold value is given in Kbytes. -When you call this function, -Lua sets the new threshold and checks it against the byte counter. -If the new threshold is less than the byte counter, -then Lua immediately runs the garbage collector. -In particular -lua_setgcthreshold(L,0) forces a garbage collection. -After the collection, -a new threshold is set according to the previous rule. - -

3.8 - Userdata

- -

Userdata represents C values in Lua. -Lua supports two types of userdata: -full userdata and light userdata. - -

A full userdata represents a block of memory. -It is an object (like a table): -You must create it, it can have its own metatable, -and you can detect when it is being collected. -A full userdata is only equal to itself (under raw equality). - -

A light userdata represents a pointer. -It is a value (like a number): -You do not create it, it has no metatables, -it is not collected (as it was never created). -A light userdata is equal to "any" -light userdata with the same C address. - -

In Lua code, there is no way to test whether a userdata is full or light; -both have type userdata. -In C code, lua_type returns LUA_TUSERDATA for full userdata, -and LUA_TLIGHTUSERDATA for light userdata. - -

You can create a new full userdata with the following function: -

-       void *lua_newuserdata (lua_State *L, size_t size);
-
- -This function allocates a new block of memory with the given size, -pushes on the stack a new userdata with the block address, -and returns this address. - -

To push a light userdata into the stack you use -lua_pushlightuserdata (see 3.6). - -

lua_touserdata (see 3.5) retrieves the value of a userdata. -When applied on a full userdata, it returns the address of its block; -when applied on a light userdata, it returns its pointer; -when applied on a non-userdata value, it returns NULL. - -

When Lua collects a full userdata, -it calls the userdata's gc metamethod, if any, -and then it frees the userdata's corresponding memory. - -

3.9 - Metatables

- -

The following functions allow you to manipulate the metatables -of an object: -

-       int lua_getmetatable (lua_State *L, int index);
-       int lua_setmetatable (lua_State *L, int index);
-
- -lua_getmetatable pushes on the stack the metatable of a given object. -If the index is not valid, -or if the object does not have a metatable, -lua_getmetatable returns 0 and pushes nothing on the stack. - -

lua_setmetatable pops a table from the stack and -sets it as the new metatable for the given object. -lua_setmetatable returns 0 when it cannot -set the metatable of the given object -(that is, when the object is neither a userdata nor a table); -even then it pops the table from the stack. - -

3.10 - Loading Lua Chunks

- -

You can load a Lua chunk with lua_load: -

-       typedef const char * (*lua_Chunkreader)
-                                (lua_State *L, void *data, size_t *size);
-
-       int lua_load (lua_State *L, lua_Chunkreader reader, void *data,
-                                   const char *chunkname);
-
- -The return values of lua_load are: -
    -
  • 0 --- no errors; -
  • LUA_ERRSYNTAX --- -syntax error during pre-compilation. -
  • LUA_ERRMEM --- -memory allocation error. -
-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. - -

lua_load automatically detects whether the chunk is text or binary, -and loads it accordingly (see program luac). - -

lua_load uses a user-supplied reader function to read the chunk. -Everytime 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. -To signal the end of the chunk, the reader returns NULL. -The reader function may return pieces of any size greater than zero. - -

In the current implementation, -the reader function cannot call any Lua function; -to ensure that, it always receives NULL as the Lua state. - -

The chunkname is used for error messages -and debug information (see 4). - -

See the auxiliary library (lauxlib.c) -for examples of how to use lua_load -and for some ready-to-use functions to load chunks -from files and strings. - -

3.11 - Manipulating Tables

- -

Tables are created by calling -the function -

-       void lua_newtable (lua_State *L);
-
- -This function creates a new, empty table and pushes it onto the stack. - -

To read a value from a table that resides somewhere in the stack, -call -

-       void lua_gettable (lua_State *L, int index);
-
- -where index points to the table. -lua_gettable pops a key from the stack -and returns (on the stack) the contents of the table at that key. -The table is left where it was in the stack. -As in Lua, this function may trigger a metamethod -for the "index" event (see 2.8). -To get the real value of any table key, -without invoking any metamethod, -use the raw version: -
-       void lua_rawget (lua_State *L, int index);
-
- - -

To store a value into a table that resides somewhere in the stack, -you push the key and then the value onto the stack, -and call -

-       void lua_settable (lua_State *L, int index);
-
- -where index points to the table. -lua_settable pops from the stack both the key and the value. -The table is left where it was in the stack. -As in Lua, this operation may trigger a metamethod -for the "settable" or "newindex" events. -To set the real value of any table index, -without invoking any metamethod, -use the raw version: -
-       void lua_rawset (lua_State *L, int index);
-
- - -

You can traverse a table with the function -

-       int lua_next (lua_State *L, int index);
-
- -where index points to the table to be traversed. -The function pops a key from the stack, -and pushes a key-value pair from the table -(the "next" pair after the given key). -If there are no more elements, then lua_next returns 0 -(and pushes nothing). -Use a nil key to signal the start of a traversal. - -

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) {
-         /* `key' is 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)));
-         lua_pop(L, 1);  /* removes `value'; keeps `key' for next iteration */
-       }
-
- -

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

3.12 - Manipulating Environments

- -

All global variables are kept in ordinary Lua tables, -called environments. -The initial environment is called the global environment. -This table is always at pseudo-index LUA_GLOBALSINDEX. - -

To access and change the value of global variables, -you can use regular table operations over an environment table. -For instance, to access the value of a global variable, do -

-       lua_pushstring(L, varname);
-       lua_gettable(L, LUA_GLOBALSINDEX);
-
- -

You can change the global environment of a Lua thread using lua_replace. - -

The following functions get and set the environment of Lua functions: -

-       void lua_getfenv (lua_State *L, int index);
-       int  lua_setfenv (lua_State *L, int index);
-
- -lua_getfenv pushes on the stack the environment table of -the function at index index in the stack. -If the function is a C function, -lua_getfenv pushes the global environment. -lua_setfenv pops a table from the stack and sets it as -the new environment for the function at index index in the stack. -If the object at the given index is not a Lua function, -lua_setfenv returns 0. - -

3.13 - Using Tables as Arrays

-The API has functions that help to use Lua tables as arrays, -that is, -tables indexed by numbers only: -
-       void lua_rawgeti (lua_State *L, int index, int n);
-       void lua_rawseti (lua_State *L, int index, int n);
-
- - - -

lua_rawgeti pushes the value of the n-th element of the table -at stack position index. -lua_rawseti sets the value of the n-th element of the table -at stack position index to the value at the top of the stack, -removing this value from the stack. - -

3.14 - Calling Functions

- -

Functions defined in Lua -and C functions registered in Lua -can be called from the host program. -This is done using 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, the function is called using -

-       void lua_call (lua_State *L, int nargs, int nresults);
-
- -nargs is the number of arguments that you pushed onto the stack. -All arguments and the function value are popped from the stack, -and the function results are pushed. -The number of results are adjusted to nresults, -unless nresults is LUA_MULTRET. -In that 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. - -

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

-       a = f("how", t.x, 14)
-
-Here it is in C: -
-    lua_pushstring(L, "t");
-    lua_gettable(L, LUA_GLOBALSINDEX);          /* global `t' (for later use) */
-    lua_pushstring(L, "a");                                       /* var name */
-    lua_pushstring(L, "f");                                  /* function name */
-    lua_gettable(L, LUA_GLOBALSINDEX);               /* function to be called */
-    lua_pushstring(L, "how");                                 /* 1st argument */
-    lua_pushstring(L, "x");                            /* push the string "x" */
-    lua_gettable(L, -5);                      /* push result of t.x (2nd arg) */
-    lua_pushnumber(L, 14);                                    /* 3rd argument */
-    lua_call(L, 3, 1);         /* call function with 3 arguments and 1 result */
-    lua_settable(L, LUA_GLOBALSINDEX);             /* set global variable `a' */
-    lua_pop(L, 1);                               /* remove `t' from the stack */
-
-Note that the code above is "balanced": -at its end, the stack is back to its original configuration. -This is considered good programming practice. - -

(We did this example using only the raw functions provided by Lua's API, -to show all the details. -Usually programmers define and use several macros and auxiliary functions -that provide higher level access to Lua. -See the source code of the standard libraries for examples.) - -

3.15 - Protected Calls

- -

When you call a function with lua_call, -any error inside the called function is propagated upwards -(with a longjmp). -If you need to handle errors, -then you should use lua_pcall: -

-       int lua_pcall (lua_State *L, int nargs, int nresults, int errfunc);
-
-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 at 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 errfunc is 0, -then the error message returned is exactly the original error message. -Otherwise, errfunc gives the stack index for an -error handler function. -(In the current implementation, that index cannot be a pseudo-index.) -In case of runtime errors, -that function will be called with the error message -and its return value will be the message returned by lua_pcall. - -

Typically, the error handler function 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 0 in case of success -or one of the following error codes -(defined in lua.h): -

    -
  • LUA_ERRRUN --- a runtime error. -
  • LUA_ERRMEM --- memory allocation error. -For such errors, Lua does not call the error handler function. -
  • LUA_ERRERR --- -error while running the error handler function. -
- -

3.16 - Defining C Functions

- -

Lua can be extended with functions written in C. -These functions must be of type lua_CFunction, -which is defined as -

-       typedef int (*lua_CFunction) (lua_State *L);
-
- -A C function receives a Lua state and returns an integer, -the number of values it wants to return to Lua. - -

In order to communicate properly with Lua, -a C function must follow 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, -its first argument (if any) is at index 1. -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 -discharged 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 to function `average'");
-             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 */
-       }
-
- -

To register a C function to Lua, -there is the following convenience macro: -

-       #define lua_register(L,n,f) \
-               (lua_pushstring(L, n), \
-                lua_pushcfunction(L, f), \
-                lua_settable(L, LUA_GLOBALSINDEX))
-     /* lua_State *L;    */
-     /* const char *n;   */
-     /* lua_CFunction f; */
-
- -which receives the name the function will have in Lua -and a pointer to the function. -Thus, -the C function foo above may be registered in Lua as -average by calling -
-       lua_register(L, "average", foo);
-
- -

3.17 - Defining C Closures

- -

When a C function is created, -it is possible to associate some values with it, -thus creating a C closure; -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 the function -

-       void lua_pushcclosure (lua_State *L, lua_CFunction fn, int n);
-
- -is used to 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); -in fact, the macro lua_pushcfunction is defined as -lua_pushcclosure with n set to 0. - -

Then, whenever the C function is called, -those values are located at specific pseudo-indices. -Those pseudo-indices are produced by a 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, -produces an acceptable (but invalid) index. - -

For examples of C functions and closures, -see the standard libraries in the official Lua distribution -(src/lib/*.c). - -

3.18 - Registry

- -

Lua provides a registry, -a pre-defined table that can be used by any C code to -store whatever Lua value it needs to store, -specially if the C code needs to keep that Lua value -outside the life span of a C function. -This table is always located at pseudo-index -LUA_REGISTRYINDEX. -Any C library can store data into this table, -as long as it chooses keys different from other libraries. -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. - -

The integer keys in the registry are used by the reference mechanism, -implemented by the auxiliary library, -and therefore should not be used by other purposes. - -

3.19 - Error Handling in C

- -

Internally, Lua uses the C longjmp facility to handle errors. -When Lua faces any error -(such as memory allocation errors, type errors, syntax errors) -it raises an error, that is, it does a long jump. -A protected environment uses setjmp -to set a recover point; -any error jumps to the most recent active recover point. - -

If an error happens outside any protected environment, -Lua calls a panic function -and then calls exit(EXIT_FAILURE). -You can change the panic function with -

-       lua_CFunction lua_atpanic (lua_State *L, lua_CFunction panicf);
-
-Your new panic function may avoid the application exit by -never returning (e.g., by doing a long jump). -Nevertheless, the corresponding Lua state will not be consistent; -the only safe operation with it is to close it. - -

Almost any function in the API may raise an error, -for instance due to a memory allocation error. -The following functions run in protected mode -(that is, they create a protected environment to run), -so they never raise an error: -lua_open, lua_close, lua_load, -and lua_pcall. - -

There is yet another function that runs a given C function in protected mode: -

-       int lua_cpcall (lua_State *L, lua_CFunction func, void *ud);
-
- -lua_cpcall calls func in protected mode. -func starts with only one element in its stack, -a light userdata containing ud. -In case of errors, -lua_cpcall returns the same error codes as lua_pcall -(see 3.15), -plus the error object on the top of the stack; -otherwise, it returns zero, and does not change the stack. -Any value returned by func is discarded. - -

C code can generate a Lua error calling the function -

-       void lua_error (lua_State *L);
-
- -The error message (which actually can be any type of object) -must be on the stack top. -This function does a long jump, -and therefore never returns. - -

3.20 - Threads

- -

Lua offers partial support for multiple threads of execution. -If you have a C library that offers multi-threading, -then Lua can cooperate with it to implement the equivalent facility in Lua. -Also, Lua implements its own coroutine system on top of threads. -The following function creates a new thread in Lua: -

-       lua_State *lua_newthread (lua_State *L);
-
- -This function pushes the thread on the stack and returns a pointer to -a lua_State that represents this new thread. -The new state returned by this function shares with the original state -all global objects (such as tables), -but has an independent run-time stack. - -

Each thread has an independent global environment table. -When you create a thread, this table is the same as that of the given state, -but you can change each one independently. - -

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

To manipulate threads as coroutines, -Lua offers the following functions: -

-       int lua_resume (lua_State *L, int narg);
-       int lua_yield  (lua_State *L, int nresults);
-
- -To start a coroutine, you first create a new thread; -then you push on its stack the body function plus any eventual arguments; -then you call lua_resume, -with narg 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 0 if there are no errors running the coroutine, -or an error code (see 3.15). -In case of errors, -the stack contains only the error message. -To restart a coroutine, you put on its stack only the values to -be passed as results from yield, -and then call lua_resume. - -

The lua_yield function can only be called as the -return expression of a C function, as follows: -

-       return lua_yield (L, nresults);
-
-When a C function calls lua_yield 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. - -

To exchange values between different threads, -you may use lua_xmove: -

-       void lua_xmove (lua_State *from, lua_State *to, int n);
-
-It pops n values from the stack from, -and puhses them into the stack to. - -

-

4 - 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. - -

4.1 - Stack and Function Information

- -

The main function to get information about the interpreter runtime stack is -

-       int lua_getstack (lua_State *L, int level, lua_Debug *ar);
-
- -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. -When there are no errors, lua_getstack returns 1; -when called with a level greater than the stack depth, -it returns 0. - -

The structure lua_Debug is used to carry different pieces of -information about an active function: -

-      typedef struct lua_Debug {
-        int event;
-        const char *name;      /* (n) */
-        const char *namewhat;  /* (n) `global', `local', `field', `method' */
-        const char *what;      /* (S) `Lua' function, `C' function, Lua `main' */
-        const char *source;    /* (S) */
-        int currentline;       /* (l) */
-        int nups;              /* (u) number of upvalues */
-        int linedefined;       /* (S) */
-        char short_src[LUA_IDSIZE]; /* (S) */
-
-        /* private part */
-        ...
-      } lua_Debug;
-
- -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 -
-       int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar);
-
- -This function returns 0 on error -(for instance, an invalid option in what). -Each character in the string what -selects some fields of the structure ar to be filled, -as indicated by the letter in parentheses in the definition of lua_Debug -above: -`S´ fills in the fields source, linedefined, -and what; -`l´ fills in the field currentline, etc. -Moreover, `f´ pushes onto the stack the function that is -running at the given level. - -

To get information about a function that is not active -(that is, not in the stack), -you push it onto the stack -and start the what string with the character `>´. -For instance, to know in which line a function f was defined, -you can write -

-       lua_Debug ar;
-       lua_pushstring(L, "f");
-       lua_gettable(L, LUA_GLOBALSINDEX);  /* get global `f' */
-       lua_getinfo(L, ">S", &ar);
-       printf("%d\n", ar.linedefined);
-
-The fields of lua_Debug have the following meaning: -
    - -

  • source -If the function was defined in a string, -then source is that string. -If the function was defined in a file, -then source starts with a `@´ followed by the file name. - -

  • short_src -A "printable" version of source, to be used in error messages. - -

  • linedefined -the line number where the definition of the function starts. - -

  • what the string "Lua" if this is a Lua function, -"C" if this is a C function, -"main" if this is the main part of a chunk, -and "tail" if this was a function that did a tail call. -In the latter case, -Lua has no other information about this function. - -

  • 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 may be the value of multiple global variables, -while others may be stored only in a table field. -The lua_getinfo function checks how the function was -called or whether it is the value of a global variable 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", or "" (the empty string), -according to how the function was called. -(Lua uses the empty string when no other option seems to apply.) - -

  • nups -The number of upvalues of the function. - -

- -

4.2 - Manipulating Local Variables and Upvalues

- -

For the manipulation of local variables and upvalues, -the debug interface uses indices: -The first parameter or local variable has index 1, and so on, -until the last active local variable. -Upvalues have no particular order, -as they are active through the whole function. - -

The following functions allow the manipulation of the -local variables of a given activation record: -

-       const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n);
-       const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n);
-
- -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 4.3). -lua_getlocal gets the index n of a local variable, -pushes the variable's value onto the stack, -and returns its name. -lua_setlocal assigns the value at the top of the stack -to the variable and returns its name. -Both functions return NULL -when the index is greater than -the number of active local variables. - -

The following functions allow the manipulation of the -upvalues of a given function -(unlike local variables, -the upvalues of a function are accessible even when the -function is not active): -

-       const char *lua_getupvalue (lua_State *L, int funcindex, int n);
-       const char *lua_setupvalue (lua_State *L, int funcindex, int n);
-
- -These functions operate both on Lua functions and on C functions. -(For Lua functions, -upvalues are the external local variables that the function uses, -and that consequently are included in its closure.) -funcindex points to a function in the stack. -lua_getpuvalue gets the index n of an upvalue, -pushes the upvalue's value onto the stack, -and returns its name. -lua_setupvalue assigns the value at the top of the stack -to the upvalue and returns its name. -Both functions return NULL -when the index is greater than the number of upvalues. -For C functions, these functions use the empty string "" -as a name for all upvalues. - -

As an example, the following function lists the names of all -local variables and upvalues for a function at a given level of the stack: -

-       int listvars (lua_State *L, int level) {
-         lua_Debug ar;
-         int i;
-         const char *name;
-         if (lua_getstack(L, level, &ar) == 0)
-           return 0;  /* failure: no such level in the stack */
-         i = 1;
-         while ((name = lua_getlocal(L, &ar, i++)) != NULL) {
-           printf("local %d %s\n", i-1, name);
-           lua_pop(L, 1);  /* remove variable value */
-         }
-         lua_getinfo(L, "f", &ar);  /* retrieves function */
-         i = 1;
-         while ((name = lua_getpuvalue(L, -1, i++)) != NULL) {
-           printf("upvalue %d %s\n", i-1, name);
-           lua_pop(L, 1);  /* remove upvalue value */
-         }
-         return 1;
-       }
-
- -

4.3 - Hooks

- -

Lua offers a mechanism of hooks, which are -user-defined C functions that are called during the program execution. -A hook may be called in four different events: -a call event, when Lua calls a function; -a return event, when Lua returns from a function; -a line event, when Lua starts executing a new line of code; -and a count event, which happens every "count" instructions. -Lua identifies these events with the following constants: -LUA_HOOKCALL, -LUA_HOOKRET (or LUA_HOOKTAILRET, see below), -LUA_HOOKLINE, -and LUA_HOOKCOUNT. - -

A hook has type lua_Hook, defined as follows: -

-       typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
-
- -You can set the hook with the following function: -
-       int lua_sethook (lua_State *L, lua_Hook func, int mask, int count);
-
- -func is the hook. -mask specifies on which events the hook will be called: -It is formed by a disjunction 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. -
  • The return hook is called when the interpreter returns from a function. -The hook is called just before Lua leaves 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. - -

You can get the current hook, the current mask, -and the current count with the next functions: -

-       lua_Hook lua_gethook      (lua_State *L);
-       int      lua_gethookmask  (lua_State *L);
-       int      lua_gethookcount (lua_State *L);
-
- - -

Whenever a hook is called, its ar argument has its field -event set to the specific event that triggered the hook. -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 return events, event may be LUA_HOOKRET, -the normal value, or LUA_HOOKTAILRET. -In the latter case, Lua is simulating a return from -a function that did a tail call; -in this case, it is useless to call lua_getinfo. - -

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, -that execution occurs without any calls to hooks. - -

-

5 - Standard Libraries

- -

The standard 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 to -deserve an implementation in C (e.g., 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; -
  • string manipulation; -
  • table manipulation; -
  • mathematical functions (sin, log, etc.); -
  • input and output; -
  • operating system facilities; -
  • debug facilities. -
-Except for the basic library, -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 must first call the functions -luaopen_base (for the basic library), -luaopen_string (for the string library), -luaopen_table (for the table library), -luaopen_math (for the mathematical library), -luaopen_io (for the I/O and the Operating System libraries), -and luaopen_debug (for the debug library). -These functions are declared in lualib.h. - - - - - - - -

5.1 - Basic Functions

- -

The basic library provides some core functions to Lua. -If you do not include this library in your application, -you should check carefully whether you need to provide some alternative -implementation for some of its facilities. - -

assert (v [, message])

-Issues an error when -the value of its argument v is nil or false; -otherwise, returns this value. -message is an error message; -when absent, it defaults to "assertion failed!" - -

collectgarbage ([limit])

- -

Sets the garbage-collection threshold to the given limit -(in Kbytes) and checks it against the byte counter. -If the new threshold is smaller than the byte counter, -then Lua immediately runs the garbage collector (see 2.9). -If limit is absent, it defaults to zero -(thus forcing a garbage-collection cycle). - -

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 any value returned by the chunk. -In case of errors, dofile propagates the error -to its caller (that is, it 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. - -

The level argument specifies where the error -message points the error. -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. - -

_G

-A global variable (not a function) that -holds the global environment (that is, _G._G = _G). -Lua itself does not use this variable; -changing its value does not affect any environment. -(Use setfenv to change environments.) - -

getfenv (f)

-Returns the current environment in use by the function. -f can be a Lua function or a number, -which specifies the function at that stack level: -Level 1 is the function calling getfenv. -If the given function is not a Lua function, -or if f is 0, -getfenv returns the global environment. -The default for f is 1. - -

If the environment has a "__fenv" field, -returns the associated value, instead of the environment. - -

getmetatable (object)

- - -

If the 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. - -

gcinfo ()

- -

Returns two results: -the number of Kbytes of dynamic memory that Lua is using -and the current garbage collector threshold (also in Kbytes). - -

ipairs (t)

- -

Returns an iterator function, the table t, and 0, -so that the construction -

-       for i,v in ipairs(t) do ... end
-
-will iterate over the pairs (1,t[1]), (2,t[2]), ..., -up to the first integer key with a nil value in the table. - -

loadfile (filename)

- -

Loads a file as a Lua chunk (without running it). -If there are no errors, -returns the compiled chunk as a function; -otherwise, returns nil plus the error message. -The environment of the returned function is the global environment. - -

loadlib (libname, funcname)

- -

Links the program with the dynamic C library libname. -Inside this library, looks for a function funcname -and returns this function as a C function. - -

libname must be the complete file name of the C library, -including any eventual path and extension. - -

This function is not supported by ANSI C. -As such, it is only available on some platforms -(Windows, Linux, Solaris, BSD, plus other Unix systems that -support the dlfcn standard). - -

loadstring (string [, chunkname])

-Loads a string as a Lua chunk (without running it). -If there are no errors, -returns the compiled chunk as a function; -otherwise, returns nil plus the error message. -The environment of the returned function is the global environment. - -

The optional parameter chunkname -is the name to be used in error messages and debug information. - -

To load and run a given string, use the idiom -

-      assert(loadstring(s))()
-
- -

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 the -value associated with the index. -When called with nil as its second argument, -next returns the first index -of the table 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. - -

Lua has no declaration of fields; -There is no difference between a -field not present in a table or a field with value nil. -Therefore, next only considers fields with non-nil values. -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 or the ipairs function.) - -

The behavior of next is undefined if, -during the traversal, -you assign any value to a non-existent field in the table. - -

pairs (t)

- -

Returns the next function and the table t (plus a nil), -so that the construction -

-       for k,v in pairs(t) do ... end
-
-will iterate over all key-value pairs of table t. - -

pcall (f, arg1, arg2, ...)

- -

Calls function f with -the given arguments in protected mode. -That 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 (e1, e2, ...)

-Receives any number of arguments, -and prints their values in stdout, -using the tostring function to convert them to strings. -This function is not intended for formatted output, -but only as a quick way to show a value, -typically for debugging. -For formatted output, use format (see 5.3). - -

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 is any value different from nil. - -

rawset (table, index, value)

-Sets the real value of table[index] to value, -without invoking any metamethod. -table must be a table, -index is any value different from nil, -and value is any Lua value. - -

require (packagename)

- -

Loads the given package. -The function starts by looking into the table _LOADED -to determine whether packagename is already loaded. -If it is, then require returns the value that the package -returned when it was first loaded. -Otherwise, it searches a path looking for a file to load. - -

If the global variable LUA_PATH is a string, -this string is the path. -Otherwise, require tries the environment variable LUA_PATH. -As a last resort, it uses the predefined path "?;?.lua". - -

The path is a sequence of templates separated by semicolons. -For each template, require will change each interrogation -mark in the template to packagename, -and then will try to load the resulting file name. -So, for instance, if the path is -

-  "./?.lua;./?.lc;/usr/local/?/?.lua;/lasttry"
-
-a require "mod" will try to load the files -./mod.lua, -./mod.lc, -/usr/local/mod/mod.lua, -and /lasttry, in that order. - -

The function stops the search as soon as it can load a file, -and then it runs the file. -After that, it associates, in table _LOADED, -the package name with the value that the package returned, -and returns that value. -If the package returns nil (or no value), -require converts this value to true. -If the package returns false, -require also returns false. -However, as the mark in table _LOADED is false, -any new attempt to reload the file -will happen as if the package was not loaded -(that is, the package will be loaded again). - -

If there is any error loading or running the file, -or if it cannot find any file in the path, -then require signals an error. - -

While running a file, -require defines the global variable _REQUIREDNAME -with the package name. -The package being loaded always runs within the global environment. - -

setfenv (f, table)

- -

Sets the current environment to be used by the given function. -f can be a Lua function or a number, -which specifies the function at that stack level: -Level 1 is the function calling setfenv. - -

As a special case, when f is 0 setfenv changes -the global environment of the running thread. - -

If the original environment has a "__fenv" field, -setfenv raises an error. - -

setmetatable (table, metatable)

- -

Sets the metatable for the given table. -(You cannot change the metatable of a userdata from Lua.) -If metatable is nil, removes the metatable of the given table. -If the original metatable has a "__metatable" field, -raises an error. - -

tonumber (e [, base])

-Tries to convert its argument to a number. -If the argument is already a number or a string convertible -to a number, then tonumber returns that number; -otherwise, it returns nil. - -

An optional argument specifies the base to interpret the numeral. -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. -In base 10 (the default), the number may have a decimal part, -as well as an optional exponent part (see 2.2.1). -In other bases, only unsigned integers are accepted. - -

tostring (e)

-Receives an argument of any type and -converts it to a string in a reasonable format. -For complete control of how numbers are converted, -use format (see 5.3). - -

If the metatable of e has a "__tostring" field, -tostring calls the corresponding value -with e 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". - -

unpack (list)

-Returns all elements from the given list. -This function is equivalent to -
-  return list[1], list[2], ..., list[n]
-
-except that the above code can be written only for a fixed n. -The number n is the size of the list, -as defined for the table.getn function. - -

_VERSION

-A global variable (not a function) that -holds a string containing the current interpreter version. -The current content of this string is "Lua 5.0". - -

xpcall (f, err)

- -

This function is similar to pcall, -except that you can set a new error handler. - -

xpcall calls function f in protected mode, -using err as the error handler. -Any error inside f is not propagated; -instead, xpcall catches the error, -calls the err function with the original error object, -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, xpcall also returns all results from the call, -after this first result. -In case of any error, -xpcall returns false plus the result from err. - -

5.2 - Coroutine Manipulation

- -

The operations related to coroutines comprise a sub-library of -the basic library and come inside the table coroutine. -See 2.10 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 arguments val1, ... go as the arguments to the body function. -If the coroutine has yielded, -resume restarts it; -the arguments val1, ... go 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.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; -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 (val1, ...)

- -

Suspends the execution of the calling coroutine. -The coroutine cannot be running neither a C function, -nor a metamethod, nor an iterator. -Any arguments to yield go as extra results to resume. - -

5.3 - 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. - -

string.byte (s [, i])

-Returns the internal numerical code of the i-th character of s, -or nil if the index is out of range. -If i is absent, then it is assumed to be 1. -i may be negative. - -

Note that numerical codes are not necessarily portable across platforms. - -

string.char (i1, i2, ...)

-Receives 0 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 correspondent argument. - -

Note that numerical codes are not necessarily portable across platforms. - -

string.dump (function)

- -

Returns a binary representation of the given function, -so that a later loadstring on that string returns -a copy of the function. -function must be a Lua function without upvalues. - -

string.find (s, pattern [, init [, plain]])

-Looks for the first match of -pattern in the string s. -If it finds one, then find returns the indices of s -where this occurrence starts and ends; -otherwise, it returns nil. -If the pattern specifies captures (see string.gsub below), -the captured strings are returned as extra results. -A third, optional numerical argument init specifies -where to start the search; -its default value is 1 and may 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 too. - -

string.len (s)

-Receives a string and returns its length. -The empty string "" has length 0. -Embedded zeros are counted, -so "a\000b\000c" has length 5. - -

string.lower (s)

-Receives a string and returns a copy of that string with all -uppercase letters changed to lowercase. -All other characters are left unchanged. -The definition of what is an uppercase letter depends on the current locale. - -

string.rep (s, n)

-Returns a string that is the concatenation of n copies of -the string s. - -

string.sub (s, i [, j])

-Returns the substring of s that -starts at i and continues until j; -i and j may 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. - -

string.upper (s)

-Receives a string and returns a copy of that string with all -lowercase letters changed to uppercase. -All other characters are left unchanged. -The definition of what is a lowercase letter depends on the current locale. - -

string.format (formatstring, e1, e2, ...)

- -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 printf family of -standard C functions. -The only differences are that the options/modifiers -*, l, L, n, p, -and h are not supported, -and there is an extra option, q. -The q option formats a string in a form suitable to be safely read -back by the Lua interpreter: -The string is written between double quotes, -and all double quotes, newlines, and backslashes in the string -are correctly escaped when written. -For instance, the call -
-       string.format('%q', 'a string with "quotes" and \n new line')
-
-will produce the string: -
-"a string with \"quotes\" and \
- new line"
-
- -

The options c, d, E, e, f, -g, G, i, o, u, X, and x all -expect a number as argument, -whereas q and s expect a string. -The * modifier can be simulated by building -the appropriate format string. -For example, "%*g" can be simulated with -"%"..width.."g". - -

String values to be formatted with -%s cannot contain embedded zeros. - -

string.gfind (s, pat)

- -

Returns an iterator function that, -each time it is called, -returns the next captures from pattern pat over string s. - -

If pat specifies no captures, -then the whole match is produced in each call. - -

As an example, the following loop -

-  s = "hello world from Lua"
-  for w in string.gfind(s, "%a+") do
-    print(w)
-  end
-
-will iterate over all the words from string s, -printing one per line. -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.gfind(s, "(%w+)=(%w+)") do
-    t[k] = v
-  end
-
- -

string.gsub (s, pat, repl [, n])

- -Returns a copy of s -in which all occurrences of the pattern pat have been -replaced by a replacement string specified by repl. -gsub also returns, as a second value, -the total number of substitutions made. - -

If repl is a string, then its value is used for replacement. -Any sequence in repl of the form %n, -with n between 1 and 9, -stands for the value of the n-th captured substring (see below). - -

If repl is a function, then this function is called every time a -match occurs, with all captured substrings passed as arguments, -in order; -if the pattern specifies no captures, -then the whole match is passed as a sole argument. -If the value returned by this function is a string, -then it is used as the replacement string; -otherwise, the replacement string is the empty string. - -

The optional last parameter n limits -the maximum number of substitutions to occur. -For instance, when n is 1 only the first occurrence of -pat is replaced. - -

Here are some examples: -

-   x = string.gsub("hello world", "(%w+)", "%1 %1")
-   --> x="hello hello world world"
-
-   x = string.gsub("hello world", "(%w+)", "%1 %1", 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 loadstring(s)()
-       end)
-   --> x="4+5 = 9"
-
-   local t = {name="lua", version="5.0"}
-   x = string.gsub("$name_$version.tar.gz", "%$(%w+)", function (v)
-         return t[v]
-       end)
-   --> x="lua_5.0.tar.gz"
-
- -

Patterns

- -

-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. -
  • %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. -
  • %z --- represents the character with representation 0. -
  • %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 may be specified by -separating the end characters of the range with a `-´. -All classes %x described above may 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. -The second form should be preferred for portability. - -

-A pattern item may 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. -
- -

-A pattern is a sequence of pattern items. -A `^´ 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. - -

-A pattern may 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. - -

A pattern cannot contain embedded zeros. Use %z instead. - -

5.4 - Table Manipulation

-This library provides generic functions for table manipulation. -It provides all its functions inside the table table. - -

Most functions in the table library assume that the table -represents an array or a list. -For those functions, an important concept is the size of the array. -There are three ways to specify that size: -

    -
  • the field "n" --- -When the table has a field "n" with a numerical value, -that value is assumed as its size. -
  • setn --- -You can call the table.setn function to explicitly set -the size of a table. -
  • implicit size --- -Otherwise, the size of the object is one less the first integer index -with a nil value. -
-For more details, see the descriptions of the table.getn and -table.setn functions. - -

table.concat (table [, sep [, i [, j]]])

- -Returns table[i]..sep..table[i+1] ... sep..table[j]. -The default value for sep is the empty string, -the default for i is 1, -and the default for j is the size of the table. -If i is greater than j, returns the empty string. - -

table.foreach (table, f)

-Executes the given f over all elements of table. -For each element, f is called with the index and -respective value as arguments. -If f returns a non-nil value, -then the loop is broken, and this value is returned -as the final value of foreach. - -

See the next function for extra information about table traversals. - -

table.foreachi (table, f)

-Executes the given f over the -numerical indices of table. -For each index, f is called with the index and -respective value as arguments. -Indices are visited in sequential order, -from 1 to n, -where n is the size of the table (see 5.4). -If f returns a non-nil value, -then the loop is broken and this value is returned -as the result of foreachi. - -

table.getn (table)

-Returns the size of a table, when seen as a list. -If the table has an n field with a numeric value, -this value is the size of the table. -Otherwise, if there was a previous call -to table.setn over this table, -the respective value is returned. -Otherwise, the size is one less the first integer index with -a nil value. - -

table.sort (table [, comp])

-Sorts table elements in a given order, in-place, -from table[1] to table[n], -where n is the size of the table (see 5.4). -If comp is given, -then it must be a function that receives two table elements, -and returns true -when the first is less than the second -(so that not comp(a[i+1],a[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.insert (table, [pos,] value)

- -

Inserts element value at position pos in table, -shifting up other elements to open space, if necessary. -The default value for pos is n+1, -where n is the size of the table (see 5.4), -so that a call table.insert(t,x) inserts x at the end -of table t. -This function also updates the size of the table by -calling table.setn(table, n+1). - -

table.remove (table [, pos])

- -

Removes from table the element at position pos, -shifting down other elements to close the space, if necessary. -Returns the value of the removed element. -The default value for pos is n, -where n is the size of the table (see 5.4), -so that a call table.remove(t) removes the last element -of table t. -This function also updates the size of the table by -calling table.setn(table, n-1). - -

table.setn (table, n)

- -

Updates the size of a table. -If the table has a field "n" with a numerical value, -that value is changed to the given n. -Otherwise, it updates an internal state -so that subsequent calls to table.getn(table) return n. - -

5.5 - Mathematical Functions

- -

This library is an interface to most of the functions of the -standard C math library. -(Some have slightly different names.) -It provides all its functions inside the table math. -In addition, -it registers the global __pow -for the binary exponentiation operator ^, -so that x^y returns xy. -The library provides the following functions: - - - - - - - - - -

-       math.abs     math.acos    math.asin    math.atan    math.atan2
-       math.ceil    math.cos     math.deg     math.exp     math.floor
-       math.log     math.log10   math.max     math.min     math.mod
-       math.pow     math.rad     math.sin     math.sqrt    math.tan
-       math.frexp   math.ldexp   math.random  math.randomseed
-
-plus a variable math.pi. -Most of them -are only interfaces to the corresponding functions in the C library. -All trigonometric functions work in radians -(previous versions of Lua used degrees). -The functions math.deg and math.rad convert -between radians and degrees. - -

The function math.max returns the maximum -value of its numeric arguments. -Similarly, math.min computes the minimum. -Both can be used with 1, 2, or more arguments. - -

The functions math.random and math.randomseed -are interfaces to the simple random generator functions -rand and srand that are provided by ANSI C. -(No guarantees can be given for their statistical properties.) -When called without arguments, -math.random returns a pseudo-random real number -in the range [0,1). -When called with a number n, -math.random returns a pseudo-random integer in the range [1,n]. -When called with two arguments, l and u, -math.random returns a pseudo-random integer in the range [l,u]. -The math.randomseed function sets a "seed" -for the pseudo-random generator: -Equal seeds produce equal sequences of numbers. - -

5.6 - 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 those 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 by 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. - -

A file handle is a userdata containing the file stream (FILE*), -with a distinctive metatable created by the I/O library. - -

Unless otherwise stated, -all I/O functions return nil on failure -(plus an error message as a second result) -and some value different from nil on success. - -

io.close ([file])

- -

Equivalent to file:close(). -Without a file, closes the default output file. - -

io.flush ()

- -

Equivalent to file:flush over the default output file. - -

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 that 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, -each time it is called, -returns a new line from the file. -Therefore, the construction -

-       for line in io.lines(filename) do ... end
-
-will iterate over all lines of the 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() (without a file name) is equivalent -to io.input():lines(), that is, it iterates over the -lines of the default input file. - -

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 may also have a b at the end, -which is needed in some systems to open the file in binary mode. -This string is exactly what is used in the standard C function fopen. - -

io.output ([file])

- -

Similar to io.input, but operates over the default output file. - -

io.read (format1, ...)

- -

Equivalent to io.input():read. - -

io.tmpfile ()

- -

Returns a handle for a temporary file. -This file is open 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, -and nil if obj is not a file handle. - -

io.write (value1, ...)

- -

Equivalent to io.output():write. - -

file:close ()

- -

Closes file. - -

file:flush ()

- -

Saves any written data to file. - -

file:lines ()

- -

Returns an iterator function that, -each time it is called, -returns a new line from the file. -Therefore, the construction -

-       for line in file:lines() do ... end
-
-will iterate over all lines of the file. -(Unlike io.lines, this function does not close the file -when the loop ends.) - -

file:read (format1, ...)

- -

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 entire 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. -
  • number reads a string with up to that number of characters, -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, function seek returns the final file position, -measured in bytes from the beginning of the file. -If this function 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:write (value1, ...)

- -

Writes the value of each of its arguments to -the filehandle file. -The arguments must be strings or numbers. -To write other values, -use tostring or string.format before write. - -

5.7 - Operating System Facilities

- -

This library is implemented through table os. - -

os.clock ()

- -

Returns an approximation of the amount of CPU time -used by the program, in seconds. - -

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 that optional character, -if format is *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). - -

If format is not *t, -then date returns the date as a string, -formatted according with the same rules as the 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")). - -

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 C function system. -It passes command to be executed by an operating system shell. -It returns a status code, which is system-dependent. - -

os.exit ([code])

- -

Calls the C function exit, -with an optional code, -to terminate the host program. -The default value for code is the success code. - -

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 with the given name. -If this function fails, it returns nil, -plus a string describing the error. - -

os.rename (oldname, newname)

- -

Renames file named oldname to newname. -If this function fails, it returns nil, -plus a string describing the error. - -

os.setlocale (locale [, category])

- -

Sets the current locale of the program. -locale is a 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. - -

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, min, sec, and isdst -(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 -date and 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 removed when no longer needed. - -

This function is equivalent to the tmpnam C function, -and many people (and even some compilers!) advise against its use, -because between the time you call this function -and the time you open the file, -it is possible for another process -to create a file with the same name. - -

5.8 - The Reflexive Debug Interface

- -

The debug library provides -the functionality of the debug interface to Lua programs. -You should exert care when using this library. -The functions provided here should be used exclusively for debugging -and similar tasks, such as profiling. -Please resist the temptation to use them as a -usual programming tool: -They can be very slow. -Moreover, setlocal and getlocal -violate the privacy of local variables -and therefore can compromise some otherwise secure code. - -

All functions in this library are provided -inside a debug table. - -

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 -with any function, so they have no direct access to local variables. - -

debug.gethook ()

- -

Returns the current hook settings, 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 (function [, what])

- -

This function returns a table with information about a function. -You can give the function directly, -or you can give a number as the value of function, -which means the function running at level function of the call stack: -Level 0 is the current function (getinfo itself); -level 1 is the function that called getinfo; -and so on. -If function is a number larger than the number of active functions, -then getinfo returns nil. - -

The returned table contains 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. -If present, -the option `f´ -adds a field named func with the function itself. - -

For instance, the expression debug.getinfo(1,"n").name returns -the name of the current function, if a reasonable name can be found, -and debug.getinfo(print) returns a table with all available information -about the print function. - -

debug.getlocal (level, local)

- -

This function returns the name and the value of the local variable -with index local of the function at level level of the stack. -(The first parameter or local variable has index 1, and so on, -until the last active local variable.) -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 debug.getinfo to check whether the level is valid.) - -

debug.getupvalue (func, up)

- -

This function returns the name and the value of the upvalue -with index up of the function func. -The function returns nil if there is no upvalue with the given index. - -

debug.setlocal (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.) - -

debug.setupvalue (func, up, value)

- -

This function assigns the value value to the upvalue -with index up of the function func. -The function returns nil if there is no upvalue -with the given index. - -

debug.sethook (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, -the debug.sethook function turns off the hook. - -

When the hook is called, its first parameter is always a string -describing the event that triggered its call: -"call", "return" (or "tail return"), -"line", and "count". -Moreover, for line events, -it also gets as its second parameter the new line number. -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), -unless the event is "tail return". -In this case, Lua is only simulating the return, -and a call to getinfo will return invalid data. - -

debug.traceback ([message])

- -

Returns a string with a traceback of the call stack. -An optional message string is appended -at the beginning of the traceback. -This function is typically used with xpcall to produce -better error messages. - -

-

6 - Lua Stand-alone

- -

Although Lua has been designed as an extension language, -to be embedded in a host C program, -it is also frequently used as a stand-alone language. -An interpreter for Lua as a stand-alone language, -called simply lua, -is provided with the standard distribution. -The stand-alone interpreter includes -all standard libraries plus the reflexive debug interface. -Its usage is: -

-      lua [options] [script [args]]
-
-The options are: -
    -
  • - executes stdin as a file; -
  • -e stat executes string stat; -
  • -l file "requires" file; -
  • -i enters interactive mode after running script; -
  • -v prints version information; -
  • -- stop handling options. -
-After handling its options, lua runs the given script, -passing to it the given args. -When called without arguments, -lua behaves as lua -v -i when stdin is a terminal, -and as lua - otherwise. - -

Before running any argument, -the interpreter checks for an environment variable LUA_INIT. -If its format is @filename, -then lua executes the file. -Otherwise, lua executes the string itself. - -

All options are handled in order, except -i. -For instance, an invocation like -

-       $ lua -e'a=1' -e 'print(a)' script.lua
-
-will first set a to 1, then print a, -and finally run the file script.lua. -(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 in index 0, -the first argument after the script name goes to index 1, -and so on. -The field n gets the number of arguments after the script name. -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.lua b.lua t1 t2
-
-the interpreter first runs the file a.lua, -then creates a table -
-       arg = { [-2] = "lua", [-1] = "-la.lua", [0] = "b.lua",
-               [1] = "t1", [2] = "t2"; n = 2 }
-
-and finally runs the file b.lua. - -

In interactive mode, -if you write an incomplete statement, -the interpreter waits for its completion. - -

If the global variable _PROMPT is defined as a string, -then its value is used as the prompt. -Therefore, the prompt can be changed directly on the command line: -

-       $ lua -e"_PROMPT='myprompt> '" -i
-
-(the outer pair of quotes is for the shell, -the inner is for Lua), -or in any Lua programs by assigning to _PROMPT. -Note the use of -i to enter interactive mode; otherwise, -the program would end just after the assignment to _PROMPT. - -

In Unix systems, 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.) - -

-

Acknowledgments

- -

The Lua team is grateful to Tecgraf for its continued support to Lua. -We thank everyone at Tecgraf, -specially the head of the group, Marcelo Gattass. -At the risk of omitting several names, -we also thank the following individuals for supporting, -contributing to, and spreading the word about Lua: -Alan Watson. -André Clinio, -André Costa, -Antonio Scuri, -Asko Kauppi, -Bret Mogilefsky, -Cameron Laird, -Carlos Cassino, -Carlos Henrique Levy, -Claudio Terra, -David Jeske, -Ed Ferguson, -Edgar Toernig, -Erik Hougaard, -Jim Mathies, -John Belmonte, -John Passaniti, -John Roll, -Jon Erickson, -Jon Kleiser, -Mark Ian Barlow, -Nick Trout, -Noemi Rodriguez, -Norman Ramsey, -Philippe Lhoste, -Renata Ratton, -Renato Borges, -Renato Cerqueira, -Reuben Thomas, -Stephan Herrmann, -Steve Dekorte, -Thatcher Ulrich, -Tomás Gorham, -Vincent Penquerc'h. -Thank you! - -

- -

Incompatibilities with Previous Versions

- - -

Lua 5.0 is a major release. -There are several incompatibilities with its previous version, Lua 4.0. - -

Incompatibilities with version 4.0

- -

Changes in the Language

-
    - -

  • -The whole tag-method scheme was replaced by metatables. - -

  • -Function calls written between parentheses result in exactly one value. - -

  • -A function call as the last expression in a list constructor -(like {a,b,f()}) has all its return values inserted in the list. - -

  • -The precedence of or is smaller than the precedence of and. - -

  • -in, false, and true are reserved words. - -

  • -The old construction for k,v in t, where t is a table, -is deprecated (although it is still supported). -Use for k,v in pairs(t) instead. - -

  • -When a literal string of the form [[...]] starts with a newline, -this newline is ignored. - -

    - -

  • Upvalues in the form %var are obsolete; -use external local variables instead. - -

- -

Changes in the Libraries

-
    - -

  • -Most library functions now are defined inside tables. -There is a compatibility script (compat.lua) that -redefine most of them as global names. - -

  • -In the math library, angles are expressed in radians. -With the compatibility script (compat.lua), -functions still work in degrees. - -

  • -The call function is deprecated. -Use f(unpack(tab)) instead of call(f, tab) -for unprotected calls, -or the new pcall function for protected calls. - -

  • -dofile do not handle errors, but simply propagates them. - -

  • -dostring is deprecated. Use loadstring instead. - -

  • -The read option *w is obsolete. - -

  • -The format option %n$ is obsolete. - -

- -

Changes in the API

-
    - -

  • -lua_open does not have a stack size as its argument -(stacks are dynamic). - -

  • -lua_pushuserdata is deprecated. -Use lua_newuserdata or lua_pushlightuserdata instead. - -

- -

- -

The Complete Syntax of Lua

- - -

- -

-
-
	chunk ::= {stat [`;´]}
-
-
	block ::= chunk
-
-
	stat ::=  varlist1 `=´ explist1 | functioncall | do block end | while exp do block end | repeat block until exp | if exp then block {elseif exp then block} [else block] end | return [explist1] | break | for Name `=´ exp `,´ exp [`,´ exp] do block end | for Name {`,´ Name} in explist1 do block end | function funcname funcbody | local function Name funcbody | local namelist [init] 
-
-
	funcname ::= Name {`.´ Name} [`:´ Name]
-
-
	varlist1 ::= var {`,´ var}
-
-
	var ::=  Name | prefixexp `[´ exp `]´ | prefixexp `.´ Name 
-
-
	namelist ::= Name {`,´ Name}
-
-
	init ::= `=´ explist1
-
-
	explist1 ::= {exp `,´} exp
-
-
	exp ::=  nil | false | true | Number | Literal | function | prefixexp | tableconstructor | exp binop exp | unop exp 
-
-
	prefixexp ::= var | functioncall | `(´ exp `)´
-
-
	functioncall ::=  prefixexp args | prefixexp `:´ Name args 
-
-
	args ::=  `(´ [explist1] `)´ | tableconstructor | Literal 
-
-
	function ::= function funcbody
-
-
	funcbody ::= `(´ [parlist1] `)´ block end
-
-
	parlist1 ::=  Name {`,´ Name} [`,´ `...´] | `...´ 
-
-
	tableconstructor ::= `{´ [fieldlist] `}´
-	fieldlist ::= field {fieldsep field} [fieldsep]
-	field ::= `[´ exp `]´ `=´ exp | name `=´ exp | exp
-	fieldsep ::= `,´ | `;´
-
-
	binop ::= `+´ | `-´ | `*´ | `/´ | `^´ | `..´ | `<´ | `<=´ | `>´ | `>=´ | `==´ | `~=´ | and | or
-
-
	unop ::= `-´ | not
-
-
- -

- -

- -

- -Last update: -Tue Nov 25 16:08:37 BRST 2003 - - - - diff --git a/contrib/lua50/doc/readme.html b/contrib/lua50/doc/readme.html deleted file mode 100644 index baa7cc8a0..000000000 --- a/contrib/lua50/doc/readme.html +++ /dev/null @@ -1,35 +0,0 @@ - - -Lua documentation - - - - -
-

-Lua -Documentation -

- - - -
- -Last update: -Thu Mar 11 23:08:56 BRT 2004 - - - - diff --git a/contrib/lua50/include/lauxlib.h b/contrib/lua50/include/lauxlib.h deleted file mode 100644 index 450e16c72..000000000 --- a/contrib/lua50/include/lauxlib.h +++ /dev/null @@ -1,145 +0,0 @@ -/* -** $Id: lauxlib.h,v 1.60 2003/04/03 13:35:34 roberto Exp $ -** Auxiliary functions for building Lua libraries -** See Copyright Notice in lua.h -*/ - - -#ifndef lauxlib_h -#define lauxlib_h - - -#include -#include - -#include "lua.h" - - -#ifndef LUALIB_API -#define LUALIB_API LUA_API -#endif - - - -typedef struct luaL_reg { - const char *name; - lua_CFunction func; -} luaL_reg; - - -LUALIB_API void luaL_openlib (lua_State *L, const char *libname, - const luaL_reg *l, int nup); -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 int luaL_typerror (lua_State *L, int narg, const char *tname); -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 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_getmetatable (lua_State *L, 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_findstring (const char *st, const char *const lst[]); - -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_getn (lua_State *L, int t); -LUALIB_API void luaL_setn (lua_State *L, int t, int n); - -LUALIB_API int luaL_loadfile (lua_State *L, const char *filename); -LUALIB_API int luaL_loadbuffer (lua_State *L, const char *buff, size_t sz, - const char *name); - - - -/* -** =============================================================== -** some useful macros -** =============================================================== -*/ - -#define luaL_argcheck(L, cond,numarg,extramsg) if (!(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_checknumber(L, n)) -#define luaL_checklong(L,n) ((long)luaL_checknumber(L, n)) -#define luaL_optint(L,n,d) ((int)luaL_optnumber(L, n,(lua_Number)(d))) -#define luaL_optlong(L,n,d) ((long)luaL_optnumber(L, n,(lua_Number)(d))) - - -/* -** {====================================================== -** Generic Buffer manipulation -** ======================================================= -*/ - - -#ifndef LUAL_BUFFERSIZE -#define LUAL_BUFFERSIZE BUFSIZ -#endif - - -typedef struct luaL_Buffer { - char *p; /* current position in buffer */ - int lvl; /* number of strings in the stack (level) */ - lua_State *L; - char buffer[LUAL_BUFFERSIZE]; -} luaL_Buffer; - -#define luaL_putchar(B,c) \ - ((void)((B)->p < ((B)->buffer+LUAL_BUFFERSIZE) || luaL_prepbuffer(B)), \ - (*(B)->p++ = (char)(c))) - -#define luaL_addsize(B,n) ((B)->p += (n)) - -LUALIB_API void luaL_buffinit (lua_State *L, luaL_Buffer *B); -LUALIB_API char *luaL_prepbuffer (luaL_Buffer *B); -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); - - -/* }====================================================== */ - - - -/* -** Compatibility macros and functions -*/ - -LUALIB_API int lua_dofile (lua_State *L, const char *filename); -LUALIB_API int lua_dostring (lua_State *L, const char *str); -LUALIB_API int lua_dobuffer (lua_State *L, const char *buff, size_t sz, - const char *n); - - -#define luaL_check_lstr luaL_checklstring -#define luaL_opt_lstr luaL_optlstring -#define luaL_check_number luaL_checknumber -#define luaL_opt_number luaL_optnumber -#define luaL_arg_check luaL_argcheck -#define luaL_check_string luaL_checkstring -#define luaL_opt_string luaL_optstring -#define luaL_check_int luaL_checkint -#define luaL_check_long luaL_checklong -#define luaL_opt_int luaL_optint -#define luaL_opt_long luaL_optlong - - -#endif - - diff --git a/contrib/lua50/include/lua.h b/contrib/lua50/include/lua.h deleted file mode 100644 index bd4acc9a8..000000000 --- a/contrib/lua50/include/lua.h +++ /dev/null @@ -1,391 +0,0 @@ -/* -** $Id: lua.h,v 1.175c 2003/03/18 12:31:39 roberto Exp $ -** Lua - An Extensible Extension Language -** Tecgraf: Computer Graphics Technology Group, PUC-Rio, Brazil -** http://www.lua.org mailto:info@lua.org -** See Copyright Notice at the end of this file -*/ - - -#ifndef lua_h -#define lua_h - -#include -#include - - -#define LUA_VERSION "Lua 5.0.3" -#define LUA_COPYRIGHT "Copyright (C) 1994-2006 Tecgraf, PUC-Rio" -#define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo & W. Celes" - - - -/* option for multiple returns in `lua_pcall' and `lua_call' */ -#define LUA_MULTRET (-1) - - -/* -** pseudo-indices -*/ -#define LUA_REGISTRYINDEX (-10000) -#define LUA_GLOBALSINDEX (-10001) -#define lua_upvalueindex(i) (LUA_GLOBALSINDEX-(i)) - - -/* error codes for `lua_load' and `lua_pcall' */ -#define LUA_ERRRUN 1 -#define LUA_ERRFILE 2 -#define LUA_ERRSYNTAX 3 -#define LUA_ERRMEM 4 -#define LUA_ERRERR 5 - - -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_Chunkreader) (lua_State *L, void *ud, size_t *sz); - -typedef int (*lua_Chunkwriter) (lua_State *L, const void* p, - size_t sz, void* ud); - - -/* -** 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 - - -/* minimum Lua stack available to a C function */ -#define LUA_MINSTACK 20 - - -/* -** generic extra include file -*/ -#ifdef LUA_USER_H -#include LUA_USER_H -#endif - - -/* type of numbers in Lua */ -#ifndef LUA_NUMBER -typedef double lua_Number; -#else -typedef LUA_NUMBER lua_Number; -#endif - - -/* mark for all API functions */ -#ifndef LUA_API -#define LUA_API extern -#endif - - -/* -** state manipulation -*/ -LUA_API lua_State *lua_open (void); -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); - - -/* -** basic stack manipulation -*/ -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 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 int lua_equal (lua_State *L, int idx1, int idx2); -LUA_API int lua_rawequal (lua_State *L, int idx1, int idx2); -LUA_API int lua_lessthan (lua_State *L, int idx1, int idx2); - -LUA_API lua_Number lua_tonumber (lua_State *L, int idx); -LUA_API int lua_toboolean (lua_State *L, int idx); -LUA_API const char *lua_tostring (lua_State *L, int idx); -LUA_API size_t lua_strlen (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); - - -/* -** 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_pushlstring (lua_State *L, const char *s, size_t l); -LUA_API void 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); - - -/* -** get functions (Lua -> stack) -*/ -LUA_API void lua_gettable (lua_State *L, int idx); -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_newtable (lua_State *L); -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_getfenv (lua_State *L, int idx); - - -/* -** set functions (stack -> Lua) -*/ -LUA_API void lua_settable (lua_State *L, int idx); -LUA_API void lua_rawset (lua_State *L, int idx); -LUA_API void lua_rawseti (lua_State *L, int idx, int n); -LUA_API int lua_setmetatable (lua_State *L, int objindex); -LUA_API int lua_setfenv (lua_State *L, int idx); - - -/* -** `load' and `call' functions (load and run Lua code) -*/ -LUA_API void lua_call (lua_State *L, int nargs, int nresults); -LUA_API int lua_pcall (lua_State *L, int nargs, int nresults, int errfunc); -LUA_API int lua_cpcall (lua_State *L, lua_CFunction func, void *ud); -LUA_API int lua_load (lua_State *L, lua_Chunkreader reader, void *dt, - const char *chunkname); - -LUA_API int lua_dump (lua_State *L, lua_Chunkwriter writer, void *data); - - -/* -** coroutine functions -*/ -LUA_API int lua_yield (lua_State *L, int nresults); -LUA_API int lua_resume (lua_State *L, int narg); - -/* -** garbage-collection functions -*/ -LUA_API int lua_getgcthreshold (lua_State *L); -LUA_API int lua_getgccount (lua_State *L); -LUA_API void lua_setgcthreshold (lua_State *L, int newthreshold); - -/* -** miscellaneous functions -*/ - -LUA_API const char *lua_version (void); - -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); - - - -/* -** =============================================================== -** some useful macros -** =============================================================== -*/ - -#define lua_boxpointer(L,u) \ - (*(void **)(lua_newuserdata(L, sizeof(void *))) = (u)) - -#define lua_unboxpointer(L,i) (*(void **)(lua_touserdata(L, i))) - -#define lua_pop(L,n) lua_settop(L, -(n)-1) - -#define lua_register(L,n,f) \ - (lua_pushstring(L, n), \ - lua_pushcfunction(L, f), \ - lua_settable(L, LUA_GLOBALSINDEX)) - -#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_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) - - - -/* -** compatibility macros and functions -*/ - - -LUA_API int lua_pushupvalues (lua_State *L); - -#define lua_getregistry(L) lua_pushvalue(L, LUA_REGISTRYINDEX) -#define lua_setglobal(L,s) \ - (lua_pushstring(L, s), lua_insert(L, -2), lua_settable(L, LUA_GLOBALSINDEX)) - -#define lua_getglobal(L,s) \ - (lua_pushstring(L, s), lua_gettable(L, LUA_GLOBALSINDEX)) - - -/* compatibility with ref system */ - -/* pre-defined references */ -#define LUA_NOREF (-2) -#define LUA_REFNIL (-1) - -#define lua_ref(L,lock) ((lock) ? luaL_ref(L, LUA_REGISTRYINDEX) : \ - (lua_pushstring(L, "unlocked references are obsolete"), lua_error(L), 0)) - -#define lua_unref(L,ref) luaL_unref(L, LUA_REGISTRYINDEX, (ref)) - -#define lua_getref(L,ref) lua_rawgeti(L, LUA_REGISTRYINDEX, ref) - - - -/* -** {====================================================================== -** useful definitions for Lua kernel and libraries -** ======================================================================= -*/ - -/* formats for Lua numbers */ -#ifndef LUA_NUMBER_SCAN -#define LUA_NUMBER_SCAN "%lf" -#endif - -#ifndef LUA_NUMBER_FMT -#define LUA_NUMBER_FMT "%.14g" -#endif - -/* }====================================================================== */ - - -/* -** {====================================================================== -** Debug API -** ======================================================================= -*/ - - -/* -** Event codes -*/ -#define LUA_HOOKCALL 0 -#define LUA_HOOKRET 1 -#define LUA_HOOKLINE 2 -#define LUA_HOOKCOUNT 3 -#define LUA_HOOKTAILRET 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 */ - -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 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); - - -#define LUA_IDSIZE 60 - -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 nups; /* (u) number of upvalues */ - int linedefined; /* (S) */ - char short_src[LUA_IDSIZE]; /* (S) */ - /* private part */ - int i_ci; /* active function */ -}; - -/* }====================================================================== */ - - -/****************************************************************************** -* Copyright (C) 1994-2006 Tecgraf, PUC-Rio. All rights reserved. -* -* 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/contrib/lua50/include/lualib.h b/contrib/lua50/include/lualib.h deleted file mode 100644 index e22c4c306..000000000 --- a/contrib/lua50/include/lualib.h +++ /dev/null @@ -1,56 +0,0 @@ -/* -** $Id: lualib.h,v 1.28 2003/03/18 12:24:26 roberto Exp $ -** Lua standard libraries -** See Copyright Notice in lua.h -*/ - - -#ifndef lualib_h -#define lualib_h - -#include "lua.h" - - -#ifndef LUALIB_API -#define LUALIB_API LUA_API -#endif - - -#define LUA_COLIBNAME "coroutine" -LUALIB_API int luaopen_base (lua_State *L); - -#define LUA_TABLIBNAME "table" -LUALIB_API int luaopen_table (lua_State *L); - -#define LUA_IOLIBNAME "io" -#define LUA_OSLIBNAME "os" -LUALIB_API int luaopen_io (lua_State *L); - -#define LUA_STRLIBNAME "string" -LUALIB_API int luaopen_string (lua_State *L); - -#define LUA_MATHLIBNAME "math" -LUALIB_API int luaopen_math (lua_State *L); - -#define LUA_DBLIBNAME "debug" -LUALIB_API int luaopen_debug (lua_State *L); - - -LUALIB_API int luaopen_loadlib (lua_State *L); - - -/* to help testing the libraries */ -#ifndef lua_assert -#define lua_assert(c) /* empty */ -#endif - - -/* compatibility code */ -#define lua_baselibopen luaopen_base -#define lua_tablibopen luaopen_table -#define lua_iolibopen luaopen_io -#define lua_strlibopen luaopen_string -#define lua_mathlibopen luaopen_math -#define lua_dblibopen luaopen_debug - -#endif diff --git a/contrib/lua50/includedirs.vsprops b/contrib/lua50/includedirs.vsprops deleted file mode 100644 index 6322ff2a4..000000000 --- a/contrib/lua50/includedirs.vsprops +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/contrib/lua50/lua50_vc9.vcproj b/contrib/lua50/lua50_vc9.vcproj deleted file mode 100644 index 55703d7bd..000000000 --- a/contrib/lua50/lua50_vc9.vcproj +++ /dev/null @@ -1,487 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/contrib/lua50/src/lapi.c b/contrib/lua50/src/lapi.c deleted file mode 100644 index 2ed4c6348..000000000 --- a/contrib/lua50/src/lapi.c +++ /dev/null @@ -1,922 +0,0 @@ -/* -** $Id: lapi.c,v 1.235a 2003/04/07 14:36:08 roberto Exp $ -** Lua API -** See Copyright Notice in lua.h -*/ - - -#include -#include - -#define lapi_c - -#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[] = - "$Lua: " LUA_VERSION " " LUA_COPYRIGHT " $\n" - "$Authors: " LUA_AUTHORS " $\n" - "$URL: www.lua.org $\n"; - - - -#ifndef api_check -#define api_check(L, o) /*{ assert(o); }*/ -#endif - -#define api_checknelems(L, n) api_check(L, (n) <= (L->top - L->base)) - -#define api_incr_top(L) {api_check(L, L->top < L->ci->top); L->top++;} - - - - -static TObject *negindex (lua_State *L, int idx) { - if (idx > LUA_REGISTRYINDEX) { - api_check(L, idx != 0 && -idx <= L->top - L->base); - return L->top+idx; - } - else switch (idx) { /* pseudo-indices */ - case LUA_REGISTRYINDEX: return registry(L); - case LUA_GLOBALSINDEX: return gt(L); - default: { - TObject *func = (L->base - 1); - idx = LUA_GLOBALSINDEX - idx; - lua_assert(iscfunction(func)); - return (idx <= clvalue(func)->c.nupvalues) - ? &clvalue(func)->c.upvalue[idx-1] - : NULL; - } - } -} - - -static TObject *luaA_index (lua_State *L, int idx) { - if (idx > 0) { - api_check(L, idx <= L->top - L->base); - return L->base + idx - 1; - } - else { - TObject *o = negindex(L, idx); - api_check(L, o != NULL); - return o; - } -} - - -static TObject *luaA_indexAcceptable (lua_State *L, int idx) { - if (idx > 0) { - TObject *o = L->base+(idx-1); - api_check(L, idx <= L->stack_last - L->base); - if (o >= L->top) return NULL; - else return o; - } - else - return negindex(L, idx); -} - - -void luaA_pushobject (lua_State *L, const TObject *o) { - setobj2s(L->top, o); - incr_top(L); -} - - -LUA_API int lua_checkstack (lua_State *L, int size) { - int res; - lua_lock(L); - if ((L->top - L->base + size) > LUA_MAXCSTACK) - res = 0; /* stack overflow */ - else { - luaD_checkstack(L, size); - if (L->ci->top < L->top + size) - L->ci->top = L->top + size; - res = 1; - } - lua_unlock(L); - return res; -} - - -LUA_API void lua_xmove (lua_State *from, lua_State *to, int n) { - int i; - lua_lock(to); - api_checknelems(from, n); - from->top -= n; - for (i = 0; i < n; i++) { - setobj2s(to->top, from->top + i); - api_incr_top(to); - } - 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 lua_State *lua_newthread (lua_State *L) { - lua_State *L1; - lua_lock(L); - luaC_checkGC(L); - L1 = luaE_newthread(L); - setthvalue(L->top, L1); - api_incr_top(L); - lua_unlock(L); - lua_userstateopen(L1); - return L1; -} - - - -/* -** basic stack manipulation -*/ - - -LUA_API int lua_gettop (lua_State *L) { - return (L->top - L->base); -} - - -LUA_API void lua_settop (lua_State *L, int idx) { - lua_lock(L); - if (idx >= 0) { - api_check(L, idx <= L->stack_last - L->base); - while (L->top < L->base + idx) - setnilvalue(L->top++); - L->top = L->base + idx; - } - else { - api_check(L, -(idx+1) <= (L->top - L->base)); - 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 = luaA_index(L, idx); - while (++p < L->top) setobjs2s(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 = luaA_index(L, idx); - for (q = L->top; q>p; q--) setobjs2s(q, q-1); - setobjs2s(p, L->top); - lua_unlock(L); -} - - -LUA_API void lua_replace (lua_State *L, int idx) { - lua_lock(L); - api_checknelems(L, 1); - setobj(luaA_index(L, idx), L->top - 1); /* write barrier */ - L->top--; - lua_unlock(L); -} - - -LUA_API void lua_pushvalue (lua_State *L, int idx) { - lua_lock(L); - setobj2s(L->top, luaA_index(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 = luaA_indexAcceptable(L, idx); - return (o == NULL) ? LUA_TNONE : ttype(o); -} - - -LUA_API const char *lua_typename (lua_State *L, int t) { - UNUSED(L); - return (t == LUA_TNONE) ? "no value" : luaT_typenames[t]; -} - - -LUA_API int lua_iscfunction (lua_State *L, int idx) { - StkId o = luaA_indexAcceptable(L, idx); - return (o == NULL) ? 0 : iscfunction(o); -} - - -LUA_API int lua_isnumber (lua_State *L, int idx) { - TObject n; - const TObject *o = luaA_indexAcceptable(L, idx); - return (o != NULL && 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 TObject *o = luaA_indexAcceptable(L, idx); - return (o != NULL && (ttisuserdata(o) || ttislightuserdata(o))); -} - - -LUA_API int lua_rawequal (lua_State *L, int index1, int index2) { - StkId o1 = luaA_indexAcceptable(L, index1); - StkId o2 = luaA_indexAcceptable(L, index2); - return (o1 == NULL || o2 == NULL) ? 0 /* index out of range */ - : luaO_rawequalObj(o1, o2); -} - - -LUA_API int lua_equal (lua_State *L, int index1, int index2) { - StkId o1, o2; - int i; - lua_lock(L); /* may call tag method */ - o1 = luaA_indexAcceptable(L, index1); - o2 = luaA_indexAcceptable(L, index2); - i = (o1 == NULL || o2 == NULL) ? 0 /* index out of range */ - : equalobj(L, o1, o2); - lua_unlock(L); - return i; -} - - -LUA_API int lua_lessthan (lua_State *L, int index1, int index2) { - StkId o1, o2; - int i; - lua_lock(L); /* may call tag method */ - o1 = luaA_indexAcceptable(L, index1); - o2 = luaA_indexAcceptable(L, index2); - i = (o1 == NULL || o2 == NULL) ? 0 /* index out-of-range */ - : luaV_lessthan(L, o1, o2); - lua_unlock(L); - return i; -} - - - -LUA_API lua_Number lua_tonumber (lua_State *L, int idx) { - TObject n; - const TObject *o = luaA_indexAcceptable(L, idx); - if (o != NULL && tonumber(o, &n)) - return nvalue(o); - else - return 0; -} - - -LUA_API int lua_toboolean (lua_State *L, int idx) { - const TObject *o = luaA_indexAcceptable(L, idx); - return (o != NULL) && !l_isfalse(o); -} - - -LUA_API const char *lua_tostring (lua_State *L, int idx) { - StkId o = luaA_indexAcceptable(L, idx); - if (o == NULL) - return NULL; - else if (ttisstring(o)) - return svalue(o); - else { - const char *s; - lua_lock(L); /* `luaV_tostring' may create a new string */ - s = (luaV_tostring(L, o) ? svalue(o) : NULL); - luaC_checkGC(L); - lua_unlock(L); - return s; - } -} - - -LUA_API size_t lua_strlen (lua_State *L, int idx) { - StkId o = luaA_indexAcceptable(L, idx); - if (o == NULL) - return 0; - else if (ttisstring(o)) - return tsvalue(o)->tsv.len; - else { - size_t l; - lua_lock(L); /* `luaV_tostring' may create a new string */ - l = (luaV_tostring(L, o) ? tsvalue(o)->tsv.len : 0); - lua_unlock(L); - return l; - } -} - - -LUA_API lua_CFunction lua_tocfunction (lua_State *L, int idx) { - StkId o = luaA_indexAcceptable(L, idx); - return (o == NULL || !iscfunction(o)) ? NULL : clvalue(o)->c.f; -} - - -LUA_API void *lua_touserdata (lua_State *L, int idx) { - StkId o = luaA_indexAcceptable(L, idx); - if (o == NULL) return NULL; - switch (ttype(o)) { - case LUA_TUSERDATA: return (uvalue(o) + 1); - case LUA_TLIGHTUSERDATA: return pvalue(o); - default: return NULL; - } -} - - -LUA_API lua_State *lua_tothread (lua_State *L, int idx) { - StkId o = luaA_indexAcceptable(L, idx); - return (o == NULL || !ttisthread(o)) ? NULL : thvalue(o); -} - - -LUA_API const void *lua_topointer (lua_State *L, int idx) { - StkId o = luaA_indexAcceptable(L, idx); - if (o == NULL) return NULL; - else { - switch (ttype(o)) { - case LUA_TTABLE: return hvalue(o); - case LUA_TFUNCTION: return clvalue(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); - api_incr_top(L); - lua_unlock(L); -} - - -LUA_API void lua_pushlstring (lua_State *L, const char *s, size_t len) { - lua_lock(L); - luaC_checkGC(L); - setsvalue2s(L->top, luaS_newlstr(L, s, len)); - api_incr_top(L); - lua_unlock(L); -} - - -LUA_API void lua_pushstring (lua_State *L, const char *s) { - if (s == NULL) - lua_pushnil(L); - else - lua_pushlstring(L, s, strlen(s)); -} - - -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) { - Closure *cl; - lua_lock(L); - luaC_checkGC(L); - api_checknelems(L, n); - cl = luaF_newCclosure(L, n); - cl->c.f = fn; - L->top -= n; - while (n--) - setobj2n(&cl->c.upvalue[n], L->top+n); - setclvalue(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); -} - - - -/* -** get functions (Lua -> stack) -*/ - - -LUA_API void lua_gettable (lua_State *L, int idx) { - StkId t; - lua_lock(L); - t = luaA_index(L, idx); - setobj2s(L->top - 1, luaV_gettable(L, t, L->top - 1, 0)); - lua_unlock(L); -} - - -LUA_API void lua_rawget (lua_State *L, int idx) { - StkId t; - lua_lock(L); - t = luaA_index(L, idx); - api_check(L, ttistable(t)); - setobj2s(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 o; - lua_lock(L); - o = luaA_index(L, idx); - api_check(L, ttistable(o)); - setobj2s(L->top, luaH_getnum(hvalue(o), n)); - api_incr_top(L); - lua_unlock(L); -} - - -LUA_API void lua_newtable (lua_State *L) { - lua_lock(L); - luaC_checkGC(L); - sethvalue(L->top, luaH_new(L, 0, 0)); - api_incr_top(L); - lua_unlock(L); -} - - -LUA_API int lua_getmetatable (lua_State *L, int objindex) { - const TObject *obj; - Table *mt = NULL; - int res; - lua_lock(L); - obj = luaA_indexAcceptable(L, objindex); - if (obj != NULL) { - switch (ttype(obj)) { - case LUA_TTABLE: - mt = hvalue(obj)->metatable; - break; - case LUA_TUSERDATA: - mt = uvalue(obj)->uv.metatable; - break; - } - } - if (mt == NULL || mt == hvalue(defaultmeta(L))) - res = 0; - else { - sethvalue(L->top, mt); - api_incr_top(L); - res = 1; - } - lua_unlock(L); - return res; -} - - -LUA_API void lua_getfenv (lua_State *L, int idx) { - StkId o; - lua_lock(L); - o = luaA_index(L, idx); - setobj2s(L->top, isLfunction(o) ? &clvalue(o)->l.g : gt(L)); - api_incr_top(L); - lua_unlock(L); -} - - -/* -** set functions (stack -> Lua) -*/ - - -LUA_API void lua_settable (lua_State *L, int idx) { - StkId t; - lua_lock(L); - api_checknelems(L, 2); - t = luaA_index(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_rawset (lua_State *L, int idx) { - StkId t; - lua_lock(L); - api_checknelems(L, 2); - t = luaA_index(L, idx); - api_check(L, ttistable(t)); - setobj2t(luaH_set(L, hvalue(t), L->top-2), L->top-1); /* write barrier */ - L->top -= 2; - lua_unlock(L); -} - - -LUA_API void lua_rawseti (lua_State *L, int idx, int n) { - StkId o; - lua_lock(L); - api_checknelems(L, 1); - o = luaA_index(L, idx); - api_check(L, ttistable(o)); - setobj2t(luaH_setnum(L, hvalue(o), n), L->top-1); /* write barrier */ - L->top--; - lua_unlock(L); -} - - -LUA_API int lua_setmetatable (lua_State *L, int objindex) { - TObject *obj, *mt; - int res = 1; - lua_lock(L); - api_checknelems(L, 1); - obj = luaA_index(L, objindex); - mt = (!ttisnil(L->top - 1)) ? L->top - 1 : defaultmeta(L); - api_check(L, ttistable(mt)); - switch (ttype(obj)) { - case LUA_TTABLE: { - hvalue(obj)->metatable = hvalue(mt); /* write barrier */ - break; - } - case LUA_TUSERDATA: { - uvalue(obj)->uv.metatable = hvalue(mt); /* write barrier */ - break; - } - default: { - res = 0; /* cannot set */ - break; - } - } - L->top--; - lua_unlock(L); - return res; -} - - -LUA_API int lua_setfenv (lua_State *L, int idx) { - StkId o; - int res = 0; - lua_lock(L); - api_checknelems(L, 1); - o = luaA_index(L, idx); - L->top--; - api_check(L, ttistable(L->top)); - if (isLfunction(o)) { - res = 1; - clvalue(o)->l.g = *(L->top); - } - lua_unlock(L); - return res; -} - - -/* -** `load' and `call' functions (run Lua code) -*/ - -LUA_API void lua_call (lua_State *L, int nargs, int nresults) { - StkId func; - lua_lock(L); - api_checknelems(L, nargs+1); - func = L->top - (nargs+1); - luaD_call(L, func, 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); -} - - - -LUA_API int lua_pcall (lua_State *L, int nargs, int nresults, int errfunc) { - struct CallS c; - int status; - ptrdiff_t func; - lua_lock(L); - func = (errfunc == 0) ? 0 : savestack(L, luaA_index(L, errfunc)); - c.func = L->top - (nargs+1); /* function to be called */ - c.nresults = nresults; - status = luaD_pcall(L, f_call, &c, savestack(L, c.func), func); - lua_unlock(L); - return status; -} - - -/* -** Execute a protected C call. -*/ -struct CCallS { /* data to `f_Ccall' */ - lua_CFunction func; - void *ud; -}; - - -static void f_Ccall (lua_State *L, void *ud) { - struct CCallS *c = cast(struct CCallS *, ud); - Closure *cl; - cl = luaF_newCclosure(L, 0); - cl->c.f = c->func; - setclvalue(L->top, cl); /* push function */ - incr_top(L); - setpvalue(L->top, c->ud); /* push only argument */ - incr_top(L); - luaD_call(L, L->top - 2, 0); -} - - -LUA_API int lua_cpcall (lua_State *L, lua_CFunction func, void *ud) { - struct CCallS c; - int status; - lua_lock(L); - c.func = func; - c.ud = ud; - status = luaD_pcall(L, f_Ccall, &c, savestack(L, L->top), 0); - lua_unlock(L); - return status; -} - - -LUA_API int lua_load (lua_State *L, lua_Chunkreader reader, void *data, - const char *chunkname) { - ZIO z; - int status; - int c; - lua_lock(L); - if (!chunkname) chunkname = "?"; - luaZ_init(&z, reader, data, chunkname); - c = luaZ_lookahead(&z); - status = luaD_protectedparser(L, &z, (c == LUA_SIGNATURE[0])); - lua_unlock(L); - return status; -} - - -LUA_API int lua_dump (lua_State *L, lua_Chunkwriter writer, void *data) { - int status; - TObject *o; - lua_lock(L); - api_checknelems(L, 1); - o = L->top - 1; - if (isLfunction(o) && clvalue(o)->l.nupvalues == 0) { - luaU_dump(L, clvalue(o)->l.p, writer, data); - status = 1; - } - else - status = 0; - lua_unlock(L); - return status; -} - - -/* -** Garbage-collection functions -*/ - -/* GC values are expressed in Kbytes: #bytes/2^10 */ -#define GCscalel(x) ((x)>>10) -#define GCscale(x) (cast(int, GCscalel(x))) -#define GCunscale(x) (cast(lu_mem, x)<<10) - -LUA_API int lua_getgcthreshold (lua_State *L) { - int threshold; - lua_lock(L); - threshold = GCscale(G(L)->GCthreshold); - lua_unlock(L); - return threshold; -} - -LUA_API int lua_getgccount (lua_State *L) { - int count; - lua_lock(L); - count = GCscale(G(L)->nblocks); - lua_unlock(L); - return count; -} - -LUA_API void lua_setgcthreshold (lua_State *L, int newthreshold) { - lua_lock(L); - if (cast(lu_mem, newthreshold) > GCscalel(MAX_LUMEM)) - G(L)->GCthreshold = MAX_LUMEM; - else - G(L)->GCthreshold = GCunscale(newthreshold); - luaC_checkGC(L); - lua_unlock(L); -} - - -/* -** miscellaneous functions -*/ - - -LUA_API const char *lua_version (void) { - return LUA_VERSION; -} - - -LUA_API int lua_error (lua_State *L) { - lua_lock(L); - api_checknelems(L, 1); - luaG_errormsg(L); - lua_unlock(L); - return 0; /* to avoid warnings */ -} - - -LUA_API int lua_next (lua_State *L, int idx) { - StkId t; - int more; - lua_lock(L); - t = luaA_index(L, idx); - api_check(L, ttistable(t)); - 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); - luaC_checkGC(L); - api_checknelems(L, n); - if (n >= 2) { - luaV_concat(L, n, L->top - L->base - 1); - L->top -= (n-1); - } - else if (n == 0) { /* push empty string */ - setsvalue2s(L->top, luaS_newlstr(L, NULL, 0)); - api_incr_top(L); - } - /* else n == 1; nothing to do */ - 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); - setuvalue(L->top, u); - api_incr_top(L); - lua_unlock(L); - return u + 1; -} - - -LUA_API int lua_pushupvalues (lua_State *L) { - Closure *func; - int n, i; - lua_lock(L); - api_check(L, iscfunction(L->base - 1)); - func = clvalue(L->base - 1); - n = func->c.nupvalues; - luaD_checkstack(L, n + LUA_MINSTACK); - for (i=0; itop, &func->c.upvalue[i]); - L->top++; - } - lua_unlock(L); - return n; -} - - -static const char *aux_upvalue (lua_State *L, int funcindex, int n, - TObject **val) { - Closure *f; - StkId fi = luaA_index(L, funcindex); - if (!ttisfunction(fi)) return NULL; - f = clvalue(fi); - if (f->c.isC) { - if (!(1 <= n && n <= f->c.nupvalues)) return NULL; - *val = &f->c.upvalue[n-1]; - return ""; - } - else { - Proto *p = f->l.p; - if (!(1 <= n && n <= p->sizeupvalues)) return NULL; - *val = f->l.upvals[n-1]->v; - return getstr(p->upvalues[n-1]); - } -} - - -LUA_API const char *lua_getupvalue (lua_State *L, int funcindex, int n) { - const char *name; - TObject *val; - lua_lock(L); - name = aux_upvalue(L, funcindex, n, &val); - if (name) { - setobj2s(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; - TObject *val; - lua_lock(L); - api_checknelems(L, 1); - name = aux_upvalue(L, funcindex, n, &val); - if (name) { - L->top--; - setobj(val, L->top); /* write barrier */ - } - lua_unlock(L); - return name; -} - diff --git a/contrib/lua50/src/lapi.h b/contrib/lua50/src/lapi.h deleted file mode 100644 index d12612f30..000000000 --- a/contrib/lua50/src/lapi.h +++ /dev/null @@ -1,16 +0,0 @@ -/* -** $Id: lapi.h,v 1.21 2002/03/04 21:29:41 roberto Exp $ -** Auxiliary functions from Lua API -** See Copyright Notice in lua.h -*/ - -#ifndef lapi_h -#define lapi_h - - -#include "lobject.h" - - -void luaA_pushobject (lua_State *L, const TObject *o); - -#endif diff --git a/contrib/lua50/src/lcode.c b/contrib/lua50/src/lcode.c deleted file mode 100644 index 3925c976c..000000000 --- a/contrib/lua50/src/lcode.c +++ /dev/null @@ -1,718 +0,0 @@ -/* -** $Id: lcode.c,v 1.117a 2003/04/03 13:35:34 roberto Exp $ -** Code generator for Lua -** See Copyright Notice in lua.h -*/ - - -#include - -#define lcode_c - -#include "lua.h" - -#include "lcode.h" -#include "ldebug.h" -#include "ldo.h" -#include "llex.h" -#include "lmem.h" -#include "lobject.h" -#include "lopcodes.h" -#include "lparser.h" -#include "ltable.h" - - -#define hasjumps(e) ((e)->t != (e)->f) - - -void luaK_nil (FuncState *fs, int from, int n) { - Instruction *previous; - if (fs->pc > fs->lasttarget && /* no jumps to current position? */ - GET_OPCODE(*(previous = &fs->f->code[fs->pc-1])) == OP_LOADNIL) { - int pfrom = GETARG_A(*previous); - int pto = GETARG_B(*previous); - if (pfrom <= from && from <= pto+1) { /* can connect both? */ - if (from+n-1 > pto) - SETARG_B(*previous, from+n-1); - return; - } - } - luaK_codeABC(fs, OP_LOADNIL, from, 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; -} - - -static int luaK_condjump (FuncState *fs, OpCode op, int A, int B, int C) { - luaK_codeABC(fs, op, A, B, C); - return luaK_jump(fs); -} - - -static void luaK_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 luaK_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 && testOpMode(GET_OPCODE(*(pi-1)), OpModeT)) - 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, int cond) { - for (; list != NO_JUMP; list = luaK_getjump(fs, list)) { - Instruction i = *getjumpcontrol(fs, list); - if (GET_OPCODE(i) != OP_TEST || - GETARG_A(i) != NO_REG || - GETARG_C(i) != cond) - return 1; - } - return 0; /* not found */ -} - - -static void patchtestreg (Instruction *i, int reg) { - if (reg == NO_REG) reg = GETARG_B(*i); - SETARG_A(*i, reg); -} - - -static void removevalues (FuncState *fs, int list) { - for (; list != NO_JUMP; list = luaK_getjump(fs, list)) { - Instruction *i = getjumpcontrol(fs, list); - if (GET_OPCODE(*i) == OP_TEST) - patchtestreg(i, NO_REG); - } -} - - -static void luaK_patchlistaux (FuncState *fs, int list, int vtarget, int reg, - int dtarget) { - while (list != NO_JUMP) { - int next = luaK_getjump(fs, list); - Instruction *i = getjumpcontrol(fs, list); - if (GET_OPCODE(*i) == OP_TEST && GETARG_A(*i) == NO_REG) { - patchtestreg(i, reg); - luaK_fixjump(fs, list, vtarget); - } - else - luaK_fixjump(fs, list, dtarget); /* jump to default target */ - list = next; - } -} - - -static void luaK_dischargejpc (FuncState *fs) { - luaK_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); - luaK_patchlistaux(fs, list, target, NO_REG, target); - } -} - - -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 = luaK_getjump(fs, list)) != NO_JUMP) /* find last element */ - list = next; - luaK_fixjump(fs, list, l2); - } -} - - -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(lu_byte, newstack); - } -} - - -void luaK_reserveregs (FuncState *fs, int n) { - luaK_checkstack(fs, n); - fs->freereg += n; -} - - -static void freereg (FuncState *fs, int reg) { - if (reg >= fs->nactvar && reg < MAXSTACK) { - fs->freereg--; - lua_assert(reg == fs->freereg); - } -} - - -static void freeexp (FuncState *fs, expdesc *e) { - if (e->k == VNONRELOC) - freereg(fs, e->info); -} - - -static int addk (FuncState *fs, TObject *k, TObject *v) { - const TObject *idx = luaH_get(fs->h, k); - if (ttisnumber(idx)) { - lua_assert(luaO_rawequalObj(&fs->f->k[cast(int, nvalue(idx))], v)); - return cast(int, nvalue(idx)); - } - else { /* constant not found; create a new entry */ - Proto *f = fs->f; - luaM_growvector(fs->L, f->k, fs->nk, f->sizek, TObject, - MAXARG_Bx, "constant table overflow"); - setobj2n(&f->k[fs->nk], v); - setnvalue(luaH_set(fs->L, fs->h, k), cast(lua_Number, fs->nk)); - return fs->nk++; - } -} - - -int luaK_stringK (FuncState *fs, TString *s) { - TObject o; - setsvalue(&o, s); - return addk(fs, &o, &o); -} - - -int luaK_numberK (FuncState *fs, lua_Number r) { - TObject o; - setnvalue(&o, r); - return addk(fs, &o, &o); -} - - -static int nil_constant (FuncState *fs) { - TObject k, v; - setnilvalue(&v); - sethvalue(&k, fs->h); /* cannot use nil as key; instead use table itself */ - return addk(fs, &k, &v); -} - - -void luaK_setcallreturns (FuncState *fs, expdesc *e, int nresults) { - if (e->k == VCALL) { /* expression is an open function call? */ - SETARG_C(getcode(fs, e), nresults+1); - if (nresults == 1) { /* `regular' expression? */ - e->k = VNONRELOC; - e->info = GETARG_A(getcode(fs, e)); - } - } -} - - -void luaK_dischargevars (FuncState *fs, expdesc *e) { - switch (e->k) { - case VLOCAL: { - e->k = VNONRELOC; - break; - } - case VUPVAL: { - e->info = luaK_codeABC(fs, OP_GETUPVAL, 0, e->info, 0); - e->k = VRELOCABLE; - break; - } - case VGLOBAL: { - e->info = luaK_codeABx(fs, OP_GETGLOBAL, 0, e->info); - e->k = VRELOCABLE; - break; - } - case VINDEXED: { - freereg(fs, e->aux); - freereg(fs, e->info); - e->info = luaK_codeABC(fs, OP_GETTABLE, 0, e->info, e->aux); - e->k = VRELOCABLE; - break; - } - case VCALL: { - luaK_setcallreturns(fs, e, 1); - 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_codeABx(fs, OP_LOADK, reg, e->info); - break; - } - case VRELOCABLE: { - Instruction *pc = &getcode(fs, e); - SETARG_A(*pc, reg); - break; - } - case VNONRELOC: { - if (reg != e->info) - luaK_codeABC(fs, OP_MOVE, reg, e->info, 0); - break; - } - default: { - lua_assert(e->k == VVOID || e->k == VJMP); - return; /* nothing to do... */ - } - } - e->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 luaK_exp2reg (FuncState *fs, expdesc *e, int reg) { - discharge2reg(fs, e, reg); - if (e->k == VJMP) - luaK_concat(fs, &e->t, e->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, 1) || need_value(fs, e->f, 0)) { - int fj = NO_JUMP; /* first jump (over LOAD ops.) */ - if (e->k != VJMP) - fj = 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); - luaK_patchlistaux(fs, e->f, final, reg, p_f); - luaK_patchlistaux(fs, e->t, final, reg, p_t); - } - e->f = e->t = NO_JUMP; - e->info = reg; - e->k = VNONRELOC; -} - - -void luaK_exp2nextreg (FuncState *fs, expdesc *e) { - luaK_dischargevars(fs, e); - freeexp(fs, e); - luaK_reserveregs(fs, 1); - luaK_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->info; /* exp is already in a register */ - if (e->info >= fs->nactvar) { /* reg. is not a local? */ - luaK_exp2reg(fs, e, e->info); /* put value on it */ - return e->info; - } - } - luaK_exp2nextreg(fs, e); /* default */ - return e->info; -} - - -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 VNIL: { - if (fs->nk + MAXSTACK <= MAXARG_C) { /* constant fit in argC? */ - e->info = nil_constant(fs); - e->k = VK; - return e->info + MAXSTACK; - } - else break; - } - case VK: { - if (e->info + MAXSTACK <= MAXARG_C) /* constant fit in argC? */ - return e->info + MAXSTACK; - 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 *exp) { - switch (var->k) { - case VLOCAL: { - freeexp(fs, exp); - luaK_exp2reg(fs, exp, var->info); - return; - } - case VUPVAL: { - int e = luaK_exp2anyreg(fs, exp); - luaK_codeABC(fs, OP_SETUPVAL, e, var->info, 0); - break; - } - case VGLOBAL: { - int e = luaK_exp2anyreg(fs, exp); - luaK_codeABx(fs, OP_SETGLOBAL, e, var->info); - break; - } - case VINDEXED: { - int e = luaK_exp2RK(fs, exp); - luaK_codeABC(fs, OP_SETTABLE, var->info, var->aux, e); - break; - } - default: { - lua_assert(0); /* invalid var kind to store */ - break; - } - } - freeexp(fs, exp); -} - - -void luaK_self (FuncState *fs, expdesc *e, expdesc *key) { - int func; - luaK_exp2anyreg(fs, e); - freeexp(fs, e); - func = fs->freereg; - luaK_reserveregs(fs, 2); - luaK_codeABC(fs, OP_SELF, func, e->info, luaK_exp2RK(fs, key)); - freeexp(fs, key); - e->info = func; - e->k = VNONRELOC; -} - - -static void invertjump (FuncState *fs, expdesc *e) { - Instruction *pc = getjumpcontrol(fs, e->info); - lua_assert(testOpMode(GET_OPCODE(*pc), OpModeT) && - 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 luaK_condjump(fs, OP_TEST, GETARG_B(ie), GETARG_B(ie), !cond); - } - /* else go through */ - } - discharge2anyreg(fs, e); - freeexp(fs, e); - return luaK_condjump(fs, OP_TEST, NO_REG, e->info, cond); -} - - -void luaK_goiftrue (FuncState *fs, expdesc *e) { - int pc; /* pc of last jump */ - luaK_dischargevars(fs, e); - switch (e->k) { - case VK: case VTRUE: { - pc = NO_JUMP; /* always true; do nothing */ - break; - } - case VFALSE: { - pc = luaK_jump(fs); /* always jump */ - break; - } - case VJMP: { - invertjump(fs, e); - pc = e->info; - break; - } - default: { - pc = jumponcond(fs, e, 0); - break; - } - } - luaK_concat(fs, &e->f, pc); /* insert last jump in `f' list */ -} - - -void luaK_goiffalse (FuncState *fs, expdesc *e) { - int pc; /* pc of last jump */ - luaK_dischargevars(fs, e); - switch (e->k) { - case VNIL: case VFALSE: { - pc = NO_JUMP; /* always false; do nothing */ - break; - } - case VTRUE: { - pc = luaK_jump(fs); /* always jump */ - break; - } - case VJMP: { - pc = e->info; - break; - } - default: { - pc = jumponcond(fs, e, 1); - break; - } - } - luaK_concat(fs, &e->t, pc); /* insert last jump in `t' list */ -} - - -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 VTRUE: { - e->k = VFALSE; - break; - } - case VJMP: { - invertjump(fs, e); - break; - } - case VRELOCABLE: - case VNONRELOC: { - discharge2anyreg(fs, e); - freeexp(fs, e); - e->info = luaK_codeABC(fs, OP_NOT, 0, e->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) { - t->aux = luaK_exp2RK(fs, k); - t->k = VINDEXED; -} - - -void luaK_prefix (FuncState *fs, UnOpr op, expdesc *e) { - if (op == OPR_MINUS) { - luaK_exp2val(fs, e); - if (e->k == VK && ttisnumber(&fs->f->k[e->info])) - e->info = luaK_numberK(fs, -nvalue(&fs->f->k[e->info])); - else { - luaK_exp2anyreg(fs, e); - freeexp(fs, e); - e->info = luaK_codeABC(fs, OP_UNM, 0, e->info, 0); - e->k = VRELOCABLE; - } - } - else /* op == NOT */ - codenot(fs, e); -} - - -void luaK_infix (FuncState *fs, BinOpr op, expdesc *v) { - switch (op) { - case OPR_AND: { - luaK_goiftrue(fs, v); - luaK_patchtohere(fs, v->t); - v->t = NO_JUMP; - break; - } - case OPR_OR: { - luaK_goiffalse(fs, v); - luaK_patchtohere(fs, v->f); - v->f = NO_JUMP; - break; - } - case OPR_CONCAT: { - luaK_exp2nextreg(fs, v); /* operand must be on the `stack' */ - break; - } - default: { - luaK_exp2RK(fs, v); - break; - } - } -} - - -static void codebinop (FuncState *fs, expdesc *res, BinOpr op, - int o1, int o2) { - if (op <= OPR_POW) { /* arithmetic operator? */ - OpCode opc = cast(OpCode, (op - OPR_ADD) + OP_ADD); /* ORDER OP */ - res->info = luaK_codeABC(fs, opc, 0, o1, o2); - res->k = VRELOCABLE; - } - else { /* test operator */ - static const OpCode ops[] = {OP_EQ, OP_EQ, OP_LT, OP_LE, OP_LT, OP_LE}; - int cond = 1; - if (op >= OPR_GT) { /* `>' or `>='? */ - int temp; /* exchange args and replace by `<' or `<=' */ - temp = o1; o1 = o2; o2 = temp; /* o1 <==> o2 */ - } - else if (op == OPR_NE) cond = 0; - res->info = luaK_condjump(fs, ops[op - OPR_NE], cond, o1, o2); - res->k = VJMP; - } -} - - -void luaK_posfix (FuncState *fs, BinOpr op, expdesc *e1, expdesc *e2) { - switch (op) { - case OPR_AND: { - lua_assert(e1->t == NO_JUMP); /* list must be closed */ - luaK_dischargevars(fs, e2); - luaK_concat(fs, &e1->f, e2->f); - e1->k = e2->k; e1->info = e2->info; e1->aux = e2->aux; e1->t = e2->t; - break; - } - case OPR_OR: { - lua_assert(e1->f == NO_JUMP); /* list must be closed */ - luaK_dischargevars(fs, e2); - luaK_concat(fs, &e1->t, e2->t); - e1->k = e2->k; e1->info = e2->info; e1->aux = e2->aux; e1->f = e2->f; - break; - } - case OPR_CONCAT: { - luaK_exp2val(fs, e2); - if (e2->k == VRELOCABLE && GET_OPCODE(getcode(fs, e2)) == OP_CONCAT) { - lua_assert(e1->info == GETARG_B(getcode(fs, e2))-1); - freeexp(fs, e1); - SETARG_B(getcode(fs, e2), e1->info); - e1->k = e2->k; e1->info = e2->info; - } - else { - luaK_exp2nextreg(fs, e2); - freeexp(fs, e2); - freeexp(fs, e1); - e1->info = luaK_codeABC(fs, OP_CONCAT, 0, e1->info, e2->info); - e1->k = VRELOCABLE; - } - break; - } - default: { - int o1 = luaK_exp2RK(fs, e1); - int o2 = luaK_exp2RK(fs, e2); - freeexp(fs, e2); - freeexp(fs, e1); - codebinop(fs, e1, op, o1, o2); - } - } -} - - -void luaK_fixline (FuncState *fs, int line) { - fs->f->lineinfo[fs->pc - 1] = line; -} - - -int luaK_code (FuncState *fs, Instruction i, int line) { - Proto *f = fs->f; - luaK_dischargejpc(fs); /* `pc' will change */ - /* put new instruction in code array */ - luaM_growvector(fs->L, f->code, fs->pc, f->sizecode, Instruction, - MAX_INT, "code size overflow"); - f->code[fs->pc] = i; - /* save corresponding line information */ - luaM_growvector(fs->L, f->lineinfo, fs->pc, f->sizelineinfo, int, - MAX_INT, "code size overflow"); - f->lineinfo[fs->pc] = line; - return fs->pc++; -} - - -int luaK_codeABC (FuncState *fs, OpCode o, int a, int b, int c) { - lua_assert(getOpMode(o) == iABC); - return luaK_code(fs, CREATE_ABC(o, a, b, c), fs->ls->lastline); -} - - -int luaK_codeABx (FuncState *fs, OpCode o, int a, unsigned int bc) { - lua_assert(getOpMode(o) == iABx || getOpMode(o) == iAsBx); - return luaK_code(fs, CREATE_ABx(o, a, bc), fs->ls->lastline); -} - diff --git a/contrib/lua50/src/lcode.h b/contrib/lua50/src/lcode.h deleted file mode 100644 index 74908c658..000000000 --- a/contrib/lua50/src/lcode.h +++ /dev/null @@ -1,74 +0,0 @@ -/* -** $Id: lcode.h,v 1.38 2002/12/11 12:34:22 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 -*/ -typedef enum BinOpr { - OPR_ADD, OPR_SUB, OPR_MULT, OPR_DIV, OPR_POW, - OPR_CONCAT, - OPR_NE, OPR_EQ, - OPR_LT, OPR_LE, OPR_GT, OPR_GE, - OPR_AND, OPR_OR, - OPR_NOBINOPR -} BinOpr; - -#define binopistest(op) ((op) >= OPR_NE) - -typedef enum UnOpr { OPR_MINUS, OPR_NOT, OPR_NOUNOPR } UnOpr; - - -#define getcode(fs,e) ((fs)->f->code[(e)->info]) - -#define luaK_codeAsBx(fs,o,A,sBx) luaK_codeABx(fs,o,A,(sBx)+MAXARG_sBx) - -int luaK_code (FuncState *fs, Instruction i, int line); -int luaK_codeABx (FuncState *fs, OpCode o, int A, unsigned int Bx); -int luaK_codeABC (FuncState *fs, OpCode o, int A, int B, int C); -void luaK_fixline (FuncState *fs, int line); -void luaK_nil (FuncState *fs, int from, int n); -void luaK_reserveregs (FuncState *fs, int n); -void luaK_checkstack (FuncState *fs, int n); -int luaK_stringK (FuncState *fs, TString *s); -int luaK_numberK (FuncState *fs, lua_Number r); -void luaK_dischargevars (FuncState *fs, expdesc *e); -int luaK_exp2anyreg (FuncState *fs, expdesc *e); -void luaK_exp2nextreg (FuncState *fs, expdesc *e); -void luaK_exp2val (FuncState *fs, expdesc *e); -int luaK_exp2RK (FuncState *fs, expdesc *e); -void luaK_self (FuncState *fs, expdesc *e, expdesc *key); -void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k); -void luaK_goiftrue (FuncState *fs, expdesc *e); -void luaK_goiffalse (FuncState *fs, expdesc *e); -void luaK_storevar (FuncState *fs, expdesc *var, expdesc *e); -void luaK_setcallreturns (FuncState *fs, expdesc *var, int nresults); -int luaK_jump (FuncState *fs); -void luaK_patchlist (FuncState *fs, int list, int target); -void luaK_patchtohere (FuncState *fs, int list); -void luaK_concat (FuncState *fs, int *l1, int l2); -int luaK_getlabel (FuncState *fs); -void luaK_prefix (FuncState *fs, UnOpr op, expdesc *v); -void luaK_infix (FuncState *fs, BinOpr op, expdesc *v); -void luaK_posfix (FuncState *fs, BinOpr op, expdesc *v1, expdesc *v2); - - -#endif diff --git a/contrib/lua50/src/ldebug.c b/contrib/lua50/src/ldebug.c deleted file mode 100644 index 8e511e3bd..000000000 --- a/contrib/lua50/src/ldebug.c +++ /dev/null @@ -1,585 +0,0 @@ -/* -** $Id: ldebug.c,v 1.150 2003/03/19 21:24:04 roberto Exp $ -** Debug Interface -** See Copyright Notice in lua.h -*/ - - -#include -#include - -#define ldebug_c - -#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" - - - -static const char *getfuncname (CallInfo *ci, const char **name); - - -#define isLua(ci) (!((ci)->state & CI_C)) - - -static int currentpc (CallInfo *ci) { - if (!isLua(ci)) return -1; /* function is not a Lua function? */ - if (ci->state & CI_HASFRAME) /* function has a frame? */ - ci->u.l.savedpc = *ci->u.l.pc; /* use `pc' from there */ - /* function's pc is saved */ - return pcRel(ci->u.l.savedpc, ci_func(ci)->l.p); -} - - -static int currentline (CallInfo *ci) { - int pc = currentpc(ci); - if (pc < 0) - return -1; /* only active lua functions have current-line information */ - else - return getline(ci_func(ci)->l.p, pc); -} - - -void luaG_inithooks (lua_State *L) { - CallInfo *ci; - for (ci = L->ci; ci != L->base_ci; ci--) /* update all `savedpc's */ - currentpc(ci); - L->hookinit = 1; -} - - -/* -** 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; - } - L->hook = func; - L->basehookcount = count; - resethookcount(L); - L->hookmask = cast(lu_byte, mask); - L->hookinit = 0; - 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; - lua_lock(L); - for (ci = L->ci; level > 0 && ci > L->base_ci; ci--) { - level--; - if (!(ci->state & CI_C)) /* Lua function? */ - level -= ci->u.l.tailcalls; /* skip lost tail calls */ - } - if (level > 0 || ci == L->base_ci) status = 0; /* there is no such level */ - else if (level < 0) { /* level is of a lost tail call */ - status = 1; - ar->i_ci = 0; - } - else { - status = 1; - ar->i_ci = ci - L->base_ci; - } - lua_unlock(L); - return status; -} - - -static Proto *getluaproto (CallInfo *ci) { - return (isLua(ci) ? ci_func(ci)->l.p : NULL); -} - - -LUA_API const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n) { - const char *name; - CallInfo *ci; - Proto *fp; - lua_lock(L); - name = NULL; - ci = L->base_ci + ar->i_ci; - fp = getluaproto(ci); - if (fp) { /* is a Lua function? */ - name = luaF_getlocalname(fp, n, currentpc(ci)); - if (name) - luaA_pushobject(L, ci->base+(n-1)); /* push value */ - } - lua_unlock(L); - return name; -} - - -LUA_API const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n) { - const char *name; - CallInfo *ci; - Proto *fp; - lua_lock(L); - name = NULL; - ci = L->base_ci + ar->i_ci; - fp = getluaproto(ci); - L->top--; /* pop new value */ - if (fp) { /* is a Lua function? */ - name = luaF_getlocalname(fp, n, currentpc(ci)); - if (!name || name[0] == '(') /* `(' starts private locals */ - name = NULL; - else - setobjs2s(ci->base+(n-1), L->top); - } - lua_unlock(L); - return name; -} - - -static void funcinfo (lua_Debug *ar, StkId func) { - Closure *cl = clvalue(func); - if (cl->c.isC) { - ar->source = "=[C]"; - ar->linedefined = -1; - ar->what = "C"; - } - else { - ar->source = getstr(cl->l.p->source); - ar->linedefined = cl->l.p->lineDefined; - ar->what = (ar->linedefined == 0) ? "main" : "Lua"; - } - luaO_chunkid(ar->short_src, ar->source, LUA_IDSIZE); -} - - -static const char *travglobals (lua_State *L, const TObject *o) { - Table *g = hvalue(gt(L)); - int i = sizenode(g); - while (i--) { - Node *n = gnode(g, i); - if (luaO_rawequalObj(o, gval(n)) && ttisstring(gkey(n))) - return getstr(tsvalue(gkey(n))); - } - return NULL; -} - - -static void info_tailcall (lua_State *L, lua_Debug *ar) { - ar->name = ar->namewhat = ""; - ar->what = "tail"; - ar->linedefined = ar->currentline = -1; - ar->source = "=(tail call)"; - luaO_chunkid(ar->short_src, ar->source, LUA_IDSIZE); - ar->nups = 0; - setnilvalue(L->top); -} - - -static int auxgetinfo (lua_State *L, const char *what, lua_Debug *ar, - StkId f, CallInfo *ci) { - int status = 1; - for (; *what; what++) { - switch (*what) { - case 'S': { - funcinfo(ar, f); - break; - } - case 'l': { - ar->currentline = (ci) ? currentline(ci) : -1; - break; - } - case 'u': { - ar->nups = clvalue(f)->c.nupvalues; - break; - } - case 'n': { - ar->namewhat = (ci) ? getfuncname(ci, &ar->name) : NULL; - if (ar->namewhat == NULL) { - /* try to find a global name */ - if ((ar->name = travglobals(L, f)) != NULL) - ar->namewhat = "global"; - else ar->namewhat = ""; /* not found */ - } - break; - } - case 'f': { - setobj2s(L->top, f); - break; - } - default: status = 0; /* invalid option */ - } - } - return status; -} - - -LUA_API int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar) { - int status = 1; - lua_lock(L); - if (*what == '>') { - StkId f = L->top - 1; - if (!ttisfunction(f)) - luaG_runerror(L, "value for `lua_getinfo' is not a function"); - status = auxgetinfo(L, what + 1, ar, f, NULL); - L->top--; /* pop function */ - } - else if (ar->i_ci != 0) { /* no tail call? */ - CallInfo *ci = L->base_ci + ar->i_ci; - lua_assert(ttisfunction(ci->base - 1)); - status = auxgetinfo(L, what, ar, ci->base - 1, ci); - } - else - info_tailcall(L, ar); - if (strchr(what, 'f')) incr_top(L); - lua_unlock(L); - return status; -} - - -/* -** {====================================================== -** Symbolic Execution and code checker -** ======================================================= -*/ - -#define check(x) if (!(x)) return 0; - -#define checkjump(pt,pc) check(0 <= pc && pc < pt->sizecode) - -#define checkreg(pt,reg) check((reg) < (pt)->maxstacksize) - - - -static int precheck (const Proto *pt) { - check(pt->maxstacksize <= MAXSTACK); - check(pt->sizelineinfo == pt->sizecode || pt->sizelineinfo == 0); - lua_assert(pt->numparams+pt->is_vararg <= pt->maxstacksize); - check(GET_OPCODE(pt->code[pt->sizecode-1]) == OP_RETURN); - return 1; -} - - -static int checkopenop (const Proto *pt, int pc) { - Instruction i = pt->code[pc+1]; - switch (GET_OPCODE(i)) { - case OP_CALL: - case OP_TAILCALL: - case OP_RETURN: { - check(GETARG_B(i) == 0); - return 1; - } - case OP_SETLISTO: return 1; - default: return 0; /* invalid instruction after an open call */ - } -} - - -static int checkRK (const Proto *pt, int r) { - return (r < pt->maxstacksize || (r >= MAXSTACK && r-MAXSTACK < pt->sizek)); -} - - -static Instruction luaG_symbexec (const Proto *pt, int lastpc, int reg) { - int pc; - int last; /* stores position of last instruction that changed `reg' */ - last = pt->sizecode-1; /* points to final return (a `neutral' instruction) */ - check(precheck(pt)); - for (pc = 0; pc < lastpc; pc++) { - const Instruction i = pt->code[pc]; - OpCode op = GET_OPCODE(i); - int a = GETARG_A(i); - int b = 0; - int c = 0; - checkreg(pt, a); - switch (getOpMode(op)) { - case iABC: { - b = GETARG_B(i); - c = GETARG_C(i); - if (testOpMode(op, OpModeBreg)) { - checkreg(pt, b); - } - else if (testOpMode(op, OpModeBrk)) - check(checkRK(pt, b)); - if (testOpMode(op, OpModeCrk)) - check(checkRK(pt, c)); - break; - } - case iABx: { - b = GETARG_Bx(i); - if (testOpMode(op, OpModeK)) check(b < pt->sizek); - break; - } - case iAsBx: { - b = GETARG_sBx(i); - break; - } - } - if (testOpMode(op, OpModesetA)) { - if (a == reg) last = pc; /* change register `a' */ - } - if (testOpMode(op, OpModeT)) { - check(pc+2 < pt->sizecode); /* check skip */ - check(GET_OPCODE(pt->code[pc+1]) == OP_JMP); - } - switch (op) { - case OP_LOADBOOL: { - check(c == 0 || pc+2 < pt->sizecode); /* check its jump */ - break; - } - case OP_LOADNIL: { - if (a <= reg && reg <= b) - last = pc; /* set registers from `a' to `b' */ - break; - } - case OP_GETUPVAL: - case OP_SETUPVAL: { - check(b < pt->nups); - break; - } - case OP_GETGLOBAL: - case OP_SETGLOBAL: { - check(ttisstring(&pt->k[b])); - break; - } - case OP_SELF: { - checkreg(pt, a+1); - if (reg == a+1) last = pc; - break; - } - case OP_CONCAT: { - /* `c' is a register, and at least two operands */ - check(c < MAXSTACK && b < c); - break; - } - case OP_TFORLOOP: - checkreg(pt, a+c+5); - if (reg >= a) last = pc; /* affect all registers above base */ - /* go through */ - case OP_FORLOOP: - checkreg(pt, a+2); - /* go through */ - case OP_JMP: { - int dest = pc+1+b; - check(0 <= dest && dest < pt->sizecode); - /* not full check and jump is forward and do not skip `lastpc'? */ - if (reg != NO_REG && pc < dest && dest <= lastpc) - pc += b; /* do the jump */ - break; - } - case OP_CALL: - case OP_TAILCALL: { - if (b != 0) { - checkreg(pt, a+b-1); - } - c--; /* c = num. returns */ - if (c == LUA_MULTRET) { - check(checkopenop(pt, pc)); - } - else if (c != 0) - checkreg(pt, a+c-1); - if (reg >= a) last = pc; /* affect all registers above base */ - break; - } - case OP_RETURN: { - b--; /* b = num. returns */ - if (b > 0) checkreg(pt, a+b-1); - break; - } - case OP_SETLIST: { - checkreg(pt, a + (b&(LFIELDS_PER_FLUSH-1)) + 1); - break; - } - case OP_CLOSURE: { - int nup; - check(b < pt->sizep); - nup = pt->p[b]->nups; - check(pc + nup < pt->sizecode); - for (; nup>0; nup--) { - OpCode op1 = GET_OPCODE(pt->code[pc+nup]); - check(op1 == OP_GETUPVAL || op1 == OP_MOVE); - } - break; - } - default: break; - } - } - return pt->code[last]; -} - -#undef check -#undef checkjump -#undef checkreg - -/* }====================================================== */ - - -int luaG_checkcode (const Proto *pt) { - return luaG_symbexec(pt, pt->sizecode, NO_REG); -} - - -static const char *kname (Proto *p, int c) { - c = c - MAXSTACK; - if (c >= 0 && ttisstring(&p->k[c])) - return svalue(&p->k[c]); - else - return "?"; -} - - -static const char *getobjname (CallInfo *ci, int stackpos, const char **name) { - if (isLua(ci)) { /* a Lua function? */ - Proto *p = ci_func(ci)->l.p; - int pc = currentpc(ci); - Instruction i; - *name = luaF_getlocalname(p, stackpos+1, pc); - if (*name) /* is a local? */ - return "local"; - i = luaG_symbexec(p, pc, stackpos); /* try symbolic execution */ - lua_assert(pc != -1); - switch (GET_OPCODE(i)) { - case OP_GETGLOBAL: { - int g = GETARG_Bx(i); /* global index */ - lua_assert(ttisstring(&p->k[g])); - *name = svalue(&p->k[g]); - return "global"; - } - case OP_MOVE: { - int a = GETARG_A(i); - int b = GETARG_B(i); /* move from `b' to `a' */ - if (b < a) - return getobjname(ci, b, name); /* get name for `b' */ - break; - } - case OP_GETTABLE: { - int k = GETARG_C(i); /* key index */ - *name = kname(p, k); - return "field"; - } - case OP_SELF: { - int k = GETARG_C(i); /* key index */ - *name = kname(p, k); - return "method"; - } - default: break; - } - } - return NULL; /* no useful name found */ -} - - -static const char *getfuncname (CallInfo *ci, const char **name) { - Instruction i; - if ((isLua(ci) && ci->u.l.tailcalls > 0) || !isLua(ci - 1)) - return NULL; /* calling function is not Lua (or is unknown) */ - ci--; /* calling function */ - i = ci_func(ci)->l.p->code[currentpc(ci)]; - if (GET_OPCODE(i) == OP_CALL || GET_OPCODE(i) == OP_TAILCALL) - return getobjname(ci, GETARG_A(i), name); - else - return NULL; /* no useful name can be found */ -} - - -/* only ANSI way to check whether a pointer points to an array */ -static int isinstack (CallInfo *ci, const TObject *o) { - StkId p; - for (p = ci->base; p < ci->top; p++) - if (o == p) return 1; - return 0; -} - - -void luaG_typeerror (lua_State *L, const TObject *o, const char *op) { - const char *name = NULL; - const char *t = luaT_typenames[ttype(o)]; - const char *kind = (isinstack(L->ci, o)) ? - getobjname(L->ci, o - L->base, &name) : NULL; - if (kind) - luaG_runerror(L, "attempt to %s %s `%s' (a %s value)", - op, kind, name, t); - else - luaG_runerror(L, "attempt to %s a %s value", op, t); -} - - -void luaG_concaterror (lua_State *L, StkId p1, StkId p2) { - if (ttisstring(p1)) p1 = p2; - lua_assert(!ttisstring(p1)); - luaG_typeerror(L, p1, "concatenate"); -} - - -void luaG_aritherror (lua_State *L, const TObject *p1, const TObject *p2) { - TObject temp; - if (luaV_tonumber(p1, &temp) == NULL) - p2 = p1; /* first operand is wrong */ - luaG_typeerror(L, p2, "perform arithmetic on"); -} - - -int luaG_ordererror (lua_State *L, const TObject *p1, const TObject *p2) { - const char *t1 = luaT_typenames[ttype(p1)]; - const char *t2 = luaT_typenames[ttype(p2)]; - if (t1[2] == t2[2]) - luaG_runerror(L, "attempt to compare two %s values", t1); - else - luaG_runerror(L, "attempt to compare %s with %s", t1, t2); - return 0; -} - - -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); - luaO_chunkid(buff, getstr(getluaproto(ci)->source), LUA_IDSIZE); - luaO_pushfstring(L, "%s:%d: %s", buff, line, msg); - } -} - - -void 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->top, L->top - 1); /* move argument */ - setobjs2s(L->top - 1, errfunc); /* push function */ - incr_top(L); - luaD_call(L, L->top - 2, 1); /* call it */ - } - luaD_throw(L, LUA_ERRRUN); -} - - -void 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/contrib/lua50/src/ldebug.h b/contrib/lua50/src/ldebug.h deleted file mode 100644 index 7ff395839..000000000 --- a/contrib/lua50/src/ldebug.h +++ /dev/null @@ -1,31 +0,0 @@ -/* -** $Id: ldebug.h,v 1.32 2002/11/18 11:01:55 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 getline(f,pc) (((f)->lineinfo) ? (f)->lineinfo[pc] : 0) - -#define resethookcount(L) (L->hookcount = L->basehookcount) - - -void luaG_inithooks (lua_State *L); -void luaG_typeerror (lua_State *L, const TObject *o, const char *opname); -void luaG_concaterror (lua_State *L, StkId p1, StkId p2); -void luaG_aritherror (lua_State *L, const TObject *p1, const TObject *p2); -int luaG_ordererror (lua_State *L, const TObject *p1, const TObject *p2); -void luaG_runerror (lua_State *L, const char *fmt, ...); -void luaG_errormsg (lua_State *L); -int luaG_checkcode (const Proto *pt); - - -#endif diff --git a/contrib/lua50/src/ldo.c b/contrib/lua50/src/ldo.c deleted file mode 100644 index a6d344cd5..000000000 --- a/contrib/lua50/src/ldo.c +++ /dev/null @@ -1,471 +0,0 @@ -/* -** $Id: ldo.c,v 1.217a 2003/04/03 13:35:34 roberto Exp $ -** Stack and Call structure of Lua -** See Copyright Notice in lua.h -*/ - - -#include -#include -#include - -#define ldo_c - -#include "lua.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 (based on long jumps) -** ======================================================= -*/ - - -/* chain list of long jump buffers */ -struct lua_longjmp { - struct lua_longjmp *previous; - jmp_buf b; - volatile int status; /* error code */ -}; - - -static void seterrorobj (lua_State *L, int errcode, StkId oldtop) { - switch (errcode) { - case LUA_ERRMEM: { - setsvalue2s(oldtop, luaS_new(L, MEMERRMSG)); - break; - } - case LUA_ERRERR: { - setsvalue2s(oldtop, luaS_new(L, "error in error handling")); - break; - } - case LUA_ERRSYNTAX: - case LUA_ERRRUN: { - setobjs2s(oldtop, L->top - 1); /* error message on current top */ - break; - } - } - L->top = oldtop + 1; -} - - -void luaD_throw (lua_State *L, int errcode) { - if (L->errorJmp) { - L->errorJmp->status = errcode; - longjmp(L->errorJmp->b, 1); - } - else { - G(L)->panic(L); - exit(EXIT_FAILURE); - } -} - - -int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud) { - struct lua_longjmp lj; - lj.status = 0; - lj.previous = L->errorJmp; /* chain new error handler */ - L->errorJmp = &lj; - if (setjmp(lj.b) == 0) - (*f)(L, ud); - L->errorJmp = lj.previous; /* restore old error handler */ - return lj.status; -} - - -static void restore_stack_limit (lua_State *L) { - L->stack_last = L->stack+L->stacksize-1; - if (L->size_ci > LUA_MAXCALLS) { /* there was an overflow? */ - int inuse = (L->ci - L->base_ci); - if (inuse + 1 < LUA_MAXCALLS) /* can `undo' overflow? */ - luaD_reallocCI(L, LUA_MAXCALLS); - } -} - -/* }====================================================== */ - - -static void correctstack (lua_State *L, TObject *oldstack) { - CallInfo *ci; - GCObject *up; - L->top = (L->top - oldstack) + L->stack; - for (up = L->openupval; up != NULL; up = up->gch.next) - gcotouv(up)->v = (gcotouv(up)->v - oldstack) + L->stack; - for (ci = L->base_ci; ci <= L->ci; ci++) { - ci->top = (ci->top - oldstack) + L->stack; - ci->base = (ci->base - oldstack) + L->stack; - } - L->base = L->ci->base; -} - - -void luaD_reallocstack (lua_State *L, int newsize) { - TObject *oldstack = L->stack; - luaM_reallocvector(L, L->stack, L->stacksize, newsize, TObject); - L->stacksize = newsize; - L->stack_last = L->stack+newsize-1-EXTRA_STACK; - correctstack(L, oldstack); -} - - -void luaD_reallocCI (lua_State *L, int newsize) { - CallInfo *oldci = L->base_ci; - luaM_reallocvector(L, L->base_ci, L->size_ci, newsize, CallInfo); - L->size_ci = cast(unsigned short, newsize); - L->ci = (L->ci - oldci) + L->base_ci; - L->end_ci = L->base_ci + L->size_ci; -} - - -void luaD_growstack (lua_State *L, int n) { - if (n <= L->stacksize) /* double size is enough? */ - luaD_reallocstack(L, 2*L->stacksize); - else - luaD_reallocstack(L, L->stacksize + n + EXTRA_STACK); -} - - -static void luaD_growCI (lua_State *L) { - if (L->size_ci > LUA_MAXCALLS) /* overflow while handling overflow? */ - luaD_throw(L, LUA_ERRERR); - else { - luaD_reallocCI(L, 2*L->size_ci); - if (L->size_ci > LUA_MAXCALLS) - luaG_runerror(L, "stack overflow"); - } -} - - -void luaD_callhook (lua_State *L, int event, int line) { - lua_Hook hook = L->hook; - if (hook && L->allowhook) { - ptrdiff_t top = savestack(L, L->top); - ptrdiff_t ci_top = savestack(L, L->ci->top); - lua_Debug ar; - ar.event = event; - ar.currentline = line; - if (event == LUA_HOOKTAILRET) - ar.i_ci = 0; /* tail call; no debug information about it */ - else - ar.i_ci = L->ci - L->base_ci; - luaD_checkstack(L, LUA_MINSTACK); /* ensure minimum stack size */ - L->ci->top = L->top + LUA_MINSTACK; - L->allowhook = 0; /* cannot call hooks inside a hook */ - lua_unlock(L); - (*hook)(L, &ar); - lua_lock(L); - lua_assert(!L->allowhook); - L->allowhook = 1; - L->ci->top = restorestack(L, ci_top); - L->top = restorestack(L, top); - } -} - - -static void adjust_varargs (lua_State *L, int nfixargs, StkId base) { - int i; - Table *htab; - TObject nname; - int actual = L->top - base; /* actual number of arguments */ - if (actual < nfixargs) { - luaD_checkstack(L, nfixargs - actual); - for (; actual < nfixargs; ++actual) - setnilvalue(L->top++); - } - actual -= nfixargs; /* number of extra arguments */ - htab = luaH_new(L, actual, 1); /* create `arg' table */ - for (i=0; itop - actual + i); - /* store counter in field `n' */ - setsvalue(&nname, luaS_newliteral(L, "n")); - setnvalue(luaH_set(L, htab, &nname), cast(lua_Number, actual)); - L->top -= actual; /* remove extra elements from the stack */ - sethvalue(L->top, htab); - incr_top(L); -} - - -static StkId tryfuncTM (lua_State *L, StkId func) { - const TObject *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(p, p-1); - incr_top(L); - func = restorestack(L, funcr); /* previous call may change stack */ - setobj2s(func, tm); /* tag method is the new function to be called */ - return func; -} - - -StkId luaD_precall (lua_State *L, StkId func) { - LClosure *cl; - ptrdiff_t funcr = savestack(L, func); - if (!ttisfunction(func)) /* `func' is not a function? */ - func = tryfuncTM(L, func); /* check the `function' tag method */ - if (L->ci + 1 == L->end_ci) luaD_growCI(L); - else condhardstacktests(luaD_reallocCI(L, L->size_ci)); - cl = &clvalue(func)->l; - if (!cl->isC) { /* Lua function? prepare its call */ - CallInfo *ci; - Proto *p = cl->p; - if (p->is_vararg) /* varargs? */ - adjust_varargs(L, p->numparams, func+1); - luaD_checkstack(L, p->maxstacksize); - ci = ++L->ci; /* now `enter' new function */ - L->base = L->ci->base = restorestack(L, funcr) + 1; - ci->top = L->base + p->maxstacksize; - ci->u.l.savedpc = p->code; /* starting point */ - ci->u.l.tailcalls = 0; - ci->state = CI_SAVEDPC; - while (L->top < ci->top) - setnilvalue(L->top++); - L->top = ci->top; - return NULL; - } - else { /* if is a C function, call it */ - CallInfo *ci; - int n; - luaD_checkstack(L, LUA_MINSTACK); /* ensure minimum stack size */ - ci = ++L->ci; /* now `enter' new function */ - L->base = L->ci->base = restorestack(L, funcr) + 1; - ci->top = L->top + LUA_MINSTACK; - ci->state = CI_C; /* a C function */ - if (L->hookmask & LUA_MASKCALL) - luaD_callhook(L, LUA_HOOKCALL, -1); - lua_unlock(L); -#ifdef LUA_COMPATUPVALUES - lua_pushupvalues(L); -#endif - n = (*clvalue(L->base - 1)->c.f)(L); /* do the actual call */ - lua_lock(L); - return L->top - n; - } -} - - -static StkId callrethooks (lua_State *L, StkId firstResult) { - ptrdiff_t fr = savestack(L, firstResult); /* next call may change stack */ - luaD_callhook(L, LUA_HOOKRET, -1); - if (!(L->ci->state & CI_C)) { /* Lua function? */ - while (L->ci->u.l.tailcalls--) /* call hook for eventual tail calls */ - luaD_callhook(L, LUA_HOOKTAILRET, -1); - } - return restorestack(L, fr); -} - - -void luaD_poscall (lua_State *L, int wanted, StkId firstResult) { - StkId res; - if (L->hookmask & LUA_MASKRET) - firstResult = callrethooks(L, firstResult); - res = L->base - 1; /* res == final position of 1st result */ - L->ci--; - L->base = L->ci->base; /* restore base */ - /* move results to correct place */ - while (wanted != 0 && firstResult < L->top) { - setobjs2s(res++, firstResult++); - wanted--; - } - while (wanted-- > 0) - setnilvalue(res++); - L->top = res; -} - - -/* -** 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) { - StkId firstResult; - lua_assert(!(L->ci->state & CI_CALLING)); - if (++L->nCcalls >= LUA_MAXCCALLS) { - if (L->nCcalls == LUA_MAXCCALLS) - luaG_runerror(L, "C stack overflow"); - else if (L->nCcalls >= (LUA_MAXCCALLS + (LUA_MAXCCALLS>>3))) - luaD_throw(L, LUA_ERRERR); /* error while handing stack error */ - } - firstResult = luaD_precall(L, func); - if (firstResult == NULL) /* is a Lua function? */ - firstResult = luaV_execute(L); /* call it */ - luaD_poscall(L, nResults, firstResult); - L->nCcalls--; - luaC_checkGC(L); -} - - -static void resume (lua_State *L, void *ud) { - StkId firstResult; - int nargs = *cast(int *, ud); - CallInfo *ci = L->ci; - if (ci == L->base_ci) { /* no activation record? */ - lua_assert(nargs < L->top - L->base); - luaD_precall(L, L->top - (nargs + 1)); /* start coroutine */ - } - else { /* inside a yield */ - lua_assert(ci->state & CI_YIELD); - if (ci->state & CI_C) { /* `common' yield? */ - /* finish interrupted execution of `OP_CALL' */ - int nresults; - lua_assert((ci-1)->state & CI_SAVEDPC); - lua_assert(GET_OPCODE(*((ci-1)->u.l.savedpc - 1)) == OP_CALL || - GET_OPCODE(*((ci-1)->u.l.savedpc - 1)) == OP_TAILCALL); - nresults = GETARG_C(*((ci-1)->u.l.savedpc - 1)) - 1; - luaD_poscall(L, nresults, L->top - nargs); /* complete it */ - if (nresults >= 0) L->top = L->ci->top; - } - else { /* yielded inside a hook: just continue its execution */ - ci->state &= ~CI_YIELD; - } - } - firstResult = luaV_execute(L); - if (firstResult != NULL) /* return? */ - luaD_poscall(L, LUA_MULTRET, firstResult); /* finalize this coroutine */ -} - - -static int resume_error (lua_State *L, const char *msg) { - L->top = L->ci->base; - setsvalue2s(L->top, luaS_new(L, msg)); - incr_top(L); - lua_unlock(L); - return LUA_ERRRUN; -} - - -LUA_API int lua_resume (lua_State *L, int nargs) { - int status; - lu_byte old_allowhooks; - lua_lock(L); - if (L->ci == L->base_ci) { - if (nargs >= L->top - L->base) - return resume_error(L, "cannot resume dead coroutine"); - } - else if (!(L->ci->state & CI_YIELD)) /* not inside a yield? */ - return resume_error(L, "cannot resume non-suspended coroutine"); - old_allowhooks = L->allowhook; - lua_assert(L->errfunc == 0 && L->nCcalls == 0); - status = luaD_rawrunprotected(L, resume, &nargs); - if (status != 0) { /* error? */ - L->ci = L->base_ci; /* go back to initial level */ - L->base = L->ci->base; - L->nCcalls = 0; - luaF_close(L, L->base); /* close eventual pending closures */ - seterrorobj(L, status, L->base); - L->allowhook = old_allowhooks; - restore_stack_limit(L); - } - lua_unlock(L); - return status; -} - - -LUA_API int lua_yield (lua_State *L, int nresults) { - CallInfo *ci; - lua_lock(L); - ci = L->ci; - if (L->nCcalls > 0) - luaG_runerror(L, "attempt to yield across metamethod/C-call boundary"); - if (ci->state & CI_C) { /* usual yield */ - if ((ci-1)->state & CI_C) - luaG_runerror(L, "cannot yield a C function"); - if (L->top - nresults > L->base) { /* is there garbage in the stack? */ - int i; - for (i=0; ibase + i, L->top - nresults + i); - L->top = L->base + nresults; - } - } /* else it's an yield inside a hook: nothing to do */ - ci->state |= CI_YIELD; - lua_unlock(L); - return -1; -} - - -int luaD_pcall (lua_State *L, Pfunc func, void *u, - ptrdiff_t old_top, ptrdiff_t ef) { - int status; - unsigned short oldnCcalls = L->nCcalls; - ptrdiff_t old_ci = saveci(L, L->ci); - lu_byte old_allowhooks = L->allowhook; - ptrdiff_t old_errfunc = L->errfunc; - L->errfunc = ef; - status = luaD_rawrunprotected(L, func, u); - if (status != 0) { /* an error occurred? */ - StkId oldtop = restorestack(L, old_top); - luaF_close(L, oldtop); /* close eventual pending closures */ - seterrorobj(L, status, oldtop); - L->nCcalls = oldnCcalls; - L->ci = restoreci(L, old_ci); - L->base = L->ci->base; - L->allowhook = old_allowhooks; - restore_stack_limit(L); - } - L->errfunc = old_errfunc; - return status; -} - - - -/* -** Execute a protected parser. -*/ -struct SParser { /* data to `f_parser' */ - ZIO *z; - Mbuffer buff; /* buffer to be used by the scanner */ - int bin; -}; - -static void f_parser (lua_State *L, void *ud) { - struct SParser *p; - Proto *tf; - Closure *cl; - luaC_checkGC(L); - p = cast(struct SParser *, ud); - tf = p->bin ? luaU_undump(L, p->z, &p->buff) : luaY_parser(L, p->z, &p->buff); - cl = luaF_newLclosure(L, 0, gt(L)); - cl->l.p = tf; - setclvalue(L->top, cl); - incr_top(L); -} - - -int luaD_protectedparser (lua_State *L, ZIO *z, int bin) { - struct SParser p; - int status; - ptrdiff_t oldtopr = savestack(L, L->top); /* save current top */ - p.z = z; p.bin = bin; - luaZ_initbuffer(L, &p.buff); - status = luaD_rawrunprotected(L, f_parser, &p); - luaZ_freebuffer(L, &p.buff); - if (status != 0) { /* error? */ - StkId oldtop = restorestack(L, oldtopr); - seterrorobj(L, status, oldtop); - } - return status; -} - - diff --git a/contrib/lua50/src/ldo.h b/contrib/lua50/src/ldo.h deleted file mode 100644 index 2a61bf5bb..000000000 --- a/contrib/lua50/src/ldo.h +++ /dev/null @@ -1,60 +0,0 @@ -/* -** $Id: ldo.h,v 1.56 2002/12/04 17:29:32 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" - - -/* -** macro to control inclusion of some hard tests on stack reallocation -*/ -#ifndef HARDSTACKTESTS -#define condhardstacktests(x) { /* empty */ } -#else -#define condhardstacktests(x) x -#endif - - -#define luaD_checkstack(L,n) \ - if ((char *)L->stack_last - (char *)L->top <= (n)*(int)sizeof(TObject)) \ - luaD_growstack(L, n); \ - else condhardstacktests(luaD_reallocstack(L, L->stacksize)); - - -#define incr_top(L) {luaD_checkstack(L,1); L->top++;} - -#define savestack(L,p) ((char *)(p) - (char *)L->stack) -#define restorestack(L,n) ((TObject *)((char *)L->stack + (n))) - -#define saveci(L,p) ((char *)(p) - (char *)L->base_ci) -#define restoreci(L,n) ((CallInfo *)((char *)L->base_ci + (n))) - - -/* type of protected functions, to be ran by `runprotected' */ -typedef void (*Pfunc) (lua_State *L, void *ud); - -void luaD_resetprotection (lua_State *L); -int luaD_protectedparser (lua_State *L, ZIO *z, int bin); -void luaD_callhook (lua_State *L, int event, int line); -StkId luaD_precall (lua_State *L, StkId func); -void luaD_call (lua_State *L, StkId func, int nResults); -int luaD_pcall (lua_State *L, Pfunc func, void *u, - ptrdiff_t oldtop, ptrdiff_t ef); -void luaD_poscall (lua_State *L, int wanted, StkId firstResult); -void luaD_reallocCI (lua_State *L, int newsize); -void luaD_reallocstack (lua_State *L, int newsize); -void luaD_growstack (lua_State *L, int n); - -void luaD_throw (lua_State *L, int errcode); -int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud); - - -#endif diff --git a/contrib/lua50/src/ldump.c b/contrib/lua50/src/ldump.c deleted file mode 100644 index 234b011f5..000000000 --- a/contrib/lua50/src/ldump.c +++ /dev/null @@ -1,170 +0,0 @@ -/* -** $Id: ldump.c,v 1.4 2003/02/11 23:52:12 lhf Exp $ -** save bytecodes -** See Copyright Notice in lua.h -*/ - -#include - -#define ldump_c - -#include "lua.h" - -#include "lobject.h" -#include "lopcodes.h" -#include "lstate.h" -#include "lundump.h" - -#define DumpVector(b,n,size,D) DumpBlock(b,(n)*(size),D) -#define DumpLiteral(s,D) DumpBlock("" s,(sizeof(s))-1,D) - -typedef struct { - lua_State* L; - lua_Chunkwriter write; - void* data; -} DumpState; - -static void DumpBlock(const void* b, size_t size, DumpState* D) -{ - lua_unlock(D->L); - (*D->write)(D->L,b,size,D->data); - lua_lock(D->L); -} - -static void DumpByte(int y, DumpState* D) -{ - char x=(char)y; - DumpBlock(&x,sizeof(x),D); -} - -static void DumpInt(int x, DumpState* D) -{ - DumpBlock(&x,sizeof(x),D); -} - -static void DumpSize(size_t x, DumpState* D) -{ - DumpBlock(&x,sizeof(x),D); -} - -static void DumpNumber(lua_Number x, DumpState* D) -{ - DumpBlock(&x,sizeof(x),D); -} - -static void DumpString(TString* s, DumpState* D) -{ - if (s==NULL || getstr(s)==NULL) - DumpSize(0,D); - else - { - size_t size=s->tsv.len+1; /* include trailing '\0' */ - DumpSize(size,D); - DumpBlock(getstr(s),size,D); - } -} - -static void DumpCode(const Proto* f, DumpState* D) -{ - DumpInt(f->sizecode,D); - DumpVector(f->code,f->sizecode,sizeof(*f->code),D); -} - -static void DumpLocals(const Proto* f, DumpState* D) -{ - int i,n=f->sizelocvars; - DumpInt(n,D); - for (i=0; ilocvars[i].varname,D); - DumpInt(f->locvars[i].startpc,D); - DumpInt(f->locvars[i].endpc,D); - } -} - -static void DumpLines(const Proto* f, DumpState* D) -{ - DumpInt(f->sizelineinfo,D); - DumpVector(f->lineinfo,f->sizelineinfo,sizeof(*f->lineinfo),D); -} - -static void DumpUpvalues(const Proto* f, DumpState* D) -{ - int i,n=f->sizeupvalues; - DumpInt(n,D); - for (i=0; iupvalues[i],D); -} - -static void DumpFunction(const Proto* f, const TString* p, DumpState* D); - -static void DumpConstants(const Proto* f, DumpState* D) -{ - int i,n; - DumpInt(n=f->sizek,D); - for (i=0; ik[i]; - DumpByte(ttype(o),D); - switch (ttype(o)) - { - case LUA_TNUMBER: - DumpNumber(nvalue(o),D); - break; - case LUA_TSTRING: - DumpString(tsvalue(o),D); - break; - case LUA_TNIL: - break; - default: - lua_assert(0); /* cannot happen */ - break; - } - } - DumpInt(n=f->sizep,D); - for (i=0; ip[i],f->source,D); -} - -static void DumpFunction(const Proto* f, const TString* p, DumpState* D) -{ - DumpString((f->source==p) ? NULL : f->source,D); - DumpInt(f->lineDefined,D); - DumpByte(f->nups,D); - DumpByte(f->numparams,D); - DumpByte(f->is_vararg,D); - DumpByte(f->maxstacksize,D); - DumpLines(f,D); - DumpLocals(f,D); - DumpUpvalues(f,D); - DumpConstants(f,D); - DumpCode(f,D); -} - -static void DumpHeader(DumpState* D) -{ - DumpLiteral(LUA_SIGNATURE,D); - DumpByte(VERSION,D); - DumpByte(luaU_endianness(),D); - DumpByte(sizeof(int),D); - DumpByte(sizeof(size_t),D); - DumpByte(sizeof(Instruction),D); - DumpByte(SIZE_OP,D); - DumpByte(SIZE_A,D); - DumpByte(SIZE_B,D); - DumpByte(SIZE_C,D); - DumpByte(sizeof(lua_Number),D); - DumpNumber(TEST_NUMBER,D); -} - -/* -** dump function as precompiled chunk -*/ -void luaU_dump (lua_State* L, const Proto* Main, lua_Chunkwriter w, void* data) -{ - DumpState D; - D.L=L; - D.write=w; - D.data=data; - DumpHeader(&D); - DumpFunction(Main,NULL,&D); -} - diff --git a/contrib/lua50/src/lfunc.c b/contrib/lua50/src/lfunc.c deleted file mode 100644 index 97c5d9bbd..000000000 --- a/contrib/lua50/src/lfunc.c +++ /dev/null @@ -1,127 +0,0 @@ -/* -** $Id: lfunc.c,v 1.67a 2003/03/18 12:50:04 roberto Exp $ -** Auxiliary functions to manipulate prototypes and closures -** See Copyright Notice in lua.h -*/ - - -#include - -#define lfunc_c - -#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 nelems) { - Closure *c = cast(Closure *, luaM_malloc(L, sizeCclosure(nelems))); - luaC_link(L, valtogco(c), LUA_TFUNCTION); - c->c.isC = 1; - c->c.nupvalues = cast(lu_byte, nelems); - return c; -} - - -Closure *luaF_newLclosure (lua_State *L, int nelems, TObject *e) { - Closure *c = cast(Closure *, luaM_malloc(L, sizeLclosure(nelems))); - luaC_link(L, valtogco(c), LUA_TFUNCTION); - c->l.isC = 0; - c->l.g = *e; - c->l.nupvalues = cast(lu_byte, nelems); - return c; -} - - -UpVal *luaF_findupval (lua_State *L, StkId level) { - GCObject **pp = &L->openupval; - UpVal *p; - UpVal *v; - while ((p = ngcotouv(*pp)) != NULL && p->v >= level) { - if (p->v == level) return p; - pp = &p->next; - } - v = luaM_new(L, UpVal); /* not found: create a new one */ - v->tt = LUA_TUPVAL; - v->marked = 1; /* open upvalues should not be collected */ - v->v = level; /* current value lives in the stack */ - v->next = *pp; /* chain it in the proper position */ - *pp = valtogco(v); - return v; -} - - -void luaF_close (lua_State *L, StkId level) { - UpVal *p; - while ((p = ngcotouv(L->openupval)) != NULL && p->v >= level) { - setobj(&p->value, p->v); /* save current value (write barrier) */ - p->v = &p->value; /* now current value lives here */ - L->openupval = p->next; /* remove from `open' list */ - luaC_link(L, valtogco(p), LUA_TUPVAL); - } -} - - -Proto *luaF_newproto (lua_State *L) { - Proto *f = luaM_new(L, Proto); - luaC_link(L, valtogco(f), LUA_TPROTO); - f->k = NULL; - f->sizek = 0; - f->p = NULL; - f->sizep = 0; - f->code = NULL; - f->sizecode = 0; - f->sizelineinfo = 0; - f->sizeupvalues = 0; - f->nups = 0; - f->upvalues = NULL; - f->numparams = 0; - f->is_vararg = 0; - f->maxstacksize = 0; - f->lineinfo = NULL; - f->sizelocvars = 0; - f->locvars = NULL; - f->lineDefined = 0; - f->source = NULL; - return f; -} - - -void luaF_freeproto (lua_State *L, Proto *f) { - luaM_freearray(L, f->code, f->sizecode, Instruction); - luaM_freearray(L, f->p, f->sizep, Proto *); - luaM_freearray(L, f->k, f->sizek, TObject); - luaM_freearray(L, f->lineinfo, f->sizelineinfo, int); - luaM_freearray(L, f->locvars, f->sizelocvars, struct LocVar); - luaM_freearray(L, f->upvalues, f->sizeupvalues, TString *); - luaM_freelem(L, f); -} - - -void luaF_freeclosure (lua_State *L, Closure *c) { - int size = (c->c.isC) ? sizeCclosure(c->c.nupvalues) : - sizeLclosure(c->l.nupvalues); - luaM_free(L, c, size); -} - - -/* -** 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/contrib/lua50/src/lfunc.h b/contrib/lua50/src/lfunc.h deleted file mode 100644 index dc61e2ed4..000000000 --- a/contrib/lua50/src/lfunc.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -** $Id: lfunc.h,v 1.21a 2003/03/18 12:50:04 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(TObject)*((n)-1))) - -#define sizeLclosure(n) (cast(int, sizeof(LClosure)) + \ - cast(int, sizeof(TObject *)*((n)-1))) - - -Proto *luaF_newproto (lua_State *L); -Closure *luaF_newCclosure (lua_State *L, int nelems); -Closure *luaF_newLclosure (lua_State *L, int nelems, TObject *e); -UpVal *luaF_findupval (lua_State *L, StkId level); -void luaF_close (lua_State *L, StkId level); -void luaF_freeproto (lua_State *L, Proto *f); -void luaF_freeclosure (lua_State *L, Closure *c); - -const char *luaF_getlocalname (const Proto *func, int local_number, int pc); - - -#endif diff --git a/contrib/lua50/src/lgc.c b/contrib/lua50/src/lgc.c deleted file mode 100644 index b44f20170..000000000 --- a/contrib/lua50/src/lgc.c +++ /dev/null @@ -1,505 +0,0 @@ -/* -** $Id: lgc.c,v 1.171b 2003/04/03 13:35:34 roberto Exp $ -** Garbage Collector -** See Copyright Notice in lua.h -*/ - -#include - -#define lgc_c - -#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" - - -typedef struct GCState { - GCObject *tmark; /* list of marked objects to be traversed */ - GCObject *wk; /* list of traversed key-weak tables (to be cleared) */ - GCObject *wv; /* list of traversed value-weak tables */ - GCObject *wkv; /* list of traversed key-value weak tables */ - global_State *g; -} GCState; - - -/* -** some userful bit tricks -*/ -#define setbit(x,b) ((x) |= (1<<(b))) -#define resetbit(x,b) ((x) &= cast(lu_byte, ~(1<<(b)))) -#define testbit(x,b) ((x) & (1<<(b))) - -#define unmark(x) resetbit((x)->gch.marked, 0) -#define ismarked(x) ((x)->gch.marked & ((1<<4)|1)) - -#define stringmark(s) setbit((s)->tsv.marked, 0) - - -#define isfinalized(u) (!testbit((u)->uv.marked, 1)) -#define markfinalized(u) resetbit((u)->uv.marked, 1) - - -#define KEYWEAKBIT 1 -#define VALUEWEAKBIT 2 -#define KEYWEAK (1<gch.marked, 0); /* mark object */ - switch (o->gch.tt) { - case LUA_TUSERDATA: { - markvalue(st, gcotou(o)->uv.metatable); - break; - } - case LUA_TFUNCTION: { - gcotocl(o)->c.gclist = st->tmark; - st->tmark = o; - break; - } - case LUA_TTABLE: { - gcotoh(o)->gclist = st->tmark; - st->tmark = o; - break; - } - case LUA_TTHREAD: { - gcototh(o)->gclist = st->tmark; - st->tmark = o; - break; - } - case LUA_TPROTO: { - gcotop(o)->gclist = st->tmark; - st->tmark = o; - break; - } - default: lua_assert(o->gch.tt == LUA_TSTRING); - } -} - - -static void marktmu (GCState *st) { - GCObject *u; - for (u = st->g->tmudata; u; u = u->gch.next) { - unmark(u); /* may be marked, if left from previous GC */ - reallymarkobject(st, u); - } -} - - -/* move `dead' udata that need finalization to list `tmudata' */ -size_t luaC_separateudata (lua_State *L) { - size_t deadmem = 0; - GCObject **p = &G(L)->rootudata; - GCObject *curr; - GCObject *collected = NULL; /* to collect udata with gc event */ - GCObject **lastcollected = &collected; - while ((curr = *p) != NULL) { - lua_assert(curr->gch.tt == LUA_TUSERDATA); - if (ismarked(curr) || isfinalized(gcotou(curr))) - p = &curr->gch.next; /* don't bother with them */ - - else if (fasttm(L, gcotou(curr)->uv.metatable, TM_GC) == NULL) { - markfinalized(gcotou(curr)); /* don't need finalization */ - p = &curr->gch.next; - } - else { /* must call its gc method */ - deadmem += sizeudata(gcotou(curr)->uv.len); - *p = curr->gch.next; - curr->gch.next = NULL; /* link `curr' at the end of `collected' list */ - *lastcollected = curr; - lastcollected = &curr->gch.next; - } - } - /* insert collected udata with gc event into `tmudata' list */ - *lastcollected = G(L)->tmudata; - G(L)->tmudata = collected; - return deadmem; -} - - -static void removekey (Node *n) { - setnilvalue(gval(n)); /* remove corresponding value ... */ - if (iscollectable(gkey(n))) - setttype(gkey(n), LUA_TNONE); /* dead key; remove it */ -} - - -static void traversetable (GCState *st, Table *h) { - int i; - int weakkey = 0; - int weakvalue = 0; - const TObject *mode; - markvalue(st, h->metatable); - lua_assert(h->lsizenode || h->node == st->g->dummynode); - mode = gfasttm(st->g, h->metatable, TM_MODE); - if (mode && ttisstring(mode)) { /* is there a weak mode? */ - weakkey = (strchr(svalue(mode), 'k') != NULL); - weakvalue = (strchr(svalue(mode), 'v') != NULL); - if (weakkey || weakvalue) { /* is really weak? */ - GCObject **weaklist; - h->marked &= ~(KEYWEAK | VALUEWEAK); /* clear bits */ - h->marked |= cast(lu_byte, (weakkey << KEYWEAKBIT) | - (weakvalue << VALUEWEAKBIT)); - weaklist = (weakkey && weakvalue) ? &st->wkv : - (weakkey) ? &st->wk : - &st->wv; - h->gclist = *weaklist; /* must be cleared after GC, ... */ - *weaklist = valtogco(h); /* ... so put in the appropriate list */ - } - } - if (!weakvalue) { - i = h->sizearray; - while (i--) - markobject(st, &h->array[i]); - } - i = sizenode(h); - while (i--) { - Node *n = gnode(h, i); - if (!ttisnil(gval(n))) { - lua_assert(!ttisnil(gkey(n))); - condmarkobject(st, gkey(n), !weakkey); - condmarkobject(st, gval(n), !weakvalue); - } - } -} - - -static void traverseproto (GCState *st, Proto *f) { - int i; - stringmark(f->source); - for (i=0; isizek; i++) { /* mark literal strings */ - if (ttisstring(f->k+i)) - stringmark(tsvalue(f->k+i)); - } - for (i=0; isizeupvalues; i++) /* mark upvalue names */ - stringmark(f->upvalues[i]); - for (i=0; isizep; i++) /* mark nested protos */ - markvalue(st, f->p[i]); - for (i=0; isizelocvars; i++) /* mark local-variable names */ - stringmark(f->locvars[i].varname); - lua_assert(luaG_checkcode(f)); -} - - - -static void traverseclosure (GCState *st, Closure *cl) { - if (cl->c.isC) { - int i; - for (i=0; ic.nupvalues; i++) /* mark its upvalues */ - markobject(st, &cl->c.upvalue[i]); - } - else { - int i; - lua_assert(cl->l.nupvalues == cl->l.p->nups); - markvalue(st, hvalue(&cl->l.g)); - markvalue(st, cl->l.p); - for (i=0; il.nupvalues; i++) { /* mark its upvalues */ - UpVal *u = cl->l.upvals[i]; - markobject(st, u->v); - u->marked = 1; - } - } -} - - -static void checkstacksizes (lua_State *L, StkId max) { - int used = L->ci - L->base_ci; /* number of `ci' in use */ - if (4*used < L->size_ci && 2*BASIC_CI_SIZE < L->size_ci) - luaD_reallocCI(L, L->size_ci/2); /* still big enough... */ - else condhardstacktests(luaD_reallocCI(L, L->size_ci)); - used = max - L->stack; /* part of stack in use */ - if (4*used < L->stacksize && 2*(BASIC_STACK_SIZE+EXTRA_STACK) < L->stacksize) - luaD_reallocstack(L, L->stacksize/2); /* still big enough... */ - else condhardstacktests(luaD_reallocstack(L, L->stacksize)); -} - - -static void traversestack (GCState *st, lua_State *L1) { - StkId o, lim; - CallInfo *ci; - markobject(st, gt(L1)); - lim = L1->top; - for (ci = L1->base_ci; ci <= L1->ci; ci++) { - lua_assert(ci->top <= L1->stack_last); - lua_assert(ci->state & (CI_C | CI_HASFRAME | CI_SAVEDPC)); - if (lim < ci->top) - lim = ci->top; - } - for (o = L1->stack; o < L1->top; o++) - markobject(st, o); - for (; o <= lim; o++) - setnilvalue(o); - checkstacksizes(L1, lim); -} - - -static lu_mem propagatemarks (GCState *st) { - lu_mem mf = 0; - while (st->tmark) { /* traverse marked objects */ - switch (st->tmark->gch.tt) { - case LUA_TTABLE: { - Table *h = gcotoh(st->tmark); - st->tmark = h->gclist; - traversetable(st, h); - mf += sizeof(Table) + sizeof(TObject) * h->sizearray + - sizeof(Node) * sizenode(h); - break; - } - case LUA_TFUNCTION: { - Closure *cl = gcotocl(st->tmark); - st->tmark = cl->c.gclist; - traverseclosure(st, cl); - mf += (cl->c.isC) ? sizeCclosure(cl->c.nupvalues) : - sizeLclosure(cl->l.nupvalues); - break; - } - case LUA_TTHREAD: { - lua_State *th = gcototh(st->tmark); - st->tmark = th->gclist; - traversestack(st, th); - mf += sizeof(lua_State) + sizeof(TObject) * th->stacksize + - sizeof(CallInfo) * th->size_ci; - break; - } - case LUA_TPROTO: { - Proto *p = gcotop(st->tmark); - st->tmark = p->gclist; - traverseproto(st, p); - /* do not need 'mf' for this case (cannot happen inside a udata) */ - break; - } - default: lua_assert(0); - } - } - return mf; -} - - -static int valismarked (const TObject *o) { - if (ttisstring(o)) - stringmark(tsvalue(o)); /* strings are `values', so are never weak */ - return !iscollectable(o) || testbit(o->value.gc->gch.marked, 0); -} - - -/* -** clear collected keys from weaktables -*/ -static void cleartablekeys (GCObject *l) { - while (l) { - Table *h = gcotoh(l); - int i = sizenode(h); - lua_assert(h->marked & KEYWEAK); - while (i--) { - Node *n = gnode(h, i); - if (!valismarked(gkey(n))) /* key was collected? */ - removekey(n); /* remove entry from table */ - } - l = h->gclist; - } -} - - -/* -** clear collected values from weaktables -*/ -static void cleartablevalues (GCObject *l) { - while (l) { - Table *h = gcotoh(l); - int i = h->sizearray; - lua_assert(h->marked & VALUEWEAK); - while (i--) { - TObject *o = &h->array[i]; - if (!valismarked(o)) /* value was collected? */ - setnilvalue(o); /* remove value */ - } - i = sizenode(h); - while (i--) { - Node *n = gnode(h, i); - if (!valismarked(gval(n))) /* value was collected? */ - removekey(n); /* remove entry from table */ - } - l = h->gclist; - } -} - - -static void freeobj (lua_State *L, GCObject *o) { - switch (o->gch.tt) { - case LUA_TPROTO: luaF_freeproto(L, gcotop(o)); break; - case LUA_TFUNCTION: luaF_freeclosure(L, gcotocl(o)); break; - case LUA_TUPVAL: luaM_freelem(L, gcotouv(o)); break; - case LUA_TTABLE: luaH_free(L, gcotoh(o)); break; - case LUA_TTHREAD: { - lua_assert(gcototh(o) != L && gcototh(o) != G(L)->mainthread); - luaE_freethread(L, gcototh(o)); - break; - } - case LUA_TSTRING: { - luaM_free(L, o, sizestring(gcotots(o)->tsv.len)); - break; - } - case LUA_TUSERDATA: { - luaM_free(L, o, sizeudata(gcotou(o)->uv.len)); - break; - } - default: lua_assert(0); - } -} - - -static int sweeplist (lua_State *L, GCObject **p, int limit) { - GCObject *curr; - int count = 0; /* number of collected items */ - while ((curr = *p) != NULL) { - if ((curr->gch.marked & ~(KEYWEAK | VALUEWEAK)) > limit) { - unmark(curr); - p = &curr->gch.next; - } - else { - count++; - *p = curr->gch.next; - freeobj(L, curr); - } - } - return count; -} - - -static void sweepstrings (lua_State *L, int all) { - int i; - for (i=0; istrt.size; i++) { /* for each list */ - G(L)->strt.nuse -= sweeplist(L, &G(L)->strt.hash[i], all); - } -} - - -static void checkSizes (lua_State *L, size_t deadmem) { - /* check size of string hash */ - if (G(L)->strt.nuse < cast(ls_nstr, G(L)->strt.size/4) && - G(L)->strt.size > MINSTRTABSIZE*2) - luaS_resize(L, G(L)->strt.size/2); /* table is too big */ - /* check size of buffer */ - if (luaZ_sizebuffer(&G(L)->buff) > LUA_MINBUFFER*2) { /* buffer too big? */ - size_t newsize = luaZ_sizebuffer(&G(L)->buff) / 2; - luaZ_resizebuffer(L, &G(L)->buff, newsize); - } - G(L)->GCthreshold = 2*G(L)->nblocks - deadmem; /* new threshold */ -} - - -static void do1gcTM (lua_State *L, Udata *udata) { - const TObject *tm = fasttm(L, udata->uv.metatable, TM_GC); - if (tm != NULL) { - setobj2s(L->top, tm); - setuvalue(L->top+1, udata); - L->top += 2; - luaD_call(L, L->top - 2, 0); - } -} - - -void luaC_callGCTM (lua_State *L) { - lu_byte oldah = L->allowhook; - L->allowhook = 0; /* stop debug hooks during GC tag methods */ - L->top++; /* reserve space to keep udata while runs its gc method */ - while (G(L)->tmudata != NULL) { - GCObject *o = G(L)->tmudata; - Udata *udata = gcotou(o); - G(L)->tmudata = udata->uv.next; /* remove udata from `tmudata' */ - udata->uv.next = G(L)->rootudata; /* return it to `root' list */ - G(L)->rootudata = o; - setuvalue(L->top - 1, udata); /* keep a reference to it */ - unmark(o); - markfinalized(udata); - do1gcTM(L, udata); - } - L->top--; - L->allowhook = oldah; /* restore hooks */ -} - - -void luaC_sweep (lua_State *L, int all) { - if (all) all = 256; /* larger than any mark */ - sweeplist(L, &G(L)->rootudata, all); - sweepstrings(L, all); - sweeplist(L, &G(L)->rootgc, all); -} - - -/* mark root set */ -static void markroot (GCState *st, lua_State *L) { - global_State *g = st->g; - markobject(st, defaultmeta(L)); - markobject(st, registry(L)); - traversestack(st, g->mainthread); - if (L != g->mainthread) /* another thread is running? */ - markvalue(st, L); /* cannot collect it */ -} - - -static size_t mark (lua_State *L) { - size_t deadmem; - GCState st; - GCObject *wkv; - st.g = G(L); - st.tmark = NULL; - st.wkv = st.wk = st.wv = NULL; - markroot(&st, L); - propagatemarks(&st); /* mark all reachable objects */ - cleartablevalues(st.wkv); - cleartablevalues(st.wv); - wkv = st.wkv; /* keys must be cleared after preserving udata */ - st.wkv = NULL; - st.wv = NULL; - deadmem = luaC_separateudata(L); /* separate userdata to be preserved */ - marktmu(&st); /* mark `preserved' userdata */ - deadmem += propagatemarks(&st); /* remark, to propagate `preserveness' */ - cleartablekeys(wkv); - /* `propagatemarks' may resuscitate some weak tables; clear them too */ - cleartablekeys(st.wk); - cleartablevalues(st.wv); - cleartablekeys(st.wkv); - cleartablevalues(st.wkv); - return deadmem; -} - - -void luaC_collectgarbage (lua_State *L) { - size_t deadmem = mark(L); - luaC_sweep(L, 0); - checkSizes(L, deadmem); - luaC_callGCTM(L); -} - - -void luaC_link (lua_State *L, GCObject *o, lu_byte tt) { - o->gch.next = G(L)->rootgc; - G(L)->rootgc = o; - o->gch.marked = 0; - o->gch.tt = tt; -} - diff --git a/contrib/lua50/src/lgc.h b/contrib/lua50/src/lgc.h deleted file mode 100644 index 3f4d7486e..000000000 --- a/contrib/lua50/src/lgc.h +++ /dev/null @@ -1,25 +0,0 @@ -/* -** $Id: lgc.h,v 1.19a 2003/02/28 19:45:15 roberto Exp $ -** Garbage Collector -** See Copyright Notice in lua.h -*/ - -#ifndef lgc_h -#define lgc_h - - -#include "lobject.h" - - -#define luaC_checkGC(L) { lua_assert(!(L->ci->state & CI_CALLING)); \ - if (G(L)->nblocks >= G(L)->GCthreshold) luaC_collectgarbage(L); } - - -size_t luaC_separateudata (lua_State *L); -void luaC_callGCTM (lua_State *L); -void luaC_sweep (lua_State *L, int all); -void luaC_collectgarbage (lua_State *L); -void luaC_link (lua_State *L, GCObject *o, lu_byte tt); - - -#endif diff --git a/contrib/lua50/src/lib/lauxlib.c b/contrib/lua50/src/lib/lauxlib.c deleted file mode 100644 index ee2d1339b..000000000 --- a/contrib/lua50/src/lib/lauxlib.c +++ /dev/null @@ -1,591 +0,0 @@ -/* -** $Id: lauxlib.c,v 1.100 2003/04/07 14:35:00 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" - - -/* number of prereserved references (for internal use) */ -#define RESERVED_REFS 2 - -/* reserved references */ -#define FREELIST_REF 1 /* free list of references */ -#define ARRAYSIZE_REF 2 /* array sizes */ - - -/* convert a stack index to positive */ -#define abs_index(L, i) ((i) > 0 || (i) <= LUA_REGISTRYINDEX ? (i) : \ - lua_gettop(L) + (i) + 1) - - -/* -** {====================================================== -** Error-report functions -** ======================================================= -*/ - - -LUALIB_API int luaL_argerror (lua_State *L, int narg, const char *extramsg) { - lua_Debug ar; - lua_getstack(L, 0, &ar); - 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 `%s' on bad self (%s)", ar.name, extramsg); - } - if (ar.name == NULL) - ar.name = "?"; - return luaL_error(L, "bad argument #%d to `%s' (%s)", - narg, ar.name, extramsg); -} - - -LUALIB_API int luaL_typerror (lua_State *L, int narg, const char *tname) { - const char *msg = lua_pushfstring(L, "%s expected, got %s", - tname, lua_typename(L, lua_type(L,narg))); - return luaL_argerror(L, narg, msg); -} - - -static void tag_error (lua_State *L, int narg, int tag) { - luaL_typerror(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, "Snl", &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_findstring (const char *name, const char *const list[]) { - int i; - for (i=0; list[i]; i++) - if (strcmp(list[i], name) == 0) - return i; - return -1; /* name not found */ -} - - -LUALIB_API int luaL_newmetatable (lua_State *L, const char *tname) { - lua_pushstring(L, tname); - lua_rawget(L, LUA_REGISTRYINDEX); /* get registry.name */ - 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_pushstring(L, tname); - lua_pushvalue(L, -2); - lua_rawset(L, LUA_REGISTRYINDEX); /* registry.name = metatable */ - lua_pushvalue(L, -1); - lua_pushstring(L, tname); - lua_rawset(L, LUA_REGISTRYINDEX); /* registry[metatable] = name */ - return 1; -} - - -LUALIB_API void luaL_getmetatable (lua_State *L, const char *tname) { - lua_pushstring(L, tname); - lua_rawget(L, LUA_REGISTRYINDEX); -} - - -LUALIB_API void *luaL_checkudata (lua_State *L, int ud, const char *tname) { - const char *tn; - if (!lua_getmetatable(L, ud)) return NULL; /* no metatable? */ - lua_rawget(L, LUA_REGISTRYINDEX); /* get registry[metatable] */ - tn = lua_tostring(L, -1); - if (tn && (strcmp(tn, tname) == 0)) { - lua_pop(L, 1); - return lua_touserdata(L, ud); - } - else { - lua_pop(L, 1); - return NULL; - } -} - - -LUALIB_API void luaL_checkstack (lua_State *L, int space, const char *mes) { - if (!lua_checkstack(L, space)) - luaL_error(L, "stack overflow (%s)", mes); -} - - -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_tostring(L, narg); - if (!s) tag_error(L, narg, LUA_TSTRING); - if (len) *len = lua_strlen(L, narg); - 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) { - lua_Number d = lua_tonumber(L, narg); - if (d == 0 && !lua_isnumber(L, narg)) /* avoid extra test when d is not 0 */ - tag_error(L, narg, LUA_TNUMBER); - return d; -} - - -LUALIB_API lua_Number luaL_optnumber (lua_State *L, int narg, lua_Number def) { - if (lua_isnoneornil(L, narg)) return def; - else return luaL_checknumber(L, narg); -} - - -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 = abs_index(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 void luaL_openlib (lua_State *L, const char *libname, - const luaL_reg *l, int nup) { - if (libname) { - lua_pushstring(L, libname); - lua_gettable(L, LUA_GLOBALSINDEX); /* check whether lib already exists */ - if (lua_isnil(L, -1)) { /* no? */ - lua_pop(L, 1); - lua_newtable(L); /* create it */ - lua_pushstring(L, libname); - lua_pushvalue(L, -2); - lua_settable(L, LUA_GLOBALSINDEX); /* register it with given name */ - } - lua_insert(L, -(nup+1)); /* move library table to below upvalues */ - } - for (; l->name; l++) { - int i; - lua_pushstring(L, l->name); - for (i=0; ifunc, nup); - lua_settable(L, -(nup+3)); - } - lua_pop(L, nup); /* remove upvalues */ -} - - - -/* -** {====================================================== -** getn-setn: size for arrays -** ======================================================= -*/ - -static int checkint (lua_State *L, int topop) { - int n = (int)lua_tonumber(L, -1); - if (n == 0 && !lua_isnumber(L, -1)) n = -1; - lua_pop(L, topop); - return n; -} - - -static void getsizes (lua_State *L) { - lua_rawgeti(L, LUA_REGISTRYINDEX, ARRAYSIZE_REF); - if (lua_isnil(L, -1)) { /* no `size' table? */ - lua_pop(L, 1); /* remove nil */ - lua_newtable(L); /* create it */ - lua_pushvalue(L, -1); /* `size' will be its own metatable */ - lua_setmetatable(L, -2); - lua_pushliteral(L, "__mode"); - lua_pushliteral(L, "k"); - lua_rawset(L, -3); /* metatable(N).__mode = "k" */ - lua_pushvalue(L, -1); - lua_rawseti(L, LUA_REGISTRYINDEX, ARRAYSIZE_REF); /* store in register */ - } -} - - -void luaL_setn (lua_State *L, int t, int n) { - t = abs_index(L, t); - lua_pushliteral(L, "n"); - lua_rawget(L, t); - if (checkint(L, 1) >= 0) { /* is there a numeric field `n'? */ - lua_pushliteral(L, "n"); /* use it */ - lua_pushnumber(L, (lua_Number)n); - lua_rawset(L, t); - } - else { /* use `sizes' */ - getsizes(L); - lua_pushvalue(L, t); - lua_pushnumber(L, (lua_Number)n); - lua_rawset(L, -3); /* sizes[t] = n */ - lua_pop(L, 1); /* remove `sizes' */ - } -} - - -int luaL_getn (lua_State *L, int t) { - int n; - t = abs_index(L, t); - lua_pushliteral(L, "n"); /* try t.n */ - lua_rawget(L, t); - if ((n = checkint(L, 1)) >= 0) return n; - getsizes(L); /* else try sizes[t] */ - lua_pushvalue(L, t); - lua_rawget(L, -2); - if ((n = checkint(L, 2)) >= 0) return n; - for (n = 1; ; n++) { /* else must count elements */ - lua_rawgeti(L, t, n); - if (lua_isnil(L, -1)) break; - lua_pop(L, 1); - } - lua_pop(L, 1); - return n - 1; -} - -/* }====================================================== */ - - - -/* -** {====================================================== -** Generic Buffer manipulation -** ======================================================= -*/ - - -#define bufflen(B) ((B)->p - (B)->buffer) -#define bufffree(B) ((size_t)(LUAL_BUFFERSIZE - bufflen(B))) - -#define LIMIT (LUA_MINSTACK/2) - - -static int emptybuffer (luaL_Buffer *B) { - size_t l = bufflen(B); - if (l == 0) return 0; /* put nothing on stack */ - else { - lua_pushlstring(B->L, B->buffer, l); - B->p = B->buffer; - B->lvl++; - return 1; - } -} - - -static void adjuststack (luaL_Buffer *B) { - if (B->lvl > 1) { - lua_State *L = B->L; - int toget = 1; /* number of levels to concat */ - size_t toplen = lua_strlen(L, -1); - do { - size_t l = lua_strlen(L, -(toget+1)); - if (B->lvl - toget + 1 >= LIMIT || toplen > l) { - toplen += l; - toget++; - } - else break; - } while (toget < B->lvl); - lua_concat(L, toget); - B->lvl = B->lvl - toget + 1; - } -} - - -LUALIB_API char *luaL_prepbuffer (luaL_Buffer *B) { - if (emptybuffer(B)) - adjuststack(B); - return B->buffer; -} - - -LUALIB_API void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l) { - while (l--) - luaL_putchar(B, *s++); -} - - -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) { - emptybuffer(B); - lua_concat(B->L, B->lvl); - B->lvl = 1; -} - - -LUALIB_API void luaL_addvalue (luaL_Buffer *B) { - lua_State *L = B->L; - size_t vl = lua_strlen(L, -1); - if (vl <= bufffree(B)) { /* fit into buffer? */ - memcpy(B->p, lua_tostring(L, -1), vl); /* put it there */ - B->p += vl; - lua_pop(L, 1); /* remove from stack */ - } - else { - if (emptybuffer(B)) - lua_insert(L, -2); /* put buffer before new value */ - B->lvl++; /* add new value into B stack */ - adjuststack(B); - } -} - - -LUALIB_API void luaL_buffinit (lua_State *L, luaL_Buffer *B) { - B->L = L; - B->p = B->buffer; - B->lvl = 0; -} - -/* }====================================================== */ - - -LUALIB_API int luaL_ref (lua_State *L, int t) { - int ref; - t = abs_index(L, t); - if (lua_isnil(L, -1)) { - lua_pop(L, 1); /* remove from stack */ - return LUA_REFNIL; /* `nil' has a unique fixed reference */ - } - lua_rawgeti(L, t, FREELIST_REF); /* get first free element */ - ref = (int)lua_tonumber(L, -1); /* ref = t[FREELIST_REF] */ - 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_REF); /* (t[FREELIST_REF] = t[ref]) */ - } - else { /* no free elements */ - ref = luaL_getn(L, t); - if (ref < RESERVED_REFS) - ref = RESERVED_REFS; /* skip reserved references */ - ref++; /* create new reference */ - luaL_setn(L, t, ref); - } - lua_rawseti(L, t, ref); - return ref; -} - - -LUALIB_API void luaL_unref (lua_State *L, int t, int ref) { - if (ref >= 0) { - t = abs_index(L, t); - lua_rawgeti(L, t, FREELIST_REF); - lua_rawseti(L, t, ref); /* t[ref] = t[FREELIST_REF] */ - lua_pushnumber(L, (lua_Number)ref); - lua_rawseti(L, t, FREELIST_REF); /* t[FREELIST_REF] = ref */ - } -} - - - -/* -** {====================================================== -** Load functions -** ======================================================= -*/ - -typedef struct LoadF { - FILE *f; - char buff[LUAL_BUFFERSIZE]; -} LoadF; - - -static const char *getF (lua_State *L, void *ud, size_t *size) { - LoadF *lf = (LoadF *)ud; - (void)L; - if (feof(lf->f)) return NULL; - *size = fread(lf->buff, 1, LUAL_BUFFERSIZE, lf->f); - return (*size > 0) ? lf->buff : NULL; -} - - -static int errfile (lua_State *L, int fnameindex) { - const char *filename = lua_tostring(L, fnameindex) + 1; - lua_pushfstring(L, "cannot read %s: %s", filename, strerror(errno)); - lua_remove(L, fnameindex); - return LUA_ERRFILE; -} - - -LUALIB_API int luaL_loadfile (lua_State *L, const char *filename) { - LoadF lf; - int status, readstatus; - int c; - int fnameindex = lua_gettop(L) + 1; /* index of filename on the stack */ - if (filename == NULL) { - lua_pushliteral(L, "=stdin"); - lf.f = stdin; - } - else { - lua_pushfstring(L, "@%s", filename); - lf.f = fopen(filename, "r"); - } - if (lf.f == NULL) return errfile(L, fnameindex); /* unable to open file */ - c = ungetc(getc(lf.f), lf.f); - if (!(isspace(c) || isprint(c)) && lf.f != stdin) { /* binary file? */ - fclose(lf.f); - lf.f = fopen(filename, "rb"); /* reopen in binary mode */ - if (lf.f == NULL) return errfile(L, fnameindex); /* unable to reopen file */ - } - status = lua_load(L, getF, &lf, lua_tostring(L, -1)); - readstatus = ferror(lf.f); - if (lf.f != stdin) fclose(lf.f); /* close file (even in case of errors) */ - if (readstatus) { - lua_settop(L, fnameindex); /* ignore results from `lua_load' */ - return errfile(L, 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; - if (ls->size == 0) return NULL; - *size = ls->size; - ls->size = 0; - return ls->s; -} - - -LUALIB_API int luaL_loadbuffer (lua_State *L, const char *buff, size_t size, - const char *name) { - LoadS ls; - ls.s = buff; - ls.size = size; - return lua_load(L, getS, &ls, name); -} - -/* }====================================================== */ - - -/* -** {====================================================== -** compatibility code -** ======================================================= -*/ - - -static void callalert (lua_State *L, int status) { - if (status != 0) { - lua_getglobal(L, "_ALERT"); - if (lua_isfunction(L, -1)) { - lua_insert(L, -2); - lua_call(L, 1, 0); - } - else { /* no _ALERT function; print it on stderr */ - fprintf(stderr, "%s\n", lua_tostring(L, -2)); - lua_pop(L, 2); /* remove error message and _ALERT */ - } - } -} - - -static int aux_do (lua_State *L, int status) { - if (status == 0) { /* parse OK? */ - status = lua_pcall(L, 0, LUA_MULTRET, 0); /* call main */ - } - callalert(L, status); - return status; -} - - -LUALIB_API int lua_dofile (lua_State *L, const char *filename) { - return aux_do(L, luaL_loadfile(L, filename)); -} - - -LUALIB_API int lua_dobuffer (lua_State *L, const char *buff, size_t size, - const char *name) { - return aux_do(L, luaL_loadbuffer(L, buff, size, name)); -} - - -LUALIB_API int lua_dostring (lua_State *L, const char *str) { - return lua_dobuffer(L, str, strlen(str), str); -} - -/* }====================================================== */ diff --git a/contrib/lua50/src/lib/lbaselib.c b/contrib/lua50/src/lib/lbaselib.c deleted file mode 100644 index fb26a54a9..000000000 --- a/contrib/lua50/src/lib/lbaselib.c +++ /dev/null @@ -1,677 +0,0 @@ -/* -** $Id: lbaselib.c,v 1.130c 2003/04/03 13:35:34 roberto Exp $ -** Basic library -** See Copyright Notice in lua.h -*/ - - - -#include -#include -#include -#include - -#define lbaselib_c - -#include "lua.h" - -#include "lauxlib.h" -#include "lualib.h" - - - - -/* -** If your system does not support `stdout', you can just remove this function. -** If you need, you can define your own `print' function, following this -** model but changing `fputs' to put the strings at a proper place -** (a console window or a log file, for instance). -*/ -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; - lua_pushvalue(L, -1); /* function to be called */ - lua_pushvalue(L, i); /* value to print */ - lua_call(L, 1, 1); - s = lua_tostring(L, -1); /* get result */ - if (s == NULL) - return luaL_error(L, "`tostring' must return a string to `print'"); - if (i>1) fputs("\t", stdout); - fputs(s, stdout); - lua_pop(L, 1); /* pop result */ - } - fputs("\n", stdout); - return 0; -} - - -static int luaB_tonumber (lua_State *L) { - int base = luaL_optint(L, 2, 10); - if (base == 10) { /* standard conversion */ - luaL_checkany(L, 1); - if (lua_isnumber(L, 1)) { - lua_pushnumber(L, lua_tonumber(L, 1)); - return 1; - } - } - else { - const char *s1 = luaL_checkstring(L, 1); - char *s2; - unsigned long n; - luaL_argcheck(L, 2 <= base && base <= 36, 2, "base out of range"); - n = strtoul(s1, &s2, base); - if (s1 != s2) { /* at least one valid digit? */ - while (isspace((unsigned char)(*s2))) s2++; /* skip trailing spaces */ - if (*s2 == '\0') { /* no invalid trailing characters? */ - lua_pushnumber(L, (lua_Number)n); - return 1; - } - } - } - lua_pushnil(L); /* else not a number */ - return 1; -} - - -static int luaB_error (lua_State *L) { - int level = luaL_optint(L, 2, 1); - luaL_checkany(L, 1); - if (!lua_isstring(L, 1) || level == 0) - lua_pushvalue(L, 1); /* propagate error message without changes */ - else { /* 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")) - luaL_error(L, "cannot change a protected metatable"); - lua_settop(L, 2); - lua_setmetatable(L, 1); - return 1; -} - - -static void getfunc (lua_State *L) { - if (lua_isfunction(L, 1)) lua_pushvalue(L, 1); - else { - lua_Debug ar; - int level = luaL_optint(L, 1, 1); - luaL_argcheck(L, level >= 0, 1, "level must be non-negative"); - if (lua_getstack(L, level, &ar) == 0) - luaL_argerror(L, 1, "invalid level"); - lua_getinfo(L, "f", &ar); - if (lua_isnil(L, -1)) - luaL_error(L, "no function environment for tail call at level %d", - level); - } -} - - -static int aux_getfenv (lua_State *L) { - lua_getfenv(L, -1); - lua_pushliteral(L, "__fenv"); - lua_rawget(L, -2); - return !lua_isnil(L, -1); -} - - -static int luaB_getfenv (lua_State *L) { - getfunc(L); - if (!aux_getfenv(L)) /* __fenv not defined? */ - lua_pop(L, 1); /* remove it, to return real environment */ - return 1; -} - - -static int luaB_setfenv (lua_State *L) { - luaL_checktype(L, 2, LUA_TTABLE); - getfunc(L); - if (aux_getfenv(L)) /* __fenv defined? */ - luaL_error(L, "`setfenv' cannot change a protected environment"); - else - lua_pop(L, 2); /* remove __fenv and real environment table */ - lua_pushvalue(L, 2); - if (lua_isnumber(L, 1) && lua_tonumber(L, 1) == 0) - lua_replace(L, LUA_GLOBALSINDEX); - else if (lua_setfenv(L, -2) == 0) - luaL_error(L, "`setfenv' cannot change environment of given function"); - return 0; -} - - -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_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_gcinfo (lua_State *L) { - lua_pushnumber(L, (lua_Number)lua_getgccount(L)); - lua_pushnumber(L, (lua_Number)lua_getgcthreshold(L)); - return 2; -} - - -static int luaB_collectgarbage (lua_State *L) { - lua_setgcthreshold(L, luaL_optint(L, 1, 0)); - return 0; -} - - -static int luaB_type (lua_State *L) { - luaL_checkany(L, 1); - lua_pushstring(L, lua_typename(L, lua_type(L, 1))); - return 1; -} - - -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) { - luaL_checktype(L, 1, LUA_TTABLE); - lua_pushliteral(L, "next"); - lua_rawget(L, LUA_GLOBALSINDEX); /* return generator, */ - lua_pushvalue(L, 1); /* state, */ - lua_pushnil(L); /* and initial value */ - return 3; -} - - -static int luaB_ipairs (lua_State *L) { - lua_Number i = lua_tonumber(L, 2); - luaL_checktype(L, 1, LUA_TTABLE); - if (i == 0 && lua_isnone(L, 2)) { /* `for' start? */ - lua_pushliteral(L, "ipairs"); - lua_rawget(L, LUA_GLOBALSINDEX); /* return generator, */ - lua_pushvalue(L, 1); /* state, */ - lua_pushnumber(L, 0); /* and initial value */ - return 3; - } - else { /* `for' step */ - i++; /* next value */ - lua_pushnumber(L, i); - lua_rawgeti(L, 1, (int)i); - return (lua_isnil(L, -1)) ? 0 : 2; - } -} - - -static int load_aux (lua_State *L, int status) { - if (status == 0) /* OK? */ - return 1; - else { - lua_pushnil(L); - lua_insert(L, -2); /* put before error message */ - return 2; /* return nil plus error message */ - } -} - - -static int luaB_loadstring (lua_State *L) { - size_t l; - const char *s = luaL_checklstring(L, 1, &l); - const char *chunkname = luaL_optstring(L, 2, s); - return load_aux(L, luaL_loadbuffer(L, s, l, chunkname)); -} - - -static int luaB_loadfile (lua_State *L) { - const char *fname = luaL_optstring(L, 1, NULL); - return load_aux(L, luaL_loadfile(L, fname)); -} - - -static int luaB_dofile (lua_State *L) { - const char *fname = luaL_optstring(L, 1, NULL); - int n = lua_gettop(L); - int status = luaL_loadfile(L, fname); - if (status != 0) lua_error(L); - lua_call(L, 0, LUA_MULTRET); - return lua_gettop(L) - n; -} - - -static int luaB_assert (lua_State *L) { - luaL_checkany(L, 1); - if (!lua_toboolean(L, 1)) - return luaL_error(L, "%s", luaL_optstring(L, 2, "assertion failed!")); - lua_settop(L, 1); - return 1; -} - - -static int luaB_unpack (lua_State *L) { - int n, i; - luaL_checktype(L, 1, LUA_TTABLE); - n = luaL_getn(L, 1); - luaL_checkstack(L, n, "table too big to unpack"); - for (i=1; i<=n; i++) /* push arg[1...n] */ - lua_rawgeti(L, 1, i); - return n; -} - - -static int luaB_pcall (lua_State *L) { - int status; - luaL_checkany(L, 1); - status = lua_pcall(L, lua_gettop(L) - 1, LUA_MULTRET, 0); - lua_pushboolean(L, (status == 0)); - lua_insert(L, 1); - return lua_gettop(L); /* return status + all results */ -} - - -static int luaB_xpcall (lua_State *L) { - int status; - luaL_checkany(L, 2); - lua_settop(L, 2); - lua_insert(L, 1); /* put error function under function to be called */ - status = lua_pcall(L, 0, LUA_MULTRET, 1); - lua_pushboolean(L, (status == 0)); - lua_replace(L, 1); - return lua_gettop(L); /* return status + all results */ -} - - -static int luaB_tostring (lua_State *L) { - char buff[128]; - luaL_checkany(L, 1); - if (luaL_callmeta(L, 1, "__tostring")) /* is there a metafield? */ - return 1; /* use its value */ - switch (lua_type(L, 1)) { - case LUA_TNUMBER: - lua_pushstring(L, lua_tostring(L, 1)); - return 1; - case LUA_TSTRING: - lua_pushvalue(L, 1); - return 1; - case LUA_TBOOLEAN: - lua_pushstring(L, (lua_toboolean(L, 1) ? "true" : "false")); - return 1; - case LUA_TTABLE: - sprintf(buff, "table: %p", lua_topointer(L, 1)); - break; - case LUA_TFUNCTION: - sprintf(buff, "function: %p", lua_topointer(L, 1)); - break; - case LUA_TUSERDATA: - case LUA_TLIGHTUSERDATA: - sprintf(buff, "userdata: %p", lua_touserdata(L, 1)); - break; - case LUA_TTHREAD: - sprintf(buff, "thread: %p", (void *)lua_tothread(L, 1)); - break; - case LUA_TNIL: - lua_pushliteral(L, "nil"); - return 1; - } - lua_pushstring(L, buff); - return 1; -} - - -static int luaB_newproxy (lua_State *L) { - lua_settop(L, 1); - lua_newuserdata(L, 0); /* create proxy */ - if (lua_toboolean(L, 1) == 0) - return 1; /* no metatable */ - else if (lua_isboolean(L, 1)) { - lua_newtable(L); /* create a new metatable `m' ... */ - lua_pushvalue(L, -1); /* ... and mark `m' as a valid metatable */ - lua_pushboolean(L, 1); - lua_rawset(L, lua_upvalueindex(1)); /* weaktable[m] = true */ - } - else { - int validproxy = 0; /* to check if weaktable[metatable(u)] == true */ - if (lua_getmetatable(L, 1)) { - lua_rawget(L, lua_upvalueindex(1)); - validproxy = lua_toboolean(L, -1); - lua_pop(L, 1); /* remove value */ - } - luaL_argcheck(L, validproxy, 1, "boolean or proxy expected"); - lua_getmetatable(L, 1); /* metatable is valid; get it */ - } - lua_setmetatable(L, 2); - return 1; -} - - -/* -** {====================================================== -** `require' function -** ======================================================= -*/ - - -/* name of global that holds table with loaded packages */ -#define REQTAB "_LOADED" - -/* name of global that holds the search path for packages */ -#define LUA_PATH "LUA_PATH" - -#ifndef LUA_PATH_SEP -#define LUA_PATH_SEP ';' -#endif - -#ifndef LUA_PATH_MARK -#define LUA_PATH_MARK '?' -#endif - -#ifndef LUA_PATH_DEFAULT -#define LUA_PATH_DEFAULT "?;?.lua" -#endif - - -static const char *getpath (lua_State *L) { - const char *path; - lua_getglobal(L, LUA_PATH); /* try global variable */ - path = lua_tostring(L, -1); - lua_pop(L, 1); - if (path) return path; - path = getenv(LUA_PATH); /* else try environment variable */ - if (path) return path; - return LUA_PATH_DEFAULT; /* else use default */ -} - - -static const char *pushnextpath (lua_State *L, const char *path) { - const char *l; - if (*path == '\0') return NULL; /* no more paths */ - if (*path == LUA_PATH_SEP) path++; /* skip separator */ - l = strchr(path, LUA_PATH_SEP); /* find next separator */ - if (l == NULL) l = path+strlen(path); - lua_pushlstring(L, path, l - path); /* directory name */ - return l; -} - - -static void pushcomposename (lua_State *L) { - const char *path = lua_tostring(L, -1); - const char *wild; - int n = 1; - while ((wild = strchr(path, LUA_PATH_MARK)) != NULL) { - /* is there stack space for prefix, name, and eventual last sufix? */ - luaL_checkstack(L, 3, "too many marks in a path component"); - lua_pushlstring(L, path, wild - path); /* push prefix */ - lua_pushvalue(L, 1); /* push package name (in place of MARK) */ - path = wild + 1; /* continue after MARK */ - n += 2; - } - lua_pushstring(L, path); /* push last sufix (`n' already includes this) */ - lua_concat(L, n); -} - - -static int luaB_require (lua_State *L) { - const char *path; - int status = LUA_ERRFILE; /* not found (yet) */ - luaL_checkstring(L, 1); - lua_settop(L, 1); - lua_getglobal(L, REQTAB); - if (!lua_istable(L, 2)) return luaL_error(L, "`" REQTAB "' is not a table"); - path = getpath(L); - lua_pushvalue(L, 1); /* check package's name in book-keeping table */ - lua_rawget(L, 2); - if (lua_toboolean(L, -1)) /* is it there? */ - return 1; /* package is already loaded; return its result */ - else { /* must load it */ - while (status == LUA_ERRFILE) { - lua_settop(L, 3); /* reset stack position */ - if ((path = pushnextpath(L, path)) == NULL) break; - pushcomposename(L); - status = luaL_loadfile(L, lua_tostring(L, -1)); /* try to load it */ - } - } - switch (status) { - case 0: { - lua_getglobal(L, "_REQUIREDNAME"); /* save previous name */ - lua_insert(L, -2); /* put it below function */ - lua_pushvalue(L, 1); - lua_setglobal(L, "_REQUIREDNAME"); /* set new name */ - lua_call(L, 0, 1); /* run loaded module */ - lua_insert(L, -2); /* put result below previous name */ - lua_setglobal(L, "_REQUIREDNAME"); /* reset to previous name */ - if (lua_isnil(L, -1)) { /* no/nil return? */ - lua_pushboolean(L, 1); - lua_replace(L, -2); /* replace to true */ - } - lua_pushvalue(L, 1); - lua_pushvalue(L, -2); - lua_rawset(L, 2); /* mark it as loaded */ - return 1; /* return value */ - } - case LUA_ERRFILE: { /* file not found */ - return luaL_error(L, "could not load package `%s' from path `%s'", - lua_tostring(L, 1), getpath(L)); - } - default: { - return luaL_error(L, "error loading package `%s' (%s)", - lua_tostring(L, 1), lua_tostring(L, -1)); - } - } -} - -/* }====================================================== */ - - -static const luaL_reg base_funcs[] = { - {"error", luaB_error}, - {"getmetatable", luaB_getmetatable}, - {"setmetatable", luaB_setmetatable}, - {"getfenv", luaB_getfenv}, - {"setfenv", luaB_setfenv}, - {"next", luaB_next}, - {"ipairs", luaB_ipairs}, - {"pairs", luaB_pairs}, - {"print", luaB_print}, - {"tonumber", luaB_tonumber}, - {"tostring", luaB_tostring}, - {"type", luaB_type}, - {"assert", luaB_assert}, - {"unpack", luaB_unpack}, - {"rawequal", luaB_rawequal}, - {"rawget", luaB_rawget}, - {"rawset", luaB_rawset}, - {"pcall", luaB_pcall}, - {"xpcall", luaB_xpcall}, - {"collectgarbage", luaB_collectgarbage}, - {"gcinfo", luaB_gcinfo}, - {"loadfile", luaB_loadfile}, - {"dofile", luaB_dofile}, - {"loadstring", luaB_loadstring}, - {"require", luaB_require}, - {NULL, NULL} -}; - - -/* -** {====================================================== -** Coroutine library -** ======================================================= -*/ - -static int auxresume (lua_State *L, lua_State *co, int narg) { - int status; - if (!lua_checkstack(co, narg)) - luaL_error(L, "too many arguments to resume"); - lua_xmove(L, co, narg); - status = lua_resume(co, narg); - if (status == 0) { - int nres = lua_gettop(co); - if (!lua_checkstack(L, nres)) - luaL_error(L, "too many results to resume"); - 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); - } - lua_error(L); /* propagate error */ - } - return r; -} - - -static int luaB_cocreate (lua_State *L) { - lua_State *NL = lua_newthread(L); - luaL_argcheck(L, lua_isfunction(L, 1) && !lua_iscfunction(L, 1), 1, - "Lua function expected"); - 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 { - lua_Debug ar; - if (lua_getstack(co, 0, &ar) == 0 && lua_gettop(co) == 0) - lua_pushliteral(L, "dead"); - else - lua_pushliteral(L, "suspended"); - } - return 1; -} - - -static const luaL_reg co_funcs[] = { - {"create", luaB_cocreate}, - {"wrap", luaB_cowrap}, - {"resume", luaB_coresume}, - {"yield", luaB_yield}, - {"status", luaB_costatus}, - {NULL, NULL} -}; - -/* }====================================================== */ - - - -static void base_open (lua_State *L) { - lua_pushliteral(L, "_G"); - lua_pushvalue(L, LUA_GLOBALSINDEX); - luaL_openlib(L, NULL, base_funcs, 0); /* open lib into global table */ - lua_pushliteral(L, "_VERSION"); - lua_pushliteral(L, LUA_VERSION); - lua_rawset(L, -3); /* set global _VERSION */ - /* `newproxy' needs a weaktable as upvalue */ - lua_pushliteral(L, "newproxy"); - lua_newtable(L); /* new table `w' */ - lua_pushvalue(L, -1); /* `w' will be its own metatable */ - lua_setmetatable(L, -2); - lua_pushliteral(L, "__mode"); - lua_pushliteral(L, "k"); - lua_rawset(L, -3); /* metatable(w).__mode = "k" */ - lua_pushcclosure(L, luaB_newproxy, 1); - lua_rawset(L, -3); /* set global `newproxy' */ - lua_rawset(L, -1); /* set global _G */ -} - - -LUALIB_API int luaopen_base (lua_State *L) { - base_open(L); - luaL_openlib(L, LUA_COLIBNAME, co_funcs, 0); - lua_newtable(L); - lua_setglobal(L, REQTAB); - return 0; -} - diff --git a/contrib/lua50/src/lib/ldblib.c b/contrib/lua50/src/lib/ldblib.c deleted file mode 100644 index 6dc9b64cf..000000000 --- a/contrib/lua50/src/lib/ldblib.c +++ /dev/null @@ -1,299 +0,0 @@ -/* -** $Id: ldblib.c,v 1.80 2003/04/03 13:35:34 roberto Exp $ -** Interface from Lua to its debug API -** See Copyright Notice in lua.h -*/ - - -#include -#include -#include - -#define ldblib_c - -#include "lua.h" - -#include "lauxlib.h" -#include "lualib.h" - - - -static void settabss (lua_State *L, const char *i, const char *v) { - lua_pushstring(L, i); - lua_pushstring(L, v); - lua_rawset(L, -3); -} - - -static void settabsi (lua_State *L, const char *i, int v) { - lua_pushstring(L, i); - lua_pushnumber(L, (lua_Number)v); - lua_rawset(L, -3); -} - - -static int getinfo (lua_State *L) { - lua_Debug ar; - const char *options = luaL_optstring(L, 2, "flnSu"); - if (lua_isnumber(L, 1)) { - if (!lua_getstack(L, (int)(lua_tonumber(L, 1)), &ar)) { - lua_pushnil(L); /* level out of range */ - return 1; - } - } - else if (lua_isfunction(L, 1)) { - lua_pushfstring(L, ">%s", options); - options = lua_tostring(L, -1); - lua_pushvalue(L, 1); - } - else - return luaL_argerror(L, 1, "function or level expected"); - if (!lua_getinfo(L, options, &ar)) - return luaL_argerror(L, 2, "invalid option"); - lua_newtable(L); - for (; *options; options++) { - switch (*options) { - case 'S': - settabss(L, "source", ar.source); - settabss(L, "short_src", ar.short_src); - settabsi(L, "linedefined", ar.linedefined); - settabss(L, "what", ar.what); - break; - case 'l': - settabsi(L, "currentline", ar.currentline); - break; - case 'u': - settabsi(L, "nups", ar.nups); - break; - case 'n': - settabss(L, "name", ar.name); - settabss(L, "namewhat", ar.namewhat); - break; - case 'f': - lua_pushliteral(L, "func"); - lua_pushvalue(L, -3); - lua_rawset(L, -3); - break; - } - } - return 1; /* return table */ -} - - -static int getlocal (lua_State *L) { - lua_Debug ar; - const char *name; - if (!lua_getstack(L, luaL_checkint(L, 1), &ar)) /* level out of range? */ - return luaL_argerror(L, 1, "level out of range"); - name = lua_getlocal(L, &ar, luaL_checkint(L, 2)); - if (name) { - lua_pushstring(L, name); - lua_pushvalue(L, -2); - return 2; - } - else { - lua_pushnil(L); - return 1; - } -} - - -static int setlocal (lua_State *L) { - lua_Debug ar; - if (!lua_getstack(L, luaL_checkint(L, 1), &ar)) /* level out of range? */ - return luaL_argerror(L, 1, "level out of range"); - luaL_checkany(L, 3); - lua_pushstring(L, lua_setlocal(L, &ar, luaL_checkint(L, 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); - if (lua_iscfunction(L, 1)) return 0; /* cannot touch C upvalues from Lua */ - 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 getupvalue (lua_State *L) { - return auxupvalue(L, 1); -} - - -static int setupvalue (lua_State *L) { - luaL_checkany(L, 3); - return auxupvalue(L, 0); -} - - - -static const char KEY_HOOK = 'h'; - - -static void hookf (lua_State *L, lua_Debug *ar) { - static const char *const hooknames[] = - {"call", "return", "line", "count", "tail return"}; - lua_pushlightuserdata(L, (void *)&KEY_HOOK); - lua_rawget(L, LUA_REGISTRYINDEX); - if (lua_isfunction(L, -1)) { - lua_pushstring(L, hooknames[(int)ar->event]); - if (ar->currentline >= 0) - lua_pushnumber(L, (lua_Number)ar->currentline); - else lua_pushnil(L); - lua_assert(lua_getinfo(L, "lS", ar)); - lua_call(L, 2, 0); - } - else - lua_pop(L, 1); /* pop result from gettable */ -} - - -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 sethook (lua_State *L) { - if (lua_isnoneornil(L, 1)) { - lua_settop(L, 1); - lua_sethook(L, NULL, 0, 0); /* turn off hooks */ - } - else { - const char *smask = luaL_checkstring(L, 2); - int count = luaL_optint(L, 3, 0); - luaL_checktype(L, 1, LUA_TFUNCTION); - lua_sethook(L, hookf, makemask(smask, count), count); - } - lua_pushlightuserdata(L, (void *)&KEY_HOOK); - lua_pushvalue(L, 1); - lua_rawset(L, LUA_REGISTRYINDEX); /* set new hook */ - return 0; -} - - -static int gethook (lua_State *L) { - char buff[5]; - int mask = lua_gethookmask(L); - lua_Hook hook = lua_gethook(L); - if (hook != NULL && hook != hookf) /* external hook? */ - lua_pushliteral(L, "external hook"); - else { - lua_pushlightuserdata(L, (void *)&KEY_HOOK); - lua_rawget(L, LUA_REGISTRYINDEX); /* get hook */ - } - lua_pushstring(L, unmakemask(mask, buff)); - lua_pushnumber(L, (lua_Number)lua_gethookcount(L)); - return 3; -} - - -static int debug (lua_State *L) { - for (;;) { - char buffer[250]; - fputs("lua_debug> ", stderr); - if (fgets(buffer, sizeof(buffer), stdin) == 0 || - strcmp(buffer, "cont\n") == 0) - return 0; - lua_dostring(L, buffer); - lua_settop(L, 0); /* remove eventual returns */ - } -} - - -#define LEVELS1 12 /* size of the first part of the stack */ -#define LEVELS2 10 /* size of the second part of the stack */ - -static int errorfb (lua_State *L) { - int level = 1; /* skip level 0 (it's this function) */ - int firstpart = 1; /* still before eventual `...' */ - lua_Debug ar; - if (lua_gettop(L) == 0) - lua_pushliteral(L, ""); - else if (!lua_isstring(L, 1)) return 1; /* no string message */ - else lua_pushliteral(L, "\n"); - lua_pushliteral(L, "stack traceback:"); - while (lua_getstack(L, level++, &ar)) { - if (level > LEVELS1 && firstpart) { - /* no more than `LEVELS2' more levels? */ - if (!lua_getstack(L, level+LEVELS2, &ar)) - level--; /* keep going */ - else { - lua_pushliteral(L, "\n\t..."); /* too many levels */ - while (lua_getstack(L, level+LEVELS2, &ar)) /* find last levels */ - level++; - } - firstpart = 0; - continue; - } - lua_pushliteral(L, "\n\t"); - lua_getinfo(L, "Snl", &ar); - lua_pushfstring(L, "%s:", ar.short_src); - if (ar.currentline > 0) - lua_pushfstring(L, "%d:", ar.currentline); - switch (*ar.namewhat) { - case 'g': /* global */ - case 'l': /* local */ - case 'f': /* field */ - case 'm': /* method */ - lua_pushfstring(L, " in function `%s'", ar.name); - break; - default: { - if (*ar.what == 'm') /* main? */ - lua_pushfstring(L, " in main chunk"); - else if (*ar.what == 'C' || *ar.what == 't') - lua_pushliteral(L, " ?"); /* C function or tail call */ - else - lua_pushfstring(L, " in function <%s:%d>", - ar.short_src, ar.linedefined); - } - } - lua_concat(L, lua_gettop(L)); - } - lua_concat(L, lua_gettop(L)); - return 1; -} - - -static const luaL_reg dblib[] = { - {"getlocal", getlocal}, - {"getinfo", getinfo}, - {"gethook", gethook}, - {"getupvalue", getupvalue}, - {"sethook", sethook}, - {"setlocal", setlocal}, - {"setupvalue", setupvalue}, - {"debug", debug}, - {"traceback", errorfb}, - {NULL, NULL} -}; - - -LUALIB_API int luaopen_debug (lua_State *L) { - luaL_openlib(L, LUA_DBLIBNAME, dblib, 0); - lua_pushliteral(L, "_TRACEBACK"); - lua_pushcfunction(L, errorfb); - lua_settable(L, LUA_GLOBALSINDEX); - return 1; -} - diff --git a/contrib/lua50/src/lib/liolib.c b/contrib/lua50/src/lib/liolib.c deleted file mode 100644 index bcadcdfde..000000000 --- a/contrib/lua50/src/lib/liolib.c +++ /dev/null @@ -1,762 +0,0 @@ -/* -** $Id: liolib.c,v 2.39b 2003/03/19 21:16:12 roberto Exp $ -** Standard I/O (and system) library -** See Copyright Notice in lua.h -*/ - - -#include -#include -#include -#include -#include -#include - -#define liolib_c - -#include "lua.h" - -#include "lauxlib.h" -#include "lualib.h" - - -typedef struct FileHandle { - FILE *f; - int ispipe; -} FileHandle; - - - -/* -** by default, gcc does not get `tmpname' -*/ -#ifndef USE_TMPNAME -#ifdef __GNUC__ -#define USE_TMPNAME 0 -#else -#define USE_TMPNAME 1 -#endif -#endif - - -/* -** by default, posix systems get `popen' -*/ -#ifndef USE_POPEN -#ifdef _POSIX_C_SOURCE -#if _POSIX_C_SOURCE >= 2 -#define USE_POPEN 1 -#endif -#endif -#endif - -#ifndef USE_POPEN -#define USE_POPEN 0 -#endif - - - - -/* -** {====================================================== -** FILE Operations -** ======================================================= -*/ - - -#if !USE_POPEN -#define pclose(f) (-1) -#endif - - -#define FILEHANDLE "FILE*" - -#define IO_INPUT "_input" -#define IO_OUTPUT "_output" - - -static int pushresult (lua_State *L, int i, const char *filename) { - if (i) { - lua_pushboolean(L, 1); - return 1; - } - else { - lua_pushnil(L); - if (filename) - lua_pushfstring(L, "%s: %s", filename, strerror(errno)); - else - lua_pushfstring(L, "%s", strerror(errno)); - lua_pushnumber(L, errno); - return 3; - } -} - - -static FileHandle *topfile (lua_State *L, int findex) { - FileHandle *fh = (FileHandle *)luaL_checkudata(L, findex, FILEHANDLE); - if (fh == NULL) luaL_argerror(L, findex, "bad file"); - return fh; -} - - -static int io_type (lua_State *L) { - FileHandle *fh = (FileHandle *)luaL_checkudata(L, 1, FILEHANDLE); - if (fh == NULL) lua_pushnil(L); - else if (fh->f == NULL) - lua_pushliteral(L, "closed file"); - else - lua_pushliteral(L, "file"); - return 1; -} - - -#define tofile(L,i) (tofileh(L,i)->f) - -static FileHandle *tofileh (lua_State *L, int findex) { - FileHandle *fh = topfile(L, findex); - if (fh->f == NULL) - luaL_error(L, "attempt to use a closed file"); - return fh; -} - - - -#define newfile(L) (&(newfileh(L)->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 FileHandle *newfileh (lua_State *L) { - FileHandle *fh = (FileHandle *)lua_newuserdata(L, sizeof(FileHandle)); - fh->f = NULL; /* file handle is currently `closed' */ - fh->ispipe = 0; - luaL_getmetatable(L, FILEHANDLE); - lua_setmetatable(L, -2); - return fh; -} - - -/* -** assumes that top of the stack is the `io' library, and next is -** the `io' metatable -*/ -static void registerfile (lua_State *L, FILE *f, const char *name, - const char *impname) { - lua_pushstring(L, name); - *newfile(L) = f; - if (impname) { - lua_pushstring(L, impname); - lua_pushvalue(L, -2); - lua_settable(L, -6); /* metatable[impname] = file */ - } - lua_settable(L, -3); /* io[name] = file */ -} - - -static int aux_close (lua_State *L) { - FileHandle *fh = tofileh(L, 1); - FILE *f = fh->f; - if (f == stdin || f == stdout || f == stderr) - return 0; /* file cannot be closed */ - else { - int ok = fh->ispipe ? (pclose(f) != -1) : (fclose(f) == 0); - fh->f = NULL; /* mark file as closed */ - return ok; - } -} - - -static int io_close (lua_State *L) { - if (lua_isnone(L, 1) && lua_type(L, lua_upvalueindex(1)) == LUA_TTABLE) { - lua_pushstring(L, IO_OUTPUT); - lua_rawget(L, lua_upvalueindex(1)); - } - return pushresult(L, aux_close(L), NULL); -} - - -static int io_gc (lua_State *L) { - FileHandle *fh = topfile(L, 1); - if (fh->f != NULL) /* ignore closed files */ - aux_close(L); - return 0; -} - - -static int io_tostring (lua_State *L) { - char buff[128]; - FileHandle *fh = topfile(L, 1); - if (fh->f == NULL) - strcpy(buff, "closed"); - else - sprintf(buff, "%p", lua_touserdata(L, 1)); - lua_pushfstring(L, "file (%s)", buff); - return 1; -} - - -static int io_open (lua_State *L) { - const char *filename = luaL_checkstring(L, 1); - const char *mode = luaL_optstring(L, 2, "r"); - FILE **pf = newfile(L); - *pf = fopen(filename, mode); - return (*pf == NULL) ? pushresult(L, 0, filename) : 1; -} - - -static int io_popen (lua_State *L) { -#if !USE_POPEN - luaL_error(L, "`popen' not supported"); - return 0; -#else - const char *filename = luaL_checkstring(L, 1); - const char *mode = luaL_optstring(L, 2, "r"); - FileHandle *fh = newfileh(L); - fh->f = popen(filename, mode); - fh->ispipe = 1; - return (fh->f == NULL) ? pushresult(L, 0, filename) : 1; -#endif -} - - -static int io_tmpfile (lua_State *L) { - FILE **pf = newfile(L); - *pf = tmpfile(); - return (*pf == NULL) ? pushresult(L, 0, NULL) : 1; -} - - -static FILE *getiofile (lua_State *L, const char *name) { - lua_pushstring(L, name); - lua_rawget(L, lua_upvalueindex(1)); - return tofile(L, -1); -} - - -static int g_iofile (lua_State *L, const char *name, const char *mode) { - if (!lua_isnoneornil(L, 1)) { - const char *filename = lua_tostring(L, 1); - lua_pushstring(L, name); - if (filename) { - FILE **pf = newfile(L); - *pf = fopen(filename, mode); - if (*pf == NULL) { - lua_pushfstring(L, "%s: %s", filename, strerror(errno)); - luaL_argerror(L, 1, lua_tostring(L, -1)); - } - } - else { - tofile(L, 1); /* check that it's a valid file handle */ - lua_pushvalue(L, 1); - } - lua_rawset(L, lua_upvalueindex(1)); - } - /* return current value */ - lua_pushstring(L, name); - lua_rawget(L, lua_upvalueindex(1)); - 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 idx, int close) { - lua_pushliteral(L, FILEHANDLE); - lua_rawget(L, LUA_REGISTRYINDEX); - lua_pushvalue(L, idx); - lua_pushboolean(L, close); /* close/not close file when finished */ - lua_pushcclosure(L, io_readline, 3); -} - - -static int f_lines (lua_State *L) { - tofile(L, 1); /* check that it's a valid file handle */ - aux_lines(L, 1, 0); - return 1; -} - - -static int io_lines (lua_State *L) { - if (lua_isnoneornil(L, 1)) { /* no arguments? */ - lua_pushstring(L, IO_INPUT); - lua_rawget(L, lua_upvalueindex(1)); /* will iterate over default input */ - return f_lines(L); - } - else { - const char *filename = luaL_checkstring(L, 1); - FILE **pf = newfile(L); - *pf = fopen(filename, "r"); - luaL_argcheck(L, *pf, 1, strerror(errno)); - aux_lines(L, lua_gettop(L), 1); - 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 return 0; /* read fails */ -} - - -static int test_eof (lua_State *L, FILE *f) { - int c = getc(f); - ungetc(c, f); - lua_pushlstring(L, NULL, 0); - return (c != EOF); -} - - -static int read_line (lua_State *L, FILE *f) { - 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_strlen(L, -1) > 0); /* check whether read something */ - } - l = strlen(p); - if (p[l-1] != '\n') - luaL_addsize(&b, l); - else { - luaL_addsize(&b, l - 1); /* do not include `eol' */ - luaL_pushresult(&b); /* close buffer */ - return 1; /* read at least an `eol' */ - } - } -} - - -static int read_chars (lua_State *L, FILE *f, size_t n) { - size_t rlen; /* how much to read */ - size_t nr; /* number of chars actually read */ - luaL_Buffer b; - luaL_buffinit(L, &b); - rlen = LUAL_BUFFERSIZE; /* try to read that much each time */ - do { - char *p = luaL_prepbuffer(&b); - if (rlen > n) rlen = n; /* cannot read more than asked */ - nr = fread(p, sizeof(char), rlen, f); - luaL_addsize(&b, nr); - n -= nr; /* still have to read `n' chars */ - } while (n > 0 && nr == rlen); /* until end of count or eof */ - luaL_pushresult(&b); /* close buffer */ - return (n == 0 || lua_strlen(L, -1) > 0); -} - - -static int g_read (lua_State *L, FILE *f, int first) { - int nargs = lua_gettop(L) - 1; - int success; - int n; - if (nargs == 0) { /* no arguments? */ - success = read_line(L, f); - 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_tonumber(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); - break; - case 'a': /* file */ - read_chars(L, f, ~((size_t)0)); /* read MAX_SIZE_T chars */ - success = 1; /* always success */ - break; - case 'w': /* word */ - return luaL_error(L, "obsolete option `*w' to `read'"); - default: - return luaL_argerror(L, n, "invalid format"); - } - } - } - } - 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, 1), 2); -} - - -static int io_readline (lua_State *L) { - FILE *f = *(FILE **)lua_touserdata(L, lua_upvalueindex(2)); - if (f == NULL) /* file is already closed? */ - luaL_error(L, "file is already closed"); - if (read_line(L, f)) return 1; - else { /* EOF */ - if (lua_toboolean(L, lua_upvalueindex(3))) { /* generator created file? */ - lua_settop(L, 0); - lua_pushvalue(L, lua_upvalueindex(2)); - aux_close(L); /* close it */ - } - return 0; - } -} - -/* }====================================================== */ - - -static int g_write (lua_State *L, FILE *f, int arg) { - int nargs = lua_gettop(L) - 1; - 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); - } - } - return pushresult(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) { - return g_write(L, tofile(L, 1), 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, 1); - int op = luaL_findstring(luaL_optstring(L, 2, "cur"), modenames); - long offset = luaL_optlong(L, 3, 0); - luaL_argcheck(L, op != -1, 2, "invalid mode"); - op = fseek(f, offset, mode[op]); - if (op) - return pushresult(L, 0, NULL); /* error */ - else { - lua_pushnumber(L, ftell(f)); - return 1; - } -} - - -static int io_flush (lua_State *L) { - return pushresult(L, fflush(getiofile(L, IO_OUTPUT)) == 0, NULL); -} - - -static int f_flush (lua_State *L) { - return pushresult(L, fflush(tofile(L, 1)) == 0, NULL); -} - - -static const luaL_reg iolib[] = { - {"input", io_input}, - {"output", io_output}, - {"lines", io_lines}, - {"close", io_close}, - {"flush", io_flush}, - {"open", io_open}, - {"popen", io_popen}, - {"read", io_read}, - {"tmpfile", io_tmpfile}, - {"type", io_type}, - {"write", io_write}, - {NULL, NULL} -}; - - -static const luaL_reg flib[] = { - {"flush", f_flush}, - {"read", f_read}, - {"lines", f_lines}, - {"seek", f_seek}, - {"write", f_write}, - {"close", io_close}, - {"__gc", io_gc}, - {"__tostring", io_tostring}, - {NULL, NULL} -}; - - -static void createmeta (lua_State *L) { - luaL_newmetatable(L, FILEHANDLE); /* create new metatable for file handles */ - /* file methods */ - lua_pushliteral(L, "__index"); - lua_pushvalue(L, -2); /* push metatable */ - lua_rawset(L, -3); /* metatable.__index = metatable */ - luaL_openlib(L, NULL, flib, 0); -} - -/* }====================================================== */ - - -/* -** {====================================================== -** Other O.S. Operations -** ======================================================= -*/ - -static int io_execute (lua_State *L) { - lua_pushnumber(L, system(luaL_checkstring(L, 1))); - return 1; -} - - -static int io_remove (lua_State *L) { - const char *filename = luaL_checkstring(L, 1); - return pushresult(L, remove(filename) == 0, filename); -} - - -static int io_rename (lua_State *L) { - const char *fromname = luaL_checkstring(L, 1); - const char *toname = luaL_checkstring(L, 2); - return pushresult(L, rename(fromname, toname) == 0, fromname); -} - - -static int io_tmpname (lua_State *L) { -#if !USE_TMPNAME - luaL_error(L, "`tmpname' not supported"); - return 0; -#else - char buff[L_tmpnam]; - if (tmpnam(buff) != buff) - return luaL_error(L, "unable to generate a unique filename in `tmpname'"); - lua_pushstring(L, buff); - return 1; -#endif -} - - -static int io_getenv (lua_State *L) { - lua_pushstring(L, getenv(luaL_checkstring(L, 1))); /* if NULL push nil */ - return 1; -} - - -static int io_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_pushstring(L, key); - lua_pushnumber(L, value); - lua_rawset(L, -3); -} - -static void setboolfield (lua_State *L, const char *key, int value) { - lua_pushstring(L, key); - lua_pushboolean(L, value); - lua_rawset(L, -3); -} - -static int getboolfield (lua_State *L, const char *key) { - int res; - lua_pushstring(L, key); - lua_gettable(L, -2); - res = lua_toboolean(L, -1); - lua_pop(L, 1); - return res; -} - - -static int getfield (lua_State *L, const char *key, int d) { - int res; - lua_pushstring(L, key); - lua_gettable(L, -2); - if (lua_isnumber(L, -1)) - res = (int)(lua_tonumber(L, -1)); - else { - if (d == -2) - return luaL_error(L, "field `%s' missing in date table", key); - res = d; - } - lua_pop(L, 1); - return res; -} - - -static int io_date (lua_State *L) { - const char *s = luaL_optstring(L, 1, "%c"); - time_t t = (time_t)(luaL_optnumber(L, 2, -1)); - struct tm *stm; - if (t == (time_t)(-1)) /* no time given? */ - t = time(NULL); /* use current time */ - if (*s == '!') { /* UTC? */ - stm = gmtime(&t); - s++; /* skip `!' */ - } - else - stm = localtime(&t); - if (stm == NULL) /* invalid date? */ - lua_pushnil(L); - else if (strcmp(s, "*t") == 0) { - lua_newtable(L); - 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 b[256]; - if (strftime(b, sizeof(b), s, stm)) - lua_pushstring(L, b); - else - return luaL_error(L, "`date' format too long"); - } - return 1; -} - - -static int io_time (lua_State *L) { - if (lua_isnoneornil(L, 1)) /* called without args? */ - lua_pushnumber(L, time(NULL)); /* return current time */ - else { - time_t t; - 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", -2); - ts.tm_mon = getfield(L, "month", -2) - 1; - ts.tm_year = getfield(L, "year", -2) - 1900; - ts.tm_isdst = getboolfield(L, "isdst"); - t = mktime(&ts); - if (t == (time_t)(-1)) - lua_pushnil(L); - else - lua_pushnumber(L, t); - } - return 1; -} - - -static int io_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 io_setloc (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 = lua_tostring(L, 1); - int op = luaL_findstring(luaL_optstring(L, 2, "all"), catnames); - luaL_argcheck(L, l || lua_isnoneornil(L, 1), 1, "string expected"); - luaL_argcheck(L, op != -1, 2, "invalid option"); - lua_pushstring(L, setlocale(cat[op], l)); - return 1; -} - - -static int io_exit (lua_State *L) { - exit(luaL_optint(L, 1, EXIT_SUCCESS)); - return 0; /* to avoid warnings */ -} - -static const luaL_reg syslib[] = { - {"clock", io_clock}, - {"date", io_date}, - {"difftime", io_difftime}, - {"execute", io_execute}, - {"exit", io_exit}, - {"getenv", io_getenv}, - {"remove", io_remove}, - {"rename", io_rename}, - {"setlocale", io_setloc}, - {"time", io_time}, - {"tmpname", io_tmpname}, - {NULL, NULL} -}; - -/* }====================================================== */ - - - -LUALIB_API int luaopen_io (lua_State *L) { - luaL_openlib(L, LUA_OSLIBNAME, syslib, 0); - createmeta(L); - lua_pushvalue(L, -1); - luaL_openlib(L, LUA_IOLIBNAME, iolib, 1); - /* put predefined file handles into `io' table */ - registerfile(L, stdin, "stdin", IO_INPUT); - registerfile(L, stdout, "stdout", IO_OUTPUT); - registerfile(L, stderr, "stderr", NULL); - return 1; -} - diff --git a/contrib/lua50/src/lib/lmathlib.c b/contrib/lua50/src/lib/lmathlib.c deleted file mode 100644 index f074a56ee..000000000 --- a/contrib/lua50/src/lib/lmathlib.c +++ /dev/null @@ -1,246 +0,0 @@ -/* -** $Id: lmathlib.c,v 1.56 2003/03/11 12:30:37 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 (3.14159265358979323846) -#define RADIANS_PER_DEGREE (PI/180.0) - - - -/* -** If you want Lua to operate in degrees (instead of radians), -** define USE_DEGREES -*/ -#ifdef USE_DEGREES -#define FROMRAD(a) ((a)/RADIANS_PER_DEGREE) -#define TORAD(a) ((a)*RADIANS_PER_DEGREE) -#else -#define FROMRAD(a) (a) -#define TORAD(a) (a) -#endif - - -static int math_abs (lua_State *L) { - lua_pushnumber(L, fabs(luaL_checknumber(L, 1))); - return 1; -} - -static int math_sin (lua_State *L) { - lua_pushnumber(L, sin(TORAD(luaL_checknumber(L, 1)))); - return 1; -} - -static int math_cos (lua_State *L) { - lua_pushnumber(L, cos(TORAD(luaL_checknumber(L, 1)))); - return 1; -} - -static int math_tan (lua_State *L) { - lua_pushnumber(L, tan(TORAD(luaL_checknumber(L, 1)))); - return 1; -} - -static int math_asin (lua_State *L) { - lua_pushnumber(L, FROMRAD(asin(luaL_checknumber(L, 1)))); - return 1; -} - -static int math_acos (lua_State *L) { - lua_pushnumber(L, FROMRAD(acos(luaL_checknumber(L, 1)))); - return 1; -} - -static int math_atan (lua_State *L) { - lua_pushnumber(L, FROMRAD(atan(luaL_checknumber(L, 1)))); - return 1; -} - -static int math_atan2 (lua_State *L) { - lua_pushnumber(L, FROMRAD(atan2(luaL_checknumber(L, 1), luaL_checknumber(L, 2)))); - return 1; -} - -static int math_ceil (lua_State *L) { - lua_pushnumber(L, ceil(luaL_checknumber(L, 1))); - return 1; -} - -static int math_floor (lua_State *L) { - lua_pushnumber(L, floor(luaL_checknumber(L, 1))); - return 1; -} - -static int math_mod (lua_State *L) { - lua_pushnumber(L, fmod(luaL_checknumber(L, 1), luaL_checknumber(L, 2))); - return 1; -} - -static int math_sqrt (lua_State *L) { - lua_pushnumber(L, sqrt(luaL_checknumber(L, 1))); - return 1; -} - -static int math_pow (lua_State *L) { - lua_pushnumber(L, pow(luaL_checknumber(L, 1), luaL_checknumber(L, 2))); - return 1; -} - -static int math_log (lua_State *L) { - lua_pushnumber(L, log(luaL_checknumber(L, 1))); - return 1; -} - -static int math_log10 (lua_State *L) { - lua_pushnumber(L, log10(luaL_checknumber(L, 1))); - return 1; -} - -static int math_exp (lua_State *L) { - lua_pushnumber(L, 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, frexp(luaL_checknumber(L, 1), &e)); - lua_pushnumber(L, e); - return 2; -} - -static int math_ldexp (lua_State *L) { - lua_pushnumber(L, ldexp(luaL_checknumber(L, 1), luaL_checkint(L, 2))); - 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 */ - int u = luaL_checkint(L, 1); - luaL_argcheck(L, 1<=u, 1, "interval is empty"); - lua_pushnumber(L, (int)floor(r*u)+1); /* int between 1 and `u' */ - break; - } - case 2: { /* lower and upper limits */ - int l = luaL_checkint(L, 1); - int u = luaL_checkint(L, 2); - luaL_argcheck(L, l<=u, 2, "interval is empty"); - lua_pushnumber(L, (int)floor(r*(u-l+1))+l); /* int between `l' and `u' */ - break; - } - default: return luaL_error(L, "wrong number of arguments"); - } - return 1; -} - - -static int math_randomseed (lua_State *L) { - srand(luaL_checkint(L, 1)); - return 0; -} - - -static const luaL_reg mathlib[] = { - {"abs", math_abs}, - {"sin", math_sin}, - {"cos", math_cos}, - {"tan", math_tan}, - {"asin", math_asin}, - {"acos", math_acos}, - {"atan", math_atan}, - {"atan2", math_atan2}, - {"ceil", math_ceil}, - {"floor", math_floor}, - {"mod", math_mod}, - {"frexp", math_frexp}, - {"ldexp", math_ldexp}, - {"sqrt", math_sqrt}, - {"min", math_min}, - {"max", math_max}, - {"log", math_log}, - {"log10", math_log10}, - {"exp", math_exp}, - {"deg", math_deg}, - {"pow", math_pow}, - {"rad", math_rad}, - {"random", math_random}, - {"randomseed", math_randomseed}, - {NULL, NULL} -}; - - -/* -** Open math library -*/ -LUALIB_API int luaopen_math (lua_State *L) { - luaL_openlib(L, LUA_MATHLIBNAME, mathlib, 0); - lua_pushliteral(L, "pi"); - lua_pushnumber(L, PI); - lua_settable(L, -3); - lua_pushliteral(L, "__pow"); - lua_pushcfunction(L, math_pow); - lua_settable(L, LUA_GLOBALSINDEX); - return 1; -} - diff --git a/contrib/lua50/src/lib/loadlib.c b/contrib/lua50/src/lib/loadlib.c deleted file mode 100644 index 0cba2fc38..000000000 --- a/contrib/lua50/src/lib/loadlib.c +++ /dev/null @@ -1,205 +0,0 @@ -/* -** $Id: loadlib.c,v 1.4 2003/04/07 20:11:53 roberto Exp $ -** Dynamic library loader for Lua -** See Copyright Notice in lua.h -* -* This Lua library exports a single function, called loadlib, which is -* called from Lua as loadlib(lib,init), where lib is the full name of the -* library to be loaded (including the complete path) and init is the name -* of a function to be called after the library is loaded. Typically, this -* function will register other functions, thus making the complete library -* available to Lua. The init function is *not* automatically called by -* loadlib. Instead, loadlib returns the init function as a Lua function -* that the client can call when it thinks is appropriate. In the case of -* errors, loadlib returns nil and two strings describing the error. -* The first string is supplied by the operating system; it should be -* informative and useful for error messages. The second string is "open", -* "init", or "absent" to identify the error and is meant to be used for -* making decisions without having to look into the first string (whose -* format is system-dependent). -* -* This module contains an implementation of loadlib for Unix systems that -* have dlfcn, an implementation for Windows, and a stub for other systems. -* See the list at the end of this file for some links to available -* implementations of dlfcn and interfaces to other native dynamic loaders -* on top of which loadlib could be implemented. -* -*/ - -#include "lua.h" -#include "lauxlib.h" -#include "lualib.h" - - -#undef LOADLIB - - -#ifdef USE_DLOPEN -#define LOADLIB -/* -* 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 int loadlib(lua_State *L) -{ - const char *path=luaL_checkstring(L,1); - const char *init=luaL_checkstring(L,2); - void *lib=dlopen(path,RTLD_NOW); - if (lib!=NULL) - { - lua_CFunction f=(lua_CFunction) dlsym(lib,init); - if (f!=NULL) - { - lua_pushlightuserdata(L,lib); - lua_pushcclosure(L,f,1); - return 1; - } - } - /* else return appropriate error messages */ - lua_pushnil(L); - lua_pushstring(L,dlerror()); - lua_pushstring(L,(lib!=NULL) ? "init" : "open"); - if (lib!=NULL) dlclose(lib); - return 3; -} - -#endif - - - -/* -** In Windows, default is to use dll; otherwise, default is not to use dll -*/ -#ifndef USE_DLL -#ifdef _WIN32 -#define USE_DLL 1 -#else -#define USE_DLL 0 -#endif -#endif - - -#if USE_DLL -#define LOADLIB -/* -* This is an implementation of loadlib for Windows using native functions. -*/ - -#include - -static void pusherror(lua_State *L) -{ - int error=GetLastError(); - char buffer[128]; - if (FormatMessageA(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM, - 0, error, 0, buffer, sizeof(buffer), 0)) - lua_pushstring(L,buffer); - else - lua_pushfstring(L,"system error %d\n",error); -} - -static int loadlib(lua_State *L) -{ - const char *path=luaL_checkstring(L,1); - const char *init=luaL_checkstring(L,2); - HINSTANCE lib=LoadLibraryA(path); - if (lib!=NULL) - { - lua_CFunction f=(lua_CFunction) GetProcAddress(lib,init); - if (f!=NULL) - { - lua_pushlightuserdata(L,lib); - lua_pushcclosure(L,f,1); - return 1; - } - } - lua_pushnil(L); - pusherror(L); - lua_pushstring(L,(lib!=NULL) ? "init" : "open"); - if (lib!=NULL) FreeLibrary(lib); - return 3; -} - -#endif - - - -#ifndef LOADLIB -/* Fallback for other systems */ - -/* -** Those systems support dlopen, so they should have defined USE_DLOPEN. -** The default (no)implementation gives them a special error message. -*/ -#ifdef linux -#define LOADLIB -#endif - -#ifdef sun -#define LOADLIB -#endif - -#ifdef sgi -#define LOADLIB -#endif - -#ifdef BSD -#define LOADLIB -#endif - -#ifdef _WIN32 -#define LOADLIB -#endif - -#ifdef LOADLIB -#undef LOADLIB -#define LOADLIB "`loadlib' not installed (check your Lua configuration)" -#else -#define LOADLIB "`loadlib' not supported" -#endif - -static int loadlib(lua_State *L) -{ - lua_pushnil(L); - lua_pushliteral(L,LOADLIB); - lua_pushliteral(L,"absent"); - return 3; -} -#endif - -LUALIB_API int luaopen_loadlib (lua_State *L) -{ - lua_register(L,"loadlib",loadlib); - return 0; -} - -/* -* Here are some links to available implementations of dlfcn and -* interfaces to other native dynamic loaders on top of which loadlib -* could be implemented. Please send contributions and corrections to us. -* -* AIX -* Starting with AIX 4.2, dlfcn is included in the base OS. -* There is also an emulation package available. -* http://www.faqs.org/faqs/aix-faq/part4/section-21.html -* -* HPUX -* HPUX 11 has dlfcn. For HPUX 10 use shl_*. -* http://www.geda.seul.org/mailinglist/geda-dev37/msg00094.html -* http://www.stat.umn.edu/~luke/xls/projects/dlbasics/dlbasics.html -* -* Macintosh, Windows -* http://www.stat.umn.edu/~luke/xls/projects/dlbasics/dlbasics.html -* -* Mac OS X/Darwin -* http://www.opendarwin.org/projects/dlcompat/ -* -* GLIB has wrapper code for BeOS, OS2, Unix and Windows -* http://cvs.gnome.org/lxr/source/glib/gmodule/ -* -*/ diff --git a/contrib/lua50/src/lib/lstrlib.c b/contrib/lua50/src/lib/lstrlib.c deleted file mode 100644 index 8752e3aba..000000000 --- a/contrib/lua50/src/lib/lstrlib.c +++ /dev/null @@ -1,770 +0,0 @@ -/* -** $Id: lstrlib.c,v 1.98 2003/04/03 13:35:34 roberto Exp $ -** Standard library for string operations and pattern-matching -** See Copyright Notice in lua.h -*/ - - -#include -#include -#include -#include -#include - -#define lstrlib_c - -#include "lua.h" - -#include "lauxlib.h" -#include "lualib.h" - - -/* macro to `unsign' a character */ -#ifndef uchar -#define uchar(c) ((unsigned char)(c)) -#endif - - -typedef long sint32; /* a signed version for size_t */ - - -static int str_len (lua_State *L) { - size_t l; - luaL_checklstring(L, 1, &l); - lua_pushnumber(L, (lua_Number)l); - return 1; -} - - -static sint32 posrelat (sint32 pos, size_t len) { - /* relative string position: negative means back from end */ - return (pos>=0) ? pos : (sint32)len+pos+1; -} - - -static int str_sub (lua_State *L) { - size_t l; - const char *s = luaL_checklstring(L, 1, &l); - sint32 start = posrelat(luaL_checklong(L, 2), l); - sint32 end = posrelat(luaL_optlong(L, 3, -1), l); - if (start < 1) start = 1; - if (end > (sint32)l) end = (sint32)l; - if (start <= end) - lua_pushlstring(L, s+start-1, end-start+1); - else lua_pushliteral(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); - luaL_buffinit(L, &b); - for (i=0; i 0) - luaL_addlstring(&b, s, l); - luaL_pushresult(&b); - return 1; -} - - -static int str_byte (lua_State *L) { - size_t l; - const char *s = luaL_checklstring(L, 1, &l); - sint32 pos = posrelat(luaL_optlong(L, 2, 1), l); - if (pos <= 0 || (size_t)(pos) > l) /* index out of range? */ - return 0; /* no answer */ - lua_pushnumber(L, uchar(s[pos-1])); - return 1; -} - - -static int str_char (lua_State *L) { - int n = lua_gettop(L); /* number of arguments */ - int i; - luaL_Buffer b; - luaL_buffinit(L, &b); - for (i=1; i<=n; i++) { - int c = luaL_checkint(L, i); - luaL_argcheck(L, uchar(c) == c, i, "invalid value"); - luaL_putchar(&b, uchar(c)); - } - luaL_pushresult(&b); - return 1; -} - - -static int writer (lua_State *L, const void* b, size_t size, void* B) { - (void)L; - luaL_addlstring((luaL_Buffer*) B, (const char *)b, size); - return 1; -} - - -static int str_dump (lua_State *L) { - luaL_Buffer b; - luaL_checktype(L, 1, LUA_TFUNCTION); - luaL_buffinit(L,&b); - if (!lua_dump(L, writer, &b)) - luaL_error(L, "unable to dump given function"); - luaL_pushresult(&b); - return 1; -} - - - -/* -** {====================================================== -** PATTERN MATCHING -** ======================================================= -*/ - -#ifndef MAX_CAPTURES -#define MAX_CAPTURES 32 /* arbitrary limit */ -#endif - - -#define CAP_UNFINISHED (-1) -#define CAP_POSITION (-2) - -typedef struct MatchState { - const char *src_init; /* init of source string */ - const char *src_end; /* end (`\0') of source string */ - lua_State *L; - int level; /* total number of captures (finished or unfinished) */ - struct { - const char *init; - sint32 len; - } capture[MAX_CAPTURES]; -} MatchState; - - -#define ESC '%' -#define SPECIALS "^$*+?.([%-" - - -static int check_capture (MatchState *ms, int l) { - l -= '1'; - if (l < 0 || l >= ms->level || ms->capture[l].len == CAP_UNFINISHED) - return luaL_error(ms->L, "invalid capture index"); - 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 *luaI_classend (MatchState *ms, const char *p) { - switch (*p++) { - case ESC: { - if (*p == '\0') - luaL_error(ms->L, "malformed pattern (ends with `%')"); - return p+1; - } - case '[': { - if (*p == '^') p++; - do { /* look for a `]' */ - if (*p == '\0') - luaL_error(ms->L, "malformed pattern (missing `]')"); - if (*(p++) == ESC && *p != '\0') - 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 '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; - 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 == ESC) { - p++; - if (match_class(c, *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 luaI_singlematch (int c, const char *p, const char *ep) { - switch (*p) { - case '.': return 1; /* matches any char */ - case ESC: return match_class(c, *(p+1)); - case '[': return matchbracketclass(c, p, ep-1); - default: return (uchar(*p) == c); - } -} - - -static const char *match (MatchState *ms, const char *s, const char *p); - - -static const char *matchbalance (MatchState *ms, const char *s, - const char *p) { - if (*p == 0 || *(p+1) == 0) - luaL_error(ms->L, "unbalanced pattern"); - 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) { - sint32 i = 0; /* counts maximum expand for item */ - while ((s+i)src_end && luaI_singlematch(uchar(*(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 (ssrc_end && luaI_singlematch(uchar(*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 >= MAX_CAPTURES) 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) { - init: /* using goto's to optimize tail recursion */ - switch (*p) { - case '(': { /* start capture */ - if (*(p+1) == ')') /* position capture? */ - return start_capture(ms, s, p+2, CAP_POSITION); - else - return start_capture(ms, s, p+1, CAP_UNFINISHED); - } - case ')': { /* end capture */ - return end_capture(ms, s, p+1); - } - case ESC: { - switch (*(p+1)) { - case 'b': { /* balanced string? */ - s = matchbalance(ms, s, p+2); - if (s == NULL) return NULL; - p+=4; goto init; /* else return match(ms, s, p+4); */ - } - case 'f': { /* frontier? */ - const char *ep; char previous; - p += 2; - if (*p != '[') - luaL_error(ms->L, "missing `[' after `%%f' in pattern"); - ep = luaI_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)) return NULL; - p=ep; goto init; /* else return match(ms, s, ep); */ - } - default: { - if (isdigit(uchar(*(p+1)))) { /* capture results (%0-%9)? */ - s = match_capture(ms, s, *(p+1)); - if (s == NULL) return NULL; - p+=2; goto init; /* else return match(ms, s, p+2) */ - } - goto dflt; /* case default */ - } - } - } - case '\0': { /* end of pattern */ - return s; /* match succeeded */ - } - case '$': { - if (*(p+1) == '\0') /* is the `$' the last char in pattern? */ - return (s == ms->src_end) ? s : NULL; /* check end of string */ - else goto dflt; - } - default: dflt: { /* it is a pattern item */ - const char *ep = luaI_classend(ms, p); /* points to what is next */ - int m = ssrc_end && luaI_singlematch(uchar(*s), p, ep); - switch (*ep) { - case '?': { /* optional */ - const char *res; - if (m && ((res=match(ms, s+1, ep+1)) != NULL)) - return res; - p=ep+1; goto init; /* else return match(ms, s, ep+1); */ - } - case '*': { /* 0 or more repetitions */ - return max_expand(ms, s, p, ep); - } - case '+': { /* 1 or more repetitions */ - return (m ? max_expand(ms, s+1, p, ep) : NULL); - } - case '-': { /* 0 or more repetitions (minimum) */ - return min_expand(ms, s, p, ep); - } - default: { - if (!m) return NULL; - s++; p=ep; goto init; /* else return match(ms, s+1, ep); */ - } - } - } - } -} - - - -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) { - int l = ms->capture[i].len; - if (l == CAP_UNFINISHED) luaL_error(ms->L, "unfinished capture"); - if (l == CAP_POSITION) - lua_pushnumber(ms->L, (lua_Number)(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; - luaL_checkstack(ms->L, ms->level, "too many captures"); - if (ms->level == 0 && s) { /* no explicit captures? */ - lua_pushlstring(ms->L, s, e-s); /* return whole match */ - return 1; - } - else { /* return all captures */ - for (i=0; ilevel; i++) - push_onecapture(ms, i); - return ms->level; /* number of strings pushed */ - } -} - - -static int str_find (lua_State *L) { - size_t l1, l2; - const char *s = luaL_checklstring(L, 1, &l1); - const char *p = luaL_checklstring(L, 2, &l2); - sint32 init = posrelat(luaL_optlong(L, 3, 1), l1) - 1; - if (init < 0) init = 0; - else if ((size_t)(init) > l1) init = (sint32)l1; - if (lua_toboolean(L, 4) || /* explicit request? */ - strpbrk(p, SPECIALS) == NULL) { /* or no special characters? */ - /* do a plain search */ - const char *s2 = lmemfind(s+init, l1-init, p, l2); - if (s2) { - lua_pushnumber(L, (lua_Number)(s2-s+1)); - lua_pushnumber(L, (lua_Number)(s2-s+l2)); - return 2; - } - } - else { - MatchState ms; - int anchor = (*p == '^') ? (p++, 1) : 0; - const char *s1=s+init; - ms.L = L; - ms.src_init = s; - ms.src_end = s+l1; - do { - const char *res; - ms.level = 0; - if ((res=match(&ms, s1, p)) != NULL) { - lua_pushnumber(L, (lua_Number)(s1-s+1)); /* start */ - lua_pushnumber(L, (lua_Number)(res-s)); /* end */ - return push_captures(&ms, NULL, 0) + 2; - } - } while (s1++L; - if (lua_isstring(L, 3)) { - const char *news = lua_tostring(L, 3); - size_t l = lua_strlen(L, 3); - size_t i; - for (i=0; i= 3 && (lua_isstring(L, 3) || lua_isfunction(L, 3)), - 3, "string or function expected"); - luaL_buffinit(L, &b); - ms.L = L; - ms.src_init = src; - ms.src_end = src+srcl; - while (n < max_s) { - const char *e; - ms.level = 0; - e = match(&ms, src, p); - if (e) { - n++; - add_s(&ms, &b, src, e); - } - if (e && e>src) /* non empty match? */ - src = e; /* skip it */ - else if (src < ms.src_end) - luaL_putchar(&b, *src++); - else break; - if (anchor) break; - } - luaL_addlstring(&b, src, ms.src_end-src); - luaL_pushresult(&b); - lua_pushnumber(L, (lua_Number)n); /* number of substitutions */ - return 2; -} - -/* }====================================================== */ - - -/* maximum size of each formatted item (> len(format('%99.99f', -1e308))) */ -#define MAX_ITEM 512 -/* maximum size of each format specification (such as '%-099.99d') */ -#define MAX_FORMAT 20 - - -static void luaI_addquoted (lua_State *L, luaL_Buffer *b, int arg) { - size_t l; - const char *s = luaL_checklstring(L, arg, &l); - luaL_putchar(b, '"'); - while (l--) { - switch (*s) { - case '"': case '\\': case '\n': { - luaL_putchar(b, '\\'); - luaL_putchar(b, *s); - break; - } - case '\0': { - luaL_addlstring(b, "\\000", 4); - break; - } - default: { - luaL_putchar(b, *s); - break; - } - } - s++; - } - luaL_putchar(b, '"'); -} - - -static const char *scanformat (lua_State *L, const char *strfrmt, - char *form, int *hasprecision) { - const char *p = strfrmt; - while (strchr("-+ #0", *p)) p++; /* skip flags */ - if (isdigit(uchar(*p))) p++; /* skip width */ - if (isdigit(uchar(*p))) p++; /* (2 digits at most) */ - if (*p == '.') { - p++; - *hasprecision = 1; - 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)"); - if (p-strfrmt+2 > MAX_FORMAT) /* +2 to include `%' and the specifier */ - luaL_error(L, "invalid format (too long)"); - form[0] = '%'; - strncpy(form+1, strfrmt, p-strfrmt+1); - form[p-strfrmt+2] = 0; - return p; -} - - -static int str_format (lua_State *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 != '%') - luaL_putchar(&b, *strfrmt++); - else if (*++strfrmt == '%') - luaL_putchar(&b, *strfrmt++); /* %% */ - else { /* format item */ - char form[MAX_FORMAT]; /* to store the format (`%...') */ - char buff[MAX_ITEM]; /* to store the formatted item */ - int hasprecision = 0; - if (isdigit(uchar(*strfrmt)) && *(strfrmt+1) == '$') - return luaL_error(L, "obsolete option (d$) to `format'"); - arg++; - strfrmt = scanformat(L, strfrmt, form, &hasprecision); - switch (*strfrmt++) { - case 'c': case 'd': case 'i': { - sprintf(buff, form, luaL_checkint(L, arg)); - break; - } - case 'o': case 'u': case 'x': case 'X': { - sprintf(buff, form, (unsigned int)(luaL_checknumber(L, arg))); - break; - } - case 'e': case 'E': case 'f': - case 'g': case 'G': { - sprintf(buff, form, luaL_checknumber(L, arg)); - break; - } - case 'q': { - luaI_addquoted(L, &b, arg); - continue; /* skip the `addsize' at the end */ - } - case 's': { - size_t l; - const char *s = luaL_checklstring(L, arg, &l); - if (!hasprecision && l >= 100) { - /* no precision and string is too long to be formatted; - keep original string */ - lua_pushvalue(L, arg); - luaL_addvalue(&b); - continue; /* skip the `addsize' at the end */ - } - else { - sprintf(buff, form, s); - break; - } - } - default: { /* also treat cases `pnLlh' */ - return luaL_error(L, "invalid option to `format'"); - } - } - luaL_addlstring(&b, buff, strlen(buff)); - } - } - luaL_pushresult(&b); - return 1; -} - - -static const luaL_reg strlib[] = { - {"len", str_len}, - {"sub", str_sub}, - {"lower", str_lower}, - {"upper", str_upper}, - {"char", str_char}, - {"rep", str_rep}, - {"byte", str_byte}, - {"format", str_format}, - {"dump", str_dump}, - {"find", str_find}, - {"gfind", gfind}, - {"gsub", str_gsub}, - {NULL, NULL} -}; - - -/* -** Open string library -*/ -LUALIB_API int luaopen_string (lua_State *L) { - luaL_openlib(L, LUA_STRLIBNAME, strlib, 0); - return 1; -} - diff --git a/contrib/lua50/src/lib/ltablib.c b/contrib/lua50/src/lib/ltablib.c deleted file mode 100644 index c9bb2d1b7..000000000 --- a/contrib/lua50/src/lib/ltablib.c +++ /dev/null @@ -1,250 +0,0 @@ -/* -** $Id: ltablib.c,v 1.21 2003/04/03 13:35:34 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_getn(L, n)) - - -static int luaB_foreachi (lua_State *L) { - int i; - int n = aux_getn(L, 1); - luaL_checktype(L, 2, LUA_TFUNCTION); - for (i=1; i<=n; i++) { - lua_pushvalue(L, 2); /* function */ - lua_pushnumber(L, (lua_Number)i); /* 1st argument */ - lua_rawgeti(L, 1, i); /* 2nd argument */ - lua_call(L, 2, 1); - if (!lua_isnil(L, -1)) - return 1; - lua_pop(L, 1); /* remove nil result */ - } - return 0; -} - - -static int luaB_foreach (lua_State *L) { - luaL_checktype(L, 1, LUA_TTABLE); - luaL_checktype(L, 2, LUA_TFUNCTION); - lua_pushnil(L); /* first key */ - for (;;) { - if (lua_next(L, 1) == 0) - return 0; - lua_pushvalue(L, 2); /* function */ - lua_pushvalue(L, -3); /* key */ - lua_pushvalue(L, -3); /* value */ - lua_call(L, 2, 1); - if (!lua_isnil(L, -1)) - return 1; - lua_pop(L, 2); /* remove value and result */ - } -} - - -static int luaB_getn (lua_State *L) { - lua_pushnumber(L, (lua_Number)aux_getn(L, 1)); - return 1; -} - - -static int luaB_setn (lua_State *L) { - luaL_checktype(L, 1, LUA_TTABLE); - luaL_setn(L, 1, luaL_checkint(L, 2)); - return 0; -} - - -static int luaB_tinsert (lua_State *L) { - int v = lua_gettop(L); /* number of arguments */ - int n = aux_getn(L, 1) + 1; - int pos; /* where to insert new element */ - if (v == 2) /* called with only 2 arguments */ - pos = n; /* insert new element at the end */ - else { - pos = luaL_checkint(L, 2); /* 2nd argument is the position */ - if (pos > n) n = pos; /* `grow' array if necessary */ - v = 3; /* function may be called with more than 3 args */ - } - luaL_setn(L, 1, n); /* new size */ - while (--n >= pos) { /* move up elements */ - lua_rawgeti(L, 1, n); - lua_rawseti(L, 1, n+1); /* t[n+1] = t[n] */ - } - lua_pushvalue(L, v); - lua_rawseti(L, 1, pos); /* t[pos] = v */ - return 0; -} - - -static int luaB_tremove (lua_State *L) { - int n = aux_getn(L, 1); - int pos = luaL_optint(L, 2, n); - if (n <= 0) return 0; /* table is `empty' */ - luaL_setn(L, 1, n-1); /* t.n = n-1 */ - lua_rawgeti(L, 1, pos); /* result = t[pos] */ - for ( ;pos= 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 -#include - -#define llex_c - -#include "lua.h" - -#include "ldo.h" -#include "llex.h" -#include "lobject.h" -#include "lparser.h" -#include "lstate.h" -#include "lstring.h" -#include "lzio.h" - - - -#define next(LS) (LS->current = zgetc(LS->z)) - - - -/* ORDER RESERVED */ -static const char *const token2string [] = { - "and", "break", "do", "else", "elseif", - "end", "false", "for", "function", "if", - "in", "local", "nil", "not", "or", "repeat", - "return", "then", "true", "until", "while", "*name", - "..", "...", "==", ">=", "<=", "~=", - "*number", "*string", "" -}; - - -void luaX_init (lua_State *L) { - int i; - for (i=0; itsv.reserved = cast(lu_byte, i+1); /* reserved word */ - } -} - - -#define MAXSRC 80 - - -void luaX_checklimit (LexState *ls, int val, int limit, const char *msg) { - if (val > limit) { - msg = luaO_pushfstring(ls->L, "too many %s (limit=%d)", msg, limit); - luaX_syntaxerror(ls, msg); - } -} - - -void luaX_errorline (LexState *ls, const char *s, const char *token, int line) { - lua_State *L = ls->L; - char buff[MAXSRC]; - luaO_chunkid(buff, getstr(ls->source), MAXSRC); - luaO_pushfstring(L, "%s:%d: %s near `%s'", buff, line, s, token); - luaD_throw(L, LUA_ERRSYNTAX); -} - - -static void luaX_error (LexState *ls, const char *s, const char *token) { - luaX_errorline(ls, s, token, ls->linenumber); -} - - -void luaX_syntaxerror (LexState *ls, const char *msg) { - const char *lasttoken; - switch (ls->t.token) { - case TK_NAME: - lasttoken = getstr(ls->t.seminfo.ts); - break; - case TK_STRING: - case TK_NUMBER: - lasttoken = luaZ_buffer(ls->buff); - break; - default: - lasttoken = luaX_token2str(ls, ls->t.token); - break; - } - luaX_error(ls, msg, lasttoken); -} - - -const char *luaX_token2str (LexState *ls, int token) { - if (token < FIRST_RESERVED) { - lua_assert(token == (unsigned char)token); - return luaO_pushfstring(ls->L, "%c", token); - } - else - return token2string[token-FIRST_RESERVED]; -} - - -static void luaX_lexerror (LexState *ls, const char *s, int token) { - if (token == TK_EOS) - luaX_error(ls, s, luaX_token2str(ls, token)); - else - luaX_error(ls, s, luaZ_buffer(ls->buff)); -} - - -static void inclinenumber (LexState *LS) { - next(LS); /* skip `\n' */ - ++LS->linenumber; - luaX_checklimit(LS, LS->linenumber, MAX_INT, "lines in a chunk"); -} - - -void luaX_setinput (lua_State *L, LexState *LS, ZIO *z, TString *source) { - LS->L = L; - LS->lookahead.token = TK_EOS; /* no look-ahead token */ - LS->z = z; - LS->fs = NULL; - LS->linenumber = 1; - LS->lastline = 1; - LS->source = source; - next(LS); /* read first char */ - if (LS->current == '#') { - do { /* skip first line */ - next(LS); - } while (LS->current != '\n' && LS->current != EOZ); - } -} - - - -/* -** ======================================================= -** LEXICAL ANALYZER -** ======================================================= -*/ - - -/* use buffer to store names, literal strings and numbers */ - -/* extra space to allocate when growing buffer */ -#define EXTRABUFF 32 - -/* maximum number of chars that can be read without checking buffer size */ -#define MAXNOCHECK 5 - -#define checkbuffer(LS, len) \ - if (((len)+MAXNOCHECK)*sizeof(char) > luaZ_sizebuffer((LS)->buff)) \ - luaZ_openspace((LS)->L, (LS)->buff, (len)+EXTRABUFF) - -#define save(LS, c, l) \ - (luaZ_buffer((LS)->buff)[l++] = cast(char, c)) -#define save_and_next(LS, l) (save(LS, LS->current, l), next(LS)) - - -static size_t readname (LexState *LS) { - size_t l = 0; - checkbuffer(LS, l); - do { - checkbuffer(LS, l); - save_and_next(LS, l); - } while (isalnum(LS->current) || LS->current == '_'); - save(LS, '\0', l); - return l-1; -} - - -/* LUA_NUMBER */ -static void read_numeral (LexState *LS, int comma, SemInfo *seminfo) { - size_t l = 0; - checkbuffer(LS, l); - if (comma) save(LS, '.', l); - while (isdigit(LS->current)) { - checkbuffer(LS, l); - save_and_next(LS, l); - } - if (LS->current == '.') { - save_and_next(LS, l); - if (LS->current == '.') { - save_and_next(LS, l); - save(LS, '\0', l); - luaX_lexerror(LS, - "ambiguous syntax (decimal point x string concatenation)", - TK_NUMBER); - } - } - while (isdigit(LS->current)) { - checkbuffer(LS, l); - save_and_next(LS, l); - } - if (LS->current == 'e' || LS->current == 'E') { - save_and_next(LS, l); /* read `E' */ - if (LS->current == '+' || LS->current == '-') - save_and_next(LS, l); /* optional exponent sign */ - while (isdigit(LS->current)) { - checkbuffer(LS, l); - save_and_next(LS, l); - } - } - save(LS, '\0', l); - if (!luaO_str2d(luaZ_buffer(LS->buff), &seminfo->r)) - luaX_lexerror(LS, "malformed number", TK_NUMBER); -} - - -static void read_long_string (LexState *LS, SemInfo *seminfo) { - int cont = 0; - size_t l = 0; - checkbuffer(LS, l); - save(LS, '[', l); /* save first `[' */ - save_and_next(LS, l); /* pass the second `[' */ - if (LS->current == '\n') /* string starts with a newline? */ - inclinenumber(LS); /* skip it */ - for (;;) { - checkbuffer(LS, l); - switch (LS->current) { - case EOZ: - save(LS, '\0', l); - luaX_lexerror(LS, (seminfo) ? "unfinished long string" : - "unfinished long comment", TK_EOS); - break; /* to avoid warnings */ - case '[': - save_and_next(LS, l); - if (LS->current == '[') { - cont++; - save_and_next(LS, l); - } - continue; - case ']': - save_and_next(LS, l); - if (LS->current == ']') { - if (cont == 0) goto endloop; - cont--; - save_and_next(LS, l); - } - continue; - case '\n': - save(LS, '\n', l); - inclinenumber(LS); - if (!seminfo) l = 0; /* reset buffer to avoid wasting space */ - continue; - default: - save_and_next(LS, l); - } - } endloop: - save_and_next(LS, l); /* skip the second `]' */ - save(LS, '\0', l); - if (seminfo) - seminfo->ts = luaS_newlstr(LS->L, luaZ_buffer(LS->buff) + 2, l - 5); -} - - -static void read_string (LexState *LS, int del, SemInfo *seminfo) { - size_t l = 0; - checkbuffer(LS, l); - save_and_next(LS, l); - while (LS->current != del) { - checkbuffer(LS, l); - switch (LS->current) { - case EOZ: - save(LS, '\0', l); - luaX_lexerror(LS, "unfinished string", TK_EOS); - break; /* to avoid warnings */ - case '\n': - save(LS, '\0', l); - luaX_lexerror(LS, "unfinished string", TK_STRING); - break; /* to avoid warnings */ - case '\\': - next(LS); /* do not save the `\' */ - switch (LS->current) { - case 'a': save(LS, '\a', l); next(LS); break; - case 'b': save(LS, '\b', l); next(LS); break; - case 'f': save(LS, '\f', l); next(LS); break; - case 'n': save(LS, '\n', l); next(LS); break; - case 'r': save(LS, '\r', l); next(LS); break; - case 't': save(LS, '\t', l); next(LS); break; - case 'v': save(LS, '\v', l); next(LS); break; - case '\n': save(LS, '\n', l); inclinenumber(LS); break; - case EOZ: break; /* will raise an error next loop */ - default: { - if (!isdigit(LS->current)) - save_and_next(LS, l); /* handles \\, \", \', and \? */ - else { /* \xxx */ - int c = 0; - int i = 0; - do { - c = 10*c + (LS->current-'0'); - next(LS); - } while (++i<3 && isdigit(LS->current)); - if (c > UCHAR_MAX) { - save(LS, '\0', l); - luaX_lexerror(LS, "escape sequence too large", TK_STRING); - } - save(LS, c, l); - } - } - } - break; - default: - save_and_next(LS, l); - } - } - save_and_next(LS, l); /* skip delimiter */ - save(LS, '\0', l); - seminfo->ts = luaS_newlstr(LS->L, luaZ_buffer(LS->buff) + 1, l - 3); -} - - -int luaX_lex (LexState *LS, SemInfo *seminfo) { - for (;;) { - switch (LS->current) { - - case '\n': { - inclinenumber(LS); - continue; - } - case '-': { - next(LS); - if (LS->current != '-') return '-'; - /* else is a comment */ - next(LS); - if (LS->current == '[' && (next(LS), LS->current == '[')) - read_long_string(LS, NULL); /* long comment */ - else /* short comment */ - while (LS->current != '\n' && LS->current != EOZ) - next(LS); - continue; - } - case '[': { - next(LS); - if (LS->current != '[') return '['; - else { - read_long_string(LS, seminfo); - return 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 '"': - case '\'': { - read_string(LS, LS->current, seminfo); - return TK_STRING; - } - case '.': { - next(LS); - if (LS->current == '.') { - next(LS); - if (LS->current == '.') { - next(LS); - return TK_DOTS; /* ... */ - } - else return TK_CONCAT; /* .. */ - } - else if (!isdigit(LS->current)) return '.'; - else { - read_numeral(LS, 1, seminfo); - return TK_NUMBER; - } - } - case EOZ: { - return TK_EOS; - } - default: { - if (isspace(LS->current)) { - next(LS); - continue; - } - else if (isdigit(LS->current)) { - read_numeral(LS, 0, seminfo); - return TK_NUMBER; - } - else if (isalpha(LS->current) || LS->current == '_') { - /* identifier or reserved word */ - size_t l = readname(LS); - TString *ts = luaS_newlstr(LS->L, luaZ_buffer(LS->buff), l); - if (ts->tsv.reserved > 0) /* reserved word? */ - return ts->tsv.reserved - 1 + FIRST_RESERVED; - seminfo->ts = ts; - return TK_NAME; - } - else { - int c = LS->current; - if (iscntrl(c)) - luaX_error(LS, "invalid control char", - luaO_pushfstring(LS->L, "char(%d)", c)); - next(LS); - return c; /* single-char tokens (+ - / ...) */ - } - } - } - } -} - -#undef next diff --git a/contrib/lua50/src/llex.h b/contrib/lua50/src/llex.h deleted file mode 100644 index 740e3f6b3..000000000 --- a/contrib/lua50/src/llex.h +++ /dev/null @@ -1,75 +0,0 @@ -/* -** $Id: llex.h,v 1.47 2003/02/28 17:19:47 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 - -/* maximum length of a reserved word */ -#define TOKEN_LEN (sizeof("function")/sizeof(char)) - - -/* -* 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_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_NAME, TK_CONCAT, TK_DOTS, TK_EQ, TK_GE, TK_LE, TK_NE, TK_NUMBER, - TK_STRING, TK_EOS -}; - -/* 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; - - -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; /* `FuncState' is private to the parser */ - struct lua_State *L; - ZIO *z; /* input stream */ - Mbuffer *buff; /* buffer for tokens */ - TString *source; /* current source name */ - int nestlevel; /* level of nested non-terminals */ -} LexState; - - -void luaX_init (lua_State *L); -void luaX_setinput (lua_State *L, LexState *LS, ZIO *z, TString *source); -int luaX_lex (LexState *LS, SemInfo *seminfo); -void luaX_checklimit (LexState *ls, int val, int limit, const char *msg); -void luaX_syntaxerror (LexState *ls, const char *s); -void luaX_errorline (LexState *ls, const char *s, const char *token, int line); -const char *luaX_token2str (LexState *ls, int token); - - -#endif diff --git a/contrib/lua50/src/llimits.h b/contrib/lua50/src/llimits.h deleted file mode 100644 index 343c92261..000000000 --- a/contrib/lua50/src/llimits.h +++ /dev/null @@ -1,185 +0,0 @@ -/* -** $Id: llimits.h,v 1.52 2003/02/20 19:33:23 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" - - -/* -** try to find number of bits in an integer -*/ -#ifndef BITS_INT -/* avoid overflows in comparison */ -#if INT_MAX-20 < 32760 -#define BITS_INT 16 -#else -#if INT_MAX > 2147483640L -/* machine has at least 32 bits */ -#define BITS_INT 32 -#else -#error "you must define BITS_INT with number of bits in an integer" -#endif -#endif -#endif - - -/* -** the following types define integer types for values that may not -** fit in a `small int' (16 bits), but may waste space in a -** `large long' (64 bits). The current definitions should work in -** any machine, but may not be optimal. -*/ - -/* an unsigned integer to hold hash values */ -typedef unsigned int lu_hash; -/* its signed equivalent */ -typedef int ls_hash; - -/* an unsigned integer big enough to count the total memory used by Lua; */ -/* it should be at least as large as size_t */ -typedef unsigned long lu_mem; - -#define MAX_LUMEM ULONG_MAX - - -/* an integer big enough to count the number of strings in use */ -typedef long ls_nstr; - -/* 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_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) ((lu_hash)(p)) - - - -/* type to ensure maximum alignment */ -#ifndef LUSER_ALIGNMENT_T -typedef union { double u; void *s; long l; } L_Umaxalign; -#else -typedef LUSER_ALIGNMENT_T L_Umaxalign; -#endif - - -/* result of `usual argument conversion' over lua_Number */ -#ifndef LUA_UACNUMBER -typedef double l_uacNumber; -#else -typedef LUA_UACNUMBER l_uacNumber; -#endif - - -#ifndef lua_assert -#define lua_assert(c) /* empty */ -#endif - - -#ifndef check_exp -#define check_exp(c,e) (e) -#endif - - -#ifndef UNUSED -#define UNUSED(x) ((void)(x)) /* to avoid warnings */ -#endif - - -#ifndef cast -#define cast(t, exp) ((t)(exp)) -#endif - - - -/* -** type for virtual-machine instructions -** must be an unsigned with (at least) 4 bytes (see details in lopcodes.h) -*/ -typedef unsigned long Instruction; - - -/* maximum depth for calls (unsigned short) */ -#ifndef LUA_MAXCALLS -#define LUA_MAXCALLS 4096 -#endif - - -/* -** maximum depth for C calls (unsigned short): Not too big, or may -** overflow the C stack... -*/ - -#ifndef LUA_MAXCCALLS -#define LUA_MAXCCALLS 200 -#endif - - -/* maximum size for the C stack */ -#ifndef LUA_MAXCSTACK -#define LUA_MAXCSTACK 2048 -#endif - - -/* maximum stack for a Lua function */ -#define MAXSTACK 250 - - -/* maximum number of variables declared in a function */ -#ifndef MAXVARS -#define MAXVARS 200 /* arbitrary limit ( - -#define lmem_c - -#include "lua.h" - -#include "ldebug.h" -#include "ldo.h" -#include "lmem.h" -#include "lobject.h" -#include "lstate.h" - - - -/* -** definition for realloc function. It must assure that l_realloc(NULL, -** 0, x) allocates a new block (ANSI C assures that). (`os' is the old -** block size; some allocators may use that.) -*/ -#ifndef l_realloc -#define l_realloc(b,os,s) realloc(b,s) -#endif - -/* -** definition for free function. (`os' is the old block size; some -** allocators may use that.) -*/ -#ifndef l_free -#define l_free(b,os) free(b) -#endif - - -#define MINSIZEARRAY 4 - - -void *luaM_growaux (lua_State *L, void *block, int *size, int size_elems, - int limit, const char *errormsg) { - void *newblock; - int newsize = (*size)*2; - if (newsize < MINSIZEARRAY) - newsize = MINSIZEARRAY; /* minimum size */ - else if (*size >= limit/2) { /* cannot double it? */ - if (*size < limit - MINSIZEARRAY) /* try something smaller... */ - newsize = limit; /* still have at least MINSIZEARRAY free places */ - else luaG_runerror(L, errormsg); - } - newblock = luaM_realloc(L, block, - cast(lu_mem, *size)*cast(lu_mem, size_elems), - cast(lu_mem, newsize)*cast(lu_mem, size_elems)); - *size = newsize; /* update only when everything else is OK */ - return newblock; -} - - -/* -** generic allocation routine. -*/ -void *luaM_realloc (lua_State *L, void *block, lu_mem oldsize, lu_mem size) { - lua_assert((oldsize == 0) == (block == NULL)); - if (size == 0) { - if (block != NULL) { - l_free(block, oldsize); - block = NULL; - } - else return NULL; /* avoid `nblocks' computations when oldsize==size==0 */ - } - else if (size >= MAX_SIZET) - luaG_runerror(L, "memory allocation error: block too big"); - else { - block = l_realloc(block, oldsize, size); - if (block == NULL) { - if (L) - luaD_throw(L, LUA_ERRMEM); - else return NULL; /* error before creating state! */ - } - } - if (L) { - lua_assert(G(L) != NULL && G(L)->nblocks > 0); - G(L)->nblocks -= oldsize; - G(L)->nblocks += size; - } - return block; -} - diff --git a/contrib/lua50/src/lmem.h b/contrib/lua50/src/lmem.h deleted file mode 100644 index 1bb4fde0b..000000000 --- a/contrib/lua50/src/lmem.h +++ /dev/null @@ -1,44 +0,0 @@ -/* -** $Id: lmem.h,v 1.26 2002/05/01 20:40:42 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" - -#define MEMERRMSG "not enough memory" - - -void *luaM_realloc (lua_State *L, void *oldblock, lu_mem oldsize, lu_mem size); - -void *luaM_growaux (lua_State *L, void *block, int *size, int size_elem, - int limit, const char *errormsg); - -#define luaM_free(L, b, s) luaM_realloc(L, (b), (s), 0) -#define luaM_freelem(L, b) luaM_realloc(L, (b), sizeof(*(b)), 0) -#define luaM_freearray(L, b, n, t) luaM_realloc(L, (b), \ - cast(lu_mem, n)*cast(lu_mem, sizeof(t)), 0) - -#define luaM_malloc(L, t) luaM_realloc(L, NULL, 0, (t)) -#define luaM_new(L, t) cast(t *, luaM_malloc(L, sizeof(t))) -#define luaM_newvector(L, n,t) cast(t *, luaM_malloc(L, \ - cast(lu_mem, n)*cast(lu_mem, sizeof(t)))) - -#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_realloc(L, v,cast(lu_mem, oldn)*cast(lu_mem, sizeof(t)), \ - cast(lu_mem, n)*cast(lu_mem, sizeof(t))))) - - -#endif - diff --git a/contrib/lua50/src/lobject.c b/contrib/lua50/src/lobject.c deleted file mode 100644 index 9522b6e81..000000000 --- a/contrib/lua50/src/lobject.c +++ /dev/null @@ -1,195 +0,0 @@ -/* -** $Id: lobject.c,v 1.97 2003/04/03 13:35:34 roberto Exp $ -** Some generic functions over Lua objects -** See Copyright Notice in lua.h -*/ - -#include -#include -#include -#include - -#define lobject_c - -#include "lua.h" - -#include "ldo.h" -#include "lmem.h" -#include "lobject.h" -#include "lstate.h" -#include "lstring.h" -#include "lvm.h" - - -/* function to convert a string to a lua_Number */ -#ifndef lua_str2number -#define lua_str2number(s,p) strtod((s), (p)) -#endif - - -const TObject luaO_nilobject = {LUA_TNIL, {NULL}}; - - -/* -** converts an integer to a "floating point byte", represented as -** (mmmmmxxx), where the real value is (xxx) * 2^(mmmmm) -*/ -int luaO_int2fb (unsigned int x) { - int m = 0; /* mantissa */ - while (x >= (1<<3)) { - x = (x+1) >> 1; - m++; - } - return (m << 3) | cast(int, x); -} - - -int luaO_log2 (unsigned int x) { - static const lu_byte log_8[255] = { - 0, - 1,1, - 2,2,2,2, - 3,3,3,3,3,3,3,3, - 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, - 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,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, - 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, - 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 - }; - if (x >= 0x00010000) { - if (x >= 0x01000000) return log_8[((x>>24) & 0xff) - 1]+24; - else return log_8[((x>>16) & 0xff) - 1]+16; - } - else { - if (x >= 0x00000100) return log_8[((x>>8) & 0xff) - 1]+8; - else if (x) return log_8[(x & 0xff) - 1]; - return -1; /* special `log' for 0 */ - } -} - - -int luaO_rawequalObj (const TObject *t1, const TObject *t2) { - if (ttype(t1) != ttype(t2)) return 0; - else switch (ttype(t1)) { - case LUA_TNIL: - return 1; - case LUA_TNUMBER: - return nvalue(t1) == nvalue(t2); - case LUA_TBOOLEAN: - return bvalue(t1) == bvalue(t2); /* boolean true must be 1 !! */ - case LUA_TLIGHTUSERDATA: - return pvalue(t1) == pvalue(t2); - default: - lua_assert(iscollectable(t1)); - return gcvalue(t1) == gcvalue(t2); - } -} - - -int luaO_str2d (const char *s, lua_Number *result) { - char *endptr; - lua_Number res = lua_str2number(s, &endptr); - if (endptr == s) return 0; /* no conversion */ - while (isspace((unsigned char)(*endptr))) endptr++; - if (*endptr != '\0') return 0; /* invalid trailing characters? */ - *result = res; - return 1; -} - - - -static void pushstr (lua_State *L, const char *str) { - setsvalue2s(L->top, luaS_new(L, str)); - incr_top(L); -} - - -/* this function handles only `%d', `%c', %f, and `%s' formats */ -const char *luaO_pushvfstring (lua_State *L, const char *fmt, va_list argp) { - int n = 1; - pushstr(L, ""); - for (;;) { - const char *e = strchr(fmt, '%'); - if (e == NULL) break; - setsvalue2s(L->top, luaS_newlstr(L, fmt, e-fmt)); - incr_top(L); - switch (*(e+1)) { - case 's': - pushstr(L, va_arg(argp, char *)); - break; - case 'c': { - char buff[2]; - buff[0] = cast(char, va_arg(argp, int)); - buff[1] = '\0'; - pushstr(L, buff); - break; - } - case 'd': - setnvalue(L->top, cast(lua_Number, va_arg(argp, int))); - incr_top(L); - break; - case 'f': - setnvalue(L->top, cast(lua_Number, va_arg(argp, l_uacNumber))); - incr_top(L); - break; - case '%': - pushstr(L, "%"); - break; - default: lua_assert(0); - } - n += 2; - fmt = e+2; - } - pushstr(L, fmt); - luaV_concat(L, n+1, L->top - L->base - 1); - L->top -= n; - 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; -} - - -void luaO_chunkid (char *out, const char *source, int bufflen) { - if (*source == '=') { - strncpy(out, source+1, bufflen); /* remove first char */ - out[bufflen-1] = '\0'; /* ensures null termination */ - } - else { /* out = "source", or "...source" */ - if (*source == '@') { - int l; - source++; /* skip the `@' */ - bufflen -= sizeof(" `...' "); - l = strlen(source); - strcpy(out, ""); - if (l>bufflen) { - source += (l-bufflen); /* get last part of file name */ - strcat(out, "..."); - } - strcat(out, source); - } - else { /* out = [string "string"] */ - int len = strcspn(source, "\n"); /* stop at first newline */ - bufflen -= sizeof(" [string \"...\"] "); - if (len > bufflen) len = bufflen; - strcpy(out, "[string \""); - if (source[len] != '\0') { /* must truncate? */ - strncat(out, source, len); - strcat(out, "..."); - } - else - strcat(out, source); - strcat(out, "\"]"); - } - } -} diff --git a/contrib/lua50/src/lobject.h b/contrib/lua50/src/lobject.h deleted file mode 100644 index 321a7e06c..000000000 --- a/contrib/lua50/src/lobject.h +++ /dev/null @@ -1,336 +0,0 @@ -/* -** $Id: lobject.h,v 1.159 2003/03/18 12:50:04 roberto Exp $ -** Type definitions for Lua objects -** See Copyright Notice in lua.h -*/ - -#ifndef lobject_h -#define lobject_h - - -#include "llimits.h" -#include "lua.h" - - -/* tags for values visible from Lua */ -#define NUM_TAGS LUA_TTHREAD - - -/* -** Extra tags for non-values -*/ -#define LUA_TPROTO (NUM_TAGS+1) -#define LUA_TUPVAL (NUM_TAGS+2) - - -/* -** 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 { - GCObject *gc; - void *p; - lua_Number n; - int b; -} Value; - - -/* -** Lua values (or `tagged objects') -*/ -typedef struct lua_TObject { - int tt; - Value value; -} TObject; - - -/* Macros to test type */ -#define ttisnil(o) (ttype(o) == LUA_TNIL) -#define ttisnumber(o) (ttype(o) == LUA_TNUMBER) -#define ttisstring(o) (ttype(o) == LUA_TSTRING) -#define ttistable(o) (ttype(o) == LUA_TTABLE) -#define ttisfunction(o) (ttype(o) == LUA_TFUNCTION) -#define ttisboolean(o) (ttype(o) == LUA_TBOOLEAN) -#define ttisuserdata(o) (ttype(o) == LUA_TUSERDATA) -#define ttisthread(o) (ttype(o) == LUA_TTHREAD) -#define ttislightuserdata(o) (ttype(o) == LUA_TLIGHTUSERDATA) - -/* Macros to access values */ -#define ttype(o) ((o)->tt) -#define gcvalue(o) check_exp(iscollectable(o), (o)->value.gc) -#define pvalue(o) check_exp(ttislightuserdata(o), (o)->value.p) -#define nvalue(o) check_exp(ttisnumber(o), (o)->value.n) -#define tsvalue(o) check_exp(ttisstring(o), &(o)->value.gc->ts) -#define uvalue(o) check_exp(ttisuserdata(o), &(o)->value.gc->u) -#define clvalue(o) check_exp(ttisfunction(o), &(o)->value.gc->cl) -#define hvalue(o) check_exp(ttistable(o), &(o)->value.gc->h) -#define bvalue(o) check_exp(ttisboolean(o), (o)->value.b) -#define thvalue(o) check_exp(ttisthread(o), &(o)->value.gc->th) - -#define l_isfalse(o) (ttisnil(o) || (ttisboolean(o) && bvalue(o) == 0)) - -/* Macros to set values */ -#define setnvalue(obj,x) \ - { TObject *i_o=(obj); i_o->tt=LUA_TNUMBER; i_o->value.n=(x); } - -#define chgnvalue(obj,x) \ - check_exp(ttype(obj)==LUA_TNUMBER, (obj)->value.n=(x)) - -#define setpvalue(obj,x) \ - { TObject *i_o=(obj); i_o->tt=LUA_TLIGHTUSERDATA; i_o->value.p=(x); } - -#define setbvalue(obj,x) \ - { TObject *i_o=(obj); i_o->tt=LUA_TBOOLEAN; i_o->value.b=(x); } - -#define setsvalue(obj,x) \ - { TObject *i_o=(obj); i_o->tt=LUA_TSTRING; \ - i_o->value.gc=cast(GCObject *, (x)); \ - lua_assert(i_o->value.gc->gch.tt == LUA_TSTRING); } - -#define setuvalue(obj,x) \ - { TObject *i_o=(obj); i_o->tt=LUA_TUSERDATA; \ - i_o->value.gc=cast(GCObject *, (x)); \ - lua_assert(i_o->value.gc->gch.tt == LUA_TUSERDATA); } - -#define setthvalue(obj,x) \ - { TObject *i_o=(obj); i_o->tt=LUA_TTHREAD; \ - i_o->value.gc=cast(GCObject *, (x)); \ - lua_assert(i_o->value.gc->gch.tt == LUA_TTHREAD); } - -#define setclvalue(obj,x) \ - { TObject *i_o=(obj); i_o->tt=LUA_TFUNCTION; \ - i_o->value.gc=cast(GCObject *, (x)); \ - lua_assert(i_o->value.gc->gch.tt == LUA_TFUNCTION); } - -#define sethvalue(obj,x) \ - { TObject *i_o=(obj); i_o->tt=LUA_TTABLE; \ - i_o->value.gc=cast(GCObject *, (x)); \ - lua_assert(i_o->value.gc->gch.tt == LUA_TTABLE); } - -#define setnilvalue(obj) ((obj)->tt=LUA_TNIL) - - - -/* -** for internal debug only -*/ -#define checkconsistency(obj) \ - lua_assert(!iscollectable(obj) || (ttype(obj) == (obj)->value.gc->gch.tt)) - - -#define setobj(obj1,obj2) \ - { const TObject *o2=(obj2); TObject *o1=(obj1); \ - checkconsistency(o2); \ - o1->tt=o2->tt; o1->value = o2->value; } - - -/* -** different types of sets, according to destination -*/ - -/* from stack to (same) stack */ -#define setobjs2s setobj -/* to stack (not from same stack) */ -#define setobj2s setobj -#define setsvalue2s setsvalue -/* from table to same table */ -#define setobjt2t setobj -/* to table */ -#define setobj2t setobj -/* to new object */ -#define setobj2n setobj -#define setsvalue2n setsvalue - -#define setttype(obj, tt) (ttype(obj) = (tt)) - - -#define iscollectable(o) (ttype(o) >= LUA_TSTRING) - - - -typedef TObject *StkId; /* index to stack elements */ - - -/* -** String headers for string table -*/ -typedef union TString { - L_Umaxalign dummy; /* ensures maximum alignment for strings */ - struct { - CommonHeader; - lu_byte reserved; - lu_hash hash; - size_t len; - } tsv; -} TString; - - -#define getstr(ts) cast(const char *, (ts) + 1) -#define svalue(o) getstr(tsvalue(o)) - - - -typedef union Udata { - L_Umaxalign dummy; /* ensures maximum alignment for `local' udata */ - struct { - CommonHeader; - struct Table *metatable; - size_t len; - } uv; -} Udata; - - - - -/* -** Function Prototypes -*/ -typedef struct Proto { - CommonHeader; - TObject *k; /* constants used by the function */ - Instruction *code; - struct Proto **p; /* functions defined inside the function */ - int *lineinfo; /* map from opcodes to source lines */ - struct LocVar *locvars; /* information about local variables */ - TString **upvalues; /* upvalue names */ - TString *source; - int sizeupvalues; - int sizek; /* size of `k' */ - int sizecode; - int sizelineinfo; - int sizep; /* size of `p' */ - int sizelocvars; - int lineDefined; - GCObject *gclist; - lu_byte nups; /* number of upvalues */ - lu_byte numparams; - lu_byte is_vararg; - lu_byte maxstacksize; -} Proto; - - -typedef struct LocVar { - TString *varname; - int startpc; /* first point where variable is active */ - int endpc; /* first point where variable is dead */ -} LocVar; - - - -/* -** Upvalues -*/ - -typedef struct UpVal { - CommonHeader; - TObject *v; /* points to stack or to its own value */ - TObject value; /* the value (when closed) */ -} UpVal; - - -/* -** Closures -*/ - -#define ClosureHeader \ - CommonHeader; lu_byte isC; lu_byte nupvalues; GCObject *gclist - -typedef struct CClosure { - ClosureHeader; - lua_CFunction f; - TObject upvalue[1]; -} CClosure; - - -typedef struct LClosure { - ClosureHeader; - struct Proto *p; - TObject g; /* global table for this closure */ - UpVal *upvals[1]; -} LClosure; - - -typedef union Closure { - CClosure c; - LClosure l; -} Closure; - - -#define iscfunction(o) (ttype(o) == LUA_TFUNCTION && clvalue(o)->c.isC) -#define isLfunction(o) (ttype(o) == LUA_TFUNCTION && !clvalue(o)->c.isC) - - -/* -** Tables -*/ - -typedef struct Node { - TObject i_key; - TObject i_val; - struct Node *next; /* for chaining */ -} Node; - - -typedef struct Table { - CommonHeader; - lu_byte flags; /* 1<

lsizenode)) - - - -extern const TObject luaO_nilobject; - -int luaO_log2 (unsigned int x); -int luaO_int2fb (unsigned int x); -#define fb2int(x) (((x) & 7) << ((x) >> 3)) - -int luaO_rawequalObj (const TObject *t1, const TObject *t2); -int luaO_str2d (const char *s, lua_Number *result); - -const char *luaO_pushvfstring (lua_State *L, const char *fmt, va_list argp); -const char *luaO_pushfstring (lua_State *L, const char *fmt, ...); -void luaO_chunkid (char *out, const char *source, int len); - - -#endif diff --git a/contrib/lua50/src/lopcodes.c b/contrib/lua50/src/lopcodes.c deleted file mode 100644 index 993e426d3..000000000 --- a/contrib/lua50/src/lopcodes.c +++ /dev/null @@ -1,102 +0,0 @@ -/* -** $Id: lopcodes.c,v 1.22 2002/12/04 17:38:31 roberto Exp $ -** extracted automatically from lopcodes.h by mkprint.lua -** DO NOT EDIT -** See Copyright Notice in lua.h -*/ - - -#define lopcodes_c - -#include "lua.h" - -#include "lobject.h" -#include "lopcodes.h" - - -#ifdef LUA_OPNAMES - -const char *const luaP_opnames[] = { - "MOVE", - "LOADK", - "LOADBOOL", - "LOADNIL", - "GETUPVAL", - "GETGLOBAL", - "GETTABLE", - "SETGLOBAL", - "SETUPVAL", - "SETTABLE", - "NEWTABLE", - "SELF", - "ADD", - "SUB", - "MUL", - "DIV", - "POW", - "UNM", - "NOT", - "CONCAT", - "JMP", - "EQ", - "LT", - "LE", - "TEST", - "CALL", - "TAILCALL", - "RETURN", - "FORLOOP", - "TFORLOOP", - "TFORPREP", - "SETLIST", - "SETLISTO", - "CLOSE", - "CLOSURE" -}; - -#endif - -#define opmode(t,b,bk,ck,sa,k,m) (((t)<>1) /* `sBx' is signed */ -#else -#define MAXARG_Bx MAX_INT -#define MAXARG_sBx MAX_INT -#endif - - -#define MAXARG_A ((1<>POS_A)) -#define SETARG_A(i,u) ((i) = (((i)&MASK0(SIZE_A,POS_A)) | \ - ((cast(Instruction, u)<>POS_B) & MASK1(SIZE_B,0))) -#define SETARG_B(i,b) ((i) = (((i)&MASK0(SIZE_B,POS_B)) | \ - ((cast(Instruction, b)<>POS_C) & MASK1(SIZE_C,0))) -#define SETARG_C(i,b) ((i) = (((i)&MASK0(SIZE_C,POS_C)) | \ - ((cast(Instruction, b)<>POS_Bx) & MASK1(SIZE_Bx,0))) -#define SETARG_Bx(i,b) ((i) = (((i)&MASK0(SIZE_Bx,POS_Bx)) | \ - ((cast(Instruction, 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) =) R(A)*/ -OP_CLOSURE/* A Bx R(A) := closure(KPROTO[Bx], R(A), ... ,R(A+n)) */ -} OpCode; - - -#define NUM_OPCODES (cast(int, OP_CLOSURE+1)) - - - -/*=========================================================================== - Notes: - (1) In OP_CALL, if (B == 0) then B = top. C is the number of returns - 1, - and can be 0: OP_CALL then sets `top' to last_result+1, so - next open instruction (OP_CALL, OP_RETURN, OP_SETLIST) may use `top'. - - (2) In OP_RETURN, if (B == 0) then return up to `top' - - (3) For comparisons, B specifies what conditions the test should accept. - - (4) All `skips' (pc++) assume that next instruction is a jump -===========================================================================*/ - - -/* -** masks for instruction properties -*/ -enum OpModeMask { - OpModeBreg = 2, /* B is a register */ - OpModeBrk, /* B is a register/constant */ - OpModeCrk, /* C is a register/constant */ - OpModesetA, /* instruction set register A */ - OpModeK, /* Bx is a constant */ - OpModeT /* operator is a test */ - -}; - - -extern const lu_byte luaP_opmodes[NUM_OPCODES]; - -#define getOpMode(m) (cast(enum OpMode, luaP_opmodes[m] & 3)) -#define testOpMode(m, b) (luaP_opmodes[m] & (1 << (b))) - - -#ifdef LUA_OPNAMES -extern const char *const luaP_opnames[]; /* opcode names */ -#endif - - - -/* number of list items to accumulate before a SETLIST instruction */ -/* (must be a power of 2) */ -#define LFIELDS_PER_FLUSH 32 - - -#endif diff --git a/contrib/lua50/src/lparser.c b/contrib/lua50/src/lparser.c deleted file mode 100644 index 99bd3020e..000000000 --- a/contrib/lua50/src/lparser.c +++ /dev/null @@ -1,1333 +0,0 @@ -/* -** $Id: lparser.c,v 1.208a 2003/04/03 13:35:34 roberto Exp $ -** Lua Parser -** See Copyright Notice in lua.h -*/ - - -#include - -#define lparser_c - -#include "lua.h" - -#include "lcode.h" -#include "ldebug.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" - - - - -#define getlocvar(fs, i) ((fs)->f->locvars[(fs)->actvar[i]]) - - -#define enterlevel(ls) if (++(ls)->nestlevel > LUA_MAXPARSERLEVEL) \ - luaX_syntaxerror(ls, "too many syntax levels"); -#define leavelevel(ls) ((ls)->nestlevel--) - - -/* -** nodes for block list (list of active blocks) -*/ -typedef struct BlockCnt { - struct BlockCnt *previous; /* chain */ - int breaklist; /* list of jumps out of this loop */ - int nactvar; /* # active local variables outside the breakable structure */ - int upval; /* true if some variable in the block is an upvalue */ - int isbreakable; /* true if `block' is a loop */ -} BlockCnt; - - - -/* -** prototypes for recursive non-terminal functions -*/ -static void chunk (LexState *ls); -static void expr (LexState *ls, expdesc *v); - - - -static void 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 = luaX_lex(ls, &ls->t.seminfo); /* read next token */ -} - - -static void lookahead (LexState *ls) { - lua_assert(ls->lookahead.token == TK_EOS); - ls->lookahead.token = luaX_lex(ls, &ls->lookahead.seminfo); -} - - -static void error_expected (LexState *ls, int token) { - luaX_syntaxerror(ls, - luaO_pushfstring(ls->L, "`%s' expected", luaX_token2str(ls, token))); -} - - -static int testnext (LexState *ls, int c) { - if (ls->t.token == c) { - next(ls); - return 1; - } - else return 0; -} - - -static void check (LexState *ls, int c) { - if (!testnext(ls, c)) - error_expected(ls, c); -} - - -#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_condition(ls, (ls->t.token == TK_NAME), " expected"); - ts = ls->t.seminfo.ts; - next(ls); - return ts; -} - - -static void init_exp (expdesc *e, expkind k, int i) { - e->f = e->t = NO_JUMP; - e->k = k; - e->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 luaI_registerlocalvar (LexState *ls, TString *varname) { - FuncState *fs = ls->fs; - Proto *f = fs->f; - luaM_growvector(ls->L, f->locvars, fs->nlocvars, f->sizelocvars, - LocVar, MAX_INT, ""); - f->locvars[fs->nlocvars].varname = varname; - return fs->nlocvars++; -} - - -static void new_localvar (LexState *ls, TString *name, int n) { - FuncState *fs = ls->fs; - luaX_checklimit(ls, fs->nactvar+n+1, MAXVARS, "local variables"); - fs->actvar[fs->nactvar+n] = luaI_registerlocalvar(ls, name); -} - - -static void adjustlocalvars (LexState *ls, int nvars) { - FuncState *fs = ls->fs; - fs->nactvar += nvars; - for (; nvars; nvars--) { - getlocvar(fs, fs->nactvar - nvars).startpc = fs->pc; - } -} - - -static void removevars (LexState *ls, int tolevel) { - FuncState *fs = ls->fs; - while (fs->nactvar > tolevel) - getlocvar(fs, --fs->nactvar).endpc = fs->pc; -} - - -static void new_localvarstr (LexState *ls, const char *name, int n) { - new_localvar(ls, luaS_new(ls->L, name), n); -} - - -static void create_local (LexState *ls, const char *name) { - new_localvarstr(ls, name, 0); - adjustlocalvars(ls, 1); -} - - -static int indexupvalue (FuncState *fs, TString *name, expdesc *v) { - int i; - Proto *f = fs->f; - for (i=0; inups; i++) { - if (fs->upvalues[i].k == v->k && fs->upvalues[i].info == v->info) { - lua_assert(fs->f->upvalues[i] == name); - return i; - } - } - /* new one */ - luaX_checklimit(fs->ls, f->nups + 1, MAXUPVALUES, "upvalues"); - luaM_growvector(fs->L, fs->f->upvalues, f->nups, fs->f->sizeupvalues, - TString *, MAX_INT, ""); - fs->f->upvalues[f->nups] = name; - fs->upvalues[f->nups] = *v; - return f->nups++; -} - - -static int searchvar (FuncState *fs, TString *n) { - int i; - for (i=fs->nactvar-1; i >= 0; i--) { - if (n == getlocvar(fs, i).varname) - return i; - } - return -1; /* not found */ -} - - -static void markupval (FuncState *fs, int level) { - BlockCnt *bl = fs->bl; - while (bl && bl->nactvar > level) bl = bl->previous; - if (bl) bl->upval = 1; -} - - -static void singlevaraux (FuncState *fs, TString *n, expdesc *var, int base) { - if (fs == NULL) /* no more levels? */ - init_exp(var, VGLOBAL, NO_REG); /* default is global variable */ - else { - int v = searchvar(fs, n); /* look up at current level */ - if (v >= 0) { - init_exp(var, VLOCAL, v); - if (!base) - markupval(fs, v); /* local will be used as an upval */ - } - else { /* not found at current level; try upper one */ - singlevaraux(fs->prev, n, var, 0); - if (var->k == VGLOBAL) { - if (base) - var->info = luaK_stringK(fs, n); /* info points to global name */ - } - else { /* LOCAL or UPVAL */ - var->info = indexupvalue(fs, n, var); - var->k = VUPVAL; /* upvalue in this level */ - } - } - } -} - - -static TString *singlevar (LexState *ls, expdesc *var, int base) { - TString *varname = str_checkname(ls); - singlevaraux(ls->fs, varname, var, base); - return varname; -} - - -static void adjust_assign (LexState *ls, int nvars, int nexps, expdesc *e) { - FuncState *fs = ls->fs; - int extra = nvars - nexps; - if (e->k == VCALL) { - extra++; /* includes call itself */ - if (extra <= 0) extra = 0; - else luaK_reserveregs(fs, extra-1); - luaK_setcallreturns(fs, e, extra); /* call provides the difference */ - } - 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 code_params (LexState *ls, int nparams, int dots) { - FuncState *fs = ls->fs; - adjustlocalvars(ls, nparams); - luaX_checklimit(ls, fs->nactvar, MAXPARAMS, "parameters"); - fs->f->numparams = cast(lu_byte, fs->nactvar); - fs->f->is_vararg = cast(lu_byte, dots); - if (dots) - create_local(ls, "arg"); - luaK_reserveregs(fs, fs->nactvar); /* reserve register for parameters */ -} - - -static void enterblock (FuncState *fs, BlockCnt *bl, int isbreakable) { - bl->breaklist = NO_JUMP; - bl->isbreakable = isbreakable; - bl->nactvar = fs->nactvar; - bl->upval = 0; - bl->previous = fs->bl; - fs->bl = bl; - lua_assert(fs->freereg == fs->nactvar); -} - - -static void leaveblock (FuncState *fs) { - BlockCnt *bl = fs->bl; - fs->bl = bl->previous; - removevars(fs->ls, bl->nactvar); - if (bl->upval) - luaK_codeABC(fs, OP_CLOSE, bl->nactvar, 0, 0); - lua_assert(bl->nactvar == fs->nactvar); - fs->freereg = fs->nactvar; /* free registers */ - luaK_patchtohere(fs, bl->breaklist); -} - - -static void pushclosure (LexState *ls, FuncState *func, expdesc *v) { - FuncState *fs = ls->fs; - Proto *f = fs->f; - int i; - luaM_growvector(ls->L, f->p, fs->np, f->sizep, Proto *, - MAXARG_Bx, "constant table overflow"); - f->p[fs->np++] = func->f; - init_exp(v, VRELOCABLE, luaK_codeABx(fs, OP_CLOSURE, 0, fs->np-1)); - for (i=0; if->nups; i++) { - OpCode o = (func->upvalues[i].k == VLOCAL) ? OP_MOVE : OP_GETUPVAL; - luaK_codeABC(fs, o, 0, func->upvalues[i].info, 0); - } -} - - -static void open_func (LexState *ls, FuncState *fs) { - Proto *f = luaF_newproto(ls->L); - fs->f = f; - fs->prev = ls->fs; /* linked list of funcstates */ - fs->ls = ls; - fs->L = ls->L; - ls->fs = fs; - fs->pc = 0; - fs->lasttarget = 0; - fs->jpc = NO_JUMP; - fs->freereg = 0; - fs->nk = 0; - fs->h = luaH_new(ls->L, 0, 0); - fs->np = 0; - fs->nlocvars = 0; - fs->nactvar = 0; - fs->bl = NULL; - f->source = ls->source; - f->maxstacksize = 2; /* registers 0/1 are always valid */ -} - - -static void close_func (LexState *ls) { - lua_State *L = ls->L; - FuncState *fs = ls->fs; - Proto *f = fs->f; - removevars(ls, 0); - luaK_codeABC(fs, OP_RETURN, 0, 1, 0); /* final return */ - 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, TObject); - 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, f->nups, TString *); - f->sizeupvalues = f->nups; - lua_assert(luaG_checkcode(f)); - lua_assert(fs->bl == NULL); - ls->fs = fs->prev; -} - - -Proto *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff) { - struct LexState lexstate; - struct FuncState funcstate; - lexstate.buff = buff; - lexstate.nestlevel = 0; - luaX_setinput(L, &lexstate, z, luaS_new(L, zname(z))); - open_func(&lexstate, &funcstate); - next(&lexstate); /* read first token */ - chunk(&lexstate); - check_condition(&lexstate, (lexstate.t.token == TK_EOS), " expected"); - close_func(&lexstate); - lua_assert(funcstate.prev == NULL); - lua_assert(funcstate.f->nups == 0); - lua_assert(lexstate.nestlevel == 0); - return funcstate.f; -} - - - -/*============================================================*/ -/* GRAMMAR RULES */ -/*============================================================*/ - - -static void luaY_field (LexState *ls, expdesc *v) { - /* field -> ['.' | ':'] NAME */ - FuncState *fs = ls->fs; - expdesc key; - luaK_exp2anyreg(fs, v); - next(ls); /* skip the dot or colon */ - checkname(ls, &key); - luaK_indexed(fs, v, &key); -} - - -static void luaY_index (LexState *ls, expdesc *v) { - /* index -> '[' expr ']' */ - next(ls); /* skip the '[' */ - expr(ls, v); - luaK_exp2val(ls->fs, v); - check(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; - if (ls->t.token == TK_NAME) { - luaX_checklimit(ls, cc->nh, MAX_INT, "items in a constructor"); - cc->nh++; - checkname(ls, &key); - } - else /* ls->t.token == '[' */ - luaY_index(ls, &key); - check(ls, '='); - luaK_exp2RK(fs, &key); - expr(ls, &val); - luaK_codeABC(fs, OP_SETTABLE, cc->t->info, luaK_exp2RK(fs, &key), - 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_codeABx(fs, OP_SETLIST, cc->t->info, cc->na-1); /* flush */ - cc->tostore = 0; /* no more items pending */ - fs->freereg = cc->t->info + 1; /* free registers */ - } -} - - -static void lastlistfield (FuncState *fs, struct ConsControl *cc) { - if (cc->tostore == 0) return; - if (cc->v.k == VCALL) { - luaK_setcallreturns(fs, &cc->v, LUA_MULTRET); - luaK_codeABx(fs, OP_SETLISTO, cc->t->info, cc->na-1); - } - else { - if (cc->v.k != VVOID) - luaK_exp2nextreg(fs, &cc->v); - luaK_codeABx(fs, OP_SETLIST, cc->t->info, cc->na-1); - } - fs->freereg = cc->t->info + 1; /* free registers */ -} - - -static void listfield (LexState *ls, struct ConsControl *cc) { - expr(ls, &cc->v); - luaX_checklimit(ls, cc->na, MAXARG_Bx, "items in a constructor"); - cc->na++; - cc->tostore++; -} - - -static void constructor (LexState *ls, expdesc *t) { - /* constructor -> ?? */ - 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 (for gc) */ - check(ls, '{'); - do { - lua_assert(cc.v.k == VVOID || cc.tostore > 0); - testnext(ls, ';'); /* compatibility only */ - if (ls->t.token == '}') break; - closelistfield(fs, &cc); - switch(ls->t.token) { - case TK_NAME: { /* may be listfields or recfields */ - lookahead(ls); - if (ls->lookahead.token != '=') /* expression? */ - listfield(ls, &cc); - else - recfield(ls, &cc); - break; - } - case '[': { /* constructor_item -> recfield */ - recfield(ls, &cc); - break; - } - default: { /* constructor_part -> listfield */ - listfield(ls, &cc); - break; - } - } - } 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_log2(cc.nh)+1); /* set initial table size */ -} - -/* }====================================================================== */ - - - -static void parlist (LexState *ls) { - /* parlist -> [ param { `,' param } ] */ - int nparams = 0; - int dots = 0; - if (ls->t.token != ')') { /* is `parlist' not empty? */ - do { - switch (ls->t.token) { - case TK_DOTS: dots = 1; next(ls); break; - case TK_NAME: new_localvar(ls, str_checkname(ls), nparams++); break; - default: luaX_syntaxerror(ls, " or `...' expected"); - } - } while (!dots && testnext(ls, ',')); - } - code_params(ls, nparams, dots); -} - - -static void body (LexState *ls, expdesc *e, int needself, int line) { - /* body -> `(' parlist `)' chunk END */ - FuncState new_fs; - open_func(ls, &new_fs); - new_fs.f->lineDefined = line; - check(ls, '('); - if (needself) - create_local(ls, "self"); - parlist(ls); - check(ls, ')'); - chunk(ls); - check_match(ls, TK_END, TK_FUNCTION, line); - close_func(ls); - pushclosure(ls, &new_fs, e); -} - - -static int explist1 (LexState *ls, expdesc *v) { - /* explist1 -> 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) { - FuncState *fs = ls->fs; - expdesc args; - int base, nparams; - int line = ls->linenumber; - switch (ls->t.token) { - case '(': { /* funcargs -> `(' [ explist1 ] `)' */ - if (line != ls->lastline) - luaX_syntaxerror(ls,"ambiguous syntax (function call x new statement)"); - next(ls); - if (ls->t.token == ')') /* arg list is empty? */ - args.k = VVOID; - else { - explist1(ls, &args); - luaK_setcallreturns(fs, &args, LUA_MULTRET); - } - check_match(ls, ')', '(', line); - break; - } - case '{': { /* funcargs -> constructor */ - constructor(ls, &args); - break; - } - case TK_STRING: { /* funcargs -> STRING */ - codestring(ls, &args, ls->t.seminfo.ts); - next(ls); /* must use `seminfo' before `next' */ - break; - } - default: { - luaX_syntaxerror(ls, "function arguments expected"); - return; - } - } - lua_assert(f->k == VNONRELOC); - base = f->info; /* base register for call */ - if (args.k == VCALL) - 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 prefixexp (LexState *ls, expdesc *v) { - /* prefixexp -> NAME | '(' expr ')' */ - switch (ls->t.token) { - case '(': { - int line = ls->linenumber; - next(ls); - expr(ls, v); - check_match(ls, ')', '(', line); - luaK_dischargevars(ls->fs, v); - return; - } - case TK_NAME: { - singlevar(ls, v, 1); - return; - } -#ifdef LUA_COMPATUPSYNTAX - case '%': { /* for compatibility only */ - TString *varname; - int line = ls->linenumber; - next(ls); /* skip `%' */ - varname = singlevar(ls, v, 1); - if (v->k != VUPVAL) - luaX_errorline(ls, "global upvalues are obsolete", - getstr(varname), line); - return; - } -#endif - default: { - luaX_syntaxerror(ls, "unexpected symbol"); - return; - } - } -} - - -static void primaryexp (LexState *ls, expdesc *v) { - /* primaryexp -> - prefixexp { `.' NAME | `[' exp `]' | `:' NAME funcargs | funcargs } */ - FuncState *fs = ls->fs; - prefixexp(ls, v); - for (;;) { - switch (ls->t.token) { - case '.': { /* field */ - luaY_field(ls, v); - break; - } - case '[': { /* `[' exp1 `]' */ - expdesc key; - luaK_exp2anyreg(fs, v); - luaY_index(ls, &key); - luaK_indexed(fs, v, &key); - break; - } - case ':': { /* `:' NAME funcargs */ - expdesc key; - next(ls); - checkname(ls, &key); - luaK_self(fs, v, &key); - funcargs(ls, v); - break; - } - case '(': case TK_STRING: case '{': { /* funcargs */ - luaK_exp2nextreg(fs, v); - funcargs(ls, v); - break; - } - default: return; - } - } -} - - -static void simpleexp (LexState *ls, expdesc *v) { - /* simpleexp -> NUMBER | STRING | NIL | constructor | FUNCTION body - | primaryexp */ - switch (ls->t.token) { - case TK_NUMBER: { - init_exp(v, VK, luaK_numberK(ls->fs, ls->t.seminfo.r)); - next(ls); /* must use `seminfo' before `next' */ - break; - } - case TK_STRING: { - codestring(ls, v, ls->t.seminfo.ts); - next(ls); /* must use `seminfo' before `next' */ - break; - } - case TK_NIL: { - init_exp(v, VNIL, 0); - next(ls); - break; - } - case TK_TRUE: { - init_exp(v, VTRUE, 0); - next(ls); - break; - } - case TK_FALSE: { - init_exp(v, VFALSE, 0); - next(ls); - break; - } - case '{': { /* constructor */ - constructor(ls, v); - break; - } - case TK_FUNCTION: { - next(ls); - body(ls, v, 0, ls->linenumber); - break; - } - default: { - primaryexp(ls, v); - break; - } - } -} - - -static UnOpr getunopr (int op) { - switch (op) { - case TK_NOT: return OPR_NOT; - case '-': return OPR_MINUS; - default: return OPR_NOUNOPR; - } -} - - -static BinOpr getbinopr (int op) { - switch (op) { - case '+': return OPR_ADD; - case '-': return OPR_SUB; - case '*': return OPR_MULT; - case '/': return OPR_DIV; - 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}, /* arithmetic */ - {10, 9}, {5, 4}, /* power and concat (right associative) */ - {3, 3}, {3, 3}, /* equality */ - {3, 3}, {3, 3}, {3, 3}, {3, 3}, /* order */ - {2, 2}, {1, 1} /* logical (and/or) */ -}; - -#define UNARY_PRIORITY 8 /* priority for unary operators */ - - -/* -** subexpr -> (simplexep | 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) { - next(ls); - subexpr(ls, v, UNARY_PRIORITY); - luaK_prefix(ls->fs, uop, v); - } - else simpleexp(ls, v); - /* expand while operators have priorities higher than `limit' */ - op = getbinopr(ls->t.token); - while (op != OPR_NOBINOPR && cast(int, priority[op].left) > limit) { - expdesc v2; - BinOpr nextop; - next(ls); - luaK_infix(ls->fs, op, v); - /* read sub-expression with higher priority */ - nextop = subexpr(ls, &v2, cast(int, priority[op].right)); - luaK_posfix(ls->fs, op, v, &v2); - op = nextop; - } - leavelevel(ls); - return op; /* return first untreated operator */ -} - - -static void expr (LexState *ls, expdesc *v) { - subexpr(ls, v, -1); -} - -/* }==================================================================== */ - - - -/* -** {====================================================================== -** Rules for Statements -** ======================================================================= -*/ - - -static int block_follow (int token) { - switch (token) { - case TK_ELSE: case TK_ELSEIF: case TK_END: - case TK_UNTIL: case TK_EOS: - return 1; - default: return 0; - } -} - - -static void block (LexState *ls) { - /* block -> chunk */ - FuncState *fs = ls->fs; - BlockCnt bl; - enterblock(fs, &bl, 0); - chunk(ls); - lua_assert(bl.breaklist == NO_JUMP); - 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 a local variable, the local variable -** is needed in a previous assignment (to a table). If so, save original -** 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) { - if (lh->v.k == VINDEXED) { - if (lh->v.info == v->info) { /* conflict? */ - conflict = 1; - lh->v.info = extra; /* previous assignment will use safe copy */ - } - if (lh->v.aux == v->info) { /* conflict? */ - conflict = 1; - lh->v.aux = extra; /* previous assignment will use safe copy */ - } - } - } - if (conflict) { - luaK_codeABC(fs, OP_MOVE, fs->freereg, v->info, 0); /* make copy */ - luaK_reserveregs(fs, 1); - } -} - - -static void assignment (LexState *ls, struct LHS_assign *lh, int nvars) { - expdesc e; - check_condition(ls, VLOCAL <= lh->v.k && lh->v.k <= VINDEXED, - "syntax error"); - if (testnext(ls, ',')) { /* assignment -> `,' primaryexp assignment */ - struct LHS_assign nv; - nv.prev = lh; - primaryexp(ls, &nv.v); - if (nv.v.k == VLOCAL) - check_conflict(ls, lh, &nv.v); - assignment(ls, &nv, nvars+1); - } - else { /* assignment -> `=' explist1 */ - int nexps; - check(ls, '='); - nexps = explist1(ls, &e); - if (nexps != nvars) { - adjust_assign(ls, nvars, nexps, &e); - if (nexps > nvars) - ls->fs->freereg -= nexps - nvars; /* remove extra values */ - } - else { - luaK_setcallreturns(ls->fs, &e, 1); /* 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 void cond (LexState *ls, expdesc *v) { - /* cond -> exp */ - expr(ls, v); /* read condition */ - if (v->k == VNIL) v->k = VFALSE; /* `falses' are all equal here */ - luaK_goiftrue(ls->fs, v); - luaK_patchtohere(ls->fs, v->t); -} - - -/* -** The while statement optimizes its code by coding the condition -** after its body (and thus avoiding one jump in the loop). -*/ - -/* -** maximum size of expressions for optimizing `while' code -*/ -#ifndef MAXEXPWHILE -#define MAXEXPWHILE 100 -#endif - -/* -** the call `luaK_goiffalse' may grow the size of an expression by -** at most this: -*/ -#define EXTRAEXP 5 - -static void whilestat (LexState *ls, int line) { - /* whilestat -> WHILE cond DO block END */ - Instruction codeexp[MAXEXPWHILE + EXTRAEXP]; - int lineexp; - int i; - int sizeexp; - FuncState *fs = ls->fs; - int whileinit, blockinit, expinit; - expdesc v; - BlockCnt bl; - next(ls); /* skip WHILE */ - whileinit = luaK_jump(fs); /* jump to condition (which will be moved) */ - expinit = luaK_getlabel(fs); - expr(ls, &v); /* parse condition */ - if (v.k == VK) v.k = VTRUE; /* `trues' are all equal here */ - lineexp = ls->linenumber; - luaK_goiffalse(fs, &v); - luaK_concat(fs, &v.f, fs->jpc); - fs->jpc = NO_JUMP; - sizeexp = fs->pc - expinit; /* size of expression code */ - if (sizeexp > MAXEXPWHILE) - luaX_syntaxerror(ls, "`while' condition too complex"); - for (i = 0; i < sizeexp; i++) /* save `exp' code */ - codeexp[i] = fs->f->code[expinit + i]; - fs->pc = expinit; /* remove `exp' code */ - enterblock(fs, &bl, 1); - check(ls, TK_DO); - blockinit = luaK_getlabel(fs); - block(ls); - luaK_patchtohere(fs, whileinit); /* initial jump jumps to here */ - /* move `exp' back to code */ - if (v.t != NO_JUMP) v.t += fs->pc - expinit; - if (v.f != NO_JUMP) v.f += fs->pc - expinit; - for (i=0; i REPEAT block UNTIL cond */ - FuncState *fs = ls->fs; - int repeat_init = luaK_getlabel(fs); - expdesc v; - BlockCnt bl; - enterblock(fs, &bl, 1); - next(ls); - block(ls); - check_match(ls, TK_UNTIL, TK_REPEAT, line); - cond(ls, &v); - luaK_patchlist(fs, v.f, repeat_init); - leaveblock(fs); -} - - -static int exp1 (LexState *ls) { - expdesc e; - int k; - expr(ls, &e); - k = e.k; - luaK_exp2nextreg(ls->fs, &e); - return k; -} - - -static void forbody (LexState *ls, int base, int line, int nvars, int isnum) { - BlockCnt bl; - FuncState *fs = ls->fs; - int prep, endfor; - adjustlocalvars(ls, nvars); /* scope for all variables */ - check(ls, TK_DO); - enterblock(fs, &bl, 1); /* loop block */ - prep = luaK_getlabel(fs); - block(ls); - luaK_patchtohere(fs, prep-1); - endfor = (isnum) ? luaK_codeAsBx(fs, OP_FORLOOP, base, NO_JUMP) : - luaK_codeABC(fs, OP_TFORLOOP, base, 0, nvars - 3); - luaK_fixline(fs, line); /* pretend that `OP_FOR' starts the loop */ - luaK_patchlist(fs, (isnum) ? endfor : luaK_jump(fs), prep); - leaveblock(fs); -} - - -static void fornum (LexState *ls, TString *varname, int line) { - /* fornum -> NAME = exp1,exp1[,exp1] DO body */ - FuncState *fs = ls->fs; - int base = fs->freereg; - new_localvar(ls, varname, 0); - new_localvarstr(ls, "(for limit)", 1); - new_localvarstr(ls, "(for step)", 2); - check(ls, '='); - exp1(ls); /* initial value */ - check(ls, ','); - exp1(ls); /* limit */ - if (testnext(ls, ',')) - exp1(ls); /* optional step */ - else { /* default step = 1 */ - luaK_codeABx(fs, OP_LOADK, fs->freereg, luaK_numberK(fs, 1)); - luaK_reserveregs(fs, 1); - } - luaK_codeABC(fs, OP_SUB, fs->freereg - 3, fs->freereg - 3, fs->freereg - 1); - luaK_jump(fs); - forbody(ls, base, line, 3, 1); -} - - -static void forlist (LexState *ls, TString *indexname) { - /* forlist -> NAME {,NAME} IN explist1 DO body */ - FuncState *fs = ls->fs; - expdesc e; - int nvars = 0; - int line; - int base = fs->freereg; - new_localvarstr(ls, "(for generator)", nvars++); - new_localvarstr(ls, "(for state)", nvars++); - new_localvar(ls, indexname, nvars++); - while (testnext(ls, ',')) - new_localvar(ls, str_checkname(ls), nvars++); - check(ls, TK_IN); - line = ls->linenumber; - adjust_assign(ls, nvars, explist1(ls, &e), &e); - luaK_checkstack(fs, 3); /* extra space to call generator */ - luaK_codeAsBx(fs, OP_TFORPREP, base, NO_JUMP); - forbody(ls, base, line, nvars, 0); -} - - -static void forstat (LexState *ls, int line) { - /* forstat -> fornum | forlist */ - FuncState *fs = ls->fs; - TString *varname; - BlockCnt bl; - enterblock(fs, &bl, 0); /* block to control variable scope */ - 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, "`=' or `in' expected"); - } - check_match(ls, TK_END, TK_FOR, line); - leaveblock(fs); -} - - -static void test_then_block (LexState *ls, expdesc *v) { - /* test_then_block -> [IF | ELSEIF] cond THEN block */ - next(ls); /* skip IF or ELSEIF */ - cond(ls, v); - check(ls, TK_THEN); - block(ls); /* `then' part */ -} - - -static void ifstat (LexState *ls, int line) { - /* ifstat -> IF cond THEN block {ELSEIF cond THEN block} [ELSE block] END */ - FuncState *fs = ls->fs; - expdesc v; - int escapelist = NO_JUMP; - test_then_block(ls, &v); /* IF cond THEN block */ - while (ls->t.token == TK_ELSEIF) { - luaK_concat(fs, &escapelist, luaK_jump(fs)); - luaK_patchtohere(fs, v.f); - test_then_block(ls, &v); /* ELSEIF cond THEN block */ - } - if (ls->t.token == TK_ELSE) { - luaK_concat(fs, &escapelist, luaK_jump(fs)); - luaK_patchtohere(fs, v.f); - next(ls); /* skip ELSE (after patch, for correct line info) */ - block(ls); /* `else' part */ - } - else - luaK_concat(fs, &escapelist, v.f); - luaK_patchtohere(fs, escapelist); - check_match(ls, TK_END, TK_IF, line); -} - - -static void localfunc (LexState *ls) { - expdesc v, b; - FuncState *fs = ls->fs; - new_localvar(ls, str_checkname(ls), 0); - init_exp(&v, VLOCAL, fs->freereg); - luaK_reserveregs(fs, 1); - adjustlocalvars(ls, 1); - body(ls, &b, 0, ls->linenumber); - luaK_storevar(fs, &v, &b); - /* debug information will only see the variable after this point! */ - getlocvar(fs, fs->nactvar - 1).startpc = fs->pc; -} - - -static void localstat (LexState *ls) { - /* stat -> LOCAL NAME {`,' NAME} [`=' explist1] */ - int nvars = 0; - int nexps; - expdesc e; - do { - new_localvar(ls, str_checkname(ls), nvars++); - } while (testnext(ls, ',')); - if (testnext(ls, '=')) - nexps = explist1(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 {field} [`:' NAME] */ - int needself = 0; - singlevar(ls, v, 1); - while (ls->t.token == '.') - luaY_field(ls, v); - if (ls->t.token == ':') { - needself = 1; - luaY_field(ls, v); - } - return needself; -} - - -static void funcstat (LexState *ls, int line) { - /* funcstat -> FUNCTION funcname body */ - int needself; - expdesc v, b; - next(ls); /* skip FUNCTION */ - needself = funcname(ls, &v); - body(ls, &b, needself, 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; - primaryexp(ls, &v.v); - if (v.v.k == VCALL) { /* stat -> func */ - luaK_setcallreturns(fs, &v.v, 0); /* call statement uses no results */ - } - else { /* stat -> assignment */ - v.prev = NULL; - assignment(ls, &v, 1); - } -} - - -static void retstat (LexState *ls) { - /* stat -> RETURN explist */ - FuncState *fs = ls->fs; - expdesc e; - int first, nret; /* registers with returned values */ - next(ls); /* skip RETURN */ - if (block_follow(ls->t.token) || ls->t.token == ';') - first = nret = 0; /* return no values */ - else { - nret = explist1(ls, &e); /* optional return values */ - if (e.k == VCALL) { - luaK_setcallreturns(fs, &e, LUA_MULTRET); - if (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_codeABC(fs, OP_RETURN, first, nret+1, 0); -} - - -static void breakstat (LexState *ls) { - /* stat -> BREAK [NAME] */ - FuncState *fs = ls->fs; - BlockCnt *bl = fs->bl; - int upval = 0; - next(ls); /* skip BREAK */ - while (bl && !bl->isbreakable) { - upval |= bl->upval; - bl = bl->previous; - } - if (!bl) - luaX_syntaxerror(ls, "no loop to break"); - if (upval) - luaK_codeABC(fs, OP_CLOSE, bl->nactvar, 0, 0); - luaK_concat(fs, &bl->breaklist, luaK_jump(fs)); -} - - -static int statement (LexState *ls) { - int line = ls->linenumber; /* may be needed for error messages */ - switch (ls->t.token) { - case TK_IF: { /* stat -> ifstat */ - ifstat(ls, line); - return 0; - } - case TK_WHILE: { /* stat -> whilestat */ - whilestat(ls, line); - return 0; - } - case TK_DO: { /* stat -> DO block END */ - next(ls); /* skip DO */ - block(ls); - check_match(ls, TK_END, TK_DO, line); - return 0; - } - case TK_FOR: { /* stat -> forstat */ - forstat(ls, line); - return 0; - } - case TK_REPEAT: { /* stat -> repeatstat */ - repeatstat(ls, line); - return 0; - } - case TK_FUNCTION: { - funcstat(ls, line); /* stat -> funcstat */ - return 0; - } - case TK_LOCAL: { /* stat -> localstat */ - next(ls); /* skip LOCAL */ - if (testnext(ls, TK_FUNCTION)) /* local function? */ - localfunc(ls); - else - localstat(ls); - return 0; - } - case TK_RETURN: { /* stat -> retstat */ - retstat(ls); - return 1; /* must be last statement */ - } - case TK_BREAK: { /* stat -> breakstat */ - breakstat(ls); - return 1; /* must be last statement */ - } - default: { - exprstat(ls); - return 0; /* to avoid warnings */ - } - } -} - - -static void chunk (LexState *ls) { - /* chunk -> { stat [`;'] } */ - int islast = 0; - enterlevel(ls); - while (!islast && !block_follow(ls->t.token)) { - islast = statement(ls); - testnext(ls, ';'); - lua_assert(ls->fs->freereg >= ls->fs->nactvar); - ls->fs->freereg = ls->fs->nactvar; /* free registers */ - } - leavelevel(ls); -} - -/* }====================================================================== */ diff --git a/contrib/lua50/src/lparser.h b/contrib/lua50/src/lparser.h deleted file mode 100644 index d6aaaf0e7..000000000 --- a/contrib/lua50/src/lparser.h +++ /dev/null @@ -1,71 +0,0 @@ -/* -** $Id: lparser.h,v 1.47 2003/02/11 10:46:24 roberto Exp $ -** Lua Parser -** See Copyright Notice in lua.h -*/ - -#ifndef lparser_h -#define lparser_h - -#include "llimits.h" -#include "lobject.h" -#include "ltable.h" -#include "lzio.h" - - -/* -** Expression descriptor -*/ - -typedef enum { - VVOID, /* no value */ - VNIL, - VTRUE, - VFALSE, - VK, /* info = index of constant in `k' */ - VLOCAL, /* info = local register */ - VUPVAL, /* info = index of upvalue in `upvalues' */ - VGLOBAL, /* info = index of table; aux = index of global name in `k' */ - VINDEXED, /* info = table register; aux = index register (or `k') */ - VJMP, /* info = instruction pc */ - VRELOCABLE, /* info = instruction pc */ - VNONRELOC, /* info = result register */ - VCALL /* info = result register */ -} expkind; - -typedef struct expdesc { - expkind k; - int info, aux; - int t; /* patch list of `exit when true' */ - int f; /* patch list of `exit when false' */ -} expdesc; - - -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 lua_State *L; /* copy of the Lua state */ - struct BlockCnt *bl; /* chain of current blocks */ - int pc; /* next position to code (equivalent to `ncode') */ - int lasttarget; /* `pc' of last `jump target' */ - int jpc; /* list of pending jumps to `pc' */ - int freereg; /* first free register */ - int nk; /* number of elements in `k' */ - int np; /* number of elements in `p' */ - int nlocvars; /* number of elements in `locvars' */ - int nactvar; /* number of active local variables */ - expdesc upvalues[MAXUPVALUES]; /* upvalues */ - int actvar[MAXVARS]; /* declared-variable stack */ -} FuncState; - - -Proto *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff); - - -#endif diff --git a/contrib/lua50/src/lstate.c b/contrib/lua50/src/lstate.c deleted file mode 100644 index b593658de..000000000 --- a/contrib/lua50/src/lstate.c +++ /dev/null @@ -1,220 +0,0 @@ -/* -** $Id: lstate.c,v 1.123 2003/04/03 13:35:34 roberto Exp $ -** Global State -** See Copyright Notice in lua.h -*/ - - -#include - -#define lstate_c - -#include "lua.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" - - -/* -** macro to allow the inclusion of user information in Lua state -*/ -#ifndef LUA_USERSTATE -#define EXTRASPACE 0 -#else -union UEXTRASPACE {L_Umaxalign a; LUA_USERSTATE b;}; -#define EXTRASPACE (sizeof(union UEXTRASPACE)) -#endif - - - -/* -** you can change this function through the official API: -** call `lua_setpanicf' -*/ -static int default_panic (lua_State *L) { - UNUSED(L); - return 0; -} - - -static lua_State *mallocstate (lua_State *L) { - lu_byte *block = (lu_byte *)luaM_malloc(L, sizeof(lua_State) + EXTRASPACE); - if (block == NULL) return NULL; - else { - block += EXTRASPACE; - return cast(lua_State *, block); - } -} - - -static void freestate (lua_State *L, lua_State *L1) { - luaM_free(L, cast(lu_byte *, L1) - EXTRASPACE, - sizeof(lua_State) + EXTRASPACE); -} - - -static void stack_init (lua_State *L1, lua_State *L) { - L1->stack = luaM_newvector(L, BASIC_STACK_SIZE + EXTRA_STACK, TObject); - L1->stacksize = BASIC_STACK_SIZE + EXTRA_STACK; - L1->top = L1->stack; - L1->stack_last = L1->stack+(L1->stacksize - EXTRA_STACK)-1; - L1->base_ci = luaM_newvector(L, BASIC_CI_SIZE, CallInfo); - L1->ci = L1->base_ci; - L1->ci->state = CI_C; /* not a Lua function */ - setnilvalue(L1->top++); /* `function' entry for this `ci' */ - L1->base = L1->ci->base = L1->top; - L1->ci->top = L1->top + LUA_MINSTACK; - L1->size_ci = BASIC_CI_SIZE; - L1->end_ci = L1->base_ci + L1->size_ci; -} - - -static void freestack (lua_State *L, lua_State *L1) { - luaM_freearray(L, L1->base_ci, L1->size_ci, CallInfo); - luaM_freearray(L, L1->stack, L1->stacksize, TObject); -} - - -/* -** open parts that may cause memory-allocation errors -*/ -static void f_luaopen (lua_State *L, void *ud) { - /* create a new global state */ - global_State *g = luaM_new(NULL, global_State); - UNUSED(ud); - if (g == NULL) luaD_throw(L, LUA_ERRMEM); - L->l_G = g; - g->mainthread = L; - g->GCthreshold = 0; /* mark it as unfinished state */ - g->strt.size = 0; - g->strt.nuse = 0; - g->strt.hash = NULL; - setnilvalue(defaultmeta(L)); - setnilvalue(registry(L)); - luaZ_initbuffer(L, &g->buff); - g->panic = default_panic; - g->rootgc = NULL; - g->rootudata = NULL; - g->tmudata = NULL; - setnilvalue(gkey(g->dummynode)); - setnilvalue(gval(g->dummynode)); - g->dummynode->next = NULL; - g->nblocks = sizeof(lua_State) + sizeof(global_State); - stack_init(L, L); /* init stack */ - /* create default meta table with a dummy table, and then close the loop */ - defaultmeta(L)->tt = LUA_TTABLE; - sethvalue(defaultmeta(L), luaH_new(L, 0, 0)); - hvalue(defaultmeta(L))->metatable = hvalue(defaultmeta(L)); - sethvalue(gt(L), luaH_new(L, 0, 4)); /* table of globals */ - sethvalue(registry(L), luaH_new(L, 4, 4)); /* registry */ - luaS_resize(L, MINSTRTABSIZE); /* initial size of string table */ - luaT_init(L); - luaX_init(L); - luaS_fix(luaS_newliteral(L, MEMERRMSG)); - g->GCthreshold = 4*G(L)->nblocks; -} - - -static void preinit_state (lua_State *L) { - L->stack = NULL; - L->stacksize = 0; - L->errorJmp = NULL; - L->hook = NULL; - L->hookmask = L->hookinit = 0; - L->basehookcount = 0; - L->allowhook = 1; - resethookcount(L); - L->openupval = NULL; - L->size_ci = 0; - L->nCcalls = 0; - L->base_ci = L->ci = NULL; - L->errfunc = 0; - setnilvalue(gt(L)); -} - - -static void close_state (lua_State *L) { - luaF_close(L, L->stack); /* close all upvalues for this thread */ - if (G(L)) { /* close global state */ - luaC_sweep(L, 1); /* collect all elements */ - lua_assert(G(L)->rootgc == NULL); - lua_assert(G(L)->rootudata == NULL); - luaS_freeall(L); - luaZ_freebuffer(L, &G(L)->buff); - } - freestack(L, L); - if (G(L)) { - lua_assert(G(L)->nblocks == sizeof(lua_State) + sizeof(global_State)); - luaM_freelem(NULL, G(L)); - } - freestate(NULL, L); -} - - -lua_State *luaE_newthread (lua_State *L) { - lua_State *L1 = mallocstate(L); - luaC_link(L, valtogco(L1), LUA_TTHREAD); - preinit_state(L1); - L1->l_G = L->l_G; - stack_init(L1, L); /* init stack */ - setobj2n(gt(L1), gt(L)); /* share table of globals */ - return L1; -} - - -void luaE_freethread (lua_State *L, lua_State *L1) { - luaF_close(L1, L1->stack); /* close all upvalues for this thread */ - lua_assert(L1->openupval == NULL); - freestack(L, L1); - freestate(L, L1); -} - - -LUA_API lua_State *lua_open (void) { - lua_State *L = mallocstate(NULL); - if (L) { /* allocation OK? */ - L->tt = LUA_TTHREAD; - L->marked = 0; - L->next = L->gclist = NULL; - preinit_state(L); - L->l_G = NULL; - if (luaD_rawrunprotected(L, f_luaopen, NULL) != 0) { - /* memory allocation error: free partial state */ - close_state(L); - L = NULL; - } - } - lua_userstateopen(L); - return L; -} - - -static void callallgcTM (lua_State *L, void *ud) { - UNUSED(ud); - luaC_callGCTM(L); /* call GC metamethods for all udata */ -} - - -LUA_API void lua_close (lua_State *L) { - lua_lock(L); - L = G(L)->mainthread; /* only the main thread can be closed */ - luaF_close(L, L->stack); /* close all upvalues for this thread */ - luaC_separateudata(L); /* separate udata that have GC metamethods */ - L->errfunc = 0; /* no error function during GC metamethods */ - do { /* repeat until no more errors */ - L->ci = L->base_ci; - L->base = L->top = L->ci->base; - L->nCcalls = 0; - } while (luaD_rawrunprotected(L, callallgcTM, NULL) != 0); - lua_assert(G(L)->tmudata == NULL); - close_state(L); -} - diff --git a/contrib/lua50/src/lstate.h b/contrib/lua50/src/lstate.h deleted file mode 100644 index 5422f1b19..000000000 --- a/contrib/lua50/src/lstate.h +++ /dev/null @@ -1,195 +0,0 @@ -/* -** $Id: lstate.h,v 1.109 2003/02/27 11:52:30 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" - - -/* -** macros for thread synchronization inside Lua core machine: -** all accesses to the global state and to global objects are synchronized. -** Because threads can read the stack of other threads -** (when running garbage collection), -** a thread must also synchronize any write-access to its own stack. -** Unsynchronized accesses are allowed only when reading its own stack, -** or when reading immutable fields from global objects -** (such as string values and udata values). -*/ -#ifndef lua_lock -#define lua_lock(L) ((void) 0) -#endif - -#ifndef lua_unlock -#define lua_unlock(L) ((void) 0) -#endif - - -#ifndef lua_userstateopen -#define lua_userstateopen(l) -#endif - - - -struct lua_longjmp; /* defined in ldo.c */ - - -/* default meta table (both for tables and udata) */ -#define defaultmeta(L) (&G(L)->_defaultmeta) - -/* table of globals */ -#define gt(L) (&L->_gt) - -/* registry */ -#define registry(L) (&G(L)->_registry) - - -/* extra stack space to handle TM calls and some other extras */ -#define EXTRA_STACK 5 - - -#define BASIC_CI_SIZE 8 - -#define BASIC_STACK_SIZE (2*LUA_MINSTACK) - - - -typedef struct stringtable { - GCObject **hash; - ls_nstr nuse; /* number of elements */ - int size; -} stringtable; - - -/* -** informations about a call -*/ -typedef struct CallInfo { - StkId base; /* base for called function */ - StkId top; /* top for this function */ - int state; /* bit fields; see below */ - union { - struct { /* for Lua functions */ - const Instruction *savedpc; - const Instruction **pc; /* points to `pc' variable in `luaV_execute' */ - int tailcalls; /* number of tail calls lost under this entry */ - } l; - struct { /* for C functions */ - int dummy; /* just to avoid an empty struct */ - } c; - } u; -} CallInfo; - - -/* -** bit fields for `CallInfo.state' -*/ -#define CI_C (1<<0) /* 1 if function is a C function */ -/* 1 if (Lua) function has an active `luaV_execute' running it */ -#define CI_HASFRAME (1<<1) -/* 1 if Lua function is calling another Lua function (and therefore its - `pc' is being used by the other, and therefore CI_SAVEDPC is 1 too) */ -#define CI_CALLING (1<<2) -#define CI_SAVEDPC (1<<3) /* 1 if `savedpc' is updated */ -#define CI_YIELD (1<<4) /* 1 if thread is suspended */ - - -#define ci_func(ci) (clvalue((ci)->base - 1)) - - -/* -** `global state', shared by all threads of this state -*/ -typedef struct global_State { - stringtable strt; /* hash table for strings */ - GCObject *rootgc; /* list of (almost) all collectable objects */ - GCObject *rootudata; /* (separated) list of all userdata */ - GCObject *tmudata; /* list of userdata to be GC */ - Mbuffer buff; /* temporary buffer for string concatentation */ - lu_mem GCthreshold; - lu_mem nblocks; /* number of `bytes' currently allocated */ - lua_CFunction panic; /* to be called in unprotected errors */ - TObject _registry; - TObject _defaultmeta; - struct lua_State *mainthread; - Node dummynode[1]; /* common node array for all empty tables */ - TString *tmname[TM_N]; /* array with tag-method names */ -} global_State; - - -/* -** `per thread' state -*/ -struct lua_State { - CommonHeader; - StkId top; /* first free slot in the stack */ - StkId base; /* base of current function */ - global_State *l_G; - CallInfo *ci; /* call info for current function */ - StkId stack_last; /* last free slot in the stack */ - StkId stack; /* stack base */ - int stacksize; - CallInfo *end_ci; /* points after end of ci array*/ - CallInfo *base_ci; /* array of CallInfo's */ - unsigned short size_ci; /* size of array `base_ci' */ - unsigned short nCcalls; /* number of nested C calls */ - lu_byte hookmask; - lu_byte allowhook; - lu_byte hookinit; - int basehookcount; - int hookcount; - lua_Hook hook; - TObject _gt; /* table of globals */ - 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) */ -}; - - -#define G(L) (L->l_G) - - -/* -** Union of all collectable objects -*/ -union GCObject { - GCheader gch; - union TString ts; - union Udata u; - union Closure cl; - struct Table h; - struct Proto p; - struct UpVal uv; - struct lua_State th; /* thread */ -}; - - -/* macros to convert a GCObject into a specific value */ -#define gcotots(o) check_exp((o)->gch.tt == LUA_TSTRING, &((o)->ts)) -#define gcotou(o) check_exp((o)->gch.tt == LUA_TUSERDATA, &((o)->u)) -#define gcotocl(o) check_exp((o)->gch.tt == LUA_TFUNCTION, &((o)->cl)) -#define gcotoh(o) check_exp((o)->gch.tt == LUA_TTABLE, &((o)->h)) -#define gcotop(o) check_exp((o)->gch.tt == LUA_TPROTO, &((o)->p)) -#define gcotouv(o) check_exp((o)->gch.tt == LUA_TUPVAL, &((o)->uv)) -#define ngcotouv(o) \ - check_exp((o) == NULL || (o)->gch.tt == LUA_TUPVAL, &((o)->uv)) -#define gcototh(o) check_exp((o)->gch.tt == LUA_TTHREAD, &((o)->th)) - -/* macro to convert any value into a GCObject */ -#define valtogco(v) (cast(GCObject *, (v))) - - -lua_State *luaE_newthread (lua_State *L); -void luaE_freethread (lua_State *L, lua_State *L1); - -#endif - diff --git a/contrib/lua50/src/lstring.c b/contrib/lua50/src/lstring.c deleted file mode 100644 index 8cbddbd21..000000000 --- a/contrib/lua50/src/lstring.c +++ /dev/null @@ -1,102 +0,0 @@ -/* -** $Id: lstring.c,v 1.78 2002/12/04 17:38:31 roberto Exp $ -** String table (keeps all strings handled by Lua) -** See Copyright Notice in lua.h -*/ - - -#include - -#define lstring_c - -#include "lua.h" - -#include "lmem.h" -#include "lobject.h" -#include "lstate.h" -#include "lstring.h" - - - -void luaS_freeall (lua_State *L) { - lua_assert(G(L)->strt.nuse==0); - luaM_freearray(L, G(L)->strt.hash, G(L)->strt.size, TString *); -} - - -void luaS_resize (lua_State *L, int newsize) { - GCObject **newhash = luaM_newvector(L, newsize, GCObject *); - stringtable *tb = &G(L)->strt; - int i; - for (i=0; isize; i++) { - GCObject *p = tb->hash[i]; - while (p) { /* for each node in the list */ - GCObject *next = p->gch.next; /* save next */ - lu_hash h = gcotots(p)->tsv.hash; - int h1 = lmod(h, newsize); /* new position */ - lua_assert(cast(int, h%newsize) == lmod(h, newsize)); - p->gch.next = newhash[h1]; /* chain it */ - newhash[h1] = p; - p = next; - } - } - luaM_freearray(L, tb->hash, tb->size, TString *); - tb->size = newsize; - tb->hash = newhash; -} - - -static TString *newlstr (lua_State *L, const char *str, size_t l, lu_hash h) { - TString *ts = cast(TString *, luaM_malloc(L, sizestring(l))); - stringtable *tb; - ts->tsv.len = l; - ts->tsv.hash = h; - ts->tsv.marked = 0; - ts->tsv.tt = LUA_TSTRING; - ts->tsv.reserved = 0; - memcpy(ts+1, str, l*sizeof(char)); - ((char *)(ts+1))[l] = '\0'; /* ending 0 */ - tb = &G(L)->strt; - h = lmod(h, tb->size); - ts->tsv.next = tb->hash[h]; /* chain new entry */ - tb->hash[h] = valtogco(ts); - tb->nuse++; - if (tb->nuse > cast(ls_nstr, tb->size) && tb->size <= MAX_INT/2) - luaS_resize(L, tb->size*2); /* too crowded */ - return ts; -} - - -TString *luaS_newlstr (lua_State *L, const char *str, size_t l) { - GCObject *o; - lu_hash h = (lu_hash)l; /* seed */ - size_t step = (l>>5)+1; /* if string is too long, don't hash all its chars */ - size_t l1; - for (l1=l; l1>=step; l1-=step) /* compute hash */ - h = h ^ ((h<<5)+(h>>2)+(unsigned char)(str[l1-1])); - for (o = G(L)->strt.hash[lmod(h, G(L)->strt.size)]; - o != NULL; - o = o->gch.next) { - TString *ts = gcotots(o); - if (ts->tsv.len == l && (memcmp(str, getstr(ts), l) == 0)) - return ts; - } - return newlstr(L, str, l, h); /* not found */ -} - - -Udata *luaS_newudata (lua_State *L, size_t s) { - Udata *u; - u = cast(Udata *, luaM_malloc(L, sizeudata(s))); - u->uv.marked = (1<<1); /* is not finalized */ - u->uv.tt = LUA_TUSERDATA; - u->uv.len = s; - u->uv.metatable = hvalue(defaultmeta(L)); - /* chain it on udata list */ - u->uv.next = G(L)->rootudata; - G(L)->rootudata = valtogco(u); - return u; -} - diff --git a/contrib/lua50/src/lstring.h b/contrib/lua50/src/lstring.h deleted file mode 100644 index be5a1e376..000000000 --- a/contrib/lua50/src/lstring.h +++ /dev/null @@ -1,33 +0,0 @@ -/* -** $Id: lstring.h,v 1.37 2002/08/16 14:45:55 roberto Exp $ -** String table (keep all strings handled by Lua) -** See Copyright Notice in lua.h -*/ - -#ifndef lstring_h -#define lstring_h - - -#include "lobject.h" -#include "lstate.h" - - - -#define sizestring(l) (cast(lu_mem, sizeof(union TString))+ \ - (cast(lu_mem, l)+1)*sizeof(char)) - -#define sizeudata(l) (cast(lu_mem, sizeof(union Udata))+(l)) - -#define luaS_new(L, s) (luaS_newlstr(L, s, strlen(s))) -#define luaS_newliteral(L, s) (luaS_newlstr(L, "" s, \ - (sizeof(s)/sizeof(char))-1)) - -#define luaS_fix(s) ((s)->tsv.marked |= (1<<4)) - -void luaS_resize (lua_State *L, int newsize); -Udata *luaS_newudata (lua_State *L, size_t s); -void luaS_freeall (lua_State *L); -TString *luaS_newlstr (lua_State *L, const char *str, size_t l); - - -#endif diff --git a/contrib/lua50/src/ltable.c b/contrib/lua50/src/ltable.c deleted file mode 100644 index 0c64adb10..000000000 --- a/contrib/lua50/src/ltable.c +++ /dev/null @@ -1,509 +0,0 @@ -/* -** $Id: ltable.c,v 1.132 2003/04/03 13:35:34 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. -** In other words, there are collisions only when two elements have the -** same main position (i.e. the same hash values for that table size). -** Because of that, the load factor of these tables can be 100% without -** performance penalties. -*/ - -#include - -#define ltable_c - -#include "lua.h" - -#include "ldebug.h" -#include "ldo.h" -#include "lgc.h" -#include "lmem.h" -#include "lobject.h" -#include "lstate.h" -#include "ltable.h" - - -/* -** max size of array part is 2^MAXBITS -*/ -#if BITS_INT > 26 -#define MAXBITS 24 -#else -#define MAXBITS (BITS_INT-2) -#endif - -/* check whether `x' < 2^MAXBITS */ -#define toobig(x) ((((x)-1) >> MAXBITS) != 0) - - -/* function to convert a lua_Number to int (with any rounding method) */ -#ifndef lua_number2int -#define lua_number2int(i,n) ((i)=(int)(n)) -#endif - - -#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)) - - -/* -** number of ints inside a lua_Number -*/ -#define numints cast(int, sizeof(lua_Number)/sizeof(int)) - - -/* -** hash for lua_Numbers -*/ -static Node *hashnum (const Table *t, lua_Number n) { - unsigned int a[numints]; - int i; - n += 1; /* normalize number (avoid -0) */ - lua_assert(sizeof(a) <= sizeof(n)); - memcpy(a, &n, sizeof(a)); - for (i = 1; i < numints; i++) a[0] += a[i]; - return hashmod(t, cast(lu_hash, a[0])); -} - - - -/* -** returns the `main' position of an element in a table (that is, the index -** of its hash value) -*/ -Node *luaH_mainposition (const Table *t, const TObject *key) { - switch (ttype(key)) { - case LUA_TNUMBER: - return hashnum(t, nvalue(key)); - case LUA_TSTRING: - return hashstr(t, tsvalue(key)); - case LUA_TBOOLEAN: - return hashboolean(t, bvalue(key)); - case LUA_TLIGHTUSERDATA: - return hashpointer(t, pvalue(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 TObject *key) { - if (ttisnumber(key)) { - int k; - lua_number2int(k, (nvalue(key))); - if (cast(lua_Number, k) == nvalue(key) && k >= 1 && !toobig(k)) - 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 and end of a traversal are signalled by -1. -*/ -static int luaH_index (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 { - const TObject *v = luaH_get(t, key); - if (v == &luaO_nilobject) - luaG_runerror(L, "invalid key for `next'"); - i = cast(int, (cast(const lu_byte *, v) - - cast(const lu_byte *, gval(gnode(t, 0)))) / sizeof(Node)); - return i + t->sizearray; /* hash elements are numbered after array ones */ - } -} - - -int luaH_next (lua_State *L, Table *t, StkId key) { - int i = luaH_index(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(lua_Number, i+1)); - setobj2s(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(key, gkey(gnode(t, i))); - setobj2s(key+1, gval(gnode(t, i))); - return 1; - } - } - return 0; /* no more elements */ -} - - -/* -** {============================================================= -** Rehash -** ============================================================== -*/ - - -static void computesizes (int nums[], int ntotal, int *narray, int *nhash) { - int i; - int a = nums[0]; /* number of elements smaller than 2^i */ - int na = a; /* number of elements to go to array part */ - int n = (na == 0) ? -1 : 0; /* (log of) optimal size for array part */ - for (i = 1; a < *narray && *narray >= twoto(i-1); i++) { - if (nums[i] > 0) { - a += nums[i]; - if (a >= twoto(i-1)) { /* more than half elements in use? */ - n = i; - na = a; - } - } - } - lua_assert(na <= *narray && *narray <= ntotal); - *nhash = ntotal - na; - *narray = (n == -1) ? 0 : twoto(n); - lua_assert(na <= *narray && na >= *narray/2); -} - - -static void numuse (const Table *t, int *narray, int *nhash) { - int nums[MAXBITS+1]; - int i, lg; - int totaluse = 0; - /* count elements in array part */ - for (i=0, lg=0; lg<=MAXBITS; lg++) { /* for each slice [2^(lg-1) to 2^lg) */ - int ttlg = twoto(lg); /* 2^lg */ - if (ttlg > t->sizearray) { - ttlg = t->sizearray; - if (i >= ttlg) break; - } - nums[lg] = 0; - for (; iarray[i])) { - nums[lg]++; - totaluse++; - } - } - } - for (; lg<=MAXBITS; lg++) nums[lg] = 0; /* reset other counts */ - *narray = totaluse; /* all previous uses were in array part */ - /* count elements in hash part */ - i = sizenode(t); - while (i--) { - Node *n = &t->node[i]; - if (!ttisnil(gval(n))) { - int k = arrayindex(gkey(n)); - if (k >= 0) { /* is `key' an appropriate array index? */ - nums[luaO_log2(k-1)+1]++; /* count as such */ - (*narray)++; - } - totaluse++; - } - } - computesizes(nums, totaluse, narray, nhash); -} - - -static void setarrayvector (lua_State *L, Table *t, int size) { - int i; - luaM_reallocvector(L, t->array, t->sizearray, size, TObject); - for (i=t->sizearray; iarray[i]); - t->sizearray = size; -} - - -static void setnodevector (lua_State *L, Table *t, int lsize) { - int i; - int size = twoto(lsize); - if (lsize > MAXBITS) - luaG_runerror(L, "table overflow"); - if (lsize == 0) { /* no elements to hash part? */ - t->node = G(L)->dummynode; /* use common `dummynode' */ - lua_assert(ttisnil(gkey(t->node))); /* assert invariants: */ - lua_assert(ttisnil(gval(t->node))); - lua_assert(t->node->next == NULL); /* (`dummynode' must be empty) */ - } - else { - t->node = luaM_newvector(L, size, Node); - for (i=0; inode[i].next = NULL; - setnilvalue(gkey(gnode(t, i))); - setnilvalue(gval(gnode(t, i))); - } - } - t->lsizenode = cast(lu_byte, lsize); - t->firstfree = gnode(t, size-1); /* first free position to be used */ -} - - -static void resize (lua_State *L, Table *t, int nasize, int nhsize) { - int i; - int oldasize = t->sizearray; - int oldhsize = t->lsizenode; - Node *nold; - Node temp[1]; - if (oldhsize) - nold = t->node; /* save old hash ... */ - else { /* old hash is `dummynode' */ - lua_assert(t->node == G(L)->dummynode); - temp[0] = t->node[0]; /* copy it to `temp' */ - nold = temp; - setnilvalue(gkey(G(L)->dummynode)); /* restate invariant */ - setnilvalue(gval(G(L)->dummynode)); - lua_assert(G(L)->dummynode->next == NULL); - } - if (nasize > oldasize) /* array part must grow? */ - setarrayvector(L, t, nasize); - /* create new hash part with appropriate size */ - setnodevector(L, t, nhsize); - /* re-insert elements */ - if (nasize < oldasize) { /* array part must shrink? */ - t->sizearray = nasize; - /* re-insert elements from vanishing slice */ - for (i=nasize; iarray[i])) - setobjt2t(luaH_setnum(L, t, i+1), &t->array[i]); - } - /* shrink array */ - luaM_reallocvector(L, t->array, oldasize, nasize, TObject); - } - /* re-insert elements in hash part */ - for (i = twoto(oldhsize) - 1; i >= 0; i--) { - Node *old = nold+i; - if (!ttisnil(gval(old))) - setobjt2t(luaH_set(L, t, gkey(old)), gval(old)); - } - if (oldhsize) - luaM_freearray(L, nold, twoto(oldhsize), Node); /* free old array */ -} - - -static void rehash (lua_State *L, Table *t) { - int nasize, nhsize; - numuse(t, &nasize, &nhsize); /* compute new sizes for array and hash parts */ - resize(L, t, nasize, luaO_log2(nhsize)+1); -} - - - -/* -** }============================================================= -*/ - - -Table *luaH_new (lua_State *L, int narray, int lnhash) { - Table *t = luaM_new(L, Table); - luaC_link(L, valtogco(t), LUA_TTABLE); - t->metatable = hvalue(defaultmeta(L)); - t->flags = cast(lu_byte, ~0); - /* temporary values (kept only if some malloc fails) */ - t->array = NULL; - t->sizearray = 0; - t->lsizenode = 0; - t->node = NULL; - setarrayvector(L, t, narray); - setnodevector(L, t, lnhash); - return t; -} - - -void luaH_free (lua_State *L, Table *t) { - if (t->lsizenode) - luaM_freearray(L, t->node, sizenode(t), Node); - luaM_freearray(L, t->array, t->sizearray, TObject); - luaM_freelem(L, t); -} - - -#if 0 -/* -** try to remove an element from a hash table; cannot move any element -** (because gc can call `remove' during a table traversal) -*/ -void luaH_remove (Table *t, Node *e) { - Node *mp = luaH_mainposition(t, gkey(e)); - if (e != mp) { /* element not in its main position? */ - while (mp->next != e) mp = mp->next; /* find previous */ - mp->next = e->next; /* remove `e' from its list */ - } - else { - if (e->next != NULL) ?? - } - lua_assert(ttisnil(gval(node))); - setnilvalue(gkey(e)); /* clear node `e' */ - e->next = NULL; -} -#endif - - -/* -** 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. -*/ -static TObject *newkey (lua_State *L, Table *t, const TObject *key) { - TObject *val; - Node *mp = luaH_mainposition(t, key); - if (!ttisnil(gval(mp))) { /* main position is not free? */ - Node *othern = luaH_mainposition(t, gkey(mp)); /* `mp' of colliding node */ - Node *n = t->firstfree; /* get a free place */ - if (othern != mp) { /* is colliding node out of its main position? */ - /* yes; move colliding node into free position */ - while (othern->next != mp) othern = othern->next; /* find previous */ - othern->next = n; /* redo the chain with `n' in place of `mp' */ - *n = *mp; /* copy colliding node into free pos. (mp->next also goes) */ - mp->next = NULL; /* now `mp' is free */ - setnilvalue(gval(mp)); - } - else { /* colliding node is in its own main position */ - /* new node will go into free position */ - n->next = mp->next; /* chain new position */ - mp->next = n; - mp = n; - } - } - setobj2t(gkey(mp), key); /* write barrier */ - lua_assert(ttisnil(gval(mp))); - for (;;) { /* correct `firstfree' */ - if (ttisnil(gkey(t->firstfree))) - return gval(mp); /* OK; table still has a free place */ - else if (t->firstfree == t->node) break; /* cannot decrement from here */ - else (t->firstfree)--; - } - /* no more free places; must create one */ - setbvalue(gval(mp), 0); /* avoid new key being removed */ - rehash(L, t); /* grow table */ - val = cast(TObject *, luaH_get(t, key)); /* get new position */ - lua_assert(ttisboolean(val)); - setnilvalue(val); - return val; -} - - -/* -** generic search function -*/ -static const TObject *luaH_getany (Table *t, const TObject *key) { - if (ttisnil(key)) return &luaO_nilobject; - else { - Node *n = luaH_mainposition(t, key); - do { /* check whether `key' is somewhere in the chain */ - if (luaO_rawequalObj(gkey(n), key)) return gval(n); /* that's it */ - else n = n->next; - } while (n); - return &luaO_nilobject; - } -} - - -/* -** search function for integers -*/ -const TObject *luaH_getnum (Table *t, int key) { - if (1 <= key && key <= t->sizearray) - return &t->array[key-1]; - else { - lua_Number nk = cast(lua_Number, key); - Node *n = hashnum(t, nk); - do { /* check whether `key' is somewhere in the chain */ - if (ttisnumber(gkey(n)) && nvalue(gkey(n)) == nk) - return gval(n); /* that's it */ - else n = n->next; - } while (n); - return &luaO_nilobject; - } -} - - -/* -** search function for strings -*/ -const TObject *luaH_getstr (Table *t, TString *key) { - Node *n = hashstr(t, key); - do { /* check whether `key' is somewhere in the chain */ - if (ttisstring(gkey(n)) && tsvalue(gkey(n)) == key) - return gval(n); /* that's it */ - else n = n->next; - } while (n); - return &luaO_nilobject; -} - - -/* -** main search function -*/ -const TObject *luaH_get (Table *t, const TObject *key) { - switch (ttype(key)) { - case LUA_TSTRING: return luaH_getstr(t, tsvalue(key)); - case LUA_TNUMBER: { - int k; - lua_number2int(k, (nvalue(key))); - if (cast(lua_Number, k) == nvalue(key)) /* is an integer index? */ - return luaH_getnum(t, k); /* use specialized version */ - /* else go through */ - } - default: return luaH_getany(t, key); - } -} - - -TObject *luaH_set (lua_State *L, Table *t, const TObject *key) { - const TObject *p = luaH_get(t, key); - t->flags = 0; - if (p != &luaO_nilobject) - return cast(TObject *, p); - else { - if (ttisnil(key)) luaG_runerror(L, "table index is nil"); - else if (ttisnumber(key) && nvalue(key) != nvalue(key)) - luaG_runerror(L, "table index is NaN"); - return newkey(L, t, key); - } -} - - -TObject *luaH_setnum (lua_State *L, Table *t, int key) { - const TObject *p = luaH_getnum(t, key); - if (p != &luaO_nilobject) - return cast(TObject *, p); - else { - TObject k; - setnvalue(&k, cast(lua_Number, key)); - return newkey(L, t, &k); - } -} - diff --git a/contrib/lua50/src/ltable.h b/contrib/lua50/src/ltable.h deleted file mode 100644 index 3d4d753c3..000000000 --- a/contrib/lua50/src/ltable.h +++ /dev/null @@ -1,31 +0,0 @@ -/* -** $Id: ltable.h,v 1.44 2003/03/18 12:50:04 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) -#define gval(n) (&(n)->i_val) - - -const TObject *luaH_getnum (Table *t, int key); -TObject *luaH_setnum (lua_State *L, Table *t, int key); -const TObject *luaH_getstr (Table *t, TString *key); -const TObject *luaH_get (Table *t, const TObject *key); -TObject *luaH_set (lua_State *L, Table *t, const TObject *key); -Table *luaH_new (lua_State *L, int narray, int lnhash); -void luaH_free (lua_State *L, Table *t); -int luaH_next (lua_State *L, Table *t, StkId key); - -/* exported only for debugging */ -Node *luaH_mainposition (const Table *t, const TObject *key); - - -#endif diff --git a/contrib/lua50/src/ltests.c b/contrib/lua50/src/ltests.c deleted file mode 100644 index 649b14e0d..000000000 --- a/contrib/lua50/src/ltests.c +++ /dev/null @@ -1,852 +0,0 @@ -/* -** $Id: ltests.c,v 1.158 2003/04/07 14:35:00 roberto Exp $ -** Internal Module for Debugging of the Lua Implementation -** See Copyright Notice in lua.h -*/ - - -#include -#include -#include -#include -#include - -#define ltests_c - -#include "lua.h" - -#include "lapi.h" -#include "lauxlib.h" -#include "lcode.h" -#include "ldebug.h" -#include "ldo.h" -#include "lfunc.h" -#include "lmem.h" -#include "lopcodes.h" -#include "lstate.h" -#include "lstring.h" -#include "ltable.h" -#include "lualib.h" - - - -/* -** The whole module only makes sense with LUA_DEBUG on -*/ -#ifdef LUA_DEBUG - - -#define lua_pushintegral(L,i) lua_pushnumber(L, cast(lua_Number, (i))) - - -static lua_State *lua_state = NULL; - -int islocked = 0; - - -#define func_at(L,k) (L->ci->base+(k) - 1) - - -static void setnameval (lua_State *L, const char *name, int val) { - lua_pushstring(L, name); - lua_pushintegral(L, val); - lua_settable(L, -3); -} - - -/* -** {====================================================================== -** Controlled version for realloc. -** ======================================================================= -*/ - -#define MARK 0x55 /* 01010101 (a nice pattern) */ - -#ifndef EXTERNMEMCHECK -/* full memory check */ -#define HEADER (sizeof(L_Umaxalign)) /* ensures maximum alignment for HEADER */ -#define MARKSIZE 16 /* size of marks after each block */ -#define blockhead(b) (cast(char *, b) - HEADER) -#define setsize(newblock, size) (*cast(size_t *, newblock) = size) -#define checkblocksize(b, size) (size == (*cast(size_t *, blockhead(b)))) -#define fillmem(mem,size) memset(mem, -MARK, size) -#else -/* external memory check: don't do it twice */ -#define HEADER 0 -#define MARKSIZE 0 -#define blockhead(b) (b) -#define setsize(newblock, size) /* empty */ -#define checkblocksize(b,size) (1) -#define fillmem(mem,size) /* empty */ -#endif - -unsigned long memdebug_numblocks = 0; -unsigned long memdebug_total = 0; -unsigned long memdebug_maxmem = 0; -unsigned long memdebug_memlimit = ULONG_MAX; - - -static void *checkblock (void *block, size_t size) { - void *b = blockhead(block); - int i; - for (i=0;i 0); - if (size == 0) { - freeblock(block, oldsize); - return NULL; - } - else if (size > oldsize && memdebug_total+size-oldsize > memdebug_memlimit) - return NULL; /* to test memory allocation errors */ - else { - void *newblock; - int i; - size_t realsize = HEADER+size+MARKSIZE; - size_t commonsize = (oldsize < size) ? oldsize : size; - if (realsize < size) return NULL; /* overflow! */ - newblock = malloc(realsize); /* alloc a new block */ - if (newblock == NULL) return NULL; - if (block) { - memcpy(cast(char *, newblock)+HEADER, block, commonsize); - freeblock(block, oldsize); /* erase (and check) old copy */ - } - /* initialize new part of the block with something `weird' */ - fillmem(cast(char *, newblock)+HEADER+commonsize, size-commonsize); - memdebug_total += size; - if (memdebug_total > memdebug_maxmem) - memdebug_maxmem = memdebug_total; - memdebug_numblocks++; - setsize(newblock, size); - for (i=0;icode[pc]; - OpCode o = GET_OPCODE(i); - const char *name = luaP_opnames[o]; - int line = getline(p, pc); - sprintf(buff, "(%4d) %4d - ", line, pc); - switch (getOpMode(o)) { - case iABC: - sprintf(buff+strlen(buff), "%-12s%4d %4d %4d", name, - GETARG_A(i), GETARG_B(i), GETARG_C(i)); - break; - case iABx: - sprintf(buff+strlen(buff), "%-12s%4d %4d", name, GETARG_A(i), GETARG_Bx(i)); - break; - case iAsBx: - sprintf(buff+strlen(buff), "%-12s%4d %4d", name, GETARG_A(i), GETARG_sBx(i)); - break; - } - return buff; -} - - -#if 0 -void luaI_printcode (Proto *pt, int size) { - int pc; - for (pc=0; pcl.p; - lua_newtable(L); - setnameval(L, "maxstack", p->maxstacksize); - setnameval(L, "numparams", p->numparams); - for (pc=0; pcsizecode; pc++) { - char buff[100]; - lua_pushintegral(L, pc+1); - lua_pushstring(L, buildop(p, pc, buff)); - lua_settable(L, -3); - } - return 1; -} - - -static int listk (lua_State *L) { - Proto *p; - int i; - luaL_argcheck(L, lua_isfunction(L, 1) && !lua_iscfunction(L, 1), - 1, "Lua function expected"); - p = clvalue(func_at(L, 1))->l.p; - lua_newtable(L); - for (i=0; isizek; i++) { - lua_pushintegral(L, i+1); - luaA_pushobject(L, p->k+i); - lua_settable(L, -3); - } - return 1; -} - - -static int listlocals (lua_State *L) { - Proto *p; - int pc = luaL_checkint(L, 2) - 1; - int i = 0; - const char *name; - luaL_argcheck(L, lua_isfunction(L, 1) && !lua_iscfunction(L, 1), - 1, "Lua function expected"); - p = clvalue(func_at(L, 1))->l.p; - while ((name = luaF_getlocalname(p, ++i, pc)) != NULL) - lua_pushstring(L, name); - return i-1; -} - -/* }====================================================== */ - - - - -static int get_limits (lua_State *L) { - lua_newtable(L); - setnameval(L, "BITS_INT", BITS_INT); - setnameval(L, "LFPF", LFIELDS_PER_FLUSH); - setnameval(L, "MAXVARS", MAXVARS); - setnameval(L, "MAXPARAMS", MAXPARAMS); - setnameval(L, "MAXSTACK", MAXSTACK); - setnameval(L, "MAXUPVALUES", MAXUPVALUES); - return 1; -} - - -static int mem_query (lua_State *L) { - if (lua_isnone(L, 1)) { - lua_pushintegral(L, memdebug_total); - lua_pushintegral(L, memdebug_numblocks); - lua_pushintegral(L, memdebug_maxmem); - return 3; - } - else { - memdebug_memlimit = luaL_checkint(L, 1); - return 0; - } -} - - -static int hash_query (lua_State *L) { - if (lua_isnone(L, 2)) { - luaL_argcheck(L, lua_type(L, 1) == LUA_TSTRING, 1, "string expected"); - lua_pushintegral(L, tsvalue(func_at(L, 1))->tsv.hash); - } - else { - TObject *o = func_at(L, 1); - Table *t; - luaL_checktype(L, 2, LUA_TTABLE); - t = hvalue(func_at(L, 2)); - lua_pushintegral(L, luaH_mainposition(t, o) - t->node); - } - return 1; -} - - -static int stacklevel (lua_State *L) { - unsigned long a = 0; - lua_pushintegral(L, (int)(L->top - L->stack)); - lua_pushintegral(L, (int)(L->stack_last - L->stack)); - lua_pushintegral(L, (int)(L->ci - L->base_ci)); - lua_pushintegral(L, (int)(L->end_ci - L->base_ci)); - lua_pushintegral(L, (unsigned long)&a); - return 5; -} - - -static int table_query (lua_State *L) { - const Table *t; - int i = luaL_optint(L, 2, -1); - luaL_checktype(L, 1, LUA_TTABLE); - t = hvalue(func_at(L, 1)); - if (i == -1) { - lua_pushintegral(L, t->sizearray); - lua_pushintegral(L, sizenode(t)); - lua_pushintegral(L, t->firstfree - t->node); - } - else if (i < t->sizearray) { - lua_pushintegral(L, i); - luaA_pushobject(L, &t->array[i]); - lua_pushnil(L); - } - else if ((i -= t->sizearray) < sizenode(t)) { - if (!ttisnil(gval(gnode(t, i))) || - ttisnil(gkey(gnode(t, i))) || - ttisnumber(gkey(gnode(t, i)))) { - luaA_pushobject(L, gkey(gnode(t, i))); - } - else - lua_pushstring(L, ""); - luaA_pushobject(L, gval(gnode(t, i))); - if (t->node[i].next) - lua_pushintegral(L, t->node[i].next - t->node); - else - lua_pushnil(L); - } - return 3; -} - - -static int string_query (lua_State *L) { - stringtable *tb = &G(L)->strt; - int s = luaL_optint(L, 2, 0) - 1; - if (s==-1) { - lua_pushintegral(L ,tb->nuse); - lua_pushintegral(L ,tb->size); - return 2; - } - else if (s < tb->size) { - GCObject *ts; - int n = 0; - for (ts = tb->hash[s]; ts; ts = ts->gch.next) { - setsvalue2s(L->top, gcotots(ts)); - incr_top(L); - n++; - } - return n; - } - return 0; -} - - -static int tref (lua_State *L) { - int level = lua_gettop(L); - int lock = luaL_optint(L, 2, 1); - luaL_checkany(L, 1); - lua_pushvalue(L, 1); - lua_pushintegral(L, lua_ref(L, lock)); - assert(lua_gettop(L) == level+1); /* +1 for result */ - return 1; -} - -static int getref (lua_State *L) { - int level = lua_gettop(L); - lua_getref(L, luaL_checkint(L, 1)); - assert(lua_gettop(L) == level+1); - return 1; -} - -static int unref (lua_State *L) { - int level = lua_gettop(L); - lua_unref(L, luaL_checkint(L, 1)); - assert(lua_gettop(L) == level); - return 0; -} - -static int metatable (lua_State *L) { - luaL_checkany(L, 1); - if (lua_isnone(L, 2)) { - if (lua_getmetatable(L, 1) == 0) - lua_pushnil(L); - } - else { - lua_settop(L, 2); - luaL_checktype(L, 2, LUA_TTABLE); - lua_setmetatable(L, 1); - } - return 1; -} - - -static int upvalue (lua_State *L) { - int n = luaL_checkint(L, 2); - luaL_checktype(L, 1, LUA_TFUNCTION); - if (lua_isnone(L, 3)) { - const char *name = lua_getupvalue(L, 1, n); - if (name == NULL) return 0; - lua_pushstring(L, name); - return 2; - } - else { - const char *name = lua_setupvalue(L, 1, n); - lua_pushstring(L, name); - return 1; - } -} - - -static int newuserdata (lua_State *L) { - size_t size = luaL_checkint(L, 1); - char *p = cast(char *, lua_newuserdata(L, size)); - while (size--) *p++ = '\0'; - return 1; -} - - -static int pushuserdata (lua_State *L) { - lua_pushlightuserdata(L, cast(void *, luaL_checkint(L, 1))); - return 1; -} - - -static int udataval (lua_State *L) { - lua_pushintegral(L, cast(int, lua_touserdata(L, 1))); - return 1; -} - - -static int doonnewstack (lua_State *L) { - lua_State *L1 = lua_newthread(L); - size_t l; - const char *s = luaL_checklstring(L, 1, &l); - int status = luaL_loadbuffer(L1, s, l, s); - if (status == 0) - status = lua_pcall(L1, 0, 0, 0); - lua_pushintegral(L, status); - return 1; -} - - -static int s2d (lua_State *L) { - lua_pushnumber(L, *cast(const double *, luaL_checkstring(L, 1))); - return 1; -} - -static int d2s (lua_State *L) { - double d = luaL_checknumber(L, 1); - lua_pushlstring(L, cast(char *, &d), sizeof(d)); - return 1; -} - - -static int newstate (lua_State *L) { - lua_State *L1 = lua_open(); - if (L1) { - lua_userstateopen(L1); /* init lock */ - lua_pushintegral(L, (unsigned long)L1); - } - else - lua_pushnil(L); - return 1; -} - - -static int loadlib (lua_State *L) { - static const luaL_reg libs[] = { - {"mathlibopen", luaopen_math}, - {"strlibopen", luaopen_string}, - {"iolibopen", luaopen_io}, - {"tablibopen", luaopen_table}, - {"dblibopen", luaopen_debug}, - {"baselibopen", luaopen_base}, - {NULL, NULL} - }; - lua_State *L1 = cast(lua_State *, - cast(unsigned long, luaL_checknumber(L, 1))); - lua_pushvalue(L1, LUA_GLOBALSINDEX); - luaL_openlib(L1, NULL, libs, 0); - return 0; -} - -static int closestate (lua_State *L) { - lua_State *L1 = cast(lua_State *, cast(unsigned long, luaL_checknumber(L, 1))); - lua_close(L1); - lua_unlock(L); /* close cannot unlock that */ - return 0; -} - -static int doremote (lua_State *L) { - lua_State *L1 = cast(lua_State *,cast(unsigned long,luaL_checknumber(L, 1))); - size_t lcode; - const char *code = luaL_checklstring(L, 2, &lcode); - int status; - lua_settop(L1, 0); - status = luaL_loadbuffer(L1, code, lcode, code); - if (status == 0) - status = lua_pcall(L1, 0, LUA_MULTRET, 0); - if (status != 0) { - lua_pushnil(L); - lua_pushintegral(L, status); - lua_pushstring(L, lua_tostring(L1, -1)); - return 3; - } - else { - int i = 0; - while (!lua_isnone(L1, ++i)) - lua_pushstring(L, lua_tostring(L1, i)); - lua_pop(L1, i-1); - return i-1; - } -} - - -static int log2_aux (lua_State *L) { - lua_pushintegral(L, luaO_log2(luaL_checkint(L, 1))); - return 1; -} - -static int int2fb_aux (lua_State *L) { - int b = luaO_int2fb(luaL_checkint(L, 1)); - lua_pushintegral(L, b); - lua_pushintegral(L, fb2int(b)); - return 2; -} - - -static int test_do (lua_State *L) { - const char *p = luaL_checkstring(L, 1); - if (*p == '@') - lua_dofile(L, p+1); - else - lua_dostring(L, p); - return lua_gettop(L); -} - - - -/* -** {====================================================== -** function to test the API with C. It interprets a kind of assembler -** language with calls to the API, so the test can be driven by Lua code -** ======================================================= -*/ - -static const char *const delimits = " \t\n,;"; - -static void skip (const char **pc) { - while (**pc != '\0' && strchr(delimits, **pc)) (*pc)++; -} - -static int getnum_aux (lua_State *L, const char **pc) { - int res = 0; - int sig = 1; - skip(pc); - if (**pc == '.') { - res = cast(int, lua_tonumber(L, -1)); - lua_pop(L, 1); - (*pc)++; - return res; - } - else if (**pc == '-') { - sig = -1; - (*pc)++; - } - while (isdigit(cast(int, **pc))) res = res*10 + (*(*pc)++) - '0'; - return sig*res; -} - -static const char *getname_aux (char *buff, const char **pc) { - int i = 0; - skip(pc); - while (**pc != '\0' && !strchr(delimits, **pc)) - buff[i++] = *(*pc)++; - buff[i] = '\0'; - return buff; -} - - -#define EQ(s1) (strcmp(s1, inst) == 0) - -#define getnum (getnum_aux(L, &pc)) -#define getname (getname_aux(buff, &pc)) - - -static int testC (lua_State *L) { - char buff[30]; - const char *pc = luaL_checkstring(L, 1); - for (;;) { - const char *inst = getname; - if EQ("") return 0; - else if EQ("isnumber") { - lua_pushintegral(L, lua_isnumber(L, getnum)); - } - else if EQ("isstring") { - lua_pushintegral(L, lua_isstring(L, getnum)); - } - else if EQ("istable") { - lua_pushintegral(L, lua_istable(L, getnum)); - } - else if EQ("iscfunction") { - lua_pushintegral(L, lua_iscfunction(L, getnum)); - } - else if EQ("isfunction") { - lua_pushintegral(L, lua_isfunction(L, getnum)); - } - else if EQ("isuserdata") { - lua_pushintegral(L, lua_isuserdata(L, getnum)); - } - else if EQ("isudataval") { - lua_pushintegral(L, lua_islightuserdata(L, getnum)); - } - else if EQ("isnil") { - lua_pushintegral(L, lua_isnil(L, getnum)); - } - else if EQ("isnull") { - lua_pushintegral(L, lua_isnone(L, getnum)); - } - else if EQ("tonumber") { - lua_pushnumber(L, lua_tonumber(L, getnum)); - } - else if EQ("tostring") { - const char *s = lua_tostring(L, getnum); - lua_pushstring(L, s); - } - else if EQ("strlen") { - lua_pushintegral(L, lua_strlen(L, getnum)); - } - else if EQ("tocfunction") { - lua_pushcfunction(L, lua_tocfunction(L, getnum)); - } - else if EQ("return") { - return getnum; - } - else if EQ("gettop") { - lua_pushintegral(L, lua_gettop(L)); - } - else if EQ("settop") { - lua_settop(L, getnum); - } - else if EQ("pop") { - lua_pop(L, getnum); - } - else if EQ("pushnum") { - lua_pushintegral(L, getnum); - } - else if EQ("pushnil") { - lua_pushnil(L); - } - else if EQ("pushbool") { - lua_pushboolean(L, getnum); - } - else if EQ("tobool") { - lua_pushintegral(L, lua_toboolean(L, getnum)); - } - else if EQ("pushvalue") { - lua_pushvalue(L, getnum); - } - else if EQ("pushcclosure") { - lua_pushcclosure(L, testC, getnum); - } - else if EQ("pushupvalues") { - lua_pushupvalues(L); - } - else if EQ("remove") { - lua_remove(L, getnum); - } - else if EQ("insert") { - lua_insert(L, getnum); - } - else if EQ("replace") { - lua_replace(L, getnum); - } - else if EQ("gettable") { - lua_gettable(L, getnum); - } - else if EQ("settable") { - lua_settable(L, getnum); - } - else if EQ("next") { - lua_next(L, -2); - } - else if EQ("concat") { - lua_concat(L, getnum); - } - else if EQ("lessthan") { - int a = getnum; - lua_pushboolean(L, lua_lessthan(L, a, getnum)); - } - else if EQ("equal") { - int a = getnum; - lua_pushboolean(L, lua_equal(L, a, getnum)); - } - else if EQ("rawcall") { - int narg = getnum; - int nres = getnum; - lua_call(L, narg, nres); - } - else if EQ("call") { - int narg = getnum; - int nres = getnum; - lua_pcall(L, narg, nres, 0); - } - else if EQ("loadstring") { - size_t sl; - const char *s = luaL_checklstring(L, getnum, &sl); - luaL_loadbuffer(L, s, sl, s); - } - else if EQ("loadfile") { - luaL_loadfile(L, luaL_checkstring(L, getnum)); - } - else if EQ("setmetatable") { - lua_setmetatable(L, getnum); - } - else if EQ("getmetatable") { - if (lua_getmetatable(L, getnum) == 0) - lua_pushnil(L); - } - else if EQ("type") { - lua_pushstring(L, lua_typename(L, lua_type(L, getnum))); - } - else if EQ("getn") { - int i = getnum; - lua_pushintegral(L, luaL_getn(L, i)); - } - else if EQ("setn") { - int i = getnum; - int n = cast(int, lua_tonumber(L, -1)); - luaL_setn(L, i, n); - lua_pop(L, 1); - } - else luaL_error(L, "unknown instruction %s", buff); - } - return 0; -} - -/* }====================================================== */ - - -/* -** {====================================================== -** tests for yield inside hooks -** ======================================================= -*/ - -static void yieldf (lua_State *L, lua_Debug *ar) { - lua_yield(L, 0); -} - -static int setyhook (lua_State *L) { - if (lua_isnoneornil(L, 1)) - lua_sethook(L, NULL, 0, 0); /* turn off hooks */ - else { - const char *smask = luaL_checkstring(L, 1); - int count = luaL_optint(L, 2, 0); - int mask = 0; - if (strchr(smask, 'l')) mask |= LUA_MASKLINE; - if (count > 0) mask |= LUA_MASKCOUNT; - lua_sethook(L, yieldf, mask, count); - } - return 0; -} - - -static int coresume (lua_State *L) { - int status; - lua_State *co = lua_tothread(L, 1); - luaL_argcheck(L, co, 1, "coroutine expected"); - status = lua_resume(co, 0); - if (status != 0) { - lua_pushboolean(L, 0); - lua_insert(L, -2); - return 2; /* return false + error message */ - } - else { - lua_pushboolean(L, 1); - return 1; - } -} - -/* }====================================================== */ - - - -static const struct luaL_reg tests_funcs[] = { - {"hash", hash_query}, - {"limits", get_limits}, - {"listcode", listcode}, - {"listk", listk}, - {"listlocals", listlocals}, - {"loadlib", loadlib}, - {"stacklevel", stacklevel}, - {"querystr", string_query}, - {"querytab", table_query}, - {"doit", test_do}, - {"testC", testC}, - {"ref", tref}, - {"getref", getref}, - {"unref", unref}, - {"d2s", d2s}, - {"s2d", s2d}, - {"metatable", metatable}, - {"upvalue", upvalue}, - {"newuserdata", newuserdata}, - {"pushuserdata", pushuserdata}, - {"udataval", udataval}, - {"doonnewstack", doonnewstack}, - {"newstate", newstate}, - {"closestate", closestate}, - {"doremote", doremote}, - {"log2", log2_aux}, - {"int2fb", int2fb_aux}, - {"totalmem", mem_query}, - {"resume", coresume}, - {"setyhook", setyhook}, - {NULL, NULL} -}; - - -static void fim (void) { - if (!islocked) - lua_close(lua_state); - lua_assert(memdebug_numblocks == 0); - lua_assert(memdebug_total == 0); -} - - -static int l_panic (lua_State *L) { - UNUSED(L); - fprintf(stderr, "unable to recover; exiting\n"); - return 0; -} - - -int luaB_opentests (lua_State *L) { - lua_atpanic(L, l_panic); - lua_userstateopen(L); /* init lock */ - lua_state = L; /* keep first state to be opened */ - luaL_openlib(L, "T", tests_funcs, 0); - atexit(fim); - return 0; -} - - -#undef main -int main (int argc, char *argv[]) { - char *limit = getenv("MEMLIMIT"); - if (limit) - memdebug_memlimit = strtoul(limit, NULL, 10); - l_main(argc, argv); - return 0; -} - -#endif diff --git a/contrib/lua50/src/ltm.c b/contrib/lua50/src/ltm.c deleted file mode 100644 index 1b3e515e5..000000000 --- a/contrib/lua50/src/ltm.c +++ /dev/null @@ -1,70 +0,0 @@ -/* -** $Id: ltm.c,v 1.106 2003/04/03 13:35:34 roberto Exp $ -** Tag methods -** See Copyright Notice in lua.h -*/ - - -#include - -#define ltm_c - -#include "lua.h" - -#include "lobject.h" -#include "lstate.h" -#include "lstring.h" -#include "ltable.h" -#include "ltm.h" - - - -const char *const luaT_typenames[] = { - "nil", "boolean", "userdata", "number", - "string", "table", "function", "userdata", "thread" -}; - - -void luaT_init (lua_State *L) { - static const char *const luaT_eventname[] = { /* ORDER TM */ - "__index", "__newindex", - "__gc", "__mode", "__eq", - "__add", "__sub", "__mul", "__div", - "__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 TObject *luaT_gettm (Table *events, TMS event, TString *ename) { - const TObject *tm = luaH_getstr(events, ename); - lua_assert(event <= TM_EQ); - if (ttisnil(tm)) { /* no tag method? */ - events->flags |= cast(lu_byte, 1u<tmname[event]; - switch (ttype(o)) { - case LUA_TTABLE: - return luaH_getstr(hvalue(o)->metatable, ename); - case LUA_TUSERDATA: - return luaH_getstr(uvalue(o)->uv.metatable, ename); - default: - return &luaO_nilobject; - } -} - diff --git a/contrib/lua50/src/ltm.h b/contrib/lua50/src/ltm.h deleted file mode 100644 index 8eebfd3dc..000000000 --- a/contrib/lua50/src/ltm.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -** $Id: ltm.h,v 1.41 2002/11/14 11:51:50 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_EQ, /* last tag method with `fast' access */ - TM_ADD, - TM_SUB, - TM_MUL, - TM_DIV, - 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)->flags & (1u<<(e))) ? NULL : luaT_gettm(et, e, (g)->tmname[e])) - -#define fasttm(l,et,e) gfasttm(G(l), et, e) - - -const TObject *luaT_gettm (Table *events, TMS event, TString *ename); -const TObject *luaT_gettmbyobj (lua_State *L, const TObject *o, TMS event); -void luaT_init (lua_State *L); - -extern const char *const luaT_typenames[]; - -#endif diff --git a/contrib/lua50/src/lundump.c b/contrib/lua50/src/lundump.c deleted file mode 100644 index 151a8507c..000000000 --- a/contrib/lua50/src/lundump.c +++ /dev/null @@ -1,286 +0,0 @@ -/* -** $Id: lundump.c,v 1.49 2003/04/07 20:34:20 lhf Exp $ -** load pre-compiled Lua chunks -** See Copyright Notice in lua.h -*/ - -#define lundump_c - -#include "lua.h" - -#include "ldebug.h" -#include "lfunc.h" -#include "lmem.h" -#include "lopcodes.h" -#include "lstring.h" -#include "lundump.h" -#include "lzio.h" - -#define LoadByte (lu_byte) ezgetc - -typedef struct { - lua_State* L; - ZIO* Z; - Mbuffer* b; - int swap; - const char* name; -} LoadState; - -static void unexpectedEOZ (LoadState* S) -{ - luaG_runerror(S->L,"unexpected end of file in %s",S->name); -} - -static int ezgetc (LoadState* S) -{ - int c=zgetc(S->Z); - if (c==EOZ) unexpectedEOZ(S); - return c; -} - -static void ezread (LoadState* S, void* b, int n) -{ - int r=luaZ_read(S->Z,b,n); - if (r!=0) unexpectedEOZ(S); -} - -static void LoadBlock (LoadState* S, void* b, size_t size) -{ - if (S->swap) - { - char* p=(char*) b+size-1; - int n=size; - while (n--) *p--=(char)ezgetc(S); - } - else - ezread(S,b,size); -} - -static void LoadVector (LoadState* S, void* b, int m, size_t size) -{ - if (S->swap) - { - char* q=(char*) b; - while (m--) - { - char* p=q+size-1; - int n=size; - while (n--) *p--=(char)ezgetc(S); - q+=size; - } - } - else - ezread(S,b,m*size); -} - -static int LoadInt (LoadState* S) -{ - int x; - LoadBlock(S,&x,sizeof(x)); - if (x<0) luaG_runerror(S->L,"bad integer in %s",S->name); - return x; -} - -static size_t LoadSize (LoadState* S) -{ - size_t x; - LoadBlock(S,&x,sizeof(x)); - return x; -} - -static lua_Number LoadNumber (LoadState* S) -{ - lua_Number x; - LoadBlock(S,&x,sizeof(x)); - return x; -} - -static TString* LoadString (LoadState* S) -{ - size_t size=LoadSize(S); - if (size==0) - return NULL; - else - { - char* s=luaZ_openspace(S->L,S->b,size); - ezread(S,s,size); - return luaS_newlstr(S->L,s,size-1); /* remove trailing '\0' */ - } -} - -static void LoadCode (LoadState* S, Proto* f) -{ - int size=LoadInt(S); - f->code=luaM_newvector(S->L,size,Instruction); - f->sizecode=size; - LoadVector(S,f->code,size,sizeof(*f->code)); -} - -static void LoadLocals (LoadState* S, Proto* f) -{ - int i,n; - n=LoadInt(S); - f->locvars=luaM_newvector(S->L,n,LocVar); - f->sizelocvars=n; - for (i=0; ilocvars[i].varname=LoadString(S); - f->locvars[i].startpc=LoadInt(S); - f->locvars[i].endpc=LoadInt(S); - } -} - -static void LoadLines (LoadState* S, Proto* f) -{ - int size=LoadInt(S); - f->lineinfo=luaM_newvector(S->L,size,int); - f->sizelineinfo=size; - LoadVector(S,f->lineinfo,size,sizeof(*f->lineinfo)); -} - -static void LoadUpvalues (LoadState* S, Proto* f) -{ - int i,n; - n=LoadInt(S); - if (n!=0 && n!=f->nups) - luaG_runerror(S->L,"bad nupvalues in %s: read %d; expected %d", - S->name,n,f->nups); - f->upvalues=luaM_newvector(S->L,n,TString*); - f->sizeupvalues=n; - for (i=0; iupvalues[i]=LoadString(S); -} - -static Proto* LoadFunction (LoadState* S, TString* p); - -static void LoadConstants (LoadState* S, Proto* f) -{ - int i,n; - n=LoadInt(S); - f->k=luaM_newvector(S->L,n,TObject); - f->sizek=n; - for (i=0; ik[i]; - int t=LoadByte(S); - switch (t) - { - case LUA_TNUMBER: - setnvalue(o,LoadNumber(S)); - break; - case LUA_TSTRING: - setsvalue2n(o,LoadString(S)); - break; - case LUA_TNIL: - setnilvalue(o); - break; - default: - luaG_runerror(S->L,"bad constant type (%d) in %s",t,S->name); - break; - } - } - n=LoadInt(S); - f->p=luaM_newvector(S->L,n,Proto*); - f->sizep=n; - for (i=0; ip[i]=LoadFunction(S,f->source); -} - -static Proto* LoadFunction (LoadState* S, TString* p) -{ - Proto* f=luaF_newproto(S->L); - f->source=LoadString(S); if (f->source==NULL) f->source=p; - f->lineDefined=LoadInt(S); - f->nups=LoadByte(S); - f->numparams=LoadByte(S); - f->is_vararg=LoadByte(S); - f->maxstacksize=LoadByte(S); - LoadLines(S,f); - LoadLocals(S,f); - LoadUpvalues(S,f); - LoadConstants(S,f); - LoadCode(S,f); -#ifndef TRUST_BINARIES - if (!luaG_checkcode(f)) luaG_runerror(S->L,"bad code in %s",S->name); -#endif - return f; -} - -static void LoadSignature (LoadState* S) -{ - const char* s=LUA_SIGNATURE; - while (*s!=0 && ezgetc(S)==*s) - ++s; - if (*s!=0) luaG_runerror(S->L,"bad signature in %s",S->name); -} - -static void TestSize (LoadState* S, int s, const char* what) -{ - int r=LoadByte(S); - if (r!=s) - luaG_runerror(S->L,"virtual machine mismatch in %s: " - "size of %s is %d but read %d",S->name,what,s,r); -} - -#define TESTSIZE(s,w) TestSize(S,s,w) -#define V(v) v/16,v%16 - -static void LoadHeader (LoadState* S) -{ - int version; - lua_Number x,tx=TEST_NUMBER; - LoadSignature(S); - version=LoadByte(S); - if (version>VERSION) - luaG_runerror(S->L,"%s too new: " - "read version %d.%d; expected at most %d.%d", - S->name,V(version),V(VERSION)); - if (versionL,"%s too old: " - "read version %d.%d; expected at least %d.%d", - S->name,V(version),V(VERSION0)); - S->swap=(luaU_endianness()!=LoadByte(S)); /* need to swap bytes? */ - TESTSIZE(sizeof(int),"int"); - TESTSIZE(sizeof(size_t), "size_t"); - TESTSIZE(sizeof(Instruction), "Instruction"); - TESTSIZE(SIZE_OP, "OP"); - TESTSIZE(SIZE_A, "A"); - TESTSIZE(SIZE_B, "B"); - TESTSIZE(SIZE_C, "C"); - TESTSIZE(sizeof(lua_Number), "number"); - x=LoadNumber(S); - if ((long)x!=(long)tx) /* disregard errors in last bits of fraction */ - luaG_runerror(S->L,"unknown number format in %s",S->name); -} - -static Proto* LoadChunk (LoadState* S) -{ - LoadHeader(S); - return LoadFunction(S,NULL); -} - -/* -** load precompiled chunk -*/ -Proto* luaU_undump (lua_State* L, ZIO* Z, Mbuffer* buff) -{ - LoadState S; - const char* s=zname(Z); - if (*s=='@' || *s=='=') - S.name=s+1; - else if (*s==LUA_SIGNATURE[0]) - S.name="binary string"; - else - S.name=s; - S.L=L; - S.Z=Z; - S.b=buff; - return LoadChunk(&S); -} - -/* -** find byte order -*/ -int luaU_endianness (void) -{ - int x=1; - return *(char*)&x; -} diff --git a/contrib/lua50/src/lundump.h b/contrib/lua50/src/lundump.h deleted file mode 100644 index c7e6959b3..000000000 --- a/contrib/lua50/src/lundump.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -** $Id: lundump.h,v 1.30 2003/04/07 20:34:20 lhf Exp $ -** load pre-compiled 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 */ -Proto* luaU_undump (lua_State* L, ZIO* Z, Mbuffer* buff); - -/* find byte order; from lundump.c */ -int luaU_endianness (void); - -/* dump one chunk; from ldump.c */ -void luaU_dump (lua_State* L, const Proto* Main, lua_Chunkwriter w, void* data); - -/* print one chunk; from print.c */ -void luaU_print (const Proto* Main); - -/* definitions for headers of binary files */ -#define LUA_SIGNATURE "\033Lua" /* binary files start with "Lua" */ -#define VERSION 0x50 /* last format change was in 5.0 */ -#define VERSION0 0x50 /* last major change was in 5.0 */ - -/* a multiple of PI for testing native format */ -/* multiplying by 1E7 gives non-trivial integer values */ -#define TEST_NUMBER ((lua_Number)3.14159265358979323846E7) - -#endif diff --git a/contrib/lua50/src/lvm.c b/contrib/lua50/src/lvm.c deleted file mode 100644 index 951329315..000000000 --- a/contrib/lua50/src/lvm.c +++ /dev/null @@ -1,781 +0,0 @@ -/* -** $Id: lvm.c,v 1.284c 2003/04/03 13:35:34 roberto Exp $ -** Lua virtual machine -** See Copyright Notice in lua.h -*/ - - -#include -#include -#include - -/* needed only when `lua_number2str' uses `sprintf' */ -#include - -#define lvm_c - -#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" - - - -/* function to convert a lua_Number to a string */ -#ifndef lua_number2str -#define lua_number2str(s,n) sprintf((s), LUA_NUMBER_FMT, (n)) -#endif - - -/* limit for table tag-method chains (to avoid loops) */ -#define MAXTAGLOOP 100 - - -const TObject *luaV_tonumber (const TObject *obj, TObject *n) { - lua_Number num; - if (ttisnumber(obj)) return obj; - if (ttisstring(obj) && luaO_str2d(svalue(obj), &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[32]; /* 16 digits, sign, point and \0 (+ some extra...) */ - lua_number2str(s, nvalue(obj)); - setsvalue2s(obj, luaS_new(L, s)); - return 1; - } -} - - -static void traceexec (lua_State *L) { - lu_byte mask = L->hookmask; - if (mask & LUA_MASKCOUNT) { /* instruction-hook set? */ - if (L->hookcount == 0) { - resethookcount(L); - luaD_callhook(L, LUA_HOOKCOUNT, -1); - return; - } - } - if (mask & LUA_MASKLINE) { - CallInfo *ci = L->ci; - Proto *p = ci_func(ci)->l.p; - int newline = getline(p, pcRel(*ci->u.l.pc, p)); - if (!L->hookinit) { - luaG_inithooks(L); - return; - } - lua_assert(ci->state & CI_HASFRAME); - if (pcRel(*ci->u.l.pc, p) == 0) /* tracing may be starting now? */ - ci->u.l.savedpc = *ci->u.l.pc; /* initialize `savedpc' */ - /* calls linehook when enters a new line or jumps back (loop) */ - if (*ci->u.l.pc <= ci->u.l.savedpc || - newline != getline(p, pcRel(ci->u.l.savedpc, p))) { - luaD_callhook(L, LUA_HOOKLINE, newline); - ci = L->ci; /* previous call may reallocate `ci' */ - } - ci->u.l.savedpc = *ci->u.l.pc; - } -} - - -static void callTMres (lua_State *L, const TObject *f, - const TObject *p1, const TObject *p2) { - setobj2s(L->top, f); /* push function */ - setobj2s(L->top+1, p1); /* 1st argument */ - setobj2s(L->top+2, p2); /* 2nd argument */ - luaD_checkstack(L, 3); /* cannot check before (could invalidate p1, p2) */ - L->top += 3; - luaD_call(L, L->top - 3, 1); - L->top--; /* result will be in L->top */ -} - - - -static void callTM (lua_State *L, const TObject *f, - const TObject *p1, const TObject *p2, const TObject *p3) { - setobj2s(L->top, f); /* push function */ - setobj2s(L->top+1, p1); /* 1st argument */ - setobj2s(L->top+2, p2); /* 2nd argument */ - setobj2s(L->top+3, p3); /* 3th argument */ - luaD_checkstack(L, 4); /* cannot check before (could invalidate p1...p3) */ - L->top += 4; - luaD_call(L, L->top - 4, 0); -} - - -static const TObject *luaV_index (lua_State *L, const TObject *t, - TObject *key, int loop) { - const TObject *tm = fasttm(L, hvalue(t)->metatable, TM_INDEX); - if (tm == NULL) return &luaO_nilobject; /* no TM */ - if (ttisfunction(tm)) { - callTMres(L, tm, t, key); - return L->top; - } - else return luaV_gettable(L, tm, key, loop); -} - -static const TObject *luaV_getnotable (lua_State *L, const TObject *t, - TObject *key, int loop) { - const TObject *tm = luaT_gettmbyobj(L, t, TM_INDEX); - if (ttisnil(tm)) - luaG_typeerror(L, t, "index"); - if (ttisfunction(tm)) { - callTMres(L, tm, t, key); - return L->top; - } - else return luaV_gettable(L, tm, key, loop); -} - - -/* -** Function to index a table. -** Receives the table at `t' and the key at `key'. -** leaves the result at `res'. -*/ -const TObject *luaV_gettable (lua_State *L, const TObject *t, TObject *key, - int loop) { - if (loop > MAXTAGLOOP) - luaG_runerror(L, "loop in gettable"); - if (ttistable(t)) { /* `t' is a table? */ - Table *h = hvalue(t); - const TObject *v = luaH_get(h, key); /* do a primitive get */ - if (!ttisnil(v)) return v; - else return luaV_index(L, t, key, loop+1); - } - else return luaV_getnotable(L, t, key, loop+1); -} - - -/* -** Receives table at `t', key at `key' and value at `val'. -*/ -void luaV_settable (lua_State *L, const TObject *t, TObject *key, StkId val) { - const TObject *tm; - int loop = 0; - do { - if (ttistable(t)) { /* `t' is a table? */ - Table *h = hvalue(t); - TObject *oldval = luaH_set(L, h, key); /* do a primitive set */ - if (!ttisnil(oldval) || /* result is no nil? */ - (tm = fasttm(L, h->metatable, TM_NEWINDEX)) == NULL) { /* or no TM? */ - setobj2t(oldval, val); /* write barrier */ - return; - } - /* else will try the tag method */ - } - else if (ttisnil(tm = luaT_gettmbyobj(L, t, TM_NEWINDEX))) - luaG_typeerror(L, t, "index"); - if (ttisfunction(tm)) { - callTM(L, tm, t, key, val); - return; - } - t = tm; /* else repeat with `tm' */ - } while (++loop <= MAXTAGLOOP); - luaG_runerror(L, "loop in settable"); -} - - -static int call_binTM (lua_State *L, const TObject *p1, const TObject *p2, - StkId res, TMS event) { - ptrdiff_t result = savestack(L, res); - const TObject *tm = luaT_gettmbyobj(L, p1, event); /* try first operand */ - if (ttisnil(tm)) - tm = luaT_gettmbyobj(L, p2, event); /* try second operand */ - if (!ttisfunction(tm)) return 0; - callTMres(L, tm, p1, p2); - res = restorestack(L, result); /* previous call may change stack */ - setobjs2s(res, L->top); - return 1; -} - - -static const TObject *get_compTM (lua_State *L, Table *mt1, Table *mt2, - TMS event) { - const TObject *tm1 = fasttm(L, mt1, event); - const TObject *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 (luaO_rawequalObj(tm1, tm2)) /* same metamethods? */ - return tm1; - return NULL; -} - - -static int call_orderTM (lua_State *L, const TObject *p1, const TObject *p2, - TMS event) { - const TObject *tm1 = luaT_gettmbyobj(L, p1, event); - const TObject *tm2; - if (ttisnil(tm1)) return -1; /* no metamethod? */ - tm2 = luaT_gettmbyobj(L, p2, event); - if (!luaO_rawequalObj(tm1, tm2)) /* different metamethods? */ - return -1; - callTMres(L, tm1, p1, p2); - return !l_isfalse(L->top); -} - - -static int luaV_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 TObject *l, const TObject *r) { - int res; - if (ttype(l) != ttype(r)) - return luaG_ordererror(L, l, r); - else if (ttisnumber(l)) - return nvalue(l) < nvalue(r); - else if (ttisstring(l)) - return luaV_strcmp(tsvalue(l), tsvalue(r)) < 0; - else if ((res = call_orderTM(L, l, r, TM_LT)) != -1) - return res; - return luaG_ordererror(L, l, r); -} - - -static int luaV_lessequal (lua_State *L, const TObject *l, const TObject *r) { - int res; - if (ttype(l) != ttype(r)) - return luaG_ordererror(L, l, r); - else if (ttisnumber(l)) - return nvalue(l) <= nvalue(r); - else if (ttisstring(l)) - return luaV_strcmp(tsvalue(l), tsvalue(r)) <= 0; - else if ((res = call_orderTM(L, l, r, TM_LE)) != -1) /* first try `le' */ - return res; - else if ((res = call_orderTM(L, r, l, TM_LT)) != -1) /* else try `lt' */ - return !res; - return luaG_ordererror(L, l, r); -} - - -int luaV_equalval (lua_State *L, const TObject *t1, const TObject *t2) { - const TObject *tm; - lua_assert(ttype(t1) == ttype(t2)); - switch (ttype(t1)) { - case LUA_TNIL: return 1; - case LUA_TNUMBER: return 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_TUSERDATA: { - if (uvalue(t1) == uvalue(t2)) return 1; - tm = get_compTM(L, uvalue(t1)->uv.metatable, uvalue(t2)->uv.metatable, - TM_EQ); - break; /* will try TM */ - } - case LUA_TTABLE: { - if (hvalue(t1) == hvalue(t2)) return 1; - tm = get_compTM(L, hvalue(t1)->metatable, hvalue(t2)->metatable, TM_EQ); - break; /* will try TM */ - } - default: return gcvalue(t1) == gcvalue(t2); - } - if (tm == NULL) return 0; /* no TM? */ - callTMres(L, tm, t1, t2); /* call TM */ - return !l_isfalse(L->top); -} - - -void luaV_concat (lua_State *L, int total, int last) { - do { - StkId top = L->base + last + 1; - int n = 2; /* number of elements handled in this pass (at least 2) */ - if (!tostring(L, 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)->tsv.len > 0) { /* if len=0, do nothing */ - /* at least two string values; get as many as possible */ - size_t tl = tsvalue(top-1)->tsv.len; - char *buffer; - int i; - /* collect total length */ - for (n = 1; n < total && tostring(L, top-n-1); n++) { - size_t l = tsvalue(top-n-1)->tsv.len; - if (l >= MAX_SIZET - tl) luaG_runerror(L, "string length overflow"); - tl += l; - } - buffer = luaZ_openspace(L, &G(L)->buff, tl); - tl = 0; - for (i=n; i>0; i--) { /* concat all strings */ - size_t l = tsvalue(top-i)->tsv.len; - memcpy(buffer+tl, svalue(top-i), l); - tl += l; - } - setsvalue2s(top-n, luaS_newlstr(L, buffer, tl)); - } - total -= n-1; /* got `n' strings to create 1 new */ - last -= n-1; - } while (total > 1); /* repeat until only 1 result left */ -} - - -static void Arith (lua_State *L, StkId ra, - const TObject *rb, const TObject *rc, TMS op) { - TObject tempb, tempc; - const TObject *b, *c; - if ((b = luaV_tonumber(rb, &tempb)) != NULL && - (c = luaV_tonumber(rc, &tempc)) != NULL) { - switch (op) { - case TM_ADD: setnvalue(ra, nvalue(b) + nvalue(c)); break; - case TM_SUB: setnvalue(ra, nvalue(b) - nvalue(c)); break; - case TM_MUL: setnvalue(ra, nvalue(b) * nvalue(c)); break; - case TM_DIV: setnvalue(ra, nvalue(b) / nvalue(c)); break; - case TM_POW: { - const TObject *f = luaH_getstr(hvalue(gt(L)), G(L)->tmname[TM_POW]); - ptrdiff_t res = savestack(L, ra); - if (!ttisfunction(f)) - luaG_runerror(L, "`__pow' (`^' operator) is not a function"); - callTMres(L, f, b, c); - ra = restorestack(L, res); /* previous call may change stack */ - setobjs2s(ra, L->top); - break; - } - default: lua_assert(0); break; - } - } - else if (!call_binTM(L, rb, rc, ra, op)) - luaG_aritherror(L, rb, rc); -} - - - -/* -** some macros for common tasks in `luaV_execute' -*/ - -#define runtime_check(L, c) { if (!(c)) return 0; } - -#define RA(i) (base+GETARG_A(i)) -/* to be used after possible stack reallocation */ -#define XRA(i) (L->base+GETARG_A(i)) -#define RB(i) (base+GETARG_B(i)) -#define RKB(i) ((GETARG_B(i) < MAXSTACK) ? RB(i) : k+GETARG_B(i)-MAXSTACK) -#define RC(i) (base+GETARG_C(i)) -#define RKC(i) ((GETARG_C(i) < MAXSTACK) ? RC(i) : k+GETARG_C(i)-MAXSTACK) -#define KBx(i) (k+GETARG_Bx(i)) - - -#define dojump(pc, i) ((pc) += (i)) - - -StkId luaV_execute (lua_State *L) { - LClosure *cl; - TObject *k; - const Instruction *pc; - callentry: /* entry point when calling new functions */ - if (L->hookmask & LUA_MASKCALL) { - L->ci->u.l.pc = &pc; - luaD_callhook(L, LUA_HOOKCALL, -1); - } - retentry: /* entry point when returning to old functions */ - L->ci->u.l.pc = &pc; - lua_assert(L->ci->state == CI_SAVEDPC || - L->ci->state == (CI_SAVEDPC | CI_CALLING)); - L->ci->state = CI_HASFRAME; /* activate frame */ - pc = L->ci->u.l.savedpc; - cl = &clvalue(L->base - 1)->l; - k = cl->p->k; - /* main loop of interpreter */ - for (;;) { - const Instruction i = *pc++; - StkId base, ra; - if ((L->hookmask & (LUA_MASKLINE | LUA_MASKCOUNT)) && - (--L->hookcount == 0 || L->hookmask & LUA_MASKLINE)) { - traceexec(L); - if (L->ci->state & CI_YIELD) { /* did hook yield? */ - L->ci->u.l.savedpc = pc - 1; - L->ci->state = CI_YIELD | CI_SAVEDPC; - return NULL; - } - } - /* warning!! several calls may realloc the stack and invalidate `ra' */ - base = L->base; - ra = RA(i); - lua_assert(L->ci->state & CI_HASFRAME); - lua_assert(base == L->ci->base); - lua_assert(L->top <= L->stack + L->stacksize && L->top >= base); - lua_assert(L->top == L->ci->top || - GET_OPCODE(i) == OP_CALL || GET_OPCODE(i) == OP_TAILCALL || - GET_OPCODE(i) == OP_RETURN || GET_OPCODE(i) == OP_SETLISTO); - switch (GET_OPCODE(i)) { - case OP_MOVE: { - setobjs2s(ra, RB(i)); - break; - } - case OP_LOADK: { - setobj2s(ra, KBx(i)); - break; - } - case OP_LOADBOOL: { - setbvalue(ra, GETARG_B(i)); - if (GETARG_C(i)) pc++; /* skip next instruction (if C) */ - break; - } - case OP_LOADNIL: { - TObject *rb = RB(i); - do { - setnilvalue(rb--); - } while (rb >= ra); - break; - } - case OP_GETUPVAL: { - int b = GETARG_B(i); - setobj2s(ra, cl->upvals[b]->v); - break; - } - case OP_GETGLOBAL: { - TObject *rb = KBx(i); - const TObject *v; - lua_assert(ttisstring(rb) && ttistable(&cl->g)); - v = luaH_getstr(hvalue(&cl->g), tsvalue(rb)); - if (!ttisnil(v)) { setobj2s(ra, v); } - else - setobj2s(XRA(i), luaV_index(L, &cl->g, rb, 0)); - break; - } - case OP_GETTABLE: { - StkId rb = RB(i); - TObject *rc = RKC(i); - if (ttistable(rb)) { - const TObject *v = luaH_get(hvalue(rb), rc); - if (!ttisnil(v)) { setobj2s(ra, v); } - else - setobj2s(XRA(i), luaV_index(L, rb, rc, 0)); - } - else - setobj2s(XRA(i), luaV_getnotable(L, rb, rc, 0)); - break; - } - case OP_SETGLOBAL: { - lua_assert(ttisstring(KBx(i)) && ttistable(&cl->g)); - luaV_settable(L, &cl->g, KBx(i), ra); - break; - } - case OP_SETUPVAL: { - int b = GETARG_B(i); - setobj(cl->upvals[b]->v, ra); /* write barrier */ - break; - } - case OP_SETTABLE: { - luaV_settable(L, ra, RKB(i), RKC(i)); - break; - } - case OP_NEWTABLE: { - int b = GETARG_B(i); - b = fb2int(b); - sethvalue(ra, luaH_new(L, b, GETARG_C(i))); - luaC_checkGC(L); - break; - } - case OP_SELF: { - StkId rb = RB(i); - TObject *rc = RKC(i); - runtime_check(L, ttisstring(rc)); - setobjs2s(ra+1, rb); - if (ttistable(rb)) { - const TObject *v = luaH_getstr(hvalue(rb), tsvalue(rc)); - if (!ttisnil(v)) { setobj2s(ra, v); } - else - setobj2s(XRA(i), luaV_index(L, rb, rc, 0)); - } - else - setobj2s(XRA(i), luaV_getnotable(L, rb, rc, 0)); - break; - } - case OP_ADD: { - TObject *rb = RKB(i); - TObject *rc = RKC(i); - if (ttisnumber(rb) && ttisnumber(rc)) { - setnvalue(ra, nvalue(rb) + nvalue(rc)); - } - else - Arith(L, ra, rb, rc, TM_ADD); - break; - } - case OP_SUB: { - TObject *rb = RKB(i); - TObject *rc = RKC(i); - if (ttisnumber(rb) && ttisnumber(rc)) { - setnvalue(ra, nvalue(rb) - nvalue(rc)); - } - else - Arith(L, ra, rb, rc, TM_SUB); - break; - } - case OP_MUL: { - TObject *rb = RKB(i); - TObject *rc = RKC(i); - if (ttisnumber(rb) && ttisnumber(rc)) { - setnvalue(ra, nvalue(rb) * nvalue(rc)); - } - else - Arith(L, ra, rb, rc, TM_MUL); - break; - } - case OP_DIV: { - TObject *rb = RKB(i); - TObject *rc = RKC(i); - if (ttisnumber(rb) && ttisnumber(rc)) { - setnvalue(ra, nvalue(rb) / nvalue(rc)); - } - else - Arith(L, ra, rb, rc, TM_DIV); - break; - } - case OP_POW: { - Arith(L, ra, RKB(i), RKC(i), TM_POW); - break; - } - case OP_UNM: { - const TObject *rb = RB(i); - TObject temp; - if (tonumber(rb, &temp)) { - setnvalue(ra, -nvalue(rb)); - } - else { - setnilvalue(&temp); - if (!call_binTM(L, RB(i), &temp, ra, TM_UNM)) - luaG_aritherror(L, RB(i), &temp); - } - break; - } - case OP_NOT: { - int res = l_isfalse(RB(i)); /* next assignment may change this value */ - setbvalue(ra, res); - break; - } - case OP_CONCAT: { - int b = GETARG_B(i); - int c = GETARG_C(i); - luaV_concat(L, c-b+1, c); /* may change `base' (and `ra') */ - base = L->base; - setobjs2s(RA(i), base+b); - luaC_checkGC(L); - break; - } - case OP_JMP: { - dojump(pc, GETARG_sBx(i)); - break; - } - case OP_EQ: { - if (equalobj(L, RKB(i), RKC(i)) != GETARG_A(i)) pc++; - else dojump(pc, GETARG_sBx(*pc) + 1); - break; - } - case OP_LT: { - if (luaV_lessthan(L, RKB(i), RKC(i)) != GETARG_A(i)) pc++; - else dojump(pc, GETARG_sBx(*pc) + 1); - break; - } - case OP_LE: { - if (luaV_lessequal(L, RKB(i), RKC(i)) != GETARG_A(i)) pc++; - else dojump(pc, GETARG_sBx(*pc) + 1); - break; - } - case OP_TEST: { - TObject *rb = RB(i); - if (l_isfalse(rb) == GETARG_C(i)) pc++; - else { - setobjs2s(ra, rb); - dojump(pc, GETARG_sBx(*pc) + 1); - } - break; - } - case OP_CALL: - case OP_TAILCALL: { - StkId firstResult; - int b = GETARG_B(i); - int nresults; - if (b != 0) L->top = ra+b; /* else previous instruction set top */ - nresults = GETARG_C(i) - 1; - firstResult = luaD_precall(L, ra); - if (firstResult) { - if (firstResult > L->top) { /* yield? */ - lua_assert(L->ci->state == (CI_C | CI_YIELD)); - (L->ci - 1)->u.l.savedpc = pc; - (L->ci - 1)->state = CI_SAVEDPC; - return NULL; - } - /* it was a C function (`precall' called it); adjust results */ - luaD_poscall(L, nresults, firstResult); - if (nresults >= 0) L->top = L->ci->top; - } - else { /* it is a Lua function */ - if (GET_OPCODE(i) == OP_CALL) { /* regular call? */ - (L->ci-1)->u.l.savedpc = pc; /* save `pc' to return later */ - (L->ci-1)->state = (CI_SAVEDPC | CI_CALLING); - } - else { /* tail call: put new frame in place of previous one */ - int aux; - base = (L->ci - 1)->base; /* `luaD_precall' may change the stack */ - ra = RA(i); - if (L->openupval) luaF_close(L, base); - for (aux = 0; ra+aux < L->top; aux++) /* move frame down */ - setobjs2s(base+aux-1, ra+aux); - (L->ci - 1)->top = L->top = base+aux; /* correct top */ - lua_assert(L->ci->state & CI_SAVEDPC); - (L->ci - 1)->u.l.savedpc = L->ci->u.l.savedpc; - (L->ci - 1)->u.l.tailcalls++; /* one more call lost */ - (L->ci - 1)->state = CI_SAVEDPC; - L->ci--; /* remove new frame */ - L->base = L->ci->base; - } - goto callentry; - } - break; - } - case OP_RETURN: { - CallInfo *ci = L->ci - 1; /* previous function frame */ - int b = GETARG_B(i); - if (b != 0) L->top = ra+b-1; - lua_assert(L->ci->state & CI_HASFRAME); - if (L->openupval) luaF_close(L, base); - L->ci->state = CI_SAVEDPC; /* deactivate current function */ - L->ci->u.l.savedpc = pc; - /* previous function was running `here'? */ - if (!(ci->state & CI_CALLING)) { - lua_assert((ci->state & CI_C) || ci->u.l.pc != &pc); - return ra; /* no: return */ - } - else { /* yes: continue its execution */ - int nresults; - lua_assert(ttisfunction(ci->base - 1) && (ci->state & CI_SAVEDPC)); - lua_assert(GET_OPCODE(*(ci->u.l.savedpc - 1)) == OP_CALL); - nresults = GETARG_C(*(ci->u.l.savedpc - 1)) - 1; - luaD_poscall(L, nresults, ra); - if (nresults >= 0) L->top = L->ci->top; - goto retentry; - } - } - case OP_FORLOOP: { - lua_Number step, idx, limit; - const TObject *plimit = ra+1; - const TObject *pstep = ra+2; - if (!ttisnumber(ra)) - luaG_runerror(L, "`for' initial value must be a number"); - if (!tonumber(plimit, ra+1)) - luaG_runerror(L, "`for' limit must be a number"); - if (!tonumber(pstep, ra+2)) - luaG_runerror(L, "`for' step must be a number"); - step = nvalue(pstep); - idx = nvalue(ra) + step; /* increment index */ - limit = nvalue(plimit); - if (step > 0 ? idx <= limit : idx >= limit) { - dojump(pc, GETARG_sBx(i)); /* jump back */ - chgnvalue(ra, idx); /* update index */ - } - break; - } - case OP_TFORLOOP: { - int nvar = GETARG_C(i) + 1; - StkId cb = ra + nvar + 2; /* call base */ - setobjs2s(cb, ra); - setobjs2s(cb+1, ra+1); - setobjs2s(cb+2, ra+2); - L->top = cb+3; /* func. + 2 args (state and index) */ - luaD_call(L, cb, nvar); - L->top = L->ci->top; - ra = XRA(i) + 2; /* final position of first result */ - cb = ra + nvar; - do { /* move results to proper positions */ - nvar--; - setobjs2s(ra+nvar, cb+nvar); - } while (nvar > 0); - if (ttisnil(ra)) /* break loop? */ - pc++; /* skip jump (break loop) */ - else - dojump(pc, GETARG_sBx(*pc) + 1); /* jump back */ - break; - } - case OP_TFORPREP: { /* for compatibility only */ - if (ttistable(ra)) { - setobjs2s(ra+1, ra); - setobj2s(ra, luaH_getstr(hvalue(gt(L)), luaS_new(L, "next"))); - } - dojump(pc, GETARG_sBx(i)); - break; - } - case OP_SETLIST: - case OP_SETLISTO: { - int bc; - int n; - Table *h; - runtime_check(L, ttistable(ra)); - h = hvalue(ra); - bc = GETARG_Bx(i); - if (GET_OPCODE(i) == OP_SETLIST) - n = (bc&(LFIELDS_PER_FLUSH-1)) + 1; - else { - n = L->top - ra - 1; - L->top = L->ci->top; - } - bc &= ~(LFIELDS_PER_FLUSH-1); /* bc = bc - bc%FPF */ - for (; n > 0; n--) - setobj2t(luaH_setnum(L, h, bc+n), ra+n); /* write barrier */ - break; - } - case OP_CLOSE: { - luaF_close(L, ra); - break; - } - case OP_CLOSURE: { - Proto *p; - Closure *ncl; - int nup, j; - p = cl->p->p[GETARG_Bx(i)]; - nup = p->nups; - ncl = luaF_newLclosure(L, nup, &cl->g); - ncl->l.p = p; - for (j=0; jl.upvals[j] = cl->upvals[GETARG_B(*pc)]; - else { - lua_assert(GET_OPCODE(*pc) == OP_MOVE); - ncl->l.upvals[j] = luaF_findupval(L, base + GETARG_B(*pc)); - } - } - setclvalue(ra, ncl); - luaC_checkGC(L); - break; - } - } - } -} - - diff --git a/contrib/lua50/src/lvm.h b/contrib/lua50/src/lvm.h deleted file mode 100644 index 19cce200b..000000000 --- a/contrib/lua50/src/lvm.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -** $Id: lvm.h,v 1.47 2002/11/14 16:16:21 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) ((ttype(o) == LUA_TSTRING) || (luaV_tostring(L, o))) - -#define tonumber(o,n) (ttype(o) == LUA_TNUMBER || \ - (((o) = luaV_tonumber(o,n)) != NULL)) - -#define equalobj(L,o1,o2) \ - (ttype(o1) == ttype(o2) && luaV_equalval(L, o1, o2)) - - -int luaV_lessthan (lua_State *L, const TObject *l, const TObject *r); -int luaV_equalval (lua_State *L, const TObject *t1, const TObject *t2); -const TObject *luaV_tonumber (const TObject *obj, TObject *n); -int luaV_tostring (lua_State *L, StkId obj); -const TObject *luaV_gettable (lua_State *L, const TObject *t, TObject *key, - int loop); -void luaV_settable (lua_State *L, const TObject *t, TObject *key, StkId val); -StkId luaV_execute (lua_State *L); -void luaV_concat (lua_State *L, int total, int last); - -#endif diff --git a/contrib/lua50/src/lzio.c b/contrib/lua50/src/lzio.c deleted file mode 100644 index 3aeca1c58..000000000 --- a/contrib/lua50/src/lzio.c +++ /dev/null @@ -1,81 +0,0 @@ -/* -** $Id: lzio.c,v 1.24 2003/03/20 16:00:56 roberto Exp $ -** a generic input stream interface -** See Copyright Notice in lua.h -*/ - - -#include - -#define lzio_c - -#include "lua.h" - -#include "llimits.h" -#include "lmem.h" -#include "lzio.h" - - -int luaZ_fill (ZIO *z) { - size_t size; - const char *buff = z->reader(NULL, z->data, &size); - if (buff == NULL || size == 0) return EOZ; - z->n = size - 1; - z->p = buff; - return char2int(*(z->p++)); -} - - -int luaZ_lookahead (ZIO *z) { - if (z->n == 0) { - int c = luaZ_fill(z); - if (c == EOZ) return c; - z->n++; - z->p--; - } - return char2int(*z->p); -} - - -void luaZ_init (ZIO *z, lua_Chunkreader reader, void *data, const char *name) { - z->reader = reader; - z->data = data; - z->name = name; - 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) { - if (luaZ_fill(z) == EOZ) - return n; /* return number of missing bytes */ - else { - ++z->n; /* filbuf removed first byte; put back it */ - --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; - luaM_reallocvector(L, buff->buffer, buff->buffsize, n, char); - buff->buffsize = n; - } - return buff->buffer; -} - - diff --git a/contrib/lua50/src/lzio.h b/contrib/lua50/src/lzio.h deleted file mode 100644 index 5e73615cc..000000000 --- a/contrib/lua50/src/lzio.h +++ /dev/null @@ -1,64 +0,0 @@ -/* -** $Id: lzio.h,v 1.15 2003/03/20 16:00:56 roberto Exp $ -** Buffered streams -** See Copyright Notice in lua.h -*/ - - -#ifndef lzio_h -#define lzio_h - -#include "lua.h" - - -#define EOZ (-1) /* end of stream */ - -typedef struct Zio ZIO; - - -#define char2int(c) cast(int, cast(unsigned char, (c))) - -#define zgetc(z) (((z)->n--)>0 ? char2int(*(z)->p++) : luaZ_fill(z)) - -#define zname(z) ((z)->name) - -void luaZ_init (ZIO *z, lua_Chunkreader reader, void *data, const char *name); -size_t luaZ_read (ZIO* z, void* b, size_t n); /* read next n bytes */ -int luaZ_lookahead (ZIO *z); - - - -typedef struct Mbuffer { - char *buffer; - size_t buffsize; -} Mbuffer; - - -char *luaZ_openspace (lua_State *L, Mbuffer *buff, size_t n); - -#define luaZ_initbuffer(L, buff) ((buff)->buffer = NULL, (buff)->buffsize = 0) - -#define luaZ_sizebuffer(buff) ((buff)->buffsize) -#define luaZ_buffer(buff) ((buff)->buffer) - -#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) - - -/* --------- Private Part ------------------ */ - -struct Zio { - size_t n; /* bytes still unread */ - const char *p; /* current position in buffer */ - lua_Chunkreader reader; - void* data; /* additional data */ - const char *name; -}; - - -int luaZ_fill (ZIO *z); - -#endif