diff --git a/scripts/genie.lua b/scripts/genie.lua index 6504b2d5c50..6d086f1994a 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -553,7 +553,7 @@ configuration { "Debug" } defines { "MAME_DEBUG", "MAME_PROFILER", --- "BGFX_CONFIG_DEBUG=1", +-- "BGFX_CONFIG_DEBUG=1", } if _OPTIONS["FASTDEBUG"]=="1" then diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 7cd71715225..23b9264bba3 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -355,14 +355,14 @@ project "7z" configuration { "gmake or ninja" } buildoptions_c { "-Wno-undef", - "-Wno-strict-prototypes", + "-Wno-strict-prototypes", } configuration { "mingw*" } buildoptions_c { "-Wno-strict-prototypes", } - + configuration { "vs*" } buildoptions { "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter @@ -743,9 +743,9 @@ end buildoptions_cpp { "-Wno-misleading-indentation", } - end + end end - + if _OPTIONS["targetos"]=="windows" then if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then buildoptions { @@ -827,150 +827,150 @@ end -- --if not _OPTIONS["with-system-portaudio"] then --project "portaudio" --- uuid "0755c5f5-eccf-47f3-98a9-df67018a94d4" --- kind "StaticLib" +-- uuid "0755c5f5-eccf-47f3-98a9-df67018a94d4" +-- kind "StaticLib" -- --- configuration { "vs*" } --- buildoptions { --- "/wd4245", -- warning C4245: 'conversion' : conversion from 'type1' to 'type2', signed/unsigned mismatch --- "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data --- "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter --- "/wd4389", -- warning C4389: 'operator' : signed/unsigned mismatch --- "/wd4189", -- warning C4189: 'xxx' : local variable is initialized but not referenced --- "/wd4127", -- warning C4127: conditional expression is constant --- } +-- configuration { "vs*" } +-- buildoptions { +-- "/wd4245", -- warning C4245: 'conversion' : conversion from 'type1' to 'type2', signed/unsigned mismatch +-- "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data +-- "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter +-- "/wd4389", -- warning C4389: 'operator' : signed/unsigned mismatch +-- "/wd4189", -- warning C4189: 'xxx' : local variable is initialized but not referenced +-- "/wd4127", -- warning C4127: conditional expression is constant +-- } --if _OPTIONS["vs"]=="intel-15" then --- buildoptions { --- "/Qwd869", -- remark #869: parameter "xxx" was never referenced --- "/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated --- "/Qwd2544", -- message #2544: empty dependent statement in if-statement --- "/Qwd1879", -- warning #1879: unimplemented pragma ignored --- } +-- buildoptions { +-- "/Qwd869", -- remark #869: parameter "xxx" was never referenced +-- "/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated +-- "/Qwd2544", -- message #2544: empty dependent statement in if-statement +-- "/Qwd1879", -- warning #1879: unimplemented pragma ignored +-- } --end --- configuration { "vs2015*" } --- buildoptions { --- "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration --- } +-- configuration { "vs2015*" } +-- buildoptions { +-- "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration +-- } -- --- configuration { "gmake or ninja" } --- buildoptions_c { --- "-Wno-strict-prototypes", --- "-Wno-bad-function-cast", --- "-Wno-undef", --- "-Wno-missing-braces", --- "-Wno-unused-variable", --- "-Wno-unused-value", --- "-Wno-unused-function", --- "-Wno-unknown-pragmas", --- } +-- configuration { "gmake or ninja" } +-- buildoptions_c { +-- "-Wno-strict-prototypes", +-- "-Wno-bad-function-cast", +-- "-Wno-undef", +-- "-Wno-missing-braces", +-- "-Wno-unused-variable", +-- "-Wno-unused-value", +-- "-Wno-unused-function", +-- "-Wno-unknown-pragmas", +-- } -- --- local version = str_to_version(_OPTIONS["gcc_version"]) --- if (_OPTIONS["gcc"]~=nil) then --- if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "android") then --- buildoptions_c { --- "-Wno-unknown-warning-option", --- "-Wno-absolute-value", --- "-Wno-unused-but-set-variable", --- "-Wno-maybe-uninitialized", --- "-Wno-sometimes-uninitialized", --- } --- else --- if (version >= 40600) then --- buildoptions_c { --- "-Wno-unused-but-set-variable", --- "-Wno-maybe-uninitialized", --- "-Wno-sometimes-uninitialized", --- } --- end --- end --- end --- configuration { "vs*" } --- buildoptions { --- "/wd4204", -- warning C4204: nonstandard extension used : non-constant aggregate initializer --- "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used --- } +-- local version = str_to_version(_OPTIONS["gcc_version"]) +-- if (_OPTIONS["gcc"]~=nil) then +-- if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "android") then +-- buildoptions_c { +-- "-Wno-unknown-warning-option", +-- "-Wno-absolute-value", +-- "-Wno-unused-but-set-variable", +-- "-Wno-maybe-uninitialized", +-- "-Wno-sometimes-uninitialized", +-- } +-- else +-- if (version >= 40600) then +-- buildoptions_c { +-- "-Wno-unused-but-set-variable", +-- "-Wno-maybe-uninitialized", +-- "-Wno-sometimes-uninitialized", +-- } +-- end +-- end +-- end +-- configuration { "vs*" } +-- buildoptions { +-- "/wd4204", -- warning C4204: nonstandard extension used : non-constant aggregate initializer +-- "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used +-- } -- --- configuration { } +-- configuration { } -- --- includedirs { --- MAME_DIR .. "3rdparty/portaudio/include", --- MAME_DIR .. "3rdparty/portaudio/src/common", --- } +-- includedirs { +-- MAME_DIR .. "3rdparty/portaudio/include", +-- MAME_DIR .. "3rdparty/portaudio/src/common", +-- } -- --- files { --- MAME_DIR .. "3rdparty/portaudio/src/common/pa_allocation.c", --- MAME_DIR .. "3rdparty/portaudio/src/common/pa_converters.c", --- MAME_DIR .. "3rdparty/portaudio/src/common/pa_cpuload.c", --- MAME_DIR .. "3rdparty/portaudio/src/common/pa_dither.c", --- MAME_DIR .. "3rdparty/portaudio/src/common/pa_debugprint.c", --- MAME_DIR .. "3rdparty/portaudio/src/common/pa_front.c", --- MAME_DIR .. "3rdparty/portaudio/src/common/pa_process.c", --- MAME_DIR .. "3rdparty/portaudio/src/common/pa_stream.c", --- MAME_DIR .. "3rdparty/portaudio/src/common/pa_trace.c", --- MAME_DIR .. "3rdparty/portaudio/src/hostapi/skeleton/pa_hostapi_skeleton.c", --- } +-- files { +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_allocation.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_converters.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_cpuload.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_dither.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_debugprint.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_front.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_process.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_stream.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_trace.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/skeleton/pa_hostapi_skeleton.c", +-- } -- --- if _OPTIONS["targetos"]=="windows" then --- defines { --- "PA_USE_DS=1", --- "PA_USE_WDMKS=1", --- "PA_USE_WMME=1", --- } --- includedirs { --- MAME_DIR .. "3rdparty/portaudio/src/os/win", --- } +-- if _OPTIONS["targetos"]=="windows" then +-- defines { +-- "PA_USE_DS=1", +-- "PA_USE_WDMKS=1", +-- "PA_USE_WMME=1", +-- } +-- includedirs { +-- MAME_DIR .. "3rdparty/portaudio/src/os/win", +-- } -- --- configuration { } --- files { --- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_util.c", --- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_waveformat.c", --- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_hostapis.c", --- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_wdmks_utils.c", --- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_coinitialize.c", --- MAME_DIR .. "3rdparty/portaudio/src/hostapi/dsound/pa_win_ds.c", --- MAME_DIR .. "3rdparty/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c", --- MAME_DIR .. "3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c", --- MAME_DIR .. "3rdparty/portaudio/src/common/pa_ringbuffer.c", --- MAME_DIR .. "3rdparty/portaudio/src/hostapi/wmme/pa_win_wmme.c", --- } +-- configuration { } +-- files { +-- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_util.c", +-- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_waveformat.c", +-- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_hostapis.c", +-- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_wdmks_utils.c", +-- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_coinitialize.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/dsound/pa_win_ds.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_ringbuffer.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/wmme/pa_win_wmme.c", +-- } -- --- end --- if _OPTIONS["targetos"]=="linux" then --- defines { --- "PA_USE_ALSA=1", --- "PA_USE_OSS=1", --- "HAVE_LINUX_SOUNDCARD_H", --- } --- includedirs { --- MAME_DIR .. "3rdparty/portaudio/src/os/unix", --- } --- files { --- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_hostapis.c", --- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_util.c", --- MAME_DIR .. "3rdparty/portaudio/src/hostapi/alsa/pa_linux_alsa.c", --- MAME_DIR .. "3rdparty/portaudio/src/hostapi/oss/pa_unix_oss.c", --- } --- end --- if _OPTIONS["targetos"]=="macosx" then --- defines { --- "PA_USE_COREAUDIO=1", --- } --- includedirs { --- MAME_DIR .. "3rdparty/portaudio/src/os/unix", --- } --- files { --- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_hostapis.c", --- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_util.c", --- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core.c", --- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c", --- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c", --- MAME_DIR .. "3rdparty/portaudio/src/common/pa_ringbuffer.c", --- } --- end +-- end +-- if _OPTIONS["targetos"]=="linux" then +-- defines { +-- "PA_USE_ALSA=1", +-- "PA_USE_OSS=1", +-- "HAVE_LINUX_SOUNDCARD_H", +-- } +-- includedirs { +-- MAME_DIR .. "3rdparty/portaudio/src/os/unix", +-- } +-- files { +-- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_hostapis.c", +-- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_util.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/alsa/pa_linux_alsa.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/oss/pa_unix_oss.c", +-- } +-- end +-- if _OPTIONS["targetos"]=="macosx" then +-- defines { +-- "PA_USE_COREAUDIO=1", +-- } +-- includedirs { +-- MAME_DIR .. "3rdparty/portaudio/src/os/unix", +-- } +-- files { +-- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_hostapis.c", +-- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_util.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_ringbuffer.c", +-- } +-- end -- --else --links { --- ext_lib("portaudio"), +-- ext_lib("portaudio"), --} --end @@ -1165,7 +1165,7 @@ project "uv" links { "kvm", } - end + end if (_OPTIONS["SHADOW_CHECK"]=="1") then removebuildoptions { diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index 65ce22d8b8d..0ba196a4500 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -2863,7 +2863,7 @@ end if (BUSES["HP_OPTROM"]~=null) then files { MAME_DIR .. "src/devices/bus/hp_optroms/hp_optrom.cpp", - } + } end --------------------------------------------------- @@ -2877,5 +2877,5 @@ if (BUSES["COMPIS_GRAPHICS"]~=null) then MAME_DIR .. "src/devices/bus/compis/graphics.h", MAME_DIR .. "src/devices/bus/compis/hrg.cpp", MAME_DIR .. "src/devices/bus/compis/hrg.h", - } + } end diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index 4dbdb38f191..cc0e2f8e649 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -112,7 +112,7 @@ files { MAME_DIR .. "src/emu/emucore.cpp", MAME_DIR .. "src/emu/emucore.h", MAME_DIR .. "src/emu/emumem.cpp", - MAME_DIR .. "src/emu/emumem.h", + MAME_DIR .. "src/emu/emumem.h", MAME_DIR .. "src/emu/emuopts.cpp", MAME_DIR .. "src/emu/emuopts.h", MAME_DIR .. "src/emu/emupal.cpp", diff --git a/scripts/src/formats.lua b/scripts/src/formats.lua index f5f1a253a19..643beb7d36f 100644 --- a/scripts/src/formats.lua +++ b/scripts/src/formats.lua @@ -72,7 +72,7 @@ if (FORMATS["2D_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/2d_dsk.cpp", MAME_DIR.. "src/lib/formats/2d_dsk.h", - } + } end -------------------------------------------------- @@ -84,7 +84,7 @@ if (FORMATS["A26_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/a26_cas.cpp", MAME_DIR.. "src/lib/formats/a26_cas.h", - } + } end -------------------------------------------------- @@ -96,7 +96,7 @@ if (FORMATS["A5105_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/a5105_dsk.cpp", MAME_DIR.. "src/lib/formats/a5105_dsk.h", - } + } end -------------------------------------------------- @@ -108,7 +108,7 @@ if (FORMATS["ABC800_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/abc800_dsk.cpp", MAME_DIR.. "src/lib/formats/abc800_dsk.h", - } + } end -------------------------------------------------- @@ -120,7 +120,7 @@ if (FORMATS["ABCFD2_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/abcfd2_dsk.cpp", MAME_DIR.. "src/lib/formats/abcfd2_dsk.h", - } + } end -------------------------------------------------- @@ -132,7 +132,7 @@ if (FORMATS["ACE_TAP"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/ace_tap.cpp", MAME_DIR.. "src/lib/formats/ace_tap.h", - } + } end -------------------------------------------------- @@ -144,7 +144,7 @@ if (FORMATS["ACORN_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/acorn_dsk.cpp", MAME_DIR.. "src/lib/formats/acorn_dsk.h", - } + } end -------------------------------------------------- @@ -156,7 +156,7 @@ if (FORMATS["ADAM_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/adam_cas.cpp", MAME_DIR.. "src/lib/formats/adam_cas.h", - } + } end -------------------------------------------------- @@ -168,7 +168,7 @@ if (FORMATS["ADAM_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/adam_dsk.cpp", MAME_DIR.. "src/lib/formats/adam_dsk.h", - } + } end -------------------------------------------------- @@ -180,7 +180,7 @@ if (FORMATS["AFS_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/afs_dsk.cpp", MAME_DIR.. "src/lib/formats/afs_dsk.h", - } + } end -------------------------------------------------- @@ -192,7 +192,7 @@ if (FORMATS["AMI_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/ami_dsk.cpp", MAME_DIR.. "src/lib/formats/ami_dsk.h", - } + } end -------------------------------------------------- @@ -204,7 +204,7 @@ if (FORMATS["AP2_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/ap2_dsk.cpp", MAME_DIR.. "src/lib/formats/ap2_dsk.h", - } + } end -------------------------------------------------- @@ -216,7 +216,7 @@ if (FORMATS["APF_APT"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/apf_apt.cpp", MAME_DIR.. "src/lib/formats/apf_apt.h", - } + } end -------------------------------------------------- @@ -228,7 +228,7 @@ if (FORMATS["APOLLO_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/apollo_dsk.cpp", MAME_DIR.. "src/lib/formats/apollo_dsk.h", - } + } end -------------------------------------------------- @@ -240,7 +240,7 @@ if (FORMATS["APPLIX_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/applix_dsk.cpp", MAME_DIR.. "src/lib/formats/applix_dsk.h", - } + } end -------------------------------------------------- @@ -252,7 +252,7 @@ if (FORMATS["APRIDISK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/apridisk.cpp", MAME_DIR.. "src/lib/formats/apridisk.h", - } + } end -------------------------------------------------- @@ -264,7 +264,7 @@ if (FORMATS["AP_DSK35"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/ap_dsk35.cpp", MAME_DIR.. "src/lib/formats/ap_dsk35.h", - } + } end -------------------------------------------------- @@ -276,7 +276,7 @@ if (FORMATS["ASST128_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/asst128_dsk.cpp", MAME_DIR.. "src/lib/formats/asst128_dsk.h", - } + } end -------------------------------------------------- @@ -288,7 +288,7 @@ if (FORMATS["ATARI_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/atari_dsk.cpp", MAME_DIR.. "src/lib/formats/atari_dsk.h", - } + } end -------------------------------------------------- @@ -300,7 +300,7 @@ if (FORMATS["ATOM_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/atom_dsk.cpp", MAME_DIR.. "src/lib/formats/atom_dsk.h", - } + } end -------------------------------------------------- @@ -312,7 +312,7 @@ if (FORMATS["ATOM_TAP"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/atom_tap.cpp", MAME_DIR.. "src/lib/formats/atom_tap.h", - } + } end -------------------------------------------------- @@ -324,7 +324,7 @@ if (FORMATS["BASICDSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/basicdsk.cpp", MAME_DIR.. "src/lib/formats/basicdsk.h", - } + } end -------------------------------------------------- @@ -336,7 +336,7 @@ if (FORMATS["BW12_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/bw12_dsk.cpp", MAME_DIR.. "src/lib/formats/bw12_dsk.h", - } + } end -------------------------------------------------- @@ -348,7 +348,7 @@ if (FORMATS["BW2_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/bw2_dsk.cpp", MAME_DIR.. "src/lib/formats/bw2_dsk.h", - } + } end -------------------------------------------------- @@ -360,7 +360,7 @@ if (FORMATS["C3040_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/c3040_dsk.cpp", MAME_DIR.. "src/lib/formats/c3040_dsk.h", - } + } end -------------------------------------------------- @@ -372,7 +372,7 @@ if (FORMATS["C4040_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/c4040_dsk.cpp", MAME_DIR.. "src/lib/formats/c4040_dsk.h", - } + } end -------------------------------------------------- @@ -384,7 +384,7 @@ if (FORMATS["C8280_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/c8280_dsk.cpp", MAME_DIR.. "src/lib/formats/c8280_dsk.h", - } + } end -------------------------------------------------- @@ -396,7 +396,7 @@ if (FORMATS["CAMPLYNX_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/camplynx_cas.cpp", MAME_DIR.. "src/lib/formats/camplynx_cas.h", - } + } end -------------------------------------------------- @@ -408,7 +408,7 @@ if (FORMATS["CAMPLYNX_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/camplynx_dsk.cpp", MAME_DIR.. "src/lib/formats/camplynx_dsk.h", - } + } end -------------------------------------------------- @@ -420,7 +420,7 @@ if (FORMATS["CBM_CRT"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/cbm_crt.cpp", MAME_DIR.. "src/lib/formats/cbm_crt.h", - } + } end -------------------------------------------------- @@ -432,7 +432,7 @@ if (FORMATS["CBM_TAP"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/cbm_tap.cpp", MAME_DIR.. "src/lib/formats/cbm_tap.h", - } + } end -------------------------------------------------- @@ -444,7 +444,7 @@ if (FORMATS["CCVF_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/ccvf_dsk.cpp", MAME_DIR.. "src/lib/formats/ccvf_dsk.h", - } + } end -------------------------------------------------- @@ -456,7 +456,7 @@ if (FORMATS["CD90_640_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/cd90_640_dsk.cpp", MAME_DIR.. "src/lib/formats/cd90_640_dsk.h", - } + } end -------------------------------------------------- @@ -468,7 +468,7 @@ if (FORMATS["CGENIE_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/cgenie_dsk.cpp", MAME_DIR.. "src/lib/formats/cgenie_dsk.h", - } + } end -------------------------------------------------- @@ -480,7 +480,7 @@ if (FORMATS["CGEN_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/cgen_cas.cpp", MAME_DIR.. "src/lib/formats/cgen_cas.h", - } + } end -------------------------------------------------- @@ -492,7 +492,7 @@ if (FORMATS["COCO_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/coco_cas.cpp", MAME_DIR.. "src/lib/formats/coco_cas.h", - } + } end -------------------------------------------------- @@ -504,7 +504,7 @@ if (FORMATS["COMX35_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/comx35_dsk.cpp", MAME_DIR.. "src/lib/formats/comx35_dsk.h", - } + } end -------------------------------------------------- @@ -516,7 +516,7 @@ if (FORMATS["CONCEPT_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/concept_dsk.cpp", MAME_DIR.. "src/lib/formats/concept_dsk.h", - } + } end -------------------------------------------------- @@ -528,7 +528,7 @@ if (FORMATS["COUPEDSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/coupedsk.cpp", MAME_DIR.. "src/lib/formats/coupedsk.h", - } + } end -------------------------------------------------- @@ -540,7 +540,7 @@ if (FORMATS["CPIS_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/cpis_dsk.cpp", MAME_DIR.. "src/lib/formats/cpis_dsk.h", - } + } end -------------------------------------------------- @@ -552,7 +552,7 @@ if (FORMATS["CSW_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/csw_cas.cpp", MAME_DIR.. "src/lib/formats/csw_cas.h", - } + } end -------------------------------------------------- @@ -564,7 +564,7 @@ if (FORMATS["D64_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/d64_dsk.cpp", MAME_DIR.. "src/lib/formats/d64_dsk.h", - } + } end -------------------------------------------------- @@ -576,7 +576,7 @@ if (FORMATS["D71_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/d71_dsk.cpp", MAME_DIR.. "src/lib/formats/d71_dsk.h", - } + } end -------------------------------------------------- @@ -588,7 +588,7 @@ if (FORMATS["D80_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/d80_dsk.cpp", MAME_DIR.. "src/lib/formats/d80_dsk.h", - } + } end -------------------------------------------------- @@ -600,7 +600,7 @@ if (FORMATS["D81_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/d81_dsk.cpp", MAME_DIR.. "src/lib/formats/d81_dsk.h", - } + } end -------------------------------------------------- @@ -612,7 +612,7 @@ if (FORMATS["D82_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/d82_dsk.cpp", MAME_DIR.. "src/lib/formats/d82_dsk.h", - } + } end -------------------------------------------------- @@ -624,7 +624,7 @@ if (FORMATS["DCP_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/dcp_dsk.cpp", MAME_DIR.. "src/lib/formats/dcp_dsk.h", - } + } end -------------------------------------------------- @@ -636,7 +636,7 @@ if (FORMATS["DIM_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/dim_dsk.cpp", MAME_DIR.. "src/lib/formats/dim_dsk.h", - } + } end -------------------------------------------------- @@ -648,7 +648,7 @@ if (FORMATS["DIP_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/dip_dsk.cpp", MAME_DIR.. "src/lib/formats/dip_dsk.h", - } + } end -------------------------------------------------- @@ -660,7 +660,7 @@ if (FORMATS["DMK_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/dmk_dsk.cpp", MAME_DIR.. "src/lib/formats/dmk_dsk.h", - } + } end -------------------------------------------------- @@ -672,7 +672,7 @@ if (FORMATS["EP64_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/ep64_dsk.cpp", MAME_DIR.. "src/lib/formats/ep64_dsk.h", - } + } end -------------------------------------------------- @@ -684,7 +684,7 @@ if (FORMATS["DMV_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/dmv_dsk.cpp", MAME_DIR.. "src/lib/formats/dmv_dsk.h", - } + } end -------------------------------------------------- @@ -696,7 +696,7 @@ if (FORMATS["ESQ16_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/esq16_dsk.cpp", MAME_DIR.. "src/lib/formats/esq16_dsk.h", - } + } end -------------------------------------------------- @@ -708,7 +708,7 @@ if (FORMATS["ESQ8_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/esq8_dsk.cpp", MAME_DIR.. "src/lib/formats/esq8_dsk.h", - } + } end -------------------------------------------------- @@ -720,7 +720,7 @@ if (FORMATS["EXCALI64_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/excali64_dsk.cpp", MAME_DIR.. "src/lib/formats/excali64_dsk.h", - } + } end -------------------------------------------------- @@ -732,7 +732,7 @@ if (FORMATS["FC100_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/fc100_cas.cpp", MAME_DIR.. "src/lib/formats/fc100_cas.h", - } + } end -------------------------------------------------- @@ -744,7 +744,7 @@ if (FORMATS["FDD_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/fdd_dsk.cpp", MAME_DIR.. "src/lib/formats/fdd_dsk.h", - } + } end -------------------------------------------------- @@ -756,7 +756,7 @@ if (FORMATS["FLEX_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/flex_dsk.cpp", MAME_DIR.. "src/lib/formats/flex_dsk.h", - } + } end -------------------------------------------------- @@ -768,7 +768,7 @@ if (FORMATS["FM7_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/fm7_cas.cpp", MAME_DIR.. "src/lib/formats/fm7_cas.h", - } + } end -------------------------------------------------- @@ -780,7 +780,7 @@ if (FORMATS["FMSX_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/fmsx_cas.cpp", MAME_DIR.. "src/lib/formats/fmsx_cas.h", - } + } end -------------------------------------------------- @@ -792,7 +792,7 @@ if (FORMATS["FMTOWNS_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/fmtowns_dsk.cpp", MAME_DIR.. "src/lib/formats/fmtowns_dsk.h", - } + } end -------------------------------------------------- @@ -804,7 +804,7 @@ if (FORMATS["FSD_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/fsd_dsk.cpp", MAME_DIR.. "src/lib/formats/fsd_dsk.h", - } + } end -------------------------------------------------- @@ -816,7 +816,7 @@ if (FORMATS["G64_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/g64_dsk.cpp", MAME_DIR.. "src/lib/formats/g64_dsk.h", - } + } end -------------------------------------------------- @@ -828,7 +828,7 @@ if (FORMATS["GTP_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/gtp_cas.cpp", MAME_DIR.. "src/lib/formats/gtp_cas.h", - } + } end -------------------------------------------------- @@ -840,7 +840,7 @@ if (FORMATS["GUAB_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/guab_dsk.cpp", MAME_DIR.. "src/lib/formats/guab_dsk.h", - } + } end -------------------------------------------------- @@ -852,7 +852,7 @@ if (FORMATS["HECTOR_MINIDISC"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/hector_minidisc.cpp", MAME_DIR.. "src/lib/formats/hector_minidisc.h", - } + } end -------------------------------------------------- @@ -864,7 +864,7 @@ if (FORMATS["HECT_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/hect_dsk.cpp", MAME_DIR.. "src/lib/formats/hect_dsk.h", - } + } end -------------------------------------------------- @@ -876,7 +876,7 @@ if (FORMATS["HECT_TAP"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/hect_tap.cpp", MAME_DIR.. "src/lib/formats/hect_tap.h", - } + } end -------------------------------------------------- @@ -888,7 +888,7 @@ if (FORMATS["IQ151_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/iq151_dsk.cpp", MAME_DIR.. "src/lib/formats/iq151_dsk.h", - } + } end -------------------------------------------------- @@ -900,7 +900,7 @@ if (FORMATS["ITT3030_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/itt3030_dsk.cpp", MAME_DIR.. "src/lib/formats/itt3030_dsk.h", - } + } end -------------------------------------------------- @@ -912,7 +912,7 @@ if (FORMATS["JVC_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/jvc_dsk.cpp", MAME_DIR.. "src/lib/formats/jvc_dsk.h", - } + } end -------------------------------------------------- @@ -924,7 +924,7 @@ if (FORMATS["KAYPRO_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/kaypro_dsk.cpp", MAME_DIR.. "src/lib/formats/kaypro_dsk.h", - } + } end -------------------------------------------------- @@ -936,7 +936,7 @@ if (FORMATS["KC85_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/kc85_dsk.cpp", MAME_DIR.. "src/lib/formats/kc85_dsk.h", - } + } end -------------------------------------------------- @@ -948,7 +948,7 @@ if (FORMATS["KC_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/kc_cas.cpp", MAME_DIR.. "src/lib/formats/kc_cas.h", - } + } end -------------------------------------------------- @@ -960,7 +960,7 @@ if (FORMATS["KIM1_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/kim1_cas.cpp", MAME_DIR.. "src/lib/formats/kim1_cas.h", - } + } end -------------------------------------------------- @@ -972,7 +972,7 @@ if (FORMATS["LVIV_LVT"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/lviv_lvt.cpp", MAME_DIR.. "src/lib/formats/lviv_lvt.h", - } + } end -------------------------------------------------- @@ -984,7 +984,7 @@ if (FORMATS["M20_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/m20_dsk.cpp", MAME_DIR.. "src/lib/formats/m20_dsk.h", - } + } end -------------------------------------------------- @@ -996,7 +996,7 @@ if (FORMATS["M5_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/m5_dsk.cpp", MAME_DIR.. "src/lib/formats/m5_dsk.h", - } + } end -------------------------------------------------- @@ -1008,7 +1008,7 @@ if (FORMATS["MBEE_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/mbee_cas.cpp", MAME_DIR.. "src/lib/formats/mbee_cas.h", - } + } end -------------------------------------------------- @@ -1020,7 +1020,7 @@ if (FORMATS["MFM_HD"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/mfm_hd.cpp", MAME_DIR.. "src/lib/formats/mfm_hd.h", - } + } end -------------------------------------------------- @@ -1032,7 +1032,7 @@ if (FORMATS["MM_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/mm_dsk.cpp", MAME_DIR.. "src/lib/formats/mm_dsk.h", - } + } end -------------------------------------------------- @@ -1044,7 +1044,7 @@ if (FORMATS["MSX_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/msx_dsk.cpp", MAME_DIR.. "src/lib/formats/msx_dsk.h", - } + } end -------------------------------------------------- @@ -1056,7 +1056,7 @@ if (FORMATS["MZ_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/mz_cas.cpp", MAME_DIR.. "src/lib/formats/mz_cas.h", - } + } end -------------------------------------------------- @@ -1068,7 +1068,7 @@ if (FORMATS["NANOS_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/nanos_dsk.cpp", MAME_DIR.. "src/lib/formats/nanos_dsk.h", - } + } end -------------------------------------------------- @@ -1080,7 +1080,7 @@ if (FORMATS["NASCOM_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/nascom_dsk.cpp", MAME_DIR.. "src/lib/formats/nascom_dsk.h", - } + } end -------------------------------------------------- @@ -1092,7 +1092,7 @@ if (FORMATS["NASLITE_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/naslite_dsk.cpp", MAME_DIR.. "src/lib/formats/naslite_dsk.h", - } + } end -------------------------------------------------- @@ -1104,7 +1104,7 @@ if (FORMATS["NES_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/nes_dsk.cpp", MAME_DIR.. "src/lib/formats/nes_dsk.h", - } + } end -------------------------------------------------- @@ -1116,7 +1116,7 @@ if (FORMATS["NFD_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/nfd_dsk.cpp", MAME_DIR.. "src/lib/formats/nfd_dsk.h", - } + } end -------------------------------------------------- @@ -1128,7 +1128,7 @@ if (FORMATS["ORAO_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/orao_cas.cpp", MAME_DIR.. "src/lib/formats/orao_cas.h", - } + } end -------------------------------------------------- @@ -1140,7 +1140,7 @@ if (FORMATS["ORIC_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/oric_dsk.cpp", MAME_DIR.. "src/lib/formats/oric_dsk.h", - } + } end -------------------------------------------------- @@ -1152,7 +1152,7 @@ if (FORMATS["ORIC_TAP"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/oric_tap.cpp", MAME_DIR.. "src/lib/formats/oric_tap.h", - } + } end -------------------------------------------------- @@ -1164,7 +1164,7 @@ if (FORMATS["P6001_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/p6001_cas.cpp", MAME_DIR.. "src/lib/formats/p6001_cas.h", - } + } end -------------------------------------------------- @@ -1176,7 +1176,7 @@ if (FORMATS["PASTI_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/pasti_dsk.cpp", MAME_DIR.. "src/lib/formats/pasti_dsk.h", - } + } end -------------------------------------------------- @@ -1188,7 +1188,7 @@ if (FORMATS["PC98FDI_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/pc98fdi_dsk.cpp", MAME_DIR.. "src/lib/formats/pc98fdi_dsk.h", - } + } end -------------------------------------------------- @@ -1200,7 +1200,7 @@ if (FORMATS["PC98_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/pc98_dsk.cpp", MAME_DIR.. "src/lib/formats/pc98_dsk.h", - } + } end -------------------------------------------------- @@ -1212,7 +1212,7 @@ if (FORMATS["PC_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/pc_dsk.cpp", MAME_DIR.. "src/lib/formats/pc_dsk.h", - } + } end -------------------------------------------------- @@ -1224,7 +1224,7 @@ if (FORMATS["PHC25_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/phc25_cas.cpp", MAME_DIR.. "src/lib/formats/phc25_cas.h", - } + } end -------------------------------------------------- @@ -1236,7 +1236,7 @@ if (FORMATS["PK8020_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/pk8020_dsk.cpp", MAME_DIR.. "src/lib/formats/pk8020_dsk.h", - } + } end -------------------------------------------------- @@ -1248,7 +1248,7 @@ if (FORMATS["PMD_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/pmd_cas.cpp", MAME_DIR.. "src/lib/formats/pmd_cas.h", - } + } end -------------------------------------------------- @@ -1260,7 +1260,7 @@ if (FORMATS["PRIMOPTP"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/primoptp.cpp", MAME_DIR.. "src/lib/formats/primoptp.h", - } + } end -------------------------------------------------- @@ -1272,7 +1272,7 @@ if (FORMATS["PYLDIN_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/pyldin_dsk.cpp", MAME_DIR.. "src/lib/formats/pyldin_dsk.h", - } + } end -------------------------------------------------- @@ -1284,7 +1284,7 @@ if (FORMATS["QL_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/ql_dsk.cpp", MAME_DIR.. "src/lib/formats/ql_dsk.h", - } + } end -------------------------------------------------- @@ -1296,7 +1296,7 @@ if (FORMATS["RK_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/rk_cas.cpp", MAME_DIR.. "src/lib/formats/rk_cas.h", - } + } end -------------------------------------------------- @@ -1308,7 +1308,7 @@ if (FORMATS["RX50_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/rx50_dsk.cpp", MAME_DIR.. "src/lib/formats/rx50_dsk.h", - } + } end -------------------------------------------------- @@ -1320,7 +1320,7 @@ if (FORMATS["SC3000_BIT"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/sc3000_bit.cpp", MAME_DIR.. "src/lib/formats/sc3000_bit.h", - } + } end -------------------------------------------------- @@ -1332,7 +1332,7 @@ if (FORMATS["SF7000_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/sf7000_dsk.cpp", MAME_DIR.. "src/lib/formats/sf7000_dsk.h", - } + } end -------------------------------------------------- @@ -1344,7 +1344,7 @@ if (FORMATS["SMX_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/smx_dsk.cpp", MAME_DIR.. "src/lib/formats/smx_dsk.h", - } + } end -------------------------------------------------- @@ -1356,7 +1356,7 @@ if (FORMATS["SOL_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/sol_cas.cpp", MAME_DIR.. "src/lib/formats/sol_cas.h", - } + } end -------------------------------------------------- @@ -1368,7 +1368,7 @@ if (FORMATS["SORC_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/sorc_cas.cpp", MAME_DIR.. "src/lib/formats/sorc_cas.h", - } + } end -------------------------------------------------- @@ -1380,7 +1380,7 @@ if (FORMATS["SORC_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/sorc_dsk.cpp", MAME_DIR.. "src/lib/formats/sorc_dsk.h", - } + } end -------------------------------------------------- @@ -1392,7 +1392,7 @@ if (FORMATS["SORD_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/sord_cas.cpp", MAME_DIR.. "src/lib/formats/sord_cas.h", - } + } end -------------------------------------------------- @@ -1404,7 +1404,7 @@ if (FORMATS["SPC1000_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/spc1000_cas.cpp", MAME_DIR.. "src/lib/formats/spc1000_cas.h", - } + } end -------------------------------------------------- @@ -1416,7 +1416,7 @@ if (FORMATS["ST_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/st_dsk.cpp", MAME_DIR.. "src/lib/formats/st_dsk.h", - } + } end -------------------------------------------------- @@ -1428,7 +1428,7 @@ if (FORMATS["SVI_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/svi_cas.cpp", MAME_DIR.. "src/lib/formats/svi_cas.h", - } + } end -------------------------------------------------- @@ -1440,7 +1440,7 @@ if (FORMATS["SVI_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/svi_dsk.cpp", MAME_DIR.. "src/lib/formats/svi_dsk.h", - } + } end -------------------------------------------------- @@ -1452,7 +1452,7 @@ if (FORMATS["TANDY2K_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/tandy2k_dsk.cpp", MAME_DIR.. "src/lib/formats/tandy2k_dsk.h", - } + } end -------------------------------------------------- @@ -1464,7 +1464,7 @@ if (FORMATS["THOM_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/thom_cas.cpp", MAME_DIR.. "src/lib/formats/thom_cas.h", - } + } end -------------------------------------------------- @@ -1476,7 +1476,7 @@ if (FORMATS["THOM_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/thom_dsk.cpp", MAME_DIR.. "src/lib/formats/thom_dsk.h", - } + } end -------------------------------------------------- @@ -1488,7 +1488,7 @@ if (FORMATS["TI99_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/ti99_dsk.cpp", MAME_DIR.. "src/lib/formats/ti99_dsk.h", - } + } end -------------------------------------------------- @@ -1500,7 +1500,7 @@ if (FORMATS["TIKI100_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/tiki100_dsk.cpp", MAME_DIR.. "src/lib/formats/tiki100_dsk.h", - } + } end -------------------------------------------------- @@ -1512,7 +1512,7 @@ if (FORMATS["TRD_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/trd_dsk.cpp", MAME_DIR.. "src/lib/formats/trd_dsk.h", - } + } end -------------------------------------------------- @@ -1524,7 +1524,7 @@ if (FORMATS["TRS80_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/trs80_dsk.cpp", MAME_DIR.. "src/lib/formats/trs80_dsk.h", - } + } end -------------------------------------------------- @@ -1536,7 +1536,7 @@ if (FORMATS["TRS_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/trs_cas.cpp", MAME_DIR.. "src/lib/formats/trs_cas.h", - } + } end -------------------------------------------------- @@ -1548,7 +1548,7 @@ if (FORMATS["TVC_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/tvc_cas.cpp", MAME_DIR.. "src/lib/formats/tvc_cas.h", - } + } end -------------------------------------------------- @@ -1560,7 +1560,7 @@ if (FORMATS["TVC_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/tvc_dsk.cpp", MAME_DIR.. "src/lib/formats/tvc_dsk.h", - } + } end -------------------------------------------------- @@ -1572,7 +1572,7 @@ if (FORMATS["TZX_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/tzx_cas.cpp", MAME_DIR.. "src/lib/formats/tzx_cas.h", - } + } end -------------------------------------------------- @@ -1584,7 +1584,7 @@ if (FORMATS["UEF_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/uef_cas.cpp", MAME_DIR.. "src/lib/formats/uef_cas.h", - } + } end -------------------------------------------------- @@ -1596,7 +1596,7 @@ if (FORMATS["UPD765_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/upd765_dsk.cpp", MAME_DIR.. "src/lib/formats/upd765_dsk.h", - } + } end -------------------------------------------------- @@ -1608,7 +1608,7 @@ if (FORMATS["VDK_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/vdk_dsk.cpp", MAME_DIR.. "src/lib/formats/vdk_dsk.h", - } + } end -------------------------------------------------- @@ -1620,7 +1620,7 @@ if (FORMATS["VECTOR06_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/vector06_dsk.cpp", MAME_DIR.. "src/lib/formats/vector06_dsk.h", - } + } end -------------------------------------------------- @@ -1632,7 +1632,7 @@ if (FORMATS["VG5K_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/vg5k_cas.cpp", MAME_DIR.. "src/lib/formats/vg5k_cas.h", - } + } end -------------------------------------------------- @@ -1644,7 +1644,7 @@ if (FORMATS["VICTOR9K_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/victor9k_dsk.cpp", MAME_DIR.. "src/lib/formats/victor9k_dsk.h", - } + } end -------------------------------------------------- @@ -1656,7 +1656,7 @@ if (FORMATS["VT_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/vt_cas.cpp", MAME_DIR.. "src/lib/formats/vt_cas.h", - } + } end -------------------------------------------------- @@ -1668,7 +1668,7 @@ if (FORMATS["WD177X_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/wd177x_dsk.cpp", MAME_DIR.. "src/lib/formats/wd177x_dsk.h", - } + } end -------------------------------------------------- @@ -1680,7 +1680,7 @@ if (FORMATS["X07_CAS"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/x07_cas.cpp", MAME_DIR.. "src/lib/formats/x07_cas.h", - } + } end -------------------------------------------------- @@ -1692,7 +1692,7 @@ if (FORMATS["X1_TAP"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/x1_tap.cpp", MAME_DIR.. "src/lib/formats/x1_tap.h", - } + } end -------------------------------------------------- @@ -1704,7 +1704,7 @@ if (FORMATS["XDF_DSK"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/xdf_dsk.cpp", MAME_DIR.. "src/lib/formats/xdf_dsk.h", - } + } end -------------------------------------------------- @@ -1716,7 +1716,7 @@ if (FORMATS["ZX81_P"]~=null or _OPTIONS["with-tools"]) then files { MAME_DIR.. "src/lib/formats/zx81_p.cpp", MAME_DIR.. "src/lib/formats/zx81_p.h", - } + } end -end \ No newline at end of file +end diff --git a/scripts/src/main.lua b/scripts/src/main.lua index 4c460f1c212..d52cfbf36aa 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -223,7 +223,7 @@ end ext_lib("jpeg"), "7z", } -if (STANDALONE~=true) then +if (STANDALONE~=true) then links { ext_lib("lua"), "lualibs", @@ -267,11 +267,11 @@ end ext_includedir("flac"), } - + if (STANDALONE==true) then standalone(); end - + if (STANDALONE~=true) then if _OPTIONS["targetos"]=="macosx" and (not override_resources) then linkoptions { @@ -378,6 +378,6 @@ end debugargs (_OPTIONS["DEBUG_ARGS"]) else debugargs ("-window") - end - + end + end diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua index 58fdf39f6a0..70feb291aa5 100644 --- a/scripts/src/netlist.lua +++ b/scripts/src/netlist.lua @@ -14,8 +14,8 @@ project "netlist" kind (LIBTYPE) addprojectflags() - - + + defines { "__STDC_CONSTANT_MACROS", } @@ -43,14 +43,14 @@ project "netlist" MAME_DIR .. "src/lib/netlist/plib/pconfig.h", MAME_DIR .. "src/lib/netlist/plib/palloc.cpp", MAME_DIR .. "src/lib/netlist/plib/palloc.h", - MAME_DIR .. "src/lib/netlist/plib/pchrono.cpp", - MAME_DIR .. "src/lib/netlist/plib/pchrono.h", + MAME_DIR .. "src/lib/netlist/plib/pchrono.cpp", + MAME_DIR .. "src/lib/netlist/plib/pchrono.h", MAME_DIR .. "src/lib/netlist/plib/pfmtlog.cpp", MAME_DIR .. "src/lib/netlist/plib/pfmtlog.h", MAME_DIR .. "src/lib/netlist/plib/plists.h", - MAME_DIR .. "src/lib/netlist/plib/pdynlib.cpp", - MAME_DIR .. "src/lib/netlist/plib/pdynlib.h", - MAME_DIR .. "src/lib/netlist/plib/poptions.cpp", + MAME_DIR .. "src/lib/netlist/plib/pdynlib.cpp", + MAME_DIR .. "src/lib/netlist/plib/pdynlib.h", + MAME_DIR .. "src/lib/netlist/plib/poptions.cpp", MAME_DIR .. "src/lib/netlist/plib/poptions.h", MAME_DIR .. "src/lib/netlist/plib/pparser.cpp", MAME_DIR .. "src/lib/netlist/plib/pparser.h", @@ -63,8 +63,8 @@ project "netlist" MAME_DIR .. "src/lib/netlist/plib/pstream.cpp", MAME_DIR .. "src/lib/netlist/plib/pstream.h", MAME_DIR .. "src/lib/netlist/plib/ptypes.h", - MAME_DIR .. "src/lib/netlist/plib/putil.cpp", - MAME_DIR .. "src/lib/netlist/plib/putil.h", + MAME_DIR .. "src/lib/netlist/plib/putil.cpp", + MAME_DIR .. "src/lib/netlist/plib/putil.h", MAME_DIR .. "src/lib/netlist/tools/nl_convert.cpp", MAME_DIR .. "src/lib/netlist/tools/nl_convert.h", MAME_DIR .. "src/lib/netlist/analog/nld_bjt.cpp", @@ -147,8 +147,8 @@ project "netlist" MAME_DIR .. "src/lib/netlist/devices/nld_system.h", MAME_DIR .. "src/lib/netlist/devices/nld_truthtable.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_truthtable.h", - MAME_DIR .. "src/lib/netlist/devices/nlid_cmos.h", - MAME_DIR .. "src/lib/netlist/devices/nlid_system.h", + MAME_DIR .. "src/lib/netlist/devices/nlid_cmos.h", + MAME_DIR .. "src/lib/netlist/devices/nlid_system.h", MAME_DIR .. "src/lib/netlist/macro/nlm_ttl74xx.cpp", MAME_DIR .. "src/lib/netlist/macro/nlm_ttl74xx.h", MAME_DIR .. "src/lib/netlist/macro/nlm_cd4xxx.cpp", diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index 25a7aca2c0e..59cbc8c1d32 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -37,8 +37,8 @@ end function pkgconfigcmd() local pkgconfig = os.getenv("PKG_CONFIG") - if pkgconfig == nil then - return "pkg-config" + if pkgconfig == nil then + return "pkg-config" end return pkgconfig end diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua index a6e40c7aadc..32e7f2339a7 100644 --- a/scripts/src/osd/windows.lua +++ b/scripts/src/osd/windows.lua @@ -257,7 +257,7 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/file/winsocket.cpp", MAME_DIR .. "src/osd/modules/lib/osdlib_win32.cpp", } - + -------------------------------------------------- diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index 9d364c79158..e03ef307b59 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -2132,9 +2132,9 @@ files { MAME_DIR .. "src/mame/drivers/ddribble.cpp", MAME_DIR .. "src/mame/includes/ddribble.h", MAME_DIR .. "src/mame/video/ddribble.cpp", - MAME_DIR .. "src/mame/drivers/divebomb.cpp", - MAME_DIR .. "src/mame/includes/divebomb.h", - MAME_DIR .. "src/mame/video/divebomb.cpp", + MAME_DIR .. "src/mame/drivers/divebomb.cpp", + MAME_DIR .. "src/mame/includes/divebomb.h", + MAME_DIR .. "src/mame/video/divebomb.cpp", MAME_DIR .. "src/mame/drivers/djmain.cpp", MAME_DIR .. "src/mame/includes/djmain.h", MAME_DIR .. "src/mame/video/djmain.cpp", @@ -3931,9 +3931,9 @@ files { MAME_DIR .. "src/mame/video/slapfght.cpp", MAME_DIR .. "src/mame/drivers/snowbros.cpp", MAME_DIR .. "src/mame/includes/snowbros.h", - MAME_DIR .. "src/mame/video/snowbros.cpp", + MAME_DIR .. "src/mame/video/snowbros.cpp", MAME_DIR .. "src/mame/video/kan_pand.cpp", - MAME_DIR .. "src/mame/video/kan_pand.h", + MAME_DIR .. "src/mame/video/kan_pand.h", MAME_DIR .. "src/mame/drivers/toaplan1.cpp", MAME_DIR .. "src/mame/includes/toaplan1.h", MAME_DIR .. "src/mame/machine/toaplan1.cpp", diff --git a/scripts/target/mame/nl.lua b/scripts/target/mame/nl.lua index 08829959c1f..a3bdddbee98 100644 --- a/scripts/target/mame/nl.lua +++ b/scripts/target/mame/nl.lua @@ -124,7 +124,7 @@ files{ MAME_DIR .. "src/mame/includes/mario.h", MAME_DIR .. "src/mame/video/mario.cpp", MAME_DIR .. "src/mame/audio/mario.cpp", - + MAME_DIR .. "src/mame/drivers/m62.cpp", MAME_DIR .. "src/mame/includes/m62.h", MAME_DIR .. "src/mame/video/m62.cpp", diff --git a/scripts/target/zexall/zexall.lua b/scripts/target/zexall/zexall.lua index 739cd2a225a..36a1ff64a34 100644 --- a/scripts/target/zexall/zexall.lua +++ b/scripts/target/zexall/zexall.lua @@ -3,10 +3,10 @@ STANDALONE = true CPUS["Z80"] = true function standalone() - files{ + files{ MAME_DIR .. "src/zexall/main.cpp", MAME_DIR .. "src/zexall/zexall.cpp", MAME_DIR .. "src/zexall/zexall.h", - } + } end diff --git a/src/mame/drivers/mpu4sw.hxx b/src/mame/drivers/mpu4sw.hxx index f7de98b12f5..4f824af0735 100644 --- a/src/mame/drivers/mpu4sw.hxx +++ b/src/mame/drivers/mpu4sw.hxx @@ -3596,7 +3596,7 @@ GAME_CUSTOM( 199?, m4luckst__b, m4luckst, "ls15t", 0x0000, 0 DRIVER_INIT_MEMBER(mpu4_state,m4tenten) { DRIVER_INIT_CALL(m4default); -// DRIVER_INIT_CALL(m4_showstring); +// DRIVER_INIT_CALL(m4_showstring); //Derived from 10_x_10_(Barcrest)_[C01_v1-0_1024_10jp].gam DRIVER_INIT_CALL(m4_hopper_duart_a); DRIVER_INIT_CALL(m4default_reels); @@ -3717,7 +3717,7 @@ DRIVER_INIT_MEMBER(mpu4_state,m4andyfh) { //Derived from Andy's_Full_House_(Barcrest)_[C01_800_10jp].gam DRIVER_INIT_CALL(m4default); -// DRIVER_INIT_CALL(m4_showstring); +// DRIVER_INIT_CALL(m4_showstring); DRIVER_INIT_CALL(m4_hopper_tubes); DRIVER_INIT_CALL(m4default_reels); //PCKEY =b diff --git a/src/tools/srcclean.cpp b/src/tools/srcclean.cpp index 0e08fa57c52..9aac6ee845a 100644 --- a/src/tools/srcclean.cpp +++ b/src/tools/srcclean.cpp @@ -29,6 +29,13 @@ "bad\\ tbehaviour" + Known Lua limitations: + * Whitespace normalisation is applied inside long string literals + which can cause changes in behaviour + * Disabled code inside long comments gets no special treatment and + may have spacing adjusted in a way that affects behaviour when + uncommented + Known XML limitations: * No special handling for CDATA * No special handling for processing instructions @@ -88,9 +95,17 @@ public: virtual void summarise(std::ostream &os) const; protected: - static constexpr unicode_char HORIZONTAL_TAB = 0x0000'0009U; - static constexpr unicode_char LINE_FEED = 0x0000'000aU; - static constexpr unicode_char SPACE = 0x0000'0020U; + static constexpr unicode_char HORIZONTAL_TAB = 0x0000'0009U; + static constexpr unicode_char LINE_FEED = 0x0000'000aU; + static constexpr unicode_char VERTICAL_TAB = 0x0000'000bU; + static constexpr unicode_char SPACE = 0x0000'0020U; + static constexpr unicode_char DOUBLE_QUOTE = 0x0000'0022U; + static constexpr unicode_char SINGLE_QUOTE = 0x0000'0027U; + static constexpr unicode_char HYPHEN_MINUS = 0x0000'002dU; + static constexpr unicode_char QUESTION_MARK = 0x0000'003fU; + static constexpr unicode_char BACKSLASH = 0x0000'005cU; + static constexpr unicode_char BASIC_LATIN_LAST = 0x0000'007fU; + static constexpr unicode_char CYRILLIC_SUPPLEMENT_LAST = 0x0000'052fU; template cleaner_base(OutputIt &&output, newline newline_mode, unsigned tab_width); @@ -805,32 +820,26 @@ protected: void output_character(unicode_char ch); private: - static constexpr unicode_char DOUBLE_QUOTE = 0x0000'0022U; - static constexpr unicode_char SINGLE_QUOTE = 0x0000'0027U; - static constexpr unicode_char ASTERISK = 0x0000'002aU; - static constexpr unicode_char SLASH = 0x0000'002fU; - static constexpr unicode_char QUESTION_MARK = 0x0000'003fU; - static constexpr unicode_char UPPERCASE_FIRST = 0x0000'0041U; - static constexpr unicode_char UPPERCASE_B = 0x0000'0042U; - static constexpr unicode_char UPPERCASE_X = 0x0000'0058U; - static constexpr unicode_char UPPERCASE_LAST = 0x0000'005aU; - static constexpr unicode_char BACKSLASH = 0x0000'005cU; - static constexpr unicode_char UNDERSCORE = 0x0000'005fU; - static constexpr unicode_char LOWERCASE_FIRST = 0x0000'0061U; - static constexpr unicode_char LOWERCASE_B = 0x0000'0062U; - static constexpr unicode_char LOWERCASE_X = 0x0000'0078U; - static constexpr unicode_char LOWERCASE_LAST = 0x0000'007aU; - static constexpr unicode_char BASIC_LATIN_LAST = 0x0000'007fU; - static constexpr unicode_char CYRILLIC_SUPPLEMENT_LAST = 0x0000'052fU; + static constexpr unicode_char ASTERISK = 0x0000'002aU; + static constexpr unicode_char SLASH = 0x0000'002fU; + static constexpr unicode_char UPPERCASE_FIRST = 0x0000'0041U; + static constexpr unicode_char UPPERCASE_B = 0x0000'0042U; + static constexpr unicode_char UPPERCASE_X = 0x0000'0058U; + static constexpr unicode_char UPPERCASE_LAST = 0x0000'005aU; + static constexpr unicode_char UNDERSCORE = 0x0000'005fU; + static constexpr unicode_char LOWERCASE_FIRST = 0x0000'0061U; + static constexpr unicode_char LOWERCASE_B = 0x0000'0062U; + static constexpr unicode_char LOWERCASE_X = 0x0000'0078U; + static constexpr unicode_char LOWERCASE_LAST = 0x0000'007aU; - static constexpr unicode_char DIGIT_FIRST = 0x0000'0030U; - static constexpr unicode_char DIGIT_BINARY_LAST = 0x0000'0031U; - static constexpr unicode_char DIGIT_OCTAL_LAST = 0x0000'0037U; - static constexpr unicode_char DIGIT_DECIMAL_LAST = 0x0000'0039U; - static constexpr unicode_char DIGIT_HEX_UPPER_FIRST = 0x0000'0041U; - static constexpr unicode_char DIGIT_HEX_UPPER_LAST = 0x0000'0046U; - static constexpr unicode_char DIGIT_HEX_LOWER_FIRST = 0x0000'0061U; - static constexpr unicode_char DIGIT_HEX_LOWER_LAST = 0x0000'0066U; + static constexpr unicode_char DIGIT_FIRST = 0x0000'0030U; + static constexpr unicode_char DIGIT_BINARY_LAST = 0x0000'0031U; + static constexpr unicode_char DIGIT_OCTAL_LAST = 0x0000'0037U; + static constexpr unicode_char DIGIT_DECIMAL_LAST = 0x0000'0039U; + static constexpr unicode_char DIGIT_HEX_UPPER_FIRST = 0x0000'0041U; + static constexpr unicode_char DIGIT_HEX_UPPER_LAST = 0x0000'0046U; + static constexpr unicode_char DIGIT_HEX_LOWER_FIRST = 0x0000'0061U; + static constexpr unicode_char DIGIT_HEX_LOWER_LAST = 0x0000'0066U; enum class parse_state { @@ -1060,8 +1069,17 @@ void cpp_cleaner::process_characters(unicode_char const *begin, unicode_char con void cpp_cleaner::input_complete() { flush_tail(); - if (parse_state::COMMENT == m_parse_state) + switch (m_parse_state) + { + case parse_state::COMMENT: throw std::runtime_error(util::string_format("unterminated multi-line comment beginning on line %1$u", m_comment_line)); + case parse_state::CHARACTER_CONSTANT: + throw std::runtime_error(util::string_format("unterminated character literal on line %1$u", m_input_line)); + case parse_state::STRING_CONSTANT: + throw std::runtime_error(util::string_format("unterminated string literal on line %1$u", m_input_line)); + default: + break; + } } @@ -1188,6 +1206,12 @@ void cpp_cleaner::process_text(unicode_char ch) throw std::runtime_error(util::string_format("unterminated string literal on line %1$u", m_input_line)); } break; + case VERTICAL_TAB: + ++m_tabs_escaped; + if (!m_escape) + output_character(BACKSLASH); + output_character(unicode_char(std::uint8_t('v'))); + break; default: output_character(ch); if (!m_escape && (((parse_state::STRING_CONSTANT == m_parse_state) ? DOUBLE_QUOTE : SINGLE_QUOTE) == ch)) @@ -1299,6 +1323,324 @@ void cpp_cleaner::process_numeric(unicode_char ch) +/*************************************************************************** + LUA SOURCE CLEANER CLASS +***************************************************************************/ + +class lua_cleaner : public cleaner_base +{ +public: + template + lua_cleaner(OutputIt &&output, newline newline_mode, unsigned tab_width); + + virtual bool affected() const override; + virtual void summarise(std::ostream &os) const override; + +protected: + void output_character(unicode_char ch); + +private: + static constexpr unicode_char EQUALS = 0x0000'003dU; + static constexpr unicode_char LEFT_BRACKET = 0x0000'005bU; + static constexpr unicode_char RIGHT_BRACKET = 0x0000'005dU; + + enum class parse_state + { + DEFAULT, + SHORT_COMMENT, + LONG_COMMENT, + STRING_CONSTANT, + LONG_STRING_CONSTANT + }; + + virtual void process_characters(unicode_char const *begin, unicode_char const *end) override; + virtual void input_complete() override; + + void process_default(unicode_char ch); + void process_short_comment(unicode_char ch); + void process_long_comment(unicode_char ch); + void process_string_constant(unicode_char ch); + void process_long_string_constant(unicode_char ch); + + parse_state m_parse_state; + std::uint64_t m_input_line; + int m_long_bracket_level; + bool m_escape; + std::uint32_t m_block_line; + int m_block_level; + bool m_comment_start; + unicode_char m_string_quote; + + std::uint64_t m_tabs_escaped = 0U; + std::uint64_t m_newlines_escaped = 0U; + std::uint64_t m_non_ascii = 0U; +}; + + +template +lua_cleaner::lua_cleaner( + OutputIt &&output, + newline newline_mode, + unsigned tab_width) + : cleaner_base(std::forward(output), newline_mode, tab_width) + , m_parse_state(parse_state::DEFAULT) + , m_input_line(1U) + , m_long_bracket_level(-1) + , m_escape(false) + , m_block_line(0U) + , m_block_level(0) + , m_comment_start(false) + , m_string_quote(0U) +{ +} + + +bool lua_cleaner::affected() const +{ + return + cleaner_base::affected() || + m_tabs_escaped || + m_newlines_escaped || + m_non_ascii; +} + + +void lua_cleaner::summarise(std::ostream &os) const +{ + cleaner_base::summarise(os); + if (m_tabs_escaped) + util::stream_format(os, "%1$u tab(s) escaped\n", m_tabs_escaped); + if (m_newlines_escaped) + util::stream_format(os, "%1$u escaped line ending(s) converted\n", m_newlines_escaped); + if (m_non_ascii) + util::stream_format(os, "%1$u non-ASCII character(s) replaced\n", m_non_ascii); +} + + +void lua_cleaner::output_character(unicode_char ch) +{ + switch (m_parse_state) + { + case parse_state::DEFAULT: + if (BASIC_LATIN_LAST < ch) + { + ++m_non_ascii; + ch = QUESTION_MARK; + } + break; + case parse_state::SHORT_COMMENT: + case parse_state::LONG_COMMENT: + break; + case parse_state::STRING_CONSTANT: + case parse_state::LONG_STRING_CONSTANT: + if (CYRILLIC_SUPPLEMENT_LAST < ch) + { + ++m_non_ascii; + ch = QUESTION_MARK; + } + break; + } + + cleaner_base::output_character(ch); +} + + +void lua_cleaner::process_characters(unicode_char const *begin, unicode_char const *end) +{ + while (begin != end) + { + unicode_char const ch(*begin++); + switch (m_parse_state) + { + case parse_state::DEFAULT: + process_default(ch); + break; + case parse_state::SHORT_COMMENT: + process_short_comment(ch); + break; + case parse_state::LONG_COMMENT: + process_long_comment(ch); + break; + case parse_state::STRING_CONSTANT: + process_string_constant(ch); + break; + case parse_state::LONG_STRING_CONSTANT: + process_long_string_constant(ch); + break; + } + + if (LINE_FEED == ch) + ++m_input_line; + } +} + + +void lua_cleaner::input_complete() +{ + switch (m_parse_state) + { + case parse_state::LONG_COMMENT: + throw std::runtime_error(util::string_format("unterminated long comment beginning on line %1$u", m_block_line)); + case parse_state::STRING_CONSTANT: + throw std::runtime_error(util::string_format("unterminated string literal on line %1$u", m_input_line)); + case parse_state::LONG_STRING_CONSTANT: + throw std::runtime_error(util::string_format("unterminated long string literal beginning on line %1$u", m_block_line)); + default: + break; + } +} + + +void lua_cleaner::process_default(unicode_char ch) +{ + switch (ch) + { + case DOUBLE_QUOTE: + case SINGLE_QUOTE: + m_string_quote = ch; + m_parse_state = parse_state::STRING_CONSTANT; + break; + case HYPHEN_MINUS: + if (m_escape) + { + m_comment_start = true; + m_parse_state = parse_state::SHORT_COMMENT; + } + break; + default: + break; + } + if (0 <= m_long_bracket_level) + { + switch (ch) + { + case EQUALS: + ++m_long_bracket_level; + break; + case LEFT_BRACKET: + m_block_line = m_input_line; + m_block_level = m_long_bracket_level; + m_parse_state = parse_state::LONG_STRING_CONSTANT; + default: + m_long_bracket_level = -1; + } + } + else if (LEFT_BRACKET == ch) + { + m_long_bracket_level = 0; + } + m_escape = (HYPHEN_MINUS == ch) && !m_escape; + output_character(ch); +} + + +void lua_cleaner::process_short_comment(unicode_char ch) +{ + if (0 <= m_long_bracket_level) + { + switch (ch) + { + case EQUALS: + ++m_long_bracket_level; + break; + case LEFT_BRACKET: + m_block_line = m_input_line; + m_block_level = m_long_bracket_level; + m_parse_state = parse_state::LONG_COMMENT; + set_tab_limit(); + default: + m_long_bracket_level = -1; + } + } + else if (m_comment_start && (LEFT_BRACKET == ch)) + { + m_long_bracket_level = 0; + } + else if (LINE_FEED == ch) + { + m_parse_state = parse_state::DEFAULT; + } + m_comment_start = false; + output_character(ch); +} + + +void lua_cleaner::process_long_comment(unicode_char ch) +{ + if (0 <= m_long_bracket_level) + { + switch (ch) + { + case EQUALS: + ++m_long_bracket_level; + break; + case RIGHT_BRACKET: + if (m_long_bracket_level == m_block_level) + { + m_parse_state = parse_state::DEFAULT; + reset_tab_limit(); + } + else + { + m_long_bracket_level = 0; + } + break; + default: + m_long_bracket_level = -1; + } + } + else if (RIGHT_BRACKET == ch) + { + m_long_bracket_level = 0; + } + output_character(ch); +} + + +void lua_cleaner::process_string_constant(unicode_char ch) +{ + switch (ch) + { + case HORIZONTAL_TAB: + ++m_tabs_escaped; + if (!m_escape) + output_character(BACKSLASH); + output_character(unicode_char(std::uint8_t('t'))); + break; + case LINE_FEED: + if (m_escape) + { + ++m_newlines_escaped; + output_character(unicode_char(std::uint8_t('n'))); + } + else + { + throw std::runtime_error(util::string_format("unterminated string literal on line %1$u", m_input_line)); + } + break; + case VERTICAL_TAB: + ++m_tabs_escaped; + if (!m_escape) + output_character(BACKSLASH); + output_character(unicode_char(std::uint8_t('v'))); + break; + default: + output_character(ch); + if (!m_escape && (m_string_quote == ch)) + m_parse_state = parse_state::DEFAULT; + } + m_escape = (BACKSLASH == ch) && !m_escape; +} + + +void lua_cleaner::process_long_string_constant(unicode_char ch) +{ + // this works because they're both closed by a matching long bracket + process_long_comment(ch); +} + + + /*************************************************************************** XML DATA CLEANER CLASS ***************************************************************************/ @@ -1310,10 +1652,9 @@ public: xml_cleaner(OutputIt &&output, newline newline_mode, unsigned tab_width); private: - constexpr static unicode_char EXCLAMATION = 0x0000'0021U; - constexpr static unicode_char HYPHEN = 0x0000'002dU; - constexpr static unicode_char LEFT_ANGLE_BRACKET = 0x0000'003cU; - constexpr static unicode_char RIGHT_ANGLE_BRACKET = 0x0000'003eU; + static constexpr unicode_char EXCLAMATION = 0x0000'0021U; + static constexpr unicode_char LEFT_ANGLE_BRACKET = 0x0000'003cU; + static constexpr unicode_char RIGHT_ANGLE_BRACKET = 0x0000'003eU; enum class parse_state { @@ -1390,7 +1731,7 @@ void xml_cleaner::process_default(unicode_char ch) break; case 2U: case 3U: - m_escape = (HYPHEN == ch) ? (m_escape + 1U) : 0U; + m_escape = (HYPHEN_MINUS == ch) ? (m_escape + 1U) : 0U; break; } output_character(ch); @@ -1413,10 +1754,10 @@ void xml_cleaner::process_comment(unicode_char ch) { case 0U: case 1U: - m_escape = (HYPHEN == ch) ? (m_escape + 1U) : 0U; + m_escape = (HYPHEN_MINUS == ch) ? (m_escape + 1U) : 0U; break; case 2U: - m_escape = (RIGHT_ANGLE_BRACKET == ch) ? (m_escape + 1U) : (HYPHEN == ch) ? m_escape : 0U; + m_escape = (RIGHT_ANGLE_BRACKET == ch) ? (m_escape + 1U) : (HYPHEN_MINUS == ch) ? m_escape : 0U; break; } output_character(ch); @@ -1451,6 +1792,13 @@ bool is_c_source_extension(char const *ext) } +bool is_lua_source_extension(char const *ext) +{ + return + !core_stricmp(ext, ".lua"); +} + + bool is_xml_extension(char const *ext) { return @@ -1528,10 +1876,13 @@ int main(int argc, char *argv[]) // instantiate appropriate cleaner implementation char const *const ext(std::strrchr(argv[1], '.')); bool const is_c_file(ext && is_c_source_extension(ext)); + bool const is_lua_file(ext && is_lua_source_extension(ext)); bool const is_xml_file(ext && is_xml_extension(ext)); std::unique_ptr cleaner; if (is_c_file) cleaner = std::make_unique(std::back_inserter(output), newline_mode, 4U); + else if (is_lua_file) + cleaner = std::make_unique(std::back_inserter(output), newline_mode, 4U); else if (is_xml_file) cleaner = std::make_unique(std::back_inserter(output), newline_mode, 4U); else