JNAerator: accept orphaned "extern "C" {" prefixes and "}" suffixes

ochafik · ochafik · commit ff60679e03eb · 2011-05-29T17:21:09.000Z
diff --git a/libraries/DirectX/src/main/jnaerator/config.jnaerator b/libraries/DirectX/src/main/jnaerator/config.jnaerator
@@ -2,19 +2,25 @@
 -D_MSC_VER=1300
 -DMIDL_PASS=1
 -DHRESULT=int
+-DDWORD=int
+-DBYTE=char
+-DSIZE_T=size_t
 -D__stdcall=
 -D__cplusplus=1
 "-DMIDL_INTERFACE(x)=struct __declspec(uuid(x)) __declspec(novtable)"
 
 "-IC:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Include"
+
+//-library d3d9
+//	"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Include\d3d9*.h"
 -library d3d10
 	"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Include\d3d10.h"
--library d3d11
-	"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Include\d3d11.h"
+//-library d3d11
+//	"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Include\d3d11.h"
 	
 -noJar -noComp
 -o src/main/java
--v
+//-v
 
 -runtime BridJ
--parseInOneChunk
+//-parseInOneChunk
diff --git a/libraries/jnaerator/jnaerator-parser/src/main/antlr3/com/ochafik/lang/jnaerator/parser/ObjCpp.g b/libraries/jnaerator/jnaerator-parser/src/main/antlr3/com/ochafik/lang/jnaerator/parser/ObjCpp.g
@@ -389,7 +389,9 @@ scope Symbols;
 			lineDirective {
 				if ($sourceFile.getElementFile() == null)
 					$sourceFile.setElementFile(getFile());
-			}
+			} |
+			{ next("extern") }?=> IDENTIFIER STRING '{' |
+			'}'
 		)* 
 	 	EOF
 	 ;
