Skip to content

Commit 2508164

Browse files
ochafikochafik
committed
JNAerator: moving to version 0.9.6-SNAPSHOT
1 parent 4b70fd9 commit 2508164

19 files changed

Lines changed: 50 additions & 28 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.2</bridj.version>
16-
<jnaerator.version>0.9.5</jnaerator.version>
16+
<jnaerator.version>0.9.6-SNAPSHOT</jnaerator.version>
1717
</properties>
1818

1919
<dependencies>

‎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.5</jnaerator.version>
14+
<jnaerator.version>0.9.6-SNAPSHOT</jnaerator.version>
1515
<nativelibs4java.version>1.1-SNAPSHOT</nativelibs4java.version>
1616
<opencl4java.version>1.0-SNAPSHOT</opencl4java.version>
1717
<nl4j-runtime.version>0.2</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.5</version>
35+
<version>0.9.6-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.5</version>
35+
<version>0.9.6-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.5</version>
30+
<version>0.9.6-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.5</version>
9+
<version>0.9.6-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.5</version>
40+
<version>0.9.6-SNAPSHOT</version>
4141
<relativePath>../parent</relativePath>
4242
</parent>
4343

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

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,19 +253,27 @@ public Element getPreviousChild(Element child) {
253253
public static class NewArray extends Expression {
254254
TypeRef type;
255255
List<Expression> dimensions = new ArrayList<Expression>();
256+
List<Expression> initialValues = new ArrayList<Expression>();
256257

257258
public NewArray() {}
258259

259-
public NewArray(TypeRef type, Expression... dimensions) {
260+
public NewArray(TypeRef type, Expression[] dimensions, Expression[] initialValues) {
260261
setType(type);
261262
setDimensions(Arrays.asList(dimensions));
263+
setInitialValues(Arrays.asList(initialValues));
262264
}
263265
public List<Expression> getDimensions() {
264266
return unmodifiableList(dimensions);
265267
}
266268
public void setDimensions(List<Expression> dimensions) {
267269
changeValue(this, this.dimensions, dimensions);
268270
}
271+
public List<Expression> getInitialValues() {
272+
return unmodifiableList(initialValues);
273+
}
274+
public void setInitialValues(List<Expression> initialValues) {
275+
changeValue(this, this.initialValues, initialValues);
276+
}
269277
public TypeRef getType() {
270278
return type;
271279
}
@@ -279,12 +287,18 @@ public void accept(Visitor visitor) {
279287

280288
@Override
281289
public Element getNextChild(Element child) {
282-
return getNextSibling(dimensions, child);
290+
Element e = getNextSibling(dimensions, child);
291+
if (e == null)
292+
e = getNextSibling(initialValues, child);
293+
return e;
283294
}
284295

285296
@Override
286297
public Element getPreviousChild(Element child) {
287-
return getPreviousSibling(dimensions, child);
298+
Element e = getPreviousSibling(dimensions, child);
299+
if (e == null)
300+
e = getPreviousSibling(initialValues, child);
301+
return e;
288302
}
289303

290304
@Override
@@ -293,7 +307,9 @@ public boolean replaceChild(Element child, Element by) {
293307
setType((TypeRef)by);
294308
return true;
295309
}
296-
return replaceChild(dimensions, Expression.class, this, child, by);
310+
return
311+
replaceChild(initialValues, Expression.class, this, child, by) ||
312+
replaceChild(dimensions, Expression.class, this, child, by);
297313
}
298314

299315
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,8 @@ public void visitEmptyDeclaration(EmptyDeclaration e) {
606606
public void visitNewArray(NewArray e) {
607607
expressionPre(e);
608608
append("new ").append(e.getType()).append("[").implode(e.getDimensions(), "][").append("]");
609+
if (e.getDimensions().isEmpty() && !e.getInitialValues().isEmpty())
610+
append("{").implode(e.getInitialValues(), ", ").append("}");
609611
expressionPost(e);
610612
}
611613

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,7 @@ public void visitNewArray(NewArray newArray) {
324324
visitExpression(newArray);
325325
visit(newArray.getType());
326326
visit(newArray.getDimensions());
327+
visit(newArray.getInitialValues());
327328
}
328329

329330
public void visitArrayDeclarator(ArrayDeclarator arrayDeclarator) {

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ This file is part of JNAerator (http://jnaerator.googlecode.com/).
2424
import java.util.List;
2525

2626
public abstract class Statement extends Element {
27-
27+
@Override
28+
public Statement clone() {
29+
return (Statement)super.clone();
30+
}
2831
public static class Throw extends Statement {
2932
Expression expression;
3033
public Expression getExpression() {

0 commit comments

Comments
 (0)