diff --git a/src/test/java/com/aparapi/codegen/test/FirstAssignInExpression2Test.java b/src/test/java/com/aparapi/codegen/test/FirstAssignInExpression2Test.java
index d3f55664e5ac2f7599989d4276a95bcd659f7619..3bfdcbb92e6b061d421564d42ede37dc99c7f0f8 100644
--- a/src/test/java/com/aparapi/codegen/test/FirstAssignInExpression2Test.java
+++ b/src/test/java/com/aparapi/codegen/test/FirstAssignInExpression2Test.java
@@ -18,35 +18,36 @@ package com.aparapi.codegen.test;
import org.junit.Test;
public class FirstAssignInExpression2Test extends com.aparapi.codegen.CodeGenJUnitBase {
+
private static final String[] expectedOpenCL = {
- "typedef struct This_s{\n" +
-"\n" +
-" int passid;\n" +
-" }This;\n" +
-" int get_pass_id(This *this){\n" +
-" return this->passid;\n" +
-" }\n" +
-" __kernel void run(\n" +
-" int passid\n" +
-" ){\n" +
-" This thisStruct;\n" +
-" This* this=&thisStruct;\n" +
-" this->passid = passid;\n" +
-" {\n" +
-" int value = 1;\n" +
-" int result=0;\n" +
-" int assignMe=0;\n" +
-" if (true){\n" +
-" result = assignMe = value;\n" +
-" }else{\n" +
-" assignMe =1;\n" +
-" result=2;\n" +
-" }\n" +
-" result++;\n" +
-" return;\n" +
-" }\n" +
-" }\n" +
-" "};
+ "typedef struct This_s{\n"
+ + "\n"
+ + " int passid;\n"
+ + " }This;\n"
+ + " int get_pass_id(This *this){\n"
+ + " return this->passid;\n"
+ + " }\n"
+ + " __kernel void run(\n"
+ + " int passid\n"
+ + " ){\n"
+ + " This thisStruct;\n"
+ + " This* this=&thisStruct;\n"
+ + " this->passid = passid;\n"
+ + " {\n"
+ + " int value = 1;\n"
+ + " int result=0;\n"
+ + " int assignMe=0;\n"
+ + " if (true){\n"
+ + " result = assignMe = value;\n"
+ + " }else{\n"
+ + " assignMe =1;\n"
+ + " result=2;\n"
+ + " }\n"
+ + " result++;\n"
+ + " return;\n"
+ + " }\n"
+ + " }\n"
+ + " "};
private static final Class<? extends com.aparapi.internal.exception.AparapiException> expectedException = null;
@Test
diff --git a/src/test/java/com/aparapi/codegen/test/NonNullCheckTest.java b/src/test/java/com/aparapi/codegen/test/NonNullCheckTest.java
index cbd60087c591c88a09d27bc156b51e3e63c78e57..4c663b20097aa2b2150826b94b60bf58eb75c8eb 100644
--- a/src/test/java/com/aparapi/codegen/test/NonNullCheckTest.java
+++ b/src/test/java/com/aparapi/codegen/test/NonNullCheckTest.java
@@ -18,31 +18,32 @@ package com.aparapi.codegen.test;
import org.junit.Test;
public class NonNullCheckTest extends com.aparapi.codegen.CodeGenJUnitBase {
+
private static final String[] expectedOpenCL = {
- "typedef struct This_s{\n" +
-" __global int *ints;\n" +
-" int passid;\n" +
-" }This;\n" +
-" int get_pass_id(This *this){\n" +
-" return this->passid;\n" +
-" }\n" +
-"\n" +
-" __kernel void run(\n" +
-" __global int *ints,\n" +
-" int passid\n" +
-" ){\n" +
-" This thisStruct;\n" +
-" This* this=&thisStruct;\n" +
-" this->ints = ints;\n" +
-" this->passid = passid;\n" +
-" {\n" +
-" if (this->ints != NULL){\n" +
-" int value = this->ints[0];\n" +
-" }\n" +
-" return;\n" +
-" }\n" +
-" }\n" +
-" "};
+ "typedef struct This_s{\n"
+ + " __global int *ints;\n"
+ + " int passid;\n"
+ + " }This;\n"
+ + " int get_pass_id(This *this){\n"
+ + " return this->passid;\n"
+ + " }\n"
+ + "\n"
+ + " __kernel void run(\n"
+ + " __global int *ints,\n"
+ + " int passid\n"
+ + " ){\n"
+ + " This thisStruct;\n"
+ + " This* this=&thisStruct;\n"
+ + " this->ints = ints;\n"
+ + " this->passid = passid;\n"
+ + " {\n"
+ + " if (this->ints != NULL){\n"
+ + " int value = this->ints[0];\n"
+ + " }\n"
+ + " return;\n"
+ + " }\n"
+ + " }\n"
+ + " "};
private static final Class<? extends com.aparapi.internal.exception.AparapiException> expectedException = null;
@Test
diff --git a/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberCallTest.java b/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberCallTest.java
index 8392894551004c5890ce59ee1be92a1dfb1250f1..65bde86df46867b56a3ac236c37a5257eb5ecc7f 100644
--- a/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberCallTest.java
+++ b/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberCallTest.java
@@ -18,49 +18,47 @@ package com.aparapi.codegen.test;
import org.junit.Test;
public class ObjectArrayMemberCallTest extends com.aparapi.codegen.CodeGenJUnitBase {
+
private static final String[] expectedOpenCL = {
- "typedef struct com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA_s{\n" +
-" int mem;\n" +
-"\n" +
-" } com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA;\n" +
-"\n" +
-" typedef struct This_s{\n" +
-" __global com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA *dummy;\n" +
-" int passid;\n" +
-" }This;\n" +
-" int get_pass_id(This *this){\n" +
-" return this->passid;\n" +
-" }\n" +
-"\n" +
-" int com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__getMem( __global com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA *this){\n" +
-" return(this->mem);\n" +
-" }\n" +
-" int com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__addEmUp( __global com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA *this, int x, int y){\n" +
-" return((x + y));\n" +
-" }\n" +
-" int com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__addEmUpPlusOne( __global com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA *this, int x, int y){\n" +
-" return(((com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__addEmUp(this, x, y) + 1) + com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__getMem(this)));\n" +
-" }\n" +
-" int com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__addToMem( __global com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA *this, int x){\n" +
-" return((x + this->mem));\n" +
-" }\n" +
-" __kernel void run(\n" +
-" __global com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA *dummy,\n" +
-" int passid\n" +
-" ){\n" +
-" This thisStruct;\n" +
-" This* this=&thisStruct;\n" +
-" this->dummy = dummy;\n" +
-" this->passid = passid;\n" +
-" {\n" +
-" int myId = get_global_id(0);\n" +
-" this->dummy[myId].mem=com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__addEmUp( &(this->dummy[myId]), this->dummy[myId].mem, 2);\n" +
-" int tmp = com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__addToMem( &(this->dummy[myId]), 2);\n" +
-" int tmp2 = com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__addEmUpPlusOne( &(this->dummy[myId]), 2, tmp);\n" +
-" return;\n" +
-" }\n" +
-" }\n" +
-" "};
+ "typedef struct com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA_s{\n"
+ + " int mem;\n"
+ + " \n"
+ + "} com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA;\n"
+ + "typedef struct This_s{\n"
+ + " __global com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA *dummy;\n"
+ + " int passid;\n"
+ + "}This;\n"
+ + "int get_pass_id(This *this){\n"
+ + " return this->passid;\n"
+ + "}\n"
+ + "int com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__getMem(__global com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA *this){\n"
+ + " return this->mem;\n"
+ + "}\n"
+ + "int com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__addEmUp(__global com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA *this, int x, int y){\n"
+ + " return((x + y));\n"
+ + "}\n"
+ + "int com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__addEmUpPlusOne(__global com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA *this, int x, int y){\n"
+ + " return(((com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__addEmUp(this, x, y) + 1) + com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__getMem(this)));\n"
+ + "}\n"
+ + "int com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__addToMem(__global com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA *this, int x){\n"
+ + " return((x + this->mem));\n"
+ + "}\n"
+ + "__kernel void run(\n"
+ + " __global com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA *dummy, \n"
+ + " int passid\n"
+ + "){\n"
+ + " This thisStruct;\n"
+ + " This* this=&thisStruct;\n"
+ + " this->dummy = dummy;\n"
+ + " this->passid = passid;\n"
+ + " {\n"
+ + " int myId = get_global_id(0);\n"
+ + " this->dummy[myId].mem=com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__addEmUp( &(this->dummy[myId]), this->dummy[myId].mem, 2);\n"
+ + " int tmp = com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__addToMem( &(this->dummy[myId]), 2);\n"
+ + " int tmp2 = com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__addEmUpPlusOne( &(this->dummy[myId]), 2, tmp);\n"
+ + " return;\n"
+ + " }\n"
+ + "}"};
private static final Class<? extends com.aparapi.internal.exception.AparapiException> expectedException = null;
@Test
diff --git a/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberGetterSetterTest.java b/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberGetterSetterTest.java
index 329a88015b7a9a7e35714a6c498de92ac6b73a91..554829d9e2cd6a175e28d135631ed0925aa4f52c 100644
--- a/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberGetterSetterTest.java
+++ b/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberGetterSetterTest.java
@@ -18,107 +18,105 @@ package com.aparapi.codegen.test;
import org.junit.Test;
public class ObjectArrayMemberGetterSetterTest extends com.aparapi.codegen.CodeGenJUnitBase {
+
private static final String[] expectedOpenCL = {
- "typedef struct com_aparapi_codegen_test_TheOtherOne_s{\n" +
-" int mem;\n" +
-"\n" +
-" } com_aparapi_codegen_test_TheOtherOne;\n" +
-"\n" +
-" typedef struct com_aparapi_codegen_test_DummyOOA_s{\n" +
-" long longField;\n" +
-" float floatField;\n" +
-" int mem;\n" +
-" char boolField;\n" +
-" char _pad_17;\n" +
-" char _pad_18;\n" +
-" char _pad_19;\n" +
-" char _pad_20;\n" +
-" char _pad_21;\n" +
-" char _pad_22;\n" +
-" char _pad_23;\n" +
-"\n" +
-" } com_aparapi_codegen_test_DummyOOA;\n" +
-"\n" +
-" typedef struct This_s{\n" +
-" int something;\n" +
-" __global com_aparapi_codegen_test_DummyOOA *dummy;\n" +
-" __global com_aparapi_codegen_test_TheOtherOne *other;\n" +
-" __global int *out;\n" +
-" int passid;\n" +
-" }This;\n" +
-" int get_pass_id(This *this){\n" +
-" return this->passid;\n" +
-" }\n" +
-"\n" +
-" void com_aparapi_codegen_test_DummyOOA__setBoolField( __global com_aparapi_codegen_test_DummyOOA *this, char x){\n" +
-" this->boolField=x;\n" +
-" return;\n" +
-" }\n" +
-" char com_aparapi_codegen_test_DummyOOA__isBoolField( __global com_aparapi_codegen_test_DummyOOA *this){\n" +
-" return(this->boolField);\n" +
-" }\n" +
-" char com_aparapi_codegen_test_DummyOOA__getBoolField( __global com_aparapi_codegen_test_DummyOOA *this){\n" +
-" return(this->boolField);\n" +
-" }\n" +
-" void com_aparapi_codegen_test_DummyOOA__setFloatField( __global com_aparapi_codegen_test_DummyOOA *this, float x){\n" +
-" this->floatField=x;\n" +
-" return;\n" +
-" }\n" +
-" float com_aparapi_codegen_test_DummyOOA__getFloatField( __global com_aparapi_codegen_test_DummyOOA *this){\n" +
-" return(this->floatField);\n" +
-" }\n" +
-" void com_aparapi_codegen_test_DummyOOA__setLongField( __global com_aparapi_codegen_test_DummyOOA *this, long x){\n" +
-" this->longField=x;\n" +
-" return;\n" +
-" }\n" +
-" long com_aparapi_codegen_test_DummyOOA__getLongField( __global com_aparapi_codegen_test_DummyOOA *this){\n" +
-" return(this->longField);\n" +
-" }\n" +
-" void com_aparapi_codegen_test_TheOtherOne__setMem( __global com_aparapi_codegen_test_TheOtherOne *this, int x){\n" +
-" this->mem=x;\n" +
-" return;\n" +
-" }\n" +
-" int com_aparapi_codegen_test_ObjectArrayMemberGetterSetter__getSomething(This *this){\n" +
-" return(this->something);\n" +
-" }\n" +
-" int com_aparapi_codegen_test_TheOtherOne__getMem( __global com_aparapi_codegen_test_TheOtherOne *this){\n" +
-" return(this->mem);\n" +
-" }\n" +
-" void com_aparapi_codegen_test_DummyOOA__setMem( __global com_aparapi_codegen_test_DummyOOA *this, int x){\n" +
-" this->mem=x;\n" +
-" return;\n" +
-" }\n" +
-" int com_aparapi_codegen_test_DummyOOA__getMem( __global com_aparapi_codegen_test_DummyOOA *this){\n" +
-" return(this->mem);\n" +
-" }\n" +
-" __kernel void run(\n" +
-" int something,\n" +
-" __global com_aparapi_codegen_test_DummyOOA *dummy,\n" +
-" __global com_aparapi_codegen_test_TheOtherOne *other,\n" +
-" __global int *out,\n" +
-" int passid\n" +
-" ){\n" +
-" This thisStruct;\n" +
-" This* this=&thisStruct;\n" +
-" this->something = something;\n" +
-" this->dummy = dummy;\n" +
-" this->other = other;\n" +
-" this->out = out;\n" +
-" this->passid = passid;\n" +
-" {\n" +
-" int myId = get_global_id(0);\n" +
-" int tmp = com_aparapi_codegen_test_DummyOOA__getMem( &(this->dummy[myId]));\n" +
-" com_aparapi_codegen_test_DummyOOA__setMem( &(this->dummy[myId]), (com_aparapi_codegen_test_DummyOOA__getMem( &(this->dummy[myId])) + 2));\n" +
-" com_aparapi_codegen_test_DummyOOA__setMem( &(this->dummy[myId]), (com_aparapi_codegen_test_TheOtherOne__getMem( &(this->other[myId])) + com_aparapi_codegen_test_ObjectArrayMemberGetterSetter__getSomething(this)));\n" +
-" com_aparapi_codegen_test_TheOtherOne__setMem( &(this->other[myId]), (com_aparapi_codegen_test_TheOtherOne__getMem( &(this->other[myId])) + com_aparapi_codegen_test_ObjectArrayMemberGetterSetter__getSomething(this)));\n" +
-" com_aparapi_codegen_test_DummyOOA__setLongField( &(this->dummy[myId]), (com_aparapi_codegen_test_DummyOOA__getLongField( &(this->dummy[myId])) + 2L));\n" +
-" com_aparapi_codegen_test_DummyOOA__setFloatField( &(this->dummy[myId]), (com_aparapi_codegen_test_DummyOOA__getFloatField( &(this->dummy[myId])) + 2.0f));\n" +
-" com_aparapi_codegen_test_DummyOOA__setBoolField( &(this->dummy[myId]), (com_aparapi_codegen_test_DummyOOA__getBoolField( &(this->dummy[myId])) | com_aparapi_codegen_test_DummyOOA__isBoolField( &(this->dummy[myId]))));\n" +
-" this->out[myId] = com_aparapi_codegen_test_ObjectArrayMemberGetterSetter__getSomething(this);\n" +
-" return;\n" +
-" }\n" +
-" }\n" +
-" "};
+ "typedef struct com_aparapi_codegen_test_DummyOOA_s{\n"
+ + " long longField;\n"
+ + " float floatField;\n"
+ + " int mem;\n"
+ + " char boolField;\n"
+ + " char _pad_17;\n"
+ + " char _pad_18;\n"
+ + " char _pad_19;\n"
+ + " char _pad_20;\n"
+ + " char _pad_21;\n"
+ + " char _pad_22;\n"
+ + " char _pad_23;\n"
+ + " \n"
+ + "} com_aparapi_codegen_test_DummyOOA;\n"
+ + "\n"
+ + "typedef struct com_aparapi_codegen_test_TheOtherOne_s{\n"
+ + " int mem;\n"
+ + " \n"
+ + "} com_aparapi_codegen_test_TheOtherOne;\n"
+ + "typedef struct This_s{\n"
+ + " int something;\n"
+ + " __global com_aparapi_codegen_test_DummyOOA *dummy;\n"
+ + " __global com_aparapi_codegen_test_TheOtherOne *other;\n"
+ + " __global int *out;\n"
+ + " int passid;\n"
+ + "}This;\n"
+ + "int get_pass_id(This *this){\n"
+ + " return this->passid;\n"
+ + "}\n"
+ + "void com_aparapi_codegen_test_DummyOOA__setBoolField(__global com_aparapi_codegen_test_DummyOOA *this, char x){\n"
+ + " this->boolField=x;\n"
+ + " return;\n"
+ + "}\n"
+ + "char com_aparapi_codegen_test_DummyOOA__isBoolField(__global com_aparapi_codegen_test_DummyOOA *this){\n"
+ + " return this->boolField;\n"
+ + "}\n"
+ + "char com_aparapi_codegen_test_DummyOOA__getBoolField(__global com_aparapi_codegen_test_DummyOOA *this){\n"
+ + " return this->boolField;\n"
+ + "}\n"
+ + "void com_aparapi_codegen_test_DummyOOA__setFloatField(__global com_aparapi_codegen_test_DummyOOA *this, float x){\n"
+ + " this->floatField=x;\n"
+ + " return;\n"
+ + "}\n"
+ + "float com_aparapi_codegen_test_DummyOOA__getFloatField(__global com_aparapi_codegen_test_DummyOOA *this){\n"
+ + " return this->floatField;\n"
+ + "}\n"
+ + "void com_aparapi_codegen_test_DummyOOA__setLongField(__global com_aparapi_codegen_test_DummyOOA *this, long x){\n"
+ + " this->longField=x;\n"
+ + " return;\n"
+ + "}\n"
+ + "long com_aparapi_codegen_test_DummyOOA__getLongField(__global com_aparapi_codegen_test_DummyOOA *this){\n"
+ + " return this->longField;\n"
+ + "}\n"
+ + "void com_aparapi_codegen_test_TheOtherOne__setMem(__global com_aparapi_codegen_test_TheOtherOne *this, int x){\n"
+ + " this->mem=x;\n"
+ + " return;\n"
+ + "}\n"
+ + "int com_aparapi_codegen_test_ObjectArrayMemberGetterSetter__getSomething(This *this){\n"
+ + " return(this->something);\n"
+ + "}\n"
+ + "int com_aparapi_codegen_test_TheOtherOne__getMem(__global com_aparapi_codegen_test_TheOtherOne *this){\n"
+ + " return this->mem;\n"
+ + "}\n"
+ + "void com_aparapi_codegen_test_DummyOOA__setMem(__global com_aparapi_codegen_test_DummyOOA *this, int x){\n"
+ + " this->mem=x;\n"
+ + " return;\n"
+ + "}\n"
+ + "int com_aparapi_codegen_test_DummyOOA__getMem(__global com_aparapi_codegen_test_DummyOOA *this){\n"
+ + " return this->mem;\n"
+ + "}\n"
+ + "__kernel void run(\n"
+ + " int something, \n"
+ + " __global com_aparapi_codegen_test_DummyOOA *dummy, \n"
+ + " __global com_aparapi_codegen_test_TheOtherOne *other, \n"
+ + " __global int *out, \n"
+ + " int passid\n"
+ + "){\n"
+ + " This thisStruct;\n"
+ + " This* this=&thisStruct;\n"
+ + " this->something = something;\n"
+ + " this->dummy = dummy;\n"
+ + " this->other = other;\n"
+ + " this->out = out;\n"
+ + " this->passid = passid;\n"
+ + " {\n"
+ + " int myId = get_global_id(0);\n"
+ + " int tmp = com_aparapi_codegen_test_DummyOOA__getMem( &(this->dummy[myId]));\n"
+ + " com_aparapi_codegen_test_DummyOOA__setMem( &(this->dummy[myId]), (com_aparapi_codegen_test_DummyOOA__getMem( &(this->dummy[myId])) + 2));\n"
+ + " com_aparapi_codegen_test_DummyOOA__setMem( &(this->dummy[myId]), (com_aparapi_codegen_test_TheOtherOne__getMem( &(this->other[myId])) + com_aparapi_codegen_test_ObjectArrayMemberGetterSetter__getSomething(this)));\n"
+ + " com_aparapi_codegen_test_TheOtherOne__setMem( &(this->other[myId]), (com_aparapi_codegen_test_TheOtherOne__getMem( &(this->other[myId])) + com_aparapi_codegen_test_ObjectArrayMemberGetterSetter__getSomething(this)));\n"
+ + " com_aparapi_codegen_test_DummyOOA__setLongField( &(this->dummy[myId]), (com_aparapi_codegen_test_DummyOOA__getLongField( &(this->dummy[myId])) + 2L));\n"
+ + " com_aparapi_codegen_test_DummyOOA__setFloatField( &(this->dummy[myId]), (com_aparapi_codegen_test_DummyOOA__getFloatField( &(this->dummy[myId])) + 2.0f));\n"
+ + " com_aparapi_codegen_test_DummyOOA__setBoolField( &(this->dummy[myId]), (com_aparapi_codegen_test_DummyOOA__getBoolField( &(this->dummy[myId])) | com_aparapi_codegen_test_DummyOOA__isBoolField( &(this->dummy[myId]))));\n"
+ + " this->out[myId] = com_aparapi_codegen_test_ObjectArrayMemberGetterSetter__getSomething(this);\n"
+ + " return;\n"
+ + " }\n"
+ + "}"};
private static final Class<? extends com.aparapi.internal.exception.AparapiException> expectedException = null;
@Test
diff --git a/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberHierarchyTest.java b/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberHierarchyTest.java
index 5080332e715a8c50f3e956c499f6b9d988f257cd..375ed62b0bb88ee23a998bf6332ee1eabc4bd974 100644
--- a/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberHierarchyTest.java
+++ b/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberHierarchyTest.java
@@ -18,50 +18,48 @@ package com.aparapi.codegen.test;
import org.junit.Test;
public class ObjectArrayMemberHierarchyTest extends com.aparapi.codegen.CodeGenJUnitBase {
+
private static final String[] expectedOpenCL = {
- "typedef struct com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyOOA_s{\n" +
-" float floatField;\n" +
-" int intField;\n" +
-"\n" +
-" } com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyOOA;\n" +
-"\n" +
-" typedef struct This_s{\n" +
-" int something;\n" +
-" __global com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyOOA *dummy;\n" +
-" int passid;\n" +
-" }This;\n" +
-" int get_pass_id(This *this){\n" +
-" return this->passid;\n" +
-" }\n" +
-"\n" +
-" void com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyOOA__setFloatField( __global com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyOOA *this, float x){\n" +
-" this->floatField=x;\n" +
-" return;\n" +
-" }\n" +
-" int com_aparapi_codegen_test_ObjectArrayMemberHierarchy__getSomething(This *this){\n" +
-" return(this->something);\n" +
-" }\n" +
-" int com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyParent__getIntField( __global com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyOOA *this){\n" +
-" return(this->intField);\n" +
-" }\n" +
-" __kernel void run(\n" +
-" int something,\n" +
-" __global com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyOOA *dummy,\n" +
-" int passid\n" +
-" ){\n" +
-" This thisStruct;\n" +
-" This* this=&thisStruct;\n" +
-" this->something = something;\n" +
-" this->dummy = dummy;\n" +
-" this->passid = passid;\n" +
-" {\n" +
-" int myId = get_global_id(0);\n" +
-" this->dummy[myId].intField=(com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyParent__getIntField( &(this->dummy[myId])) + 2) + com_aparapi_codegen_test_ObjectArrayMemberHierarchy__getSomething(this);\n" +
-" com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyOOA__setFloatField( &(this->dummy[myId]), (this->dummy[myId].floatField + 2.0f));\n" +
-" return;\n" +
-" }\n" +
-" }\n" +
-" "};
+ "typedef struct com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyOOA_s{\n"
+ + " float floatField;\n"
+ + " int intField;\n"
+ + " \n"
+ + "} com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyOOA;\n"
+ + "typedef struct This_s{\n"
+ + " int something;\n"
+ + " __global com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyOOA *dummy;\n"
+ + " int passid;\n"
+ + "}This;\n"
+ + "int get_pass_id(This *this){\n"
+ + " return this->passid;\n"
+ + "}\n"
+ + "void com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyOOA__setFloatField(__global com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyOOA *this, float x){\n"
+ + " this->floatField=x;\n"
+ + " return;\n"
+ + "}\n"
+ + "int com_aparapi_codegen_test_ObjectArrayMemberHierarchy__getSomething(This *this){\n"
+ + " return(this->something);\n"
+ + "}\n"
+ + "int com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyParent__getIntField(__global com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyOOA *this){\n"
+ + " return this->intField;\n"
+ + "}\n"
+ + "__kernel void run(\n"
+ + " int something, \n"
+ + " __global com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyOOA *dummy, \n"
+ + " int passid\n"
+ + "){\n"
+ + " This thisStruct;\n"
+ + " This* this=&thisStruct;\n"
+ + " this->something = something;\n"
+ + " this->dummy = dummy;\n"
+ + " this->passid = passid;\n"
+ + " {\n"
+ + " int myId = get_global_id(0);\n"
+ + " this->dummy[myId].intField=(com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyParent__getIntField( &(this->dummy[myId])) + 2) + com_aparapi_codegen_test_ObjectArrayMemberHierarchy__getSomething(this);\n"
+ + " com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyOOA__setFloatField( &(this->dummy[myId]), (this->dummy[myId].floatField + 2.0f));\n"
+ + " return;\n"
+ + " }\n"
+ + "}"};
private static final Class<? extends com.aparapi.internal.exception.AparapiException> expectedException = null;
@Test
diff --git a/src/test/java/com/aparapi/codegen/test/TernaryNestedTest.java b/src/test/java/com/aparapi/codegen/test/TernaryNestedTest.java
index 2128d5cfd47a7cfa8ec2adec239b08c0b1be5ac5..e766849a1657cdbabf19a3019d235587298a92cc 100644
--- a/src/test/java/com/aparapi/codegen/test/TernaryNestedTest.java
+++ b/src/test/java/com/aparapi/codegen/test/TernaryNestedTest.java
@@ -21,27 +21,25 @@ public class TernaryNestedTest extends com.aparapi.codegen.CodeGenJUnitBase {
private static final String[] expectedOpenCL = {
"typedef struct This_s{\n"
- + " int passid;\n"
- + " }This;\n"
- + " int get_pass_id(This *this){\n"
- + " return this->passid;\n"
- + "\n"
- + " }\n"
- + " __kernel void run(\n"
- + " int passid\n"
- + " ){\n"
- + " This thisStruct;\n"
- + " This* this=&thisStruct;\n"
- + " this->passid = passid;\n"
- + " {\n"
- + " char a = 0;\n"
- + " char b = 0;\n"
- + " char c = 0;\n"
- + " int count = (a!=0)?(b!=0)?1:2:(c!=0)?3:4;\n"
- + " return;\n"
- + " }\n"
- + " }\n"
- + " "};
+ + " int passid;\n"
+ + "}This;\n"
+ + "int get_pass_id(This *this){\n"
+ + " return this->passid;\n"
+ + "}\n"
+ + "__kernel void run(\n"
+ + " int passid\n"
+ + "){\n"
+ + " This thisStruct;\n"
+ + " This* this=&thisStruct;\n"
+ + " this->passid = passid;\n"
+ + " {\n"
+ + " char a = 0;\n"
+ + " char b = 0;\n"
+ + " char c = 0;\n"
+ + " int count = (a!=0)?((b!=0)?1:2):((c!=0)?3:4);\n"
+ + " return;\n"
+ + " }\n"
+ + "}"};
private static final Class<? extends com.aparapi.internal.exception.AparapiException> expectedException = null;
@Test
diff --git a/src/test/java/com/aparapi/codegen/test/TernaryOrTest.java b/src/test/java/com/aparapi/codegen/test/TernaryOrTest.java
index a6584cd2243908757f7db63e63fd76e8d4c61476..32ea3fa8f8d434b0f8a1a00e1f9dbdb68dafc4ed 100644
--- a/src/test/java/com/aparapi/codegen/test/TernaryOrTest.java
+++ b/src/test/java/com/aparapi/codegen/test/TernaryOrTest.java
@@ -20,7 +20,7 @@ import org.junit.Test;
public class TernaryOrTest extends com.aparapi.codegen.CodeGenJUnitBase {
private static final String[] expectedOpenCL = {
- "ypedef struct This_s{\n"
+ "typedef struct This_s{\n"
+ "\n"
+ " int passid;\n"
+ " }This;\n"
diff --git a/src/test/java/com/aparapi/codegen/test/UsesArrayLengthTest.java b/src/test/java/com/aparapi/codegen/test/UsesArrayLengthTest.java
index 2f0e7fa1817fe372f230d2989b00e35cb57aee92..2491a18fdae693f8d382021621e25df3654de8e3 100644
--- a/src/test/java/com/aparapi/codegen/test/UsesArrayLengthTest.java
+++ b/src/test/java/com/aparapi/codegen/test/UsesArrayLengthTest.java
@@ -21,48 +21,46 @@ public class UsesArrayLengthTest extends com.aparapi.codegen.CodeGenJUnitBase {
private static final String[] expectedOpenCL = {
"typedef struct This_s{\n"
- + " __global char *values;\n"
- + " int values__javaArrayLength;\n"
- + " __global char *results;\n"
- + " int results__javaArrayLength;\n"
- + " __global char *results2;\n"
- + " int passid;\n"
- + " }This;\n"
- + " int get_pass_id(This *this){\n"
- + " return this->passid;\n"
- + " }\n"
- + "\n"
- + " char com_aparapi_codegen_test_UsesArrayLength__actuallyDoIt(This *this, int index){\n"
- + " int x = 0;\n"
- + " char y = this->values[(this->values__javaArrayLength - index)];\n"
- + " x = index + this->results__javaArrayLength;\n"
- + " return(((this->results__javaArrayLength - x)>0)?1:0);\n"
- + " }\n"
- + " __kernel void run(\n"
- + " __global char *values,\n"
- + " int values__javaArrayLength,\n"
- + " __global char *results,\n"
- + " int results__javaArrayLength,\n"
- + " __global char *results2,\n"
- + " int passid\n"
- + " ){\n"
- + " This thisStruct;\n"
- + " This* this=&thisStruct;\n"
- + " this->values = values;\n"
- + " this->values__javaArrayLength = values__javaArrayLength;\n"
- + " this->results = results;\n"
- + " this->results__javaArrayLength = results__javaArrayLength;\n"
- + " this->results2 = results2;\n"
- + " this->passid = passid;\n"
- + " {\n"
- + " int myId = 0;\n"
- + " char x = (this->values__javaArrayLength>0)?1:0;\n"
- + " this->results[myId] = x & com_aparapi_codegen_test_UsesArrayLength__actuallyDoIt(this, this->values__javaArrayLength);\n"
- + " this->results2[myId] = (this->results[myId]==0)?1:0;\n"
- + " return;\n"
- + " }\n"
- + " }\n"
- + " "};
+ + " __global char *values;\n"
+ + " int values__javaArrayLength;\n"
+ + " __global char *results;\n"
+ + " int results__javaArrayLength;\n"
+ + " __global char *results2;\n"
+ + " int passid;\n"
+ + "}This;\n"
+ + "int get_pass_id(This *this){\n"
+ + " return this->passid;\n"
+ + "}\n"
+ + "char com_aparapi_codegen_test_UsesArrayLength__actuallyDoIt(This *this, int index){\n"
+ + " int x = 0;\n"
+ + " char y = this->values[(this->values__javaArrayLength - index)];\n"
+ + " x = index + this->results__javaArrayLength;\n"
+ + " return((((this->results__javaArrayLength - x)>0)?1:0));\n"
+ + "}\n"
+ + "__kernel void run(\n"
+ + " __global char *values, \n"
+ + " int values__javaArrayLength, \n"
+ + " __global char *results, \n"
+ + " int results__javaArrayLength, \n"
+ + " __global char *results2, \n"
+ + " int passid\n"
+ + "){\n"
+ + " This thisStruct;\n"
+ + " This* this=&thisStruct;\n"
+ + " this->values = values;\n"
+ + " this->values__javaArrayLength = values__javaArrayLength;\n"
+ + " this->results = results;\n"
+ + " this->results__javaArrayLength = results__javaArrayLength;\n"
+ + " this->results2 = results2;\n"
+ + " this->passid = passid;\n"
+ + " {\n"
+ + " int myId = 0;\n"
+ + " char x = (this->values__javaArrayLength>0)?1:0;\n"
+ + " this->results[myId] = x & com_aparapi_codegen_test_UsesArrayLength__actuallyDoIt(this, this->values__javaArrayLength);\n"
+ + " this->results2[myId] = (this->results[myId]==0)?1:0;\n"
+ + " return;\n"
+ + " }\n"
+ + "}"};
private static final Class<? extends com.aparapi.internal.exception.AparapiException> expectedException = null;
@Test