Skip to content

Commit a9d9a96

Browse files
ochafikochafik
committed
JNAerator:
- fixed generation of typed pointers : introduced undefined types (mere interfaces) - added preliminary generation of globals to BridJ
1 parent 502243f commit a9d9a96

24 files changed

Lines changed: 224 additions & 77 deletions

File tree

‎libraries/FFMpeg/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<properties>
1414
<maven.compiler.debug>true</maven.compiler.debug>
1515
<bridj.version>0.4-SNAPSHOT</bridj.version>
16-
<jnaerator.version>0.9.7</jnaerator.version>
16+
<jnaerator.version>0.9.8-SNAPSHOT</jnaerator.version>
1717
</properties>
1818

1919
<dependencies>

‎libraries/Mono/Mono4Java/pom.xml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@
2424
<version>${jnaerator.version}</version>
2525
<scope>compile</scope>
2626
</dependency>
27+
28+
<dependency>
29+
<groupId>com.nativelibs4java</groupId>
30+
<artifactId>bridj</artifactId>
31+
<version>${nl4j-runtime.version}</version>
32+
<scope>compile</scope>
33+
</dependency>
2734

2835
</dependencies>
2936

@@ -33,7 +40,7 @@
3340
<plugin>
3441
<groupId>com.jnaerator</groupId>
3542
<artifactId>maven-jnaerator-plugin</artifactId>
36-
<version>${jnaerator.version}</version>
43+
<version>0.9.8-SNAPSHOT</version> <!-- ${jnaerator.version} -->
3744
<configuration>
3845
<javaOutputDirectory>src/main/java</javaOutputDirectory>
3946
</configuration>

‎libraries/Mono/Mono4Java/src/main/jnaerator/Mono.MacOSX.jnaerator‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"$(DIR)/Mono.base.jnaerator"
22

3-
"-I/Library/Frameworks/Mono.framework/Headers/mono-1.0"
4-
"-I/Library/Frameworks/Mono.framework/Headers/glib-2.0"
3+
"-I/Library/Frameworks/Mono.framework/Headers/mono-2.0"
4+
//"-I/Library/Frameworks/Mono.framework/Headers/glib-2.0"
55

6-
"/Library/Frameworks/Mono.framework/Headers/mono-1.0/mono"
6+
"/Library/Frameworks/Mono.framework/Headers/mono-2.0/mono"
77

‎libraries/Mono/Mono4Java/src/main/jnaerator/config.jnaerator‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66

77
-noJar -noComp
88
//-o "$(DIR)/../../../target/generated-sources/java"
9+
-o "$(DIR)/../../../src/main/java"
910

1011
-choicesOut "$(DIR)/Mono.choices"

‎libraries/Parent/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<properties>
1212
<scala.version>2.8.0</scala.version>
1313
<rococoa.version>0.5.1-NL4J</rococoa.version>
14-
<jnaerator.version>0.9.7</jnaerator.version>
14+
<jnaerator.version>0.9.8-SNAPSHOT</jnaerator.version>
1515
<nativelibs4java.version>1.3-SNAPSHOT</nativelibs4java.version>
1616
<opencl4java.version>1.0-SNAPSHOT</opencl4java.version>
1717
<nl4j-runtime.version>0.4-SNAPSHOT</nl4j-runtime.version>

‎libraries/jnaerator/anarres/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<groupId>com.jnaerator</groupId>
3434
<artifactId>jnaerator-parent</artifactId>
35-
<version>0.9.7</version>
35+
<version>0.9.8-SNAPSHOT</version>
3636
<relativePath>../parent</relativePath>
3737
</parent>
3838

‎libraries/jnaerator/ecj/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<groupId>com.jnaerator</groupId>
3434
<artifactId>jnaerator-parent</artifactId>
35-
<version>0.9.7</version>
35+
<version>0.9.8-SNAPSHOT</version>
3636
<relativePath>../parent</relativePath>
3737
</parent>
3838

‎libraries/jnaerator/jna-jnaerator/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<parent>
2828
<groupId>com.jnaerator</groupId>
2929
<artifactId>jnaerator-parent</artifactId>
30-
<version>0.9.7</version>
30+
<version>0.9.8-SNAPSHOT</version>
3131
<relativePath>../parent</relativePath>
3232
</parent>
3333

‎libraries/jnaerator/jnaerator-parser/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<artifactId>jnaerator-parser</artifactId>
77
<name>JNAerator Parser</name>
88
<url>http://code.google.com/p/jnaerator/</url>
9-
<version>0.9.7</version>
9+
<version>0.9.8-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<dependencies>
@@ -37,7 +37,7 @@
3737
<parent>
3838
<groupId>com.jnaerator</groupId>
3939
<artifactId>jnaerator-parent</artifactId>
40-
<version>0.9.7</version>
40+
<version>0.9.8-SNAPSHOT</version>
4141
<relativePath>../parent</relativePath>
4242
</parent>
4343

‎libraries/jnaerator/jnaerator-parser/src/main/java/com/ochafik/lang/jnaerator/parser/ElementsHelper.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,10 @@ public static SimpleTypeRef typeRef(Identifier name) {
196196
}
197197
public static Statement stat(Declaration d) {
198198
return d;//new Statement.DeclarationStatement(d);
199+
}
200+
public static Statement tryRethrow(Statement st) {
201+
String exName = "$ex$";
202+
return new Try(st, null, new Catch(new VariablesDeclaration(typeRef(Throwable.class), new Declarator.DirectDeclarator(exName)), new Throw(new New(typeRef(RuntimeException.class), varRef(exName)))));
199203
}
200204
public static Statement stat(Expression x) {
201205
return new ExpressionStatement(x);

0 commit comments

Comments
 (0)