gobject-introspection r128 - in trunk: . tools

[juergbi svn gnome org]

Author: juergbi
Date: Mon Mar 10 15:36:56 2008
New Revision: 128
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=128&view=rev

Log:
2008-03-10  Juerg Billeter  <j bitron ch>

	* tools/gidlparser.c: (parse_type_internal):
	* tools/scannerlexer.l:
	* tools/scannerparser.y:
	Support C99 _Bool type in scanner.


Modified:
   trunk/ChangeLog
   trunk/tools/gidlparser.c
   trunk/tools/scannerlexer.l
   trunk/tools/scannerparser.y

Modified: trunk/tools/gidlparser.c
==============================================================================
--- trunk/tools/gidlparser.c	(original)
+++ trunk/tools/gidlparser.c	Mon Mar 10 15:36:56 2008
@@ -92,6 +92,7 @@
   } basic[] = {
     { "void",     TYPE_TAG_VOID,    0 },
     { "gpointer", TYPE_TAG_VOID,    1 },
+    { "bool",     TYPE_TAG_BOOLEAN, 0 },
     { "gboolean", TYPE_TAG_BOOLEAN, 0 },
 #if 0
     { "char",     TYPE_TAG_INT8,    0 },

Modified: trunk/tools/scannerlexer.l
==============================================================================
--- trunk/tools/scannerlexer.l	(original)
+++ trunk/tools/scannerlexer.l	Mon Mar 10 15:36:56 2008
@@ -119,6 +119,7 @@
 [a-zA-Z_][a-zA-Z_0-9]*			{ if (igenerator->macro_scan) return IDENTIFIER; else REJECT; }
 
 "auto"					{ return AUTO; }
+"_Bool"					{ return BOOL; }
 "break"					{ return BREAK; }
 "case"					{ return CASE; }
 "char"					{ return CHAR; }

Modified: trunk/tools/scannerparser.y
==============================================================================
--- trunk/tools/scannerparser.y	(original)
+++ trunk/tools/scannerparser.y	Mon Mar 10 15:36:56 2008
@@ -1,7 +1,7 @@
 /* GObject introspection: C parser
  *
  * Copyright (c) 1997 Sandro Sigala  <ssigala globalnet it>
- * Copyright (c) 2007 JÃrg Billeter  <j bitron ch>
+ * Copyright (c) 2007-2008 JÃrg Billeter  <j bitron ch>
  *
  * All rights reserved.
  *
@@ -209,7 +209,7 @@
 %token ELLIPSIS ADDEQ SUBEQ MULEQ DIVEQ MODEQ XOREQ ANDEQ OREQ SL SR
 %token SLEQ SREQ EQ NOTEQ LTEQ GTEQ ANDAND OROR PLUSPLUS MINUSMINUS ARROW
 
-%token AUTO BREAK CASE CHAR CONST CONTINUE DEFAULT DO DOUBLE ELSE ENUM
+%token AUTO BOOL BREAK CASE CHAR CONST CONTINUE DEFAULT DO DOUBLE ELSE ENUM
 %token EXTERN FLOAT FOR GOTO IF INLINE INT LONG REGISTER RESTRICT RETURN SHORT
 %token SIGNED SIZEOF STATIC STRUCT SWITCH TYPEDEF UNION UNSIGNED VOID VOLATILE
 %token WHILE
@@ -787,6 +787,10 @@
 	  {
 		$$ = cbasic_type_new ("unsigned");
 	  }
+	| BOOL
+	  {
+		$$ = cbasic_type_new ("bool");
+	  }
 	| struct_or_union_specifier
 	| enum_specifier
 	| typedef_name