Rob Shearman : widl: callback, code, comm_status and in_line are attribute names, not keywords.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e35c79efbfa6b630a572469e3c84785eba17ddae
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e35c79efbfa6b630a572469e3c...

Author: Rob Shearman <rob(a)codeweavers.com>
Date:   Tue Apr 29 19:52:31 2008 +0100

widl: callback, code, comm_status and in_line are attribute names, not keywords.

---

 tools/widl/parser.l |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/widl/parser.l b/tools/widl/parser.l
index c202409..096f6a0 100644
--- a/tools/widl/parser.l
+++ b/tools/widl/parser.l
@@ -213,13 +213,10 @@ static const struct keyword keywords[] = {
 	{"_stdcall",			tSTDCALL},
 	{"boolean",			tBOOLEAN},
 	{"byte",			tBYTE},
-	{"callback",			tCALLBACK},
 	{"case",			tCASE},
 	{"cdecl",			tCDECL},
 	{"char",			tCHAR},
 	{"coclass",			tCOCLASS},
-	{"code",			tCODE},
-	{"comm_status",			tCOMMSTATUS},
 	{"const",			tCONST},
 	{"cpp_quote",			tCPPQUOTE},
 	{"default",			tDEFAULT},
@@ -233,7 +230,6 @@ static const struct keyword keywords[] = {
 	{"hyper",			tHYPER},
 	{"import",			tIMPORT},
 	{"importlib",			tIMPORTLIB},
-	{"in_line",			tIN_LINE},
 	{"inline",			tINLINE},
 	{"int",				tINT},
 	{"interface",			tINTERFACE},
@@ -271,6 +267,9 @@ static const struct keyword attr_keywords[] =
         {"broadcast",                   tBROADCAST},
         {"byte_count",                  tBYTECOUNT},
         {"call_as",                     tCALLAS},
+        {"callback",                    tCALLBACK},
+        {"code",                        tCODE},
+        {"comm_status",                 tCOMMSTATUS},
         {"context_handle",              tCONTEXTHANDLE},
         {"context_handle_noserialize",  tCONTEXTHANDLENOSERIALIZE},
         {"context_handle_serialize",    tCONTEXTHANDLENOSERIALIZE},
@@ -297,6 +296,7 @@ static const struct keyword attr_keywords[] =
         {"immediatebind",               tIMMEDIATEBIND},
         {"implicit_handle",             tIMPLICITHANDLE},
         {"in",                          tIN},
+        {"in_line",                     tIN_LINE},
         {"input_sync",                  tINPUTSYNC},
         {"lcid",                        tLCID},
         {"length_is",                   tLENGTHIS},