jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-04-24 23:07:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Berry rule engine fix array index (#18123)

Browse Source
This commit is contained in:
s-hadinger 2023-03-05 23:35:16 +02:00 committed by GitHub
parent eab1abadc0
commit af8dbe8724
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/libesp32/berry_tasmota/src/embedded/rule_matcher.be
View File

@ -71,16 +71,16 @@ m = tasmota.Rule_Matcher.parse("AA#?#CC=2")
assert(m.match({'aa':1}) == nil)
assert(m.match({'aa':{'bb':{'cc':2}}}) == 2)
m = tasmota.Rule_Matcher.parse("AA#Power[0]")
assert(m.match({'aa':{'power':[0.5,1.5,2.5]}}) == 0.5)
m = tasmota.Rule_Matcher.parse("AA#Power[1]")
assert(m.match({'aa':{'power':[0.5,1.5,2.5]}}) == 1.5)
assert(m.match({'aa':{'power':[0.5,1.5,2.5]}}) == 0.5)
m = tasmota.Rule_Matcher.parse("AA#Power[2]")
assert(m.match({'aa':{'power':[0.5,1.5,2.5]}}) == 2.5)
assert(m.match({'aa':{'power':[0.5,1.5,2.5]}}) == 1.5)
m = tasmota.Rule_Matcher.parse("AA#Power[3]")
assert(m.match({'aa':{'power':[0.5,1.5,2.5]}}) == 2.5)
m = tasmota.Rule_Matcher.parse("AA#Power[4]")
assert(m.match({'aa':{'power':[0.5,1.5,2.5]}}) == nil)
m = tasmota.Rule_Matcher.parse("AA#Power[0]>1")
m = tasmota.Rule_Matcher.parse("AA#Power[1]>1")
assert(m.match({'aa':{'power':[0.5,1.5,2.5]}}) == nil)
assert(m.match({'aa':{'power':[1.2,1.5,2.5]}}) == 1.2)
@ -164,8 +164,9 @@ class Rule_Matcher
def match(val)
if val == nil return nil end # safeguard
if !isinstance(val, list) return val end # ignore index if not a list
if self.index >= size(val) return nil end # out of bounds
return val[self.index]
if self.index <= 0 return nil end # out of bounds
if self.index > size(val) return nil end # out of bounds
return val[self.index - 1]
end
def tostring()

32
lib/libesp32/berry_tasmota/src/solidify/solidified_rule_matcher.h
View File

@ -515,12 +515,14 @@ be_local_closure(Rule_Matcher_Array_match, /* name */
0, /* has sup protos */
NULL, /* no sub protos */
1, /* has constants */
( &(const bvalue[ 1]) { /* constants */
( &(const bvalue[ 3]) { /* constants */
/* K0 */ be_nested_str(index),
/* K1 */ be_const_int(0),
/* K2 */ be_const_int(1),
}),
&be_const_str_match,
&be_const_str_solidified,
( &(const binstruction[22]) { /* code */
( &(const binstruction[28]) { /* code */
0x4C080000, // 0000 LDNIL R2
0x1C080202, // 0001 EQ R2 R1 R2
0x780A0001, // 0002 JMPF R2 #0005
@ -533,16 +535,22 @@ be_local_closure(Rule_Matcher_Array_match, /* name */
0x740A0000, // 0009 JMPT R2 #000B
0x80040200, // 000A RET 1 R1
0x88080100, // 000B GETMBR R2 R0 K0
0x600C000C, // 000C GETGBL R3 G12
0x5C100200, // 000D MOVE R4 R1
0x7C0C0200, // 000E CALL R3 1
0x28080403, // 000F GE R2 R2 R3
0x780A0001, // 0010 JMPF R2 #0013
0x4C080000, // 0011 LDNIL R2
0x80040400, // 0012 RET 1 R2
0x88080100, // 0013 GETMBR R2 R0 K0
0x94080202, // 0014 GETIDX R2 R1 R2
0x80040400, // 0015 RET 1 R2
0x18080501, // 000C LE R2 R2 K1
0x780A0001, // 000D JMPF R2 #0010
0x4C080000, // 000E LDNIL R2
0x80040400, // 000F RET 1 R2
0x88080100, // 0010 GETMBR R2 R0 K0
0x600C000C, // 0011 GETGBL R3 G12
0x5C100200, // 0012 MOVE R4 R1
0x7C0C0200, // 0013 CALL R3 1
0x24080403, // 0014 GT R2 R2 R3
0x780A0001, // 0015 JMPF R2 #0018
0x4C080000, // 0016 LDNIL R2
0x80040400, // 0017 RET 1 R2
0x88080100, // 0018 GETMBR R2 R0 K0
0x04080502, // 0019 SUB R2 R2 K2
0x94080202, // 001A GETIDX R2 R1 R2
0x80040400, // 001B RET 1 R2
})
)
);