diff options
| author | Sven Gothel <[email protected]> | 2010-11-09 02:42:03 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-11-09 02:42:03 +0100 |
| commit | 7865b355bd52958f4b27e42b500e83c52255ef37 (patch) | |
| tree | cdd887ede9b43f1a3d18527cf9eaabc9627946da /src/java/com/jogamp/gluegen/cgram | |
| parent | 08a74fb5d45f29f4d77a2713d1ebca4343519eb0 (diff) | |
Gluegen: Types (stddef/stdint), Header and Predefined Macro Change
Read API doc ad GlueGen.java
New predefined types: wchar_t, intptr_t, uintptr_t
New reusable headers
for gluegen usage: make/stub_includes/gluegen
for native usage: make/stub_includes/platform
New predefined macro
#define __GLUEGEN__ 2
Diffstat (limited to 'src/java/com/jogamp/gluegen/cgram')
| -rw-r--r-- | src/java/com/jogamp/gluegen/cgram/GnuCParser.g | 3 | ||||
| -rw-r--r-- | src/java/com/jogamp/gluegen/cgram/GnuCTreeParser.g | 11 | ||||
| -rw-r--r-- | src/java/com/jogamp/gluegen/cgram/HeaderParser.g | 3 | ||||
| -rw-r--r-- | src/java/com/jogamp/gluegen/cgram/StdCParser.g | 11 |
4 files changed, 28 insertions, 0 deletions
diff --git a/src/java/com/jogamp/gluegen/cgram/GnuCParser.g b/src/java/com/jogamp/gluegen/cgram/GnuCParser.g index f795702..58d3171 100644 --- a/src/java/com/jogamp/gluegen/cgram/GnuCParser.g +++ b/src/java/com/jogamp/gluegen/cgram/GnuCParser.g @@ -315,12 +315,15 @@ typeSpecifier [int specCount] returns [int retSpecCount] | "unsigned" | "__int32" | "int32_t" + | "wchar_t" | "uint32_t" | "__int64" | "int64_t" | "uint64_t" | "ptrdiff_t" + | "intptr_t" | "size_t" + | "uintptr_t" | structOrUnionSpecifier ( options{warnWhenFollowAmbig=false;}: attributeDecl )* | enumSpecifier | { specCount==0 }? typedefName diff --git a/src/java/com/jogamp/gluegen/cgram/GnuCTreeParser.g b/src/java/com/jogamp/gluegen/cgram/GnuCTreeParser.g index 82792f3..1beeb7d 100644 --- a/src/java/com/jogamp/gluegen/cgram/GnuCTreeParser.g +++ b/src/java/com/jogamp/gluegen/cgram/GnuCTreeParser.g @@ -183,6 +183,17 @@ typeSpecifier | "double" | "signed" | "unsigned" + | "__int32" + | "int32_t" + | "wchar_t" + | "uint32_t" + | "__int64" + | "int64_t" + | "uint64_t" + | "ptrdiff_t" + | "intptr_t" + | "size_t" + | "uintptr_t" | structSpecifier ( attributeDecl )* | unionSpecifier ( attributeDecl )* | enumSpecifier diff --git a/src/java/com/jogamp/gluegen/cgram/HeaderParser.g b/src/java/com/jogamp/gluegen/cgram/HeaderParser.g index fa6455f..acb6dde 100644 --- a/src/java/com/jogamp/gluegen/cgram/HeaderParser.g +++ b/src/java/com/jogamp/gluegen/cgram/HeaderParser.g @@ -506,12 +506,15 @@ typeSpecifier[int attributes] returns [Type t] { | "double" { t = new DoubleType("double", SizeThunk.DOUBLE, cvAttrs); } | "__int32" { t = new IntType("__int32", SizeThunk.INT, unsigned, cvAttrs); } | "int32_t" { t = new IntType("int32_t", SizeThunk.INT, false, cvAttrs); /* TS: always signed */ } + | "wchar_t" { t = new IntType("wchar_t", SizeThunk.INT, false, cvAttrs); /* TS: always signed */ } | "uint32_t" { t = new IntType("uint32_t", SizeThunk.INT, true, cvAttrs); /* TS: always unsigned */ } | "__int64" { t = new IntType("__int64", SizeThunk.INT64, unsigned, cvAttrs); } | "int64_t" { t = new IntType("int64_t", SizeThunk.INT64, false, cvAttrs); /* TS: always signed */ } | "uint64_t" { t = new IntType("uint64_t", SizeThunk.INT64, true, cvAttrs); /* TS: always unsigned */ } | "ptrdiff_t" { t = new IntType("ptrdiff_t", SizeThunk.POINTER, false, cvAttrs); /* TS: always signed */ } + | "intptr_t" { t = new IntType("intptr_t", SizeThunk.POINTER, false, cvAttrs); /* TS: always signed */ } | "size_t" { t = new IntType("size_t", SizeThunk.POINTER, true, cvAttrs); /* TS: always unsigned */ } + | "uintptr_t" { t = new IntType("uintptr_t", SizeThunk.POINTER, true, cvAttrs); /* TS: always unsigned */ } | t = structSpecifier[cvAttrs] ( attributeDecl )* | t = unionSpecifier [cvAttrs] ( attributeDecl )* | t = enumSpecifier [cvAttrs] diff --git a/src/java/com/jogamp/gluegen/cgram/StdCParser.g b/src/java/com/jogamp/gluegen/cgram/StdCParser.g index 015c3e0..231e371 100644 --- a/src/java/com/jogamp/gluegen/cgram/StdCParser.g +++ b/src/java/com/jogamp/gluegen/cgram/StdCParser.g @@ -265,6 +265,17 @@ typeSpecifier [int specCount] returns [int retSpecCount] | "double" | "signed" | "unsigned" + | "__int32" + | "int32_t" + | "wchar_t" + | "uint32_t" + | "__int64" + | "int64_t" + | "uint64_t" + | "ptrdiff_t" + | "intptr_t" + | "size_t" + | "uintptr_t" | structOrUnionSpecifier | enumSpecifier | { specCount == 0 }? typedefName |