mail[Wesnoth-commits] r52697 - in /trunk: changelog data/tools/wmllint


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by strgaltent on January 20, 2012 - 23:19:
Author: anonymissimus
Date: Fri Jan 20 23:19:01 2012
New Revision: 52697

URL: http://svn.gna.org/viewcvs/wesnoth?rev=52697&view=rev
Log:
Revert revisions of mine: 52659, 52660

Since it introduced wrong line numbers in wmllint messages.
And probably messes up files in case dryrun isn't used.
Reintroduces the wmllint breakage problem with Hornshark Island.

Modified:
    trunk/changelog
    trunk/data/tools/wmllint

Modified: trunk/changelog
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=52697&r1=52696&r2=52697&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Fri Jan 20 23:19:01 2012
@@ -50,7 +50,6 @@
    * Fixed wmlindent writing CRLF end of lines on windows
    * Fix tutorial units without xp bar
    * Reset game credits instead of appending on WML cache refresh (bug 
#19292)
-   * Make wmllint ignore lines with << until a line with >> (embedded lua)
 
 Version 1.9.14:
  * AI:

Modified: trunk/data/tools/wmllint
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/wmllint?rev=52697&r1=52696&r2=52697&view=diff
==============================================================================
--- trunk/data/tools/wmllint (original)
+++ trunk/data/tools/wmllint Fri Jan 20 23:19:01 2012
@@ -1726,7 +1726,6 @@
     unbalanced = False
     newdata = []
     refname = None
-    in_lua = False
     while mfile:
         if not map_only:
             line = mfile.pop(0)
@@ -1887,15 +1886,6 @@
             newdata.append(line + terminator)
         else:
             # Handle text (non-map) lines.  It can use within().
-            # Ignore lines with embedded lua.
-            if in_lua:
-                if ">>" in line:
-                    in_lua = False
-                continue
-            elif "<<" in line:
-                if not ">>" in line:
-                    in_lua = True
-                continue
             newline = textxform(filename, lineno, line)
             newdata.append(newline + terminator)
             fields = newline.split("#")




Related Messages


Powered by MHonArc, Updated Fri Jan 20 23:20:08 2012