Update of /cvsroot/gtk2hs/gtk2hs/tools/c2hs/c
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9604/tools/c2hs/c
Modified Files:
CLexer.hs
Log Message:
Make c2hs understand the __signed, __signed__, __volatile and __volatile__
portability keyword synonyms.
Index: CLexer.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/c2hs/c/CLexer.hs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CLexer.hs 18 Jan 2005 22:06:34 -0000 1.2
+++ CLexer.hs 19 Jan 2005 18:34:46 -0000 1.3
@@ -164,6 +164,8 @@
| CTokReturn Position -- `return'
| CTokShort Position -- `short'
| CTokSigned Position -- `signed'
+ -- (or `__signed',
+ -- `__signed__')
| CTokSizeof Position -- `sizeof'
| CTokStatic Position -- `static'
| CTokStruct Position -- `struct'
@@ -173,6 +175,8 @@
| CTokUnsigned Position -- `unsigned'
| CTokVoid Position -- `void'
| CTokVolatile Position -- `volatile'
+ -- (or `__volatile',
+ -- `__volatile__')
| CTokWhile Position -- `while'
| CTokCLit Position Char -- character constant
| CTokILit Position Integer -- integer constant
@@ -594,6 +598,8 @@
idkwtok pos "return" _ = CTokReturn pos
idkwtok pos "short" _ = CTokShort pos
idkwtok pos "signed" _ = CTokSigned pos
+ idkwtok pos "__signed" _ = CTokSigned pos
+ idkwtok pos "__signed__" _ = CTokSigned pos
idkwtok pos "sizeof" _ = CTokSizeof pos
idkwtok pos "static" _ = CTokStatic pos
idkwtok pos "struct" _ = CTokStruct pos
@@ -603,6 +609,8 @@
idkwtok pos "unsigned" _ = CTokUnsigned pos
idkwtok pos "void" _ = CTokVoid pos
idkwtok pos "volatile" _ = CTokVolatile pos
+ idkwtok pos "__volatile" _ = CTokVolatile pos
+ idkwtok pos "__volatile__" _ = CTokVolatile pos
idkwtok pos "while" _ = CTokWhile pos
idkwtok pos "__attribute__" _ = CTokGnuC GnuCAttrTok pos
idkwtok pos "__extension__" _ = CTokGnuC GnuCExtTok pos
|
