<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3dc47ec91514fa546b5aa50876431b250dcb3a29">https://github.com/macports/macports-ports/commit/3dc47ec91514fa546b5aa50876431b250dcb3a29</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3dc47ec91514fa546b5aa50876431b250dcb3a29
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Mar 19 06:26:02 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> lua-luahpdf: update & rewrite w/ lua & makefile PGs
</span>---
lua/lua-luahpdf/Portfile | 106 ++++++++++++++++--------------
lua/lua-luahpdf/files/patch-Makefile.diff | 52 ++-------------
lua/lua-luahpdf/files/patch-lua_5.4.diff | 37 +++++++++++
3 files changed, 99 insertions(+), 96 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lua/lua-luahpdf/Portfile b/lua/lua-luahpdf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 79297f2fb15..b74d19aca30 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lua/lua-luahpdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lua/lua-luahpdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,51 +1,59 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup jung-kurt luahpdf c8b2677cba
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name lua-luahpdf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license MIT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories lua devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Lua module that lets you programmatically create PDF files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description LuaHPDF is a Lua module that lets you programmatically create PDF files using \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Lua. It does this by binding to the Haru Free PDF Library, an open-source \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- library that manages the details of PDF generation. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- With this module, you can write Lua programs that will produce PDF files that \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include lines, text and graphics, PNG and JPEG images, compression, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- encryption, Type1 and TrueType fonts, various character sets, outlines, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- links.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ee7d234de41de41b3c8de2e10a5cff3de920a817 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2b01967287b83f9efd35d5a317b0838a609f55e07419f58aad74be7399bcc2ea
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:lua \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libharu \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libpng \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set lua_version 5.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LUAINC="${configure.cppflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PLATFORM=macosx \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MODDIR=${prefix}/lib/lua/${lua_version} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 755 ${destroot}${prefix}/share/examples
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/demo ${destroot}${prefix}/share/examples/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${destroot}${prefix}/share/doc/luahpdf ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup lua 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup makefile 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name lua-luahpdf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup jung-kurt luahpdf f0098346f8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license MIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories lua devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Lua module that lets you programmatically create PDF files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description LuaHPDF is a {*}${description} using Lua.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 bfae209ac6046dc6bb282263f6ea1be0cd1c33da \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ef620fa9fd17eabf0074ab216232585a3ea9302ea185c8c4a61754346655276d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 45849
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-Makefile.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-lua_5.4.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append PLATFORM=macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:libharu \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach branch ${lua.branches} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set subname luahpdf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set branch_no_dot [join [split ${branch} .] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set subport_name lua${branch_no_dot}-${subname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport ${subport_name} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq ${subport_name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lua.version ${branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args-append MODDIR=${prefix}/lib/lua/${lua.version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract.rename no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach deptype {depends_extract depends_patch depends_lib depends_build depends_run depends_test} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${deptype}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc lua::callback {} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set docdir ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set f [open "${docdir}/README" w 0644]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${f} "[option subport] is a stub port"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lua/lua-luahpdf/files/patch-Makefile.diff b/lua/lua-luahpdf/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2411217d083..fe47e9e86ad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lua/lua-luahpdf/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lua/lua-luahpdf/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,55 +1,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2015-03-12 16:23:05.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2015-09-15 09:39:41.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,17 +2,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # --- Change the settings below to suit your environment. See explanations in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # --- the build documentation for more details. ---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PREFIX=/usr/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--MODDIR=$(PREFIX)/lib/lua/5.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#PREFIX=/usr/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#MODDIR=$(PREFIX)/lib/lua/5.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DOCDIR=$(PREFIX)/share/doc/luahpdf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LUALIB=-llua5.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LUAINC=-I/usr/include/lua5.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LUALIB=-llua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LUAINC=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HPDFLIB=-lhpdf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HPDFINC=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LUA=lua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LUAC=luac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PLATFORM=linux
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# PLATFORM=macosx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# PLATFORM=linux
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PLATFORM=macosx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # --- End of user settings, no need to change anything below this line. ---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2018-04-09 15:46:15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2023-03-18 16:26:06
</span> @@ -22,8 +22,8 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- linux_COMPILE=cc -DHPDF_SHARED $(LUAINC) $(HPDFINC) -Wall -O2 -fomit-frame-pointer -shared -fPIC -c -o $@ $<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ linux_COMPILE=cc $(LUAINC) $(HPDFINC) -Wall -O2 -fomit-frame-pointer -shared -fPIC -c -o $@ $<
</span> linux_LINK=cc -shared -fPIC -o $@ $^ $(HPDFLIB) -lz -lpng -lm
linux_REPORT=ldd ./$(TARGET)
-macosx_COMPILE=cc -DHPDF_SHARED $(LUAINC) $(HPDFINC) -DLUA_USE_MACOSX -Wall -O2 -fomit-frame-pointer -fPIC -c -o $@ $<
-macosx_LINK=cc -bundle -undefined dynamic_lookup -DLUA_USE_MACOSX $(HPDFLIB) -lz -lpng -o hpdf.so hpdf.o
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+macosx_COMPILE=$(CC) $(CFLAGS) -DHPDF_SHARED $(LUAINC) $(HPDFINC) -DLUA_USE_MACOSX -Wall -fomit-frame-pointer -fPIC -c -o $@ $<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+macosx_LINK=$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup -DLUA_USE_MACOSX $(HPDFLIB) -lz -lpng -o hpdf.so hpdf.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++macosx_COMPILE=$(CC) $(CPPFLAGS) $(CFLAGS) -DLUA_USE_MACOSX -fomit-frame-pointer -fPIC -c -o $@ $<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++macosx_LINK=$(CC) -bundle -undefined dynamic_lookup -DLUA_USE_MACOSX $(LDFLAGS) $(HPDFLIB) -lz -lpng -o hpdf.so hpdf.o
</span> macosx_REPORT=otool -L ./$(TARGET)
PDF = \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,7 +58,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $($(PLATFORM)_COMPILE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dump :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cc -E -dM -ansi -DHPDF_SHARED -pedantic -Wall -O2 $(CFLAGS) $(LUAINC) $(HPDFINC) -shared hpdf.c > $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) -E -dM -ansi -DHPDF_SHARED -pedantic -Wall -O2 $(CFLAGS) $(LUAINC) $(HPDFINC) -shared hpdf.c > $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test : $(TARGET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(LUA) -e "package.path=[[]] package.cpath=[[./?.so;./?.dll]] local hpdf = require [[hpdf]] print(hpdf.VERSION_TEXT)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -71,7 +71,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install -m 0755 -d "$(DESTDIR)$(DOCDIR)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install -m 0755 -d "$(DESTDIR)$(DOCDIR)/text"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install -m 0755 -d "$(DESTDIR)$(DOCDIR)/html"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install -m 0644 README doc/*.lua "$(DESTDIR)$(DOCDIR)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install -m 0644 README.md doc/*.lua "$(DESTDIR)$(DOCDIR)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install -m 0644 doc/text/*.txt "$(DESTDIR)$(DOCDIR)/text"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install -m 0644 doc/html/*.html doc/html/*.css doc/html/*.png "$(DESTDIR)$(DOCDIR)/html"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lua/lua-luahpdf/files/patch-lua_5.4.diff b/lua/lua-luahpdf/files/patch-lua_5.4.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2af0d7e6d2c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lua/lua-luahpdf/files/patch-lua_5.4.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+LUA_QS was removed in Lua 5.4.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+In Lua 5.1-5.3, it just
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LUA_QL(x) "'" x "'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LUA_QS LUA_QL("%s")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+So this patch can be applied unconditionally.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+No upstream report since the GitHub repository has been archived.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- hpdf.c.orig 2018-04-09 15:46:15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ hpdf.c 2023-03-19 05:51:03
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -482,7 +482,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (lua_isnumber(L, -1)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Num = (HPDF_REAL) lua_tonumber(L, -1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- luaL_error(L, "field " LUA_QS " not found", NameStr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ luaL_error(L, "field '%s' not found", NameStr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lua_pop(L, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Stk: ... Tbl */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -531,7 +531,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (lua_isnumber(L, -1)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Num = lua_tointeger(L, -1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- luaL_error(L, "field " LUA_QS " not found", NameStr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ luaL_error(L, "field '%s' not found", NameStr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lua_pop(L, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Stk: ... Tbl */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -555,7 +555,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Stk: ... RctTbl Str? */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Str = lua_tostring(L, -1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (! Str) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- luaL_error(L, "expecting character field " LUA_QS, NameStr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ luaL_error(L, "expecting character field '%s'", NameStr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Ch = *Str;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>