gobject-introspection r843 - in trunk: . giscanner

[johan svn gnome org]

Author: johan
Date: Thu Oct 30 17:48:45 2008
New Revision: 843
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=843&view=rev

Log:
2008-10-30  Johan Dahlin  <jdahlin async com br>

    * giscanner/scannerlexer.l:
    Parse and discard __typeof and __attribute.



Modified:
   trunk/ChangeLog
   trunk/giscanner/scannerlexer.l

Modified: trunk/giscanner/scannerlexer.l
==============================================================================
--- trunk/giscanner/scannerlexer.l	(original)
+++ trunk/giscanner/scannerlexer.l	Thu Oct 30 17:48:45 2008
@@ -118,20 +118,22 @@
 ","					{ return ','; }
 "->"					{ return ARROW; }
 
+"__asm" 	        	        { if (!parse_ignored_macro()) REJECT; }
+"__asm__" 	        	        { if (!parse_ignored_macro()) REJECT; }
 "__attribute__" 		        { if (!parse_ignored_macro()) REJECT; }
+"__attribute" 		                { if (!parse_ignored_macro()) REJECT; }
 "__const"                               { return CONST; }
 "__extension__"                         { return EXTENSION; }
 "__inline"				{ return INLINE; }
 "__nonnull" 			        { if (!parse_ignored_macro()) REJECT; }
 "__restrict"				{ return RESTRICT; }
+"__typeof"				{ if (!parse_ignored_macro()) REJECT; }
+"_Bool"					{ return BOOL; }
 
 [a-zA-Z_][a-zA-Z_0-9]*			{ if (scanner->macro_scan) return IDENTIFIER; else REJECT; }
 
 "asm"           		        { if (!parse_ignored_macro()) REJECT; }
-"__asm" 	        	        { if (!parse_ignored_macro()) REJECT; }
-"__asm__" 	        	        { if (!parse_ignored_macro()) REJECT; }
 "auto"					{ return AUTO; }
-"_Bool"					{ return BOOL; }
 "break"					{ return BREAK; }
 "case"					{ return CASE; }
 "char"					{ return CHAR; }
@@ -148,7 +150,6 @@
 "goto"					{ return GOTO; }
 "if"					{ return IF; }
 "inline"				{ return INLINE; }
-"__inline__"				{ return INLINE; }
 "int"					{ return INT; }
 "long"					{ return LONG; }
 "register"				{ return REGISTER; }