[Commits] [wesnoth/wesnoth] f5bd41: New WML tags to replace macro loop constructs

GitHub noreply at github.com
Thu Sep 24 13:40:25 UTC 2015


  Branch: refs/heads/sdl2
  Home:   https://github.com/wesnoth/wesnoth
  Commit: f5bd414b690b96712c15da19eb7bce1a258bba40
      https://github.com/wesnoth/wesnoth/commit/f5bd414b690b96712c15da19eb7bce1a258bba40
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

  Changed paths:
    M data/lua/wml-tags.lua

  Log Message:
  -----------
  New WML tags to replace macro loop constructs
- [for] can replace {FOREACH} ... {NEXT}, but it's really intended for running over an integral range
- [repeat] can replace {REPEAT}


  Commit: 6c5cf1eb88a79fbd1a5ffa7186508b9a014b9869
      https://github.com/wesnoth/wesnoth/commit/6c5cf1eb88a79fbd1a5ffa7186508b9a014b9869
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

  Changed paths:
    M data/lua/wml-tags.lua

  Log Message:
  -----------
  Implement [foreach] tag, based on Elvish_Hunter's implementation


  Commit: 65263bfc3289e92893952c549d2ac519d0e770c1
      https://github.com/wesnoth/wesnoth/commit/65263bfc3289e92893952c549d2ac519d0e770c1
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

  Changed paths:
    M data/lua/wml-tags.lua

  Log Message:
  -----------
  Propagate modifications to item_var back into the array


  Commit: d895b1865978ef3144e650f57f3b520b271efae3
      https://github.com/wesnoth/wesnoth/commit/d895b1865978ef3144e650f57f3b520b271efae3
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

  Changed paths:
    M data/lua/wml-tags.lua

  Log Message:
  -----------
  [foreach] now raises error if array length changes during iteration


  Commit: bda61536b0b7ed3ba3ef32a3316ce94d39eb6a0e
      https://github.com/wesnoth/wesnoth/commit/bda61536b0b7ed3ba3ef32a3316ce94d39eb6a0e
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

  Changed paths:
    M data/lua/wml-tags.lua

  Log Message:
  -----------
  Use [do] subtags with [repeat]


  Commit: 3c329408ce9fd22c9606acebd4a438bca0b90085
      https://github.com/wesnoth/wesnoth/commit/3c329408ce9fd22c9606acebd4a438bca0b90085
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

  Changed paths:
    M data/lua/wml-tags.lua
    M data/lua/wml-utils.lua
    M data/lua/wml/message.lua
    M data/lua/wml/object.lua
    A data/test/scenarios/interrupts.cfg
    M wml_test_schedule

  Log Message:
  -----------
  Implement [break], [continue], [return] tags (they take no arguments)


  Commit: aec99429c4586e21ae8d762d96cdca406db06728
      https://github.com/wesnoth/wesnoth/commit/aec99429c4586e21ae8d762d96cdca406db06728
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

  Changed paths:
    M data/lua/wml-tags.lua
    M data/lua/wml-utils.lua
    M data/lua/wml/message.lua
    M data/lua/wml/object.lua
    A data/test/scenarios/interrupts.cfg
    M wml_test_schedule

  Log Message:
  -----------
  Merge branch 'break-continue' into foreach


  Commit: 0ffda44b27819eadcff4c4be59019a876e623ca4
      https://github.com/wesnoth/wesnoth/commit/0ffda44b27819eadcff4c4be59019a876e623ca4
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

  Changed paths:
    M data/lua/wml-tags.lua

  Log Message:
  -----------
  Add break/continue support to the new loops


  Commit: 2fec74a6ac4257d9042a12a2491165d121209754
      https://github.com/wesnoth/wesnoth/commit/2fec74a6ac4257d9042a12a2491165d121209754
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

  Changed paths:
    M data/lua/wml-utils.lua

  Log Message:
  -----------
  Add default scope_type to handle_event_commands


  Commit: d527ea4740e51119136ff9752a2c5109cd75e4ae
      https://github.com/wesnoth/wesnoth/commit/d527ea4740e51119136ff9752a2c5109cd75e4ae
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-20 (Sun, 20 Sep 2015)

  Changed paths:
    M data/lua/wml-tags.lua

  Log Message:
  -----------
  Fix up loop implementations to reflect recent changes


  Commit: 4c3e00b3bbb27ff837864c4c9d0629f26963882e
      https://github.com/wesnoth/wesnoth/commit/4c3e00b3bbb27ff837864c4c9d0629f26963882e
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M data/lua/wml/message.lua

  Log Message:
  -----------
  readd side_for parameter for [message] with input

