SF.net SVN: edk2-buildtools:[2558] trunk/BaseTools/Source/Python/AutoGen/ UniClassObject.py

[<yd...@us...>]

Revision: 2558
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2558&view=rev
Author:   ydong10
Date:     2012-10-22 10:21:41 +0000 (Mon, 22 Oct 2012)
Log Message:
-----------
Refine the logic to make sure the long keyword parse before the short one.

Signed-off-by: Eric Dong <eri...@in...>
Reviewed-by: Liming Gao <lim...@in...>

Modified Paths:
--------------
    trunk/BaseTools/Source/Python/AutoGen/UniClassObject.py

Modified: trunk/BaseTools/Source/Python/AutoGen/UniClassObject.py
===================================================================
--- trunk/BaseTools/Source/Python/AutoGen/UniClassObject.py	2012-10-18 15:57:46 UTC (rev 2557)
+++ trunk/BaseTools/Source/Python/AutoGen/UniClassObject.py	2012-10-22 10:21:41 UTC (rev 2558)
@@ -335,17 +335,16 @@
             Line = Line.replace(u'/include', u'#include')
 
             Line = Line.replace(u'\\\\', u'\u0006')
+            Line = Line.replace(UNICODE_WIDE_CHAR, WIDE_CHAR)
+            Line = Line.replace(UNICODE_NARROW_CHAR, NARROW_CHAR)
+            Line = Line.replace(UNICODE_NON_BREAKING_CHAR, NON_BREAKING_CHAR)
+
             Line = Line.replace(u'\\r\\n', CR + LF)
             Line = Line.replace(u'\\n', CR + LF)
             Line = Line.replace(u'\\r', CR)
             Line = Line.replace(u'\\t', u'\t')
             Line = Line.replace(u'''\"''', u'''"''')
             Line = Line.replace(u'\t', u' ')
-
-            Line = Line.replace(UNICODE_WIDE_CHAR, WIDE_CHAR)
-            Line = Line.replace(UNICODE_NARROW_CHAR, NARROW_CHAR)
-            Line = Line.replace(UNICODE_NON_BREAKING_CHAR, NON_BREAKING_CHAR)
-
             Line = Line.replace(u'\u0006', u'\\')
             
 #           if Line.find(u'\\x'):

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.