From 966d5e731245048eed3decfd28e5e23b6e05946b Mon Sep 17 00:00:00 2001 From: Carsten Teibes Date: Thu, 11 Oct 2018 14:47:24 +0200 Subject: [PATCH 1/7] Update autoconf dependency macro --- builds/autoconf/m4/ax_pkg_check_modules.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builds/autoconf/m4/ax_pkg_check_modules.m4 b/builds/autoconf/m4/ax_pkg_check_modules.m4 index 1842a9a8f..760ffaf82 100644 --- a/builds/autoconf/m4/ax_pkg_check_modules.m4 +++ b/builds/autoconf/m4/ax_pkg_check_modules.m4 @@ -50,7 +50,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 3 +#serial 4 AC_DEFUN([AX_PKG_CHECK_MODULES],[ m4_define([ax_package_requires], @@ -58,8 +58,8 @@ AC_DEFUN([AX_PKG_CHECK_MODULES],[ m4_define([ax_package_requires_private], [m4_default_quoted([$7],[AX_PACKAGE_REQUIRES_PRIVATE])]) - ax_package_requires="$[]ax_package_requires $2" - ax_package_requires_private="$[]ax_package_requires_private $3" + ax_package_requires="$[]ax_package_requires m4_normalize($2)" + ax_package_requires_private="$[]ax_package_requires_private m4_normalize($3)" PKG_CHECK_MODULES([$1],[$2 $3],[$4],[$5]) From 91d34764a3ea3d9ef6d64f7a58b17fc1ff367768 Mon Sep 17 00:00:00 2001 From: Carsten Teibes Date: Thu, 11 Oct 2018 14:49:08 +0200 Subject: [PATCH 2/7] Update doxygen configuration --- builds/Doxyfile | 67 ++++++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 29 deletions(-) diff --git a/builds/Doxyfile b/builds/Doxyfile index 8a0d2e0d7..18d8cedc1 100644 --- a/builds/Doxyfile +++ b/builds/Doxyfile @@ -1,4 +1,4 @@ -# Doxyfile 1.8.13 +# Doxyfile 1.8.14 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -20,8 +20,8 @@ # This tag specifies the encoding used for all characters in the config file # that follow. The default is UTF-8 which is also the encoding used for all text # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. # The default value is: UTF-8. DOXYFILE_ENCODING = UTF-8 @@ -226,7 +226,8 @@ TAB_SIZE = 4 # will allow you to put the command \sideeffect (or @sideeffect) in the # documentation, which will result in a user-defined paragraph with heading # "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. ALIASES = @@ -327,7 +328,7 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO # Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen # will parse them like normal C++ but will assume all classes use public instead # of private inheritance when no explicit protection keyword is present. # The default value is: NO. @@ -698,7 +699,7 @@ LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib # extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. # For LaTeX the style of the bibliography can be controlled using # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. @@ -786,7 +787,7 @@ INPUT = ../src \ # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of # possible encodings. # The default value is: UTF-8. @@ -992,7 +993,7 @@ SOURCE_TOOLTIPS = YES # If the USE_HTAGS tag is set to YES then the references to source code will # point to the HTML generated by the htags(1) tool instead of doxygen built-in # source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version +# (see https://www.gnu.org/software/global/global.html). You will need version # 4.8.6 or higher. # # To use it do the following: @@ -1137,7 +1138,7 @@ HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 # purple, and 360 is red again. # Minimum value: 0, maximum value: 359, default value: 220. @@ -1173,6 +1174,17 @@ HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = YES +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. @@ -1196,12 +1208,12 @@ HTML_INDEX_NUM_ENTRIES = 100 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# environment (see: https://developer.apple.com/tools/xcode/), introduced with # OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a # Makefile in the HTML output directory. Running make will produce the docset in # that directory and running make install will install the docset in # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html # for more information. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1317,7 +1329,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1325,8 +1337,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1334,23 +1345,21 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1443,7 +1452,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1455,7 +1464,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side Javascript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1482,8 +1491,8 @@ MATHJAX_FORMAT = HTML-CSS # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = http://www.mathjax.org/mathjax @@ -1544,7 +1553,7 @@ SERVER_BASED_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). +# Xapian (see: https://xapian.org/). # # See the section "External Indexing and Searching" for details. # The default value is: NO. @@ -1557,7 +1566,7 @@ EXTERNAL_SEARCH = NO # # Doxygen ships with an example indexer (doxyindexer) and search engine # (doxysearch.cgi) which are based on the open source search engine library -# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Xapian (see: https://xapian.org/). See the section "External Indexing and # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. @@ -1744,7 +1753,7 @@ LATEX_SOURCE_CODE = NO # The LATEX_BIB_STYLE tag can be used to specify the style to use for the # bibliography, e.g. plainnat, or ieeetr. See -# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. # The default value is: plain. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1927,9 +1936,9 @@ DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sf.net) file that captures the -# structure of the code including all documentation. Note that this feature is -# still experimental and incomplete at the moment. +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO From 4ec7dc6873e81106c9470d7999e012250624a828 Mon Sep 17 00:00:00 2001 From: Carsten Teibes Date: Thu, 11 Oct 2018 14:51:36 +0200 Subject: [PATCH 3/7] Update Author info --- AUTHORS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/AUTHORS.md b/AUTHORS.md index 6d1219549..dc12d6310 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -2,6 +2,8 @@ liblcf authors ============== * Alejandro Marzini (vgvgf) +* Carsten Teibes (carstene1ns) * Gabriel Kind (Ghabry) * Glynn Clements (glynnc) +* Matthew Fioravante (fmatthew5876) * Paulo "Zhek" Vizcaino (paulo_v) From 322f835627ae59199fcf45b24e30afeb84a90e3d Mon Sep 17 00:00:00 2001 From: Carsten Teibes Date: Thu, 11 Oct 2018 15:00:53 +0200 Subject: [PATCH 4/7] Update copyright years --- COPYING | 2 +- generator/templates/copyright.tmpl | 2 +- src/command_codes.h | 2 +- src/data.cpp | 2 +- src/data.h | 2 +- src/generated/ldb_actor.cpp | 2 +- src/generated/ldb_animation.cpp | 2 +- src/generated/ldb_animationcelldata.cpp | 2 +- src/generated/ldb_animationframe.cpp | 2 +- src/generated/ldb_animationtiming.cpp | 2 +- src/generated/ldb_attribute.cpp | 2 +- src/generated/ldb_battlecommand.cpp | 2 +- src/generated/ldb_battlecommands.cpp | 2 +- src/generated/ldb_battleranimation.cpp | 2 +- src/generated/ldb_battleranimationdata.cpp | 2 +- src/generated/ldb_battleranimationextension.cpp | 2 +- src/generated/ldb_chipset.cpp | 2 +- src/generated/ldb_chunks.h | 2 +- src/generated/ldb_class.cpp | 2 +- src/generated/ldb_commonevent.cpp | 2 +- src/generated/ldb_database.cpp | 2 +- src/generated/ldb_enemy.cpp | 2 +- src/generated/ldb_enemyaction.cpp | 2 +- src/generated/ldb_item.cpp | 2 +- src/generated/ldb_itemanimation.cpp | 2 +- src/generated/ldb_learning.cpp | 2 +- src/generated/ldb_music.cpp | 2 +- src/generated/ldb_skill.cpp | 2 +- src/generated/ldb_sound.cpp | 2 +- src/generated/ldb_state.cpp | 2 +- src/generated/ldb_switch.cpp | 2 +- src/generated/ldb_system.cpp | 2 +- src/generated/ldb_terms.cpp | 2 +- src/generated/ldb_terrain.cpp | 2 +- src/generated/ldb_terrain_flags.h | 2 +- src/generated/ldb_testbattler.cpp | 2 +- src/generated/ldb_troop.cpp | 2 +- src/generated/ldb_troopmember.cpp | 2 +- src/generated/ldb_trooppage.cpp | 2 +- src/generated/ldb_trooppagecondition.cpp | 2 +- src/generated/ldb_trooppagecondition_flags.h | 2 +- src/generated/ldb_variable.cpp | 2 +- src/generated/lmt_chunks.h | 2 +- src/generated/lmt_encounter.cpp | 2 +- src/generated/lmt_mapinfo.cpp | 2 +- src/generated/lmt_start.cpp | 2 +- src/generated/lmu_chunks.h | 2 +- src/generated/lmu_event.cpp | 2 +- src/generated/lmu_eventpage.cpp | 2 +- src/generated/lmu_eventpagecondition.cpp | 2 +- src/generated/lmu_eventpagecondition_flags.h | 2 +- src/generated/lmu_map.cpp | 2 +- src/generated/lmu_moveroute.cpp | 2 +- src/generated/lsd_chunks.h | 2 +- src/generated/lsd_save.cpp | 2 +- src/generated/lsd_saveactor.cpp | 2 +- src/generated/lsd_savecommonevent.cpp | 2 +- src/generated/lsd_saveeventcommands.cpp | 2 +- src/generated/lsd_saveeventdata.cpp | 2 +- src/generated/lsd_saveinventory.cpp | 2 +- src/generated/lsd_savemapevent.cpp | 2 +- src/generated/lsd_savemapinfo.cpp | 2 +- src/generated/lsd_savepartylocation.cpp | 2 +- src/generated/lsd_savepicture.cpp | 2 +- src/generated/lsd_savepicture_flags.h | 2 +- src/generated/lsd_savescreen.cpp | 2 +- src/generated/lsd_savesystem.cpp | 2 +- src/generated/lsd_savetarget.cpp | 2 +- src/generated/lsd_savetitle.cpp | 2 +- src/generated/lsd_savevehiclelocation.cpp | 2 +- src/generated/rpg_actor.h | 2 +- src/generated/rpg_animation.h | 2 +- src/generated/rpg_animationcelldata.h | 2 +- src/generated/rpg_animationframe.h | 2 +- src/generated/rpg_animationtiming.h | 2 +- src/generated/rpg_attribute.h | 2 +- src/generated/rpg_battlecommand.h | 2 +- src/generated/rpg_battlecommands.h | 2 +- src/generated/rpg_battleranimation.h | 2 +- src/generated/rpg_battleranimationdata.h | 2 +- src/generated/rpg_battleranimationextension.h | 2 +- src/generated/rpg_chipset.cpp | 2 +- src/generated/rpg_chipset.h | 2 +- src/generated/rpg_class.h | 2 +- src/generated/rpg_commonevent.h | 2 +- src/generated/rpg_database.h | 2 +- src/generated/rpg_encounter.h | 2 +- src/generated/rpg_enemy.h | 2 +- src/generated/rpg_enemyaction.h | 2 +- src/generated/rpg_enums.cpp | 2 +- src/generated/rpg_equipment.h | 2 +- src/generated/rpg_event.h | 2 +- src/generated/rpg_eventcommand.h | 2 +- src/generated/rpg_eventpage.h | 2 +- src/generated/rpg_eventpagecondition.h | 2 +- src/generated/rpg_item.h | 2 +- src/generated/rpg_itemanimation.h | 2 +- src/generated/rpg_learning.h | 2 +- src/generated/rpg_map.h | 2 +- src/generated/rpg_mapinfo.cpp | 2 +- src/generated/rpg_mapinfo.h | 2 +- src/generated/rpg_movecommand.h | 2 +- src/generated/rpg_moveroute.h | 2 +- src/generated/rpg_music.h | 2 +- src/generated/rpg_parameters.h | 2 +- src/generated/rpg_rect.h | 2 +- src/generated/rpg_save.h | 2 +- src/generated/rpg_saveactor.h | 2 +- src/generated/rpg_savecommonevent.h | 2 +- src/generated/rpg_saveeventcommands.h | 2 +- src/generated/rpg_saveeventdata.h | 2 +- src/generated/rpg_saveinventory.h | 2 +- src/generated/rpg_savemapevent.h | 2 +- src/generated/rpg_savemapinfo.h | 2 +- src/generated/rpg_savepartylocation.h | 2 +- src/generated/rpg_savepicture.h | 2 +- src/generated/rpg_savescreen.h | 2 +- src/generated/rpg_savesystem.h | 2 +- src/generated/rpg_savetarget.h | 2 +- src/generated/rpg_savetitle.h | 2 +- src/generated/rpg_savevehiclelocation.h | 2 +- src/generated/rpg_skill.h | 2 +- src/generated/rpg_sound.h | 2 +- src/generated/rpg_start.h | 2 +- src/generated/rpg_state.h | 2 +- src/generated/rpg_switch.h | 2 +- src/generated/rpg_system.h | 2 +- src/generated/rpg_terms.h | 2 +- src/generated/rpg_terrain.h | 2 +- src/generated/rpg_testbattler.h | 2 +- src/generated/rpg_treemap.h | 2 +- src/generated/rpg_troop.h | 2 +- src/generated/rpg_troopmember.h | 2 +- src/generated/rpg_trooppage.h | 2 +- src/generated/rpg_trooppagecondition.h | 2 +- src/generated/rpg_variable.h | 2 +- src/lcf_options.h | 2 +- src/ldb_equipment.cpp | 2 +- src/ldb_eventcommand.cpp | 2 +- src/ldb_parameters.cpp | 2 +- src/ldb_reader.cpp | 2 +- src/ldb_reader.h | 2 +- src/lmt_reader.cpp | 2 +- src/lmt_reader.h | 2 +- src/lmt_rect.cpp | 2 +- src/lmt_treemap.cpp | 2 +- src/lmu_movecommand.cpp | 2 +- src/lmu_reader.cpp | 2 +- src/lmu_reader.h | 2 +- src/lsd_reader.cpp | 2 +- src/lsd_reader.h | 2 +- src/reader_flags.cpp | 2 +- src/reader_lcf.cpp | 2 +- src/reader_lcf.h | 2 +- src/reader_struct.cpp | 2 +- src/reader_struct.h | 2 +- src/reader_util.cpp | 2 +- src/reader_util.h | 2 +- src/reader_xml.cpp | 2 +- src/reader_xml.h | 2 +- src/rpg_fixup.cpp | 2 +- src/rpg_setup.cpp | 2 +- src/writer_lcf.cpp | 2 +- src/writer_lcf.h | 2 +- src/writer_xml.cpp | 2 +- src/writer_xml.h | 2 +- tests/test_main.cpp | 2 +- tests/time_stamp.cpp | 2 +- 168 files changed, 168 insertions(+), 168 deletions(-) diff --git a/COPYING b/COPYING index 077ae4a21..9d68fc9c4 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2016 liblcf authors +Copyright (c) 2014-2018 liblcf authors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/generator/templates/copyright.tmpl b/generator/templates/copyright.tmpl index 50cb78568..152d6251c 100644 --- a/generator/templates/copyright.tmpl +++ b/generator/templates/copyright.tmpl @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/command_codes.h b/src/command_codes.h index b913ed3d2..cfe701777 100644 --- a/src/command_codes.h +++ b/src/command_codes.h @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/data.cpp b/src/data.cpp index 599fbca1d..b2e9823af 100644 --- a/src/data.cpp +++ b/src/data.cpp @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/data.h b/src/data.h index a0e02f65c..4c103806d 100644 --- a/src/data.h +++ b/src/data.h @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_actor.cpp b/src/generated/ldb_actor.cpp index 669785820..a9f6f5d77 100644 --- a/src/generated/ldb_actor.cpp +++ b/src/generated/ldb_actor.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_animation.cpp b/src/generated/ldb_animation.cpp index b72035ea5..cc6c851a2 100644 --- a/src/generated/ldb_animation.cpp +++ b/src/generated/ldb_animation.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_animationcelldata.cpp b/src/generated/ldb_animationcelldata.cpp index 52459b010..4f9d3e612 100644 --- a/src/generated/ldb_animationcelldata.cpp +++ b/src/generated/ldb_animationcelldata.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_animationframe.cpp b/src/generated/ldb_animationframe.cpp index e09f3ad2c..64b1ffff8 100644 --- a/src/generated/ldb_animationframe.cpp +++ b/src/generated/ldb_animationframe.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_animationtiming.cpp b/src/generated/ldb_animationtiming.cpp index 281ebce08..0bf726353 100644 --- a/src/generated/ldb_animationtiming.cpp +++ b/src/generated/ldb_animationtiming.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_attribute.cpp b/src/generated/ldb_attribute.cpp index 8b39a6504..ee6abc13e 100644 --- a/src/generated/ldb_attribute.cpp +++ b/src/generated/ldb_attribute.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_battlecommand.cpp b/src/generated/ldb_battlecommand.cpp index 7ffa7b493..409822b33 100644 --- a/src/generated/ldb_battlecommand.cpp +++ b/src/generated/ldb_battlecommand.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_battlecommands.cpp b/src/generated/ldb_battlecommands.cpp index f1f43f34f..bcc33ef9b 100644 --- a/src/generated/ldb_battlecommands.cpp +++ b/src/generated/ldb_battlecommands.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_battleranimation.cpp b/src/generated/ldb_battleranimation.cpp index 655d709df..925d78912 100644 --- a/src/generated/ldb_battleranimation.cpp +++ b/src/generated/ldb_battleranimation.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_battleranimationdata.cpp b/src/generated/ldb_battleranimationdata.cpp index a509d9ad6..85a8b53fe 100644 --- a/src/generated/ldb_battleranimationdata.cpp +++ b/src/generated/ldb_battleranimationdata.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_battleranimationextension.cpp b/src/generated/ldb_battleranimationextension.cpp index 2eb257192..59c56da66 100644 --- a/src/generated/ldb_battleranimationextension.cpp +++ b/src/generated/ldb_battleranimationextension.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_chipset.cpp b/src/generated/ldb_chipset.cpp index 9a011e900..121d1c91c 100644 --- a/src/generated/ldb_chipset.cpp +++ b/src/generated/ldb_chipset.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_chunks.h b/src/generated/ldb_chunks.h index e0d8c5177..2bae63633 100644 --- a/src/generated/ldb_chunks.h +++ b/src/generated/ldb_chunks.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_class.cpp b/src/generated/ldb_class.cpp index 252956068..4453e6898 100644 --- a/src/generated/ldb_class.cpp +++ b/src/generated/ldb_class.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_commonevent.cpp b/src/generated/ldb_commonevent.cpp index 6fc85e3c3..26a04ace9 100644 --- a/src/generated/ldb_commonevent.cpp +++ b/src/generated/ldb_commonevent.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_database.cpp b/src/generated/ldb_database.cpp index 93b16cb4a..2057706da 100644 --- a/src/generated/ldb_database.cpp +++ b/src/generated/ldb_database.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_enemy.cpp b/src/generated/ldb_enemy.cpp index 2ea614a7d..e7b300b27 100644 --- a/src/generated/ldb_enemy.cpp +++ b/src/generated/ldb_enemy.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_enemyaction.cpp b/src/generated/ldb_enemyaction.cpp index 61d5f08a9..a98c70219 100644 --- a/src/generated/ldb_enemyaction.cpp +++ b/src/generated/ldb_enemyaction.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_item.cpp b/src/generated/ldb_item.cpp index fb033e276..e1886a7b9 100644 --- a/src/generated/ldb_item.cpp +++ b/src/generated/ldb_item.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_itemanimation.cpp b/src/generated/ldb_itemanimation.cpp index 76c1ad9ea..29f8b9a28 100644 --- a/src/generated/ldb_itemanimation.cpp +++ b/src/generated/ldb_itemanimation.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_learning.cpp b/src/generated/ldb_learning.cpp index b15a2618a..089c51f22 100644 --- a/src/generated/ldb_learning.cpp +++ b/src/generated/ldb_learning.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_music.cpp b/src/generated/ldb_music.cpp index 07328cfbb..fee705ae7 100644 --- a/src/generated/ldb_music.cpp +++ b/src/generated/ldb_music.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_skill.cpp b/src/generated/ldb_skill.cpp index 92bdaea9c..34eace380 100644 --- a/src/generated/ldb_skill.cpp +++ b/src/generated/ldb_skill.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_sound.cpp b/src/generated/ldb_sound.cpp index 4c3f8c1e5..661cac4ff 100644 --- a/src/generated/ldb_sound.cpp +++ b/src/generated/ldb_sound.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_state.cpp b/src/generated/ldb_state.cpp index a290ec718..0190ebf35 100644 --- a/src/generated/ldb_state.cpp +++ b/src/generated/ldb_state.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_switch.cpp b/src/generated/ldb_switch.cpp index 9aa91ce11..093439c19 100644 --- a/src/generated/ldb_switch.cpp +++ b/src/generated/ldb_switch.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_system.cpp b/src/generated/ldb_system.cpp index f7962e886..7f25648dd 100644 --- a/src/generated/ldb_system.cpp +++ b/src/generated/ldb_system.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_terms.cpp b/src/generated/ldb_terms.cpp index 7850b4674..e83fd0348 100644 --- a/src/generated/ldb_terms.cpp +++ b/src/generated/ldb_terms.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_terrain.cpp b/src/generated/ldb_terrain.cpp index 22d5d1a93..d33400991 100644 --- a/src/generated/ldb_terrain.cpp +++ b/src/generated/ldb_terrain.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_terrain_flags.h b/src/generated/ldb_terrain_flags.h index b66957338..7511e35fb 100644 --- a/src/generated/ldb_terrain_flags.h +++ b/src/generated/ldb_terrain_flags.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_testbattler.cpp b/src/generated/ldb_testbattler.cpp index 7473ab1da..4e79d1b9f 100644 --- a/src/generated/ldb_testbattler.cpp +++ b/src/generated/ldb_testbattler.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_troop.cpp b/src/generated/ldb_troop.cpp index 7dad82578..4a2b6f219 100644 --- a/src/generated/ldb_troop.cpp +++ b/src/generated/ldb_troop.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_troopmember.cpp b/src/generated/ldb_troopmember.cpp index 3f5c98ca1..5d10a131f 100644 --- a/src/generated/ldb_troopmember.cpp +++ b/src/generated/ldb_troopmember.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_trooppage.cpp b/src/generated/ldb_trooppage.cpp index dbb4bd3fb..0b0ff2c11 100644 --- a/src/generated/ldb_trooppage.cpp +++ b/src/generated/ldb_trooppage.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_trooppagecondition.cpp b/src/generated/ldb_trooppagecondition.cpp index d333d3ff3..5e9c09332 100644 --- a/src/generated/ldb_trooppagecondition.cpp +++ b/src/generated/ldb_trooppagecondition.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_trooppagecondition_flags.h b/src/generated/ldb_trooppagecondition_flags.h index acc85d7fc..179d697f5 100644 --- a/src/generated/ldb_trooppagecondition_flags.h +++ b/src/generated/ldb_trooppagecondition_flags.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/ldb_variable.cpp b/src/generated/ldb_variable.cpp index 1fcb5d073..1cdd85516 100644 --- a/src/generated/ldb_variable.cpp +++ b/src/generated/ldb_variable.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lmt_chunks.h b/src/generated/lmt_chunks.h index 80a20b37b..35b4a99ef 100644 --- a/src/generated/lmt_chunks.h +++ b/src/generated/lmt_chunks.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lmt_encounter.cpp b/src/generated/lmt_encounter.cpp index dc2f0a27d..328a028da 100644 --- a/src/generated/lmt_encounter.cpp +++ b/src/generated/lmt_encounter.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lmt_mapinfo.cpp b/src/generated/lmt_mapinfo.cpp index ef7be051f..1738e1105 100644 --- a/src/generated/lmt_mapinfo.cpp +++ b/src/generated/lmt_mapinfo.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lmt_start.cpp b/src/generated/lmt_start.cpp index 1963d54bb..313b64811 100644 --- a/src/generated/lmt_start.cpp +++ b/src/generated/lmt_start.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lmu_chunks.h b/src/generated/lmu_chunks.h index 5bbf5cbb2..143838c0c 100644 --- a/src/generated/lmu_chunks.h +++ b/src/generated/lmu_chunks.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lmu_event.cpp b/src/generated/lmu_event.cpp index b02b8197a..5a93535cf 100644 --- a/src/generated/lmu_event.cpp +++ b/src/generated/lmu_event.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lmu_eventpage.cpp b/src/generated/lmu_eventpage.cpp index a69e086d5..3e5c2471f 100644 --- a/src/generated/lmu_eventpage.cpp +++ b/src/generated/lmu_eventpage.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lmu_eventpagecondition.cpp b/src/generated/lmu_eventpagecondition.cpp index be9795e49..715f61467 100644 --- a/src/generated/lmu_eventpagecondition.cpp +++ b/src/generated/lmu_eventpagecondition.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lmu_eventpagecondition_flags.h b/src/generated/lmu_eventpagecondition_flags.h index d882b178f..1ccb611b6 100644 --- a/src/generated/lmu_eventpagecondition_flags.h +++ b/src/generated/lmu_eventpagecondition_flags.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lmu_map.cpp b/src/generated/lmu_map.cpp index e2c442df2..95231f34f 100644 --- a/src/generated/lmu_map.cpp +++ b/src/generated/lmu_map.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lmu_moveroute.cpp b/src/generated/lmu_moveroute.cpp index d8fed4b36..88858b2e3 100644 --- a/src/generated/lmu_moveroute.cpp +++ b/src/generated/lmu_moveroute.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lsd_chunks.h b/src/generated/lsd_chunks.h index f426de02c..55c553399 100644 --- a/src/generated/lsd_chunks.h +++ b/src/generated/lsd_chunks.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lsd_save.cpp b/src/generated/lsd_save.cpp index 36eab8890..49b04c775 100644 --- a/src/generated/lsd_save.cpp +++ b/src/generated/lsd_save.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lsd_saveactor.cpp b/src/generated/lsd_saveactor.cpp index bfb766574..d45dbaec7 100644 --- a/src/generated/lsd_saveactor.cpp +++ b/src/generated/lsd_saveactor.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lsd_savecommonevent.cpp b/src/generated/lsd_savecommonevent.cpp index c2037d7e9..986c6036b 100644 --- a/src/generated/lsd_savecommonevent.cpp +++ b/src/generated/lsd_savecommonevent.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lsd_saveeventcommands.cpp b/src/generated/lsd_saveeventcommands.cpp index f9d12fe36..523720e6e 100644 --- a/src/generated/lsd_saveeventcommands.cpp +++ b/src/generated/lsd_saveeventcommands.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lsd_saveeventdata.cpp b/src/generated/lsd_saveeventdata.cpp index 0783f349b..8e85721b5 100644 --- a/src/generated/lsd_saveeventdata.cpp +++ b/src/generated/lsd_saveeventdata.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lsd_saveinventory.cpp b/src/generated/lsd_saveinventory.cpp index 2a9504729..f0e95a8ca 100644 --- a/src/generated/lsd_saveinventory.cpp +++ b/src/generated/lsd_saveinventory.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lsd_savemapevent.cpp b/src/generated/lsd_savemapevent.cpp index fea5fee7b..e45efad4a 100644 --- a/src/generated/lsd_savemapevent.cpp +++ b/src/generated/lsd_savemapevent.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lsd_savemapinfo.cpp b/src/generated/lsd_savemapinfo.cpp index ef1f1c6e4..718169deb 100644 --- a/src/generated/lsd_savemapinfo.cpp +++ b/src/generated/lsd_savemapinfo.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lsd_savepartylocation.cpp b/src/generated/lsd_savepartylocation.cpp index c0c2c4df8..e512301f5 100644 --- a/src/generated/lsd_savepartylocation.cpp +++ b/src/generated/lsd_savepartylocation.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lsd_savepicture.cpp b/src/generated/lsd_savepicture.cpp index 61db1a46f..4d159dad3 100644 --- a/src/generated/lsd_savepicture.cpp +++ b/src/generated/lsd_savepicture.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lsd_savepicture_flags.h b/src/generated/lsd_savepicture_flags.h index e45b08778..84c7c8d77 100644 --- a/src/generated/lsd_savepicture_flags.h +++ b/src/generated/lsd_savepicture_flags.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lsd_savescreen.cpp b/src/generated/lsd_savescreen.cpp index ee805812c..aa2f1b9e7 100644 --- a/src/generated/lsd_savescreen.cpp +++ b/src/generated/lsd_savescreen.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lsd_savesystem.cpp b/src/generated/lsd_savesystem.cpp index 4ee8e4d99..65de6b55d 100644 --- a/src/generated/lsd_savesystem.cpp +++ b/src/generated/lsd_savesystem.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lsd_savetarget.cpp b/src/generated/lsd_savetarget.cpp index 3abfae402..f13c94967 100644 --- a/src/generated/lsd_savetarget.cpp +++ b/src/generated/lsd_savetarget.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lsd_savetitle.cpp b/src/generated/lsd_savetitle.cpp index a468a32e0..8776409d2 100644 --- a/src/generated/lsd_savetitle.cpp +++ b/src/generated/lsd_savetitle.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/lsd_savevehiclelocation.cpp b/src/generated/lsd_savevehiclelocation.cpp index bc15fdae0..64d4a255f 100644 --- a/src/generated/lsd_savevehiclelocation.cpp +++ b/src/generated/lsd_savevehiclelocation.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_actor.h b/src/generated/rpg_actor.h index fea962cbf..05f41865e 100644 --- a/src/generated/rpg_actor.h +++ b/src/generated/rpg_actor.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_animation.h b/src/generated/rpg_animation.h index e188ffc99..20929dac6 100644 --- a/src/generated/rpg_animation.h +++ b/src/generated/rpg_animation.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_animationcelldata.h b/src/generated/rpg_animationcelldata.h index 136a803f7..a810ee617 100644 --- a/src/generated/rpg_animationcelldata.h +++ b/src/generated/rpg_animationcelldata.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_animationframe.h b/src/generated/rpg_animationframe.h index cb43044f8..aa9c147b9 100644 --- a/src/generated/rpg_animationframe.h +++ b/src/generated/rpg_animationframe.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_animationtiming.h b/src/generated/rpg_animationtiming.h index f20140f92..2a38a118c 100644 --- a/src/generated/rpg_animationtiming.h +++ b/src/generated/rpg_animationtiming.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_attribute.h b/src/generated/rpg_attribute.h index 88d1e1df7..3cba7c3df 100644 --- a/src/generated/rpg_attribute.h +++ b/src/generated/rpg_attribute.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_battlecommand.h b/src/generated/rpg_battlecommand.h index f89bf4489..cf96f3e21 100644 --- a/src/generated/rpg_battlecommand.h +++ b/src/generated/rpg_battlecommand.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_battlecommands.h b/src/generated/rpg_battlecommands.h index 11321cd68..10cb33863 100644 --- a/src/generated/rpg_battlecommands.h +++ b/src/generated/rpg_battlecommands.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_battleranimation.h b/src/generated/rpg_battleranimation.h index 5599fccd0..39292b81a 100644 --- a/src/generated/rpg_battleranimation.h +++ b/src/generated/rpg_battleranimation.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_battleranimationdata.h b/src/generated/rpg_battleranimationdata.h index 4be4e89a5..813f3c1c1 100644 --- a/src/generated/rpg_battleranimationdata.h +++ b/src/generated/rpg_battleranimationdata.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_battleranimationextension.h b/src/generated/rpg_battleranimationextension.h index af08c92cc..e5c4bb305 100644 --- a/src/generated/rpg_battleranimationextension.h +++ b/src/generated/rpg_battleranimationextension.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_chipset.cpp b/src/generated/rpg_chipset.cpp index 4d4743b10..f58ce634e 100644 --- a/src/generated/rpg_chipset.cpp +++ b/src/generated/rpg_chipset.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_chipset.h b/src/generated/rpg_chipset.h index 47dcfa3a8..ecb65fb74 100644 --- a/src/generated/rpg_chipset.h +++ b/src/generated/rpg_chipset.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_class.h b/src/generated/rpg_class.h index a775e5264..5b1150289 100644 --- a/src/generated/rpg_class.h +++ b/src/generated/rpg_class.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_commonevent.h b/src/generated/rpg_commonevent.h index 9faaa2a36..a986c8407 100644 --- a/src/generated/rpg_commonevent.h +++ b/src/generated/rpg_commonevent.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_database.h b/src/generated/rpg_database.h index a5d41c900..61feac9b6 100644 --- a/src/generated/rpg_database.h +++ b/src/generated/rpg_database.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_encounter.h b/src/generated/rpg_encounter.h index b93eb48da..d886fe5e9 100644 --- a/src/generated/rpg_encounter.h +++ b/src/generated/rpg_encounter.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_enemy.h b/src/generated/rpg_enemy.h index 2ca4ed30a..b39e9eb28 100644 --- a/src/generated/rpg_enemy.h +++ b/src/generated/rpg_enemy.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_enemyaction.h b/src/generated/rpg_enemyaction.h index 3fa4b9b31..f0bc8b183 100644 --- a/src/generated/rpg_enemyaction.h +++ b/src/generated/rpg_enemyaction.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_enums.cpp b/src/generated/rpg_enums.cpp index 309b986cf..7348d39b0 100644 --- a/src/generated/rpg_enums.cpp +++ b/src/generated/rpg_enums.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_equipment.h b/src/generated/rpg_equipment.h index 3639b1e0d..2d39b4269 100644 --- a/src/generated/rpg_equipment.h +++ b/src/generated/rpg_equipment.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_event.h b/src/generated/rpg_event.h index 6486dbffb..7ddd76f5b 100644 --- a/src/generated/rpg_event.h +++ b/src/generated/rpg_event.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_eventcommand.h b/src/generated/rpg_eventcommand.h index f49af619c..6305ccaa4 100644 --- a/src/generated/rpg_eventcommand.h +++ b/src/generated/rpg_eventcommand.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_eventpage.h b/src/generated/rpg_eventpage.h index f43a405d7..6b3d59ee0 100644 --- a/src/generated/rpg_eventpage.h +++ b/src/generated/rpg_eventpage.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_eventpagecondition.h b/src/generated/rpg_eventpagecondition.h index a19140cfa..c2257fbb3 100644 --- a/src/generated/rpg_eventpagecondition.h +++ b/src/generated/rpg_eventpagecondition.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_item.h b/src/generated/rpg_item.h index 87e0f323d..7cd18e2ed 100644 --- a/src/generated/rpg_item.h +++ b/src/generated/rpg_item.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_itemanimation.h b/src/generated/rpg_itemanimation.h index aa35defdf..7b847c618 100644 --- a/src/generated/rpg_itemanimation.h +++ b/src/generated/rpg_itemanimation.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_learning.h b/src/generated/rpg_learning.h index 35b1d8655..a3547aa72 100644 --- a/src/generated/rpg_learning.h +++ b/src/generated/rpg_learning.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_map.h b/src/generated/rpg_map.h index 8a285a91e..da95e5ccb 100644 --- a/src/generated/rpg_map.h +++ b/src/generated/rpg_map.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_mapinfo.cpp b/src/generated/rpg_mapinfo.cpp index e5d36e1c5..45a21f754 100644 --- a/src/generated/rpg_mapinfo.cpp +++ b/src/generated/rpg_mapinfo.cpp @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_mapinfo.h b/src/generated/rpg_mapinfo.h index 91866d1ee..fa4144668 100644 --- a/src/generated/rpg_mapinfo.h +++ b/src/generated/rpg_mapinfo.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_movecommand.h b/src/generated/rpg_movecommand.h index b93e702c8..3788ab14e 100644 --- a/src/generated/rpg_movecommand.h +++ b/src/generated/rpg_movecommand.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_moveroute.h b/src/generated/rpg_moveroute.h index 3e0669ae7..68c5670a1 100644 --- a/src/generated/rpg_moveroute.h +++ b/src/generated/rpg_moveroute.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_music.h b/src/generated/rpg_music.h index 80dbb8f82..1ea6c0de4 100644 --- a/src/generated/rpg_music.h +++ b/src/generated/rpg_music.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_parameters.h b/src/generated/rpg_parameters.h index e414103e1..98d67e7a7 100644 --- a/src/generated/rpg_parameters.h +++ b/src/generated/rpg_parameters.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_rect.h b/src/generated/rpg_rect.h index b8846517a..98957bbc3 100644 --- a/src/generated/rpg_rect.h +++ b/src/generated/rpg_rect.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_save.h b/src/generated/rpg_save.h index 8269a7f1f..8617410e0 100644 --- a/src/generated/rpg_save.h +++ b/src/generated/rpg_save.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_saveactor.h b/src/generated/rpg_saveactor.h index 7e973358c..a23a49d0e 100644 --- a/src/generated/rpg_saveactor.h +++ b/src/generated/rpg_saveactor.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_savecommonevent.h b/src/generated/rpg_savecommonevent.h index 23175ba38..4858fad8b 100644 --- a/src/generated/rpg_savecommonevent.h +++ b/src/generated/rpg_savecommonevent.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_saveeventcommands.h b/src/generated/rpg_saveeventcommands.h index 87736cbbf..4352c690f 100644 --- a/src/generated/rpg_saveeventcommands.h +++ b/src/generated/rpg_saveeventcommands.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_saveeventdata.h b/src/generated/rpg_saveeventdata.h index bfbcc0d3d..3fe297eb7 100644 --- a/src/generated/rpg_saveeventdata.h +++ b/src/generated/rpg_saveeventdata.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_saveinventory.h b/src/generated/rpg_saveinventory.h index 6468c4a36..652e3b1e0 100644 --- a/src/generated/rpg_saveinventory.h +++ b/src/generated/rpg_saveinventory.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_savemapevent.h b/src/generated/rpg_savemapevent.h index 18036c9ac..abfcca8b1 100644 --- a/src/generated/rpg_savemapevent.h +++ b/src/generated/rpg_savemapevent.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_savemapinfo.h b/src/generated/rpg_savemapinfo.h index b8b1fddfb..fb5f108ba 100644 --- a/src/generated/rpg_savemapinfo.h +++ b/src/generated/rpg_savemapinfo.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_savepartylocation.h b/src/generated/rpg_savepartylocation.h index 58c45c155..f3eaad0d8 100644 --- a/src/generated/rpg_savepartylocation.h +++ b/src/generated/rpg_savepartylocation.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_savepicture.h b/src/generated/rpg_savepicture.h index 9d68800c7..a46e55375 100644 --- a/src/generated/rpg_savepicture.h +++ b/src/generated/rpg_savepicture.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_savescreen.h b/src/generated/rpg_savescreen.h index c209fb2b4..0f2d6af64 100644 --- a/src/generated/rpg_savescreen.h +++ b/src/generated/rpg_savescreen.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_savesystem.h b/src/generated/rpg_savesystem.h index 7fd0b6699..b7f733113 100644 --- a/src/generated/rpg_savesystem.h +++ b/src/generated/rpg_savesystem.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_savetarget.h b/src/generated/rpg_savetarget.h index 1331beb7e..0ad8221e5 100644 --- a/src/generated/rpg_savetarget.h +++ b/src/generated/rpg_savetarget.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_savetitle.h b/src/generated/rpg_savetitle.h index da5bab567..2d083a8e1 100644 --- a/src/generated/rpg_savetitle.h +++ b/src/generated/rpg_savetitle.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_savevehiclelocation.h b/src/generated/rpg_savevehiclelocation.h index 2211cb429..57bc97c7f 100644 --- a/src/generated/rpg_savevehiclelocation.h +++ b/src/generated/rpg_savevehiclelocation.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_skill.h b/src/generated/rpg_skill.h index 0cfb997da..c6513e092 100644 --- a/src/generated/rpg_skill.h +++ b/src/generated/rpg_skill.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_sound.h b/src/generated/rpg_sound.h index 9fb39ae07..4487fd0ad 100644 --- a/src/generated/rpg_sound.h +++ b/src/generated/rpg_sound.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_start.h b/src/generated/rpg_start.h index f7f7d3394..31444e206 100644 --- a/src/generated/rpg_start.h +++ b/src/generated/rpg_start.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_state.h b/src/generated/rpg_state.h index 5572b540f..d7b52330e 100644 --- a/src/generated/rpg_state.h +++ b/src/generated/rpg_state.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_switch.h b/src/generated/rpg_switch.h index 8529f1271..ef91e91c7 100644 --- a/src/generated/rpg_switch.h +++ b/src/generated/rpg_switch.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_system.h b/src/generated/rpg_system.h index 7062c18da..e86025282 100644 --- a/src/generated/rpg_system.h +++ b/src/generated/rpg_system.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_terms.h b/src/generated/rpg_terms.h index b3c98ff41..173629696 100644 --- a/src/generated/rpg_terms.h +++ b/src/generated/rpg_terms.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_terrain.h b/src/generated/rpg_terrain.h index af9565631..b2249efd9 100644 --- a/src/generated/rpg_terrain.h +++ b/src/generated/rpg_terrain.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_testbattler.h b/src/generated/rpg_testbattler.h index ec4a3c83a..95d43fab5 100644 --- a/src/generated/rpg_testbattler.h +++ b/src/generated/rpg_testbattler.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_treemap.h b/src/generated/rpg_treemap.h index 4f1f659cc..87a0a78de 100644 --- a/src/generated/rpg_treemap.h +++ b/src/generated/rpg_treemap.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_troop.h b/src/generated/rpg_troop.h index 40cde9ec6..ef7e48850 100644 --- a/src/generated/rpg_troop.h +++ b/src/generated/rpg_troop.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_troopmember.h b/src/generated/rpg_troopmember.h index 24bb141b9..ddcbe76c3 100644 --- a/src/generated/rpg_troopmember.h +++ b/src/generated/rpg_troopmember.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_trooppage.h b/src/generated/rpg_trooppage.h index a56fd9000..5f0dd2cc8 100644 --- a/src/generated/rpg_trooppage.h +++ b/src/generated/rpg_trooppage.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_trooppagecondition.h b/src/generated/rpg_trooppagecondition.h index fc7ab1e26..210745ea7 100644 --- a/src/generated/rpg_trooppagecondition.h +++ b/src/generated/rpg_trooppagecondition.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/generated/rpg_variable.h b/src/generated/rpg_variable.h index 6c8cc8e7f..35879f5e2 100644 --- a/src/generated/rpg_variable.h +++ b/src/generated/rpg_variable.h @@ -1,7 +1,7 @@ /* !!!! GENERATED FILE - DO NOT EDIT !!!! * -------------------------------------- * - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/lcf_options.h b/src/lcf_options.h index d6d510821..0b38d4fc8 100644 --- a/src/lcf_options.h +++ b/src/lcf_options.h @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/ldb_equipment.cpp b/src/ldb_equipment.cpp index 14a838fe2..cb352083a 100644 --- a/src/ldb_equipment.cpp +++ b/src/ldb_equipment.cpp @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/ldb_eventcommand.cpp b/src/ldb_eventcommand.cpp index e28f6b062..50679fc7d 100644 --- a/src/ldb_eventcommand.cpp +++ b/src/ldb_eventcommand.cpp @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/ldb_parameters.cpp b/src/ldb_parameters.cpp index 476d36734..6e306c2c4 100644 --- a/src/ldb_parameters.cpp +++ b/src/ldb_parameters.cpp @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/ldb_reader.cpp b/src/ldb_reader.cpp index ec466312a..cdcdfa70a 100644 --- a/src/ldb_reader.cpp +++ b/src/ldb_reader.cpp @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/ldb_reader.h b/src/ldb_reader.h index 484ea3590..c4ae73c4a 100644 --- a/src/ldb_reader.h +++ b/src/ldb_reader.h @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/lmt_reader.cpp b/src/lmt_reader.cpp index 5241fa4f1..2c39603f0 100644 --- a/src/lmt_reader.cpp +++ b/src/lmt_reader.cpp @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/lmt_reader.h b/src/lmt_reader.h index 2c971d22b..9e8fd9289 100644 --- a/src/lmt_reader.h +++ b/src/lmt_reader.h @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/lmt_rect.cpp b/src/lmt_rect.cpp index 70236e92c..ce5149081 100644 --- a/src/lmt_rect.cpp +++ b/src/lmt_rect.cpp @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/lmt_treemap.cpp b/src/lmt_treemap.cpp index f924911de..628b7e8be 100644 --- a/src/lmt_treemap.cpp +++ b/src/lmt_treemap.cpp @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/lmu_movecommand.cpp b/src/lmu_movecommand.cpp index 0d0ceff36..8c3f96285 100644 --- a/src/lmu_movecommand.cpp +++ b/src/lmu_movecommand.cpp @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/lmu_reader.cpp b/src/lmu_reader.cpp index 412a49adf..068a18516 100644 --- a/src/lmu_reader.cpp +++ b/src/lmu_reader.cpp @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/lmu_reader.h b/src/lmu_reader.h index 34f44a926..786a55b53 100644 --- a/src/lmu_reader.h +++ b/src/lmu_reader.h @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/lsd_reader.cpp b/src/lsd_reader.cpp index 2876c50e2..75661e489 100644 --- a/src/lsd_reader.cpp +++ b/src/lsd_reader.cpp @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/lsd_reader.h b/src/lsd_reader.h index f14c26c4b..e8300c174 100644 --- a/src/lsd_reader.h +++ b/src/lsd_reader.h @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/reader_flags.cpp b/src/reader_flags.cpp index 4ebf42126..48d6cf8f4 100644 --- a/src/reader_flags.cpp +++ b/src/reader_flags.cpp @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/reader_lcf.cpp b/src/reader_lcf.cpp index 6bfb510da..d7df0a8c6 100644 --- a/src/reader_lcf.cpp +++ b/src/reader_lcf.cpp @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/reader_lcf.h b/src/reader_lcf.h index ade7e6c6a..c522618bb 100644 --- a/src/reader_lcf.h +++ b/src/reader_lcf.h @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/reader_struct.cpp b/src/reader_struct.cpp index 1f4b98a3e..516756572 100644 --- a/src/reader_struct.cpp +++ b/src/reader_struct.cpp @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/reader_struct.h b/src/reader_struct.h index 1845a363d..385c849d6 100644 --- a/src/reader_struct.h +++ b/src/reader_struct.h @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/reader_util.cpp b/src/reader_util.cpp index 834eae11b..a815c9b60 100644 --- a/src/reader_util.cpp +++ b/src/reader_util.cpp @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/reader_util.h b/src/reader_util.h index c3b6ed2d6..87846cd32 100644 --- a/src/reader_util.h +++ b/src/reader_util.h @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/reader_xml.cpp b/src/reader_xml.cpp index 41ae702cc..58a0e18dc 100644 --- a/src/reader_xml.cpp +++ b/src/reader_xml.cpp @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/reader_xml.h b/src/reader_xml.h index 9b4aadad4..382d69ad1 100644 --- a/src/reader_xml.h +++ b/src/reader_xml.h @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/rpg_fixup.cpp b/src/rpg_fixup.cpp index 3a8ae6fcc..f0e12723e 100644 --- a/src/rpg_fixup.cpp +++ b/src/rpg_fixup.cpp @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/rpg_setup.cpp b/src/rpg_setup.cpp index 637b1fd42..8391f32f3 100644 --- a/src/rpg_setup.cpp +++ b/src/rpg_setup.cpp @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/writer_lcf.cpp b/src/writer_lcf.cpp index 81019bfde..d43a0a053 100644 --- a/src/writer_lcf.cpp +++ b/src/writer_lcf.cpp @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/writer_lcf.h b/src/writer_lcf.h index 0bd62fc51..bc070e6ae 100644 --- a/src/writer_lcf.h +++ b/src/writer_lcf.h @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/writer_xml.cpp b/src/writer_xml.cpp index fb6c4c478..917d13d0d 100644 --- a/src/writer_xml.cpp +++ b/src/writer_xml.cpp @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/src/writer_xml.h b/src/writer_xml.h index b70ffa22b..b5d235044 100644 --- a/src/writer_xml.h +++ b/src/writer_xml.h @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/tests/test_main.cpp b/tests/test_main.cpp index 310d8b6a2..822797c0a 100644 --- a/tests/test_main.cpp +++ b/tests/test_main.cpp @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. diff --git a/tests/time_stamp.cpp b/tests/time_stamp.cpp index 5142f8f58..66ab24684 100644 --- a/tests/time_stamp.cpp +++ b/tests/time_stamp.cpp @@ -1,5 +1,5 @@ /* - * This file is part of liblcf. Copyright (c) 2017 liblcf authors. + * This file is part of liblcf. Copyright (c) 2018 liblcf authors. * https://github.com/EasyRPG/liblcf - https://easyrpg.org * * liblcf is Free/Libre Open Source Software, released under the MIT License. From cd74be5620fa08787a3b238cbf089efbfe6b73ce Mon Sep 17 00:00:00 2001 From: Carsten Teibes Date: Sun, 14 Oct 2018 13:32:36 +0200 Subject: [PATCH 5/7] Update doctest to 2.0.0, moved to C++11 --- tests/doctest.h | 5943 ++++++++++++++++++++++------------------------- 1 file changed, 2762 insertions(+), 3181 deletions(-) diff --git a/tests/doctest.h b/tests/doctest.h index d998b5e8c..6f2eb1ff0 100644 --- a/tests/doctest.h +++ b/tests/doctest.h @@ -4,7 +4,7 @@ // // doctest.h - the lightest feature-rich C++ single-header testing framework for unit tests and TDD // -// Copyright (c) 2016-2017 Viktor Kirilov +// Copyright (c) 2016-2018 Viktor Kirilov // // Distributed under the MIT Software License // See accompanying file LICENSE.txt or copy at @@ -19,7 +19,7 @@ // // The library is heavily influenced by Catch - https://github.com/philsquared/Catch // which uses the Boost Software License - Version 1.0 -// see here - https://github.com/philsquared/Catch/blob/master/LICENSE_1_0.txt +// see here - https://github.com/philsquared/Catch/blob/master/LICENSE.txt // // The concept of subcases (sections in Catch) and expression decomposition are from there. // Some parts of the code are taken directly: @@ -32,114 +32,193 @@ // // The expression decomposing templates are taken from lest - https://github.com/martinmoene/lest // which uses the Boost Software License - Version 1.0 -// see here - https://github.com/martinmoene/lest/blob/master/LICENSE_1_0.txt -// -// The type list and the foreach algorithm on it for C++98 are taken from Loki -// - http://loki-lib.sourceforge.net/ -// - https://en.wikipedia.org/wiki/Loki_%28C%2B%2B%29 -// - https://github.com/snaewe/loki-lib -// which uses the MIT Software License +// see here - https://github.com/martinmoene/lest/blob/master/LICENSE.txt // // ================================================================================================= // ================================================================================================= // ================================================================================================= -// Suppress this globally (without push/pop) - there is no way to silence it in the -// expression decomposition macros _Pragma() in macros doesn't work for the c++ front-end of g++ -// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55578 -// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69543 -// Also the warning is completely worthless nowadays - http://stackoverflow.com/questions/14016993 -#if defined(__GNUC__) && !defined(__clang__) -#pragma GCC diagnostic ignored "-Waggregate-return" -#endif - -#if defined(__clang__) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wunknown-pragmas" -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" -#pragma clang diagnostic ignored "-Wweak-vtables" -#pragma clang diagnostic ignored "-Wpadded" -#pragma clang diagnostic ignored "-Wdeprecated" -#pragma clang diagnostic ignored "-Wmissing-prototypes" -#pragma clang diagnostic ignored "-Wunused-local-typedef" -#if !defined(__has_warning) || __has_warning("-Wzero-as-null-pointer-constant") -#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant" -#endif -#pragma clang diagnostic ignored "-Wc++11-long-long" -#endif // __clang__ - -#if defined(__GNUC__) && !defined(__clang__) -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6) -#pragma GCC diagnostic push -#endif // > gcc 4.6 -#pragma GCC diagnostic ignored "-Wunknown-pragmas" -#pragma GCC diagnostic ignored "-Weffc++" -#pragma GCC diagnostic ignored "-Wstrict-overflow" -#pragma GCC diagnostic ignored "-Wstrict-aliasing" -#pragma GCC diagnostic ignored "-Wctor-dtor-privacy" -#pragma GCC diagnostic ignored "-Wmissing-declarations" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" -#pragma GCC diagnostic ignored "-Winline" -#pragma GCC diagnostic ignored "-Wlong-long" -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6) -#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant" -#endif // > gcc 4.6 -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7) -#pragma GCC diagnostic ignored "-Wunused-local-typedefs" -#endif // > gcc 4.7 -#if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ > 3) -#pragma GCC diagnostic ignored "-Wuseless-cast" -#endif // > gcc 5.3 -#endif // __GNUC__ - -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable : 4996) // The compiler encountered a deprecated declaration -#pragma warning(disable : 4706) // assignment within conditional expression -#pragma warning(disable : 4512) // 'class' : assignment operator could not be generated -#pragma warning(disable : 4127) // conditional expression is constant -#endif // _MSC_VER - #ifndef DOCTEST_LIBRARY_INCLUDED #define DOCTEST_LIBRARY_INCLUDED -#define DOCTEST_VERSION_MAJOR 1 -#define DOCTEST_VERSION_MINOR 2 -#define DOCTEST_VERSION_PATCH 5 -#define DOCTEST_VERSION_STR "1.2.5" +// ================================================================================================= +// == VERSION ====================================================================================== +// ================================================================================================= + +#define DOCTEST_VERSION_MAJOR 2 +#define DOCTEST_VERSION_MINOR 0 +#define DOCTEST_VERSION_PATCH 0 +#define DOCTEST_VERSION_STR "2.0.0" #define DOCTEST_VERSION \ (DOCTEST_VERSION_MAJOR * 10000 + DOCTEST_VERSION_MINOR * 100 + DOCTEST_VERSION_PATCH) // ================================================================================================= -// == FEATURE DETECTION ============================================================================ +// == COMPILER VERSION ============================================================================= +// ================================================================================================= + +// ideas for the version stuff are taken from here: https://github.com/cxxstuff/cxx_detect + +#define DOCTEST_COMPILER(MAJOR, MINOR, PATCH) ((MAJOR)*10000000 + (MINOR)*100000 + (PATCH)) + +// GCC/Clang and GCC/MSVC are mutually exclusive, but Clang/MSVC are not because of clang-cl... +#if defined(_MSC_VER) && defined(_MSC_FULL_VER) +#if _MSC_VER == _MSC_FULL_VER / 10000 +#define DOCTEST_MSVC DOCTEST_COMPILER(_MSC_VER / 100, _MSC_VER % 100, _MSC_FULL_VER % 10000) +#else // MSVC +#define DOCTEST_MSVC \ + DOCTEST_COMPILER(_MSC_VER / 100, (_MSC_FULL_VER / 100000) % 100, _MSC_FULL_VER % 100000) +#endif // MSVC +#endif // MSVC +#if defined(__clang__) && defined(__clang_minor__) +#define DOCTEST_CLANG DOCTEST_COMPILER(__clang_major__, __clang_minor__, __clang_patchlevel__) +#elif defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__) && \ + !defined(__INTEL_COMPILER) +#define DOCTEST_GCC DOCTEST_COMPILER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) +#endif // GCC + +#ifndef DOCTEST_MSVC +#define DOCTEST_MSVC 0 +#endif // DOCTEST_MSVC +#ifndef DOCTEST_CLANG +#define DOCTEST_CLANG 0 +#endif // DOCTEST_CLANG +#ifndef DOCTEST_GCC +#define DOCTEST_GCC 0 +#endif // DOCTEST_GCC + +// ================================================================================================= +// == COMPILER WARNINGS HELPERS ==================================================================== +// ================================================================================================= + +#if DOCTEST_CLANG +#define DOCTEST_PRAGMA_TO_STR(x) _Pragma(#x) +#define DOCTEST_CLANG_SUPPRESS_WARNING_PUSH _Pragma("clang diagnostic push") +#define DOCTEST_CLANG_SUPPRESS_WARNING(w) DOCTEST_PRAGMA_TO_STR(clang diagnostic ignored w) +#define DOCTEST_CLANG_SUPPRESS_WARNING_POP _Pragma("clang diagnostic pop") +#define DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH(w) \ + DOCTEST_CLANG_SUPPRESS_WARNING_PUSH DOCTEST_CLANG_SUPPRESS_WARNING(w) +#else // DOCTEST_CLANG +#define DOCTEST_CLANG_SUPPRESS_WARNING_PUSH +#define DOCTEST_CLANG_SUPPRESS_WARNING(w) +#define DOCTEST_CLANG_SUPPRESS_WARNING_POP +#define DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH(w) +#endif // DOCTEST_CLANG + +#if DOCTEST_GCC +#define DOCTEST_PRAGMA_TO_STR(x) _Pragma(#x) +#define DOCTEST_GCC_SUPPRESS_WARNING_PUSH _Pragma("GCC diagnostic push") +#define DOCTEST_GCC_SUPPRESS_WARNING(w) DOCTEST_PRAGMA_TO_STR(GCC diagnostic ignored w) +#define DOCTEST_GCC_SUPPRESS_WARNING_POP _Pragma("GCC diagnostic pop") +#define DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH(w) \ + DOCTEST_GCC_SUPPRESS_WARNING_PUSH DOCTEST_GCC_SUPPRESS_WARNING(w) +#else // DOCTEST_GCC +#define DOCTEST_GCC_SUPPRESS_WARNING_PUSH +#define DOCTEST_GCC_SUPPRESS_WARNING(w) +#define DOCTEST_GCC_SUPPRESS_WARNING_POP +#define DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH(w) +#endif // DOCTEST_GCC + +#if DOCTEST_MSVC +#define DOCTEST_MSVC_SUPPRESS_WARNING_PUSH __pragma(warning(push)) +#define DOCTEST_MSVC_SUPPRESS_WARNING(w) __pragma(warning(disable : w)) +#define DOCTEST_MSVC_SUPPRESS_WARNING_POP __pragma(warning(pop)) +#define DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(w) \ + DOCTEST_MSVC_SUPPRESS_WARNING_PUSH DOCTEST_MSVC_SUPPRESS_WARNING(w) +#else // DOCTEST_MSVC +#define DOCTEST_MSVC_SUPPRESS_WARNING_PUSH +#define DOCTEST_MSVC_SUPPRESS_WARNING(w) +#define DOCTEST_MSVC_SUPPRESS_WARNING_POP +#define DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(w) +#endif // DOCTEST_MSVC + // ================================================================================================= +// == COMPILER WARNINGS ============================================================================ +// ================================================================================================= + +DOCTEST_CLANG_SUPPRESS_WARNING_PUSH +DOCTEST_CLANG_SUPPRESS_WARNING("-Wunknown-pragmas") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wnon-virtual-dtor") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wweak-vtables") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wpadded") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wdeprecated") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-prototypes") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wunused-local-typedef") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wc++98-compat") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wc++98-compat-pedantic") + +DOCTEST_GCC_SUPPRESS_WARNING_PUSH +DOCTEST_GCC_SUPPRESS_WARNING("-Wunknown-pragmas") +DOCTEST_GCC_SUPPRESS_WARNING("-Wpragmas") +DOCTEST_GCC_SUPPRESS_WARNING("-Weffc++") +DOCTEST_GCC_SUPPRESS_WARNING("-Wstrict-overflow") +DOCTEST_GCC_SUPPRESS_WARNING("-Wstrict-aliasing") +DOCTEST_GCC_SUPPRESS_WARNING("-Wctor-dtor-privacy") +DOCTEST_GCC_SUPPRESS_WARNING("-Wmissing-declarations") +DOCTEST_GCC_SUPPRESS_WARNING("-Wnon-virtual-dtor") +DOCTEST_GCC_SUPPRESS_WARNING("-Winline") +DOCTEST_GCC_SUPPRESS_WARNING("-Wunused-local-typedefs") +DOCTEST_GCC_SUPPRESS_WARNING("-Wuseless-cast") + +DOCTEST_MSVC_SUPPRESS_WARNING_PUSH +DOCTEST_MSVC_SUPPRESS_WARNING(4616) // invalid compiler warning +DOCTEST_MSVC_SUPPRESS_WARNING(4619) // invalid compiler warning +DOCTEST_MSVC_SUPPRESS_WARNING(4996) // The compiler encountered a deprecated declaration +DOCTEST_MSVC_SUPPRESS_WARNING(4706) // assignment within conditional expression +DOCTEST_MSVC_SUPPRESS_WARNING(4512) // 'class' : assignment operator could not be generated +DOCTEST_MSVC_SUPPRESS_WARNING(4127) // conditional expression is constant +DOCTEST_MSVC_SUPPRESS_WARNING(4820) // padding +DOCTEST_MSVC_SUPPRESS_WARNING(4625) // copy constructor was implicitly defined as deleted +DOCTEST_MSVC_SUPPRESS_WARNING(4626) // assignment operator was implicitly defined as deleted +DOCTEST_MSVC_SUPPRESS_WARNING(5027) // move assignment operator was implicitly defined as deleted +DOCTEST_MSVC_SUPPRESS_WARNING(5026) // move constructor was implicitly defined as deleted +DOCTEST_MSVC_SUPPRESS_WARNING(4623) // default constructor was implicitly defined as deleted +DOCTEST_MSVC_SUPPRESS_WARNING(4640) // construction of local static object is not thread-safe +// static analysis +DOCTEST_MSVC_SUPPRESS_WARNING(26439) // This kind of function may not throw. Declare it 'noexcept' +DOCTEST_MSVC_SUPPRESS_WARNING(26495) // Always initialize a member variable +DOCTEST_MSVC_SUPPRESS_WARNING(26451) // Arithmetic overflow ... +DOCTEST_MSVC_SUPPRESS_WARNING(26444) // Avoid unnamed objects with custom construction and dtr... + +// 4548 - expression before comma has no effect; expected expression with side - effect +// 4265 - class has virtual functions, but destructor is not virtual +// 4986 - exception specification does not match previous declaration +// 4350 - behavior change: 'member1' called instead of 'member2' +// 4668 - 'x' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' +// 4365 - conversion from 'int' to 'unsigned long', signed/unsigned mismatch +// 4774 - format string expected in argument 'x' is not a string literal +// 4820 - padding in structs + +// only 4 should be disabled globally: +// - 4514 # unreferenced inline function has been removed +// - 4571 # SEH related +// - 4710 # function not inlined +// - 4711 # function 'x' selected for automatic inline expansion + +#define DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN \ + DOCTEST_MSVC_SUPPRESS_WARNING_PUSH \ + DOCTEST_MSVC_SUPPRESS_WARNING(4548) \ + DOCTEST_MSVC_SUPPRESS_WARNING(4265) \ + DOCTEST_MSVC_SUPPRESS_WARNING(4986) \ + DOCTEST_MSVC_SUPPRESS_WARNING(4350) \ + DOCTEST_MSVC_SUPPRESS_WARNING(4668) \ + DOCTEST_MSVC_SUPPRESS_WARNING(4365) \ + DOCTEST_MSVC_SUPPRESS_WARNING(4774) \ + DOCTEST_MSVC_SUPPRESS_WARNING(4820) \ + DOCTEST_MSVC_SUPPRESS_WARNING(4625) \ + DOCTEST_MSVC_SUPPRESS_WARNING(4626) \ + DOCTEST_MSVC_SUPPRESS_WARNING(5027) \ + DOCTEST_MSVC_SUPPRESS_WARNING(5026) \ + DOCTEST_MSVC_SUPPRESS_WARNING(4623) \ + DOCTEST_MSVC_SUPPRESS_WARNING(5039) + +#define DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_END DOCTEST_MSVC_SUPPRESS_WARNING_POP -#if __cplusplus >= 201103L -#ifndef DOCTEST_CONFIG_WITH_DELETED_FUNCTIONS -#define DOCTEST_CONFIG_WITH_DELETED_FUNCTIONS -#endif // DOCTEST_CONFIG_WITH_DELETED_FUNCTIONS -#ifndef DOCTEST_CONFIG_WITH_RVALUE_REFERENCES -#define DOCTEST_CONFIG_WITH_RVALUE_REFERENCES -#endif // DOCTEST_CONFIG_WITH_RVALUE_REFERENCES -#ifndef DOCTEST_CONFIG_WITH_NULLPTR -#define DOCTEST_CONFIG_WITH_NULLPTR -#endif // DOCTEST_CONFIG_WITH_NULLPTR -#ifndef DOCTEST_CONFIG_WITH_LONG_LONG -#define DOCTEST_CONFIG_WITH_LONG_LONG -#endif // DOCTEST_CONFIG_WITH_LONG_LONG -#ifndef DOCTEST_CONFIG_WITH_STATIC_ASSERT -#define DOCTEST_CONFIG_WITH_STATIC_ASSERT -#endif // DOCTEST_CONFIG_WITH_STATIC_ASSERT -#ifndef DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#endif // __cplusplus >= 201103L - -#ifndef __has_feature -#define __has_feature(x) 0 -#endif // __has_feature +// ================================================================================================= +// == FEATURE DETECTION ============================================================================ +// ================================================================================================= +// general compiler feature support table: https://en.cppreference.com/w/cpp/compiler_support // MSVC C++11 feature support table: https://msdn.microsoft.com/en-us/library/hh567368.aspx // GCC C++11 feature support table: https://gcc.gnu.org/projects/cxx-status.html // MSVC version table: @@ -151,131 +230,9 @@ // MSVC++ 9.0 _MSC_VER == 1500 (Visual Studio 2008) // MSVC++ 8.0 _MSC_VER == 1400 (Visual Studio 2005) -// deleted functions - -#ifndef DOCTEST_CONFIG_WITH_DELETED_FUNCTIONS -#if defined(_MSC_VER) && (_MSC_VER >= 1800) -#define DOCTEST_CONFIG_WITH_DELETED_FUNCTIONS -#endif // _MSC_VER -#if defined(__clang__) && __has_feature(cxx_deleted_functions) -#define DOCTEST_CONFIG_WITH_DELETED_FUNCTIONS -#endif // __clang__ -#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 4) || __GNUC__ > 4) && \ - defined(__GXX_EXPERIMENTAL_CXX0X__) -#define DOCTEST_CONFIG_WITH_DELETED_FUNCTIONS -#endif // __GNUC__ -#endif // DOCTEST_CONFIG_WITH_DELETED_FUNCTIONS - -#if defined(DOCTEST_CONFIG_NO_DELETED_FUNCTIONS) && defined(DOCTEST_CONFIG_WITH_DELETED_FUNCTIONS) -#undef DOCTEST_CONFIG_WITH_DELETED_FUNCTIONS -#endif // DOCTEST_CONFIG_NO_DELETED_FUNCTIONS - -// rvalue references - -#ifndef DOCTEST_CONFIG_WITH_RVALUE_REFERENCES -#if defined(_MSC_VER) && (_MSC_VER >= 1600) -#define DOCTEST_CONFIG_WITH_RVALUE_REFERENCES -#endif // _MSC_VER -#if defined(__clang__) && __has_feature(cxx_rvalue_references) -#define DOCTEST_CONFIG_WITH_RVALUE_REFERENCES -#endif // __clang__ -#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4) && \ - defined(__GXX_EXPERIMENTAL_CXX0X__) -#define DOCTEST_CONFIG_WITH_RVALUE_REFERENCES -#endif // __GNUC__ -#endif // DOCTEST_CONFIG_WITH_RVALUE_REFERENCES - -#if defined(DOCTEST_CONFIG_NO_RVALUE_REFERENCES) && defined(DOCTEST_CONFIG_WITH_RVALUE_REFERENCES) -#undef DOCTEST_CONFIG_WITH_RVALUE_REFERENCES -#endif // DOCTEST_CONFIG_NO_RVALUE_REFERENCES - -// nullptr - -#ifndef DOCTEST_CONFIG_WITH_NULLPTR -#if defined(__clang__) && __has_feature(cxx_nullptr) -#define DOCTEST_CONFIG_WITH_NULLPTR -#endif // __clang__ -#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4) && \ - defined(__GXX_EXPERIMENTAL_CXX0X__) -#define DOCTEST_CONFIG_WITH_NULLPTR -#endif // __GNUC__ -#if defined(_MSC_VER) && (_MSC_VER >= 1600) // MSVC 2010 -#define DOCTEST_CONFIG_WITH_NULLPTR -#endif // _MSC_VER -#endif // DOCTEST_CONFIG_WITH_NULLPTR - -#if defined(DOCTEST_CONFIG_NO_NULLPTR) && defined(DOCTEST_CONFIG_WITH_NULLPTR) -#undef DOCTEST_CONFIG_WITH_NULLPTR -#endif // DOCTEST_CONFIG_NO_NULLPTR - -// variadic macros - -#ifndef DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#if defined(_MSC_VER) && _MSC_VER > 1400 && !defined(__EDGE__) -#define DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#endif // _MSC_VER -#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || __GNUC__ > 4) && \ - defined(__GXX_EXPERIMENTAL_CXX0X__) -#define DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#endif // __GNUC__ and clang -#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS - -#if defined(DOCTEST_CONFIG_NO_VARIADIC_MACROS) && defined(DOCTEST_CONFIG_WITH_VARIADIC_MACROS) -#undef DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#endif // DOCTEST_CONFIG_NO_VARIADIC_MACROS - -// long long - -#ifndef DOCTEST_CONFIG_WITH_LONG_LONG -#if defined(_MSC_VER) && (_MSC_VER >= 1400) -#define DOCTEST_CONFIG_WITH_LONG_LONG -#endif // _MSC_VER -#if(defined(__clang__) || \ - (defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 5) || __GNUC__ > 4))) && \ - defined(__GXX_EXPERIMENTAL_CXX0X__) -#define DOCTEST_CONFIG_WITH_LONG_LONG -#endif // __GNUC__ and clang -#endif // DOCTEST_CONFIG_WITH_LONG_LONG - -#if defined(DOCTEST_CONFIG_NO_LONG_LONG) && defined(DOCTEST_CONFIG_WITH_LONG_LONG) -#undef DOCTEST_CONFIG_WITH_LONG_LONG -#endif // DOCTEST_CONFIG_NO_LONG_LONG - -// static_assert - -#ifndef DOCTEST_CONFIG_WITH_STATIC_ASSERT -#if defined(__clang__) && __has_feature(cxx_static_assert) -#define DOCTEST_CONFIG_WITH_STATIC_ASSERT -#endif // __clang__ -#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4) && \ - defined(__GXX_EXPERIMENTAL_CXX0X__) -#define DOCTEST_CONFIG_WITH_STATIC_ASSERT -#endif // __GNUC__ -#if defined(_MSC_VER) && (_MSC_VER >= 1600) // MSVC 2010 -#define DOCTEST_CONFIG_WITH_STATIC_ASSERT -#endif // _MSC_VER -#endif // DOCTEST_CONFIG_WITH_STATIC_ASSERT - -#if defined(DOCTEST_CONFIG_NO_STATIC_ASSERT) && defined(DOCTEST_CONFIG_WITH_STATIC_ASSERT) -#undef DOCTEST_CONFIG_WITH_STATIC_ASSERT -#endif // DOCTEST_CONFIG_NO_STATIC_ASSERT - -// other stuff... - -#if defined(DOCTEST_CONFIG_WITH_RVALUE_REFERENCES) || defined(DOCTEST_CONFIG_WITH_LONG_LONG) || \ - defined(DOCTEST_CONFIG_WITH_DELETED_FUNCTIONS) || defined(DOCTEST_CONFIG_WITH_NULLPTR) || \ - defined(DOCTEST_CONFIG_WITH_VARIADIC_MACROS) || defined(DOCTEST_CONFIG_WITH_STATIC_ASSERT) -#define DOCTEST_NO_CPP11_COMPAT -#endif // c++11 stuff - -#if defined(__clang__) && defined(DOCTEST_NO_CPP11_COMPAT) -#pragma clang diagnostic ignored "-Wc++98-compat" -#pragma clang diagnostic ignored "-Wc++98-compat-pedantic" -#endif // __clang__ && DOCTEST_NO_CPP11_COMPAT - -#if defined(_MSC_VER) && !defined(DOCTEST_CONFIG_WINDOWS_SEH) +#if DOCTEST_MSVC && !defined(DOCTEST_CONFIG_WINDOWS_SEH) #define DOCTEST_CONFIG_WINDOWS_SEH -#endif // _MSC_VER +#endif // MSVC #if defined(DOCTEST_CONFIG_NO_WINDOWS_SEH) && defined(DOCTEST_CONFIG_WINDOWS_SEH) #undef DOCTEST_CONFIG_WINDOWS_SEH #endif // DOCTEST_CONFIG_NO_WINDOWS_SEH @@ -288,11 +245,12 @@ #endif // DOCTEST_CONFIG_NO_POSIX_SIGNALS #ifndef DOCTEST_CONFIG_NO_EXCEPTIONS -#if defined(__GNUC__) && !defined(__EXCEPTIONS) +#if(DOCTEST_GCC || (DOCTEST_CLANG && !DOCTEST_MSVC)) && !defined(__EXCEPTIONS) #define DOCTEST_CONFIG_NO_EXCEPTIONS #endif // clang and gcc -// in MSVC _HAS_EXCEPTIONS is defined in a header instead of as a project define -// so we can't do the automatic detection for MSVC without including some header +#if DOCTEST_MSVC && (defined(_HAS_EXCEPTIONS) && _HAS_EXCEPTIONS == 0) +#define DOCTEST_CONFIG_NO_EXCEPTIONS +#endif // MSVC #endif // DOCTEST_CONFIG_NO_EXCEPTIONS #ifdef DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS @@ -309,14 +267,14 @@ #define DOCTEST_CONFIG_IMPLEMENT #endif // DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN -#if defined _WIN32 || defined __CYGWIN__ -#ifdef __GNUC__ -#define DOCTEST_SYMBOL_EXPORT __attribute__((dllexport)) -#define DOCTEST_SYMBOL_IMPORT __attribute__((dllimport)) -#else // __GNUC__ +#if defined(_WIN32) || defined(__CYGWIN__) +#if DOCTEST_MSVC #define DOCTEST_SYMBOL_EXPORT __declspec(dllexport) #define DOCTEST_SYMBOL_IMPORT __declspec(dllimport) -#endif // __GNUC__ +#else // MSVC +#define DOCTEST_SYMBOL_EXPORT __attribute__((dllexport)) +#define DOCTEST_SYMBOL_IMPORT __attribute__((dllimport)) +#endif // MSVC #else // _WIN32 #define DOCTEST_SYMBOL_EXPORT __attribute__((visibility("default"))) #define DOCTEST_SYMBOL_IMPORT @@ -332,11 +290,15 @@ #define DOCTEST_INTERFACE #endif // DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL -#ifdef _MSC_VER +#if DOCTEST_MSVC #define DOCTEST_NOINLINE __declspec(noinline) -#else // _MSC_VER +#define DOCTEST_UNUSED +#define DOCTEST_ALIGNMENT(x) +#else // MSVC #define DOCTEST_NOINLINE __attribute__((noinline)) -#endif // _MSC_VER +#define DOCTEST_UNUSED __attribute__((unused)) +#define DOCTEST_ALIGNMENT(x) __attribute__((aligned(x))) +#endif // MSVC #ifndef DOCTEST_CONFIG_NUM_CAPTURES_ON_STACK #define DOCTEST_CONFIG_NUM_CAPTURES_ON_STACK 5 @@ -355,21 +317,6 @@ #define DOCTEST_ANONYMOUS(x) DOCTEST_CAT(x, __LINE__) #endif // __COUNTER__ -// macro for making a string out of an identifier -#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_TOSTR_IMPL(...) #__VA_ARGS__ -#define DOCTEST_TOSTR(...) DOCTEST_TOSTR_IMPL(__VA_ARGS__) -#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_TOSTR_IMPL(x) #x -#define DOCTEST_TOSTR(x) DOCTEST_TOSTR_IMPL(x) -#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS - -// for concatenating literals and making the result a string -#define DOCTEST_STR_CONCAT_TOSTR(s1, s2) DOCTEST_TOSTR(s1) DOCTEST_TOSTR(s2) - -// counts the number of elements in a C string -#define DOCTEST_COUNTOF(x) (sizeof(x) / sizeof(x[0])) - #ifndef DOCTEST_CONFIG_ASSERTION_PARAMETERS_BY_VALUE #define DOCTEST_REF_WRAP(x) x& #else // DOCTEST_CONFIG_ASSERTION_PARAMETERS_BY_VALUE @@ -381,29 +328,28 @@ #define DOCTEST_PLATFORM_MAC #elif defined(__IPHONE_OS_VERSION_MIN_REQUIRED) #define DOCTEST_PLATFORM_IPHONE -#elif defined(_WIN32) || defined(_MSC_VER) +#elif defined(_WIN32) #define DOCTEST_PLATFORM_WINDOWS -#else +#else // DOCTEST_PLATFORM #define DOCTEST_PLATFORM_LINUX -#endif +#endif // DOCTEST_PLATFORM + +// clang-format off +#define DOCTEST_DELETE_COPIES(type) type(const type&) = delete; type& operator=(const type&) = delete +#define DOCTEST_DECLARE_COPIES(type) type(const type&); type& operator=(const type&) +#define DOCTEST_DEFINE_COPIES(type) type::type(const type&) = default; type& type::operator=(const type&) = default +#define DOCTEST_DECLARE_DEFAULTS(type) type(); ~type() +#define DOCTEST_DEFINE_DEFAULTS(type) type::type() = default; type::~type() = default +// clang-format on -#if defined(__clang__) #define DOCTEST_GLOBAL_NO_WARNINGS(var) \ - _Pragma("clang diagnostic push") \ - _Pragma("clang diagnostic ignored \"-Wglobal-constructors\"") static int var -#define DOCTEST_GLOBAL_NO_WARNINGS_END() _Pragma("clang diagnostic pop") -#elif defined(__GNUC__) -#define DOCTEST_GLOBAL_NO_WARNINGS(var) static int var __attribute__((unused)) -#define DOCTEST_GLOBAL_NO_WARNINGS_END() -#else // MSVC / other -#define DOCTEST_GLOBAL_NO_WARNINGS(var) static int var -#define DOCTEST_GLOBAL_NO_WARNINGS_END() -#endif // MSVC / other + DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wglobal-constructors") static int var DOCTEST_UNUSED +#define DOCTEST_GLOBAL_NO_WARNINGS_END() DOCTEST_CLANG_SUPPRESS_WARNING_POP // should probably take a look at https://github.com/scottt/debugbreak #ifdef DOCTEST_PLATFORM_MAC #define DOCTEST_BREAK_INTO_DEBUGGER() __asm__("int $3\n" : :) -#elif defined(_MSC_VER) +#elif DOCTEST_MSVC #define DOCTEST_BREAK_INTO_DEBUGGER() __debugbreak() #elif defined(__MINGW32__) extern "C" __declspec(dllimport) void __stdcall DebugBreak(); @@ -412,19 +358,20 @@ extern "C" __declspec(dllimport) void __stdcall DebugBreak(); #define DOCTEST_BREAK_INTO_DEBUGGER() ((void)0) #endif // linux -#ifdef __clang__ +#if DOCTEST_CLANG // to detect if libc++ is being used with clang (the _LIBCPP_VERSION identifier) #include -#endif // __clang__ +#endif // clang -#ifdef _LIBCPP_VERSION +// Forward declaring 'X' in namespace std is not permitted by the C++ Standard. +DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4643) + +#if defined(_LIBCPP_VERSION) || defined(DOCTEST_CONFIG_USE_IOSFWD) // not forward declaring ostream for libc++ because I had some problems (inline namespaces vs c++98) // so the header is used - also it is very light and doesn't drag a ton of stuff #include -#else // _LIBCPP_VERSION -#ifndef DOCTEST_CONFIG_USE_IOSFWD -namespace std -{ +#else // _LIBCPP_VERSION +namespace std { template struct char_traits; template <> @@ -433,93 +380,26 @@ template class basic_ostream; typedef basic_ostream > ostream; } // namespace std -#else // DOCTEST_CONFIG_USE_IOSFWD -#include -#endif // DOCTEST_CONFIG_USE_IOSFWD -#endif // _LIBCPP_VERSION - -// static assert macro - because of the c++98 support requires that the message is an -// identifier (no spaces and not a C string) - example without quotes: I_am_a_message -// taken from here: http://stackoverflow.com/a/1980156/3162383 -#ifdef DOCTEST_CONFIG_WITH_STATIC_ASSERT -#define DOCTEST_STATIC_ASSERT(expression, message) static_assert(expression, #message) -#else // DOCTEST_CONFIG_WITH_STATIC_ASSERT -#define DOCTEST_STATIC_ASSERT(expression, message) \ - struct DOCTEST_CAT(__static_assertion_at_line_, __LINE__) \ - { \ - doctest::detail::static_assert_impl::StaticAssertion((expression))> \ - DOCTEST_CAT(DOCTEST_CAT(DOCTEST_CAT(STATIC_ASSERTION_FAILED_AT_LINE_, __LINE__), \ - _), \ - message); \ - }; \ - typedef doctest::detail::static_assert_impl::StaticAssertionTest( \ - sizeof(DOCTEST_CAT(__static_assertion_at_line_, __LINE__)))> \ - DOCTEST_CAT(__static_assertion_test_at_line_, __LINE__) -#endif // DOCTEST_CONFIG_WITH_STATIC_ASSERT +#endif // _LIBCPP_VERSION || DOCTEST_CONFIG_USE_IOSFWD -#ifdef DOCTEST_CONFIG_WITH_NULLPTR #ifdef _LIBCPP_VERSION #include #else // _LIBCPP_VERSION -namespace std -{ +namespace std { typedef decltype(nullptr) nullptr_t; } #endif // _LIBCPP_VERSION -#endif // DOCTEST_CONFIG_WITH_NULLPTR -#ifndef DOCTEST_CONFIG_DISABLE +DOCTEST_MSVC_SUPPRESS_WARNING_POP #ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS #include #endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS -namespace doctest -{ -namespace detail -{ - struct TestSuite - { - const char* m_test_suite; - const char* m_description; - bool m_skip; - bool m_may_fail; - bool m_should_fail; - int m_expected_failures; - double m_timeout; - - TestSuite& operator*(const char* in) { - m_test_suite = in; - // clear state - m_description = 0; - m_skip = false; - m_may_fail = false; - m_should_fail = false; - m_expected_failures = 0; - m_timeout = 0; - return *this; - } - - template - TestSuite& operator*(const T& in) { - in.fill(*this); - return *this; - } - }; -} // namespace detail -} // namespace doctest - -// in a separate namespace outside of doctest because the DOCTEST_TEST_SUITE macro -// introduces an anonymous namespace in which getCurrentTestSuite gets overridden -namespace doctest_detail_test_suite_ns -{ -DOCTEST_INTERFACE doctest::detail::TestSuite& getCurrentTestSuite(); -} // namespace doctest_detail_test_suite_ns +namespace doctest { -#endif // DOCTEST_CONFIG_DISABLE +DOCTEST_INTERFACE extern bool is_running_in_test; -namespace doctest -{ // A 24 byte string class (can be as small as 17 for x64 and 13 for x86) that can hold strings with length // of up to 23 chars on the stack before going on the heap - the last byte of the buffer is used for: // - "is small" bit - the highest bit - if "0" then it is small - otherwise its "1" (128) @@ -558,56 +438,31 @@ class DOCTEST_INTERFACE String view data; }; - void copy(const String& other); + bool isOnStack() const { return (buf[last] & 128) == 0; } + void setOnHeap(); + void setLast(unsigned in = last); - void setOnHeap() { *reinterpret_cast(&buf[last]) = 128; } - void setLast(unsigned in = last) { buf[last] = char(in); } + void copy(const String& other); public: - String() { - buf[0] = '\0'; - setLast(); - } + String(); + ~String(); String(const char* in); - String(const String& other) { copy(other); } + String(const String& other); + String& operator=(const String& other); - ~String() { - if(!isOnStack()) - delete[] data.ptr; - } - - // GCC 4.9/5/6 report Wstrict-overflow when optimizations are ON and it got inlined in the vector class somewhere... - // see commit 574ef95f0cd379118be5011704664e4b5351f1e0 and build https://travis-ci.org/onqtam/doctest/builds/230671611 - DOCTEST_NOINLINE String& operator=(const String& other) { - if(this != &other) { - if(!isOnStack()) - delete[] data.ptr; - - copy(other); - } - - return *this; - } String& operator+=(const String& other); + String operator+(const String& other) const; - String operator+(const String& other) const { return String(*this) += other; } - -#ifdef DOCTEST_CONFIG_WITH_RVALUE_REFERENCES String(String&& other); String& operator=(String&& other); -#endif // DOCTEST_CONFIG_WITH_RVALUE_REFERENCES - - bool isOnStack() const { return (buf[last] & 128) == 0; } - char operator[](unsigned i) const { return const_cast(this)->operator[](i); } // NOLINT - char& operator[](unsigned i) { - if(isOnStack()) - return reinterpret_cast(buf)[i]; - return data.ptr[i]; - } + char operator[](unsigned i) const; + char& operator[](unsigned i); + // the only functions I'm willing to leave in the interface - available for inlining const char* c_str() const { return const_cast(this)->c_str(); } // NOLINT char* c_str() { if(isOnStack()) @@ -615,51 +470,281 @@ class DOCTEST_INTERFACE String return data.ptr; } - unsigned size() const { - if(isOnStack()) - return last - (unsigned(buf[last]) & 31); // using "last" would work only if "len" is 32 - return data.size; - } - - unsigned capacity() const { - if(isOnStack()) - return len; - return data.capacity; - } + unsigned size() const; + unsigned capacity() const; int compare(const char* other, bool no_case = false) const; int compare(const String& other, bool no_case = false) const; }; -// clang-format off -inline bool operator==(const String& lhs, const String& rhs) { return lhs.compare(rhs) == 0; } -inline bool operator!=(const String& lhs, const String& rhs) { return lhs.compare(rhs) != 0; } -inline bool operator< (const String& lhs, const String& rhs) { return lhs.compare(rhs) < 0; } -inline bool operator> (const String& lhs, const String& rhs) { return lhs.compare(rhs) > 0; } -inline bool operator<=(const String& lhs, const String& rhs) { return (lhs != rhs) ? lhs.compare(rhs) < 0 : true; } -inline bool operator>=(const String& lhs, const String& rhs) { return (lhs != rhs) ? lhs.compare(rhs) > 0 : true; } -// clang-format on +DOCTEST_INTERFACE bool operator==(const String& lhs, const String& rhs); +DOCTEST_INTERFACE bool operator!=(const String& lhs, const String& rhs); +DOCTEST_INTERFACE bool operator<(const String& lhs, const String& rhs); +DOCTEST_INTERFACE bool operator>(const String& lhs, const String& rhs); +DOCTEST_INTERFACE bool operator<=(const String& lhs, const String& rhs); +DOCTEST_INTERFACE bool operator>=(const String& lhs, const String& rhs); -DOCTEST_INTERFACE std::ostream& operator<<(std::ostream& stream, const String& in); +DOCTEST_INTERFACE std::ostream& operator<<(std::ostream& s, const String& in); -namespace detail -{ -#ifndef DOCTEST_CONFIG_WITH_STATIC_ASSERT - namespace static_assert_impl +namespace Color { + enum Enum + { + None = 0, + White, + Red, + Green, + Blue, + Cyan, + Yellow, + Grey, + + Bright = 0x10, + + BrightRed = Bright | Red, + BrightGreen = Bright | Green, + LightGrey = Bright | Grey, + BrightWhite = Bright | White + }; + + DOCTEST_INTERFACE std::ostream& operator<<(std::ostream& s, Color::Enum code); +} // namespace Color + +namespace assertType { + enum Enum { - template - struct StaticAssertion; + // macro traits + + is_warn = 1, + is_check = 2, + is_require = 4, + + is_normal = 8, + is_throws = 16, + is_throws_as = 32, + is_nothrow = 64, + + is_fast = 128, // not checked anywhere - used just to distinguish the types + is_false = 256, + is_unary = 512, + + is_eq = 1024, + is_ne = 2048, + + is_lt = 4096, + is_gt = 8192, + + is_ge = 16384, + is_le = 32768, + + // macro types + + DT_WARN = is_normal | is_warn, + DT_CHECK = is_normal | is_check, + DT_REQUIRE = is_normal | is_require, + + DT_WARN_FALSE = is_normal | is_false | is_warn, + DT_CHECK_FALSE = is_normal | is_false | is_check, + DT_REQUIRE_FALSE = is_normal | is_false | is_require, + + DT_WARN_THROWS = is_throws | is_warn, + DT_CHECK_THROWS = is_throws | is_check, + DT_REQUIRE_THROWS = is_throws | is_require, + + DT_WARN_THROWS_AS = is_throws_as | is_warn, + DT_CHECK_THROWS_AS = is_throws_as | is_check, + DT_REQUIRE_THROWS_AS = is_throws_as | is_require, + + DT_WARN_NOTHROW = is_nothrow | is_warn, + DT_CHECK_NOTHROW = is_nothrow | is_check, + DT_REQUIRE_NOTHROW = is_nothrow | is_require, + + DT_WARN_EQ = is_normal | is_eq | is_warn, + DT_CHECK_EQ = is_normal | is_eq | is_check, + DT_REQUIRE_EQ = is_normal | is_eq | is_require, + + DT_WARN_NE = is_normal | is_ne | is_warn, + DT_CHECK_NE = is_normal | is_ne | is_check, + DT_REQUIRE_NE = is_normal | is_ne | is_require, + + DT_WARN_GT = is_normal | is_gt | is_warn, + DT_CHECK_GT = is_normal | is_gt | is_check, + DT_REQUIRE_GT = is_normal | is_gt | is_require, + + DT_WARN_LT = is_normal | is_lt | is_warn, + DT_CHECK_LT = is_normal | is_lt | is_check, + DT_REQUIRE_LT = is_normal | is_lt | is_require, + + DT_WARN_GE = is_normal | is_ge | is_warn, + DT_CHECK_GE = is_normal | is_ge | is_check, + DT_REQUIRE_GE = is_normal | is_ge | is_require, + + DT_WARN_LE = is_normal | is_le | is_warn, + DT_CHECK_LE = is_normal | is_le | is_check, + DT_REQUIRE_LE = is_normal | is_le | is_require, + + DT_WARN_UNARY = is_normal | is_unary | is_warn, + DT_CHECK_UNARY = is_normal | is_unary | is_check, + DT_REQUIRE_UNARY = is_normal | is_unary | is_require, + + DT_WARN_UNARY_FALSE = is_normal | is_false | is_unary | is_warn, + DT_CHECK_UNARY_FALSE = is_normal | is_false | is_unary | is_check, + DT_REQUIRE_UNARY_FALSE = is_normal | is_false | is_unary | is_require, + + DT_FAST_WARN_EQ = is_normal | is_fast | is_eq | is_warn, + DT_FAST_CHECK_EQ = is_normal | is_fast | is_eq | is_check, + DT_FAST_REQUIRE_EQ = is_normal | is_fast | is_eq | is_require, + DT_FAST_WARN_NE = is_normal | is_fast | is_ne | is_warn, + DT_FAST_CHECK_NE = is_normal | is_fast | is_ne | is_check, + DT_FAST_REQUIRE_NE = is_normal | is_fast | is_ne | is_require, + + DT_FAST_WARN_GT = is_normal | is_fast | is_gt | is_warn, + DT_FAST_CHECK_GT = is_normal | is_fast | is_gt | is_check, + DT_FAST_REQUIRE_GT = is_normal | is_fast | is_gt | is_require, - template <> - struct StaticAssertion - {}; + DT_FAST_WARN_LT = is_normal | is_fast | is_lt | is_warn, + DT_FAST_CHECK_LT = is_normal | is_fast | is_lt | is_check, + DT_FAST_REQUIRE_LT = is_normal | is_fast | is_lt | is_require, - template - struct StaticAssertionTest - {}; - } // namespace static_assert_impl -#endif // DOCTEST_CONFIG_WITH_STATIC_ASSERT + DT_FAST_WARN_GE = is_normal | is_fast | is_ge | is_warn, + DT_FAST_CHECK_GE = is_normal | is_fast | is_ge | is_check, + DT_FAST_REQUIRE_GE = is_normal | is_fast | is_ge | is_require, + DT_FAST_WARN_LE = is_normal | is_fast | is_le | is_warn, + DT_FAST_CHECK_LE = is_normal | is_fast | is_le | is_check, + DT_FAST_REQUIRE_LE = is_normal | is_fast | is_le | is_require, + + DT_FAST_WARN_UNARY = is_normal | is_fast | is_unary | is_warn, + DT_FAST_CHECK_UNARY = is_normal | is_fast | is_unary | is_check, + DT_FAST_REQUIRE_UNARY = is_normal | is_fast | is_unary | is_require, + + DT_FAST_WARN_UNARY_FALSE = is_normal | is_fast | is_false | is_unary | is_warn, + DT_FAST_CHECK_UNARY_FALSE = is_normal | is_fast | is_false | is_unary | is_check, + DT_FAST_REQUIRE_UNARY_FALSE = is_normal | is_fast | is_false | is_unary | is_require + }; +} // namespace assertType + +DOCTEST_INTERFACE const char* assertString(assertType::Enum at); +DOCTEST_INTERFACE const char* failureString(assertType::Enum at); +DOCTEST_INTERFACE const char* removePathFromFilename(const char* file); + +struct DOCTEST_INTERFACE TestCaseData +{ + const char* m_file; // the file in which the test was registered + unsigned m_line; // the line where the test was registered + const char* m_name; // name of the test case + const char* m_test_suite; // the test suite in which the test was added + const char* m_description; + bool m_skip; + bool m_may_fail; + bool m_should_fail; + int m_expected_failures; + double m_timeout; + + DOCTEST_DECLARE_DEFAULTS(TestCaseData); + DOCTEST_DECLARE_COPIES(TestCaseData); +}; + +struct DOCTEST_INTERFACE AssertData +{ + // common - for all asserts + const TestCaseData* m_test_case; + assertType::Enum m_at; + const char* m_file; + int m_line; + const char* m_expr; + bool m_failed; + + // exception-related - for all asserts + bool m_threw; + String m_exception; + + // for normal asserts + String m_decomp; + + // for specific exception-related asserts + bool m_threw_as; + const char* m_exception_type; + + DOCTEST_DECLARE_DEFAULTS(AssertData); + DOCTEST_DELETE_COPIES(AssertData); +}; + +struct DOCTEST_INTERFACE MessageData +{ + String m_string; + const char* m_file; + int m_line; + assertType::Enum m_severity; + + DOCTEST_DECLARE_DEFAULTS(MessageData); + DOCTEST_DELETE_COPIES(MessageData); +}; + +struct DOCTEST_INTERFACE SubcaseSignature +{ + const char* m_name; + const char* m_file; + int m_line; + + SubcaseSignature(const char* name, const char* file, int line); + + bool operator<(const SubcaseSignature& other) const; + + DOCTEST_DECLARE_DEFAULTS(SubcaseSignature); + DOCTEST_DECLARE_COPIES(SubcaseSignature); +}; + +struct DOCTEST_INTERFACE IContextScope +{ + DOCTEST_DELETE_COPIES(IContextScope); + + IContextScope(); + virtual ~IContextScope(); + virtual void stringify(std::ostream*) const = 0; +}; + +struct ContextOptions //!OCLINT too many fields +{ + // == parameters from the command line + String order_by; // how tests should be ordered + unsigned rand_seed; // the seed for rand ordering + + unsigned first; // the first (matching) test to be executed + unsigned last; // the last (matching) test to be executed + + int abort_after; // stop tests after this many failed assertions + int subcase_filter_levels; // apply the subcase filters for the first N levels + + bool success; // include successful assertions in output + bool case_sensitive; // if filtering should be case sensitive + bool exit; // if the program should be exited after the tests are ran/whatever + bool duration; // print the time duration of each test case + bool no_throw; // to skip exceptions-related assertion macros + bool no_exitcode; // if the framework should return 0 as the exitcode + bool no_run; // to not run the tests at all (can be done with an "*" exclude) + bool no_version; // to not print the version of the framework + bool no_colors; // if output to the console should be colorized + bool force_colors; // forces the use of colors even when a tty cannot be detected + bool no_breaks; // to not break into the debugger + bool no_skip; // don't skip test cases which are marked to be skipped + bool gnu_file_line; // if line numbers should be surrounded with :x: and not (x): + bool no_path_in_filenames; // if the path to files should be removed from the output + bool no_line_numbers; // if source code line numbers should be omitted from the output + bool no_skipped_summary; // don't print "skipped" in the summary !!! UNDOCUMENTED !!! + + bool help; // to print the help + bool version; // to print the version + bool count; // if only the count of matching tests is to be retreived + bool list_test_cases; // to list all tests matching the filters + bool list_test_suites; // to list all suites matching the filters + bool list_reporters; // lists all registered reporters + + DOCTEST_DECLARE_DEFAULTS(ContextOptions); + DOCTEST_DELETE_COPIES(ContextOptions); +}; + +namespace detail { +#if defined(DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING) || defined(DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS) template struct enable_if {}; @@ -667,17 +752,14 @@ namespace detail template struct enable_if { typedef TYPE type; }; +#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING) || DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS template struct deferred_false // cppcheck-suppress unusedStructMember { static const bool value = false; }; - // to silence the warning "-Wzero-as-null-pointer-constant" only for gcc 5 for the Approx template ctor - pragmas don't work for it... - inline void* getNull() { return 0; } - - namespace has_insertion_operator_impl - { + namespace has_insertion_operator_impl { typedef char no; typedef char yes[2]; @@ -706,12 +788,10 @@ namespace detail struct has_insertion_operator : has_insertion_operator_impl::has_insertion_operator {}; - DOCTEST_INTERFACE void my_memcpy(void* dest, const void* src, unsigned num); - DOCTEST_INTERFACE unsigned my_strlen(const char* in); + DOCTEST_INTERFACE void my_memcpy(void* dest, const void* src, unsigned num); - DOCTEST_INTERFACE std::ostream* createStream(); - DOCTEST_INTERFACE String getStreamResult(std::ostream*); - DOCTEST_INTERFACE void freeStream(std::ostream*); + DOCTEST_INTERFACE std::ostream* getTlsOss(); // returns a thread-local ostringstream + DOCTEST_INTERFACE String getTlsOssResult(); template struct StringMakerBase @@ -727,11 +807,8 @@ namespace detail { template static String convert(const DOCTEST_REF_WRAP(T) in) { - std::ostream* stream = createStream(); - *stream << in; - String result = getStreamResult(stream); - freeStream(stream); - return result; + *getTlsOss() << in; + return getTlsOssResult(); } }; @@ -742,114 +819,14 @@ namespace detail return rawMemoryToString(&object, sizeof(object)); } - class NullType - { - }; - - template - struct Typelist - { - typedef T Head; - typedef U Tail; - }; - - // type of recursive function - template - struct ForEachType; - - // Recursion rule - template - struct ForEachType, Callable> : public ForEachType - { - enum - { - value = 1 + ForEachType::value - }; - - explicit ForEachType(Callable& callable) - : ForEachType(callable) { -#if defined(_MSC_VER) && _MSC_VER <= 1900 - callable.operator()(); -#else // _MSC_VER - callable.template operator()(); -#endif // _MSC_VER - } - }; - - // Recursion end - template - struct ForEachType, Callable> - { - public: - enum - { - value = 0 - }; - - explicit ForEachType(Callable& callable) { -#if defined(_MSC_VER) && _MSC_VER <= 1900 - callable.operator()(); -#else // _MSC_VER - callable.template operator()(); -#endif // _MSC_VER - } - }; - template const char* type_to_string() { return "<>"; } } // namespace detail -template -struct Types -{ -private: - typedef typename Types::Result TailResult; - -public: - typedef detail::Typelist Result; -}; - -template <> -struct Types<> -{ typedef detail::NullType Result; }; - template -struct StringMaker : detail::StringMakerBase::value> +struct StringMaker : public detail::StringMakerBase::value> {}; template @@ -896,52 +873,65 @@ DOCTEST_INTERFACE String toString(int in); DOCTEST_INTERFACE String toString(int unsigned in); DOCTEST_INTERFACE String toString(int long in); DOCTEST_INTERFACE String toString(int long unsigned in); - -#ifdef DOCTEST_CONFIG_WITH_LONG_LONG DOCTEST_INTERFACE String toString(int long long in); DOCTEST_INTERFACE String toString(int long long unsigned in); -#endif // DOCTEST_CONFIG_WITH_LONG_LONG - -#ifdef DOCTEST_CONFIG_WITH_NULLPTR DOCTEST_INTERFACE String toString(std::nullptr_t in); -#endif // DOCTEST_CONFIG_WITH_NULLPTR class DOCTEST_INTERFACE Approx { public: explicit Approx(double value); - Approx operator()(double value) const { - Approx approx(value); - approx.epsilon(m_epsilon); - approx.scale(m_scale); - return approx; - } + DOCTEST_DECLARE_COPIES(Approx); + + Approx operator()(double value) const; #ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS template explicit Approx(const T& value, typename detail::enable_if::value>::type* = - static_cast(detail::getNull())) { + static_cast(nullptr)) { *this = Approx(static_cast(value)); } #endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS + Approx& epsilon(double newEpsilon); + +#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS + template + typename detail::enable_if::value, Approx&>::type epsilon( + const T& newEpsilon) { + m_epsilon = static_cast(newEpsilon); + return *this; + } +#endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS + + Approx& scale(double newScale); + +#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS + template + typename detail::enable_if::value, Approx&>::type scale( + const T& newScale) { + m_scale = static_cast(newScale); + return *this; + } +#endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS + // clang-format off - // overloads for double - the first one is necessary as it is in the implementation part of doctest - // as for the others - keeping them for potentially faster compile times - DOCTEST_INTERFACE friend bool operator==(double lhs, Approx const& rhs); - friend bool operator==(Approx const& lhs, double rhs) { return operator==(rhs, lhs); } - friend bool operator!=(double lhs, Approx const& rhs) { return !operator==(lhs, rhs); } - friend bool operator!=(Approx const& lhs, double rhs) { return !operator==(rhs, lhs); } - friend bool operator<=(double lhs, Approx const& rhs) { return lhs < rhs.m_value || lhs == rhs; } - friend bool operator<=(Approx const& lhs, double rhs) { return lhs.m_value < rhs || lhs == rhs; } - friend bool operator>=(double lhs, Approx const& rhs) { return lhs > rhs.m_value || lhs == rhs; } - friend bool operator>=(Approx const& lhs, double rhs) { return lhs.m_value > rhs || lhs == rhs; } - friend bool operator< (double lhs, Approx const& rhs) { return lhs < rhs.m_value && lhs != rhs; } - friend bool operator< (Approx const& lhs, double rhs) { return lhs.m_value < rhs && lhs != rhs; } - friend bool operator> (double lhs, Approx const& rhs) { return lhs > rhs.m_value && lhs != rhs; } - friend bool operator> (Approx const& lhs, double rhs) { return lhs.m_value > rhs && lhs != rhs; } + DOCTEST_INTERFACE friend bool operator==(double lhs, const Approx & rhs); + DOCTEST_INTERFACE friend bool operator==(const Approx & lhs, double rhs); + DOCTEST_INTERFACE friend bool operator!=(double lhs, const Approx & rhs); + DOCTEST_INTERFACE friend bool operator!=(const Approx & lhs, double rhs); + DOCTEST_INTERFACE friend bool operator<=(double lhs, const Approx & rhs); + DOCTEST_INTERFACE friend bool operator<=(const Approx & lhs, double rhs); + DOCTEST_INTERFACE friend bool operator>=(double lhs, const Approx & rhs); + DOCTEST_INTERFACE friend bool operator>=(const Approx & lhs, double rhs); + DOCTEST_INTERFACE friend bool operator< (double lhs, const Approx & rhs); + DOCTEST_INTERFACE friend bool operator< (const Approx & lhs, double rhs); + DOCTEST_INTERFACE friend bool operator> (double lhs, const Approx & rhs); + DOCTEST_INTERFACE friend bool operator> (const Approx & lhs, double rhs); + + DOCTEST_INTERFACE friend String toString(const Approx& in); #ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS #define DOCTEST_APPROX_PREFIX \ @@ -964,226 +954,53 @@ class DOCTEST_INTERFACE Approx // clang-format on - Approx& epsilon(double newEpsilon) { - m_epsilon = newEpsilon; - return *this; - } - -#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS - template - typename detail::enable_if::value, Approx&>::type epsilon( - const T& newEpsilon) { - m_epsilon = static_cast(newEpsilon); - return *this; - } -#endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS - - Approx& scale(double newScale) { - m_scale = newScale; - return *this; - } - -#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS - template - typename detail::enable_if::value, Approx&>::type scale( - const T& newScale) { - m_scale = static_cast(newScale); - return *this; - } -#endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS - - String toString() const; - private: double m_epsilon; double m_scale; double m_value; }; -template <> -inline String toString(const DOCTEST_REF_WRAP(Approx) value) { - return value.toString(); -} +DOCTEST_INTERFACE String toString(const Approx& in); -#if !defined(DOCTEST_CONFIG_DISABLE) +DOCTEST_INTERFACE const ContextOptions* getContextOptions(); -namespace detail -{ - // the function type this library works with - typedef void (*funcType)(); +#if !defined(DOCTEST_CONFIG_DISABLE) - namespace assertType - { - enum Enum - { - // macro traits +namespace detail { + // clang-format off +#ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING + template struct decay_array { typedef T type; }; + template struct decay_array { typedef T* type; }; + template struct decay_array { typedef T* type; }; - is_warn = 1, - is_check = 2, - is_require = 4, + template struct not_char_pointer { enum { value = 1 }; }; + template<> struct not_char_pointer { enum { value = 0 }; }; + template<> struct not_char_pointer { enum { value = 0 }; }; - is_throws = 8, - is_throws_as = 16, - is_nothrow = 32, + template struct can_use_op : public not_char_pointer::type> {}; +#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING + // clang-format on - is_fast = 64, // not checked anywhere - used just to distinguish the types - is_false = 128, - is_unary = 256, - - is_eq = 512, - is_ne = 1024, - - is_lt = 2048, - is_gt = 4096, - - is_ge = 8192, - is_le = 16384, - - // macro types - - DT_WARN = is_warn, - DT_CHECK = is_check, - DT_REQUIRE = is_require, - - DT_WARN_FALSE = is_false | is_warn, - DT_CHECK_FALSE = is_false | is_check, - DT_REQUIRE_FALSE = is_false | is_require, - - DT_WARN_THROWS = is_throws | is_warn, - DT_CHECK_THROWS = is_throws | is_check, - DT_REQUIRE_THROWS = is_throws | is_require, - - DT_WARN_THROWS_AS = is_throws_as | is_warn, - DT_CHECK_THROWS_AS = is_throws_as | is_check, - DT_REQUIRE_THROWS_AS = is_throws_as | is_require, - - DT_WARN_NOTHROW = is_nothrow | is_warn, - DT_CHECK_NOTHROW = is_nothrow | is_check, - DT_REQUIRE_NOTHROW = is_nothrow | is_require, - - DT_WARN_EQ = is_eq | is_warn, - DT_CHECK_EQ = is_eq | is_check, - DT_REQUIRE_EQ = is_eq | is_require, - - DT_WARN_NE = is_ne | is_warn, - DT_CHECK_NE = is_ne | is_check, - DT_REQUIRE_NE = is_ne | is_require, - - DT_WARN_GT = is_gt | is_warn, - DT_CHECK_GT = is_gt | is_check, - DT_REQUIRE_GT = is_gt | is_require, - - DT_WARN_LT = is_lt | is_warn, - DT_CHECK_LT = is_lt | is_check, - DT_REQUIRE_LT = is_lt | is_require, - - DT_WARN_GE = is_ge | is_warn, - DT_CHECK_GE = is_ge | is_check, - DT_REQUIRE_GE = is_ge | is_require, - - DT_WARN_LE = is_le | is_warn, - DT_CHECK_LE = is_le | is_check, - DT_REQUIRE_LE = is_le | is_require, - - DT_WARN_UNARY = is_unary | is_warn, - DT_CHECK_UNARY = is_unary | is_check, - DT_REQUIRE_UNARY = is_unary | is_require, - - DT_WARN_UNARY_FALSE = is_false | is_unary | is_warn, - DT_CHECK_UNARY_FALSE = is_false | is_unary | is_check, - DT_REQUIRE_UNARY_FALSE = is_false | is_unary | is_require, - - DT_FAST_WARN_EQ = is_fast | is_eq | is_warn, - DT_FAST_CHECK_EQ = is_fast | is_eq | is_check, - DT_FAST_REQUIRE_EQ = is_fast | is_eq | is_require, - - DT_FAST_WARN_NE = is_fast | is_ne | is_warn, - DT_FAST_CHECK_NE = is_fast | is_ne | is_check, - DT_FAST_REQUIRE_NE = is_fast | is_ne | is_require, - - DT_FAST_WARN_GT = is_fast | is_gt | is_warn, - DT_FAST_CHECK_GT = is_fast | is_gt | is_check, - DT_FAST_REQUIRE_GT = is_fast | is_gt | is_require, - - DT_FAST_WARN_LT = is_fast | is_lt | is_warn, - DT_FAST_CHECK_LT = is_fast | is_lt | is_check, - DT_FAST_REQUIRE_LT = is_fast | is_lt | is_require, - - DT_FAST_WARN_GE = is_fast | is_ge | is_warn, - DT_FAST_CHECK_GE = is_fast | is_ge | is_check, - DT_FAST_REQUIRE_GE = is_fast | is_ge | is_require, - - DT_FAST_WARN_LE = is_fast | is_le | is_warn, - DT_FAST_CHECK_LE = is_fast | is_le | is_check, - DT_FAST_REQUIRE_LE = is_fast | is_le | is_require, - - DT_FAST_WARN_UNARY = is_fast | is_unary | is_warn, - DT_FAST_CHECK_UNARY = is_fast | is_unary | is_check, - DT_FAST_REQUIRE_UNARY = is_fast | is_unary | is_require, - - DT_FAST_WARN_UNARY_FALSE = is_fast | is_false | is_unary | is_warn, - DT_FAST_CHECK_UNARY_FALSE = is_fast | is_false | is_unary | is_check, - DT_FAST_REQUIRE_UNARY_FALSE = is_fast | is_false | is_unary | is_require - }; - } // namespace assertType - - DOCTEST_INTERFACE const char* getAssertString(assertType::Enum val); - - // clang-format off - template struct decay_array { typedef T type; }; - template struct decay_array { typedef T* type; }; - template struct decay_array { typedef T* type; }; - - template struct not_char_pointer { enum { value = 1 }; }; - template<> struct not_char_pointer { enum { value = 0 }; }; - template<> struct not_char_pointer { enum { value = 0 }; }; - - template struct can_use_op : not_char_pointer::type> {}; - // clang-format on - - struct TestFailureException + struct DOCTEST_INTERFACE TestFailureException { + DOCTEST_DECLARE_DEFAULTS(TestFailureException); + DOCTEST_DECLARE_COPIES(TestFailureException); }; - DOCTEST_INTERFACE bool checkIfShouldThrow(assertType::Enum assert_type); + DOCTEST_INTERFACE bool checkIfShouldThrow(assertType::Enum at); DOCTEST_INTERFACE void fastAssertThrowIfFlagSet(int flags); - DOCTEST_INTERFACE void throwException(); - - struct TestAccessibleContextState - { - bool no_throw; // to skip exceptions-related assertion macros - bool success; // include successful assertions in output - }; - - struct ContextState; - - DOCTEST_INTERFACE TestAccessibleContextState* getTestsContextState(); - - struct DOCTEST_INTERFACE SubcaseSignature - { - const char* m_name; - const char* m_file; - int m_line; - - SubcaseSignature(const char* name, const char* file, int line) - : m_name(name) - , m_file(file) - , m_line(line) {} - bool operator<(const SubcaseSignature& other) const; - }; - - // cppcheck-suppress copyCtorAndEqOperator struct DOCTEST_INTERFACE Subcase { SubcaseSignature m_signature; - bool m_entered; + bool m_entered = false; Subcase(const char* name, const char* file, int line); - Subcase(const Subcase& other); ~Subcase(); - operator bool() const { return m_entered; } + DOCTEST_DELETE_COPIES(Subcase); + + operator bool() const; }; template @@ -1192,87 +1009,86 @@ namespace detail return toString(lhs) + op + toString(rhs); } +#define DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(op, op_str, op_macro) \ + template \ + DOCTEST_NOINLINE Result operator op(const DOCTEST_REF_WRAP(R) rhs) { \ + bool res = op_macro(lhs, rhs); \ + if(m_at & assertType::is_false) \ + res = !res; \ + if(!res || doctest::getContextOptions()->success) \ + return Result(res, stringifyBinaryExpr(lhs, op_str, rhs)); \ + return Result(res); \ + } + +#define DOCTEST_FORBIT_EXPRESSION(rt, op) \ + template \ + rt& operator op(const R&) { \ + static_assert(deferred_false::value, \ + "Expression Too Complex Please Rewrite As Binary Comparison!"); \ + return *this; \ + } + struct DOCTEST_INTERFACE Result { bool m_passed; - String m_decomposition; - - ~Result(); - - DOCTEST_NOINLINE Result(bool passed = false, const String& decomposition = String()) - : m_passed(passed) - , m_decomposition(decomposition) {} - - DOCTEST_NOINLINE Result(const Result& other) - : m_passed(other.m_passed) - , m_decomposition(other.m_decomposition) {} + String m_decomp; - Result& operator=(const Result& other); + Result(bool passed, const String& decomposition = String()); - operator bool() { return !m_passed; } + DOCTEST_DECLARE_DEFAULTS(Result); + DOCTEST_DECLARE_COPIES(Result); - // clang-format off // forbidding some expressions based on this table: http://en.cppreference.com/w/cpp/language/operator_precedence - template Result& operator& (const R&) { DOCTEST_STATIC_ASSERT(deferred_false::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; } - template Result& operator^ (const R&) { DOCTEST_STATIC_ASSERT(deferred_false::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; } - template Result& operator| (const R&) { DOCTEST_STATIC_ASSERT(deferred_false::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; } - template Result& operator&& (const R&) { DOCTEST_STATIC_ASSERT(deferred_false::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; } - template Result& operator|| (const R&) { DOCTEST_STATIC_ASSERT(deferred_false::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; } - template Result& operator== (const R&) { DOCTEST_STATIC_ASSERT(deferred_false::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; } - template Result& operator!= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; } - template Result& operator< (const R&) { DOCTEST_STATIC_ASSERT(deferred_false::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; } - template Result& operator> (const R&) { DOCTEST_STATIC_ASSERT(deferred_false::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; } - template Result& operator<= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; } - template Result& operator>= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; } - template Result& operator= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; } - template Result& operator+= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; } - template Result& operator-= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; } - template Result& operator*= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; } - template Result& operator/= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; } - template Result& operator%= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; } - template Result& operator<<=(const R&) { DOCTEST_STATIC_ASSERT(deferred_false::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; } - template Result& operator>>=(const R&) { DOCTEST_STATIC_ASSERT(deferred_false::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; } - template Result& operator&= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; } - template Result& operator^= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; } - template Result& operator|= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return *this; } - // clang-format on + DOCTEST_FORBIT_EXPRESSION(Result, &) + DOCTEST_FORBIT_EXPRESSION(Result, ^) + DOCTEST_FORBIT_EXPRESSION(Result, |) + DOCTEST_FORBIT_EXPRESSION(Result, &&) + DOCTEST_FORBIT_EXPRESSION(Result, ||) + DOCTEST_FORBIT_EXPRESSION(Result, ==) + DOCTEST_FORBIT_EXPRESSION(Result, !=) + DOCTEST_FORBIT_EXPRESSION(Result, <) + DOCTEST_FORBIT_EXPRESSION(Result, >) + DOCTEST_FORBIT_EXPRESSION(Result, <=) + DOCTEST_FORBIT_EXPRESSION(Result, >=) + DOCTEST_FORBIT_EXPRESSION(Result, =) + DOCTEST_FORBIT_EXPRESSION(Result, +=) + DOCTEST_FORBIT_EXPRESSION(Result, -=) + DOCTEST_FORBIT_EXPRESSION(Result, *=) + DOCTEST_FORBIT_EXPRESSION(Result, /=) + DOCTEST_FORBIT_EXPRESSION(Result, %=) + DOCTEST_FORBIT_EXPRESSION(Result, <<=) + DOCTEST_FORBIT_EXPRESSION(Result, >>=) + DOCTEST_FORBIT_EXPRESSION(Result, &=) + DOCTEST_FORBIT_EXPRESSION(Result, ^=) + DOCTEST_FORBIT_EXPRESSION(Result, |=) }; #ifndef DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION -#if defined(__clang__) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wsign-conversion" -#pragma clang diagnostic ignored "-Wsign-compare" -//#pragma clang diagnostic ignored "-Wdouble-promotion" -//#pragma clang diagnostic ignored "-Wconversion" -//#pragma clang diagnostic ignored "-Wfloat-equal" -#endif // __clang__ - -#if defined(__GNUC__) && !defined(__clang__) -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6) -#pragma GCC diagnostic push -#endif // > gcc 4.6 -#pragma GCC diagnostic ignored "-Wsign-conversion" -#pragma GCC diagnostic ignored "-Wsign-compare" -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 5) -//#pragma GCC diagnostic ignored "-Wdouble-promotion" -#endif // > gcc 4.5 -//#pragma GCC diagnostic ignored "-Wconversion" -//#pragma GCC diagnostic ignored "-Wfloat-equal" -#endif // __GNUC__ - -#ifdef _MSC_VER -#pragma warning(push) -// http://stackoverflow.com/questions/39479163 what's the difference between C4018 and C4389 -#pragma warning(disable : 4389) // 'operator' : signed/unsigned mismatch -#pragma warning(disable : 4018) // 'expression' : signed/unsigned mismatch -//#pragma warning(disable : 4805) // 'operation' : unsafe mix of type 'type' and type 'type' in operation -#endif // _MSC_VER + DOCTEST_CLANG_SUPPRESS_WARNING_PUSH + DOCTEST_CLANG_SUPPRESS_WARNING("-Wsign-conversion") + DOCTEST_CLANG_SUPPRESS_WARNING("-Wsign-compare") + //DOCTEST_CLANG_SUPPRESS_WARNING("-Wdouble-promotion") + //DOCTEST_CLANG_SUPPRESS_WARNING("-Wconversion") + //DOCTEST_CLANG_SUPPRESS_WARNING("-Wfloat-equal") + + DOCTEST_GCC_SUPPRESS_WARNING_PUSH + DOCTEST_GCC_SUPPRESS_WARNING("-Wsign-conversion") + DOCTEST_GCC_SUPPRESS_WARNING("-Wsign-compare") + //DOCTEST_GCC_SUPPRESS_WARNING("-Wdouble-promotion") + //DOCTEST_GCC_SUPPRESS_WARNING("-Wconversion") + //DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal") + + DOCTEST_MSVC_SUPPRESS_WARNING_PUSH + // http://stackoverflow.com/questions/39479163 what's the difference between 4018 and 4389 + DOCTEST_MSVC_SUPPRESS_WARNING(4388) // signed/unsigned mismatch + DOCTEST_MSVC_SUPPRESS_WARNING(4389) // 'operator' : signed/unsigned mismatch + DOCTEST_MSVC_SUPPRESS_WARNING(4018) // 'expression' : signed/unsigned mismatch + //DOCTEST_MSVC_SUPPRESS_WARNING(4805) // 'operation' : unsafe mix of type 'type' and type 'type' in operation #endif // DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION -// clang-format off + // clang-format off #ifndef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING #define DOCTEST_COMPARISON_RETURN_TYPE bool #else // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING @@ -1284,15 +1100,22 @@ namespace detail inline bool le(const char* lhs, const char* rhs) { return String(lhs) <= String(rhs); } inline bool ge(const char* lhs, const char* rhs) { return String(lhs) >= String(rhs); } #endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING - - template DOCTEST_COMPARISON_RETURN_TYPE eq(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs == rhs; } - template DOCTEST_COMPARISON_RETURN_TYPE ne(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs != rhs; } - template DOCTEST_COMPARISON_RETURN_TYPE lt(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs < rhs; } - template DOCTEST_COMPARISON_RETURN_TYPE gt(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs > rhs; } - template DOCTEST_COMPARISON_RETURN_TYPE le(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs <= rhs; } - template DOCTEST_COMPARISON_RETURN_TYPE ge(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs >= rhs; } // clang-format on +#define DOCTEST_RELATIONAL_OP(name, op) \ + template \ + DOCTEST_COMPARISON_RETURN_TYPE name(const DOCTEST_REF_WRAP(L) lhs, \ + const DOCTEST_REF_WRAP(R) rhs) { \ + return lhs op rhs; \ + } + + DOCTEST_RELATIONAL_OP(eq, ==) + DOCTEST_RELATIONAL_OP(ne, !=) + DOCTEST_RELATIONAL_OP(lt, <) + DOCTEST_RELATIONAL_OP(gt, >) + DOCTEST_RELATIONAL_OP(le, <=) + DOCTEST_RELATIONAL_OP(ge, >=) + #ifndef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING #define DOCTEST_CMP_EQ(l, r) l == r #define DOCTEST_CMP_NE(l, r) l != r @@ -1309,45 +1132,23 @@ namespace detail #define DOCTEST_CMP_LE(l, r) le(l, r) #endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING -#define DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(op, op_str, op_macro) \ - template \ - DOCTEST_NOINLINE Result operator op(const DOCTEST_REF_WRAP(R) rhs) { \ - bool res = op_macro(lhs, rhs); \ - if(m_assert_type & assertType::is_false) \ - res = !res; \ - if(!res || doctest::detail::getTestsContextState()->success) \ - return Result(res, stringifyBinaryExpr(lhs, op_str, rhs)); \ - return Result(res); \ - } - -#define DOCTEST_FORBIT_EXPRESSION(op) \ - template \ - Expression_lhs& operator op(const R&) { \ - DOCTEST_STATIC_ASSERT(deferred_false::value, \ - Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); \ - return *this; \ - } - template // cppcheck-suppress copyCtorAndEqOperator struct Expression_lhs { L lhs; - assertType::Enum m_assert_type; + assertType::Enum m_at; - explicit Expression_lhs(L in, assertType::Enum assert_type) + explicit Expression_lhs(L in, assertType::Enum at) : lhs(in) - , m_assert_type(assert_type) {} - - Expression_lhs(const Expression_lhs& other) - : lhs(other.lhs) {} + , m_at(at) {} DOCTEST_NOINLINE operator Result() { bool res = !!lhs; - if(m_assert_type & assertType::is_false) //!OCLINT bitwise operator in conditional + if(m_at & assertType::is_false) //!OCLINT bitwise operator in conditional res = !res; - if(!res || getTestsContextState()->success) + if(!res || getContextOptions()->success) return Result(res, toString(lhs)); return Result(res); } @@ -1355,59 +1156,51 @@ namespace detail // clang-format off DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(==, " == ", DOCTEST_CMP_EQ) //!OCLINT bitwise operator in conditional DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(!=, " != ", DOCTEST_CMP_NE) //!OCLINT bitwise operator in conditional - DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(>, " > ", DOCTEST_CMP_GT) //!OCLINT bitwise operator in conditional - DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(<, " < ", DOCTEST_CMP_LT) //!OCLINT bitwise operator in conditional + DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(>, " > ", DOCTEST_CMP_GT) //!OCLINT bitwise operator in conditional + DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(<, " < ", DOCTEST_CMP_LT) //!OCLINT bitwise operator in conditional DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(>=, " >= ", DOCTEST_CMP_GE) //!OCLINT bitwise operator in conditional DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(<=, " <= ", DOCTEST_CMP_LE) //!OCLINT bitwise operator in conditional // clang-format on // forbidding some expressions based on this table: http://en.cppreference.com/w/cpp/language/operator_precedence - DOCTEST_FORBIT_EXPRESSION(&) - DOCTEST_FORBIT_EXPRESSION (^) - DOCTEST_FORBIT_EXPRESSION(|) - DOCTEST_FORBIT_EXPRESSION(&&) - DOCTEST_FORBIT_EXPRESSION(||) - DOCTEST_FORBIT_EXPRESSION(=) - DOCTEST_FORBIT_EXPRESSION(+=) - DOCTEST_FORBIT_EXPRESSION(-=) - DOCTEST_FORBIT_EXPRESSION(*=) - DOCTEST_FORBIT_EXPRESSION(/=) - DOCTEST_FORBIT_EXPRESSION(%=) - DOCTEST_FORBIT_EXPRESSION(<<=) - DOCTEST_FORBIT_EXPRESSION(>>=) - DOCTEST_FORBIT_EXPRESSION(&=) - DOCTEST_FORBIT_EXPRESSION(^=) - DOCTEST_FORBIT_EXPRESSION(|=) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, &) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, ^) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, |) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, &&) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, ||) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, =) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, +=) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, -=) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, *=) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, /=) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, %=) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, <<=) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, >>=) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, &=) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, ^=) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, |=) // these 2 are unfortunate because they should be allowed - they have higher precedence over the comparisons, but the // ExpressionDecomposer class uses the left shift operator to capture the left operand of the binary expression... - DOCTEST_FORBIT_EXPRESSION(<<) - DOCTEST_FORBIT_EXPRESSION(>>) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, <<) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, >>) }; #ifndef DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION -#if defined(__clang__) -#pragma clang diagnostic pop -#endif // __clang__ - -#if defined(__GNUC__) && !defined(__clang__) -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6) -#pragma GCC diagnostic pop -#endif // > gcc 4.6 -#endif // __GNUC__ - -#ifdef _MSC_VER -#pragma warning(pop) -#endif // _MSC_VER + DOCTEST_CLANG_SUPPRESS_WARNING_POP + DOCTEST_MSVC_SUPPRESS_WARNING_POP + DOCTEST_GCC_SUPPRESS_WARNING_POP #endif // DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION - struct ExpressionDecomposer + struct DOCTEST_INTERFACE ExpressionDecomposer { - assertType::Enum m_assert_type; + assertType::Enum m_at; - ExpressionDecomposer(assertType::Enum assert_type) - : m_assert_type(assert_type) {} + ExpressionDecomposer(assertType::Enum at); + + DOCTEST_DECLARE_DEFAULTS(ExpressionDecomposer); + DOCTEST_DELETE_COPIES(ExpressionDecomposer); // The right operator for capturing expressions is "<=" instead of "<<" (based on the operator precedence table) // but then there will be warnings from GCC about "-Wparentheses" and since "_Pragma()" is problematic this will stay for now... @@ -1415,18 +1208,13 @@ namespace detail // https://github.com/philsquared/Catch/issues/565 template Expression_lhs operator<<(const DOCTEST_REF_WRAP(L) operand) { - return Expression_lhs(operand, m_assert_type); + return Expression_lhs(operand, m_at); } }; - struct DOCTEST_INTERFACE TestCase + struct DOCTEST_INTERFACE TestSuite { - // not used for determining uniqueness - funcType m_test; // a function pointer to the test case - String m_full_name; // contains the name (only for templated test cases!) + the template type - const char* m_name; // name of the test case - const char* m_type; // for templated test cases - gets appended to the real name - const char* m_test_suite; // the test suite in which the test was added + const char* m_test_suite; const char* m_description; bool m_skip; bool m_may_fail; @@ -1434,16 +1222,38 @@ namespace detail int m_expected_failures; double m_timeout; - // fields by which uniqueness of test cases shall be determined - const char* m_file; // the file in which the test was registered - unsigned m_line; // the line where the test was registered + DOCTEST_DECLARE_DEFAULTS(TestSuite); + DOCTEST_DECLARE_COPIES(TestSuite); + + TestSuite& operator*(const char* in); + + template + TestSuite& operator*(const T& in) { + in.fill(*this); + return *this; + } + }; + + typedef void (*funcType)(); + + struct DOCTEST_INTERFACE TestCase : public TestCaseData + { + funcType m_test; // a function pointer to the test case + + const char* m_type; // for templated test cases - gets appended to the real name int m_template_id; // an ID used to distinguish between the different versions of a templated test case + String m_full_name; // contains the name (only for templated test cases!) + the template type TestCase(funcType test, const char* file, unsigned line, const TestSuite& test_suite, const char* type = "", int template_id = -1); - // for gcc 4.7 - DOCTEST_NOINLINE ~TestCase() {} + DOCTEST_DECLARE_DEFAULTS(TestCase); + + TestCase(const TestCase& other); + + DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(26434) // hides a non-virtual function + TestCase& operator=(const TestCase& other); + DOCTEST_MSVC_SUPPRESS_WARNING_POP TestCase& operator*(const char* in); @@ -1453,46 +1263,15 @@ namespace detail return *this; } - TestCase(const TestCase& other) { *this = other; } - - TestCase& operator=(const TestCase& other); - bool operator<(const TestCase& other) const; }; // forward declarations of functions used by the macros - DOCTEST_INTERFACE int regTest(const TestCase& tc); - DOCTEST_INTERFACE int setTestSuite(const TestSuite& ts); - - DOCTEST_INTERFACE void addFailedAssert(assertType::Enum assert_type); - - DOCTEST_INTERFACE void logTestStart(const TestCase& tc); - DOCTEST_INTERFACE void logTestEnd(); - - DOCTEST_INTERFACE void logTestException(const String& what, bool crash = false); - - DOCTEST_INTERFACE void logAssert(bool passed, const char* decomposition, bool threw, - const String& exception, const char* expr, - assertType::Enum assert_type, const char* file, int line); - - DOCTEST_INTERFACE void logAssertThrows(bool threw, const char* expr, - assertType::Enum assert_type, const char* file, - int line); - - DOCTEST_INTERFACE void logAssertThrowsAs(bool threw, bool threw_as, const char* as, - const String& exception, const char* expr, - assertType::Enum assert_type, const char* file, - int line); - - DOCTEST_INTERFACE void logAssertNothrow(bool threw, const String& exception, const char* expr, - assertType::Enum assert_type, const char* file, - int line); - + DOCTEST_INTERFACE int regTest(const TestCase& tc); + DOCTEST_INTERFACE int setTestSuite(const TestSuite& ts); DOCTEST_INTERFACE bool isDebuggerActive(); - DOCTEST_INTERFACE void writeToDebugConsole(const String&); - namespace binaryAssertComparison - { + namespace binaryAssertComparison { enum Enum { eq = 0, @@ -1506,52 +1285,45 @@ namespace detail // clang-format off template struct RelationalComparator { bool operator()(const DOCTEST_REF_WRAP(L), const DOCTEST_REF_WRAP(R) ) const { return false; } }; - template struct RelationalComparator<0, L, R> { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return eq(lhs, rhs); } }; - template struct RelationalComparator<1, L, R> { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return ne(lhs, rhs); } }; - template struct RelationalComparator<2, L, R> { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return gt(lhs, rhs); } }; - template struct RelationalComparator<3, L, R> { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return lt(lhs, rhs); } }; - template struct RelationalComparator<4, L, R> { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return ge(lhs, rhs); } }; - template struct RelationalComparator<5, L, R> { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return le(lhs, rhs); } }; + +#define DOCTEST_BINARY_RELATIONAL_OP(n, op) \ + template struct RelationalComparator { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return op(lhs, rhs); } }; // clang-format on - struct DOCTEST_INTERFACE ResultBuilder + DOCTEST_BINARY_RELATIONAL_OP(0, eq) + DOCTEST_BINARY_RELATIONAL_OP(1, ne) + DOCTEST_BINARY_RELATIONAL_OP(2, gt) + DOCTEST_BINARY_RELATIONAL_OP(3, lt) + DOCTEST_BINARY_RELATIONAL_OP(4, ge) + DOCTEST_BINARY_RELATIONAL_OP(5, le) + + struct DOCTEST_INTERFACE ResultBuilder : public AssertData { - assertType::Enum m_assert_type; - const char* m_file; - int m_line; - const char* m_expr; - const char* m_exception_type; - - Result m_result; - bool m_threw; - bool m_threw_as; - bool m_failed; - String m_exception; - - ResultBuilder(assertType::Enum assert_type, const char* file, int line, const char* expr, + ResultBuilder(assertType::Enum at, const char* file, int line, const char* expr, const char* exception_type = ""); - ~ResultBuilder(); + DOCTEST_DECLARE_DEFAULTS(ResultBuilder); + DOCTEST_DELETE_COPIES(ResultBuilder); - void setResult(const Result& res) { m_result = res; } + void setResult(const Result& res); template DOCTEST_NOINLINE void binary_assert(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { - m_result.m_passed = RelationalComparator()(lhs, rhs); - if(!m_result.m_passed || getTestsContextState()->success) - m_result.m_decomposition = stringifyBinaryExpr(lhs, ", ", rhs); + m_failed = !RelationalComparator()(lhs, rhs); + if(m_failed || getContextOptions()->success) + m_decomp = stringifyBinaryExpr(lhs, ", ", rhs); } template DOCTEST_NOINLINE void unary_assert(const DOCTEST_REF_WRAP(L) val) { - m_result.m_passed = !!val; + m_failed = !val; - if(m_assert_type & assertType::is_false) //!OCLINT bitwise operator in conditional - m_result.m_passed = !m_result.m_passed; + if(m_at & assertType::is_false) //!OCLINT bitwise operator in conditional + m_failed = !m_failed; - if(!m_result.m_passed || getTestsContextState()->success) - m_result.m_decomposition = toString(val); + if(m_failed || getContextOptions()->success) + m_decomp = toString(val); } void unexpectedExceptionOccurred(); @@ -1560,8 +1332,7 @@ namespace detail void react() const; }; - namespace assertAction - { + namespace assertAction { enum Enum { nothing = 0, @@ -1570,76 +1341,90 @@ namespace detail }; } // namespace assertAction - template - DOCTEST_NOINLINE int fast_binary_assert(assertType::Enum assert_type, const char* file, - int line, const char* expr, - const DOCTEST_REF_WRAP(L) lhs, - const DOCTEST_REF_WRAP(R) rhs) { - ResultBuilder rb(assert_type, file, line, expr); - - rb.m_result.m_passed = RelationalComparator()(lhs, rhs); +#ifdef DOCTEST_CONFIG_SUPER_FAST_ASSERTS +#define DOCTEST_FAST_ASSERT_REACT \ + do { \ + if(res & assertAction::dbgbreak) \ + DOCTEST_BREAK_INTO_DEBUGGER(); \ + fastAssertThrowIfFlagSet(res); \ + } while(false) +#define DOCTEST_FAST_ASSERT_RETURN(x) return +#define DOCTEST_FAST_ASSERT_RETURN_TYPE void +#else // DOCTEST_CONFIG_SUPER_FAST_ASSERTS +#define DOCTEST_FAST_ASSERT_REACT return res +#define DOCTEST_FAST_ASSERT_RETURN(x) return x +#define DOCTEST_FAST_ASSERT_RETURN_TYPE int +#endif // DOCTEST_CONFIG_SUPER_FAST_ASSERTS - if(!rb.m_result.m_passed || getTestsContextState()->success) - rb.m_result.m_decomposition = stringifyBinaryExpr(lhs, ", ", rhs); + DOCTEST_INTERFACE void failed_out_of_a_testing_context(const AssertData& ad); - int res = 0; +#define DOCTEST_FAST_ASSERT_OUT_OF_TESTS(decomp) \ + do { \ + if(!is_running_in_test) { \ + if(failed) { \ + ResultBuilder rb(at, file, line, expr); \ + rb.m_failed = failed; \ + rb.m_decomp = decomp; \ + failed_out_of_a_testing_context(rb); \ + int res = checkIfShouldThrow(at) ? assertAction::shouldthrow : 0; \ + res |= (isDebuggerActive() && !getContextOptions()->no_breaks) ? \ + assertAction::dbgbreak : \ + 0; \ + DOCTEST_FAST_ASSERT_REACT; \ + } \ + DOCTEST_FAST_ASSERT_RETURN(0); \ + } \ + } while(false) - if(rb.log()) - res |= assertAction::dbgbreak; +#define DOCTEST_FAST_ASSERT_IN_TESTS(decomp) \ + ResultBuilder rb(at, file, line, expr); \ + rb.m_failed = failed; \ + if(rb.m_failed || getContextOptions()->success) \ + rb.m_decomp = decomp; \ + int res = rb.log() ? assertAction::dbgbreak : 0; \ + if(rb.m_failed && checkIfShouldThrow(at)) \ + res |= assertAction::shouldthrow; \ + DOCTEST_FAST_ASSERT_REACT - if(rb.m_failed && checkIfShouldThrow(assert_type)) - res |= assertAction::shouldthrow; + template + DOCTEST_NOINLINE DOCTEST_FAST_ASSERT_RETURN_TYPE + fast_binary_assert(assertType::Enum at, const char* file, int line, const char* expr, + const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { + bool failed = !RelationalComparator()(lhs, rhs); -#ifdef DOCTEST_CONFIG_SUPER_FAST_ASSERTS - // ######################################################################################### - // IF THE DEBUGGER BREAKS HERE - GO 1 LEVEL UP IN THE CALLSTACK TO SEE THE FAILING ASSERTION + // ################################################################################### + // IF THE DEBUGGER BREAKS HERE - GO 1 LEVEL UP IN THE CALLSTACK FOR THE FAILING ASSERT // THIS IS THE EFFECT OF HAVING 'DOCTEST_CONFIG_SUPER_FAST_ASSERTS' DEFINED - // ######################################################################################### - if(res & assertAction::dbgbreak) - DOCTEST_BREAK_INTO_DEBUGGER(); - fastAssertThrowIfFlagSet(res); -#endif // DOCTEST_CONFIG_SUPER_FAST_ASSERTS - - return res; + // ################################################################################### + DOCTEST_FAST_ASSERT_OUT_OF_TESTS(stringifyBinaryExpr(lhs, ", ", rhs)); + DOCTEST_FAST_ASSERT_IN_TESTS(stringifyBinaryExpr(lhs, ", ", rhs)); } template - DOCTEST_NOINLINE int fast_unary_assert(assertType::Enum assert_type, const char* file, int line, - const char* val_str, const DOCTEST_REF_WRAP(L) val) { - ResultBuilder rb(assert_type, file, line, val_str); - - rb.m_result.m_passed = !!val; - - if(assert_type & assertType::is_false) //!OCLINT bitwise operator in conditional - rb.m_result.m_passed = !rb.m_result.m_passed; - - if(!rb.m_result.m_passed || getTestsContextState()->success) - rb.m_result.m_decomposition = toString(val); - - int res = 0; - - if(rb.log()) - res |= assertAction::dbgbreak; - - if(rb.m_failed && checkIfShouldThrow(assert_type)) - res |= assertAction::shouldthrow; - -#ifdef DOCTEST_CONFIG_SUPER_FAST_ASSERTS - // ######################################################################################### - // IF THE DEBUGGER BREAKS HERE - GO 1 LEVEL UP IN THE CALLSTACK TO SEE THE FAILING ASSERTION + DOCTEST_NOINLINE DOCTEST_FAST_ASSERT_RETURN_TYPE fast_unary_assert(assertType::Enum at, + const char* file, int line, + const char* expr, + const DOCTEST_REF_WRAP(L) + val) { + bool failed = !val; + + if(at & assertType::is_false) //!OCLINT bitwise operator in conditional + failed = !failed; + + // ################################################################################### + // IF THE DEBUGGER BREAKS HERE - GO 1 LEVEL UP IN THE CALLSTACK FOR THE FAILING ASSERT // THIS IS THE EFFECT OF HAVING 'DOCTEST_CONFIG_SUPER_FAST_ASSERTS' DEFINED - // ######################################################################################### - if(res & assertAction::dbgbreak) - DOCTEST_BREAK_INTO_DEBUGGER(); - fastAssertThrowIfFlagSet(res); -#endif // DOCTEST_CONFIG_SUPER_FAST_ASSERTS - - return res; + // ################################################################################### + DOCTEST_FAST_ASSERT_OUT_OF_TESTS(toString(val)); + DOCTEST_FAST_ASSERT_IN_TESTS(toString(val)); } struct DOCTEST_INTERFACE IExceptionTranslator { - virtual ~IExceptionTranslator() {} + DOCTEST_DELETE_COPIES(IExceptionTranslator); + + IExceptionTranslator(); + virtual ~IExceptionTranslator(); virtual bool translate(String&) const = 0; }; @@ -1664,157 +1449,122 @@ namespace detail return false; } - protected: + private: String (*m_translateFunction)(T); }; - DOCTEST_INTERFACE void registerExceptionTranslatorImpl( - const IExceptionTranslator* translateFunction); + DOCTEST_INTERFACE void registerExceptionTranslatorImpl(const IExceptionTranslator* et); // FIX FOR VISUAL STUDIO VERSIONS PRIOR TO 2015 - they failed to compile the call to operator<< with // std::ostream passed as a reference noting that there is a use of an undefined type (which there isn't) - DOCTEST_INTERFACE void writeStringToStream(std::ostream* stream, const String& str); + DOCTEST_INTERFACE void writeStringToStream(std::ostream* s, const String& str); template struct StringStreamBase { template - static void convert(std::ostream* stream, const T& in) { - writeStringToStream(stream, toString(in)); + static void convert(std::ostream* s, const T& in) { + writeStringToStream(s, toString(in)); } // always treat char* as a string in this context - no matter // if DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING is defined - static void convert(std::ostream* stream, const char* in) { - writeStringToStream(stream, String(in)); - } + static void convert(std::ostream* s, const char* in) { writeStringToStream(s, String(in)); } }; template <> struct StringStreamBase { template - static void convert(std::ostream* stream, const T& in) { - *stream << in; + static void convert(std::ostream* s, const T& in) { + *s << in; } }; template - struct StringStream : StringStreamBase::value> + struct StringStream : public StringStreamBase::value> {}; template - void toStream(std::ostream* stream, const T& value) { - StringStream::convert(stream, value); + void toStream(std::ostream* s, const T& value) { + StringStream::convert(s, value); } #ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING - DOCTEST_INTERFACE void toStream(std::ostream* stream, char* in); - DOCTEST_INTERFACE void toStream(std::ostream* stream, const char* in); + DOCTEST_INTERFACE void toStream(std::ostream* s, char* in); + DOCTEST_INTERFACE void toStream(std::ostream* s, const char* in); #endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING - DOCTEST_INTERFACE void toStream(std::ostream* stream, bool in); - DOCTEST_INTERFACE void toStream(std::ostream* stream, float in); - DOCTEST_INTERFACE void toStream(std::ostream* stream, double in); - DOCTEST_INTERFACE void toStream(std::ostream* stream, double long in); - - DOCTEST_INTERFACE void toStream(std::ostream* stream, char in); - DOCTEST_INTERFACE void toStream(std::ostream* stream, char signed in); - DOCTEST_INTERFACE void toStream(std::ostream* stream, char unsigned in); - DOCTEST_INTERFACE void toStream(std::ostream* stream, int short in); - DOCTEST_INTERFACE void toStream(std::ostream* stream, int short unsigned in); - DOCTEST_INTERFACE void toStream(std::ostream* stream, int in); - DOCTEST_INTERFACE void toStream(std::ostream* stream, int unsigned in); - DOCTEST_INTERFACE void toStream(std::ostream* stream, int long in); - DOCTEST_INTERFACE void toStream(std::ostream* stream, int long unsigned in); - -#ifdef DOCTEST_CONFIG_WITH_LONG_LONG - DOCTEST_INTERFACE void toStream(std::ostream* stream, int long long in); - DOCTEST_INTERFACE void toStream(std::ostream* stream, int long long unsigned in); -#endif // DOCTEST_CONFIG_WITH_LONG_LONG - - struct IContextScope - { - virtual ~IContextScope() {} - virtual void build(std::ostream*) = 0; - }; - - DOCTEST_INTERFACE void addToContexts(IContextScope* ptr); - DOCTEST_INTERFACE void popFromContexts(); - DOCTEST_INTERFACE void useContextIfExceptionOccurred(IContextScope* ptr); - - // cppcheck-suppress copyCtorAndEqOperator - class ContextBuilder + DOCTEST_INTERFACE void toStream(std::ostream* s, bool in); + DOCTEST_INTERFACE void toStream(std::ostream* s, float in); + DOCTEST_INTERFACE void toStream(std::ostream* s, double in); + DOCTEST_INTERFACE void toStream(std::ostream* s, double long in); + + DOCTEST_INTERFACE void toStream(std::ostream* s, char in); + DOCTEST_INTERFACE void toStream(std::ostream* s, char signed in); + DOCTEST_INTERFACE void toStream(std::ostream* s, char unsigned in); + DOCTEST_INTERFACE void toStream(std::ostream* s, int short in); + DOCTEST_INTERFACE void toStream(std::ostream* s, int short unsigned in); + DOCTEST_INTERFACE void toStream(std::ostream* s, int in); + DOCTEST_INTERFACE void toStream(std::ostream* s, int unsigned in); + DOCTEST_INTERFACE void toStream(std::ostream* s, int long in); + DOCTEST_INTERFACE void toStream(std::ostream* s, int long unsigned in); + DOCTEST_INTERFACE void toStream(std::ostream* s, int long long in); + DOCTEST_INTERFACE void toStream(std::ostream* s, int long long unsigned in); + + class DOCTEST_INTERFACE ContextBuilder { friend class ContextScope; - struct ICapture + struct DOCTEST_INTERFACE ICapture { - virtual ~ICapture() {} + DOCTEST_DELETE_COPIES(ICapture); + ICapture(); + virtual ~ICapture(); virtual void toStream(std::ostream*) const = 0; }; template - struct Capture : ICapture //!OCLINT destructor of virtual class + struct Capture : public ICapture //!OCLINT destructor of virtual class { const T* capture; explicit Capture(const T* in) : capture(in) {} - virtual void toStream(std::ostream* stream) const { // override - detail::toStream(stream, *capture); - } + void toStream(std::ostream* s) const override { detail::toStream(s, *capture); } }; - struct Chunk + struct DOCTEST_INTERFACE Chunk { - char buf[sizeof(Capture)]; // place to construct a Capture + char buf[sizeof(Capture)] DOCTEST_ALIGNMENT( + 2 * sizeof(void*)); // place to construct a Capture + + DOCTEST_DECLARE_DEFAULTS(Chunk); + DOCTEST_DELETE_COPIES(Chunk); }; - struct Node + struct DOCTEST_INTERFACE Node { Chunk chunk; Node* next; + + DOCTEST_DECLARE_DEFAULTS(Node); + DOCTEST_DELETE_COPIES(Node); }; Chunk stackChunks[DOCTEST_CONFIG_NUM_CAPTURES_ON_STACK]; - int numCaptures; - Node* head; - Node* tail; - - void build(std::ostream* stream) const { - int curr = 0; - // iterate over small buffer - while(curr < numCaptures && curr < DOCTEST_CONFIG_NUM_CAPTURES_ON_STACK) - reinterpret_cast(stackChunks[curr++].buf)->toStream(stream); - // iterate over list - Node* curr_elem = head; - while(curr < numCaptures) { - reinterpret_cast(curr_elem->chunk.buf)->toStream(stream); - curr_elem = curr_elem->next; - ++curr; - } - } + int numCaptures = 0; + Node* head = nullptr; + Node* tail = nullptr; - // steal the contents of the other - acting as a move constructor... - DOCTEST_NOINLINE ContextBuilder(ContextBuilder& other) - : numCaptures(other.numCaptures) - , head(other.head) - , tail(other.tail) { - other.numCaptures = 0; - other.head = 0; - other.tail = 0; - my_memcpy(stackChunks, other.stackChunks, - unsigned(int(sizeof(Chunk)) * DOCTEST_CONFIG_NUM_CAPTURES_ON_STACK)); - } + ContextBuilder(ContextBuilder& other); + + ContextBuilder& operator=(const ContextBuilder&) = delete; - ContextBuilder& operator=(const ContextBuilder&); // NOLINT + void stringify(std::ostream* s) const; public: - // cppcheck-suppress uninitMemberVar - DOCTEST_NOINLINE ContextBuilder() // NOLINT - : numCaptures(0) - , head(0) - , tail(0) {} + ContextBuilder(); + ~ContextBuilder(); template DOCTEST_NOINLINE ContextBuilder& operator<<(T& in) { @@ -1826,8 +1576,8 @@ namespace detail if(numCaptures < DOCTEST_CONFIG_NUM_CAPTURES_ON_STACK) { my_memcpy(stackChunks[numCaptures].buf, &temp, sizeof(Chunk)); } else { - Node* curr = new Node; - curr->next = 0; + auto curr = new Node; + curr->next = nullptr; if(tail) { tail->next = curr; tail = curr; @@ -1841,62 +1591,39 @@ namespace detail return *this; } - DOCTEST_NOINLINE ~ContextBuilder() { - // free the linked list - the ones on the stack are left as-is - // no destructors are called at all - there is no need - while(head) { - Node* next = head->next; - delete head; - head = next; - } - } - -#ifdef DOCTEST_CONFIG_WITH_RVALUE_REFERENCES template ContextBuilder& operator<<(const T&&) { - DOCTEST_STATIC_ASSERT( - deferred_false::value, - Cannot_pass_temporaries_or_rvalues_to_the_streaming_operator_because_it_caches_pointers_to_the_passed_objects_for_lazy_evaluation); + static_assert(deferred_false::value, + "Cannot pass temporaries or rvalues to the streaming operator because it " + "caches pointers to the passed objects for lazy evaluation!"); return *this; } -#endif // DOCTEST_CONFIG_WITH_RVALUE_REFERENCES }; - class ContextScope : public IContextScope + class DOCTEST_INTERFACE ContextScope : public IContextScope { ContextBuilder contextBuilder; - bool built; public: - DOCTEST_NOINLINE explicit ContextScope(ContextBuilder& temp) - : contextBuilder(temp) - , built(false) { - addToContexts(this); - } + explicit ContextScope(ContextBuilder& temp); - DOCTEST_NOINLINE ~ContextScope() { - if(!built) - useContextIfExceptionOccurred(this); - popFromContexts(); - } + DOCTEST_DELETE_COPIES(ContextScope); - void build(std::ostream* stream) { - built = true; - contextBuilder.build(stream); - } + ~ContextScope(); + + void stringify(std::ostream* s) const; }; - class DOCTEST_INTERFACE MessageBuilder + struct DOCTEST_INTERFACE MessageBuilder : public MessageData { - std::ostream* m_stream; - const char* m_file; - int m_line; - assertType::Enum m_severity; + std::ostream* m_stream; - public: MessageBuilder(const char* file, int line, assertType::Enum severity); + MessageBuilder() = delete; ~MessageBuilder(); + DOCTEST_DELETE_COPIES(MessageBuilder); + template MessageBuilder& operator<<(const T& in) { toStream(m_stream, in); @@ -1908,86 +1635,42 @@ namespace detail }; } // namespace detail -struct test_suite -{ - const char* data; - test_suite(const char* in) - : data(in) {} - void fill(detail::TestCase& state) const { state.m_test_suite = data; } - void fill(detail::TestSuite& state) const { state.m_test_suite = data; } -}; - -struct description -{ - const char* data; - description(const char* in) - : data(in) {} - void fill(detail::TestCase& state) const { state.m_description = data; } - void fill(detail::TestSuite& state) const { state.m_description = data; } -}; - -struct skip -{ - bool data; - skip(bool in = true) - : data(in) {} - void fill(detail::TestCase& state) const { state.m_skip = data; } - void fill(detail::TestSuite& state) const { state.m_skip = data; } -}; - -struct timeout -{ - double data; - timeout(double in) - : data(in) {} - void fill(detail::TestCase& state) const { state.m_timeout = data; } - void fill(detail::TestSuite& state) const { state.m_timeout = data; } -}; - -struct may_fail -{ - bool data; - may_fail(bool in = true) - : data(in) {} - void fill(detail::TestCase& state) const { state.m_may_fail = data; } - void fill(detail::TestSuite& state) const { state.m_may_fail = data; } -}; - -struct should_fail -{ - bool data; - should_fail(bool in = true) - : data(in) {} - void fill(detail::TestCase& state) const { state.m_should_fail = data; } - void fill(detail::TestSuite& state) const { state.m_should_fail = data; } -}; - -struct expected_failures -{ - int data; - expected_failures(int in) - : data(in) {} - void fill(detail::TestCase& state) const { state.m_expected_failures = data; } - void fill(detail::TestSuite& state) const { state.m_expected_failures = data; } -}; +#define DOCTEST_DEFINE_DECORATOR(name, type, def) \ + struct name \ + { \ + type data; \ + name(type in = def) \ + : data(in) {} \ + void fill(detail::TestCase& state) const { state.DOCTEST_CAT(m_, name) = data; } \ + void fill(detail::TestSuite& state) const { state.DOCTEST_CAT(m_, name) = data; } \ + } -#endif // DOCTEST_CONFIG_DISABLE +DOCTEST_DEFINE_DECORATOR(test_suite, const char*, ""); +DOCTEST_DEFINE_DECORATOR(description, const char*, ""); +DOCTEST_DEFINE_DECORATOR(skip, bool, true); +DOCTEST_DEFINE_DECORATOR(timeout, double, 0); +DOCTEST_DEFINE_DECORATOR(may_fail, bool, true); +DOCTEST_DEFINE_DECORATOR(should_fail, bool, true); +DOCTEST_DEFINE_DECORATOR(expected_failures, int, 0); -#ifndef DOCTEST_CONFIG_DISABLE template int registerExceptionTranslator(String (*translateFunction)(T)) { -#if defined(__clang__) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wexit-time-destructors" -#endif // __clang__ + DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wexit-time-destructors") static detail::ExceptionTranslator exceptionTranslator(translateFunction); -#if defined(__clang__) -#pragma clang diagnostic pop -#endif // __clang__ + DOCTEST_CLANG_SUPPRESS_WARNING_POP detail::registerExceptionTranslatorImpl(&exceptionTranslator); return 0; } +} // namespace doctest + +// in a separate namespace outside of doctest because the DOCTEST_TEST_SUITE macro +// introduces an anonymous namespace in which getCurrentTestSuite gets overridden +namespace doctest_detail_test_suite_ns { +DOCTEST_INTERFACE doctest::detail::TestSuite& getCurrentTestSuite(); +} // namespace doctest_detail_test_suite_ns + +namespace doctest { #else // DOCTEST_CONFIG_DISABLE template int registerExceptionTranslator(String (*)(T)) { @@ -1995,20 +1678,21 @@ int registerExceptionTranslator(String (*)(T)) { } #endif // DOCTEST_CONFIG_DISABLE -DOCTEST_INTERFACE bool isRunningInTest(); +namespace detail { + typedef void (*assert_handler)(const AssertData&); + struct ContextState; +} // namespace detail -// cppcheck-suppress noCopyConstructor class DOCTEST_INTERFACE Context { -#if !defined(DOCTEST_CONFIG_DISABLE) detail::ContextState* p; void parseArgs(int argc, const char* const* argv, bool withDefaults = false); -#endif // DOCTEST_CONFIG_DISABLE - public: - explicit Context(int argc = 0, const char* const* argv = 0); + explicit Context(int argc = 0, const char* const* argv = nullptr); + + DOCTEST_DELETE_COPIES(Context); ~Context(); @@ -2021,22 +1705,116 @@ class DOCTEST_INTERFACE Context bool shouldExit(); + void setAsDefaultForAssertsOutOfTestCases(); + + void setAssertHandler(detail::assert_handler ah); + int run(); }; +namespace TestCaseFailureReason { + enum Enum + { + None = 0, + AssertFailure = 1, // an assertion has failed in the test case + Exception = 2, // test case threw an exception + Crash = 4, // a crash... + TooManyFailedAsserts = 8, // the abort-after option + Timeout = 16, // see the timeout decorator + ShouldHaveFailedButDidnt = 32, // see the should_fail decorator + ShouldHaveFailedAndDid = 64, // see the should_fail decorator + DidntFailExactlyNumTimes = 128, // see the expected_failures decorator + FailedExactlyNumTimes = 256, // see the expected_failures decorator + CouldHaveFailedAndDid = 512 // see the may_fail decorator + }; +} // namespace TestCaseFailureReason + +struct DOCTEST_INTERFACE CurrentTestCaseStats +{ + int numAssertsForCurrentTestCase; + int numAssertsFailedForCurrentTestCase; + double seconds_so_far; + int failure_flags; // use TestCaseFailureReason::Enum + String error_string; + bool should_reenter; // means we are not done with the test case because of subcases + + DOCTEST_DECLARE_DEFAULTS(CurrentTestCaseStats); + DOCTEST_DELETE_COPIES(CurrentTestCaseStats); +}; + +struct DOCTEST_INTERFACE TestRunStats +{ + unsigned numTestCases; + unsigned numTestCasesPassingFilters; + unsigned numTestSuitesPassingFilters; + unsigned numTestCasesFailed; + int numAsserts; + int numAssertsFailed; + + DOCTEST_DECLARE_DEFAULTS(TestRunStats); + DOCTEST_DELETE_COPIES(TestRunStats); +}; + +struct DOCTEST_INTERFACE IReporter +{ + // called when the whole test run starts (safe to cache a pointer to the input) + virtual void test_run_start(const ContextOptions&) = 0; + // called when the whole test run ends (caching a pointer to the input doesn't make sense here) + virtual void test_run_end(const TestRunStats&) = 0; + + // called when a test case is started (safe to cache a pointer to the input) + virtual void test_case_start(const TestCaseData&) = 0; + // called when a test case has ended - could be re-entered if more subcases have to be + // traversed - check CurrentTestCaseStats::should_reenter (caching a pointer to the input doesn't make sense here) + virtual void test_case_end(const CurrentTestCaseStats&) = 0; + + // called whenever a subcase is entered (don't cache pointers to the input) + virtual void subcase_start(const SubcaseSignature&) = 0; + // called whenever a subcase is exited (don't cache pointers to the input) + virtual void subcase_end(const SubcaseSignature&) = 0; + + // called for each assert (don't cache pointers to the input) + virtual void log_assert(const AssertData&) = 0; + // called for each message (don't cache pointers to the input) + virtual void log_message(const MessageData&) = 0; + + // called when a test case is skipped either because it doesn't pass the filters, has a skip decorator + // or isn't in the execution range (between first and last) (safe to cache a pointer to the input) + virtual void test_case_skipped(const TestCaseData&) = 0; + + // doctest will not be managing the lifetimes of reporters given to it but this would still be nice to have + virtual ~IReporter(); + + // can obtain all currently active contexts and stringify them if one wishes to do so + static int get_num_active_contexts(); + static const IContextScope* const* get_active_contexts(); + + // can iterate through contexts which have been stringified automatically in their destructors when an exception has been thrown + static int get_num_stringified_contexts(); + static const String* get_stringified_contexts(); +}; + +int registerReporter(const char* name, int priority, IReporter& r); + } // namespace doctest // if registering is not disabled #if !defined(DOCTEST_CONFIG_DISABLE) -#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_EXPAND_VA_ARGS(...) __VA_ARGS__ -#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_EXPAND_VA_ARGS -#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS +// common code in asserts - for convenience +#define DOCTEST_ASSERT_LOG_AND_REACT(b) \ + if(b.log()) \ + DOCTEST_BREAK_INTO_DEBUGGER(); \ + b.react() -#define DOCTEST_STRIP_PARENS(x) x -#define DOCTEST_HANDLE_BRACED_VA_ARGS(expr) DOCTEST_STRIP_PARENS(DOCTEST_EXPAND_VA_ARGS expr) +#ifdef DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS +#define DOCTEST_WRAP_IN_TRY(x) x; +#else // DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS +#define DOCTEST_WRAP_IN_TRY(x) \ + try { \ + x; \ + } catch(...) { _DOCTEST_RB.unexpectedExceptionOccurred(); } +#endif // DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS // registers the test by initializing a dummy var with a function #define DOCTEST_REGISTER_FUNCTION(f, decorators) \ @@ -2047,9 +1825,8 @@ class DOCTEST_INTERFACE Context DOCTEST_GLOBAL_NO_WARNINGS_END() #define DOCTEST_IMPLEMENT_FIXTURE(der, base, func, decorators) \ - namespace \ - { \ - struct der : base \ + namespace { \ + struct der : public base \ { \ void f(); \ }; \ @@ -2076,140 +1853,90 @@ class DOCTEST_INTERFACE Context DOCTEST_ANONYMOUS(_DOCTEST_ANON_FUNC_), decorators) // for converting types to strings without the header and demangling -#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS #define DOCTEST_TYPE_TO_STRING_IMPL(...) \ template <> \ inline const char* type_to_string<__VA_ARGS__>() { \ return "<" #__VA_ARGS__ ">"; \ } #define DOCTEST_TYPE_TO_STRING(...) \ - namespace doctest \ - { \ - namespace detail \ - { \ + namespace doctest { namespace detail { \ DOCTEST_TYPE_TO_STRING_IMPL(__VA_ARGS__) \ } \ } \ typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_) -#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_TYPE_TO_STRING_IMPL(x) \ - template <> \ - inline const char* type_to_string() { \ - return "<" #x ">"; \ - } -#define DOCTEST_TYPE_TO_STRING(x) \ - namespace doctest \ - { \ - namespace detail \ - { \ - DOCTEST_TYPE_TO_STRING_IMPL(x) \ - } \ - } \ - typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_) -#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS // for typed tests -#define DOCTEST_TEST_CASE_TEMPLATE_IMPL(decorators, T, types, anon) \ +#define DOCTEST_REGISTER_TYPED_TEST_CASE_IMPL(func, type, decorators, idx) \ + doctest::detail::regTest( \ + doctest::detail::TestCase(func, __FILE__, __LINE__, \ + doctest_detail_test_suite_ns::getCurrentTestSuite(), \ + doctest::detail::type_to_string(), idx) * \ + decorators) + +#define DOCTEST_TEST_CASE_TEMPLATE_DEFINE_IMPL(dec, T, id, anon) \ template \ inline void anon(); \ - struct DOCTEST_CAT(anon, FUNCTOR) \ + template \ + struct DOCTEST_CAT(id, ITERATOR) \ { \ - template \ - void operator()() { \ - doctest::detail::regTest( \ - doctest::detail::TestCase(anon, __FILE__, __LINE__, \ - doctest_detail_test_suite_ns::getCurrentTestSuite(), \ - doctest::detail::type_to_string(), Index) * \ - decorators); \ + DOCTEST_CAT(id, ITERATOR)(int line, int index) { \ + DOCTEST_REGISTER_TYPED_TEST_CASE_IMPL(anon, Type, dec, line * 1000 + index); \ + DOCTEST_CAT(id, ITERATOR)(line, index + 1); \ } \ }; \ - inline int DOCTEST_CAT(anon, REG_FUNC)() { \ - DOCTEST_CAT(anon, FUNCTOR) registrar; \ - doctest::detail::ForEachType \ - doIt(registrar); \ - return 0; \ - } \ - DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_CAT(anon, DUMMY)) = DOCTEST_CAT(anon, REG_FUNC)(); \ - DOCTEST_GLOBAL_NO_WARNINGS_END() \ + template \ + struct DOCTEST_CAT(id, ITERATOR) \ + { \ + DOCTEST_CAT(id, ITERATOR)(int line, int index) { \ + DOCTEST_REGISTER_TYPED_TEST_CASE_IMPL(anon, Type, dec, line * 1000 + index); \ + } \ + } + +#define DOCTEST_TEST_CASE_TEMPLATE_DEFINE_IMPL_PROXY(dec, T, id, anon) \ + DOCTEST_TEST_CASE_TEMPLATE_DEFINE_IMPL(dec, T, id, anon); \ template \ inline void anon() -#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_TEST_CASE_TEMPLATE(decorators, T, ...) \ - DOCTEST_TEST_CASE_TEMPLATE_IMPL(decorators, T, (__VA_ARGS__), \ - DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_)) -#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_TEST_CASE_TEMPLATE(decorators, T, types) \ - DOCTEST_TEST_CASE_TEMPLATE_IMPL(decorators, T, types, DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_)) -#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS +#define DOCTEST_TEST_CASE_TEMPLATE_DEFINE(dec, T, id) \ + DOCTEST_TEST_CASE_TEMPLATE_DEFINE_IMPL_PROXY(dec, T, id, DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_)) -#define DOCTEST_TEST_CASE_TEMPLATE_DEFINE_IMPL(decorators, T, id, anon) \ - template \ - inline void anon(); \ - struct DOCTEST_CAT(id, _FUNCTOR) \ - { \ - int m_line; \ - DOCTEST_CAT(id, _FUNCTOR) \ - (int line) \ - : m_line(line) {} \ - template \ - void operator()() { \ - doctest::detail::regTest( \ - doctest::detail::TestCase(anon, __FILE__, __LINE__, \ - doctest_detail_test_suite_ns::getCurrentTestSuite(), \ - doctest::detail::type_to_string(), \ - m_line * 1000 + Index) * \ - decorators); \ - } \ - }; \ - template \ - inline void anon() - -#define DOCTEST_TEST_CASE_TEMPLATE_DEFINE(decorators, T, id) \ - DOCTEST_TEST_CASE_TEMPLATE_DEFINE_IMPL(decorators, T, id, DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_)) - -#define DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE_IMPL(id, types, anon) \ - static int DOCTEST_CAT(anon, REG_FUNC)() { \ - DOCTEST_CAT(id, _FUNCTOR) registrar(__LINE__); \ - doctest::detail::ForEachType \ - doIt(registrar); \ +#define DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE_IMPL(id, anon, ...) \ + DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_CAT(anon, DUMMY)) = []() { \ + DOCTEST_CAT(id, ITERATOR)<__VA_ARGS__> DOCTEST_UNUSED DOCTEST_CAT(anon, inner_dummy)( \ + __LINE__, 0); \ return 0; \ - } \ - DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_CAT(anon, DUMMY)) = DOCTEST_CAT(anon, REG_FUNC)(); \ - DOCTEST_GLOBAL_NO_WARNINGS_END() typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_) + }(); \ + DOCTEST_GLOBAL_NO_WARNINGS_END() -#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS #define DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE(id, ...) \ - DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE_IMPL(id, (__VA_ARGS__), \ - DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_)) -#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE(id, types) \ - DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE_IMPL(id, types, DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_)) -#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS + DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE_IMPL(id, DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_), \ + __VA_ARGS__) \ + typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_) + +#define DOCTEST_TEST_CASE_TEMPLATE_IMPL(dec, T, anon, ...) \ + DOCTEST_TEST_CASE_TEMPLATE_DEFINE_IMPL_PROXY(dec, T, anon, anon); \ + DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE_IMPL(anon, anon, __VA_ARGS__) \ + template \ + inline void anon() + +#define DOCTEST_TEST_CASE_TEMPLATE(dec, T, ...) \ + DOCTEST_TEST_CASE_TEMPLATE_IMPL(dec, T, DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_), __VA_ARGS__) // for subcases -#if defined(__GNUC__) -#define DOCTEST_SUBCASE(name) \ - if(const doctest::detail::Subcase & DOCTEST_ANONYMOUS(_DOCTEST_ANON_SUBCASE_) \ - __attribute__((unused)) = \ - doctest::detail::Subcase(name, __FILE__, __LINE__)) -#else // __GNUC__ #define DOCTEST_SUBCASE(name) \ - if(const doctest::detail::Subcase & DOCTEST_ANONYMOUS(_DOCTEST_ANON_SUBCASE_) = \ + if(const doctest::detail::Subcase & DOCTEST_ANONYMOUS(_DOCTEST_ANON_SUBCASE_) DOCTEST_UNUSED = \ doctest::detail::Subcase(name, __FILE__, __LINE__)) -#endif // __GNUC__ // for grouping tests in test suites by using code blocks #define DOCTEST_TEST_SUITE_IMPL(decorators, ns_name) \ - namespace ns_name \ - { \ - namespace doctest_detail_test_suite_ns \ - { \ + namespace ns_name { namespace doctest_detail_test_suite_ns { \ static DOCTEST_NOINLINE doctest::detail::TestSuite& getCurrentTestSuite() { \ + DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4640) \ + DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wexit-time-destructors") \ static doctest::detail::TestSuite data; \ static bool inited = false; \ + DOCTEST_MSVC_SUPPRESS_WARNING_POP \ + DOCTEST_CLANG_SUPPRESS_WARNING_POP \ if(!inited) { \ data* decorators; \ inited = true; \ @@ -2239,16 +1966,22 @@ class DOCTEST_INTERFACE Context // for registering exception translators #define DOCTEST_REGISTER_EXCEPTION_TRANSLATOR_IMPL(translatorName, signature) \ - static doctest::String translatorName(signature); \ + inline doctest::String translatorName(signature); \ DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(_DOCTEST_ANON_TRANSLATOR_)) = \ doctest::registerExceptionTranslator(translatorName); \ DOCTEST_GLOBAL_NO_WARNINGS_END() \ - static doctest::String translatorName(signature) + doctest::String translatorName(signature) #define DOCTEST_REGISTER_EXCEPTION_TRANSLATOR(signature) \ DOCTEST_REGISTER_EXCEPTION_TRANSLATOR_IMPL(DOCTEST_ANONYMOUS(_DOCTEST_ANON_TRANSLATOR_), \ signature) +// for registering +#define DOCTEST_REGISTER_REPORTER(name, priority, reporter) \ + DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(_DOCTEST_ANON_REPORTER_)) = \ + doctest::registerReporter(name, priority, reporter); \ + DOCTEST_GLOBAL_NO_WARNINGS_END() typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_) + // for logging #define DOCTEST_INFO(x) \ doctest::detail::ContextScope DOCTEST_ANONYMOUS(_DOCTEST_CAPTURE_)( \ @@ -2257,11 +1990,9 @@ class DOCTEST_INTERFACE Context #define DOCTEST_ADD_AT_IMPL(type, file, line, mb, x) \ do { \ - doctest::detail::MessageBuilder mb(file, line, doctest::detail::assertType::type); \ + doctest::detail::MessageBuilder mb(file, line, doctest::assertType::type); \ mb << x; \ - if(mb.log()) \ - DOCTEST_BREAK_INTO_DEBUGGER(); \ - mb.react(); \ + DOCTEST_ASSERT_LOG_AND_REACT(mb); \ } while((void)0, 0) // clang-format off @@ -2274,96 +2005,51 @@ class DOCTEST_INTERFACE Context #define DOCTEST_FAIL_CHECK(x) DOCTEST_ADD_FAIL_CHECK_AT(__FILE__, __LINE__, x) #define DOCTEST_FAIL(x) DOCTEST_ADD_FAIL_AT(__FILE__, __LINE__, x) -#if __cplusplus >= 201402L || (defined(_MSC_VER) && _MSC_VER >= 1910) +// hack for macros like INFO() that require lvalues +#if __cplusplus >= 201402L || (DOCTEST_MSVC >= DOCTEST_COMPILER(19, 10, 0)) template constexpr T to_lvalue = x; #define DOCTEST_TO_LVALUE(...) to_lvalue -#else -#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS +#else // TO_LVALUE #define DOCTEST_TO_LVALUE(...) TO_LVALUE_CAN_BE_USED_ONLY_IN_CPP14_MODE_OR_WITH_VS_2017_OR_NEWER -#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_TO_LVALUE(x) TO_LVALUE_CAN_BE_USED_ONLY_IN_CPP14_MODE_OR_WITH_VS_2017_OR_NEWER -#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#endif // TO_LVALUE hack for logging macros like INFO() +#endif // TO_LVALUE -// common code in asserts - for convenience -#define DOCTEST_ASSERT_LOG_AND_REACT(rb) \ - if(rb.log()) \ - DOCTEST_BREAK_INTO_DEBUGGER(); \ - rb.react() - -#ifdef DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS -#define DOCTEST_WRAP_IN_TRY(x) x; -#else // DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS -#define DOCTEST_WRAP_IN_TRY(x) \ - try { \ - x; \ - } catch(...) { _DOCTEST_RB.unexpectedExceptionOccurred(); } -#endif // DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS - -#define DOCTEST_ASSERT_IMPLEMENT_3(expr, assert_type) \ - doctest::detail::ResultBuilder _DOCTEST_RB( \ - doctest::detail::assertType::assert_type, __FILE__, __LINE__, \ - DOCTEST_TOSTR(DOCTEST_HANDLE_BRACED_VA_ARGS(expr))); \ +#define DOCTEST_ASSERT_IMPLEMENT_2(assert_type, ...) \ + DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Woverloaded-shift-op-parentheses") \ + doctest::detail::ResultBuilder _DOCTEST_RB(doctest::assertType::assert_type, __FILE__, \ + __LINE__, #__VA_ARGS__); \ DOCTEST_WRAP_IN_TRY(_DOCTEST_RB.setResult( \ - doctest::detail::ExpressionDecomposer(doctest::detail::assertType::assert_type) \ - << DOCTEST_HANDLE_BRACED_VA_ARGS(expr))) \ - DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB) - -#if defined(__clang__) -#define DOCTEST_ASSERT_IMPLEMENT_2(expr, assert_type) \ - _Pragma("clang diagnostic push") \ - _Pragma("clang diagnostic ignored \"-Woverloaded-shift-op-parentheses\"") \ - DOCTEST_ASSERT_IMPLEMENT_3(expr, assert_type); \ - _Pragma("clang diagnostic pop") -#else // __clang__ -#define DOCTEST_ASSERT_IMPLEMENT_2(expr, assert_type) DOCTEST_ASSERT_IMPLEMENT_3(expr, assert_type); -#endif // __clang__ - -#define DOCTEST_ASSERT_IMPLEMENT_1(expr, assert_type) \ + doctest::detail::ExpressionDecomposer(doctest::assertType::assert_type) \ + << __VA_ARGS__)) \ + DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB) \ + DOCTEST_CLANG_SUPPRESS_WARNING_POP + +#define DOCTEST_ASSERT_IMPLEMENT_1(assert_type, ...) \ do { \ - DOCTEST_ASSERT_IMPLEMENT_2(expr, assert_type); \ + DOCTEST_ASSERT_IMPLEMENT_2(assert_type, __VA_ARGS__); \ } while((void)0, 0) -#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_WARN(...) DOCTEST_ASSERT_IMPLEMENT_1((__VA_ARGS__), DT_WARN) -#define DOCTEST_CHECK(...) DOCTEST_ASSERT_IMPLEMENT_1((__VA_ARGS__), DT_CHECK) -#define DOCTEST_REQUIRE(...) DOCTEST_ASSERT_IMPLEMENT_1((__VA_ARGS__), DT_REQUIRE) -#define DOCTEST_WARN_FALSE(...) DOCTEST_ASSERT_IMPLEMENT_1((__VA_ARGS__), DT_WARN_FALSE) -#define DOCTEST_CHECK_FALSE(...) DOCTEST_ASSERT_IMPLEMENT_1((__VA_ARGS__), DT_CHECK_FALSE) -#define DOCTEST_REQUIRE_FALSE(...) DOCTEST_ASSERT_IMPLEMENT_1((__VA_ARGS__), DT_REQUIRE_FALSE) -#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_WARN(expr) DOCTEST_ASSERT_IMPLEMENT_1(expr, DT_WARN) -#define DOCTEST_CHECK(expr) DOCTEST_ASSERT_IMPLEMENT_1(expr, DT_CHECK) -#define DOCTEST_REQUIRE(expr) DOCTEST_ASSERT_IMPLEMENT_1(expr, DT_REQUIRE) -#define DOCTEST_WARN_FALSE(expr) DOCTEST_ASSERT_IMPLEMENT_1(expr, DT_WARN_FALSE) -#define DOCTEST_CHECK_FALSE(expr) DOCTEST_ASSERT_IMPLEMENT_1(expr, DT_CHECK_FALSE) -#define DOCTEST_REQUIRE_FALSE(expr) DOCTEST_ASSERT_IMPLEMENT_1(expr, DT_REQUIRE_FALSE) -#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS +#define DOCTEST_WARN(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_WARN, __VA_ARGS__) +#define DOCTEST_CHECK(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_CHECK, __VA_ARGS__) +#define DOCTEST_REQUIRE(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_REQUIRE, __VA_ARGS__) +#define DOCTEST_WARN_FALSE(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_WARN_FALSE, __VA_ARGS__) +#define DOCTEST_CHECK_FALSE(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_CHECK_FALSE, __VA_ARGS__) +#define DOCTEST_REQUIRE_FALSE(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_REQUIRE_FALSE, __VA_ARGS__) // clang-format off -#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_WARN_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2((cond), DT_WARN); } while((void)0, 0) -#define DOCTEST_CHECK_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2((cond), DT_CHECK); } while((void)0, 0) -#define DOCTEST_REQUIRE_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2((cond), DT_REQUIRE); } while((void)0, 0) -#define DOCTEST_WARN_FALSE_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2((cond), DT_WARN_FALSE); } while((void)0, 0) -#define DOCTEST_CHECK_FALSE_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2((cond), DT_CHECK_FALSE); } while((void)0, 0) -#define DOCTEST_REQUIRE_FALSE_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2((cond), DT_REQUIRE_FALSE); } while((void)0, 0) -#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_WARN_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2(cond, DT_WARN); } while((void)0, 0) -#define DOCTEST_CHECK_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2(cond, DT_CHECK); } while((void)0, 0) -#define DOCTEST_REQUIRE_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2(cond, DT_REQUIRE); } while((void)0, 0) -#define DOCTEST_WARN_FALSE_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2(cond, DT_WARN_FALSE); } while((void)0, 0) -#define DOCTEST_CHECK_FALSE_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2(cond, DT_CHECK_FALSE); } while((void)0, 0) -#define DOCTEST_REQUIRE_FALSE_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2(cond, DT_REQUIRE_FALSE); } while((void)0, 0) -#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS +#define DOCTEST_WARN_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2(DT_WARN, cond); } while((void)0, 0) +#define DOCTEST_CHECK_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2(DT_CHECK, cond); } while((void)0, 0) +#define DOCTEST_REQUIRE_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2(DT_REQUIRE, cond); } while((void)0, 0) +#define DOCTEST_WARN_FALSE_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2(DT_WARN_FALSE, cond); } while((void)0, 0) +#define DOCTEST_CHECK_FALSE_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2(DT_CHECK_FALSE, cond); } while((void)0, 0) +#define DOCTEST_REQUIRE_FALSE_MESSAGE(cond, msg) do { DOCTEST_INFO(msg); DOCTEST_ASSERT_IMPLEMENT_2(DT_REQUIRE_FALSE, cond); } while((void)0, 0) // clang-format on #define DOCTEST_ASSERT_THROWS(expr, assert_type) \ do { \ - if(!doctest::detail::getTestsContextState()->no_throw) { \ - doctest::detail::ResultBuilder _DOCTEST_RB(doctest::detail::assertType::assert_type, \ - __FILE__, __LINE__, #expr); \ + if(!doctest::getContextOptions()->no_throw) { \ + doctest::detail::ResultBuilder _DOCTEST_RB(doctest::assertType::assert_type, __FILE__, \ + __LINE__, #expr); \ try { \ expr; \ } catch(...) { _DOCTEST_RB.m_threw = true; } \ @@ -2371,15 +2057,14 @@ constexpr T to_lvalue = x; } \ } while((void)0, 0) -#define DOCTEST_ASSERT_THROWS_AS(expr, as, assert_type) \ +#define DOCTEST_ASSERT_THROWS_AS(expr, assert_type, ...) \ do { \ - if(!doctest::detail::getTestsContextState()->no_throw) { \ - doctest::detail::ResultBuilder _DOCTEST_RB( \ - doctest::detail::assertType::assert_type, __FILE__, __LINE__, #expr, \ - DOCTEST_TOSTR(DOCTEST_HANDLE_BRACED_VA_ARGS(as))); \ + if(!doctest::getContextOptions()->no_throw) { \ + doctest::detail::ResultBuilder _DOCTEST_RB(doctest::assertType::assert_type, __FILE__, \ + __LINE__, #expr, #__VA_ARGS__); \ try { \ expr; \ - } catch(const DOCTEST_HANDLE_BRACED_VA_ARGS(as)&) { \ + } catch(const __VA_ARGS__&) { \ _DOCTEST_RB.m_threw = true; \ _DOCTEST_RB.m_threw_as = true; \ } catch(...) { _DOCTEST_RB.unexpectedExceptionOccurred(); } \ @@ -2389,9 +2074,9 @@ constexpr T to_lvalue = x; #define DOCTEST_ASSERT_NOTHROW(expr, assert_type) \ do { \ - if(!doctest::detail::getTestsContextState()->no_throw) { \ - doctest::detail::ResultBuilder _DOCTEST_RB(doctest::detail::assertType::assert_type, \ - __FILE__, __LINE__, #expr); \ + if(!doctest::getContextOptions()->no_throw) { \ + doctest::detail::ResultBuilder _DOCTEST_RB(doctest::assertType::assert_type, __FILE__, \ + __LINE__, #expr); \ try { \ expr; \ } catch(...) { _DOCTEST_RB.unexpectedExceptionOccurred(); } \ @@ -2399,27 +2084,19 @@ constexpr T to_lvalue = x; } \ } while((void)0, 0) +// clang-format off #define DOCTEST_WARN_THROWS(expr) DOCTEST_ASSERT_THROWS(expr, DT_WARN_THROWS) #define DOCTEST_CHECK_THROWS(expr) DOCTEST_ASSERT_THROWS(expr, DT_CHECK_THROWS) #define DOCTEST_REQUIRE_THROWS(expr) DOCTEST_ASSERT_THROWS(expr, DT_REQUIRE_THROWS) -// clang-format off -#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_WARN_THROWS_AS(expr, ...) DOCTEST_ASSERT_THROWS_AS(expr, (__VA_ARGS__), DT_WARN_THROWS_AS) -#define DOCTEST_CHECK_THROWS_AS(expr, ...) DOCTEST_ASSERT_THROWS_AS(expr, (__VA_ARGS__), DT_CHECK_THROWS_AS) -#define DOCTEST_REQUIRE_THROWS_AS(expr, ...) DOCTEST_ASSERT_THROWS_AS(expr, (__VA_ARGS__), DT_REQUIRE_THROWS_AS) -#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_WARN_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_WARN_THROWS_AS) -#define DOCTEST_CHECK_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_CHECK_THROWS_AS) -#define DOCTEST_REQUIRE_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_REQUIRE_THROWS_AS) -#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS -// clang-format on +#define DOCTEST_WARN_THROWS_AS(expr, ...) DOCTEST_ASSERT_THROWS_AS(expr, DT_WARN_THROWS_AS, __VA_ARGS__) +#define DOCTEST_CHECK_THROWS_AS(expr, ...) DOCTEST_ASSERT_THROWS_AS(expr, DT_CHECK_THROWS_AS, __VA_ARGS__) +#define DOCTEST_REQUIRE_THROWS_AS(expr, ...) DOCTEST_ASSERT_THROWS_AS(expr, DT_REQUIRE_THROWS_AS, __VA_ARGS__) #define DOCTEST_WARN_NOTHROW(expr) DOCTEST_ASSERT_NOTHROW(expr, DT_WARN_NOTHROW) #define DOCTEST_CHECK_NOTHROW(expr) DOCTEST_ASSERT_NOTHROW(expr, DT_CHECK_NOTHROW) #define DOCTEST_REQUIRE_NOTHROW(expr) DOCTEST_ASSERT_NOTHROW(expr, DT_REQUIRE_NOTHROW) -// clang-format off #define DOCTEST_WARN_THROWS_MESSAGE(expr, msg) do { DOCTEST_INFO(msg); DOCTEST_WARN_THROWS(expr); } while((void)0, 0) #define DOCTEST_CHECK_THROWS_MESSAGE(expr, msg) do { DOCTEST_INFO(msg); DOCTEST_CHECK_THROWS(expr); } while((void)0, 0) #define DOCTEST_REQUIRE_THROWS_MESSAGE(expr, msg) do { DOCTEST_INFO(msg); DOCTEST_REQUIRE_THROWS(expr); } while((void)0, 0) @@ -2431,125 +2108,66 @@ constexpr T to_lvalue = x; #define DOCTEST_REQUIRE_NOTHROW_MESSAGE(expr, msg) do { DOCTEST_INFO(msg); DOCTEST_REQUIRE_NOTHROW(expr); } while((void)0, 0) // clang-format on -#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_BINARY_ASSERT(assert_type, expr, comp) \ +#define DOCTEST_BINARY_ASSERT(assert_type, comp, ...) \ do { \ - doctest::detail::ResultBuilder _DOCTEST_RB( \ - doctest::detail::assertType::assert_type, __FILE__, __LINE__, \ - DOCTEST_TOSTR(DOCTEST_HANDLE_BRACED_VA_ARGS(expr))); \ + doctest::detail::ResultBuilder _DOCTEST_RB(doctest::assertType::assert_type, __FILE__, \ + __LINE__, #__VA_ARGS__); \ DOCTEST_WRAP_IN_TRY( \ _DOCTEST_RB.binary_assert( \ - DOCTEST_HANDLE_BRACED_VA_ARGS(expr))) \ - DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB); \ - } while((void)0, 0) -#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_BINARY_ASSERT(assert_type, lhs, rhs, comp) \ - do { \ - doctest::detail::ResultBuilder _DOCTEST_RB(doctest::detail::assertType::assert_type, \ - __FILE__, __LINE__, #lhs ", " #rhs); \ - DOCTEST_WRAP_IN_TRY( \ - _DOCTEST_RB.binary_assert(lhs, \ - rhs)) \ + __VA_ARGS__)) \ DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB); \ } while((void)0, 0) -#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_UNARY_ASSERT(assert_type, expr) \ +#define DOCTEST_UNARY_ASSERT(assert_type, ...) \ do { \ - doctest::detail::ResultBuilder _DOCTEST_RB( \ - doctest::detail::assertType::assert_type, __FILE__, __LINE__, \ - DOCTEST_TOSTR(DOCTEST_HANDLE_BRACED_VA_ARGS(expr))); \ - DOCTEST_WRAP_IN_TRY(_DOCTEST_RB.unary_assert(DOCTEST_HANDLE_BRACED_VA_ARGS(expr))) \ + doctest::detail::ResultBuilder _DOCTEST_RB(doctest::assertType::assert_type, __FILE__, \ + __LINE__, #__VA_ARGS__); \ + DOCTEST_WRAP_IN_TRY(_DOCTEST_RB.unary_assert(__VA_ARGS__)) \ DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB); \ } while((void)0, 0) -#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_WARN_EQ(...) DOCTEST_BINARY_ASSERT(DT_WARN_EQ, (__VA_ARGS__), eq) -#define DOCTEST_CHECK_EQ(...) DOCTEST_BINARY_ASSERT(DT_CHECK_EQ, (__VA_ARGS__), eq) -#define DOCTEST_REQUIRE_EQ(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_EQ, (__VA_ARGS__), eq) -#define DOCTEST_WARN_NE(...) DOCTEST_BINARY_ASSERT(DT_WARN_NE, (__VA_ARGS__), ne) -#define DOCTEST_CHECK_NE(...) DOCTEST_BINARY_ASSERT(DT_CHECK_NE, (__VA_ARGS__), ne) -#define DOCTEST_REQUIRE_NE(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_NE, (__VA_ARGS__), ne) -#define DOCTEST_WARN_GT(...) DOCTEST_BINARY_ASSERT(DT_WARN_GT, (__VA_ARGS__), gt) -#define DOCTEST_CHECK_GT(...) DOCTEST_BINARY_ASSERT(DT_CHECK_GT, (__VA_ARGS__), gt) -#define DOCTEST_REQUIRE_GT(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_GT, (__VA_ARGS__), gt) -#define DOCTEST_WARN_LT(...) DOCTEST_BINARY_ASSERT(DT_WARN_LT, (__VA_ARGS__), lt) -#define DOCTEST_CHECK_LT(...) DOCTEST_BINARY_ASSERT(DT_CHECK_LT, (__VA_ARGS__), lt) -#define DOCTEST_REQUIRE_LT(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_LT, (__VA_ARGS__), lt) -#define DOCTEST_WARN_GE(...) DOCTEST_BINARY_ASSERT(DT_WARN_GE, (__VA_ARGS__), ge) -#define DOCTEST_CHECK_GE(...) DOCTEST_BINARY_ASSERT(DT_CHECK_GE, (__VA_ARGS__), ge) -#define DOCTEST_REQUIRE_GE(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_GE, (__VA_ARGS__), ge) -#define DOCTEST_WARN_LE(...) DOCTEST_BINARY_ASSERT(DT_WARN_LE, (__VA_ARGS__), le) -#define DOCTEST_CHECK_LE(...) DOCTEST_BINARY_ASSERT(DT_CHECK_LE, (__VA_ARGS__), le) -#define DOCTEST_REQUIRE_LE(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_LE, (__VA_ARGS__), le) - -#define DOCTEST_WARN_UNARY(...) DOCTEST_UNARY_ASSERT(DT_WARN_UNARY, (__VA_ARGS__)) -#define DOCTEST_CHECK_UNARY(...) DOCTEST_UNARY_ASSERT(DT_CHECK_UNARY, (__VA_ARGS__)) -#define DOCTEST_REQUIRE_UNARY(...) DOCTEST_UNARY_ASSERT(DT_REQUIRE_UNARY, (__VA_ARGS__)) -#define DOCTEST_WARN_UNARY_FALSE(...) DOCTEST_UNARY_ASSERT(DT_WARN_UNARY_FALSE, (__VA_ARGS__)) -#define DOCTEST_CHECK_UNARY_FALSE(...) DOCTEST_UNARY_ASSERT(DT_CHECK_UNARY_FALSE, (__VA_ARGS__)) -#define DOCTEST_REQUIRE_UNARY_FALSE(...) DOCTEST_UNARY_ASSERT(DT_REQUIRE_UNARY_FALSE, (__VA_ARGS__)) -#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_WARN_EQ(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_WARN_EQ, lhs, rhs, eq) -#define DOCTEST_CHECK_EQ(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_CHECK_EQ, lhs, rhs, eq) -#define DOCTEST_REQUIRE_EQ(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_REQUIRE_EQ, lhs, rhs, eq) -#define DOCTEST_WARN_NE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_WARN_NE, lhs, rhs, ne) -#define DOCTEST_CHECK_NE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_CHECK_NE, lhs, rhs, ne) -#define DOCTEST_REQUIRE_NE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_REQUIRE_NE, lhs, rhs, ne) -#define DOCTEST_WARN_GT(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_WARN_GT, lhs, rhs, gt) -#define DOCTEST_CHECK_GT(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_CHECK_GT, lhs, rhs, gt) -#define DOCTEST_REQUIRE_GT(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_REQUIRE_GT, lhs, rhs, gt) -#define DOCTEST_WARN_LT(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_WARN_LT, lhs, rhs, lt) -#define DOCTEST_CHECK_LT(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_CHECK_LT, lhs, rhs, lt) -#define DOCTEST_REQUIRE_LT(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_REQUIRE_LT, lhs, rhs, lt) -#define DOCTEST_WARN_GE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_WARN_GE, lhs, rhs, ge) -#define DOCTEST_CHECK_GE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_CHECK_GE, lhs, rhs, ge) -#define DOCTEST_REQUIRE_GE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_REQUIRE_GE, lhs, rhs, ge) -#define DOCTEST_WARN_LE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_WARN_LE, lhs, rhs, le) -#define DOCTEST_CHECK_LE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_CHECK_LE, lhs, rhs, le) -#define DOCTEST_REQUIRE_LE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_REQUIRE_LE, lhs, rhs, le) - -#define DOCTEST_WARN_UNARY(v) DOCTEST_UNARY_ASSERT(DT_WARN_UNARY, v) -#define DOCTEST_CHECK_UNARY(v) DOCTEST_UNARY_ASSERT(DT_CHECK_UNARY, v) -#define DOCTEST_REQUIRE_UNARY(v) DOCTEST_UNARY_ASSERT(DT_REQUIRE_UNARY, v) -#define DOCTEST_WARN_UNARY_FALSE(v) DOCTEST_UNARY_ASSERT(DT_WARN_UNARY_FALSE, v) -#define DOCTEST_CHECK_UNARY_FALSE(v) DOCTEST_UNARY_ASSERT(DT_CHECK_UNARY_FALSE, v) -#define DOCTEST_REQUIRE_UNARY_FALSE(v) DOCTEST_UNARY_ASSERT(DT_REQUIRE_UNARY_FALSE, v) -#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS +#define DOCTEST_WARN_EQ(...) DOCTEST_BINARY_ASSERT(DT_WARN_EQ, eq, __VA_ARGS__) +#define DOCTEST_CHECK_EQ(...) DOCTEST_BINARY_ASSERT(DT_CHECK_EQ, eq, __VA_ARGS__) +#define DOCTEST_REQUIRE_EQ(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_EQ, eq, __VA_ARGS__) +#define DOCTEST_WARN_NE(...) DOCTEST_BINARY_ASSERT(DT_WARN_NE, ne, __VA_ARGS__) +#define DOCTEST_CHECK_NE(...) DOCTEST_BINARY_ASSERT(DT_CHECK_NE, ne, __VA_ARGS__) +#define DOCTEST_REQUIRE_NE(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_NE, ne, __VA_ARGS__) +#define DOCTEST_WARN_GT(...) DOCTEST_BINARY_ASSERT(DT_WARN_GT, gt, __VA_ARGS__) +#define DOCTEST_CHECK_GT(...) DOCTEST_BINARY_ASSERT(DT_CHECK_GT, gt, __VA_ARGS__) +#define DOCTEST_REQUIRE_GT(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_GT, gt, __VA_ARGS__) +#define DOCTEST_WARN_LT(...) DOCTEST_BINARY_ASSERT(DT_WARN_LT, lt, __VA_ARGS__) +#define DOCTEST_CHECK_LT(...) DOCTEST_BINARY_ASSERT(DT_CHECK_LT, lt, __VA_ARGS__) +#define DOCTEST_REQUIRE_LT(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_LT, lt, __VA_ARGS__) +#define DOCTEST_WARN_GE(...) DOCTEST_BINARY_ASSERT(DT_WARN_GE, ge, __VA_ARGS__) +#define DOCTEST_CHECK_GE(...) DOCTEST_BINARY_ASSERT(DT_CHECK_GE, ge, __VA_ARGS__) +#define DOCTEST_REQUIRE_GE(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_GE, ge, __VA_ARGS__) +#define DOCTEST_WARN_LE(...) DOCTEST_BINARY_ASSERT(DT_WARN_LE, le, __VA_ARGS__) +#define DOCTEST_CHECK_LE(...) DOCTEST_BINARY_ASSERT(DT_CHECK_LE, le, __VA_ARGS__) +#define DOCTEST_REQUIRE_LE(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_LE, le, __VA_ARGS__) + +#define DOCTEST_WARN_UNARY(...) DOCTEST_UNARY_ASSERT(DT_WARN_UNARY, __VA_ARGS__) +#define DOCTEST_CHECK_UNARY(...) DOCTEST_UNARY_ASSERT(DT_CHECK_UNARY, __VA_ARGS__) +#define DOCTEST_REQUIRE_UNARY(...) DOCTEST_UNARY_ASSERT(DT_REQUIRE_UNARY, __VA_ARGS__) +#define DOCTEST_WARN_UNARY_FALSE(...) DOCTEST_UNARY_ASSERT(DT_WARN_UNARY_FALSE, __VA_ARGS__) +#define DOCTEST_CHECK_UNARY_FALSE(...) DOCTEST_UNARY_ASSERT(DT_CHECK_UNARY_FALSE, __VA_ARGS__) +#define DOCTEST_REQUIRE_UNARY_FALSE(...) DOCTEST_UNARY_ASSERT(DT_REQUIRE_UNARY_FALSE, __VA_ARGS__) #ifndef DOCTEST_CONFIG_SUPER_FAST_ASSERTS -#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_FAST_BINARY_ASSERT(assert_type, expr, comparison) \ +#define DOCTEST_FAST_BINARY_ASSERT(assert_type, comparison, ...) \ do { \ int _DOCTEST_FAST_RES = doctest::detail::fast_binary_assert< \ doctest::detail::binaryAssertComparison::comparison>( \ - doctest::detail::assertType::assert_type, __FILE__, __LINE__, \ - DOCTEST_TOSTR(DOCTEST_HANDLE_BRACED_VA_ARGS(expr)), \ - DOCTEST_HANDLE_BRACED_VA_ARGS(expr)); \ + doctest::assertType::assert_type, __FILE__, __LINE__, #__VA_ARGS__, __VA_ARGS__); \ if(_DOCTEST_FAST_RES & doctest::detail::assertAction::dbgbreak) \ DOCTEST_BREAK_INTO_DEBUGGER(); \ doctest::detail::fastAssertThrowIfFlagSet(_DOCTEST_FAST_RES); \ } while((void)0, 0) -#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_FAST_BINARY_ASSERT(assert_type, lhs, rhs, comparison) \ - do { \ - int _DOCTEST_FAST_RES = doctest::detail::fast_binary_assert< \ - doctest::detail::binaryAssertComparison::comparison>( \ - doctest::detail::assertType::assert_type, __FILE__, __LINE__, #lhs ", " #rhs, lhs, \ - rhs); \ - if(_DOCTEST_FAST_RES & doctest::detail::assertAction::dbgbreak) \ - DOCTEST_BREAK_INTO_DEBUGGER(); \ - doctest::detail::fastAssertThrowIfFlagSet(_DOCTEST_FAST_RES); \ - } while((void)0, 0) -#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_FAST_UNARY_ASSERT(assert_type, expr) \ +#define DOCTEST_FAST_UNARY_ASSERT(assert_type, ...) \ do { \ int _DOCTEST_FAST_RES = doctest::detail::fast_unary_assert( \ - doctest::detail::assertType::assert_type, __FILE__, __LINE__, \ - DOCTEST_TOSTR(DOCTEST_HANDLE_BRACED_VA_ARGS(expr)), \ - DOCTEST_HANDLE_BRACED_VA_ARGS(expr)); \ + doctest::assertType::assert_type, __FILE__, __LINE__, #__VA_ARGS__, __VA_ARGS__); \ if(_DOCTEST_FAST_RES & doctest::detail::assertAction::dbgbreak) \ DOCTEST_BREAK_INTO_DEBUGGER(); \ doctest::detail::fastAssertThrowIfFlagSet(_DOCTEST_FAST_RES); \ @@ -2557,81 +2175,42 @@ constexpr T to_lvalue = x; #else // DOCTEST_CONFIG_SUPER_FAST_ASSERTS -#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_FAST_BINARY_ASSERT(assert_type, expr, comparison) \ - doctest::detail::fast_binary_assert( \ - doctest::detail::assertType::assert_type, __FILE__, __LINE__, \ - DOCTEST_TOSTR(DOCTEST_HANDLE_BRACED_VA_ARGS(expr)), \ - DOCTEST_HANDLE_BRACED_VA_ARGS(expr)) -#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_FAST_BINARY_ASSERT(assert_type, lhs, rhs, comparison) \ +#define DOCTEST_FAST_BINARY_ASSERT(assert_type, comparison, ...) \ doctest::detail::fast_binary_assert( \ - doctest::detail::assertType::assert_type, __FILE__, __LINE__, #lhs ", " #rhs, lhs, \ - rhs) -#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS + doctest::assertType::assert_type, __FILE__, __LINE__, #__VA_ARGS__, __VA_ARGS__) -#define DOCTEST_FAST_UNARY_ASSERT(assert_type, expr) \ - doctest::detail::fast_unary_assert(doctest::detail::assertType::assert_type, __FILE__, \ - __LINE__, \ - DOCTEST_TOSTR(DOCTEST_HANDLE_BRACED_VA_ARGS(expr)), \ - DOCTEST_HANDLE_BRACED_VA_ARGS(expr)) +#define DOCTEST_FAST_UNARY_ASSERT(assert_type, ...) \ + doctest::detail::fast_unary_assert(doctest::assertType::assert_type, __FILE__, __LINE__, \ + #__VA_ARGS__, __VA_ARGS__) #endif // DOCTEST_CONFIG_SUPER_FAST_ASSERTS // clang-format off -#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_FAST_WARN_EQ(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_EQ, (__VA_ARGS__), eq) -#define DOCTEST_FAST_CHECK_EQ(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_EQ, (__VA_ARGS__), eq) -#define DOCTEST_FAST_REQUIRE_EQ(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_EQ, (__VA_ARGS__), eq) -#define DOCTEST_FAST_WARN_NE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_NE, (__VA_ARGS__), ne) -#define DOCTEST_FAST_CHECK_NE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_NE, (__VA_ARGS__), ne) -#define DOCTEST_FAST_REQUIRE_NE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_NE, (__VA_ARGS__), ne) -#define DOCTEST_FAST_WARN_GT(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_GT, (__VA_ARGS__), gt) -#define DOCTEST_FAST_CHECK_GT(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_GT, (__VA_ARGS__), gt) -#define DOCTEST_FAST_REQUIRE_GT(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_GT, (__VA_ARGS__), gt) -#define DOCTEST_FAST_WARN_LT(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_LT, (__VA_ARGS__), lt) -#define DOCTEST_FAST_CHECK_LT(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_LT, (__VA_ARGS__), lt) -#define DOCTEST_FAST_REQUIRE_LT(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_LT, (__VA_ARGS__), lt) -#define DOCTEST_FAST_WARN_GE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_GE, (__VA_ARGS__), ge) -#define DOCTEST_FAST_CHECK_GE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_GE, (__VA_ARGS__), ge) -#define DOCTEST_FAST_REQUIRE_GE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_GE, (__VA_ARGS__), ge) -#define DOCTEST_FAST_WARN_LE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_LE, (__VA_ARGS__), le) -#define DOCTEST_FAST_CHECK_LE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_LE, (__VA_ARGS__), le) -#define DOCTEST_FAST_REQUIRE_LE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_LE, (__VA_ARGS__), le) - -#define DOCTEST_FAST_WARN_UNARY(...) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_WARN_UNARY, (__VA_ARGS__)) -#define DOCTEST_FAST_CHECK_UNARY(...) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_CHECK_UNARY, (__VA_ARGS__)) -#define DOCTEST_FAST_REQUIRE_UNARY(...) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_REQUIRE_UNARY, (__VA_ARGS__)) -#define DOCTEST_FAST_WARN_UNARY_FALSE(...) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_WARN_UNARY_FALSE, (__VA_ARGS__)) -#define DOCTEST_FAST_CHECK_UNARY_FALSE(...) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_CHECK_UNARY_FALSE, (__VA_ARGS__)) -#define DOCTEST_FAST_REQUIRE_UNARY_FALSE(...) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_REQUIRE_UNARY_FALSE, (__VA_ARGS__)) -#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_FAST_WARN_EQ(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_EQ, l, r, eq) -#define DOCTEST_FAST_CHECK_EQ(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_EQ, l, r, eq) -#define DOCTEST_FAST_REQUIRE_EQ(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_EQ, l, r, eq) -#define DOCTEST_FAST_WARN_NE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_NE, l, r, ne) -#define DOCTEST_FAST_CHECK_NE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_NE, l, r, ne) -#define DOCTEST_FAST_REQUIRE_NE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_NE, l, r, ne) -#define DOCTEST_FAST_WARN_GT(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_GT, l, r, gt) -#define DOCTEST_FAST_CHECK_GT(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_GT, l, r, gt) -#define DOCTEST_FAST_REQUIRE_GT(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_GT, l, r, gt) -#define DOCTEST_FAST_WARN_LT(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_LT, l, r, lt) -#define DOCTEST_FAST_CHECK_LT(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_LT, l, r, lt) -#define DOCTEST_FAST_REQUIRE_LT(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_LT, l, r, lt) -#define DOCTEST_FAST_WARN_GE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_GE, l, r, ge) -#define DOCTEST_FAST_CHECK_GE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_GE, l, r, ge) -#define DOCTEST_FAST_REQUIRE_GE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_GE, l, r, ge) -#define DOCTEST_FAST_WARN_LE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_LE, l, r, le) -#define DOCTEST_FAST_CHECK_LE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_LE, l, r, le) -#define DOCTEST_FAST_REQUIRE_LE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_LE, l, r, le) - -#define DOCTEST_FAST_WARN_UNARY(v) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_WARN_UNARY, v) -#define DOCTEST_FAST_CHECK_UNARY(v) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_CHECK_UNARY, v) -#define DOCTEST_FAST_REQUIRE_UNARY(v) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_REQUIRE_UNARY, v) -#define DOCTEST_FAST_WARN_UNARY_FALSE(v) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_WARN_UNARY_FALSE, v) -#define DOCTEST_FAST_CHECK_UNARY_FALSE(v) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_CHECK_UNARY_FALSE, v) -#define DOCTEST_FAST_REQUIRE_UNARY_FALSE(v) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_REQUIRE_UNARY_FALSE, v) -#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS +#define DOCTEST_FAST_WARN_EQ(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_EQ, eq, __VA_ARGS__) +#define DOCTEST_FAST_CHECK_EQ(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_EQ, eq, __VA_ARGS__) +#define DOCTEST_FAST_REQUIRE_EQ(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_EQ, eq, __VA_ARGS__) +#define DOCTEST_FAST_WARN_NE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_NE, ne, __VA_ARGS__) +#define DOCTEST_FAST_CHECK_NE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_NE, ne, __VA_ARGS__) +#define DOCTEST_FAST_REQUIRE_NE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_NE, ne, __VA_ARGS__) +#define DOCTEST_FAST_WARN_GT(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_GT, gt, __VA_ARGS__) +#define DOCTEST_FAST_CHECK_GT(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_GT, gt, __VA_ARGS__) +#define DOCTEST_FAST_REQUIRE_GT(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_GT, gt, __VA_ARGS__) +#define DOCTEST_FAST_WARN_LT(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_LT, lt, __VA_ARGS__) +#define DOCTEST_FAST_CHECK_LT(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_LT, lt, __VA_ARGS__) +#define DOCTEST_FAST_REQUIRE_LT(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_LT, lt, __VA_ARGS__) +#define DOCTEST_FAST_WARN_GE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_GE, ge, __VA_ARGS__) +#define DOCTEST_FAST_CHECK_GE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_GE, ge, __VA_ARGS__) +#define DOCTEST_FAST_REQUIRE_GE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_GE, ge, __VA_ARGS__) +#define DOCTEST_FAST_WARN_LE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_LE, le, __VA_ARGS__) +#define DOCTEST_FAST_CHECK_LE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_LE, le, __VA_ARGS__) +#define DOCTEST_FAST_REQUIRE_LE(...) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_LE, le, __VA_ARGS__) + +#define DOCTEST_FAST_WARN_UNARY(...) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_WARN_UNARY, __VA_ARGS__) +#define DOCTEST_FAST_CHECK_UNARY(...) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_CHECK_UNARY, __VA_ARGS__) +#define DOCTEST_FAST_REQUIRE_UNARY(...) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_REQUIRE_UNARY, __VA_ARGS__) +#define DOCTEST_FAST_WARN_UNARY_FALSE(...) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_WARN_UNARY_FALSE, __VA_ARGS__) +#define DOCTEST_FAST_CHECK_UNARY_FALSE(...) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_CHECK_UNARY_FALSE, __VA_ARGS__) +#define DOCTEST_FAST_REQUIRE_UNARY_FALSE(...) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_REQUIRE_UNARY_FALSE, __VA_ARGS__) // clang-format on #ifdef DOCTEST_CONFIG_NO_EXCEPTIONS @@ -2661,15 +2240,9 @@ constexpr T to_lvalue = x; #define DOCTEST_WARN_THROWS(expr) ((void)0) #define DOCTEST_CHECK_THROWS(expr) ((void)0) #define DOCTEST_REQUIRE_THROWS(expr) ((void)0) -#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS #define DOCTEST_WARN_THROWS_AS(expr, ...) ((void)0) #define DOCTEST_CHECK_THROWS_AS(expr, ...) ((void)0) #define DOCTEST_REQUIRE_THROWS_AS(expr, ...) ((void)0) -#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_WARN_THROWS_AS(expr, ex) ((void)0) -#define DOCTEST_CHECK_THROWS_AS(expr, ex) ((void)0) -#define DOCTEST_REQUIRE_THROWS_AS(expr, ex) ((void)0) -#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS #define DOCTEST_WARN_NOTHROW(expr) ((void)0) #define DOCTEST_CHECK_NOTHROW(expr) ((void)0) #define DOCTEST_REQUIRE_NOTHROW(expr) ((void)0) @@ -2718,10 +2291,9 @@ constexpr T to_lvalue = x; #else // DOCTEST_CONFIG_DISABLE #define DOCTEST_IMPLEMENT_FIXTURE(der, base, func, name) \ - namespace \ - { \ + namespace { \ template \ - struct der : base \ + struct der : public base \ { void f(); }; \ } \ template \ @@ -2741,16 +2313,11 @@ constexpr T to_lvalue = x; DOCTEST_ANONYMOUS(_DOCTEST_ANON_FUNC_), name) // for converting types to strings without the header and demangling -#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS #define DOCTEST_TYPE_TO_STRING(...) typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_) #define DOCTEST_TYPE_TO_STRING_IMPL(...) -#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_TYPE_TO_STRING(x) typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_) -#define DOCTEST_TYPE_TO_STRING_IMPL(x) -#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS // for typed tests -#define DOCTEST_TEST_CASE_TEMPLATE(name, type, types) \ +#define DOCTEST_TEST_CASE_TEMPLATE(name, type, ...) \ template \ inline void DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_)() @@ -2758,7 +2325,7 @@ constexpr T to_lvalue = x; template \ inline void DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_)() -#define DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE(id, types) \ +#define DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE(id, ...) \ typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_) // for subcases @@ -2777,6 +2344,8 @@ constexpr T to_lvalue = x; template \ static inline doctest::String DOCTEST_ANONYMOUS(_DOCTEST_ANON_TRANSLATOR_)(signature) +#define DOCTEST_REGISTER_REPORTER(name, priority, reporter) + #define DOCTEST_INFO(x) ((void)0) #define DOCTEST_CAPTURE(x) ((void)0) #define DOCTEST_ADD_MESSAGE_AT(file, line, x) ((void)0) @@ -2786,21 +2355,12 @@ constexpr T to_lvalue = x; #define DOCTEST_FAIL_CHECK(x) ((void)0) #define DOCTEST_FAIL(x) ((void)0) -#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS #define DOCTEST_WARN(...) ((void)0) #define DOCTEST_CHECK(...) ((void)0) #define DOCTEST_REQUIRE(...) ((void)0) #define DOCTEST_WARN_FALSE(...) ((void)0) #define DOCTEST_CHECK_FALSE(...) ((void)0) #define DOCTEST_REQUIRE_FALSE(...) ((void)0) -#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_WARN(expr) ((void)0) -#define DOCTEST_CHECK(expr) ((void)0) -#define DOCTEST_REQUIRE(expr) ((void)0) -#define DOCTEST_WARN_FALSE(expr) ((void)0) -#define DOCTEST_CHECK_FALSE(expr) ((void)0) -#define DOCTEST_REQUIRE_FALSE(expr) ((void)0) -#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS #define DOCTEST_WARN_MESSAGE(cond, msg) ((void)0) #define DOCTEST_CHECK_MESSAGE(cond, msg) ((void)0) @@ -2812,15 +2372,9 @@ constexpr T to_lvalue = x; #define DOCTEST_WARN_THROWS(expr) ((void)0) #define DOCTEST_CHECK_THROWS(expr) ((void)0) #define DOCTEST_REQUIRE_THROWS(expr) ((void)0) -#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS #define DOCTEST_WARN_THROWS_AS(expr, ...) ((void)0) #define DOCTEST_CHECK_THROWS_AS(expr, ...) ((void)0) #define DOCTEST_REQUIRE_THROWS_AS(expr, ...) ((void)0) -#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_WARN_THROWS_AS(expr, ex) ((void)0) -#define DOCTEST_CHECK_THROWS_AS(expr, ex) ((void)0) -#define DOCTEST_REQUIRE_THROWS_AS(expr, ex) ((void)0) -#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS #define DOCTEST_WARN_NOTHROW(expr) ((void)0) #define DOCTEST_CHECK_NOTHROW(expr) ((void)0) #define DOCTEST_REQUIRE_NOTHROW(expr) ((void)0) @@ -2835,8 +2389,6 @@ constexpr T to_lvalue = x; #define DOCTEST_CHECK_NOTHROW_MESSAGE(expr, msg) ((void)0) #define DOCTEST_REQUIRE_NOTHROW_MESSAGE(expr, msg) ((void)0) -#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS - #define DOCTEST_WARN_EQ(...) ((void)0) #define DOCTEST_CHECK_EQ(...) ((void)0) #define DOCTEST_REQUIRE_EQ(...) ((void)0) @@ -2889,72 +2441,12 @@ constexpr T to_lvalue = x; #define DOCTEST_FAST_CHECK_UNARY_FALSE(...) ((void)0) #define DOCTEST_FAST_REQUIRE_UNARY_FALSE(...) ((void)0) -#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS - -#define DOCTEST_WARN_EQ(lhs, rhs) ((void)0) -#define DOCTEST_CHECK_EQ(lhs, rhs) ((void)0) -#define DOCTEST_REQUIRE_EQ(lhs, rhs) ((void)0) -#define DOCTEST_WARN_NE(lhs, rhs) ((void)0) -#define DOCTEST_CHECK_NE(lhs, rhs) ((void)0) -#define DOCTEST_REQUIRE_NE(lhs, rhs) ((void)0) -#define DOCTEST_WARN_GT(lhs, rhs) ((void)0) -#define DOCTEST_CHECK_GT(lhs, rhs) ((void)0) -#define DOCTEST_REQUIRE_GT(lhs, rhs) ((void)0) -#define DOCTEST_WARN_LT(lhs, rhs) ((void)0) -#define DOCTEST_CHECK_LT(lhs, rhs) ((void)0) -#define DOCTEST_REQUIRE_LT(lhs, rhs) ((void)0) -#define DOCTEST_WARN_GE(lhs, rhs) ((void)0) -#define DOCTEST_CHECK_GE(lhs, rhs) ((void)0) -#define DOCTEST_REQUIRE_GE(lhs, rhs) ((void)0) -#define DOCTEST_WARN_LE(lhs, rhs) ((void)0) -#define DOCTEST_CHECK_LE(lhs, rhs) ((void)0) -#define DOCTEST_REQUIRE_LE(lhs, rhs) ((void)0) - -#define DOCTEST_WARN_UNARY(val) ((void)0) -#define DOCTEST_CHECK_UNARY(val) ((void)0) -#define DOCTEST_REQUIRE_UNARY(val) ((void)0) -#define DOCTEST_WARN_UNARY_FALSE(val) ((void)0) -#define DOCTEST_CHECK_UNARY_FALSE(val) ((void)0) -#define DOCTEST_REQUIRE_UNARY_FALSE(val) ((void)0) - -#define DOCTEST_FAST_WARN_EQ(lhs, rhs) ((void)0) -#define DOCTEST_FAST_CHECK_EQ(lhs, rhs) ((void)0) -#define DOCTEST_FAST_REQUIRE_EQ(lhs, rhs) ((void)0) -#define DOCTEST_FAST_WARN_NE(lhs, rhs) ((void)0) -#define DOCTEST_FAST_CHECK_NE(lhs, rhs) ((void)0) -#define DOCTEST_FAST_REQUIRE_NE(lhs, rhs) ((void)0) -#define DOCTEST_FAST_WARN_GT(lhs, rhs) ((void)0) -#define DOCTEST_FAST_CHECK_GT(lhs, rhs) ((void)0) -#define DOCTEST_FAST_REQUIRE_GT(lhs, rhs) ((void)0) -#define DOCTEST_FAST_WARN_LT(lhs, rhs) ((void)0) -#define DOCTEST_FAST_CHECK_LT(lhs, rhs) ((void)0) -#define DOCTEST_FAST_REQUIRE_LT(lhs, rhs) ((void)0) -#define DOCTEST_FAST_WARN_GE(lhs, rhs) ((void)0) -#define DOCTEST_FAST_CHECK_GE(lhs, rhs) ((void)0) -#define DOCTEST_FAST_REQUIRE_GE(lhs, rhs) ((void)0) -#define DOCTEST_FAST_WARN_LE(lhs, rhs) ((void)0) -#define DOCTEST_FAST_CHECK_LE(lhs, rhs) ((void)0) -#define DOCTEST_FAST_REQUIRE_LE(lhs, rhs) ((void)0) - -#define DOCTEST_FAST_WARN_UNARY(val) ((void)0) -#define DOCTEST_FAST_CHECK_UNARY(val) ((void)0) -#define DOCTEST_FAST_REQUIRE_UNARY(val) ((void)0) -#define DOCTEST_FAST_WARN_UNARY_FALSE(val) ((void)0) -#define DOCTEST_FAST_CHECK_UNARY_FALSE(val) ((void)0) -#define DOCTEST_FAST_REQUIRE_UNARY_FALSE(val) ((void)0) - -#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS - #endif // DOCTEST_CONFIG_DISABLE // BDD style macros // clang-format off -#define DOCTEST_SCENARIO(name) TEST_CASE(" Scenario: " name) -#ifdef DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_SCENARIO_TEMPLATE(name, T, ...) TEST_CASE_TEMPLATE(" Scenario: " name, T, __VA_ARGS__) -#else // DOCTEST_CONFIG_WITH_VARIADIC_MACROS -#define DOCTEST_SCENARIO_TEMPLATE(name, T, types) TEST_CASE_TEMPLATE(" Scenario: " name, T, types) -#endif // DOCTEST_CONFIG_WITH_VARIADIC_MACROS +#define DOCTEST_SCENARIO(name) DOCTEST_TEST_CASE(" Scenario: " name) +#define DOCTEST_SCENARIO_TEMPLATE(name, T, ...) DOCTEST_TEST_CASE_TEMPLATE(" Scenario: " name, T, __VA_ARGS__) #define DOCTEST_SCENARIO_TEMPLATE_DEFINE(name, T, id) DOCTEST_TEST_CASE_TEMPLATE_DEFINE(" Scenario: " name, T, id) #define DOCTEST_GIVEN(name) SUBCASE(" Given: " name) @@ -2978,6 +2470,7 @@ constexpr T to_lvalue = x; #define TEST_SUITE_BEGIN DOCTEST_TEST_SUITE_BEGIN #define TEST_SUITE_END DOCTEST_TEST_SUITE_END #define REGISTER_EXCEPTION_TRANSLATOR DOCTEST_REGISTER_EXCEPTION_TRANSLATOR +#define REGISTER_REPORTER DOCTEST_REGISTER_REPORTER #define INFO DOCTEST_INFO #define CAPTURE DOCTEST_CAPTURE #define ADD_MESSAGE_AT DOCTEST_ADD_MESSAGE_AT @@ -3081,14 +2574,13 @@ constexpr T to_lvalue = x; #endif // DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES +#if !defined(DOCTEST_CONFIG_DISABLE) + // this is here to clear the 'current test suite' for the current translation unit - at the top DOCTEST_TEST_SUITE_END(); // add stringification for primitive/fundamental types -namespace doctest -{ -namespace detail -{ +namespace doctest { namespace detail { DOCTEST_TYPE_TO_STRING_IMPL(bool) DOCTEST_TYPE_TO_STRING_IMPL(float) DOCTEST_TYPE_TO_STRING_IMPL(double) @@ -3103,98 +2595,22 @@ namespace detail DOCTEST_TYPE_TO_STRING_IMPL(unsigned int) DOCTEST_TYPE_TO_STRING_IMPL(long int) DOCTEST_TYPE_TO_STRING_IMPL(unsigned long int) -#ifdef DOCTEST_CONFIG_WITH_LONG_LONG DOCTEST_TYPE_TO_STRING_IMPL(long long int) DOCTEST_TYPE_TO_STRING_IMPL(unsigned long long int) -#endif // DOCTEST_CONFIG_WITH_LONG_LONG -} // namespace detail -} // namespace doctest - -#endif // DOCTEST_LIBRARY_INCLUDED +}} // namespace doctest::detail -#if defined(__clang__) -#pragma clang diagnostic pop -#endif // __clang__ +#endif // DOCTEST_CONFIG_DISABLE -#if defined(__GNUC__) && !defined(__clang__) -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6) -#pragma GCC diagnostic pop -#endif // > gcc 4.6 -#endif // __GNUC__ +DOCTEST_CLANG_SUPPRESS_WARNING_POP +DOCTEST_MSVC_SUPPRESS_WARNING_POP +DOCTEST_GCC_SUPPRESS_WARNING_POP -#ifdef _MSC_VER -#pragma warning(pop) -#endif // _MSC_VER +#endif // DOCTEST_LIBRARY_INCLUDED #ifndef DOCTEST_SINGLE_HEADER #define DOCTEST_SINGLE_HEADER #endif // DOCTEST_SINGLE_HEADER -#if defined(__clang__) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wunknown-pragmas" -#pragma clang diagnostic ignored "-Wpadded" -#pragma clang diagnostic ignored "-Wglobal-constructors" -#pragma clang diagnostic ignored "-Wexit-time-destructors" -#pragma clang diagnostic ignored "-Wmissing-prototypes" -#pragma clang diagnostic ignored "-Wsign-conversion" -#pragma clang diagnostic ignored "-Wshorten-64-to-32" -#pragma clang diagnostic ignored "-Wmissing-variable-declarations" -#pragma clang diagnostic ignored "-Wswitch" -#pragma clang diagnostic ignored "-Wswitch-enum" -#pragma clang diagnostic ignored "-Wcovered-switch-default" -#pragma clang diagnostic ignored "-Wmissing-noreturn" -#pragma clang diagnostic ignored "-Wunused-local-typedef" -#pragma clang diagnostic ignored "-Wdisabled-macro-expansion" -#pragma clang diagnostic ignored "-Wmissing-braces" -#pragma clang diagnostic ignored "-Wmissing-field-initializers" -#if !defined(__has_warning) || __has_warning("-Wzero-as-null-pointer-constant") -#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant" -#endif -#pragma clang diagnostic ignored "-Wc++11-long-long" -#endif // __clang__ - -#if defined(__GNUC__) && !defined(__clang__) -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6) -#pragma GCC diagnostic push -#endif // > gcc 4.6 -#pragma GCC diagnostic ignored "-Wunknown-pragmas" -#pragma GCC diagnostic ignored "-Wconversion" -#pragma GCC diagnostic ignored "-Weffc++" -#pragma GCC diagnostic ignored "-Wsign-conversion" -#pragma GCC diagnostic ignored "-Wstrict-overflow" -#pragma GCC diagnostic ignored "-Wmissing-field-initializers" -#pragma GCC diagnostic ignored "-Wmissing-braces" -#pragma GCC diagnostic ignored "-Wmissing-declarations" -#pragma GCC diagnostic ignored "-Winline" -#pragma GCC diagnostic ignored "-Wswitch" -#pragma GCC diagnostic ignored "-Wswitch-enum" -#pragma GCC diagnostic ignored "-Wswitch-default" -#pragma GCC diagnostic ignored "-Wunsafe-loop-optimizations" -#pragma GCC diagnostic ignored "-Wlong-long" -#pragma GCC diagnostic ignored "-Wold-style-cast" -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6) -#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant" -#endif // > gcc 4.6 -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7) -#pragma GCC diagnostic ignored "-Wunused-local-typedefs" -#endif // > gcc 4.7 -#if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ > 3) -#pragma GCC diagnostic ignored "-Wuseless-cast" -#endif // > gcc 5.3 -#endif // __GNUC__ - -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable : 4996) // The compiler encountered a deprecated declaration -#pragma warning(disable : 4267) // 'var' : conversion from 'size_t' to 'type', possible loss of data -#pragma warning(disable : 4706) // assignment within conditional expression -#pragma warning(disable : 4512) // 'class' : assignment operator could not be generated -#pragma warning(disable : 4127) // conditional expression is constant -#pragma warning(disable : 4530) // C++ exception handler used, but unwind semantics are not enabled -#pragma warning(disable : 4577) // 'noexcept' used with no exception handling mode specified -#endif // _MSC_VER - #if defined(DOCTEST_CONFIG_IMPLEMENT) || !defined(DOCTEST_SINGLE_HEADER) #ifndef DOCTEST_LIBRARY_IMPLEMENTATION #define DOCTEST_LIBRARY_IMPLEMENTATION @@ -3203,29 +2619,80 @@ namespace detail #include "doctest_fwd.h" #endif // DOCTEST_SINGLE_HEADER -#if defined(__clang__) && defined(DOCTEST_NO_CPP11_COMPAT) -#pragma clang diagnostic ignored "-Wc++98-compat" -#pragma clang diagnostic ignored "-Wc++98-compat-pedantic" -#endif // __clang__ && DOCTEST_NO_CPP11_COMPAT - -// snprintf() not in the C++98 standard -#ifdef _MSC_VER -#define DOCTEST_SNPRINTF _snprintf -#else -#define DOCTEST_SNPRINTF std::snprintf -#endif - -#define DOCTEST_LOG_START() \ - do { \ - if(!contextState->hasLoggedCurrentTestStart) { \ - logTestStart(*contextState->currentTest); \ - contextState->hasLoggedCurrentTestStart = true; \ - } \ - } while(false) +DOCTEST_CLANG_SUPPRESS_WARNING_PUSH +DOCTEST_CLANG_SUPPRESS_WARNING("-Wunknown-pragmas") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wpadded") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wweak-vtables") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wglobal-constructors") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wexit-time-destructors") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-prototypes") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wsign-conversion") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wshorten-64-to-32") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-variable-declarations") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wswitch") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wswitch-enum") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wcovered-switch-default") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-noreturn") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wunused-local-typedef") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wdisabled-macro-expansion") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-braces") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-field-initializers") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wc++98-compat") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wc++98-compat-pedantic") + +DOCTEST_GCC_SUPPRESS_WARNING_PUSH +DOCTEST_GCC_SUPPRESS_WARNING("-Wunknown-pragmas") +DOCTEST_GCC_SUPPRESS_WARNING("-Wpragmas") +DOCTEST_GCC_SUPPRESS_WARNING("-Wconversion") +DOCTEST_GCC_SUPPRESS_WARNING("-Weffc++") +DOCTEST_GCC_SUPPRESS_WARNING("-Wsign-conversion") +DOCTEST_GCC_SUPPRESS_WARNING("-Wstrict-overflow") +DOCTEST_GCC_SUPPRESS_WARNING("-Wstrict-aliasing") +DOCTEST_GCC_SUPPRESS_WARNING("-Wmissing-field-initializers") +DOCTEST_GCC_SUPPRESS_WARNING("-Wmissing-braces") +DOCTEST_GCC_SUPPRESS_WARNING("-Wmissing-declarations") +DOCTEST_GCC_SUPPRESS_WARNING("-Winline") +DOCTEST_GCC_SUPPRESS_WARNING("-Wswitch") +DOCTEST_GCC_SUPPRESS_WARNING("-Wswitch-enum") +DOCTEST_GCC_SUPPRESS_WARNING("-Wswitch-default") +DOCTEST_GCC_SUPPRESS_WARNING("-Wunsafe-loop-optimizations") +DOCTEST_GCC_SUPPRESS_WARNING("-Wold-style-cast") +DOCTEST_GCC_SUPPRESS_WARNING("-Wunused-local-typedefs") +DOCTEST_GCC_SUPPRESS_WARNING("-Wuseless-cast") + +DOCTEST_MSVC_SUPPRESS_WARNING_PUSH +DOCTEST_MSVC_SUPPRESS_WARNING(4616) // invalid compiler warning +DOCTEST_MSVC_SUPPRESS_WARNING(4619) // invalid compiler warning +DOCTEST_MSVC_SUPPRESS_WARNING(4996) // The compiler encountered a deprecated declaration +DOCTEST_MSVC_SUPPRESS_WARNING(4267) // 'var' : conversion from 'x' to 'y', possible loss of data +DOCTEST_MSVC_SUPPRESS_WARNING(4706) // assignment within conditional expression +DOCTEST_MSVC_SUPPRESS_WARNING(4512) // 'class' : assignment operator could not be generated +DOCTEST_MSVC_SUPPRESS_WARNING(4127) // conditional expression is constant +DOCTEST_MSVC_SUPPRESS_WARNING(4530) // C++ exception handler used, but unwind semantics not enabled +DOCTEST_MSVC_SUPPRESS_WARNING(4577) // 'noexcept' used with no exception handling mode specified +DOCTEST_MSVC_SUPPRESS_WARNING(4774) // format string expected in argument is not a string literal +DOCTEST_MSVC_SUPPRESS_WARNING(4365) // conversion from 'int' to 'unsigned', signed/unsigned mismatch +DOCTEST_MSVC_SUPPRESS_WARNING(4820) // padding in structs +DOCTEST_MSVC_SUPPRESS_WARNING(4640) // construction of local static object is not thread-safe +DOCTEST_MSVC_SUPPRESS_WARNING(5039) // pointer to potentially throwing function passed to extern C +DOCTEST_MSVC_SUPPRESS_WARNING(5045) // Spectre mitigation stuff +DOCTEST_MSVC_SUPPRESS_WARNING(4626) // assignment operator was implicitly defined as deleted +DOCTEST_MSVC_SUPPRESS_WARNING(5027) // move assignment operator was implicitly defined as deleted +DOCTEST_MSVC_SUPPRESS_WARNING(5026) // move constructor was implicitly defined as deleted +DOCTEST_MSVC_SUPPRESS_WARNING(4625) // copy constructor was implicitly defined as deleted +DOCTEST_MSVC_SUPPRESS_WARNING(4800) // forcing value to bool 'true' or 'false' (performance warning) +// static analysis +DOCTEST_MSVC_SUPPRESS_WARNING(26439) // This kind of function may not throw. Declare it 'noexcept' +DOCTEST_MSVC_SUPPRESS_WARNING(26495) // Always initialize a member variable +DOCTEST_MSVC_SUPPRESS_WARNING(26451) // Arithmetic overflow ... +DOCTEST_MSVC_SUPPRESS_WARNING(26444) // Avoid unnamed objects with custom construction and dtor... + +DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN // required includes - will go only in one translation unit! #include #include +#include // borland (Embarcadero) compiler requires math.h and not cmath - https://github.com/onqtam/doctest/pull/37 #ifdef __BORLANDC__ #include @@ -3237,31 +2704,46 @@ namespace detail #include #include #include +#include +#include #include #include +#include +#include #include +#include #include #include #include #include -#ifndef _MSC_VER -#include -#endif // _MSC_VER +#include +#include -namespace doctest -{ -namespace detail -{ - // lowers ascii letters - char tolower(const char c) { return (c >= 'A' && c <= 'Z') ? static_cast(c + 32) : c; } +#ifdef DOCTEST_PLATFORM_MAC +#include +#include +#include +#endif // DOCTEST_PLATFORM_MAC - template - T my_max(const T& lhs, const T& rhs) { - return lhs > rhs ? lhs : rhs; - } +DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_END + +// counts the number of elements in a C array +#define DOCTEST_COUNTOF(x) (sizeof(x) / sizeof(x[0])) + +#ifdef DOCTEST_CONFIG_DISABLE +#define DOCTEST_BRANCH_ON_DISABLED(if_disabled, if_not_disabled) if_disabled +#else // DOCTEST_CONFIG_DISABLE +#define DOCTEST_BRANCH_ON_DISABLED(if_disabled, if_not_disabled) if_not_disabled +#endif // DOCTEST_CONFIG_DISABLE + +namespace doctest { + +bool is_running_in_test = false; +namespace { + using namespace detail; // case insensitive strcmp - int stricmp(char const* a, char const* b) { + int stricmp(const char* a, const char* b) { for(;; a++, b++) { const int d = tolower(*a) - tolower(*b); if(d != 0 || !*a) @@ -3269,23 +2751,6 @@ namespace detail } } - void my_memcpy(void* dest, const void* src, unsigned num) { - const char* csrc = static_cast(src); - char* cdest = static_cast(dest); - for(unsigned i = 0; i < num; ++i) - cdest[i] = csrc[i]; - } - - // not using std::strlen() because of valgrind errors when optimizations are turned on - // 'Invalid read of size 4' when the test suite len (with '\0') is not a multiple of 4 - // for details see http://stackoverflow.com/questions/35671155 - unsigned my_strlen(const char* in) { - const char* temp = in; - while(temp && *temp) - ++temp; - return unsigned(temp - in); - } - template String fpToString(T value, int precision) { std::ostringstream oss; @@ -3319,6 +2784,10 @@ namespace detail return (u.asChar[sizeof(int) - 1] == 1) ? Big : Little; // NOLINT } }; +} // namespace + +namespace detail { + void my_memcpy(void* dest, const void* src, unsigned num) { memcpy(dest, src, num); } String rawMemoryToString(const void* object, unsigned size) { // Reverse order for little endian architectures @@ -3328,127 +2797,118 @@ namespace detail end = inc = -1; } - unsigned char const* bytes = static_cast(object); - std::ostringstream os; - os << "0x" << std::setfill('0') << std::hex; + unsigned const char* bytes = static_cast(object); + std::ostringstream oss; + oss << "0x" << std::setfill('0') << std::hex; for(; i != end; i += inc) - os << std::setw(2) << static_cast(bytes[i]); - return os.str().c_str(); + oss << std::setw(2) << static_cast(bytes[i]); + return oss.str().c_str(); } - std::ostream* createStream() { return new std::ostringstream(); } - String getStreamResult(std::ostream* in) { - return static_cast(in)->str().c_str(); // NOLINT + thread_local std::ostringstream g_oss; + + std::ostream* getTlsOss() { + g_oss.clear(); // there shouldn't be anything worth clearing in the flags + g_oss.str(""); // the slow way of resetting a string stream + //g_oss.seekp(0); // optimal reset - as seen here: https://stackoverflow.com/a/624291/3162383 + return &g_oss; } - void freeStream(std::ostream* in) { delete in; } -#ifndef DOCTEST_CONFIG_DISABLE + String getTlsOssResult() { + //g_oss << std::ends; // needed - as shown here: https://stackoverflow.com/a/624291/3162383 + return g_oss.str().c_str(); + } - // this holds both parameters for the command line and runtime data for tests - struct ContextState : TestAccessibleContextState //!OCLINT too many fields +#ifndef DOCTEST_CONFIG_DISABLE + // this holds both parameters from the command line and runtime data for tests + struct ContextState : ContextOptions, TestRunStats, CurrentTestCaseStats { - // == parameters from the command line - - std::vector > filters; - - String order_by; // how tests should be ordered - unsigned rand_seed; // the seed for rand ordering - - unsigned first; // the first (matching) test to be executed - unsigned last; // the last (matching) test to be executed - - int abort_after; // stop tests after this many failed assertions - int subcase_filter_levels; // apply the subcase filters for the first N levels - bool case_sensitive; // if filtering should be case sensitive - bool exit; // if the program should be exited after the tests are ran/whatever - bool duration; // print the time duration of each test case - bool no_exitcode; // if the framework should return 0 as the exitcode - bool no_run; // to not run the tests at all (can be done with an "*" exclude) - bool no_version; // to not print the version of the framework - bool no_colors; // if output to the console should be colorized - bool force_colors; // forces the use of colors even when a tty cannot be detected - bool no_breaks; // to not break into the debugger - bool no_skip; // don't skip test cases which are marked to be skipped - bool no_path_in_filenames; // if the path to files should be removed from the output - bool no_line_numbers; // if source code line numbers should be omitted from the output - bool no_skipped_summary; // don't print "skipped" in the summary !!! UNDOCUMENTED !!! - - bool help; // to print the help - bool version; // to print the version - bool count; // if only the count of matching tests is to be retreived - bool list_test_cases; // to list all tests matching the filters - bool list_test_suites; // to list all suites matching the filters - - // == data for the tests being ran - - unsigned numTestsPassingFilters; - unsigned numTestSuitesPassingFilters; - unsigned numFailed; - const TestCase* currentTest; - bool hasLoggedCurrentTestStart; - int numAssertionsForCurrentTestcase; - int numAssertions; - int numFailedAssertionsForCurrentTestcase; - int numFailedAssertions; - bool hasCurrentTestFailed; - - std::vector contexts; // for logging with INFO() and friends - std::vector exceptionalContexts; // logging from INFO() due to an exception + std::atomic numAssertsForCurrentTestCase_atomic; + std::atomic numAssertsFailedForCurrentTestCase_atomic; + + std::vector > filters = decltype(filters)(9); // 9 different filters + + std::vector reporters_currently_used; + + const TestCase* currentTest = nullptr; + + assert_handler ah = nullptr; + + std::vector stringifiedContexts; // logging from INFO() due to an exception // stuff for subcases std::set subcasesPassed; std::set subcasesEnteredLevels; - std::vector subcasesStack; int subcasesCurrentLevel; - bool subcasesHasSkipped; void resetRunData() { - numTestsPassingFilters = 0; - numTestSuitesPassingFilters = 0; - numFailed = 0; - numAssertions = 0; - numFailedAssertions = 0; - numFailedAssertionsForCurrentTestcase = 0; - } - - // cppcheck-suppress uninitMemberVar - ContextState() - : filters(8) // 8 different filters total - { - resetRunData(); + numTestCases = 0; + numTestCasesPassingFilters = 0; + numTestSuitesPassingFilters = 0; + numTestCasesFailed = 0; + numAsserts = 0; + numAssertsFailed = 0; } }; - ContextState* contextState = 0; + ContextState* g_cs = nullptr; + thread_local bool g_no_colors; // used to avoid locks for the debug output window reporter + #endif // DOCTEST_CONFIG_DISABLE } // namespace detail +void String::setOnHeap() { *reinterpret_cast(&buf[last]) = 128; } +void String::setLast(unsigned in) { buf[last] = char(in); } + void String::copy(const String& other) { if(other.isOnStack()) { - detail::my_memcpy(buf, other.buf, len); + memcpy(buf, other.buf, len); } else { setOnHeap(); data.size = other.data.size; data.capacity = data.size + 1; data.ptr = new char[data.capacity]; - detail::my_memcpy(data.ptr, other.data.ptr, data.size + 1); + memcpy(data.ptr, other.data.ptr, data.size + 1); } } +String::String() { + buf[0] = '\0'; + setLast(); +} + +String::~String() { + if(!isOnStack()) + delete[] data.ptr; +} + String::String(const char* in) { - unsigned in_len = detail::my_strlen(in); + unsigned in_len = strlen(in); if(in_len <= last) { - detail::my_memcpy(buf, in, in_len + 1); + memcpy(buf, in, in_len + 1); setLast(last - in_len); } else { setOnHeap(); data.size = in_len; data.capacity = data.size + 1; data.ptr = new char[data.capacity]; - detail::my_memcpy(data.ptr, in, in_len + 1); + memcpy(data.ptr, in, in_len + 1); } } +String::String(const String& other) { copy(other); } + +String& String::operator=(const String& other) { + if(this != &other) { + if(!isOnStack()) + delete[] data.ptr; + + copy(other); + } + + return *this; +} + String& String::operator+=(const String& other) { const unsigned my_old_size = size(); const unsigned other_size = other.size(); @@ -3456,26 +2916,26 @@ String& String::operator+=(const String& other) { if(isOnStack()) { if(total_size < len) { // append to the current stack space - detail::my_memcpy(buf + my_old_size, other.c_str(), other_size + 1); + memcpy(buf + my_old_size, other.c_str(), other_size + 1); setLast(last - total_size); } else { // alloc new chunk char* temp = new char[total_size + 1]; // copy current data to new location before writing in the union - detail::my_memcpy(temp, buf, my_old_size); // skip the +1 ('\0') for speed + memcpy(temp, buf, my_old_size); // skip the +1 ('\0') for speed // update data in union setOnHeap(); data.size = total_size; data.capacity = data.size + 1; data.ptr = temp; // transfer the rest of the data - detail::my_memcpy(data.ptr + my_old_size, other.c_str(), other_size + 1); + memcpy(data.ptr + my_old_size, other.c_str(), other_size + 1); } } else { if(data.capacity > total_size) { // append to the current heap block data.size = total_size; - detail::my_memcpy(data.ptr + my_old_size, other.c_str(), other_size + 1); + memcpy(data.ptr + my_old_size, other.c_str(), other_size + 1); } else { // resize data.capacity *= 2; @@ -3484,23 +2944,24 @@ String& String::operator+=(const String& other) { // alloc new chunk char* temp = new char[data.capacity]; // copy current data to new location before releasing it - detail::my_memcpy(temp, data.ptr, my_old_size); // skip the +1 ('\0') for speed + memcpy(temp, data.ptr, my_old_size); // skip the +1 ('\0') for speed // release old chunk delete[] data.ptr; // update the rest of the union members data.size = total_size; data.ptr = temp; // transfer the rest of the data - detail::my_memcpy(data.ptr + my_old_size, other.c_str(), other_size + 1); + memcpy(data.ptr + my_old_size, other.c_str(), other_size + 1); } } return *this; } -#ifdef DOCTEST_CONFIG_WITH_RVALUE_REFERENCES +String String::operator+(const String& other) const { return String(*this) += other; } + String::String(String&& other) { - detail::my_memcpy(buf, other.buf, len); + memcpy(buf, other.buf, len); other.buf[0] = '\0'; other.setLast(); } @@ -3509,17 +2970,40 @@ String& String::operator=(String&& other) { if(this != &other) { if(!isOnStack()) delete[] data.ptr; - detail::my_memcpy(buf, other.buf, len); + memcpy(buf, other.buf, len); other.buf[0] = '\0'; other.setLast(); } return *this; } -#endif // DOCTEST_CONFIG_WITH_RVALUE_REFERENCES + +char String::operator[](unsigned i) const { + return const_cast(this)->operator[](i); // NOLINT +} + +char& String::operator[](unsigned i) { + if(isOnStack()) + return reinterpret_cast(buf)[i]; + return data.ptr[i]; +} + +DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wmaybe-uninitialized") +unsigned String::size() const { + if(isOnStack()) + return last - (unsigned(buf[last]) & 31); // using "last" would work only if "len" is 32 + return data.size; +} +DOCTEST_GCC_SUPPRESS_WARNING_POP + +unsigned String::capacity() const { + if(isOnStack()) + return len; + return data.capacity; +} int String::compare(const char* other, bool no_case) const { if(no_case) - return detail::stricmp(c_str(), other); + return stricmp(c_str(), other); return std::strcmp(c_str(), other); } @@ -3527,119 +3011,269 @@ int String::compare(const String& other, bool no_case) const { return compare(other.c_str(), no_case); } -std::ostream& operator<<(std::ostream& stream, const String& in) { - stream << in.c_str(); - return stream; +// clang-format off +bool operator==(const String& lhs, const String& rhs) { return lhs.compare(rhs) == 0; } +bool operator!=(const String& lhs, const String& rhs) { return lhs.compare(rhs) != 0; } +bool operator< (const String& lhs, const String& rhs) { return lhs.compare(rhs) < 0; } +bool operator> (const String& lhs, const String& rhs) { return lhs.compare(rhs) > 0; } +bool operator<=(const String& lhs, const String& rhs) { return (lhs != rhs) ? lhs.compare(rhs) < 0 : true; } +bool operator>=(const String& lhs, const String& rhs) { return (lhs != rhs) ? lhs.compare(rhs) > 0 : true; } +// clang-format on + +std::ostream& operator<<(std::ostream& s, const String& in) { return s << in.c_str(); } + +namespace { + void color_to_stream(std::ostream&, Color::Enum) DOCTEST_BRANCH_ON_DISABLED({}, ;) +} // namespace + +namespace Color { + std::ostream& operator<<(std::ostream& s, Color::Enum code) { + color_to_stream(s, code); + return s; + } +} // namespace Color + +// clang-format off +const char* assertString(assertType::Enum at) { + DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4062) // enum 'x' in switch of enum 'y' is not handled + switch(at) { //!OCLINT missing default in switch statements + case assertType::DT_WARN : return "WARN"; + case assertType::DT_CHECK : return "CHECK"; + case assertType::DT_REQUIRE : return "REQUIRE"; + + case assertType::DT_WARN_FALSE : return "WARN_FALSE"; + case assertType::DT_CHECK_FALSE : return "CHECK_FALSE"; + case assertType::DT_REQUIRE_FALSE : return "REQUIRE_FALSE"; + + case assertType::DT_WARN_THROWS : return "WARN_THROWS"; + case assertType::DT_CHECK_THROWS : return "CHECK_THROWS"; + case assertType::DT_REQUIRE_THROWS : return "REQUIRE_THROWS"; + + case assertType::DT_WARN_THROWS_AS : return "WARN_THROWS_AS"; + case assertType::DT_CHECK_THROWS_AS : return "CHECK_THROWS_AS"; + case assertType::DT_REQUIRE_THROWS_AS : return "REQUIRE_THROWS_AS"; + + case assertType::DT_WARN_NOTHROW : return "WARN_NOTHROW"; + case assertType::DT_CHECK_NOTHROW : return "CHECK_NOTHROW"; + case assertType::DT_REQUIRE_NOTHROW : return "REQUIRE_NOTHROW"; + + case assertType::DT_WARN_EQ : return "WARN_EQ"; + case assertType::DT_CHECK_EQ : return "CHECK_EQ"; + case assertType::DT_REQUIRE_EQ : return "REQUIRE_EQ"; + case assertType::DT_WARN_NE : return "WARN_NE"; + case assertType::DT_CHECK_NE : return "CHECK_NE"; + case assertType::DT_REQUIRE_NE : return "REQUIRE_NE"; + case assertType::DT_WARN_GT : return "WARN_GT"; + case assertType::DT_CHECK_GT : return "CHECK_GT"; + case assertType::DT_REQUIRE_GT : return "REQUIRE_GT"; + case assertType::DT_WARN_LT : return "WARN_LT"; + case assertType::DT_CHECK_LT : return "CHECK_LT"; + case assertType::DT_REQUIRE_LT : return "REQUIRE_LT"; + case assertType::DT_WARN_GE : return "WARN_GE"; + case assertType::DT_CHECK_GE : return "CHECK_GE"; + case assertType::DT_REQUIRE_GE : return "REQUIRE_GE"; + case assertType::DT_WARN_LE : return "WARN_LE"; + case assertType::DT_CHECK_LE : return "CHECK_LE"; + case assertType::DT_REQUIRE_LE : return "REQUIRE_LE"; + + case assertType::DT_WARN_UNARY : return "WARN_UNARY"; + case assertType::DT_CHECK_UNARY : return "CHECK_UNARY"; + case assertType::DT_REQUIRE_UNARY : return "REQUIRE_UNARY"; + case assertType::DT_WARN_UNARY_FALSE : return "WARN_UNARY_FALSE"; + case assertType::DT_CHECK_UNARY_FALSE : return "CHECK_UNARY_FALSE"; + case assertType::DT_REQUIRE_UNARY_FALSE : return "REQUIRE_UNARY_FALSE"; + + case assertType::DT_FAST_WARN_EQ : return "FAST_WARN_EQ"; + case assertType::DT_FAST_CHECK_EQ : return "FAST_CHECK_EQ"; + case assertType::DT_FAST_REQUIRE_EQ : return "FAST_REQUIRE_EQ"; + case assertType::DT_FAST_WARN_NE : return "FAST_WARN_NE"; + case assertType::DT_FAST_CHECK_NE : return "FAST_CHECK_NE"; + case assertType::DT_FAST_REQUIRE_NE : return "FAST_REQUIRE_NE"; + case assertType::DT_FAST_WARN_GT : return "FAST_WARN_GT"; + case assertType::DT_FAST_CHECK_GT : return "FAST_CHECK_GT"; + case assertType::DT_FAST_REQUIRE_GT : return "FAST_REQUIRE_GT"; + case assertType::DT_FAST_WARN_LT : return "FAST_WARN_LT"; + case assertType::DT_FAST_CHECK_LT : return "FAST_CHECK_LT"; + case assertType::DT_FAST_REQUIRE_LT : return "FAST_REQUIRE_LT"; + case assertType::DT_FAST_WARN_GE : return "FAST_WARN_GE"; + case assertType::DT_FAST_CHECK_GE : return "FAST_CHECK_GE"; + case assertType::DT_FAST_REQUIRE_GE : return "FAST_REQUIRE_GE"; + case assertType::DT_FAST_WARN_LE : return "FAST_WARN_LE"; + case assertType::DT_FAST_CHECK_LE : return "FAST_CHECK_LE"; + case assertType::DT_FAST_REQUIRE_LE : return "FAST_REQUIRE_LE"; + + case assertType::DT_FAST_WARN_UNARY : return "FAST_WARN_UNARY"; + case assertType::DT_FAST_CHECK_UNARY : return "FAST_CHECK_UNARY"; + case assertType::DT_FAST_REQUIRE_UNARY : return "FAST_REQUIRE_UNARY"; + case assertType::DT_FAST_WARN_UNARY_FALSE : return "FAST_WARN_UNARY_FALSE"; + case assertType::DT_FAST_CHECK_UNARY_FALSE : return "FAST_CHECK_UNARY_FALSE"; + case assertType::DT_FAST_REQUIRE_UNARY_FALSE: return "FAST_REQUIRE_UNARY_FALSE"; + } + DOCTEST_MSVC_SUPPRESS_WARNING_POP + return ""; } +// clang-format on -Approx::Approx(double value) - : m_epsilon(static_cast(std::numeric_limits::epsilon()) * 100) - , m_scale(1.0) - , m_value(value) {} +const char* failureString(assertType::Enum at) { + if(at & assertType::is_warn) //!OCLINT bitwise operator in conditional + return "WARNING: "; + if(at & assertType::is_check) //!OCLINT bitwise operator in conditional + return "ERROR: "; + if(at & assertType::is_require) //!OCLINT bitwise operator in conditional + return "FATAL ERROR: "; + return ""; +} -bool operator==(double lhs, Approx const& rhs) { - // Thanks to Richard Harris for his help refining this formula - return std::fabs(lhs - rhs.m_value) < - rhs.m_epsilon * (rhs.m_scale + detail::my_max(std::fabs(lhs), std::fabs(rhs.m_value))); +DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wnull-dereference") +DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wnull-dereference") +// depending on the current options this will remove the path of filenames +const char* removePathFromFilename(const char* file) { + if(getContextOptions()->no_path_in_filenames) { + auto back = std::strrchr(file, '\\'); + auto forward = std::strrchr(file, '/'); + if(back || forward) { + if(back > forward) + forward = back; + return forward + 1; + } + } + return file; +} +DOCTEST_CLANG_SUPPRESS_WARNING_POP +DOCTEST_GCC_SUPPRESS_WARNING_POP + +DOCTEST_DEFINE_DEFAULTS(TestCaseData); +DOCTEST_DEFINE_COPIES(TestCaseData); + +DOCTEST_DEFINE_DEFAULTS(AssertData); + +DOCTEST_DEFINE_DEFAULTS(MessageData); + +SubcaseSignature::SubcaseSignature(const char* name, const char* file, int line) + : m_name(name) + , m_file(file) + , m_line(line) {} + +DOCTEST_DEFINE_DEFAULTS(SubcaseSignature); +DOCTEST_DEFINE_COPIES(SubcaseSignature); + +bool SubcaseSignature::operator<(const SubcaseSignature& other) const { + if(m_line != other.m_line) + return m_line < other.m_line; + if(std::strcmp(m_file, other.m_file) != 0) + return std::strcmp(m_file, other.m_file) < 0; + return std::strcmp(m_name, other.m_name) < 0; } -String Approx::toString() const { return String("Approx( ") + doctest::toString(m_value) + " )"; } +IContextScope::IContextScope() = default; +IContextScope::~IContextScope() = default; + +DOCTEST_DEFINE_DEFAULTS(ContextOptions); #ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING String toString(char* in) { return toString(static_cast(in)); } String toString(const char* in) { return String("\"") + (in ? in : "{null string}") + "\""; } #endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING String toString(bool in) { return in ? "true" : "false"; } -String toString(float in) { return detail::fpToString(in, 5) + "f"; } -String toString(double in) { return detail::fpToString(in, 10); } -String toString(double long in) { return detail::fpToString(in, 15); } - -String toString(char in) { - char buf[64]; - std::sprintf(buf, "%d", in); - return buf; -} - -String toString(char signed in) { - char buf[64]; - std::sprintf(buf, "%d", in); - return buf; -} +String toString(float in) { return fpToString(in, 5) + "f"; } +String toString(double in) { return fpToString(in, 10); } +String toString(double long in) { return fpToString(in, 15); } + +#define DOCTEST_TO_STRING_OVERLOAD(type, fmt) \ + String toString(type in) { \ + char buf[64]; \ + std::sprintf(buf, fmt, in); \ + return buf; \ + } -String toString(char unsigned in) { - char buf[64]; - std::sprintf(buf, "%ud", in); - return buf; -} +DOCTEST_TO_STRING_OVERLOAD(char, "%d") +DOCTEST_TO_STRING_OVERLOAD(char signed, "%d") +DOCTEST_TO_STRING_OVERLOAD(char unsigned, "%ud") +DOCTEST_TO_STRING_OVERLOAD(int short, "%d") +DOCTEST_TO_STRING_OVERLOAD(int short unsigned, "%u") +DOCTEST_TO_STRING_OVERLOAD(int, "%d") +DOCTEST_TO_STRING_OVERLOAD(unsigned, "%u") +DOCTEST_TO_STRING_OVERLOAD(int long, "%ld") +DOCTEST_TO_STRING_OVERLOAD(int long unsigned, "%lu") +DOCTEST_TO_STRING_OVERLOAD(int long long, "%lld") +DOCTEST_TO_STRING_OVERLOAD(int long long unsigned, "%llu") -String toString(int short in) { - char buf[64]; - std::sprintf(buf, "%d", in); - return buf; -} +String toString(std::nullptr_t) { return "NULL"; } -String toString(int short unsigned in) { - char buf[64]; - std::sprintf(buf, "%u", in); - return buf; -} +Approx::Approx(double value) + : m_epsilon(static_cast(std::numeric_limits::epsilon()) * 100) + , m_scale(1.0) + , m_value(value) {} -String toString(int in) { - char buf[64]; - std::sprintf(buf, "%d", in); - return buf; -} +DOCTEST_DEFINE_COPIES(Approx); -String toString(int unsigned in) { - char buf[64]; - std::sprintf(buf, "%u", in); - return buf; +Approx Approx::operator()(double value) const { + Approx approx(value); + approx.epsilon(m_epsilon); + approx.scale(m_scale); + return approx; } -String toString(int long in) { - char buf[64]; - std::sprintf(buf, "%ld", in); - return buf; +Approx& Approx::epsilon(double newEpsilon) { + m_epsilon = newEpsilon; + return *this; } - -String toString(int long unsigned in) { - char buf[64]; - std::sprintf(buf, "%lu", in); - return buf; +Approx& Approx::scale(double newScale) { + m_scale = newScale; + return *this; } -#ifdef DOCTEST_CONFIG_WITH_LONG_LONG -String toString(int long long in) { - char buf[64]; - std::sprintf(buf, "%lld", in); - return buf; +bool operator==(double lhs, const Approx& rhs) { + // Thanks to Richard Harris for his help refining this formula + return std::fabs(lhs - rhs.m_value) < + rhs.m_epsilon * (rhs.m_scale + std::max(std::fabs(lhs), std::fabs(rhs.m_value))); } -String toString(int long long unsigned in) { - char buf[64]; - std::sprintf(buf, "%llu", in); - return buf; +bool operator==(const Approx& lhs, double rhs) { return operator==(rhs, lhs); } +bool operator!=(double lhs, const Approx& rhs) { return !operator==(lhs, rhs); } +bool operator!=(const Approx& lhs, double rhs) { return !operator==(rhs, lhs); } +bool operator<=(double lhs, const Approx& rhs) { return lhs < rhs.m_value || lhs == rhs; } +bool operator<=(const Approx& lhs, double rhs) { return lhs.m_value < rhs || lhs == rhs; } +bool operator>=(double lhs, const Approx& rhs) { return lhs > rhs.m_value || lhs == rhs; } +bool operator>=(const Approx& lhs, double rhs) { return lhs.m_value > rhs || lhs == rhs; } +bool operator<(double lhs, const Approx& rhs) { return lhs < rhs.m_value && lhs != rhs; } +bool operator<(const Approx& lhs, double rhs) { return lhs.m_value < rhs && lhs != rhs; } +bool operator>(double lhs, const Approx& rhs) { return lhs > rhs.m_value && lhs != rhs; } +bool operator>(const Approx& lhs, double rhs) { return lhs.m_value > rhs && lhs != rhs; } + +String toString(const Approx& in) { + return String("Approx( ") + doctest::toString(in.m_value) + " )"; } -#endif // DOCTEST_CONFIG_WITH_LONG_LONG - -#ifdef DOCTEST_CONFIG_WITH_NULLPTR -String toString(std::nullptr_t) { return "nullptr"; } -#endif // DOCTEST_CONFIG_WITH_NULLPTR +const ContextOptions* getContextOptions() { return DOCTEST_BRANCH_ON_DISABLED(nullptr, g_cs); } } // namespace doctest #ifdef DOCTEST_CONFIG_DISABLE -namespace doctest -{ -bool isRunningInTest() { return false; } +namespace doctest { Context::Context(int, const char* const*) {} -Context::~Context() {} +Context::~Context() = default; void Context::applyCommandLine(int, const char* const*) {} void Context::addFilter(const char*, const char*) {} void Context::clearFilters() {} void Context::setOption(const char*, int) {} void Context::setOption(const char*, const char*) {} bool Context::shouldExit() { return false; } +void Context::setAsDefaultForAssertsOutOfTestCases() {} +void Context::setAssertHandler(detail::assert_handler) {} int Context::run() { return 0; } + +DOCTEST_DEFINE_DEFAULTS(CurrentTestCaseStats); + +DOCTEST_DEFINE_DEFAULTS(TestRunStats); + +IReporter::~IReporter() = default; + +int IReporter::get_num_active_contexts() { return 0; } +const IContextScope* const* IReporter::get_active_contexts() { return nullptr; } +int IReporter::get_num_stringified_contexts() { return 0; } +const String* IReporter::get_stringified_contexts() { return nullptr; } + +int registerReporter(const char*, int, IReporter*) { return 0; } + } // namespace doctest #else // DOCTEST_CONFIG_DISABLE @@ -3653,38 +3287,27 @@ int Context::run() { return 0; } #endif // DOCTEST_CONFIG_COLORS_WINDOWS && DOCTEST_CONFIG_COLORS_ANSI #endif // DOCTEST_CONFIG_COLORS_NONE -#define DOCTEST_PRINTF_COLORED(buffer, color) \ - do { \ - Color col(color); \ - std::printf("%s", buffer); \ - } while((void)0, 0) - -// the buffer size used for snprintf() calls -#if !defined(DOCTEST_SNPRINTF_BUFFER_LENGTH) -#define DOCTEST_SNPRINTF_BUFFER_LENGTH 1024 -#endif // DOCTEST_SNPRINTF_BUFFER_LENGTH - -#if defined(_MSC_VER) || defined(__MINGW32__) -#if defined(_MSC_VER) && _MSC_VER >= 1700 +#if DOCTEST_MSVC || defined(__MINGW32__) +#if DOCTEST_MSVC #define DOCTEST_WINDOWS_SAL_IN_OPT _In_opt_ -#else // _MSC_VER +#else // MSVC #define DOCTEST_WINDOWS_SAL_IN_OPT -#endif // _MSC_VER +#endif // MSVC extern "C" __declspec(dllimport) void __stdcall OutputDebugStringA( DOCTEST_WINDOWS_SAL_IN_OPT const char*); extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent(); -#endif // _MSC_VER || __MINGW32__ +#endif // MSVC || __MINGW32__ #ifdef DOCTEST_CONFIG_COLORS_ANSI #include #endif // DOCTEST_CONFIG_COLORS_ANSI -#ifdef _WIN32 +#ifdef DOCTEST_PLATFORM_WINDOWS // defines for a leaner windows.h -#ifndef WIN32_MEAN_AND_LEAN -#define WIN32_MEAN_AND_LEAN -#endif // WIN32_MEAN_AND_LEAN +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#endif // WIN32_LEAN_AND_MEAN #ifndef VC_EXTRA_LEAN #define VC_EXTRA_LEAN #endif // VC_EXTRA_LEAN @@ -3692,22 +3315,25 @@ extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent(); #define NOMINMAX #endif // NOMINMAX +DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN + // not sure what AfxWin.h is for - here I do what Catch does #ifdef __AFXDLL #include #else -#include +#include #endif #include -#else // _WIN32 +DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_END + +#else // DOCTEST_PLATFORM_WINDOWS #include -#endif // _WIN32 +#endif // DOCTEST_PLATFORM_WINDOWS -namespace doctest_detail_test_suite_ns -{ +namespace doctest_detail_test_suite_ns { // holds the current test suite doctest::detail::TestSuite& getCurrentTestSuite() { static doctest::detail::TestSuite data; @@ -3715,174 +3341,55 @@ doctest::detail::TestSuite& getCurrentTestSuite() { } } // namespace doctest_detail_test_suite_ns -namespace doctest -{ -namespace detail -{ - TestCase::TestCase(funcType test, const char* file, unsigned line, const TestSuite& test_suite, - const char* type, int template_id) - : m_test(test) - , m_name(0) - , m_type(type) - , m_test_suite(test_suite.m_test_suite) - , m_description(test_suite.m_description) - , m_skip(test_suite.m_skip) - , m_may_fail(test_suite.m_may_fail) - , m_should_fail(test_suite.m_should_fail) - , m_expected_failures(test_suite.m_expected_failures) - , m_timeout(test_suite.m_timeout) - , m_file(file) - , m_line(line) - , m_template_id(template_id) {} - - TestCase& TestCase::operator*(const char* in) { - m_name = in; - // make a new name with an appended type for templated test case - if(m_template_id != -1) { - m_full_name = String(m_name) + m_type; - // redirect the name to point to the newly constructed full name - m_name = m_full_name.c_str(); - } - return *this; - } - - TestCase& TestCase::operator=(const TestCase& other) { - m_test = other.m_test; - m_full_name = other.m_full_name; - m_name = other.m_name; - m_type = other.m_type; - m_test_suite = other.m_test_suite; - m_description = other.m_description; - m_skip = other.m_skip; - m_may_fail = other.m_may_fail; - m_should_fail = other.m_should_fail; - m_expected_failures = other.m_expected_failures; - m_timeout = other.m_timeout; - m_file = other.m_file; - m_line = other.m_line; - m_template_id = other.m_template_id; - - if(m_template_id != -1) - m_name = m_full_name.c_str(); - return *this; - } - - bool TestCase::operator<(const TestCase& other) const { - if(m_line != other.m_line) - return m_line < other.m_line; - const int file_cmp = std::strcmp(m_file, other.m_file); - if(file_cmp != 0) - return file_cmp < 0; - return m_template_id < other.m_template_id; +namespace doctest { +namespace { + using namespace detail; + typedef std::map, IReporter*> reporterMap; + reporterMap& getReporters() { + static reporterMap data; + return data; } - const char* getAssertString(assertType::Enum val) { - switch(val) { //!OCLINT missing default in switch statements - // clang-format off - case assertType::DT_WARN : return "WARN"; - case assertType::DT_CHECK : return "CHECK"; - case assertType::DT_REQUIRE : return "REQUIRE"; - - case assertType::DT_WARN_FALSE : return "WARN_FALSE"; - case assertType::DT_CHECK_FALSE : return "CHECK_FALSE"; - case assertType::DT_REQUIRE_FALSE : return "REQUIRE_FALSE"; - - case assertType::DT_WARN_THROWS : return "WARN_THROWS"; - case assertType::DT_CHECK_THROWS : return "CHECK_THROWS"; - case assertType::DT_REQUIRE_THROWS : return "REQUIRE_THROWS"; - - case assertType::DT_WARN_THROWS_AS : return "WARN_THROWS_AS"; - case assertType::DT_CHECK_THROWS_AS : return "CHECK_THROWS_AS"; - case assertType::DT_REQUIRE_THROWS_AS : return "REQUIRE_THROWS_AS"; - - case assertType::DT_WARN_NOTHROW : return "WARN_NOTHROW"; - case assertType::DT_CHECK_NOTHROW : return "CHECK_NOTHROW"; - case assertType::DT_REQUIRE_NOTHROW : return "REQUIRE_NOTHROW"; - - case assertType::DT_WARN_EQ : return "WARN_EQ"; - case assertType::DT_CHECK_EQ : return "CHECK_EQ"; - case assertType::DT_REQUIRE_EQ : return "REQUIRE_EQ"; - case assertType::DT_WARN_NE : return "WARN_NE"; - case assertType::DT_CHECK_NE : return "CHECK_NE"; - case assertType::DT_REQUIRE_NE : return "REQUIRE_NE"; - case assertType::DT_WARN_GT : return "WARN_GT"; - case assertType::DT_CHECK_GT : return "CHECK_GT"; - case assertType::DT_REQUIRE_GT : return "REQUIRE_GT"; - case assertType::DT_WARN_LT : return "WARN_LT"; - case assertType::DT_CHECK_LT : return "CHECK_LT"; - case assertType::DT_REQUIRE_LT : return "REQUIRE_LT"; - case assertType::DT_WARN_GE : return "WARN_GE"; - case assertType::DT_CHECK_GE : return "CHECK_GE"; - case assertType::DT_REQUIRE_GE : return "REQUIRE_GE"; - case assertType::DT_WARN_LE : return "WARN_LE"; - case assertType::DT_CHECK_LE : return "CHECK_LE"; - case assertType::DT_REQUIRE_LE : return "REQUIRE_LE"; - - case assertType::DT_WARN_UNARY : return "WARN_UNARY"; - case assertType::DT_CHECK_UNARY : return "CHECK_UNARY"; - case assertType::DT_REQUIRE_UNARY : return "REQUIRE_UNARY"; - case assertType::DT_WARN_UNARY_FALSE : return "WARN_UNARY_FALSE"; - case assertType::DT_CHECK_UNARY_FALSE : return "CHECK_UNARY_FALSE"; - case assertType::DT_REQUIRE_UNARY_FALSE : return "REQUIRE_UNARY_FALSE"; - - case assertType::DT_FAST_WARN_EQ : return "FAST_WARN_EQ"; - case assertType::DT_FAST_CHECK_EQ : return "FAST_CHECK_EQ"; - case assertType::DT_FAST_REQUIRE_EQ : return "FAST_REQUIRE_EQ"; - case assertType::DT_FAST_WARN_NE : return "FAST_WARN_NE"; - case assertType::DT_FAST_CHECK_NE : return "FAST_CHECK_NE"; - case assertType::DT_FAST_REQUIRE_NE : return "FAST_REQUIRE_NE"; - case assertType::DT_FAST_WARN_GT : return "FAST_WARN_GT"; - case assertType::DT_FAST_CHECK_GT : return "FAST_CHECK_GT"; - case assertType::DT_FAST_REQUIRE_GT : return "FAST_REQUIRE_GT"; - case assertType::DT_FAST_WARN_LT : return "FAST_WARN_LT"; - case assertType::DT_FAST_CHECK_LT : return "FAST_CHECK_LT"; - case assertType::DT_FAST_REQUIRE_LT : return "FAST_REQUIRE_LT"; - case assertType::DT_FAST_WARN_GE : return "FAST_WARN_GE"; - case assertType::DT_FAST_CHECK_GE : return "FAST_CHECK_GE"; - case assertType::DT_FAST_REQUIRE_GE : return "FAST_REQUIRE_GE"; - case assertType::DT_FAST_WARN_LE : return "FAST_WARN_LE"; - case assertType::DT_FAST_CHECK_LE : return "FAST_CHECK_LE"; - case assertType::DT_FAST_REQUIRE_LE : return "FAST_REQUIRE_LE"; - - case assertType::DT_FAST_WARN_UNARY : return "FAST_WARN_UNARY"; - case assertType::DT_FAST_CHECK_UNARY : return "FAST_CHECK_UNARY"; - case assertType::DT_FAST_REQUIRE_UNARY : return "FAST_REQUIRE_UNARY"; - case assertType::DT_FAST_WARN_UNARY_FALSE : return "FAST_WARN_UNARY_FALSE"; - case assertType::DT_FAST_CHECK_UNARY_FALSE : return "FAST_CHECK_UNARY_FALSE"; - case assertType::DT_FAST_REQUIRE_UNARY_FALSE: return "FAST_REQUIRE_UNARY_FALSE"; - // clang-format on - } - return ""; + void throwException() { +#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS + throw TestFailureException(); +#endif // DOCTEST_CONFIG_NO_EXCEPTIONS } - - bool checkIfShouldThrow(assertType::Enum assert_type) { - if(assert_type & assertType::is_require) //!OCLINT bitwise operator in conditional +} // namespace +namespace detail { +#define DOCTEST_ITERATE_THROUGH_REPORTERS(function, ...) \ + for(auto& curr_rep : g_cs->reporters_currently_used) \ + curr_rep->function(__VA_ARGS__) + + DOCTEST_DEFINE_DEFAULTS(TestFailureException); + DOCTEST_DEFINE_COPIES(TestFailureException); + bool checkIfShouldThrow(assertType::Enum at) { + if(at & assertType::is_require) //!OCLINT bitwise operator in conditional return true; - if((assert_type & assertType::is_check) //!OCLINT bitwise operator in conditional - && contextState->abort_after > 0 && - contextState->numFailedAssertions >= contextState->abort_after) + if((at & assertType::is_check) //!OCLINT bitwise operator in conditional + && getContextOptions()->abort_after > 0 && + (g_cs->numAssertsFailed + g_cs->numAssertsFailedForCurrentTestCase_atomic) >= + getContextOptions()->abort_after) return true; return false; } + void fastAssertThrowIfFlagSet(int flags) { if(flags & assertAction::shouldthrow) //!OCLINT bitwise operator in conditional throwException(); } - void throwException() { -#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS - throw TestFailureException(); -#endif // DOCTEST_CONFIG_NO_EXCEPTIONS - } +} // namespace detail +namespace { + using namespace detail; // matching of a string against a wildcard mask (case sensitivity configurable) taken from - // http://www.emoticode.net/c/simple-wildcard-string-compare-globbing-function.html + // https://www.codeproject.com/Articles/1088/Wildcard-string-compare-globbing int wildcmp(const char* str, const char* wild, bool caseSensitive) { - const char* cp = 0; - const char* mp = 0; + const char* cp = nullptr; + const char* mp = nullptr; - // rolled my own tolower() to not include more headers while((*str) && (*wild != '*')) { if((caseSensitive ? (*wild != *str) : (tolower(*wild) != tolower(*str))) && (*wild != '?')) { @@ -3925,17 +3432,17 @@ namespace detail //} // checks if the name matches any of the filters (and can be configured what to do when empty) - bool matchesAny(const char* name, const std::vector& filters, int matchEmpty, + bool matchesAny(const char* name, const std::vector& filters, bool matchEmpty, bool caseSensitive) { if(filters.empty() && matchEmpty) return true; - for(unsigned i = 0; i < filters.size(); ++i) - if(wildcmp(name, filters[i].c_str(), caseSensitive)) + for(auto& curr : filters) + if(wildcmp(name, curr.c_str(), caseSensitive)) return true; return false; } -#ifdef _WIN32 +#ifdef DOCTEST_PLATFORM_WINDOWS typedef unsigned long long UInt64; @@ -3949,49 +3456,39 @@ namespace detail QueryPerformanceCounter(reinterpret_cast(&t)); return ((t - hzo) * 1000000) / hz; } -#else // _WIN32 +#else // DOCTEST_PLATFORM_WINDOWS typedef uint64_t UInt64; UInt64 getCurrentTicks() { timeval t; - gettimeofday(&t, 0); + gettimeofday(&t, nullptr); return static_cast(t.tv_sec) * 1000000 + static_cast(t.tv_usec); } -#endif // _WIN32 +#endif // DOCTEST_PLATFORM_WINDOWS - class Timer + struct Timer { - public: - Timer() - : m_ticks(0) {} void start() { m_ticks = getCurrentTicks(); } unsigned int getElapsedMicroseconds() const { return static_cast(getCurrentTicks() - m_ticks); } - unsigned int getElapsedMilliseconds() const { - return static_cast(getElapsedMicroseconds() / 1000); - } + //unsigned int getElapsedMilliseconds() const { + // return static_cast(getElapsedMicroseconds() / 1000); + //} double getElapsedSeconds() const { return getElapsedMicroseconds() / 1000000.0; } private: - UInt64 m_ticks; + UInt64 m_ticks = 0; }; - TestAccessibleContextState* getTestsContextState() { return contextState; } - - bool SubcaseSignature::operator<(const SubcaseSignature& other) const { - if(m_line != other.m_line) - return m_line < other.m_line; - if(std::strcmp(m_file, other.m_file) != 0) - return std::strcmp(m_file, other.m_file) < 0; - return std::strcmp(m_name, other.m_name) < 0; - } + Timer g_timer; +} // namespace +namespace detail { Subcase::Subcase(const char* name, const char* file, int line) - : m_signature(name, file, line) - , m_entered(false) { - ContextState* s = contextState; + : m_signature(name, file, line) { + ContextState* s = g_cs; // if we have already completed it if(s->subcasesPassed.count(m_signature) != 0) @@ -3999,69 +3496,140 @@ namespace detail // check subcase filters if(s->subcasesCurrentLevel < s->subcase_filter_levels) { - if(!matchesAny(m_signature.m_name, s->filters[6], 1, s->case_sensitive)) + if(!matchesAny(m_signature.m_name, s->filters[6], true, s->case_sensitive)) return; - if(matchesAny(m_signature.m_name, s->filters[7], 0, s->case_sensitive)) + if(matchesAny(m_signature.m_name, s->filters[7], false, s->case_sensitive)) return; } // if a Subcase on the same level has already been entered if(s->subcasesEnteredLevels.count(s->subcasesCurrentLevel) != 0) { - s->subcasesHasSkipped = true; + s->should_reenter = true; return; } - s->subcasesStack.push_back(*this); - if(s->hasLoggedCurrentTestStart) - logTestEnd(); - s->hasLoggedCurrentTestStart = false; - s->subcasesEnteredLevels.insert(s->subcasesCurrentLevel++); m_entered = true; - } - Subcase::Subcase(const Subcase& other) - : m_signature(other.m_signature.m_name, other.m_signature.m_file, - other.m_signature.m_line) - , m_entered(other.m_entered) {} + DOCTEST_ITERATE_THROUGH_REPORTERS(subcase_start, m_signature); + } Subcase::~Subcase() { if(m_entered) { - ContextState* s = contextState; + ContextState* s = g_cs; s->subcasesCurrentLevel--; // only mark the subcase as passed if no subcases have been skipped - if(s->subcasesHasSkipped == false) + if(s->should_reenter == false) s->subcasesPassed.insert(m_signature); - if(!s->subcasesStack.empty()) - s->subcasesStack.pop_back(); - if(s->hasLoggedCurrentTestStart) - logTestEnd(); - s->hasLoggedCurrentTestStart = false; + DOCTEST_ITERATE_THROUGH_REPORTERS(subcase_end, m_signature); } } - Result::~Result() {} + Subcase::operator bool() const { return m_entered; } + + Result::Result(bool passed, const String& decomposition) + : m_passed(passed) + , m_decomp(decomposition) {} + + DOCTEST_DEFINE_DEFAULTS(Result); + DOCTEST_DEFINE_COPIES(Result); + + ExpressionDecomposer::ExpressionDecomposer(assertType::Enum at) + : m_at(at) {} + + DOCTEST_DEFINE_DEFAULTS(ExpressionDecomposer); + + DOCTEST_DEFINE_DEFAULTS(TestSuite); + DOCTEST_DEFINE_COPIES(TestSuite); + + TestSuite& TestSuite::operator*(const char* in) { + m_test_suite = in; + // clear state + m_description = nullptr; + m_skip = false; + m_may_fail = false; + m_should_fail = false; + m_expected_failures = 0; + m_timeout = 0; + return *this; + } + + TestCase::TestCase(funcType test, const char* file, unsigned line, const TestSuite& test_suite, + const char* type, int template_id) { + m_file = file; + m_line = line; + m_name = nullptr; + m_test_suite = test_suite.m_test_suite; + m_description = test_suite.m_description; + m_skip = test_suite.m_skip; + m_may_fail = test_suite.m_may_fail; + m_should_fail = test_suite.m_should_fail; + m_expected_failures = test_suite.m_expected_failures; + m_timeout = test_suite.m_timeout; + + m_test = test; + m_type = type; + m_template_id = template_id; + } + + DOCTEST_DEFINE_DEFAULTS(TestCase); + + TestCase::TestCase(const TestCase& other) + : TestCaseData() { + *this = other; + } + + DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(26434) // hides a non-virtual function + DOCTEST_MSVC_SUPPRESS_WARNING(26437) // Do not slice + TestCase& TestCase::operator=(const TestCase& other) { + static_cast(*this) = static_cast(other); + + m_test = other.m_test; + m_type = other.m_type; + m_template_id = other.m_template_id; + m_full_name = other.m_full_name; - Result& Result::operator=(const Result& other) { - m_passed = other.m_passed; - m_decomposition = other.m_decomposition; + if(m_template_id != -1) + m_name = m_full_name.c_str(); + return *this; + } + DOCTEST_MSVC_SUPPRESS_WARNING_POP + TestCase& TestCase::operator*(const char* in) { + m_name = in; + // make a new name with an appended type for templated test case + if(m_template_id != -1) { + m_full_name = String(m_name) + m_type; + // redirect the name to point to the newly constructed full name + m_name = m_full_name.c_str(); + } return *this; } + bool TestCase::operator<(const TestCase& other) const { + if(m_line != other.m_line) + return m_line < other.m_line; + const int file_cmp = std::strcmp(m_file, other.m_file); + if(file_cmp != 0) + return file_cmp < 0; + return m_template_id < other.m_template_id; + } +} // namespace detail +namespace { + using namespace detail; // for sorting tests by file/line int fileOrderComparator(const void* a, const void* b) { - const TestCase* lhs = *static_cast(a); - const TestCase* rhs = *static_cast(b); -#ifdef _MSC_VER + auto lhs = *static_cast(a); + auto rhs = *static_cast(b); +#if DOCTEST_MSVC // this is needed because MSVC gives different case for drive letters // for __FILE__ when evaluated in a header and a source file const int res = stricmp(lhs->m_file, rhs->m_file); -#else // _MSC_VER +#else // MSVC const int res = std::strcmp(lhs->m_file, rhs->m_file); -#endif // _MSC_VER +#endif // MSVC if(res != 0) return res; return static_cast(lhs->m_line - rhs->m_line); @@ -4069,8 +3637,8 @@ namespace detail // for sorting tests by suite/file/line int suiteOrderComparator(const void* a, const void* b) { - const TestCase* lhs = *static_cast(a); - const TestCase* rhs = *static_cast(b); + auto lhs = *static_cast(a); + auto rhs = *static_cast(b); const int res = std::strcmp(lhs->m_test_suite, rhs->m_test_suite); if(res != 0) @@ -4080,8 +3648,8 @@ namespace detail // for sorting tests by name/suite/file/line int nameOrderComparator(const void* a, const void* b) { - const TestCase* lhs = *static_cast(a); - const TestCase* rhs = *static_cast(b); + auto lhs = *static_cast(a); + auto rhs = *static_cast(b); const int res_name = std::strcmp(lhs->m_name, rhs->m_name); if(res_name != 0) @@ -4089,115 +3657,72 @@ namespace detail return suiteOrderComparator(a, b); } - // sets the current test suite - int setTestSuite(const TestSuite& ts) { - doctest_detail_test_suite_ns::getCurrentTestSuite() = ts; - return 0; - } - // all the registered tests std::set& getRegisteredTests() { static std::set data; return data; } - // used by the macros for registering tests - int regTest(const TestCase& tc) { - getRegisteredTests().insert(tc); - return 0; - } - - struct Color - { - enum Code - { - None = 0, - White, - Red, - Green, - Blue, - Cyan, - Yellow, - Grey, - - Bright = 0x10, - - BrightRed = Bright | Red, - BrightGreen = Bright | Green, - LightGrey = Bright | Grey, - BrightWhite = Bright | White - }; - explicit Color(Code code) { use(code); } - ~Color() { use(None); } - - static void use(Code code); - static void init(); - }; - #ifdef DOCTEST_CONFIG_COLORS_WINDOWS HANDLE g_stdoutHandle; - WORD g_originalForegroundAttributes; - WORD g_originalBackgroundAttributes; + WORD g_origFgAttrs; + WORD g_origBgAttrs; bool g_attrsInitted = false; -#endif // DOCTEST_CONFIG_COLORS_WINDOWS - void Color::init() { -#ifdef DOCTEST_CONFIG_COLORS_WINDOWS + int colors_init() { if(!g_attrsInitted) { g_stdoutHandle = GetStdHandle(STD_OUTPUT_HANDLE); g_attrsInitted = true; CONSOLE_SCREEN_BUFFER_INFO csbiInfo; GetConsoleScreenBufferInfo(g_stdoutHandle, &csbiInfo); - g_originalForegroundAttributes = - csbiInfo.wAttributes & - ~(BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY); - g_originalBackgroundAttributes = - csbiInfo.wAttributes & - ~(FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY); + g_origFgAttrs = csbiInfo.wAttributes & ~(BACKGROUND_GREEN | BACKGROUND_RED | + BACKGROUND_BLUE | BACKGROUND_INTENSITY); + g_origBgAttrs = csbiInfo.wAttributes & ~(FOREGROUND_GREEN | FOREGROUND_RED | + FOREGROUND_BLUE | FOREGROUND_INTENSITY); } -#endif // DOCTEST_CONFIG_COLORS_WINDOWS + return 0; } - void Color::use(Code -#ifndef DOCTEST_CONFIG_COLORS_NONE - code -#endif // DOCTEST_CONFIG_COLORS_NONE - ) { - const ContextState* p = contextState; - if(p->no_colors) - return; + int dumy_init_console_colors = colors_init(); +#endif // DOCTEST_CONFIG_COLORS_WINDOWS + + DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations") + void color_to_stream(std::ostream& s, Color::Enum code) { + ((void)s); // for DOCTEST_CONFIG_COLORS_NONE or DOCTEST_CONFIG_COLORS_WINDOWS + ((void)code); // for DOCTEST_CONFIG_COLORS_NONE #ifdef DOCTEST_CONFIG_COLORS_ANSI - if(isatty(STDOUT_FILENO) == false && p->force_colors == false) + if(g_no_colors || + (isatty(STDOUT_FILENO) == false && getContextOptions()->force_colors == false)) return; - const char* col = ""; + auto col = ""; // clang-format off - switch(code) { //!OCLINT missing break in switch statement / unnecessary default statement in covered switch statement - case Color::Red: col = "[0;31m"; break; - case Color::Green: col = "[0;32m"; break; - case Color::Blue: col = "[0;34m"; break; - case Color::Cyan: col = "[0;36m"; break; - case Color::Yellow: col = "[0;33m"; break; - case Color::Grey: col = "[1;30m"; break; - case Color::LightGrey: col = "[0;37m"; break; - case Color::BrightRed: col = "[1;31m"; break; - case Color::BrightGreen: col = "[1;32m"; break; - case Color::BrightWhite: col = "[1;37m"; break; - case Color::Bright: // invalid - case Color::None: - case Color::White: - default: col = "[0m"; - } + switch(code) { //!OCLINT missing break in switch statement / unnecessary default statement in covered switch statement + case Color::Red: col = "[0;31m"; break; + case Color::Green: col = "[0;32m"; break; + case Color::Blue: col = "[0;34m"; break; + case Color::Cyan: col = "[0;36m"; break; + case Color::Yellow: col = "[0;33m"; break; + case Color::Grey: col = "[1;30m"; break; + case Color::LightGrey: col = "[0;37m"; break; + case Color::BrightRed: col = "[1;31m"; break; + case Color::BrightGreen: col = "[1;32m"; break; + case Color::BrightWhite: col = "[1;37m"; break; + case Color::Bright: // invalid + case Color::None: + case Color::White: + default: col = "[0m"; + } // clang-format on - std::printf("\033%s", col); + s << "\033" << col; #endif // DOCTEST_CONFIG_COLORS_ANSI #ifdef DOCTEST_CONFIG_COLORS_WINDOWS - if(isatty(fileno(stdout)) == false && p->force_colors == false) + if(g_no_colors || + (isatty(fileno(stdout)) == false && getContextOptions()->force_colors == false)) return; -#define DOCTEST_SET_ATTR(x) \ - SetConsoleTextAttribute(g_stdoutHandle, x | g_originalBackgroundAttributes) +#define DOCTEST_SET_ATTR(x) SetConsoleTextAttribute(g_stdoutHandle, x | g_origBgAttrs) // clang-format off switch (code) { @@ -4214,28 +3739,24 @@ namespace detail case Color::BrightWhite: DOCTEST_SET_ATTR(FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE); break; case Color::None: case Color::Bright: // invalid - default: DOCTEST_SET_ATTR(g_originalForegroundAttributes); + default: DOCTEST_SET_ATTR(g_origFgAttrs); } -// clang-format on -#undef DOCTEST_SET_ATTR + // clang-format on #endif // DOCTEST_CONFIG_COLORS_WINDOWS } + DOCTEST_CLANG_SUPPRESS_WARNING_POP std::vector& getExceptionTranslators() { static std::vector data; return data; } - void registerExceptionTranslatorImpl(const IExceptionTranslator* translateFunction) { - getExceptionTranslators().push_back(translateFunction); - } - String translateActiveException() { #ifndef DOCTEST_CONFIG_NO_EXCEPTIONS - String res; - std::vector& translators = getExceptionTranslators(); - for(size_t i = 0; i < translators.size(); ++i) - if(translators[i]->translate(res)) + String res; + auto& translators = getExceptionTranslators(); + for(auto& curr : translators) + if(curr->translate(res)) return res; // clang-format off try { @@ -4254,72 +3775,167 @@ namespace detail return ""; #endif // DOCTEST_CONFIG_NO_EXCEPTIONS } +} // namespace - void writeStringToStream(std::ostream* stream, const String& str) { *stream << str; } +namespace detail { + // used by the macros for registering tests + int regTest(const TestCase& tc) { + getRegisteredTests().insert(tc); + return 0; + } + + // sets the current test suite + int setTestSuite(const TestSuite& ts) { + doctest_detail_test_suite_ns::getCurrentTestSuite() = ts; + return 0; + } + +#ifdef DOCTEST_PLATFORM_MAC + // The following function is taken directly from the following technical note: + // http://developer.apple.com/library/mac/#qa/qa2004/qa1361.html + // Returns true if the current process is being debugged (either + // running under the debugger or has a debugger attached post facto). + bool isDebuggerActive() { + int mib[4]; + kinfo_proc info; + size_t size; + // Initialize the flags so that, if sysctl fails for some bizarre + // reason, we get a predictable result. + info.kp_proc.p_flag = 0; + // Initialize mib, which tells sysctl the info we want, in this case + // we're looking for information about a specific process ID. + mib[0] = CTL_KERN; + mib[1] = KERN_PROC; + mib[2] = KERN_PROC_PID; + mib[3] = getpid(); + // Call sysctl. + size = sizeof(info); + if(sysctl(mib, DOCTEST_COUNTOF(mib), &info, &size, 0, 0) != 0) { + fprintf(stderr, "\n** Call to sysctl failed - unable to determine if debugger is " + "active **\n\n"); + return false; + } + // We're being debugged if the P_TRACED flag is set. + return ((info.kp_proc.p_flag & P_TRACED) != 0); + } +#elif DOCTEST_MSVC || defined(__MINGW32__) + bool isDebuggerActive() { return ::IsDebuggerPresent() != 0; } +#else + bool isDebuggerActive() { return false; } +#endif // Platform + + void registerExceptionTranslatorImpl(const IExceptionTranslator* et) { + if(std::find(getExceptionTranslators().begin(), getExceptionTranslators().end(), et) == + getExceptionTranslators().end()) + getExceptionTranslators().push_back(et); + } + + void writeStringToStream(std::ostream* s, const String& str) { *s << str; } #ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING - void toStream(std::ostream* stream, char* in) { *stream << in; } - void toStream(std::ostream* stream, const char* in) { *stream << in; } + void toStream(std::ostream* s, char* in) { *s << in; } + void toStream(std::ostream* s, const char* in) { *s << in; } #endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING - void toStream(std::ostream* stream, bool in) { - *stream << std::boolalpha << in << std::noboolalpha; + void toStream(std::ostream* s, bool in) { *s << std::boolalpha << in << std::noboolalpha; } + void toStream(std::ostream* s, float in) { *s << in; } + void toStream(std::ostream* s, double in) { *s << in; } + void toStream(std::ostream* s, double long in) { *s << in; } + + void toStream(std::ostream* s, char in) { *s << in; } + void toStream(std::ostream* s, char signed in) { *s << in; } + void toStream(std::ostream* s, char unsigned in) { *s << in; } + void toStream(std::ostream* s, int short in) { *s << in; } + void toStream(std::ostream* s, int short unsigned in) { *s << in; } + void toStream(std::ostream* s, int in) { *s << in; } + void toStream(std::ostream* s, int unsigned in) { *s << in; } + void toStream(std::ostream* s, int long in) { *s << in; } + void toStream(std::ostream* s, int long unsigned in) { *s << in; } + void toStream(std::ostream* s, int long long in) { *s << in; } + void toStream(std::ostream* s, int long long unsigned in) { *s << in; } + + thread_local std::vector g_infoContexts; // for logging with INFO() + + ContextBuilder::ICapture::ICapture() = default; + ContextBuilder::ICapture::~ICapture() = default; + + ContextBuilder::Chunk::Chunk() = default; + ContextBuilder::Chunk::~Chunk() = default; + + ContextBuilder::Node::Node() = default; + ContextBuilder::Node::~Node() = default; + + // steal the contents of the other - acting as a move constructor... + ContextBuilder::ContextBuilder(ContextBuilder& other) + : numCaptures(other.numCaptures) + , head(other.head) + , tail(other.tail) { + other.numCaptures = 0; + other.head = nullptr; + other.tail = nullptr; + memcpy(stackChunks, other.stackChunks, + unsigned(int(sizeof(Chunk)) * DOCTEST_CONFIG_NUM_CAPTURES_ON_STACK)); } - void toStream(std::ostream* stream, float in) { *stream << in; } - void toStream(std::ostream* stream, double in) { *stream << in; } - void toStream(std::ostream* stream, double long in) { *stream << in; } - - void toStream(std::ostream* stream, char in) { *stream << in; } - void toStream(std::ostream* stream, char signed in) { *stream << in; } - void toStream(std::ostream* stream, char unsigned in) { *stream << in; } - void toStream(std::ostream* stream, int short in) { *stream << in; } - void toStream(std::ostream* stream, int short unsigned in) { *stream << in; } - void toStream(std::ostream* stream, int in) { *stream << in; } - void toStream(std::ostream* stream, int unsigned in) { *stream << in; } - void toStream(std::ostream* stream, int long in) { *stream << in; } - void toStream(std::ostream* stream, int long unsigned in) { *stream << in; } - -#ifdef DOCTEST_CONFIG_WITH_LONG_LONG - void toStream(std::ostream* stream, int long long in) { *stream << in; } - void toStream(std::ostream* stream, int long long unsigned in) { *stream << in; } -#endif // DOCTEST_CONFIG_WITH_LONG_LONG - - void addToContexts(IContextScope* ptr) { contextState->contexts.push_back(ptr); } - void popFromContexts() { contextState->contexts.pop_back(); } -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable : 4996) // std::uncaught_exception is deprecated in C++17 -#endif - void useContextIfExceptionOccurred(IContextScope* ptr) { + + DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wcast-align") + void ContextBuilder::stringify(std::ostream* s) const { + int curr = 0; + // iterate over small buffer + while(curr < numCaptures && curr < DOCTEST_CONFIG_NUM_CAPTURES_ON_STACK) + reinterpret_cast(stackChunks[curr++].buf)->toStream(s); + // iterate over list + auto curr_elem = head; + while(curr < numCaptures) { + reinterpret_cast(curr_elem->chunk.buf)->toStream(s); + curr_elem = curr_elem->next; + ++curr; + } + } + DOCTEST_GCC_SUPPRESS_WARNING_POP + + ContextBuilder::ContextBuilder() = default; + + ContextBuilder::~ContextBuilder() { + // free the linked list - the ones on the stack are left as-is + // no destructors are called at all - there is no need + while(head) { + auto next = head->next; + delete head; + head = next; + } + } + + ContextScope::ContextScope(ContextBuilder& temp) + : contextBuilder(temp) { + g_infoContexts.push_back(this); + } + + DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4996) // std::uncaught_exception is deprecated in C++17 + DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations") + DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations") + ContextScope::~ContextScope() { if(std::uncaught_exception()) { - std::ostringstream stream; - ptr->build(&stream); - contextState->exceptionalContexts.push_back(stream.str()); + std::ostringstream s; + this->stringify(&s); + g_cs->stringifiedContexts.push_back(s.str().c_str()); } + g_infoContexts.pop_back(); } -#if defined(_MSC_VER) -#pragma warning(pop) -#endif - - void printSummary(); + DOCTEST_CLANG_SUPPRESS_WARNING_POP + DOCTEST_GCC_SUPPRESS_WARNING_POP + DOCTEST_MSVC_SUPPRESS_WARNING_POP + void ContextScope::stringify(std::ostream* s) const { contextBuilder.stringify(s); } +} // namespace detail +namespace { + using namespace detail; #if !defined(DOCTEST_CONFIG_POSIX_SIGNALS) && !defined(DOCTEST_CONFIG_WINDOWS_SEH) - void reportFatal(const std::string&) {} struct FatalConditionHandler { void reset() {} }; #else // DOCTEST_CONFIG_POSIX_SIGNALS || DOCTEST_CONFIG_WINDOWS_SEH - void reportFatal(const std::string& message) { - DOCTEST_LOG_START(); - - contextState->numAssertions += contextState->numAssertionsForCurrentTestcase; - logTestException(message.c_str(), true); - logTestEnd(); - contextState->numFailed++; - - printSummary(); - } + void reportFatal(const std::string&); #ifdef DOCTEST_PLATFORM_WINDOWS @@ -4341,7 +3957,7 @@ namespace detail struct FatalConditionHandler { static LONG CALLBACK handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo) { - for(size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) { + for(size_t i = 0; i < DOCTEST_COUNTOF(signalDefs); ++i) { if(ExceptionInfo->ExceptionRecord->ExceptionCode == signalDefs[i].id) { reportFatal(signalDefs[i].name); } @@ -4356,7 +3972,7 @@ namespace detail // 32k seems enough for doctest to handle stack overflow, // but the value was found experimentally, so there is no strong guarantee guaranteeSize = 32 * 1024; - exceptionHandlerHandle = 0; + exceptionHandlerHandle = nullptr; // Register as first handler in current chain exceptionHandlerHandle = AddVectoredExceptionHandler(1, handleVectoredException); // Pass in guarantee size to be filled @@ -4368,7 +3984,7 @@ namespace detail // Unregister handler and restore the old guarantee RemoveVectoredExceptionHandler(exceptionHandlerHandle); SetThreadStackGuarantee(&guaranteeSize); - exceptionHandlerHandle = 0; + exceptionHandlerHandle = nullptr; isSet = false; } } @@ -4383,7 +3999,7 @@ namespace detail bool FatalConditionHandler::isSet = false; ULONG FatalConditionHandler::guaranteeSize = 0; - PVOID FatalConditionHandler::exceptionHandlerHandle = 0; + PVOID FatalConditionHandler::exceptionHandlerHandle = nullptr; #else // DOCTEST_PLATFORM_WINDOWS @@ -4402,13 +4018,13 @@ namespace detail struct FatalConditionHandler { static bool isSet; - static struct sigaction oldSigActions[sizeof(signalDefs) / sizeof(SignalDefs)]; + static struct sigaction oldSigActions[DOCTEST_COUNTOF(signalDefs)]; static stack_t oldSigStack; - static char altStackMem[SIGSTKSZ]; + static char altStackMem[4 * SIGSTKSZ]; static void handleSignal(int sig) { std::string name = ""; - for(std::size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) { + for(std::size_t i = 0; i < DOCTEST_COUNTOF(signalDefs); ++i) { SignalDefs& def = signalDefs[i]; if(sig == def.id) { name = def.name; @@ -4424,14 +4040,14 @@ namespace detail isSet = true; stack_t sigStack; sigStack.ss_sp = altStackMem; - sigStack.ss_size = SIGSTKSZ; + sigStack.ss_size = sizeof(altStackMem); sigStack.ss_flags = 0; sigaltstack(&sigStack, &oldSigStack); - struct sigaction sa = {0}; + struct sigaction sa = {nullptr}; sa.sa_handler = handleSignal; // NOLINT sa.sa_flags = SA_ONSTACK; - for(std::size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) { + for(std::size_t i = 0; i < DOCTEST_COUNTOF(signalDefs); ++i) { sigaction(signalDefs[i].id, &sa, &oldSigActions[i]); } } @@ -4440,501 +4056,581 @@ namespace detail static void reset() { if(isSet) { // Set signals back to previous values -- hopefully nobody overwrote them in the meantime - for(std::size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) { - sigaction(signalDefs[i].id, &oldSigActions[i], 0); + for(std::size_t i = 0; i < DOCTEST_COUNTOF(signalDefs); ++i) { + sigaction(signalDefs[i].id, &oldSigActions[i], nullptr); } // Return the old stack - sigaltstack(&oldSigStack, 0); + sigaltstack(&oldSigStack, nullptr); isSet = false; } } }; - bool FatalConditionHandler::isSet = false; - struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs) / sizeof(SignalDefs)] = - {}; - stack_t FatalConditionHandler::oldSigStack = {}; - char FatalConditionHandler::altStackMem[SIGSTKSZ] = {}; + bool FatalConditionHandler::isSet = false; + struct sigaction FatalConditionHandler::oldSigActions[DOCTEST_COUNTOF(signalDefs)] = {}; + stack_t FatalConditionHandler::oldSigStack = {}; + char FatalConditionHandler::altStackMem[] = {}; #endif // DOCTEST_PLATFORM_WINDOWS #endif // DOCTEST_CONFIG_POSIX_SIGNALS || DOCTEST_CONFIG_WINDOWS_SEH - // depending on the current options this will remove the path of filenames - const char* fileForOutput(const char* file) { - if(contextState->no_path_in_filenames) { - const char* back = std::strrchr(file, '\\'); - const char* forward = std::strrchr(file, '/'); - if(back || forward) { - if(back > forward) - forward = back; - return forward + 1; - } - } - return file; - } - - // depending on the current options this will substitute the line numbers with 0 - int lineForOutput(int line) { - if(contextState->no_line_numbers) - return 0; - return line; - } +} // namespace -#ifdef DOCTEST_PLATFORM_MAC -#include -#include -#include - // The following function is taken directly from the following technical note: - // http://developer.apple.com/library/mac/#qa/qa2004/qa1361.html - // Returns true if the current process is being debugged (either - // running under the debugger or has a debugger attached post facto). - bool isDebuggerActive() { - int mib[4]; - kinfo_proc info; - size_t size; - // Initialize the flags so that, if sysctl fails for some bizarre - // reason, we get a predictable result. - info.kp_proc.p_flag = 0; - // Initialize mib, which tells sysctl the info we want, in this case - // we're looking for information about a specific process ID. - mib[0] = CTL_KERN; - mib[1] = KERN_PROC; - mib[2] = KERN_PROC_PID; - mib[3] = getpid(); - // Call sysctl. - size = sizeof(info); - if(sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, 0, 0) != 0) { - fprintf(stderr, "\n** Call to sysctl failed - unable to determine if debugger is " - "active **\n\n"); - return false; - } - // We're being debugged if the P_TRACED flag is set. - return ((info.kp_proc.p_flag & P_TRACED) != 0); - } -#elif defined(_MSC_VER) || defined(__MINGW32__) - bool isDebuggerActive() { return ::IsDebuggerPresent() != 0; } -#else - bool isDebuggerActive() { return false; } -#endif // Platform +namespace { + using namespace detail; #ifdef DOCTEST_PLATFORM_WINDOWS - void myOutputDebugString(const String& text) { ::OutputDebugStringA(text.c_str()); } +#define DOCTEST_OUTPUT_DEBUG_STRING(text) ::OutputDebugStringA(text) #else // TODO: integration with XCode and other IDEs - void myOutputDebugString(const String&) {} +#define DOCTEST_OUTPUT_DEBUG_STRING(text) #endif // Platform - const char* getSeparator() { - return "===============================================================================\n"; + void addAssert(assertType::Enum at) { + if((at & assertType::is_warn) == 0) //!OCLINT bitwise operator in conditional + g_cs->numAssertsForCurrentTestCase_atomic++; } - void printToDebugConsole(const String& text) { - if(isDebuggerActive()) - myOutputDebugString(text.c_str()); + void addFailedAssert(assertType::Enum at) { + if((at & assertType::is_warn) == 0) //!OCLINT bitwise operator in conditional + g_cs->numAssertsFailedForCurrentTestCase_atomic++; } - void addFailedAssert(assertType::Enum assert_type) { - if((assert_type & assertType::is_warn) == 0) { //!OCLINT bitwise operator in conditional - contextState->numFailedAssertions++; - contextState->numFailedAssertionsForCurrentTestcase++; - contextState->hasCurrentTestFailed = true; - } - } +#if defined(DOCTEST_CONFIG_POSIX_SIGNALS) || defined(DOCTEST_CONFIG_WINDOWS_SEH) + void reportFatal(const std::string& message) { + g_cs->seconds_so_far += g_timer.getElapsedSeconds(); + g_cs->failure_flags |= TestCaseFailureReason::Crash; + g_cs->error_string = message.c_str(); + g_cs->should_reenter = false; - void logTestStart(const TestCase& tc) { - char loc[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - DOCTEST_SNPRINTF(loc, DOCTEST_COUNTOF(loc), "%s(%d)\n", fileForOutput(tc.m_file), - lineForOutput(tc.m_line)); - - char ts1[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - DOCTEST_SNPRINTF(ts1, DOCTEST_COUNTOF(ts1), "TEST SUITE: "); - char ts2[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - DOCTEST_SNPRINTF(ts2, DOCTEST_COUNTOF(ts2), "%s\n", tc.m_test_suite); - char n1[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - DOCTEST_SNPRINTF(n1, DOCTEST_COUNTOF(n1), "TEST CASE: "); - char n2[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - DOCTEST_SNPRINTF(n2, DOCTEST_COUNTOF(n2), "%s\n", tc.m_name); - char d1[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - DOCTEST_SNPRINTF(d1, DOCTEST_COUNTOF(d1), "DESCRIPTION: "); - char d2[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - DOCTEST_SNPRINTF(d2, DOCTEST_COUNTOF(d2), "%s\n", tc.m_description); - - // hack for BDD style of macros - to not print "TEST CASE:" - char scenario[] = " Scenario:"; - if(std::string(tc.m_name).substr(0, DOCTEST_COUNTOF(scenario) - 1) == scenario) - n1[0] = '\0'; - - DOCTEST_PRINTF_COLORED(getSeparator(), Color::Yellow); - DOCTEST_PRINTF_COLORED(loc, Color::LightGrey); - - String forDebugConsole; - if(tc.m_description) { - DOCTEST_PRINTF_COLORED(d1, Color::Yellow); - DOCTEST_PRINTF_COLORED(d2, Color::None); - forDebugConsole += d1; - forDebugConsole += d2; - } - if(tc.m_test_suite[0] != '\0') { - DOCTEST_PRINTF_COLORED(ts1, Color::Yellow); - DOCTEST_PRINTF_COLORED(ts2, Color::None); - forDebugConsole += ts1; - forDebugConsole += ts2; - } - DOCTEST_PRINTF_COLORED(n1, Color::Yellow); - DOCTEST_PRINTF_COLORED(n2, Color::None); - - String subcaseStuff; - std::vector& subcasesStack = contextState->subcasesStack; - for(unsigned i = 0; i < subcasesStack.size(); ++i) { - if(subcasesStack[i].m_signature.m_name[0] != '\0') { - char subcase[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - DOCTEST_SNPRINTF(subcase, DOCTEST_COUNTOF(loc), " %s\n", - subcasesStack[i].m_signature.m_name); - DOCTEST_PRINTF_COLORED(subcase, Color::None); - subcaseStuff += subcase; - } - } + // TODO: end all currently opened subcases...? - DOCTEST_PRINTF_COLORED("\n", Color::None); + DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_end, *g_cs); - printToDebugConsole(String(getSeparator()) + loc + forDebugConsole.c_str() + n1 + n2 + - subcaseStuff.c_str() + "\n"); + g_cs->numTestCasesFailed++; + + DOCTEST_ITERATE_THROUGH_REPORTERS(test_run_end, *g_cs); + } +#endif // DOCTEST_CONFIG_POSIX_SIGNALS || DOCTEST_CONFIG_WINDOWS_SEH +} // namespace +namespace detail { + + ResultBuilder::ResultBuilder(assertType::Enum at, const char* file, int line, const char* expr, + const char* exception_type) { + m_test_case = g_cs->currentTest; + m_at = at; + m_file = file; + m_line = line; + m_expr = expr; + m_failed = true; + m_threw = false; + m_threw_as = false; + m_exception_type = exception_type; +#if DOCTEST_MSVC + if(m_expr[0] == ' ') // this happens when variadic macros are disabled under MSVC + ++m_expr; +#endif // MSVC } - void logTestEnd() {} + DOCTEST_DEFINE_DEFAULTS(ResultBuilder); - void logTestException(const String& what, bool crash) { - char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH]; + void ResultBuilder::setResult(const Result& res) { + m_decomp = res.m_decomp; + m_failed = !res.m_passed; + } - DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), "TEST CASE FAILED!\n"); + void ResultBuilder::unexpectedExceptionOccurred() { + m_threw = true; + m_exception = translateActiveException(); + } - char info1[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - char info2[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - info1[0] = 0; - info2[0] = 0; - DOCTEST_SNPRINTF(info1, DOCTEST_COUNTOF(info1), - crash ? "crashed:\n" : "threw exception:\n"); - DOCTEST_SNPRINTF(info2, DOCTEST_COUNTOF(info2), " %s\n", what.c_str()); + bool ResultBuilder::log() { + if(m_at & assertType::is_throws) { //!OCLINT bitwise operator in conditional + m_failed = !m_threw; + } else if(m_at & assertType::is_throws_as) { //!OCLINT bitwise operator in conditional + m_failed = !m_threw_as; + } else if(m_at & assertType::is_nothrow) { //!OCLINT bitwise operator in conditional + m_failed = m_threw; + } - std::string contextStr; + if(is_running_in_test) { + addAssert(m_at); + DOCTEST_ITERATE_THROUGH_REPORTERS(log_assert, *this); - if(!contextState->exceptionalContexts.empty()) { - contextStr += "with context:\n"; - for(size_t i = contextState->exceptionalContexts.size(); i > 0; --i) { - contextStr += " "; - contextStr += contextState->exceptionalContexts[i - 1]; - contextStr += "\n"; - } + if(m_failed) + addFailedAssert(m_at); + } else if(m_failed) { + failed_out_of_a_testing_context(*this); } - DOCTEST_PRINTF_COLORED(msg, Color::Red); - DOCTEST_PRINTF_COLORED(info1, Color::None); - DOCTEST_PRINTF_COLORED(info2, Color::Cyan); - DOCTEST_PRINTF_COLORED(contextStr.c_str(), Color::None); - DOCTEST_PRINTF_COLORED("\n", Color::None); + return m_failed && isDebuggerActive() && + !getContextOptions()->no_breaks; // break into debugger + } - printToDebugConsole(String(msg) + info1 + info2 + contextStr.c_str() + "\n"); + void ResultBuilder::react() const { + if(m_failed && checkIfShouldThrow(m_at)) + throwException(); } - String logContext() { - std::ostringstream stream; - std::vector& contexts = contextState->contexts; - if(!contexts.empty()) - stream << "with context:\n"; - for(size_t i = 0; i < contexts.size(); ++i) { - stream << " "; - contexts[i]->build(&stream); - stream << "\n"; - } - return stream.str().c_str(); + void failed_out_of_a_testing_context(const AssertData& ad) { + if(g_cs->ah) + g_cs->ah(ad); + else + std::abort(); } - const char* getFailString(assertType::Enum assert_type) { - if(assert_type & assertType::is_warn) //!OCLINT bitwise operator in conditional - return "WARNING"; - if(assert_type & assertType::is_check) //!OCLINT bitwise operator in conditional - return "ERROR"; - if(assert_type & assertType::is_require) //!OCLINT bitwise operator in conditional - return "FATAL ERROR"; - return ""; + MessageBuilder::MessageBuilder(const char* file, int line, assertType::Enum severity) { + m_stream = getTlsOss(); + m_file = file; + m_line = line; + m_severity = severity; } - void logAssert(bool passed, const char* decomposition, bool threw, const String& exception, - const char* expr, assertType::Enum assert_type, const char* file, int line) { - char loc[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - DOCTEST_SNPRINTF(loc, DOCTEST_COUNTOF(loc), "%s(%d)", fileForOutput(file), - lineForOutput(line)); - - char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), " %s!\n", - passed ? "PASSED" : getFailString(assert_type)); - - char info1[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - DOCTEST_SNPRINTF(info1, DOCTEST_COUNTOF(info1), " %s( %s )\n", - getAssertString(assert_type), expr); - - char info2[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - char info3[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - info2[0] = 0; - info3[0] = 0; - if(threw) { - DOCTEST_SNPRINTF(info2, DOCTEST_COUNTOF(info2), "threw exception:\n"); - DOCTEST_SNPRINTF(info3, DOCTEST_COUNTOF(info3), " %s\n", exception.c_str()); - } else { - DOCTEST_SNPRINTF(info2, DOCTEST_COUNTOF(info2), "with expansion:\n"); - DOCTEST_SNPRINTF(info3, DOCTEST_COUNTOF(info3), " %s( %s )\n", - getAssertString(assert_type), decomposition); + IExceptionTranslator::IExceptionTranslator() = default; + IExceptionTranslator::~IExceptionTranslator() = default; + + bool MessageBuilder::log() { + m_string = getTlsOssResult(); + DOCTEST_ITERATE_THROUGH_REPORTERS(log_message, *this); + + const bool isWarn = m_severity & assertType::is_warn; + + // warn is just a message in this context so we dont treat it as an assert + if(!isWarn) { + addAssert(m_severity); + addFailedAssert(m_severity); } - const bool isWarn = assert_type & assertType::is_warn; - DOCTEST_PRINTF_COLORED(loc, Color::LightGrey); - DOCTEST_PRINTF_COLORED(msg, - passed ? Color::BrightGreen : isWarn ? Color::Yellow : Color::Red); - DOCTEST_PRINTF_COLORED(info1, Color::Cyan); - DOCTEST_PRINTF_COLORED(info2, Color::None); - DOCTEST_PRINTF_COLORED(info3, Color::Cyan); - String context = logContext(); - DOCTEST_PRINTF_COLORED(context.c_str(), Color::None); - DOCTEST_PRINTF_COLORED("\n", Color::None); - - printToDebugConsole(String(loc) + msg + info1 + info2 + info3 + context.c_str() + "\n"); + return isDebuggerActive() && !getContextOptions()->no_breaks && !isWarn; // break } - void logAssertThrows(bool threw, const char* expr, assertType::Enum assert_type, - const char* file, int line) { - char loc[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - DOCTEST_SNPRINTF(loc, DOCTEST_COUNTOF(loc), "%s(%d)", fileForOutput(file), - lineForOutput(line)); - - char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), " %s!\n", - threw ? "PASSED" : getFailString(assert_type)); - - char info1[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - DOCTEST_SNPRINTF(info1, DOCTEST_COUNTOF(info1), " %s( %s )\n", - getAssertString(assert_type), expr); - - char info2[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - info2[0] = 0; - - if(!threw) - DOCTEST_SNPRINTF(info2, DOCTEST_COUNTOF(info2), "didn't throw at all\n"); - - const bool isWarn = assert_type & assertType::is_warn; - DOCTEST_PRINTF_COLORED(loc, Color::LightGrey); - DOCTEST_PRINTF_COLORED(msg, - threw ? Color::BrightGreen : isWarn ? Color::Yellow : Color::Red); - DOCTEST_PRINTF_COLORED(info1, Color::Cyan); - DOCTEST_PRINTF_COLORED(info2, Color::None); - String context = logContext(); - DOCTEST_PRINTF_COLORED(context.c_str(), Color::None); - DOCTEST_PRINTF_COLORED("\n", Color::None); - - printToDebugConsole(String(loc) + msg + info1 + info2 + context.c_str() + "\n"); + void MessageBuilder::react() { + if(m_severity & assertType::is_require) //!OCLINT bitwise operator in conditional + throwException(); } - void logAssertThrowsAs(bool threw, bool threw_as, const char* as, const String& exception, - const char* expr, assertType::Enum assert_type, const char* file, - int line) { - char loc[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - DOCTEST_SNPRINTF(loc, DOCTEST_COUNTOF(loc), "%s(%d)", fileForOutput(file), - lineForOutput(line)); - - char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), " %s!\n", - threw_as ? "PASSED" : getFailString(assert_type)); - - char info1[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - DOCTEST_SNPRINTF(info1, DOCTEST_COUNTOF(info1), " %s( %s, %s )\n", - getAssertString(assert_type), expr, as); - - char info2[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - char info3[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - info2[0] = 0; - info3[0] = 0; - - if(!threw) { //!OCLINT inverted logic - DOCTEST_SNPRINTF(info2, DOCTEST_COUNTOF(info2), "didn't throw at all\n"); - } else if(!threw_as) { - DOCTEST_SNPRINTF(info2, DOCTEST_COUNTOF(info2), "threw a different exception:\n"); - DOCTEST_SNPRINTF(info3, DOCTEST_COUNTOF(info3), " %s\n", exception.c_str()); + MessageBuilder::~MessageBuilder() = default; +} // namespace detail +namespace { + std::mutex g_mutex; + + using namespace detail; + struct ConsoleReporter : public IReporter + { + std::ostream& s; + bool hasLoggedCurrentTestStart; + std::vector subcasesStack; + + // caching pointers to objects of these types - safe to do + const ContextOptions* opt; + const TestCaseData* tc; + + ConsoleReporter(std::ostream& in) + : s(in) {} + + // ========================================================================================= + // WHAT FOLLOWS ARE HELPERS USED BY THE OVERRIDES OF THE VIRTUAL METHODS OF THE INTERFACE + // ========================================================================================= + + void separator_to_stream() { + s << Color::Yellow + << "=============================================================================" + "==" + "\n"; } - const bool isWarn = assert_type & assertType::is_warn; - DOCTEST_PRINTF_COLORED(loc, Color::LightGrey); - DOCTEST_PRINTF_COLORED(msg, - threw_as ? Color::BrightGreen : isWarn ? Color::Yellow : Color::Red); - DOCTEST_PRINTF_COLORED(info1, Color::Cyan); - DOCTEST_PRINTF_COLORED(info2, Color::None); - DOCTEST_PRINTF_COLORED(info3, Color::Cyan); - String context = logContext(); - DOCTEST_PRINTF_COLORED(context.c_str(), Color::None); - DOCTEST_PRINTF_COLORED("\n", Color::None); - - printToDebugConsole(String(loc) + msg + info1 + info2 + info3 + context.c_str() + "\n"); - } + void file_line_to_stream(const char* file, int line, const char* tail = "") { + s << Color::LightGrey << removePathFromFilename(file) + << (opt->gnu_file_line ? ":" : "(") + << (opt->no_line_numbers ? 0 : line) // 0 or the real num depending on the option + << (opt->gnu_file_line ? ":" : "):") << tail; + } - void logAssertNothrow(bool threw, const String& exception, const char* expr, - assertType::Enum assert_type, const char* file, int line) { - char loc[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - DOCTEST_SNPRINTF(loc, DOCTEST_COUNTOF(loc), "%s(%d)", fileForOutput(file), - lineForOutput(line)); - - char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), " %s!\n", - threw ? getFailString(assert_type) : "PASSED"); - - char info1[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - DOCTEST_SNPRINTF(info1, DOCTEST_COUNTOF(info1), " %s( %s )\n", - getAssertString(assert_type), expr); - - char info2[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - char info3[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - info2[0] = 0; - info3[0] = 0; - if(threw) { - DOCTEST_SNPRINTF(info2, DOCTEST_COUNTOF(info2), "threw exception:\n"); - DOCTEST_SNPRINTF(info3, DOCTEST_COUNTOF(info3), " %s\n", exception.c_str()); + const char* getSuccessOrFailString(bool success, assertType::Enum at, + const char* success_str) { + if(success) + return success_str; + return failureString(at); } - const bool isWarn = assert_type & assertType::is_warn; - DOCTEST_PRINTF_COLORED(loc, Color::LightGrey); - DOCTEST_PRINTF_COLORED(msg, - threw ? isWarn ? Color::Yellow : Color::Red : Color::BrightGreen); - DOCTEST_PRINTF_COLORED(info1, Color::Cyan); - DOCTEST_PRINTF_COLORED(info2, Color::None); - DOCTEST_PRINTF_COLORED(info3, Color::Cyan); - String context = logContext(); - DOCTEST_PRINTF_COLORED(context.c_str(), Color::None); - DOCTEST_PRINTF_COLORED("\n", Color::None); - - printToDebugConsole(String(loc) + msg + info1 + info2 + info3 + context.c_str() + "\n"); - } + Color::Enum getSuccessOrFailColor(bool success, assertType::Enum at) { + return success ? Color::BrightGreen : + (at & assertType::is_warn) ? Color::Yellow : Color::Red; + } - ResultBuilder::ResultBuilder(assertType::Enum assert_type, const char* file, int line, - const char* expr, const char* exception_type) - : m_assert_type(assert_type) - , m_file(file) - , m_line(line) - , m_expr(expr) - , m_exception_type(exception_type) - , m_threw(false) - , m_threw_as(false) - , m_failed(false) { -#ifdef _MSC_VER - if(m_expr[0] == ' ') // this happens when variadic macros are disabled under MSVC - ++m_expr; -#endif // _MSC_VER - } + void successOrFailColoredStringToStream(bool success, assertType::Enum at, + const char* success_str = "SUCCESS: ") { + s << getSuccessOrFailColor(success, at) + << getSuccessOrFailString(success, at, success_str); + } - ResultBuilder::~ResultBuilder() {} + void log_contexts() { + int num_contexts = get_num_active_contexts(); + if(num_contexts) { + auto contexts = get_active_contexts(); - void ResultBuilder::unexpectedExceptionOccurred() { - m_threw = true; + s << Color::None << " logged: "; + for(int i = 0; i < num_contexts; ++i) { + s << (i == 0 ? "" : " "); + contexts[i]->stringify(&s); + s << "\n"; + } + } - m_exception = translateActiveException(); - } + s << "\n"; + } - bool ResultBuilder::log() { - if((m_assert_type & assertType::is_warn) == 0) //!OCLINT bitwise operator in conditional - contextState->numAssertionsForCurrentTestcase++; + void logTestStart() { + if(hasLoggedCurrentTestStart) + return; - if(m_assert_type & assertType::is_throws) { //!OCLINT bitwise operator in conditional - m_failed = !m_threw; - } else if(m_assert_type & //!OCLINT bitwise operator in conditional - assertType::is_throws_as) { - m_failed = !m_threw_as; - } else if(m_assert_type & //!OCLINT bitwise operator in conditional - assertType::is_nothrow) { - m_failed = m_threw; - } else { - m_failed = m_result; + separator_to_stream(); + file_line_to_stream(tc->m_file, tc->m_line, "\n"); + if(tc->m_description) + s << Color::Yellow << "DESCRIPTION: " << Color::None << tc->m_description << "\n"; + if(tc->m_test_suite && tc->m_test_suite[0] != '\0') + s << Color::Yellow << "TEST SUITE: " << Color::None << tc->m_test_suite << "\n"; + if(strncmp(tc->m_name, " Scenario:", 11) != 0) + s << Color::None << "TEST CASE: "; + s << Color::None << tc->m_name << "\n"; + + for(auto& curr : subcasesStack) + if(curr.m_name[0] != '\0') + s << " " << curr.m_name << "\n"; + + s << "\n"; + + hasLoggedCurrentTestStart = true; + } + + // ========================================================================================= + // WHAT FOLLOWS ARE OVERRIDES OF THE VIRTUAL METHODS OF THE REPORTER INTERFACE + // ========================================================================================= + + void test_run_start(const ContextOptions& o) override { opt = &o; } + + void test_run_end(const TestRunStats& p) override { + separator_to_stream(); + + const bool anythingFailed = p.numTestCasesFailed > 0 || p.numAssertsFailed > 0; + s << Color::Cyan << "[doctest] " << Color::None << "test cases: " << std::setw(6) + << p.numTestCasesPassingFilters << " | " + << ((p.numTestCasesPassingFilters == 0 || anythingFailed) ? Color::None : + Color::Green) + << std::setw(6) << p.numTestCasesPassingFilters - p.numTestCasesFailed << " passed" + << Color::None << " | " << (p.numTestCasesFailed > 0 ? Color::Red : Color::None) + << std::setw(6) << p.numTestCasesFailed << " failed" << Color::None << " | "; + if(opt->no_skipped_summary == false) { + const int numSkipped = p.numTestCases - p.numTestCasesPassingFilters; + s << (numSkipped == 0 ? Color::None : Color::Yellow) << std::setw(6) << numSkipped + << " skipped" << Color::None; + } + s << "\n"; + s << Color::Cyan << "[doctest] " << Color::None << "assertions: " << std::setw(6) + << p.numAsserts << " | " + << ((p.numAsserts == 0 || anythingFailed) ? Color::None : Color::Green) + << std::setw(6) << (p.numAsserts - p.numAssertsFailed) << " passed" << Color::None + << " | " << (p.numAssertsFailed > 0 ? Color::Red : Color::None) << std::setw(6) + << p.numAssertsFailed << " failed" << Color::None << " |\n"; + s << Color::Cyan << "[doctest] " << Color::None + << "Status: " << (p.numTestCasesFailed > 0 ? Color::Red : Color::Green) + << ((p.numTestCasesFailed > 0) ? "FAILURE!\n" : "SUCCESS!\n") << Color::None; + } + + void test_case_start(const TestCaseData& in) override { + hasLoggedCurrentTestStart = false; + tc = ∈ + } + + void test_case_end(const CurrentTestCaseStats& st) override { + // log the preamble of the test case only if there is something + // else to print - something other than that an assert has failed + if(opt->duration || + (st.failure_flags && st.failure_flags != TestCaseFailureReason::AssertFailure)) + logTestStart(); + + // report test case exceptions and crashes + bool crashed = st.failure_flags & TestCaseFailureReason::Crash; + if(crashed || (st.failure_flags & TestCaseFailureReason::Exception)) { + file_line_to_stream(tc->m_file, tc->m_line, " "); + successOrFailColoredStringToStream(false, crashed ? assertType::is_require : + assertType::is_check); + s << Color::Red << (crashed ? "test case CRASHED: " : "test case THREW exception: ") + << Color::Cyan << st.error_string << "\n"; + + int num_stringified_contexts = get_num_stringified_contexts(); + if(num_stringified_contexts) { + auto stringified_contexts = get_stringified_contexts(); + s << Color::None << " logged: "; + for(int i = num_stringified_contexts - 1; i >= 0; --i) { + s << (i == num_stringified_contexts - 1 ? "" : " ") + << stringified_contexts[i] << "\n"; + } + } + s << "\n"; + } + + // means the test case will be re-entered because there are untraversed (but discovered) subcases + if(st.should_reenter) + return; + + if(opt->duration) + s << Color::None << std::setprecision(6) << std::fixed << st.seconds_so_far + << " s: " << tc->m_name << "\n"; + + if(st.failure_flags & TestCaseFailureReason::Timeout) + s << Color::Red << "Test case exceeded time limit of " << std::setprecision(6) + << std::fixed << tc->m_timeout << "!\n"; + + if(st.failure_flags & TestCaseFailureReason::ShouldHaveFailedButDidnt) { + s << Color::Red << "Should have failed but didn't! Marking it as failed!\n"; + } else if(st.failure_flags & TestCaseFailureReason::ShouldHaveFailedAndDid) { + s << Color::Yellow << "Failed as expected so marking it as not failed\n"; + } else if(st.failure_flags & TestCaseFailureReason::CouldHaveFailedAndDid) { + s << Color::Yellow << "Allowed to fail so marking it as not failed\n"; + } else if(st.failure_flags & TestCaseFailureReason::DidntFailExactlyNumTimes) { + s << Color::Red << "Didn't fail exactly " << tc->m_expected_failures + << " times so marking it as failed!\n"; + } else if(st.failure_flags & TestCaseFailureReason::FailedExactlyNumTimes) { + s << Color::Yellow << "Failed exactly " << tc->m_expected_failures + << " times as expected so marking it as not failed!\n"; + } + if(st.failure_flags & TestCaseFailureReason::TooManyFailedAsserts) { + s << Color::Red << "Aborting - too many failed asserts!\n"; + } + s << Color::None; } - if(m_failed || contextState->success) { - DOCTEST_LOG_START(); - - if(m_assert_type & assertType::is_throws) { //!OCLINT bitwise operator in conditional - logAssertThrows(m_threw, m_expr, m_assert_type, m_file, m_line); - } else if(m_assert_type & //!OCLINT bitwise operator in conditional - assertType::is_throws_as) { - logAssertThrowsAs(m_threw, m_threw_as, m_exception_type, m_exception, m_expr, - m_assert_type, m_file, m_line); - } else if(m_assert_type & //!OCLINT bitwise operator in conditional - assertType::is_nothrow) { - logAssertNothrow(m_threw, m_exception, m_expr, m_assert_type, m_file, m_line); + void subcase_start(const SubcaseSignature& subc) override { + subcasesStack.push_back(subc); + hasLoggedCurrentTestStart = false; + } + + void subcase_end(const SubcaseSignature& /*subc*/) override { + subcasesStack.pop_back(); + hasLoggedCurrentTestStart = false; + } + + void log_assert(const AssertData& rb) override { + if(!rb.m_failed && !opt->success) + return; + + std::lock_guard lock(g_mutex); + + logTestStart(); + + file_line_to_stream(rb.m_file, rb.m_line, " "); + successOrFailColoredStringToStream(!rb.m_failed, rb.m_at); + if((rb.m_at & assertType::is_throws_as) == 0) //!OCLINT bitwise operator in conditional + s << Color::Cyan << assertString(rb.m_at) << "( " << rb.m_expr << " ) " + << Color::None; + + if(rb.m_at & assertType::is_throws) { //!OCLINT bitwise operator in conditional + s << (rb.m_threw ? "threw as expected!" : "did NOT throw at all!") << "\n"; + } else if(rb.m_at & + assertType::is_throws_as) { //!OCLINT bitwise operator in conditional + s << Color::Cyan << assertString(rb.m_at) << "( " << rb.m_expr << ", " + << rb.m_exception_type << " ) " << Color::None + << (rb.m_threw ? (rb.m_threw_as ? "threw as expected!" : + "threw a DIFFERENT exception: ") : + "did NOT throw at all!") + << Color::Cyan << rb.m_exception << "\n"; + } else if(rb.m_at & assertType::is_nothrow) { //!OCLINT bitwise operator in conditional + s << (rb.m_threw ? "THREW exception: " : "didn't throw!") << Color::Cyan + << rb.m_exception << "\n"; } else { - logAssert(m_result.m_passed, m_result.m_decomposition.c_str(), m_threw, m_exception, - m_expr, m_assert_type, m_file, m_line); + s << (rb.m_threw ? "THREW exception: " : + (!rb.m_failed ? "is correct!\n" : "is NOT correct!\n")); + if(rb.m_threw) + s << rb.m_exception << "\n"; + else + s << " values: " << assertString(rb.m_at) << "( " << rb.m_decomp << " )\n"; } + + log_contexts(); } - if(m_failed) - addFailedAssert(m_assert_type); + void log_message(const MessageData& mb) override { + std::lock_guard lock(g_mutex); - return m_failed && isDebuggerActive() && !contextState->no_breaks; // break into debugger - } + logTestStart(); - void ResultBuilder::react() const { - if(m_failed && checkIfShouldThrow(m_assert_type)) - throwException(); - } + file_line_to_stream(mb.m_file, mb.m_line, " "); + s << getSuccessOrFailColor(false, mb.m_severity) + << getSuccessOrFailString(mb.m_severity & assertType::is_warn, mb.m_severity, + "MESSAGE: "); + s << Color::None << mb.m_string << "\n"; + log_contexts(); + } - MessageBuilder::MessageBuilder(const char* file, int line, assertType::Enum severity) - : m_stream(createStream()) - , m_file(file) - , m_line(line) - , m_severity(severity) {} + void test_case_skipped(const TestCaseData&) override {} + }; - bool MessageBuilder::log() { - DOCTEST_LOG_START(); + // extension of the console reporter - with a bunch of helpers for the stdout stream redirection + struct ConsoleReporterWithHelpers : public ConsoleReporter + { + ConsoleReporterWithHelpers(std::ostream& in) + : ConsoleReporter(in) {} - const bool isWarn = m_severity & assertType::is_warn; + void printVersion() { + if(getContextOptions()->no_version == false) + s << Color::Cyan << "[doctest] " << Color::None << "doctest version is \"" + << DOCTEST_VERSION_STR << "\"\n"; + } - // warn is just a message in this context so we dont treat it as an assert - if(!isWarn) { - contextState->numAssertionsForCurrentTestcase++; - addFailedAssert(m_severity); + void printIntro() { + printVersion(); + s << Color::Cyan << "[doctest] " << Color::None << "run with \"--help\" for options\n"; } - char loc[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - DOCTEST_SNPRINTF(loc, DOCTEST_COUNTOF(loc), "%s(%d)", fileForOutput(m_file), - lineForOutput(m_line)); - char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), " %s!\n", - isWarn ? "MESSAGE" : getFailString(m_severity)); - - DOCTEST_PRINTF_COLORED(loc, Color::LightGrey); - DOCTEST_PRINTF_COLORED(msg, isWarn ? Color::Yellow : Color::Red); - - String info = getStreamResult(m_stream); - if(info.size()) { - DOCTEST_PRINTF_COLORED(" ", Color::None); - DOCTEST_PRINTF_COLORED(info.c_str(), Color::None); - DOCTEST_PRINTF_COLORED("\n", Color::None); + void printHelp() { + printVersion(); + // clang-format off + s << Color::Cyan << "[doctest]\n" << Color::None; + s << Color::Cyan << "[doctest] " << Color::None; + s << "boolean values: \"1/on/yes/true\" or \"0/off/no/false\"\n"; + s << Color::Cyan << "[doctest] " << Color::None; + s << "filter values: \"str1,str2,str3\" (comma separated strings)\n"; + s << Color::Cyan << "[doctest]\n" << Color::None; + s << Color::Cyan << "[doctest] " << Color::None; + s << "filters use wildcards for matching strings\n"; + s << Color::Cyan << "[doctest] " << Color::None; + s << "something passes a filter if any of the strings in a filter matches\n"; + s << Color::Cyan << "[doctest]\n" << Color::None; + s << Color::Cyan << "[doctest] " << Color::None; + s << "ALL FLAGS, OPTIONS AND FILTERS ALSO AVAILABLE WITH A \"dt-\" PREFIX!!!\n"; + s << Color::Cyan << "[doctest]\n" << Color::None; + s << Color::Cyan << "[doctest] " << Color::None; + s << "Query flags - the program quits after them. Available:\n\n"; + s << " -?, --help, -h prints this message\n"; + s << " -v, --version prints the version\n"; + s << " -c, --count prints the number of matching tests\n"; + s << " -ltc, --list-test-cases lists all matching tests by name\n"; + s << " -lts, --list-test-suites lists all matching test suites\n"; + s << " -lr, --list-reporters lists all registered reporters\n\n"; + // ================================================================================== << 79 + s << Color::Cyan << "[doctest] " << Color::None; + s << "The available / options/filters are:\n\n"; + s << " -tc, --test-case= filters tests by their name\n"; + s << " -tce, --test-case-exclude= filters OUT tests by their name\n"; + s << " -sf, --source-file= filters tests by their file\n"; + s << " -sfe, --source-file-exclude= filters OUT tests by their file\n"; + s << " -ts, --test-suite= filters tests by their test suite\n"; + s << " -tse, --test-suite-exclude= filters OUT tests by their test suite\n"; + s << " -sc, --subcase= filters subcases by their name\n"; + s << " -sce, --subcase-exclude= filters OUT subcases by their name\n"; + s << " -r, --reporters= reporters to use (console is default)\n"; + s << " -ob, --order-by= how the tests should be ordered\n"; + s << " - by [file/suite/name/rand]\n"; + s << " -rs, --rand-seed= seed for random ordering\n"; + s << " -f, --first= the first test passing the filters to\n"; + s << " execute - for range-based execution\n"; + s << " -l, --last= the last test passing the filters to\n"; + s << " execute - for range-based execution\n"; + s << " -aa, --abort-after= stop after failed assertions\n"; + s << " -scfl,--subcase-filter-levels= apply filters for the first levels\n"; + s << Color::Cyan << "\n[doctest] " << Color::None; + s << "Bool options - can be used like flags and true is assumed. Available:\n\n"; + s << " -s, --success= include successful assertions in output\n"; + s << " -cs, --case-sensitive= filters being treated as case sensitive\n"; + s << " -e, --exit= exits after the tests finish\n"; + s << " -d, --duration= prints the time duration of each test\n"; + s << " -nt, --no-throw= skips exceptions-related assert checks\n"; + s << " -ne, --no-exitcode= returns (or exits) always with success\n"; + s << " -nr, --no-run= skips all runtime doctest operations\n"; + s << " -nv, --no-version= omit the framework version in the output\n"; + s << " -nc, --no-colors= disables colors in output\n"; + s << " -fc, --force-colors= use colors even when not in a tty\n"; + s << " -nb, --no-breaks= disables breakpoints in debuggers\n"; + s << " -ns, --no-skip= don't skip test cases marked as skip\n"; + s << " -gfl, --gnu-file-line= :n: vs (n): for line numbers in output\n"; + s << " -npf, --no-path-filenames= only filenames and no paths in output\n"; + s << " -nln, --no-line-numbers= 0 instead of real line numbers in output\n"; + // ================================================================================== << 79 + // clang-format on + + s << Color::Cyan << "\n[doctest] " << Color::None; + s << "for more information visit the project documentation\n\n"; } - String context = logContext(); - DOCTEST_PRINTF_COLORED(context.c_str(), Color::None); - DOCTEST_PRINTF_COLORED("\n", Color::None); - printToDebugConsole(String(loc) + msg + " " + info.c_str() + "\n" + context.c_str() + - "\n"); + void printRegisteredReporters() { + printVersion(); + s << Color::Cyan << "[doctest] " << Color::None << "listing all registered reporters\n"; + for(auto& curr : getReporters()) + s << "priority: " << std::setw(5) << curr.first.first + << " name: " << curr.first.second << "\n"; + } - return isDebuggerActive() && !contextState->no_breaks && !isWarn; // break into debugger - } + void output_query_results() { + separator_to_stream(); + if(getContextOptions()->count || getContextOptions()->list_test_cases) { + s << Color::Cyan << "[doctest] " << Color::None + << "unskipped test cases passing the current filters: " + << g_cs->numTestCasesPassingFilters << "\n"; + } else if(getContextOptions()->list_test_suites) { + s << Color::Cyan << "[doctest] " << Color::None + << "unskipped test cases passing the current filters: " + << g_cs->numTestCasesPassingFilters << "\n"; + s << Color::Cyan << "[doctest] " << Color::None + << "test suites with unskipped test cases passing the current filters: " + << g_cs->numTestSuitesPassingFilters << "\n"; + } + } - void MessageBuilder::react() { - if(m_severity & assertType::is_require) //!OCLINT bitwise operator in conditional - throwException(); + void output_query_preamble_test_cases() { + s << Color::Cyan << "[doctest] " << Color::None << "listing all test case names\n"; + separator_to_stream(); + } + + void output_query_preamble_test_suites() { + s << Color::Cyan << "[doctest] " << Color::None << "listing all test suites\n"; + separator_to_stream(); + } + + void output_c_string_with_newline(const char* str) { s << Color::None << str << "\n"; } + }; + +#ifdef DOCTEST_PLATFORM_WINDOWS + struct DebugOutputWindowReporter : public ConsoleReporter + { + thread_local static std::ostringstream oss; + + DebugOutputWindowReporter() + : ConsoleReporter(oss) {} + +#define DOCTEST_DEBUG_OUTPUT_WINDOW_REPORTER_OVERRIDE(func, type) \ + void func(type in) override { \ + if(isDebuggerActive()) { \ + bool with_col = g_no_colors; \ + g_no_colors = false; \ + ConsoleReporter::func(in); \ + DOCTEST_OUTPUT_DEBUG_STRING(oss.str().c_str()); \ + oss.str(""); \ + g_no_colors = with_col; \ + } \ } - MessageBuilder::~MessageBuilder() { freeStream(m_stream); } + DOCTEST_DEBUG_OUTPUT_WINDOW_REPORTER_OVERRIDE(test_run_start, const ContextOptions&) + DOCTEST_DEBUG_OUTPUT_WINDOW_REPORTER_OVERRIDE(test_run_end, const TestRunStats&) + DOCTEST_DEBUG_OUTPUT_WINDOW_REPORTER_OVERRIDE(test_case_start, const TestCaseData&) + DOCTEST_DEBUG_OUTPUT_WINDOW_REPORTER_OVERRIDE(test_case_end, const CurrentTestCaseStats&) + DOCTEST_DEBUG_OUTPUT_WINDOW_REPORTER_OVERRIDE(subcase_start, const SubcaseSignature&) + DOCTEST_DEBUG_OUTPUT_WINDOW_REPORTER_OVERRIDE(subcase_end, const SubcaseSignature&) + DOCTEST_DEBUG_OUTPUT_WINDOW_REPORTER_OVERRIDE(log_assert, const AssertData&) + DOCTEST_DEBUG_OUTPUT_WINDOW_REPORTER_OVERRIDE(log_message, const MessageData&) + DOCTEST_DEBUG_OUTPUT_WINDOW_REPORTER_OVERRIDE(test_case_skipped, const TestCaseData&) + }; + + thread_local std::ostringstream DebugOutputWindowReporter::oss; + + DebugOutputWindowReporter g_debug_output_rep; +#endif // DOCTEST_PLATFORM_WINDOWS // the implementation of parseFlag() bool parseFlagImpl(int argc, const char* const* argv, const char* pattern) { for(int i = argc - 1; i >= 0; --i) { - const char* temp = std::strstr(argv[i], pattern); - if(temp && my_strlen(temp) == my_strlen(pattern)) { + auto temp = std::strstr(argv[i], pattern); + if(temp && strlen(temp) == strlen(pattern)) { // eliminate strings in which the chars before the option are not '-' bool noBadCharsFound = true; //!OCLINT prefer early exits and continue while(temp != argv[i]) { @@ -4953,22 +4649,20 @@ namespace detail // locates a flag on the command line bool parseFlag(int argc, const char* const* argv, const char* pattern) { #ifndef DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS - if(!parseFlagImpl(argc, argv, pattern)) - return parseFlagImpl(argc, argv, pattern + 3); // 3 for "dt-" - return true; -#else // DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS - return parseFlagImpl(argc, argv, pattern); + if(parseFlagImpl(argc, argv, pattern + 3)) // 3 to skip "dt-" + return true; #endif // DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS + return parseFlagImpl(argc, argv, pattern); } // the implementation of parseOption() bool parseOptionImpl(int argc, const char* const* argv, const char* pattern, String& res) { for(int i = argc - 1; i >= 0; --i) { - const char* temp = std::strstr(argv[i], pattern); + auto temp = std::strstr(argv[i], pattern); if(temp) { //!OCLINT prefer early exits and continue // eliminate matches in which the chars before the option are not '-' - bool noBadCharsFound = true; - const char* curr = argv[i]; + bool noBadCharsFound = true; + auto curr = argv[i]; while(curr != temp) { if(*curr++ != '-') { noBadCharsFound = false; @@ -4976,8 +4670,8 @@ namespace detail } } if(noBadCharsFound && argv[i][0] == '-') { - temp += my_strlen(pattern); - const unsigned len = my_strlen(temp); + temp += strlen(pattern); + const unsigned len = strlen(temp); if(len) { res = temp; return true; @@ -4993,12 +4687,10 @@ namespace detail const String& defaultVal = String()) { res = defaultVal; #ifndef DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS - if(!parseOptionImpl(argc, argv, pattern, res)) - return parseOptionImpl(argc, argv, pattern + 3, res); // 3 for "dt-" - return true; -#else // DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS - return parseOptionImpl(argc, argv, pattern, res); + if(parseOptionImpl(argc, argv, pattern + 3, res)) // 3 to skip "dt-" + return true; #endif // DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS + return parseOptionImpl(argc, argv, pattern, res); } // parses a comma separated list of words after a pattern in one of the arguments in argv @@ -5008,14 +4700,16 @@ namespace detail if(parseOption(argc, argv, pattern, filtersString)) { // tokenize with "," as a separator // cppcheck-suppress strtokCalled - char* pch = std::strtok(filtersString.c_str(), ","); // modifies the string - while(pch != 0) { - if(my_strlen(pch)) + DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations") + auto pch = std::strtok(filtersString.c_str(), ","); // modifies the string + while(pch != nullptr) { + if(strlen(pch)) res.push_back(pch); // uses the strtok() internal state to go to the next token // cppcheck-suppress strtokCalled - pch = std::strtok(0, ","); + pch = std::strtok(nullptr, ","); } + DOCTEST_CLANG_SUPPRESS_WARNING_POP return true; } return false; @@ -5052,6 +4746,7 @@ namespace detail } } else { // integer + // TODO: change this to use std::stoi or something else! currently it uses undefined behavior - assumes '0' on unsuccessful parse... int theInt = std::atoi(parsedValue.c_str()); // NOLINT if(theInt != 0) { res = theInt; //!OCLINT parameter reassignment @@ -5060,165 +4755,18 @@ namespace detail } return false; } - - void printVersion() { - if(contextState->no_version == false) { - DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan); - std::printf("doctest version is \"%s\"\n", DOCTEST_VERSION_STR); - } - } - - void printHelp() { - printVersion(); - // clang-format off - DOCTEST_PRINTF_COLORED("[doctest]\n", Color::Cyan); - DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan); - std::printf("boolean values: \"1/on/yes/true\" or \"0/off/no/false\"\n"); - DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan); - std::printf("filter values: \"str1,str2,str3\" (comma separated strings)\n"); - DOCTEST_PRINTF_COLORED("[doctest]\n", Color::Cyan); - DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan); - std::printf("filters use wildcards for matching strings\n"); - DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan); - std::printf("something passes a filter if any of the strings in a filter matches\n"); - DOCTEST_PRINTF_COLORED("[doctest]\n", Color::Cyan); - DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan); - std::printf("ALL FLAGS, OPTIONS AND FILTERS ALSO AVAILABLE WITH A \"dt-\" PREFIX!!!\n"); - DOCTEST_PRINTF_COLORED("[doctest]\n", Color::Cyan); - DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan); - std::printf("Query flags - the program quits after them. Available:\n\n"); - std::printf(" -?, --help, -h prints this message\n"); - std::printf(" -v, --version prints the version\n"); - std::printf(" -c, --count prints the number of matching tests\n"); - std::printf(" -ltc, --list-test-cases lists all matching tests by name\n"); - std::printf(" -lts, --list-test-suites lists all matching test suites\n\n"); - // ========================================================================================= << 79 - DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan); - std::printf("The available / options/filters are:\n\n"); - std::printf(" -tc, --test-case= filters tests by their name\n"); - std::printf(" -tce, --test-case-exclude= filters OUT tests by their name\n"); - std::printf(" -sf, --source-file= filters tests by their file\n"); - std::printf(" -sfe, --source-file-exclude= filters OUT tests by their file\n"); - std::printf(" -ts, --test-suite= filters tests by their test suite\n"); - std::printf(" -tse, --test-suite-exclude= filters OUT tests by their test suite\n"); - std::printf(" -sc, --subcase= filters subcases by their name\n"); - std::printf(" -sce, --subcase-exclude= filters OUT subcases by their name\n"); - std::printf(" -ob, --order-by= how the tests should be ordered\n"); - std::printf(" - by [file/suite/name/rand]\n"); - std::printf(" -rs, --rand-seed= seed for random ordering\n"); - std::printf(" -f, --first= the first test passing the filters to\n"); - std::printf(" execute - for range-based execution\n"); - std::printf(" -l, --last= the last test passing the filters to\n"); - std::printf(" execute - for range-based execution\n"); - std::printf(" -aa, --abort-after= stop after failed assertions\n"); - std::printf(" -scfl,--subcase-filter-levels= apply filters for the first levels\n"); - DOCTEST_PRINTF_COLORED("\n[doctest] ", Color::Cyan); - std::printf("Bool options - can be used like flags and true is assumed. Available:\n\n"); - std::printf(" -s, --success= include successful assertions in output\n"); - std::printf(" -cs, --case-sensitive= filters being treated as case sensitive\n"); - std::printf(" -e, --exit= exits after the tests finish\n"); - std::printf(" -d, --duration= prints the time duration of each test\n"); - std::printf(" -nt, --no-throw= skips exceptions-related assert checks\n"); - std::printf(" -ne, --no-exitcode= returns (or exits) always with success\n"); - std::printf(" -nr, --no-run= skips all runtime doctest operations\n"); - std::printf(" -nv, --no-version= omit the framework version in the output\n"); - std::printf(" -nc, --no-colors= disables colors in output\n"); - std::printf(" -fc, --force-colors= use colors even when not in a tty\n"); - std::printf(" -nb, --no-breaks= disables breakpoints in debuggers\n"); - std::printf(" -ns, --no-skip= don't skip test cases marked as skip\n"); - std::printf(" -npf, --no-path-filenames= only filenames and no paths in output\n"); - std::printf(" -nln, --no-line-numbers= 0 instead of real line numbers in output\n"); - // ========================================================================================= << 79 - // clang-format on - - DOCTEST_PRINTF_COLORED("\n[doctest] ", Color::Cyan); - std::printf("for more information visit the project documentation\n\n"); - } - - void printSummary() { - const ContextState* p = contextState; - - DOCTEST_PRINTF_COLORED(getSeparator(), Color::Yellow); - if(p->count || p->list_test_cases) { - DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan); - std::printf("unskipped test cases passing the current filters: %u\n", - p->numTestsPassingFilters); - } else if(p->list_test_suites) { - DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan); - std::printf("unskipped test cases passing the current filters: %u\n", - p->numTestsPassingFilters); - DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan); - std::printf("test suites with unskipped test cases passing the current filters: %u\n", - p->numTestSuitesPassingFilters); - } else { - const bool anythingFailed = p->numFailed > 0 || p->numFailedAssertions > 0; - - char buff[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - - DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan); - - DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "test cases: %6u", - p->numTestsPassingFilters); - DOCTEST_PRINTF_COLORED(buff, Color::None); - DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), " | "); - DOCTEST_PRINTF_COLORED(buff, Color::None); - DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "%6d passed", - p->numTestsPassingFilters - p->numFailed); - DOCTEST_PRINTF_COLORED(buff, (p->numTestsPassingFilters == 0 || anythingFailed) ? - Color::None : - Color::Green); - DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), " | "); - DOCTEST_PRINTF_COLORED(buff, Color::None); - DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "%6u failed", p->numFailed); - DOCTEST_PRINTF_COLORED(buff, p->numFailed > 0 ? Color::Red : Color::None); - - DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), " | "); - DOCTEST_PRINTF_COLORED(buff, Color::None); - if(p->no_skipped_summary == false) { - const int numSkipped = static_cast(getRegisteredTests().size()) - - p->numTestsPassingFilters; - DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "%6d skipped", numSkipped); - DOCTEST_PRINTF_COLORED(buff, numSkipped == 0 ? Color::None : Color::Yellow); - } - DOCTEST_PRINTF_COLORED("\n", Color::None); - - DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan); - - DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "assertions: %6d", p->numAssertions); - DOCTEST_PRINTF_COLORED(buff, Color::None); - DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), " | "); - DOCTEST_PRINTF_COLORED(buff, Color::None); - DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "%6d passed", - p->numAssertions - p->numFailedAssertions); - DOCTEST_PRINTF_COLORED(buff, (p->numAssertions == 0 || anythingFailed) ? Color::None : - Color::Green); - DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), " | "); - DOCTEST_PRINTF_COLORED(buff, Color::None); - DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "%6d failed", p->numFailedAssertions); - DOCTEST_PRINTF_COLORED(buff, p->numFailedAssertions > 0 ? Color::Red : Color::None); - - DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), " |\n"); - DOCTEST_PRINTF_COLORED(buff, Color::None); - - DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan); - DOCTEST_PRINTF_COLORED("Status: ", Color::None); - const char* result = (p->numFailed > 0) ? "FAILURE!\n" : "SUCCESS!\n"; - DOCTEST_PRINTF_COLORED(result, p->numFailed > 0 ? Color::Red : Color::Green); - } - - // remove any coloring - DOCTEST_PRINTF_COLORED("", Color::None); - } -} // namespace detail - -bool isRunningInTest() { return detail::contextState != 0; } +} // namespace Context::Context(int argc, const char* const* argv) : p(new detail::ContextState) { parseArgs(argc, argv, true); } -Context::~Context() { delete p; } +Context::~Context() { + if(g_cs == p) + g_cs = nullptr; + delete p; +} void Context::applyCommandLine(int argc, const char* const* argv) { parseArgs(argc, argv); } @@ -5243,70 +4791,69 @@ void Context::parseArgs(int argc, const char* const* argv, bool withDefaults) { parseCommaSepArgs(argc, argv, "dt-sc=", p->filters[6]); parseCommaSepArgs(argc, argv, "dt-subcase-exclude=", p->filters[7]); parseCommaSepArgs(argc, argv, "dt-sce=", p->filters[7]); + parseCommaSepArgs(argc, argv, "dt-reporters=", p->filters[8]); + parseCommaSepArgs(argc, argv, "dt-r=", p->filters[8]); // clang-format on int intRes = 0; String strRes; #define DOCTEST_PARSE_AS_BOOL_OR_FLAG(name, sname, var, default) \ - if(parseIntOption(argc, argv, DOCTEST_STR_CONCAT_TOSTR(name, =), option_bool, intRes) || \ - parseIntOption(argc, argv, DOCTEST_STR_CONCAT_TOSTR(sname, =), option_bool, intRes)) \ + if(parseIntOption(argc, argv, name "=", option_bool, intRes) || \ + parseIntOption(argc, argv, sname "=", option_bool, intRes)) \ p->var = !!intRes; \ - else if(parseFlag(argc, argv, #name) || parseFlag(argc, argv, #sname)) \ + else if(parseFlag(argc, argv, name) || parseFlag(argc, argv, sname)) \ p->var = true; \ else if(withDefaults) \ p->var = default #define DOCTEST_PARSE_INT_OPTION(name, sname, var, default) \ - if(parseIntOption(argc, argv, DOCTEST_STR_CONCAT_TOSTR(name, =), option_int, intRes) || \ - parseIntOption(argc, argv, DOCTEST_STR_CONCAT_TOSTR(sname, =), option_int, intRes)) \ + if(parseIntOption(argc, argv, name "=", option_int, intRes) || \ + parseIntOption(argc, argv, sname "=", option_int, intRes)) \ p->var = intRes; \ else if(withDefaults) \ p->var = default #define DOCTEST_PARSE_STR_OPTION(name, sname, var, default) \ - if(parseOption(argc, argv, DOCTEST_STR_CONCAT_TOSTR(name, =), strRes, default) || \ - parseOption(argc, argv, DOCTEST_STR_CONCAT_TOSTR(sname, =), strRes, default) || \ - withDefaults) \ + if(parseOption(argc, argv, name "=", strRes, default) || \ + parseOption(argc, argv, sname "=", strRes, default) || withDefaults) \ p->var = strRes // clang-format off - DOCTEST_PARSE_STR_OPTION(dt-order-by, dt-ob, order_by, "file"); - DOCTEST_PARSE_INT_OPTION(dt-rand-seed, dt-rs, rand_seed, 0); - - DOCTEST_PARSE_INT_OPTION(dt-first, dt-f, first, 1); - DOCTEST_PARSE_INT_OPTION(dt-last, dt-l, last, 0); - - DOCTEST_PARSE_INT_OPTION(dt-abort-after, dt-aa, abort_after, 0); - DOCTEST_PARSE_INT_OPTION(dt-subcase-filter-levels, dt-scfl, subcase_filter_levels, 2000000000); - - DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-success, dt-s, success, false); - DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-case-sensitive, dt-cs, case_sensitive, false); - DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-exit, dt-e, exit, false); - DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-duration, dt-d, duration, false); - DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-throw, dt-nt, no_throw, false); - DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-exitcode, dt-ne, no_exitcode, false); - DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-run, dt-nr, no_run, false); - DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-version, dt-nv, no_version, false); - DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-colors, dt-nc, no_colors, false); - DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-force-colors, dt-fc, force_colors, false); - DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-breaks, dt-nb, no_breaks, false); - DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-skip, dt-ns, no_skip, false); - DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-path-filenames, dt-npf, no_path_in_filenames, false); - DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-line-numbers, dt-nln, no_line_numbers, false); - DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-skipped-summary, dt-nss, no_skipped_summary, false); + DOCTEST_PARSE_STR_OPTION("dt-order-by", "dt-ob", order_by, "file"); + DOCTEST_PARSE_INT_OPTION("dt-rand-seed", "dt-rs", rand_seed, 0); + + DOCTEST_PARSE_INT_OPTION("dt-first", "dt-f", first, 0); + DOCTEST_PARSE_INT_OPTION("dt-last", "dt-l", last, UINT_MAX); + + DOCTEST_PARSE_INT_OPTION("dt-abort-after", "dt-aa", abort_after, 0); + DOCTEST_PARSE_INT_OPTION("dt-subcase-filter-levels", "dt-scfl", subcase_filter_levels, 2000000000); + + DOCTEST_PARSE_AS_BOOL_OR_FLAG("dt-success", "dt-s", success, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("dt-case-sensitive", "dt-cs", case_sensitive, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("dt-exit", "dt-e", exit, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("dt-duration", "dt-d", duration, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("dt-no-throw", "dt-nt", no_throw, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("dt-no-exitcode", "dt-ne", no_exitcode, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("dt-no-run", "dt-nr", no_run, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("dt-no-version", "dt-nv", no_version, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("dt-no-colors", "dt-nc", no_colors, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("dt-force-colors", "dt-fc", force_colors, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("dt-no-breaks", "dt-nb", no_breaks, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("dt-no-skip", "dt-ns", no_skip, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("dt-gnu-file-line", "dt-gfl", gnu_file_line, !bool(DOCTEST_MSVC)); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("dt-no-path-filenames", "dt-npf", no_path_in_filenames, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("dt-no-line-numbers", "dt-nln", no_line_numbers, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("dt-no-skipped-summary", "dt-nss", no_skipped_summary, false); // clang-format on -#undef DOCTEST_PARSE_STR_OPTION -#undef DOCTEST_PARSE_INT_OPTION -#undef DOCTEST_PARSE_AS_BOOL_OR_FLAG - if(withDefaults) { p->help = false; p->version = false; p->count = false; p->list_test_cases = false; p->list_test_suites = false; + p->list_reporters = false; } if(parseFlag(argc, argv, "dt-help") || parseFlag(argc, argv, "dt-h") || parseFlag(argc, argv, "dt-?")) { @@ -5329,6 +4876,10 @@ void Context::parseArgs(int argc, const char* const* argv, bool withDefaults) { p->list_test_suites = true; p->exit = true; } + if(parseFlag(argc, argv, "dt-list-reporters") || parseFlag(argc, argv, "dt-lr")) { + p->list_reporters = true; + p->exit = true; + } } // allows the user to add procedurally to the filters from the command line @@ -5336,8 +4887,8 @@ void Context::addFilter(const char* filter, const char* value) { setOption(filte // allows the user to clear all filters from the command line void Context::clearFilters() { - for(unsigned i = 0; i < p->filters.size(); ++i) - p->filters[i].clear(); + for(auto& curr : p->filters) + curr.clear(); } // allows the user to override procedurally the int/bool options from the command line @@ -5347,47 +4898,69 @@ void Context::setOption(const char* option, int value) { // allows the user to override procedurally the string options from the command line void Context::setOption(const char* option, const char* value) { - String argv = String("-") + option + "=" + value; - const char* lvalue = argv.c_str(); + auto argv = String("-") + option + "=" + value; + auto lvalue = argv.c_str(); parseArgs(1, &lvalue); } // users should query this in their main() and exit the program if true bool Context::shouldExit() { return p->exit; } +void Context::setAsDefaultForAssertsOutOfTestCases() { g_cs = p; } + +void Context::setAssertHandler(detail::assert_handler ah) { p->ah = ah; } + // the main function that does all the filtering and test running int Context::run() { using namespace detail; - Color::init(); - - contextState = p; + auto old_cs = g_cs; + g_cs = p; + is_running_in_test = true; + g_no_colors = p->no_colors; p->resetRunData(); + ConsoleReporterWithHelpers g_con_rep(std::cout); + registerReporter("console", 0, g_con_rep); + + // setup default reporter if none is given through the command line + p->reporters_currently_used.clear(); + if(p->filters[8].empty()) + p->reporters_currently_used.push_back(getReporters()[reporterMap::key_type(0, "console")]); + + // check to see if any of the registered reporters has been selected + for(auto& curr : getReporters()) { + if(matchesAny(curr.first.second.c_str(), p->filters[8], false, p->case_sensitive)) + p->reporters_currently_used.push_back(curr.second); + } + + // always use the debug output window reporter +#ifdef DOCTEST_PLATFORM_WINDOWS + if(isDebuggerActive()) + p->reporters_currently_used.push_back(&g_debug_output_rep); +#endif // DOCTEST_PLATFORM_WINDOWS + // handle version, help and no_run - if(p->no_run || p->version || p->help) { + if(p->no_run || p->version || p->help || p->list_reporters) { if(p->version) - printVersion(); + g_con_rep.printVersion(); if(p->help) - printHelp(); + g_con_rep.printHelp(); + if(p->list_reporters) + g_con_rep.printRegisteredReporters(); - contextState = 0; + g_cs = old_cs; + is_running_in_test = false; return EXIT_SUCCESS; } - printVersion(); - DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan); - std::printf("run with \"--help\" for options\n"); - - unsigned i = 0; // counter used for loops - here for VC6 - - std::set& registeredTests = getRegisteredTests(); + g_con_rep.printIntro(); std::vector testArray; - for(std::set::iterator it = registeredTests.begin(); it != registeredTests.end(); - ++it) - testArray.push_back(&(*it)); + for(auto& curr : getRegisteredTests()) + testArray.push_back(&curr); + p->numTestCases = testArray.size(); // sort the collected records if(!testArray.empty()) { @@ -5401,11 +4974,11 @@ int Context::run() { std::srand(p->rand_seed); // random_shuffle implementation - const TestCase** first = &testArray[0]; - for(i = testArray.size() - 1; i > 0; --i) { + const auto first = &testArray[0]; + for(size_t i = testArray.size() - 1; i > 0; --i) { int idxToSwap = std::rand() % (i + 1); // NOLINT - const TestCase* temp = first[i]; + const auto temp = first[i]; first[i] = first[idxToSwap]; first[idxToSwap] = temp; @@ -5413,40 +4986,52 @@ int Context::run() { } } - if(p->list_test_cases) { - DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan); - std::printf("listing all test case names\n"); - DOCTEST_PRINTF_COLORED(getSeparator(), Color::Yellow); - } + if(p->list_test_cases) + g_con_rep.output_query_preamble_test_cases(); - std::set testSuitesPassingFilters; - if(p->list_test_suites) { - DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan); - std::printf("listing all test suites\n"); - DOCTEST_PRINTF_COLORED(getSeparator(), Color::Yellow); - } + std::set testSuitesPassingFilt; + if(p->list_test_suites) + g_con_rep.output_query_preamble_test_suites(); + + bool query_mode = p->count || p->list_test_cases || p->list_test_suites; + + if(!query_mode) + DOCTEST_ITERATE_THROUGH_REPORTERS(test_run_start, *g_cs); // invoke the registered functions if they match the filter criteria (or just count them) - for(i = 0; i < testArray.size(); i++) { - const TestCase& data = *testArray[i]; + for(auto& curr : testArray) { + const auto tc = *curr; + + bool skip_me = false; + if(tc.m_skip && !p->no_skip) + skip_me = true; + + if(!matchesAny(tc.m_file, p->filters[0], true, p->case_sensitive)) + skip_me = true; + if(matchesAny(tc.m_file, p->filters[1], false, p->case_sensitive)) + skip_me = true; + if(!matchesAny(tc.m_test_suite, p->filters[2], true, p->case_sensitive)) + skip_me = true; + if(matchesAny(tc.m_test_suite, p->filters[3], false, p->case_sensitive)) + skip_me = true; + if(!matchesAny(tc.m_name, p->filters[4], true, p->case_sensitive)) + skip_me = true; + if(matchesAny(tc.m_name, p->filters[5], false, p->case_sensitive)) + skip_me = true; + + if(!skip_me) + p->numTestCasesPassingFilters++; - if(data.m_skip && !p->no_skip) - continue; + // skip the test if it is not in the execution range + if((p->last < p->numTestCasesPassingFilters && p->first <= p->last) || + (p->first > p->numTestCasesPassingFilters)) + skip_me = true; - if(!matchesAny(data.m_file, p->filters[0], 1, p->case_sensitive)) + if(skip_me) { + if(!query_mode) + DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_skipped, tc); continue; - if(matchesAny(data.m_file, p->filters[1], 0, p->case_sensitive)) - continue; - if(!matchesAny(data.m_test_suite, p->filters[2], 1, p->case_sensitive)) - continue; - if(matchesAny(data.m_test_suite, p->filters[3], 0, p->case_sensitive)) - continue; - if(!matchesAny(data.m_name, p->filters[4], 1, p->case_sensitive)) - continue; - if(matchesAny(data.m_name, p->filters[5], 0, p->case_sensitive)) - continue; - - p->numTestsPassingFilters++; + } // do not execute the test if we are to only count the number of filter passing tests if(p->count) @@ -5454,161 +5039,167 @@ int Context::run() { // print the name of the test and don't execute it if(p->list_test_cases) { - std::printf("%s\n", data.m_name); + g_con_rep.output_c_string_with_newline(tc.m_name); continue; } // print the name of the test suite if not done already and don't execute it if(p->list_test_suites) { - if((testSuitesPassingFilters.count(data.m_test_suite) == 0) && - data.m_test_suite[0] != '\0') { - std::printf("%s\n", data.m_test_suite); - testSuitesPassingFilters.insert(data.m_test_suite); + if((testSuitesPassingFilt.count(tc.m_test_suite) == 0) && tc.m_test_suite[0] != '\0') { + g_con_rep.output_c_string_with_newline(tc.m_test_suite); + testSuitesPassingFilt.insert(tc.m_test_suite); p->numTestSuitesPassingFilters++; } continue; } - // skip the test if it is not in the execution range - if((p->last < p->numTestsPassingFilters && p->first <= p->last) || - (p->first > p->numTestsPassingFilters)) - continue; - // execute the test if it passes all the filtering { - p->currentTest = &data; + p->currentTest = &tc; + + p->failure_flags = TestCaseFailureReason::None; + p->seconds_so_far = 0; + p->error_string = ""; - bool failed = false; - p->hasLoggedCurrentTestStart = false; - p->numFailedAssertionsForCurrentTestcase = 0; p->subcasesPassed.clear(); - double duration = 0; - Timer timer; - timer.start(); do { - // if the start has been logged from a previous iteration of this loop - if(p->hasLoggedCurrentTestStart) - logTestEnd(); - p->hasLoggedCurrentTestStart = false; - - // if logging successful tests - force the start log - if(p->success) - DOCTEST_LOG_START(); - - // reset the assertion state - p->numAssertionsForCurrentTestcase = 0; - p->hasCurrentTestFailed = false; - // reset some of the fields for subcases (except for the set of fully passed ones) - p->subcasesHasSkipped = false; + p->should_reenter = false; p->subcasesCurrentLevel = 0; p->subcasesEnteredLevels.clear(); // reset stuff for logging with INFO() - p->exceptionalContexts.clear(); + p->stringifiedContexts.clear(); + + // reset atomic counters + p->numAssertsFailedForCurrentTestCase_atomic = 0; + p->numAssertsForCurrentTestCase_atomic = 0; + + DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_start, tc); + + g_timer.start(); -// execute the test #ifndef DOCTEST_CONFIG_NO_EXCEPTIONS try { #endif // DOCTEST_CONFIG_NO_EXCEPTIONS FatalConditionHandler fatalConditionHandler; // Handle signals - data.m_test(); + // execute the test + tc.m_test(); fatalConditionHandler.reset(); - if(contextState->hasCurrentTestFailed) - failed = true; #ifndef DOCTEST_CONFIG_NO_EXCEPTIONS - } catch(const TestFailureException&) { failed = true; } catch(...) { - DOCTEST_LOG_START(); - logTestException(translateActiveException()); - failed = true; + } catch(const TestFailureException&) { + p->failure_flags |= TestCaseFailureReason::AssertFailure; + } catch(...) { + p->error_string = translateActiveException(); + p->failure_flags |= TestCaseFailureReason::Exception; } #endif // DOCTEST_CONFIG_NO_EXCEPTIONS - p->numAssertions += p->numAssertionsForCurrentTestcase; + p->seconds_so_far += g_timer.getElapsedSeconds(); + + // update the non-atomic counters + p->numAsserts += p->numAssertsForCurrentTestCase_atomic; + p->numAssertsForCurrentTestCase = p->numAssertsForCurrentTestCase_atomic; + p->numAssertsFailed += p->numAssertsFailedForCurrentTestCase_atomic; + p->numAssertsFailedForCurrentTestCase = + p->numAssertsFailedForCurrentTestCase_atomic; - // exit this loop if enough assertions have failed - if(p->abort_after > 0 && p->numFailedAssertions >= p->abort_after) { - p->subcasesHasSkipped = false; - DOCTEST_PRINTF_COLORED("Aborting - too many failed asserts!\n", Color::Red); + // exit this loop if enough assertions have failed - even if there are more subcases + if(p->abort_after > 0 && p->numAssertsFailed >= p->abort_after) { + p->should_reenter = false; + p->failure_flags |= TestCaseFailureReason::TooManyFailedAsserts; } - } while(p->subcasesHasSkipped == true); + // call it from here only if we will continue looping for other subcases and + // call it again outside of the loop for one final time - with updated flags + if(p->should_reenter == true) { + DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_end, *g_cs); + // remove these flags - it is expected that the reporters have handled these issues + p->failure_flags &= ~TestCaseFailureReason::Exception; + p->failure_flags &= ~TestCaseFailureReason::AssertFailure; + } + } while(p->should_reenter == true); - duration = timer.getElapsedSeconds(); + if(p->numAssertsFailedForCurrentTestCase) + p->failure_flags |= TestCaseFailureReason::AssertFailure; if(Approx(p->currentTest->m_timeout).epsilon(DBL_EPSILON) != 0 && - Approx(duration).epsilon(DBL_EPSILON) > p->currentTest->m_timeout) { - failed = true; - DOCTEST_LOG_START(); - char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), - "Test case exceeded time limit of %.6f!\n", - p->currentTest->m_timeout); - DOCTEST_PRINTF_COLORED(msg, Color::Red); - } + Approx(p->seconds_so_far).epsilon(DBL_EPSILON) > p->currentTest->m_timeout) + p->failure_flags |= TestCaseFailureReason::Timeout; - if(p->duration) { - char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), "%.6f s: %s\n", duration, - p->currentTest->m_name); - DOCTEST_PRINTF_COLORED(msg, Color::None); - } - - if(data.m_should_fail) { - DOCTEST_LOG_START(); - if(failed) { - failed = false; - DOCTEST_PRINTF_COLORED("Failed as expected so marking it as not failed\n", - Color::Yellow); + if(tc.m_should_fail) { + if(p->failure_flags) { + p->failure_flags |= TestCaseFailureReason::ShouldHaveFailedAndDid; } else { - failed = true; - DOCTEST_PRINTF_COLORED("Should have failed but didn't! Marking it as failed!\n", - Color::Red); + p->failure_flags |= TestCaseFailureReason::ShouldHaveFailedButDidnt; } - } else if(failed && data.m_may_fail) { - DOCTEST_LOG_START(); - failed = false; - DOCTEST_PRINTF_COLORED("Allowed to fail so marking it as not failed\n", - Color::Yellow); - } else if(data.m_expected_failures > 0) { - DOCTEST_LOG_START(); - char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH]; - if(p->numFailedAssertionsForCurrentTestcase == data.m_expected_failures) { - failed = false; - DOCTEST_SNPRINTF( - msg, DOCTEST_COUNTOF(msg), - "Failed exactly %d times as expected so marking it as not failed!\n", - data.m_expected_failures); - DOCTEST_PRINTF_COLORED(msg, Color::Yellow); + } else if(p->failure_flags && tc.m_may_fail) { + p->failure_flags |= TestCaseFailureReason::CouldHaveFailedAndDid; + } else if(tc.m_expected_failures > 0) { + if(p->numAssertsFailedForCurrentTestCase == tc.m_expected_failures) { + p->failure_flags |= TestCaseFailureReason::FailedExactlyNumTimes; } else { - failed = true; - DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), - "Didn't fail exactly %d times so marking it as failed!\n", - data.m_expected_failures); - DOCTEST_PRINTF_COLORED(msg, Color::Red); + p->failure_flags |= TestCaseFailureReason::DidntFailExactlyNumTimes; } } - if(p->hasLoggedCurrentTestStart) - logTestEnd(); + bool ok_to_fail = (TestCaseFailureReason::ShouldHaveFailedAndDid & p->failure_flags) || + (TestCaseFailureReason::CouldHaveFailedAndDid & p->failure_flags) || + (TestCaseFailureReason::FailedExactlyNumTimes & p->failure_flags); + + // if any subcase has failed - the whole test case has failed + if(p->failure_flags && !ok_to_fail) + p->numTestCasesFailed++; + + DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_end, *g_cs); - if(failed) // if any subcase has failed - the whole test case has failed - p->numFailed++; + p->currentTest = nullptr; // stop executing tests if enough assertions have failed - if(p->abort_after > 0 && p->numFailedAssertions >= p->abort_after) + if(p->abort_after > 0 && p->numAssertsFailed >= p->abort_after) break; } } - printSummary(); + if(!query_mode) + DOCTEST_ITERATE_THROUGH_REPORTERS(test_run_end, *g_cs); + else + g_con_rep.output_query_results(); - contextState = 0; + g_cs = old_cs; + is_running_in_test = false; - if(p->numFailed && !p->no_exitcode) + if(p->numTestCasesFailed && !p->no_exitcode) return EXIT_FAILURE; return EXIT_SUCCESS; } + +DOCTEST_DEFINE_DEFAULTS(CurrentTestCaseStats); + +DOCTEST_DEFINE_DEFAULTS(TestRunStats); + +IReporter::~IReporter() = default; + +int IReporter::get_num_active_contexts() { return detail::g_infoContexts.size(); } +const IContextScope* const* IReporter::get_active_contexts() { + return get_num_active_contexts() ? &detail::g_infoContexts[0] : nullptr; +} + +int IReporter::get_num_stringified_contexts() { return detail::g_cs->stringifiedContexts.size(); } +const String* IReporter::get_stringified_contexts() { + return get_num_stringified_contexts() ? &detail::g_cs->stringifiedContexts[0] : nullptr; +} + +int registerReporter(const char* name, int priority, IReporter& r) { + getReporters().insert(reporterMap::value_type(reporterMap::key_type(priority, name), &r)); + return 0; +} + +// see these issues on the reasoning for this: +// - https://github.com/onqtam/doctest/issues/143#issuecomment-414418903 +// - https://github.com/onqtam/doctest/issues/126 +void DOCTEST_FIX_FOR_MACOS_LIBCPP_IOSFWD_STRING_LINK_ERRORS() { std::cout << std::string(); } + } // namespace doctest #endif // DOCTEST_CONFIG_DISABLE @@ -5617,19 +5208,9 @@ int Context::run() { int main(int argc, char** argv) { return doctest::Context(argc, argv).run(); } #endif // DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN +DOCTEST_CLANG_SUPPRESS_WARNING_POP +DOCTEST_MSVC_SUPPRESS_WARNING_POP +DOCTEST_GCC_SUPPRESS_WARNING_POP + #endif // DOCTEST_LIBRARY_IMPLEMENTATION #endif // DOCTEST_CONFIG_IMPLEMENT - -#if defined(__clang__) -#pragma clang diagnostic pop -#endif // __clang__ - -#if defined(__GNUC__) && !defined(__clang__) -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6) -#pragma GCC diagnostic pop -#endif // > gcc 4.6 -#endif // __GNUC__ - -#ifdef _MSC_VER -#pragma warning(pop) -#endif // _MSC_VER From 0a168a095e6250ec26a0c6ebbf45e5a524d49693 Mon Sep 17 00:00:00 2001 From: Carsten Teibes Date: Thu, 11 Oct 2018 15:10:29 +0200 Subject: [PATCH 6/7] Let git handle line endings of text files Fixup the MSVC project and generator csv's --- .gitattributes | 8 + builds/vs2015/liblcf.vcxproj | 712 ++++++++--------- builds/vs2015/liblcf.vcxproj.filters | 1082 +++++++++++++------------- generator/csv/flags.csv | 58 +- 4 files changed, 934 insertions(+), 926 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..b7e9cb779 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,8 @@ +* text=auto +*.cpp text +*.h text +*.md text +*.csv text +*.vcxproj text eol=crlf +*.props text eol=crlf +*.filters text eol=crlf diff --git a/builds/vs2015/liblcf.vcxproj b/builds/vs2015/liblcf.vcxproj index 462f873b4..d55b36fae 100644 --- a/builds/vs2015/liblcf.vcxproj +++ b/builds/vs2015/liblcf.vcxproj @@ -1,357 +1,357 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Release - ARM - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {16E3AAE8-AE1A-4960-B7FF-20B2E77FF15F} - liblcf - 8.1 - - - - StaticLibrary - true - v140 - Unicode - - - StaticLibrary - true - v140 - Unicode - - - StaticLibrary - false - v140 - true - Unicode - - - StaticLibrary - false - v140 - true - Unicode - - - StaticLibrary - true - v140 - Unicode - - - StaticLibrary - false - v140 - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Level3 - Disabled - true - false - - - true - - - - - Level3 - Disabled - true - false - _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(PreprocessorDefinitions) - - - true - - - - - Level3 - Disabled - true - false - - - true - - - - - Level3 - MaxSpeed - true - true - true - - - true - true - true - - - - - Level3 - MaxSpeed - true - true - true - _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(PreprocessorDefinitions) - - - true - true - true - - - - - Level3 - MaxSpeed - true - true - true - - - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + ARM + + + Debug + Win32 + + + Release + ARM + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + {16E3AAE8-AE1A-4960-B7FF-20B2E77FF15F} + liblcf + 8.1 + + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Level3 + Disabled + true + false + + + true + + + + + Level3 + Disabled + true + false + _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(PreprocessorDefinitions) + + + true + + + + + Level3 + Disabled + true + false + + + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(PreprocessorDefinitions) + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/vs2015/liblcf.vcxproj.filters b/builds/vs2015/liblcf.vcxproj.filters index c1204c6f4..d311eecde 100644 --- a/builds/vs2015/liblcf.vcxproj.filters +++ b/builds/vs2015/liblcf.vcxproj.filters @@ -1,542 +1,542 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {0dde9b4a-c124-498a-b7a4-0c21c2eafe59} - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {c881e760-80a5-4102-8ad3-58978999c396} - - - {7a0a97cf-0642-4471-9b77-825b942f73db} - - - {07760826-1ea8-411e-81c3-3659cc03c568} - - - {9d62bde7-1f5a-4ad1-8365-e4d398bf1acb} - - - {832422a3-2afc-4db0-bc0e-a16ecda61ba0} - - - {a0b75d9e-2ee0-4d4b-85e1-1bbe7c6f074f} - - - - - Source Files\INI - - - Source Files\INI - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LMT - - - Source Files\LMT - - - Source Files\LMT - - - Source Files\LMU - - - Source Files\LMU - - - Source Files\LMU - - - Source Files\LMU - - - Source Files\LMU - - - Source Files - - - Source Files\RPG - - - Source Files\RPG - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LSD - - - Source Files - - - Source Files\LMU - - - Source Files\LMT - - - Source Files\LDB - - - Source Files\LSD - - - Source Files\LDB - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LMT - - - Source Files\LMU - - - Source Files - - - Source Files - - - Source Files\LMT - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LMU - - - Source Files\LSD - - - Source Files\LSD - - - Source Files\LSD - - - Source Files\LSD - - - Source Files\LSD - - - Source Files\LSD - - - Source Files\LSD - - - Source Files\LSD - - - Source Files\LSD - - - Source Files\LSD - - - Source Files\LSD - - - Source Files\LSD - - - Source Files\LSD - - - Source Files\LSD - - - Source Files\LSD - - - Source Files\RPG - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\LDB - - - Source Files\RPG - - - Source Files\RPG - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - - Header Files\RPG - - + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {0dde9b4a-c124-498a-b7a4-0c21c2eafe59} + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {c881e760-80a5-4102-8ad3-58978999c396} + + + {7a0a97cf-0642-4471-9b77-825b942f73db} + + + {07760826-1ea8-411e-81c3-3659cc03c568} + + + {9d62bde7-1f5a-4ad1-8365-e4d398bf1acb} + + + {832422a3-2afc-4db0-bc0e-a16ecda61ba0} + + + {a0b75d9e-2ee0-4d4b-85e1-1bbe7c6f074f} + + + + + Source Files\INI + + + Source Files\INI + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LMT + + + Source Files\LMT + + + Source Files\LMT + + + Source Files\LMU + + + Source Files\LMU + + + Source Files\LMU + + + Source Files\LMU + + + Source Files\LMU + + + Source Files + + + Source Files\RPG + + + Source Files\RPG + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LSD + + + Source Files + + + Source Files\LMU + + + Source Files\LMT + + + Source Files\LDB + + + Source Files\LSD + + + Source Files\LDB + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LMT + + + Source Files\LMU + + + Source Files + + + Source Files + + + Source Files\LMT + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LMU + + + Source Files\LSD + + + Source Files\LSD + + + Source Files\LSD + + + Source Files\LSD + + + Source Files\LSD + + + Source Files\LSD + + + Source Files\LSD + + + Source Files\LSD + + + Source Files\LSD + + + Source Files\LSD + + + Source Files\LSD + + + Source Files\LSD + + + Source Files\LSD + + + Source Files\LSD + + + Source Files\LSD + + + Source Files\RPG + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\LDB + + + Source Files\RPG + + + Source Files\RPG + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + + Header Files\RPG + + \ No newline at end of file diff --git a/generator/csv/flags.csv b/generator/csv/flags.csv index 98edb6654..303effd17 100644 --- a/generator/csv/flags.csv +++ b/generator/csv/flags.csv @@ -1,29 +1,29 @@ -#Structure,Field,Is2k3 -TroopPageCondition,switch_a,0 -TroopPageCondition,switch_b,0 -TroopPageCondition,variable,0 -TroopPageCondition,turn,0 -TroopPageCondition,fatigue,0 -TroopPageCondition,enemy_hp,0 -TroopPageCondition,actor_hp,0 -TroopPageCondition,turn_enemy,1 -TroopPageCondition,turn_actor,1 -TroopPageCondition,command_actor,1 -Terrain,back_party,1 -Terrain,back_enemies,1 -Terrain,lateral_party,1 -Terrain,lateral_enemies,1 -EventPageCondition,switch_a,0 -EventPageCondition,switch_b,0 -EventPageCondition,variable,0 -EventPageCondition,item,0 -EventPageCondition,actor,0 -EventPageCondition,timer,0 -EventPageCondition,timer2,1 -SavePicture,erase_on_map_change,1 -SavePicture,erase_on_battle_end,1 -SavePicture,unused_bit,1 -SavePicture,unused_bit2,1 -SavePicture,affected_by_tint,1 -SavePicture,affected_by_flash,1 -SavePicture,affected_by_shake,1 +#Structure,Field,Is2k3 +TroopPageCondition,switch_a,0 +TroopPageCondition,switch_b,0 +TroopPageCondition,variable,0 +TroopPageCondition,turn,0 +TroopPageCondition,fatigue,0 +TroopPageCondition,enemy_hp,0 +TroopPageCondition,actor_hp,0 +TroopPageCondition,turn_enemy,1 +TroopPageCondition,turn_actor,1 +TroopPageCondition,command_actor,1 +Terrain,back_party,1 +Terrain,back_enemies,1 +Terrain,lateral_party,1 +Terrain,lateral_enemies,1 +EventPageCondition,switch_a,0 +EventPageCondition,switch_b,0 +EventPageCondition,variable,0 +EventPageCondition,item,0 +EventPageCondition,actor,0 +EventPageCondition,timer,0 +EventPageCondition,timer2,1 +SavePicture,erase_on_map_change,1 +SavePicture,erase_on_battle_end,1 +SavePicture,unused_bit,1 +SavePicture,unused_bit2,1 +SavePicture,affected_by_tint,1 +SavePicture,affected_by_flash,1 +SavePicture,affected_by_shake,1 From 30d88e46f357eefaac56c094802c1ac0ce7e80a2 Mon Sep 17 00:00:00 2001 From: Carsten Teibes Date: Thu, 11 Oct 2018 15:16:18 +0200 Subject: [PATCH 7/7] Update Version to 0.5.4 Also small README update --- CMakeLists.txt | 2 +- README.md | 8 ++++---- configure.ac | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c606ba60..5b899ce8b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.7) cmake_policy(SET CMP0048 NEW) -project(liblcf VERSION 0.5.3 LANGUAGES CXX) +project(liblcf VERSION 0.5.4 LANGUAGES CXX) option(BUILD_SHARED_LIBS "Build shared library, disable for building the static library" ON) option(DISABLE_ICU "Disable ICU encoding detection (fallback to iconv, not recommended)" OFF) diff --git a/README.md b/README.md index d0882b562..8e13bd4c3 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,8 @@ Documentation is available at the documentation wiki: https://wiki.easyrpg.org ## Requirements -Expat for XML reading support. -ICU for character encoding detection and conversion (recommended). +- Expat for XML reading support. +- ICU for character encoding detection and conversion (recommended). ## Source code @@ -41,8 +41,8 @@ Building requirements: Step-by-step instructions: - tar xf liblcf-0.5.3.tar.xz # unpack the tarball - cd liblcf-0.5.3 # enter in the package directory + tar xf liblcf-0.5.4.tar.xz # unpack the tarball + cd liblcf-0.5.4 # enter in the package directory ./configure --prefix /usr # find libraries, set options make # compile the library sudo make install # install system-wide diff --git a/configure.ac b/configure.ac index 7baa52b11..b3147ae7a 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([liblcf],[0.5.3],[https://github.com/EasyRPG/liblcf/issues],[liblcf],[https://easyrpg.org/]) +AC_INIT([liblcf],[0.5.4],[https://github.com/EasyRPG/liblcf/issues],[liblcf],[https://easyrpg.org/]) AC_CONFIG_AUX_DIR([builds/autoconf]) AM_INIT_AUTOMAKE([1.11.4 foreign subdir-objects -Wall dist-xz])