this was lost when porting the code to lua.


  Commit: 58512935d405a3d864d91a246116eb2e24e90323
      https://github.com/wesnoth/wesnoth/commit/58512935d405a3d864d91a246116eb2e24e90323
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M data/lua/wml/message.lua

  Log Message:
  -----------
  add [message] wait_description=

the description provided in wait_description is used when other players
wait for this [message] input.


  Commit: 4e775dd824385b14edc7e78649f920a962dc29c0
      https://github.com/wesnoth/wesnoth/commit/4e775dd824385b14edc7e78649f920a962dc29c0
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M src/formula_string_utils.hpp
    M src/synced_user_choice.cpp

  Log Message:
  -----------
  mark waiting message as translatable.


  Commit: 52558d0d7c3980436b12d4af87614403441a07b4
      https://github.com/wesnoth/wesnoth/commit/52558d0d7c3980436b12d4af87614403441a07b4
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M src/formula_string_utils.hpp

  Log Message:
  -----------
  attempt to fix compilation on travis.


  Commit: d5eea2abbf3d21fa3354179ecddc3888083e9a56
      https://github.com/wesnoth/wesnoth/commit/d5eea2abbf3d21fa3354179ecddc3888083e9a56
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-22 (Tue, 22 Sep 2015)

  Changed paths:
    M data/lua/wml/message.lua

  Log Message:
  -----------
  Fix [show_if] in [message][option]


  Commit: 900c84657b9d003eece8d341ed223a0111f5fdf2
      https://github.com/wesnoth/wesnoth/commit/900c84657b9d003eece8d341ed223a0111f5fdf2
  Author: Elias Pschernig <elias at users.sourceforge.net>
  Date:   2015-09-22 (Tue, 22 Sep 2015)

  Changed paths:
    M data/tools/addon_manager/html.py
    M data/tools/wesnoth/campaignserver_client.py
    M data/tools/wesnoth/wescamp.py
    M data/tools/wesnoth_addon_manager

  Log Message:
  -----------
  Upgraded wesnoth_addon_manager to Python 3

