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

[GitHub]

  Branch: refs/heads/1.12
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 1537394818eb3a048ec56310c8120312ebd76597
      https://github.com/wesnoth/wesnoth/commit/1537394818eb3a048ec56310c8120312ebd76597
  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: e109f9b23bb75d6d683dfd5ffc92f2fa70d73a5f
      https://github.com/wesnoth/wesnoth/commit/e109f9b23bb75d6d683dfd5ffc92f2fa70d73a5f
  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: d95b07740e5757d3bc80c572c596e4f19a9ea4b8
      https://github.com/wesnoth/wesnoth/commit/d95b07740e5757d3bc80c572c596e4f19a9ea4b8
  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: 980594e2ac413c5e2589fd2b96f677649cffd340
      https://github.com/wesnoth/wesnoth/commit/980594e2ac413c5e2589fd2b96f677649cffd340
  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/eee57afbd2f2...980594e2ac41