[Commits] [wesnoth/wesnoth] eed4ae: validator: Conform to the new parser and preproces...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: eed4ae8a5242218bee4f83ba77bd895bba1ec3b8
      https://github.com/wesnoth/wesnoth/commit/eed4ae8a5242218bee4f83ba77bd895bba1ec3b8
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    M src/serialization/schema_validator.cpp

  Log Message:
  -----------
  validator: Conform to the new parser and preprocessor output style

Because I overlooked the validator's dependency on the preprocessor
lineno_string() function, we wound up with badly-formatted output like
the following:

> 20140619 03:16:32 error validation:
> gui/default/widget/slider_minimal.cfg:53
>     included from gui/default.cfg:30
>     included from gui/default/widget/slider_minimal.cfg:100
>     included from gui/default.cfg:30: tag [wrong_tag] may not be used in [resolution]

This commit changes the validator's error formatting functions to
produce output more akin to the parser/preprocessor under the new
scheme introduced in version 1.11.10:

> 20140619 03:17:36 error validation: Tag [wrong_tag] may not be used in [resolution]
> at gui/default/widget/slider_minimal.cfg:53
>     included from gui/default.cfg:30
>     included from gui/default/widget/slider_minimal.cfg:100
>     included from gui/default.cfg:30

There are no translatable strings involved in this change, so this
commit may be safely backported to 1.12.


  Commit: b58a2d6ba1aa45bc4e91d6dcd552ee18d44c632d
      https://github.com/wesnoth/wesnoth/commit/b58a2d6ba1aa45bc4e91d6dcd552ee18d44c632d
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    M src/serialization/schema_validator.cpp

  Log Message:
  -----------
  validator: Remove redundant "on line N" output fragments

They were redundant even before my changes.


  Commit: 0e8b3afedf8a51182f3b708b8ba074ccb0c3f3e9
      https://github.com/wesnoth/wesnoth/commit/0e8b3afedf8a51182f3b708b8ba074ccb0c3f3e9
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    M src/serialization/schema_validator.cpp

  Log Message:
  -----------
  validator: Make missing attribute error format more consistent with the rest

Instead of:
> In tag slider_definition which begins here,  missing key id

Use:
> Missing key 'id=' in tag [slider_definition]

Since otherwise the wording is very awkward with the new format (the
file:line line comes after the error), all other key-related messages
use "'key='" to denote attribute names, and there's a double-blank typo
that was there even before I first touched this code.


  Commit: 5044300e4485475976e619a6509d0d9f0cf65639
      https://github.com/wesnoth/wesnoth/commit/5044300e4485475976e619a6509d0d9f0cf65639
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    M changelog

  Log Message:
  -----------
  validator: Update changelog for previous three commits


Compare: https://github.com/wesnoth/wesnoth/compare/8a30f348b196...5044300e4485