This includes campaignserver_client.py which is also used by wescamp.py
- however wescamp.py is still Python 2 at this point and will need to be
  upgraded at a later point in time.


  Commit: 56879d1f7d9b4668b660169f2b77f88244c3b34d
      https://github.com/wesnoth/wesnoth/commit/56879d1f7d9b4668b660169f2b77f88244c3b34d
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-22 (Tue, 22 Sep 2015)

  Changed paths:
    M src/formula_string_utils.hpp

  Log Message:
  -----------
  attempt to fix travis build


  Commit: 010d3ff35cd8eb478af26fd7b19d2dedcaba38d8
      https://github.com/wesnoth/wesnoth/commit/010d3ff35cd8eb478af26fd7b19d2dedcaba38d8
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-22 (Tue, 22 Sep 2015)

  Changed paths:
    M src/formula_string_utils.hpp

  Log Message:
  -----------
  attempt to fix travis build


  Commit: 33a43990adc3181b672a2216cd8a617a5a995370
      https://github.com/wesnoth/wesnoth/commit/33a43990adc3181b672a2216cd8a617a5a995370
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-22 (Tue, 22 Sep 2015)

  Changed paths:
    M data/lua/wml-tags.lua

  Log Message:
  -----------
  Add an explanatory comment to [foreach]


  Commit: c3d51a3438928324ef0b871f54d2a1bc2d145bd3
      https://github.com/wesnoth/wesnoth/commit/c3d51a3438928324ef0b871f54d2a1bc2d145bd3
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-22 (Tue, 22 Sep 2015)

  Changed paths:
    M changelog

  Log Message:
  -----------
  Update changelog


  Commit: 0d49eeeb393347cc64e180652a3de998ddfe2f8d
      https://github.com/wesnoth/wesnoth/commit/0d49eeeb393347cc64e180652a3de998ddfe2f8d
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-22 (Tue, 22 Sep 2015)

  Changed paths:
    M data/test/macros/wml_unit_test_macros.cfg
    M data/test/scenarios/break_replay_with_lua_random.cfg
    M data/test/scenarios/characterize_pathfinding.cfg
    M data/test/scenarios/conditionals.cfg
    M data/test/scenarios/facing.cfg
    M data/test/scenarios/feeding.cfg
    M data/test/scenarios/filter_vision.cfg
    M data/test/scenarios/has_ally.cfg
    M data/test/scenarios/prestart_settings.cfg
    M data/test/scenarios/recruit_facing.cfg
    M data/test/scenarios/sighted_events.cfg
    M data/test/scenarios/test_check_victory.cfg
    M data/test/scenarios/test_dofile.cfg
    M data/test/scenarios/test_end_turn.cfg
    M data/test/scenarios/test_grunt_tod_damage.cfg
    M data/test/scenarios/test_lua_wml.cfg
    M data/test/scenarios/test_menu_items.cfg
    M data/test/scenarios/test_move.cfg
    M data/test/scenarios/test_move_unit.cfg
    M data/test/scenarios/test_role_types.cfg
    M data/test/scenarios/test_unit_map.cfg
    M data/test/scenarios/test_victory_attacks.cfg

  Log Message:
  -----------
  Add SUCCEED/FAIL macros for WML test cases


  Commit: 7e26e090615b56a86f127492afa21826c8a8b1d0
      https://github.com/wesnoth/wesnoth/commit/7e26e090615b56a86f127492afa21826c8a8b1d0
  Author: Celtic Minstrel <celtic.minstrel.ca at some.place>
  Date:   2015-09-23 (Wed, 23 Sep 2015)

  Changed paths:
    M data/lua/wml-tags.lua
    M data/lua/wml-utils.lua
    M data/test/scenarios/interrupts.cfg
    M wml_test_schedule

  Log Message:
  -----------
  Fix erroneous handling of [break]/[continue] in [elseif]


  Commit: f07e463882b904d850cf81bb64c4c052b5adebfd
      https://github.com/wesnoth/wesnoth/commit/f07e463882b904d850cf81bb64c4c052b5adebfd
  Author: CelticMinstrel <CelticMinstrel at users.noreply.github.com>
  Date:   2015-09-23 (Wed, 23 Sep 2015)

  Changed paths:
    M changelog
    M data/lua/wml-tags.lua
    M data/lua/wml-utils.lua
    M data/lua/wml/message.lua
    M data/lua/wml/object.lua
    M data/test/macros/wml_unit_test_macros.cfg
    M data/test/scenarios/break_replay_with_lua_random.cfg
    M data/test/scenarios/characterize_pathfinding.cfg
    M data/test/scenarios/conditionals.cfg
    M data/test/scenarios/facing.cfg
    M data/test/scenarios/feeding.cfg
    M data/test/scenarios/filter_vision.cfg
    M data/test/scenarios/has_ally.cfg
    A data/test/scenarios/interrupts.cfg
    M data/test/scenarios/prestart_settings.cfg
    M data/test/scenarios/recruit_facing.cfg
    M data/test/scenarios/sighted_events.cfg
    M data/test/scenarios/test_check_victory.cfg
    M data/test/scenarios/test_dofile.cfg
    M data/test/scenarios/test_end_turn.cfg
    M data/test/scenarios/test_grunt_tod_damage.cfg
    M data/test/scenarios/test_lua_wml.cfg
    M data/test/scenarios/test_menu_items.cfg
    M data/test/scenarios/test_move.cfg
    M data/test/scenarios/test_move_unit.cfg
    M data/test/scenarios/test_role_types.cfg
    M data/test/scenarios/test_unit_map.cfg
    M data/test/scenarios/test_victory_attacks.cfg
    M wml_test_schedule

  Log Message:
  -----------
  Merge pull request #493 from CelticMinstrel/foreach

Enhanced looping tags


  Commit: 53b5d031e93d6a5933ca63ec4519380c456b7a2d
      https://github.com/wesnoth/wesnoth/commit/53b5d031e93d6a5933ca63ec4519380c456b7a2d
  Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
  Date:   2015-09-24 (Thu, 24 Sep 2015)

  Changed paths:
    A data/tools/wesnoth/wmliterator3.py
    A data/tools/wesnoth/wmltools3.py

  Log Message:
  -----------
  Added Python 3 versions of wmltools and wmliterator

The Python 2 versions should be removed as soon as there are no more scripts using them.


  Commit: a04bc6f45d84b1f2de97fc9cc68e54511d78028a
      https://github.com/wesnoth/wesnoth/commit/a04bc6f45d84b1f2de97fc9cc68e54511d78028a
  Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
  Date:   2015-09-24 (Thu, 24 Sep 2015)

  Changed paths:
    M data/tools/wmllint

  Log Message:
  -----------
  Converted wmllint to Python 3

