Remove MSATTR from Parser & Lexer

Author: michael-schwarz

src/formatparse.mly

@@ -273,7 +273,6 @@ type maybeInit =
 %token BUILTIN_VA_ARG BUILTIN_VA_LIST
 %token BLOCKATTRIBUTE
 %token DECLSPEC
-%token <string> MSASM MSATTR
 %token PRAGMA
 
 

src/frontc/clexer.mll

@@ -195,13 +195,6 @@ let init_lexicon _ =
       ("__int32", fun loc -> INT loc);
       ("__int64", fun _ -> INT64 (currentLoc ()));
       ("__int128", fun _ -> INT128 (currentLoc ()));
-      ("_cdecl",  fun _ -> MSATTR ("_cdecl", currentLoc ()));
-      ("__cdecl", fun _ -> MSATTR ("__cdecl", currentLoc ()));
-      ("_stdcall", fun _ -> MSATTR ("_stdcall", currentLoc ()));
-      ("__stdcall", fun _ -> MSATTR ("__stdcall", currentLoc ()));
-      ("_fastcall", fun _ -> MSATTR ("_fastcall", currentLoc ()));
-      ("__fastcall", fun _ -> MSATTR ("__fastcall", currentLoc ()));
-      ("__w64", fun _ -> MSATTR("__w64", currentLoc ()));
       ("__declspec", fun loc -> DECLSPEC loc);
       ("__forceinline", fun loc -> INLINE loc); (* !! we turn forceinline
                                                  * into inline *)

src/frontc/cparser.mly

@@ -294,7 +294,6 @@ let transformOffsetOf (speclist, dtype) member =
 %token BLOCKATTRIBUTE
 %token<Cabs.cabsloc> BUILTIN_TYPES_COMPAT BUILTIN_OFFSETOF
 %token<Cabs.cabsloc> DECLSPEC
-%token<string * Cabs.cabsloc> MSASM MSATTR
 %token<string * Cabs.cabsloc> PRAGMA_LINE
 %token<Cabs.cabsloc> PRAGMA
 %token PRAGMA_EOL
@@ -903,7 +902,6 @@ statement:
                                  { COMPGOTO (smooth_expression (fst $3), joinLoc $1 $4) }
 |   ASM asmattr LPAREN asmtemplate asmoutputs RPAREN SEMICOLON
                         { ASM ($2, $4, $5, joinLoc $1 $7) }
-|   MSASM               { ASM ([], [fst $1], None, (*handleLoc*)(snd $1))}
 |   error location   SEMICOLON   { (NOP $2)}
 ;
 
@@ -1304,7 +1302,6 @@ attribute_nocv:
                                              [ VARIABLE "used" ]), $1 }
 *)*/
 |   DECLSPEC paren_attr_list_ne         { ("__declspec", $2), $1 }
-|   MSATTR                              { (fst $1, []), snd $1 }
                                         /* ISO 6.7.3 */
 |   THREAD                              { ("__thread",[]), $1 }
 |   QUALIFIER                     {("__attribute__",[VARIABLE(fst $1)]),snd $1}

test/small1/attr.c

@@ -211,7 +211,7 @@ sub addToGroup {
 addTest("testrun/percentm");
 addTest("testrun/percent400");
 addTest("testrun/caserange _GNUCC=1");
-addTest("test/attr");
+
 addTest("test/attr2 _GNUCC=1");
 addTest("test/attr3 _GNUCC=1");
 addTest("testrun/attr4 _GNUCC=1");