honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Quick fixes for using built in method writes.

This commit is contained in:
Jack Conradson 2016-06-21 12:53:04 -07:00
parent 553214d771
commit 346b1802ee
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EListInit.java
View File

@ -90,7 +90,7 @@ public class EListInit extends AExpression {
for (AExpression value : values) {
writer.dup();
value.write(writer, globals);
writer.invokeInterface(method.owner.type, method.method);
method.write(writer);
writer.pop();
}
}

3
modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EMapInit.java
View File

@ -27,7 +27,6 @@ import org.elasticsearch.painless.Locals;
import org.elasticsearch.painless.Location;
import org.elasticsearch.painless.MethodWriter;
import java.util.Collections;
import java.util.List;
import java.util.Set;
@ -114,7 +113,7 @@ public class EMapInit extends AExpression {
writer.dup();
key.write(writer, globals);
value.write(writer, globals);
writer.invokeInterface(method.owner.type, method.method);
method.write(writer);
writer.pop();
}
}

16
modules/lang-painless/src/test/java/org/elasticsearch/painless/InitializerTests.java
View File

@ -26,6 +26,7 @@ import java.util.Map;
public class InitializerTests extends ScriptTestCase {
@SuppressWarnings({"unchecked", "rawtypes"})
public void testArrayInitializers() {
int[] ints = (int[])exec("new int[] {}");
@ -58,6 +59,7 @@ public class InitializerTests extends ScriptTestCase {
assertEquals("aaaaaa", objects[3]);
}
@SuppressWarnings({"unchecked", "rawtypes"})
public void testListInitializers() {
List list = (List)exec("[]");
@ -84,11 +86,12 @@ public class InitializerTests extends ScriptTestCase {
assertEquals(4, list.size());
assertEquals(new Integer(2), list.get(0));
assertEquals(new ArrayList(), list.get(1));
assertEquals(new ArrayList(), list.get(1));
assertEquals("1aaa", list.get(2));
assertEquals("aaaaaa", list.get(3));
}
@SuppressWarnings({"unchecked", "rawtypes"})
public void testMapInitializers() {
Map map = (Map)exec("[:]");
@ -115,22 +118,23 @@ public class InitializerTests extends ScriptTestCase {
assertEquals("aaaaaa", map.get("1aaa"));
}
@SuppressWarnings({"unchecked", "rawtypes"})
public void testCrazyInitializer() {
Map map = (Map)exec("int y = 2; int z = 3; Map x = [y*z : y + z, 's' : [y, [y : [[z], [], [:]]]], z : [z, 9]]; return x;");
List<Object> list0 = new ArrayList<>();
List list0 = new ArrayList();
list0.add(3);
List<Object> list1 = new ArrayList();
List list1 = new ArrayList();
list1.add(list0);
list1.add(new ArrayList());
list1.add(new HashMap());
Map<Object, Object> map0 = new HashMap<>();
Map map0 = new HashMap();
map0.put(2, list1);
List<Object> list2 = new ArrayList();
List list2 = new ArrayList();
list2.add(2);
list2.add(map0);
List<Object> list3 = new ArrayList<>();
List list3 = new ArrayList();
list3.add(3);
list3.add(9);