list通过array设置值

baoxingjie · baoxingjie · commit b682a425466f · 2021-08-24T10:46:28.000+08:00
diff --git a/src/main/java/com/ql/util/express/instruction/op/OperatorArray.java b/src/main/java/com/ql/util/express/instruction/op/OperatorArray.java
@@ -28,12 +28,11 @@ public OperateData executeInner(InstructionSetContext context, ArraySwap list) t
 		Object tmpObject = p0.getObject(context);
 
 	    if( tmpObject.getClass().isArray() == false){
-			OperateData p1 = list.get(1);
-			Object property = p1.getObject(context);
-			//支持data.get(0) ->data[0]
+			Object property = list.get(1).getObject(context);
+			//支持data.get(index) ->data[index]
 			if(tmpObject instanceof  List && property instanceof Number) {
-				Object r = ((List<?>) tmpObject).get(((Number) property).intValue());
-				OperateData result = OperateDataCacheManager.fetchOperateData(r, r.getClass());
+				int index = ((Number) property).intValue();
+				OperateData result = OperateDataCacheManager.fetchOperateDataArrayItem((OperateData)p0,index);
 				return result;
 			}
 			//支持data.code -> data['code']
@@ -42,6 +41,7 @@ public OperateData executeInner(InstructionSetContext context, ArraySwap list) t
 				return result;
 			}
 		}
+	    //支持原生Array：data[index]
 	    int index = ((Number)list.get(1).getObject(context)).intValue();		
 	    OperateData result  = OperateDataCacheManager.fetchOperateDataArrayItem((OperateData)p0,index);
 		return result;
diff --git a/src/main/java/com/ql/util/express/instruction/opdata/OperateDataArrayItem.java b/src/main/java/com/ql/util/express/instruction/opdata/OperateDataArrayItem.java
@@ -1,6 +1,7 @@
 package com.ql.util.express.instruction.opdata;
 
 import java.lang.reflect.Array;
+import java.util.List;
 
 import com.ql.util.express.InstructionSetContext;
 import com.ql.util.express.OperateData;
@@ -31,15 +32,23 @@ public Class<?> getType(InstructionSetContext context) throws Exception {
 	}
 	public Object getObjectInner(InstructionSetContext context){
 		try {
-			return Array.get(this.arrayObject.getObject(context),this.index);
+			if(this.arrayObject.getObject(context) instanceof List){
+				return ((List) this.arrayObject.getObject(context)).get(this.index);
+			}else {
+				return Array.get(this.arrayObject.getObject(context), this.index);
+			}
 		} catch (Exception e) {
 			 throw new RuntimeException(e);
 		}
 	}
 
 	public void setObject(InstructionSetContext context, Object value) {
 		try {
-		 Array.set(this.arrayObject.getObject(context), this.index, value);
+			if(this.arrayObject.getObject(context) instanceof List){
+				((List) this.arrayObject.getObject(context)).set(this.index,value);
+			}else {
+				Array.set(this.arrayObject.getObject(context), this.index, value);
+			}
 		} catch (Exception e) {
 			 throw new RuntimeException(e);
 		}
diff --git a/src/test/java/com/ql/util/express/cfuture/ArrayPorpertyMixTest.java b/src/test/java/com/ql/util/express/cfuture/ArrayPorpertyMixTest.java
@@ -17,9 +17,13 @@ public void testRun() throws Exception {
         String tests[] = new String[]{
                 "request['AAAA'][0]['BBBB'][0]",
                 "requestList[0]['AAAA'][0]['BBBB'][0]",
+                "requestList[0]['AAAA'][0]['BBBB'][0]='10';return requestList[0]['AAAA'][0]['BBBB'][0];",
                 "abc = NewList(1,2,3); return abc[1]+abc[2]",
+                "abc = NewList(1,2,3); abc[1]=0;return abc[1]+abc[2]",
                 "abc = NewMap('aa':1,'bb':2); return abc['aa'] + abc.get('bb');",
+                "abc = NewMap('aa':1,'bb':2); abc['aa']='aa';return abc['aa'] + abc.get('bb');",
                 "abc = [1,2,3]; return abc[1]+abc[2];",
+                "abc = [1,2,3]; abc[1]=0;return abc[1]+abc[2];",
         };
 
 