Please note that attempting to run wmllint on Python 3.4 leads to an exception after finishing the spellcheck. This is a known bug in PyEnchant 1.6.5, and it can be solved by using PyEnchant 1.6.6.
See https://github.com/rfk/pyenchant/issues/34 .


  Commit: 1f5d713ee1bf2fa17a3568f04f5c4d6c9afeacc5
      https://github.com/wesnoth/wesnoth/commit/1f5d713ee1bf2fa17a3568f04f5c4d6c9afeacc5
  Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
  Date:   2015-09-24 (Thu, 24 Sep 2015)

  Changed paths:
    M data/tools/wmlscope

  Log Message:
  -----------
  Converted wmlscope to Python 3


  Commit: 526d745dfb19843c166f10e25897ec2f679864d2
      https://github.com/wesnoth/wesnoth/commit/526d745dfb19843c166f10e25897ec2f679864d2
  Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
  Date:   2015-09-24 (Thu, 24 Sep 2015)

  Changed paths:
    M data/tools/wmlindent

  Log Message:
  -----------
  Converted wmlindent to Python 3


  Commit: 21a6bc583150bb365038775446a115221b0d788b
      https://github.com/wesnoth/wesnoth/commit/21a6bc583150bb365038775446a115221b0d788b
  Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
  Date:   2015-09-24 (Thu, 24 Sep 2015)

  Changed paths:
    M data/tools/GUI.pyw

  Log Message:
  -----------
  Converted GUI.pyw to Python 3


  Commit: 6e4ecbb408ce57c512b761d61adfbe2bde4878dd
      https://github.com/wesnoth/wesnoth/commit/6e4ecbb408ce57c512b761d61adfbe2bde4878dd
  Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
  Date:   2015-09-24 (Thu, 24 Sep 2015)

  Changed paths:
    M data/tools/wmllint-1.4

  Log Message:
  -----------
  Converted wmllint-1.4 to Python 3


  Commit: 3e89cd49327d8a56b4bd72fdc9eaeb0d8f349f7e
      https://github.com/wesnoth/wesnoth/commit/3e89cd49327d8a56b4bd72fdc9eaeb0d8f349f7e
  Author: Elvish_Hunter <elvish.hunter2010 at gmail.com>
  Date:   2015-09-24 (Thu, 24 Sep 2015)

  Changed paths:
    M changelog

  Log Message:
  -----------
  changelog entry


  Commit: 1d7e52c387889f11294aa780367d34f1698c5c36
      https://github.com/wesnoth/wesnoth/commit/1d7e52c387889f11294aa780367d34f1698c5c36
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M changelog
    M data/lua/wml-tags.lua
    M data/lua/wml-utils.lua
    M data/lua/wml/message.lua
    M data/lua/wml/object.lua
    M data/test/macros/wml_unit_test_macros.cfg
    M data/test/scenarios/break_replay_with_lua_random.cfg
    M data/test/scenarios/characterize_pathfinding.cfg
    M data/test/scenarios/conditionals.cfg
    M data/test/scenarios/facing.cfg
    M data/test/scenarios/feeding.cfg
    M data/test/scenarios/filter_vision.cfg
    M data/test/scenarios/has_ally.cfg
    A data/test/scenarios/interrupts.cfg
    M data/test/scenarios/prestart_settings.cfg
    M data/test/scenarios/recruit_facing.cfg
    M data/test/scenarios/sighted_events.cfg
    M data/test/scenarios/test_check_victory.cfg
    M data/test/scenarios/test_dofile.cfg
    M data/test/scenarios/test_end_turn.cfg
    M data/test/scenarios/test_grunt_tod_damage.cfg
    M data/test/scenarios/test_lua_wml.cfg
    M data/test/scenarios/test_menu_items.cfg
    M data/test/scenarios/test_move.cfg
    M data/test/scenarios/test_move_unit.cfg
    M data/test/scenarios/test_role_types.cfg
    M data/test/scenarios/test_unit_map.cfg
    M data/test/scenarios/test_victory_attacks.cfg
    M data/tools/GUI.pyw
    M data/tools/addon_manager/html.py
    M data/tools/wesnoth/campaignserver_client.py
    M data/tools/wesnoth/wescamp.py
    A data/tools/wesnoth/wmliterator3.py
    A data/tools/wesnoth/wmltools3.py
    M data/tools/wesnoth_addon_manager
    M data/tools/wmlindent
    M data/tools/wmllint
    M data/tools/wmllint-1.4
    M data/tools/wmlscope
    M src/formula_string_utils.hpp
    M src/synced_user_choice.cpp
    M wml_test_schedule

  Log Message:
  -----------
  Merge branch 'master' into sdl2


Compare: https://github.com/wesnoth/wesnoth/compare/aa175ec0c8db...1d7e52c38788


More information about the Commits mailing list