jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-16 15:26:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Berry fix keys conflict (#23444)

Browse Source
This commit is contained in:
s-hadinger 2025-05-19 10:42:17 +02:00 committed by GitHub
parent 02ce050727
commit e2d30dd64d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 353 additions and 325 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
lib/libesp32/berry_tasmota/src/embedded/sortedmap.be
View File

@ -6,24 +6,24 @@
################################################################################# #################################################################################
#@ solidify:sortedmap #@ solidify:sortedmap
class sortedmap class sortedmap
var data # internal map for storing key-value pairs var _data # internal map for storing key-value pairs
var keys # list for maintaining sorted keys var _keys # list for maintaining sorted keys
# Constructor # Constructor
def init() def init()
self.data = {} self._data = {}
self.keys = [] self._keys = []
end end
# Insert a new key-value pair or update existing value # Insert a new key-value pair or update existing value
def insert(key, value) def insert(key, value)
var is_new = !self.data.contains(key) var is_new = !self._data.contains(key)
self.data[key] = value self._data[key] = value
if is_new if is_new
# Binary search to find insert position to maintain sorted order # Binary search to find insert position to maintain sorted order
var pos = self._find_insert_position(key) var pos = self._find_insert_position(key)
self.keys.insert(pos, key) self._keys.insert(pos, key)
return true return true
end end
return false return false
@ -31,12 +31,12 @@ class sortedmap
# Remove a key-value pair # Remove a key-value pair
def remove(key) def remove(key)
if self.data.contains(key) if self._data.contains(key)
self.data.remove(key) self._data.remove(key)
# Find key position in the list # Find key position in the list
var idx = self.keys.find(key) var idx = self._keys.find(key)
if idx != nil if idx != nil
self.keys.remove(idx) self._keys.remove(idx)
end end
return true return true
end end
@ -45,12 +45,12 @@ class sortedmap
# Get a value by key, with optional default if key doesn't exist # Get a value by key, with optional default if key doesn't exist
def find(key, default) def find(key, default)
return self.data.find(key, default) return self._data.find(key, default)
end end
# Access a value by key # Access a value by key
def item(key) def item(key)
return self.data[key] return self._data[key]
end end
# Set a value by key # Set a value by key
@ -60,22 +60,22 @@ class sortedmap
# Return true if map contains key # Return true if map contains key
def contains(key) def contains(key)
return self.data.contains(key) return self._data.contains(key)
end end
# Return number of key-value pairs # Return number of key-value pairs
def size() def size()
return self.data.size() return self._data.size()
end end
# Return all sorted keys # Return all sorted keys
def get_keys() def get_keys()
return self.keys return self._keys
end end
# Return iterator to keys in sorted order # Return iterator to keys in sorted order
def keys() def keys()
return self.keys.iter() return self._keys.iter()
end end
# String representation # String representation
@ -84,9 +84,9 @@ class sortedmap
var result = "{" var result = "{"
var first = true var first = true
for i : 0..self.keys.size()-1 for i : 0..self._keys.size()-1
var key = self.keys[i] var key = self._keys[i]
var val = self.data[key] var val = self._data[key]
if !first if !first
result += ", " result += ", "
@ -112,13 +112,13 @@ class sortedmap
# Iterator method for 'for x: map' style iteration # Iterator method for 'for x: map' style iteration
def iter() def iter()
return self.data.iter() return self._data.iter()
end end
# Clear all key-value pairs # Clear all key-value pairs
def clear() def clear()
self.data = {} self._data = {}
self.keys = [] self._keys = []
end end
# Remove entries with a specific value # Remove entries with a specific value
@ -126,9 +126,9 @@ class sortedmap
var keys_to_remove = [] var keys_to_remove = []
# First pass: identify all keys with matching values # First pass: identify all keys with matching values
for i : 0..self.keys.size()-1 for i : 0..self._keys.size()-1
var key = self.keys[i] var key = self._keys[i]
if self.data[key] == value if self._data[key] == value
keys_to_remove.push(key) keys_to_remove.push(key)
end end
end end
@ -146,11 +146,11 @@ class sortedmap
# Binary search to find insertion position for a new key # Binary search to find insertion position for a new key
def _find_insert_position(key) def _find_insert_position(key)
var low = 0 var low = 0
var high = self.keys.size() - 1 var high = self._keys.size() - 1
while low <= high while low <= high
var mid = int((low + high) / 2) var mid = int((low + high) / 2)
var mid_key = self.keys[mid] var mid_key = self._keys[mid]
# Compare keys - this is the tricky part since Berry doesn't have # Compare keys - this is the tricky part since Berry doesn't have
# a generic comparison operator for different types # a generic comparison operator for different types
@ -303,4 +303,4 @@ removed = m.remove_by_value(4)
assert(removed == 1, "Expected to remove 1 entry, got " + str(removed)) assert(removed == 1, "Expected to remove 1 entry, got " + str(removed))
assert(m.size() == 0, "Map should be empty") assert(m.size() == 0, "Map should be empty")
-# -#

620
lib/libesp32/berry_tasmota/src/solidify/solidified_sortedmap.h
View File

@ -3,99 +3,35 @@
* Generated code, don't edit * * Generated code, don't edit *
\********************************************************************/ \********************************************************************/
#include "be_constobj.h" #include "be_constobj.h"
// compact class 'sortedmap' ktab size: 22, total: 52 (saved 240 bytes) // compact class 'sortedmap' ktab size: 22, total: 54 (saved 256 bytes)
static const bvalue be_ktab_class_sortedmap[22] = { static const bvalue be_ktab_class_sortedmap[22] = {
/* K0 */ be_const_int(0), /* K0 */ be_nested_str(_data),
/* K1 */ be_nested_str(keys), /* K1 */ be_nested_str(_keys),
/* K2 */ be_nested_str(size), /* K2 */ be_nested_str(insert),
/* K3 */ be_const_int(1), /* K3 */ be_nested_str(string),
/* K4 */ be_nested_str(data), /* K4 */ be_nested_str(_X7B),
/* K5 */ be_nested_str(push), /* K5 */ be_const_int(0),
/* K6 */ be_nested_str(stop_iteration), /* K6 */ be_nested_str(size),
/* K7 */ be_nested_str(remove), /* K7 */ be_const_int(1),
/* K8 */ be_nested_str(insert), /* K8 */ be_nested_str(_X2C_X20),
/* K9 */ be_nested_str(string), /* K9 */ be_nested_str(format),
/* K10 */ be_nested_str(_X7B), /* K10 */ be_nested_str(_X27_X25s_X27_X3A_X20),
/* K11 */ be_nested_str(_X2C_X20), /* K11 */ be_nested_str(_X25s_X3A_X20),
/* K12 */ be_nested_str(format), /* K12 */ be_nested_str(_X27_X25s_X27),
/* K13 */ be_nested_str(_X27_X25s_X27_X3A_X20), /* K13 */ be_nested_str(stop_iteration),
/* K14 */ be_nested_str(_X25s_X3A_X20), /* K14 */ be_nested_str(_X7D),
/* K15 */ be_nested_str(_X27_X25s_X27), /* K15 */ be_const_int(2),
/* K16 */ be_nested_str(_X7D), /* K16 */ be_nested_str(push),
/* K17 */ be_nested_str(iter), /* K17 */ be_nested_str(remove),
/* K18 */ be_nested_str(contains), /* K18 */ be_nested_str(find),
/* K19 */ be_nested_str(_find_insert_position), /* K19 */ be_nested_str(contains),
/* K20 */ be_nested_str(find), /* K20 */ be_nested_str(_find_insert_position),
/* K21 */ be_const_int(2), /* K21 */ be_nested_str(iter),
}; };
extern const bclass be_class_sortedmap; extern const bclass be_class_sortedmap;
/********************************************************************
** Solidified function: remove_by_value
********************************************************************/
be_local_closure(class_sortedmap_remove_by_value, /* name */
be_nested_proto(
9, /* nstack */
2, /* argc */
10, /* varg */
0, /* has upvals */
NULL, /* no upvals */
0, /* has sup protos */
NULL, /* no sub protos */
1, /* has constants */
&be_ktab_class_sortedmap, /* shared constants */
&be_const_str_remove_by_value,
&be_const_str_solidified,
( &(const binstruction[41]) { /* code */
0x60080012, // 0000 GETGBL R2 G18
0x7C080000, // 0001 CALL R2 0
0x600C0010, // 0002 GETGBL R3 G16
0x88100101, // 0003 GETMBR R4 R0 K1
0x8C100902, // 0004 GETMET R4 R4 K2
0x7C100200, // 0005 CALL R4 1
0x04100903, // 0006 SUB R4 R4 K3
0x40120004, // 0007 CONNECT R4 K0 R4
0x7C0C0200, // 0008 CALL R3 1
0xA802000B, // 0009 EXBLK 0 #0016
0x5C100600, // 000A MOVE R4 R3
0x7C100000, // 000B CALL R4 0
0x88140101, // 000C GETMBR R5 R0 K1
0x94140A04, // 000D GETIDX R5 R5 R4
0x88180104, // 000E GETMBR R6 R0 K4
0x94180C05, // 000F GETIDX R6 R6 R5
0x1C180C01, // 0010 EQ R6 R6 R1
0x781A0002, // 0011 JMPF R6 #0015
0x8C180505, // 0012 GETMET R6 R2 K5
0x5C200A00, // 0013 MOVE R8 R5
0x7C180400, // 0014 CALL R6 2
0x7001FFF3, // 0015 JMP #000A
0x580C0006, // 0016 LDCONST R3 K6
0xAC0C0200, // 0017 CATCH R3 1 0
0xB0080000, // 0018 RAISE 2 R0 R0
0x580C0000, // 0019 LDCONST R3 K0
0x60100010, // 001A GETGBL R4 G16
0x5C140400, // 001B MOVE R5 R2
0x7C100200, // 001C CALL R4 1
0xA8020006, // 001D EXBLK 0 #0025
0x5C140800, // 001E MOVE R5 R4
0x7C140000, // 001F CALL R5 0
0x8C180107, // 0020 GETMET R6 R0 K7
0x5C200A00, // 0021 MOVE R8 R5
0x7C180400, // 0022 CALL R6 2
0x000C0703, // 0023 ADD R3 R3 K3
0x7001FFF8, // 0024 JMP #001E
0x58100006, // 0025 LDCONST R4 K6
0xAC100200, // 0026 CATCH R4 1 0
0xB0080000, // 0027 RAISE 2 R0 R0
0x80040600, // 0028 RET 1 R3
})
)
);
/*******************************************************************/
/******************************************************************** /********************************************************************
** Solidified function: clear ** Solidified function: clear
********************************************************************/ ********************************************************************/
@ -115,37 +51,7 @@ be_local_closure(class_sortedmap_clear, /* name */
( &(const binstruction[ 7]) { /* code */ ( &(const binstruction[ 7]) { /* code */
0x60040013, // 0000 GETGBL R1 G19 0x60040013, // 0000 GETGBL R1 G19
0x7C040000, // 0001 CALL R1 0 0x7C040000, // 0001 CALL R1 0
0x90020801, // 0002 SETMBR R0 K4 R1 0x90020001, // 0002 SETMBR R0 K0 R1
0x60040012, // 0003 GETGBL R1 G18
0x7C040000, // 0004 CALL R1 0
0x90020201, // 0005 SETMBR R0 K1 R1
0x80000000, // 0006 RET 0
})
)
);
/*******************************************************************/
/********************************************************************
** Solidified function: init
********************************************************************/
be_local_closure(class_sortedmap_init, /* name */
be_nested_proto(
2, /* nstack */
1, /* argc */
10, /* varg */
0, /* has upvals */
NULL, /* no upvals */
0, /* has sup protos */
NULL, /* no sub protos */
1, /* has constants */
&be_ktab_class_sortedmap, /* shared constants */
&be_const_str_init,
&be_const_str_solidified,
( &(const binstruction[ 7]) { /* code */
0x60040013, // 0000 GETGBL R1 G19
0x7C040000, // 0001 CALL R1 0
0x90020801, // 0002 SETMBR R0 K4 R1
0x60040012, // 0003 GETGBL R1 G18 0x60040012, // 0003 GETGBL R1 G18
0x7C040000, // 0004 CALL R1 0 0x7C040000, // 0004 CALL R1 0
0x90020201, // 0005 SETMBR R0 K1 R1 0x90020201, // 0005 SETMBR R0 K1 R1
@ -173,7 +79,7 @@ be_local_closure(class_sortedmap_setitem, /* name */
&be_const_str_setitem, &be_const_str_setitem,
&be_const_str_solidified, &be_const_str_solidified,
( &(const binstruction[ 5]) { /* code */ ( &(const binstruction[ 5]) { /* code */
0x8C0C0108, // 0000 GETMET R3 R0 K8 0x8C0C0102, // 0000 GETMET R3 R0 K2
0x5C140200, // 0001 MOVE R5 R1 0x5C140200, // 0001 MOVE R5 R1
0x5C180400, // 0002 MOVE R6 R2 0x5C180400, // 0002 MOVE R6 R2
0x7C0C0600, // 0003 CALL R3 3 0x7C0C0600, // 0003 CALL R3 3
@ -201,40 +107,40 @@ be_local_closure(class_sortedmap_tostring, /* name */
&be_const_str_tostring, &be_const_str_tostring,
&be_const_str_solidified, &be_const_str_solidified,
( &(const binstruction[60]) { /* code */ ( &(const binstruction[60]) { /* code */
0xA4061200, // 0000 IMPORT R1 K9 0xA4060600, // 0000 IMPORT R1 K3
0x5808000A, // 0001 LDCONST R2 K10 0x58080004, // 0001 LDCONST R2 K4
0x500C0200, // 0002 LDBOOL R3 1 0 0x500C0200, // 0002 LDBOOL R3 1 0
0x60100010, // 0003 GETGBL R4 G16 0x60100010, // 0003 GETGBL R4 G16
0x88140101, // 0004 GETMBR R5 R0 K1 0x88140101, // 0004 GETMBR R5 R0 K1
0x8C140B02, // 0005 GETMET R5 R5 K2 0x8C140B06, // 0005 GETMET R5 R5 K6
0x7C140200, // 0006 CALL R5 1 0x7C140200, // 0006 CALL R5 1
0x04140B03, // 0007 SUB R5 R5 K3 0x04140B07, // 0007 SUB R5 R5 K7
0x40160005, // 0008 CONNECT R5 K0 R5 0x40160A05, // 0008 CONNECT R5 K5 R5
0x7C100200, // 0009 CALL R4 1 0x7C100200, // 0009 CALL R4 1
0xA802002B, // 000A EXBLK 0 #0037 0xA802002B, // 000A EXBLK 0 #0037
0x5C140800, // 000B MOVE R5 R4 0x5C140800, // 000B MOVE R5 R4
0x7C140000, // 000C CALL R5 0 0x7C140000, // 000C CALL R5 0
0x88180101, // 000D GETMBR R6 R0 K1 0x88180101, // 000D GETMBR R6 R0 K1
0x94180C05, // 000E GETIDX R6 R6 R5 0x94180C05, // 000E GETIDX R6 R6 R5
0x881C0104, // 000F GETMBR R7 R0 K4 0x881C0100, // 000F GETMBR R7 R0 K0
0x941C0E06, // 0010 GETIDX R7 R7 R6 0x941C0E06, // 0010 GETIDX R7 R7 R6
0x5C200600, // 0011 MOVE R8 R3 0x5C200600, // 0011 MOVE R8 R3
0x74220000, // 0012 JMPT R8 #0014 0x74220000, // 0012 JMPT R8 #0014
0x0008050B, // 0013 ADD R2 R2 K11 0x00080508, // 0013 ADD R2 R2 K8
0x500C0000, // 0014 LDBOOL R3 0 0 0x500C0000, // 0014 LDBOOL R3 0 0
0x60200004, // 0015 GETGBL R8 G4 0x60200004, // 0015 GETGBL R8 G4
0x5C240C00, // 0016 MOVE R9 R6 0x5C240C00, // 0016 MOVE R9 R6
0x7C200200, // 0017 CALL R8 1 0x7C200200, // 0017 CALL R8 1
0x1C201109, // 0018 EQ R8 R8 K9 0x1C201103, // 0018 EQ R8 R8 K3
0x78220005, // 0019 JMPF R8 #0020 0x78220005, // 0019 JMPF R8 #0020
0x8C20030C, // 001A GETMET R8 R1 K12 0x8C200309, // 001A GETMET R8 R1 K9
0x5828000D, // 001B LDCONST R10 K13 0x5828000A, // 001B LDCONST R10 K10
0x5C2C0C00, // 001C MOVE R11 R6 0x5C2C0C00, // 001C MOVE R11 R6
0x7C200600, // 001D CALL R8 3 0x7C200600, // 001D CALL R8 3
0x00080408, // 001E ADD R2 R2 R8 0x00080408, // 001E ADD R2 R2 R8
0x70020006, // 001F JMP #0027 0x70020006, // 001F JMP #0027
0x8C20030C, // 0020 GETMET R8 R1 K12 0x8C200309, // 0020 GETMET R8 R1 K9
0x5828000E, // 0021 LDCONST R10 K14 0x5828000B, // 0021 LDCONST R10 K11
0x602C0008, // 0022 GETGBL R11 G8 0x602C0008, // 0022 GETGBL R11 G8
0x5C300C00, // 0023 MOVE R12 R6 0x5C300C00, // 0023 MOVE R12 R6
0x7C2C0200, // 0024 CALL R11 1 0x7C2C0200, // 0024 CALL R11 1
@ -243,10 +149,10 @@ be_local_closure(class_sortedmap_tostring, /* name */
0x60200004, // 0027 GETGBL R8 G4 0x60200004, // 0027 GETGBL R8 G4
0x5C240E00, // 0028 MOVE R9 R7 0x5C240E00, // 0028 MOVE R9 R7
0x7C200200, // 0029 CALL R8 1 0x7C200200, // 0029 CALL R8 1
0x1C201109, // 002A EQ R8 R8 K9 0x1C201103, // 002A EQ R8 R8 K3
0x78220005, // 002B JMPF R8 #0032 0x78220005, // 002B JMPF R8 #0032
0x8C20030C, // 002C GETMET R8 R1 K12 0x8C200309, // 002C GETMET R8 R1 K9
0x5828000F, // 002D LDCONST R10 K15 0x5828000C, // 002D LDCONST R10 K12
0x5C2C0E00, // 002E MOVE R11 R7 0x5C2C0E00, // 002E MOVE R11 R7
0x7C200600, // 002F CALL R8 3 0x7C200600, // 002F CALL R8 3
0x00080408, // 0030 ADD R2 R2 R8 0x00080408, // 0030 ADD R2 R2 R8
@ -256,10 +162,10 @@ be_local_closure(class_sortedmap_tostring, /* name */
0x7C200200, // 0034 CALL R8 1 0x7C200200, // 0034 CALL R8 1
0x00080408, // 0035 ADD R2 R2 R8 0x00080408, // 0035 ADD R2 R2 R8
0x7001FFD3, // 0036 JMP #000B 0x7001FFD3, // 0036 JMP #000B
0x58100006, // 0037 LDCONST R4 K6 0x5810000D, // 0037 LDCONST R4 K13
0xAC100200, // 0038 CATCH R4 1 0 0xAC100200, // 0038 CATCH R4 1 0
0xB0080000, // 0039 RAISE 2 R0 R0 0xB0080000, // 0039 RAISE 2 R0 R0
0x00080510, // 003A ADD R2 R2 K16 0x0008050E, // 003A ADD R2 R2 K14
0x80040400, // 003B RET 1 R2 0x80040400, // 003B RET 1 R2
}) })
) )
@ -284,7 +190,7 @@ be_local_closure(class_sortedmap_item, /* name */
&be_const_str_item, &be_const_str_item,
&be_const_str_solidified, &be_const_str_solidified,
( &(const binstruction[ 3]) { /* code */ ( &(const binstruction[ 3]) { /* code */
0x88080104, // 0000 GETMBR R2 R0 K4 0x88080100, // 0000 GETMBR R2 R0 K0
0x94080401, // 0001 GETIDX R2 R2 R1 0x94080401, // 0001 GETIDX R2 R2 R1
0x80040400, // 0002 RET 1 R2 0x80040400, // 0002 RET 1 R2
}) })
@ -294,12 +200,12 @@ be_local_closure(class_sortedmap_item, /* name */
/******************************************************************** /********************************************************************
** Solidified function: iter ** Solidified function: _find_insert_position
********************************************************************/ ********************************************************************/
be_local_closure(class_sortedmap_iter, /* name */ be_local_closure(class_sortedmap__find_insert_position, /* name */
be_nested_proto( be_nested_proto(
3, /* nstack */ 10, /* nstack */
1, /* argc */ 2, /* argc */
10, /* varg */ 10, /* varg */
0, /* has upvals */ 0, /* has upvals */
NULL, /* no upvals */ NULL, /* no upvals */
@ -307,13 +213,50 @@ be_local_closure(class_sortedmap_iter, /* name */
NULL, /* no sub protos */ NULL, /* no sub protos */
1, /* has constants */ 1, /* has constants */
&be_ktab_class_sortedmap, /* shared constants */ &be_ktab_class_sortedmap, /* shared constants */
&be_const_str_iter, &be_const_str__find_insert_position,
&be_const_str_solidified, &be_const_str_solidified,
( &(const binstruction[ 4]) { /* code */ ( &(const binstruction[41]) { /* code */
0x88040104, // 0000 GETMBR R1 R0 K4 0x58080005, // 0000 LDCONST R2 K5
0x8C040311, // 0001 GETMET R1 R1 K17 0x880C0101, // 0001 GETMBR R3 R0 K1
0x7C040200, // 0002 CALL R1 1 0x8C0C0706, // 0002 GETMET R3 R3 K6
0x80040200, // 0003 RET 1 R1 0x7C0C0200, // 0003 CALL R3 1
0x040C0707, // 0004 SUB R3 R3 K7
0x18100403, // 0005 LE R4 R2 R3
0x78120020, // 0006 JMPF R4 #0028
0x60100009, // 0007 GETGBL R4 G9
0x00140403, // 0008 ADD R5 R2 R3
0x0C140B0F, // 0009 DIV R5 R5 K15
0x7C100200, // 000A CALL R4 1
0x88140101, // 000B GETMBR R5 R0 K1
0x94140A04, // 000C GETIDX R5 R5 R4
0x4C180000, // 000D LDNIL R6
0x601C0004, // 000E GETGBL R7 G4
0x5C200200, // 000F MOVE R8 R1
0x7C1C0200, // 0010 CALL R7 1
0x60200004, // 0011 GETGBL R8 G4
0x5C240A00, // 0012 MOVE R9 R5
0x7C200200, // 0013 CALL R8 1
0x1C1C0E08, // 0014 EQ R7 R7 R8
0x781E0002, // 0015 JMPF R7 #0019
0x241C0205, // 0016 GT R7 R1 R5
0x5C180E00, // 0017 MOVE R6 R7
0x70020007, // 0018 JMP #0021
0x601C0008, // 0019 GETGBL R7 G8
0x5C200200, // 001A MOVE R8 R1
0x7C1C0200, // 001B CALL R7 1
0x60200008, // 001C GETGBL R8 G8
0x5C240A00, // 001D MOVE R9 R5
0x7C200200, // 001E CALL R8 1
0x241C0E08, // 001F GT R7 R7 R8
0x5C180E00, // 0020 MOVE R6 R7
0x781A0002, // 0021 JMPF R6 #0025
0x001C0907, // 0022 ADD R7 R4 K7
0x5C080E00, // 0023 MOVE R2 R7
0x70020001, // 0024 JMP #0027
0x041C0907, // 0025 SUB R7 R4 K7
0x5C0C0E00, // 0026 MOVE R3 R7
0x7001FFDC, // 0027 JMP #0005
0x80040400, // 0028 RET 1 R2
}) })
) )
); );
@ -321,12 +264,12 @@ be_local_closure(class_sortedmap_iter, /* name */
/******************************************************************** /********************************************************************
** Solidified function: insert ** Solidified function: remove_by_value
********************************************************************/ ********************************************************************/
be_local_closure(class_sortedmap_insert, /* name */ be_local_closure(class_sortedmap_remove_by_value, /* name */
be_nested_proto( be_nested_proto(
9, /* nstack */ 9, /* nstack */
3, /* argc */ 2, /* argc */
10, /* varg */ 10, /* varg */
0, /* has upvals */ 0, /* has upvals */
NULL, /* no upvals */ NULL, /* no upvals */
@ -334,58 +277,50 @@ be_local_closure(class_sortedmap_insert, /* name */
NULL, /* no sub protos */ NULL, /* no sub protos */
1, /* has constants */ 1, /* has constants */
&be_ktab_class_sortedmap, /* shared constants */ &be_ktab_class_sortedmap, /* shared constants */
&be_const_str_insert, &be_const_str_remove_by_value,
&be_const_str_solidified, &be_const_str_solidified,
( &(const binstruction[22]) { /* code */ ( &(const binstruction[41]) { /* code */
0x880C0104, // 0000 GETMBR R3 R0 K4 0x60080012, // 0000 GETGBL R2 G18
0x8C0C0712, // 0001 GETMET R3 R3 K18 0x7C080000, // 0001 CALL R2 0
0x5C140200, // 0002 MOVE R5 R1 0x600C0010, // 0002 GETGBL R3 G16
0x7C0C0400, // 0003 CALL R3 2 0x88100101, // 0003 GETMBR R4 R0 K1
0x780E0000, // 0004 JMPF R3 #0006 0x8C100906, // 0004 GETMET R4 R4 K6
0x500C0001, // 0005 LDBOOL R3 0 1 0x7C100200, // 0005 CALL R4 1
0x500C0200, // 0006 LDBOOL R3 1 0 0x04100907, // 0006 SUB R4 R4 K7
0x88100104, // 0007 GETMBR R4 R0 K4 0x40120A04, // 0007 CONNECT R4 K5 R4
0x98100202, // 0008 SETIDX R4 R1 R2 0x7C0C0200, // 0008 CALL R3 1
0x780E0009, // 0009 JMPF R3 #0014 0xA802000B, // 0009 EXBLK 0 #0016
0x8C100113, // 000A GETMET R4 R0 K19 0x5C100600, // 000A MOVE R4 R3
0x5C180200, // 000B MOVE R6 R1 0x7C100000, // 000B CALL R4 0
0x7C100400, // 000C CALL R4 2 0x88140101, // 000C GETMBR R5 R0 K1
0x88140101, // 000D GETMBR R5 R0 K1 0x94140A04, // 000D GETIDX R5 R5 R4
0x8C140B08, // 000E GETMET R5 R5 K8 0x88180100, // 000E GETMBR R6 R0 K0
0x5C1C0800, // 000F MOVE R7 R4 0x94180C05, // 000F GETIDX R6 R6 R5
0x5C200200, // 0010 MOVE R8 R1 0x1C180C01, // 0010 EQ R6 R6 R1
0x7C140600, // 0011 CALL R5 3 0x781A0002, // 0011 JMPF R6 #0015
0x50140200, // 0012 LDBOOL R5 1 0 0x8C180510, // 0012 GETMET R6 R2 K16
0x80040A00, // 0013 RET 1 R5 0x5C200A00, // 0013 MOVE R8 R5
0x50100000, // 0014 LDBOOL R4 0 0 0x7C180400, // 0014 CALL R6 2
0x80040800, // 0015 RET 1 R4 0x7001FFF3, // 0015 JMP #000A
}) 0x580C000D, // 0016 LDCONST R3 K13
) 0xAC0C0200, // 0017 CATCH R3 1 0
); 0xB0080000, // 0018 RAISE 2 R0 R0
/*******************************************************************/ 0x580C0005, // 0019 LDCONST R3 K5
0x60100010, // 001A GETGBL R4 G16
0x5C140400, // 001B MOVE R5 R2
/******************************************************************** 0x7C100200, // 001C CALL R4 1
** Solidified function: size 0xA8020006, // 001D EXBLK 0 #0025
********************************************************************/ 0x5C140800, // 001E MOVE R5 R4
be_local_closure(class_sortedmap_size, /* name */ 0x7C140000, // 001F CALL R5 0
be_nested_proto( 0x8C180111, // 0020 GETMET R6 R0 K17
3, /* nstack */ 0x5C200A00, // 0021 MOVE R8 R5
1, /* argc */ 0x7C180400, // 0022 CALL R6 2
10, /* varg */ 0x000C0707, // 0023 ADD R3 R3 K7
0, /* has upvals */ 0x7001FFF8, // 0024 JMP #001E
NULL, /* no upvals */ 0x5810000D, // 0025 LDCONST R4 K13
0, /* has sup protos */ 0xAC100200, // 0026 CATCH R4 1 0
NULL, /* no sub protos */ 0xB0080000, // 0027 RAISE 2 R0 R0
1, /* has constants */ 0x80040600, // 0028 RET 1 R3
&be_ktab_class_sortedmap, /* shared constants */
&be_const_str_size,
&be_const_str_solidified,
( &(const binstruction[ 4]) { /* code */
0x88040104, // 0000 GETMBR R1 R0 K4
0x8C040302, // 0001 GETMET R1 R1 K2
0x7C040200, // 0002 CALL R1 1
0x80040200, // 0003 RET 1 R1
}) })
) )
); );
@ -409,8 +344,8 @@ be_local_closure(class_sortedmap_find, /* name */
&be_const_str_find, &be_const_str_find,
&be_const_str_solidified, &be_const_str_solidified,
( &(const binstruction[ 6]) { /* code */ ( &(const binstruction[ 6]) { /* code */
0x880C0104, // 0000 GETMBR R3 R0 K4 0x880C0100, // 0000 GETMBR R3 R0 K0
0x8C0C0714, // 0001 GETMET R3 R3 K20 0x8C0C0712, // 0001 GETMET R3 R3 K18
0x5C140200, // 0002 MOVE R5 R1 0x5C140200, // 0002 MOVE R5 R1
0x5C180400, // 0003 MOVE R6 R2 0x5C180400, // 0003 MOVE R6 R2
0x7C0C0600, // 0004 CALL R3 3 0x7C0C0600, // 0004 CALL R3 3
@ -422,12 +357,12 @@ be_local_closure(class_sortedmap_find, /* name */
/******************************************************************** /********************************************************************
** Solidified function: remove ** Solidified function: insert
********************************************************************/ ********************************************************************/
be_local_closure(class_sortedmap_remove, /* name */ be_local_closure(class_sortedmap_insert, /* name */
be_nested_proto( be_nested_proto(
6, /* nstack */ 9, /* nstack */
2, /* argc */ 3, /* argc */
10, /* varg */ 10, /* varg */
0, /* has upvals */ 0, /* has upvals */
NULL, /* no upvals */ NULL, /* no upvals */
@ -435,33 +370,31 @@ be_local_closure(class_sortedmap_remove, /* name */
NULL, /* no sub protos */ NULL, /* no sub protos */
1, /* has constants */ 1, /* has constants */
&be_ktab_class_sortedmap, /* shared constants */ &be_ktab_class_sortedmap, /* shared constants */
&be_const_str_remove, &be_const_str_insert,
&be_const_str_solidified, &be_const_str_solidified,
( &(const binstruction[24]) { /* code */ ( &(const binstruction[22]) { /* code */
0x88080104, // 0000 GETMBR R2 R0 K4 0x880C0100, // 0000 GETMBR R3 R0 K0
0x8C080512, // 0001 GETMET R2 R2 K18 0x8C0C0713, // 0001 GETMET R3 R3 K19
0x5C100200, // 0002 MOVE R4 R1 0x5C140200, // 0002 MOVE R5 R1
0x7C080400, // 0003 CALL R2 2 0x7C0C0400, // 0003 CALL R3 2
0x780A0010, // 0004 JMPF R2 #0016 0x780E0000, // 0004 JMPF R3 #0006
0x88080104, // 0005 GETMBR R2 R0 K4 0x500C0001, // 0005 LDBOOL R3 0 1
0x8C080507, // 0006 GETMET R2 R2 K7 0x500C0200, // 0006 LDBOOL R3 1 0
0x5C100200, // 0007 MOVE R4 R1 0x88100100, // 0007 GETMBR R4 R0 K0
0x7C080400, // 0008 CALL R2 2 0x98100202, // 0008 SETIDX R4 R1 R2
0x88080101, // 0009 GETMBR R2 R0 K1 0x780E0009, // 0009 JMPF R3 #0014
0x8C080514, // 000A GETMET R2 R2 K20 0x8C100114, // 000A GETMET R4 R0 K20
0x5C100200, // 000B MOVE R4 R1 0x5C180200, // 000B MOVE R6 R1
0x7C080400, // 000C CALL R2 2 0x7C100400, // 000C CALL R4 2
0x4C0C0000, // 000D LDNIL R3 0x88140101, // 000D GETMBR R5 R0 K1
0x200C0403, // 000E NE R3 R2 R3 0x8C140B02, // 000E GETMET R5 R5 K2
0x780E0003, // 000F JMPF R3 #0014 0x5C1C0800, // 000F MOVE R7 R4
0x880C0101, // 0010 GETMBR R3 R0 K1 0x5C200200, // 0010 MOVE R8 R1
0x8C0C0707, // 0011 GETMET R3 R3 K7 0x7C140600, // 0011 CALL R5 3
0x5C140400, // 0012 MOVE R5 R2 0x50140200, // 0012 LDBOOL R5 1 0
0x7C0C0400, // 0013 CALL R3 2 0x80040A00, // 0013 RET 1 R5
0x500C0200, // 0014 LDBOOL R3 1 0 0x50100000, // 0014 LDBOOL R4 0 0
0x80040600, // 0015 RET 1 R3 0x80040800, // 0015 RET 1 R4
0x50080000, // 0016 LDBOOL R2 0 0
0x80040400, // 0017 RET 1 R2
}) })
) )
); );
@ -493,6 +426,107 @@ be_local_closure(class_sortedmap_get_keys, /* name */
/*******************************************************************/ /*******************************************************************/
/********************************************************************
** Solidified function: keys
********************************************************************/
be_local_closure(class_sortedmap_keys, /* name */
be_nested_proto(
3, /* nstack */
1, /* argc */
10, /* varg */
0, /* has upvals */
NULL, /* no upvals */
0, /* has sup protos */
NULL, /* no sub protos */
1, /* has constants */
&be_ktab_class_sortedmap, /* shared constants */
&be_const_str_keys,
&be_const_str_solidified,
( &(const binstruction[ 4]) { /* code */
0x88040101, // 0000 GETMBR R1 R0 K1
0x8C040315, // 0001 GETMET R1 R1 K21
0x7C040200, // 0002 CALL R1 1
0x80040200, // 0003 RET 1 R1
})
)
);
/*******************************************************************/
/********************************************************************
** Solidified function: remove
********************************************************************/
be_local_closure(class_sortedmap_remove, /* name */
be_nested_proto(
6, /* nstack */
2, /* argc */
10, /* varg */
0, /* has upvals */
NULL, /* no upvals */
0, /* has sup protos */
NULL, /* no sub protos */
1, /* has constants */
&be_ktab_class_sortedmap, /* shared constants */
&be_const_str_remove,
&be_const_str_solidified,
( &(const binstruction[24]) { /* code */
0x88080100, // 0000 GETMBR R2 R0 K0
0x8C080513, // 0001 GETMET R2 R2 K19
0x5C100200, // 0002 MOVE R4 R1
0x7C080400, // 0003 CALL R2 2
0x780A0010, // 0004 JMPF R2 #0016
0x88080100, // 0005 GETMBR R2 R0 K0
0x8C080511, // 0006 GETMET R2 R2 K17
0x5C100200, // 0007 MOVE R4 R1
0x7C080400, // 0008 CALL R2 2
0x88080101, // 0009 GETMBR R2 R0 K1
0x8C080512, // 000A GETMET R2 R2 K18
0x5C100200, // 000B MOVE R4 R1
0x7C080400, // 000C CALL R2 2
0x4C0C0000, // 000D LDNIL R3
0x200C0403, // 000E NE R3 R2 R3
0x780E0003, // 000F JMPF R3 #0014
0x880C0101, // 0010 GETMBR R3 R0 K1
0x8C0C0711, // 0011 GETMET R3 R3 K17
0x5C140400, // 0012 MOVE R5 R2
0x7C0C0400, // 0013 CALL R3 2
0x500C0200, // 0014 LDBOOL R3 1 0
0x80040600, // 0015 RET 1 R3
0x50080000, // 0016 LDBOOL R2 0 0
0x80040400, // 0017 RET 1 R2
})
)
);
/*******************************************************************/
/********************************************************************
** Solidified function: size
********************************************************************/
be_local_closure(class_sortedmap_size, /* name */
be_nested_proto(
3, /* nstack */
1, /* argc */
10, /* varg */
0, /* has upvals */
NULL, /* no upvals */
0, /* has sup protos */
NULL, /* no sub protos */
1, /* has constants */
&be_ktab_class_sortedmap, /* shared constants */
&be_const_str_size,
&be_const_str_solidified,
( &(const binstruction[ 4]) { /* code */
0x88040100, // 0000 GETMBR R1 R0 K0
0x8C040306, // 0001 GETMET R1 R1 K6
0x7C040200, // 0002 CALL R1 1
0x80040200, // 0003 RET 1 R1
})
)
);
/*******************************************************************/
/******************************************************************** /********************************************************************
** Solidified function: contains ** Solidified function: contains
********************************************************************/ ********************************************************************/
@ -510,8 +544,8 @@ be_local_closure(class_sortedmap_contains, /* name */
&be_const_str_contains, &be_const_str_contains,
&be_const_str_solidified, &be_const_str_solidified,
( &(const binstruction[ 5]) { /* code */ ( &(const binstruction[ 5]) { /* code */
0x88080104, // 0000 GETMBR R2 R0 K4 0x88080100, // 0000 GETMBR R2 R0 K0
0x8C080512, // 0001 GETMET R2 R2 K18 0x8C080513, // 0001 GETMET R2 R2 K19
0x5C100200, // 0002 MOVE R4 R1 0x5C100200, // 0002 MOVE R4 R1
0x7C080400, // 0003 CALL R2 2 0x7C080400, // 0003 CALL R2 2
0x80040400, // 0004 RET 1 R2 0x80040400, // 0004 RET 1 R2
@ -522,12 +556,12 @@ be_local_closure(class_sortedmap_contains, /* name */
/******************************************************************** /********************************************************************
** Solidified function: _find_insert_position ** Solidified function: iter
********************************************************************/ ********************************************************************/
be_local_closure(class_sortedmap__find_insert_position, /* name */ be_local_closure(class_sortedmap_iter, /* name */
be_nested_proto( be_nested_proto(
10, /* nstack */ 3, /* nstack */
2, /* argc */ 1, /* argc */
10, /* varg */ 10, /* varg */
0, /* has upvals */ 0, /* has upvals */
NULL, /* no upvals */ NULL, /* no upvals */
@ -535,50 +569,43 @@ be_local_closure(class_sortedmap__find_insert_position, /* name */
NULL, /* no sub protos */ NULL, /* no sub protos */
1, /* has constants */ 1, /* has constants */
&be_ktab_class_sortedmap, /* shared constants */ &be_ktab_class_sortedmap, /* shared constants */
&be_const_str__find_insert_position, &be_const_str_iter,
&be_const_str_solidified, &be_const_str_solidified,
( &(const binstruction[41]) { /* code */ ( &(const binstruction[ 4]) { /* code */
0x58080000, // 0000 LDCONST R2 K0 0x88040100, // 0000 GETMBR R1 R0 K0
0x880C0101, // 0001 GETMBR R3 R0 K1 0x8C040315, // 0001 GETMET R1 R1 K21
0x8C0C0702, // 0002 GETMET R3 R3 K2 0x7C040200, // 0002 CALL R1 1
0x7C0C0200, // 0003 CALL R3 1 0x80040200, // 0003 RET 1 R1
0x040C0703, // 0004 SUB R3 R3 K3 })
0x18100403, // 0005 LE R4 R2 R3 )
0x78120020, // 0006 JMPF R4 #0028 );
0x60100009, // 0007 GETGBL R4 G9 /*******************************************************************/
0x00140403, // 0008 ADD R5 R2 R3
0x0C140B15, // 0009 DIV R5 R5 K21
0x7C100200, // 000A CALL R4 1 /********************************************************************
0x88140101, // 000B GETMBR R5 R0 K1 ** Solidified function: init
0x94140A04, // 000C GETIDX R5 R5 R4 ********************************************************************/
0x4C180000, // 000D LDNIL R6 be_local_closure(class_sortedmap_init, /* name */
0x601C0004, // 000E GETGBL R7 G4 be_nested_proto(
0x5C200200, // 000F MOVE R8 R1 2, /* nstack */
0x7C1C0200, // 0010 CALL R7 1 1, /* argc */
0x60200004, // 0011 GETGBL R8 G4 10, /* varg */
0x5C240A00, // 0012 MOVE R9 R5 0, /* has upvals */
0x7C200200, // 0013 CALL R8 1 NULL, /* no upvals */
0x1C1C0E08, // 0014 EQ R7 R7 R8 0, /* has sup protos */
0x781E0002, // 0015 JMPF R7 #0019 NULL, /* no sub protos */
0x241C0205, // 0016 GT R7 R1 R5 1, /* has constants */
0x5C180E00, // 0017 MOVE R6 R7 &be_ktab_class_sortedmap, /* shared constants */
0x70020007, // 0018 JMP #0021 &be_const_str_init,
0x601C0008, // 0019 GETGBL R7 G8 &be_const_str_solidified,
0x5C200200, // 001A MOVE R8 R1 ( &(const binstruction[ 7]) { /* code */
0x7C1C0200, // 001B CALL R7 1 0x60040013, // 0000 GETGBL R1 G19
0x60200008, // 001C GETGBL R8 G8 0x7C040000, // 0001 CALL R1 0
0x5C240A00, // 001D MOVE R9 R5 0x90020001, // 0002 SETMBR R0 K0 R1
0x7C200200, // 001E CALL R8 1 0x60040012, // 0003 GETGBL R1 G18
0x241C0E08, // 001F GT R7 R7 R8 0x7C040000, // 0004 CALL R1 0
0x5C180E00, // 0020 MOVE R6 R7 0x90020201, // 0005 SETMBR R0 K1 R1
0x781A0002, // 0021 JMPF R6 #0025 0x80000000, // 0006 RET 0
0x001C0903, // 0022 ADD R7 R4 K3
0x5C080E00, // 0023 MOVE R2 R7
0x70020001, // 0024 JMP #0027
0x041C0903, // 0025 SUB R7 R4 K3
0x5C0C0E00, // 0026 MOVE R3 R7
0x7001FFDC, // 0027 JMP #0005
0x80040400, // 0028 RET 1 R2
}) })
) )
); );
@ -591,24 +618,25 @@ be_local_closure(class_sortedmap__find_insert_position, /* name */
be_local_class(sortedmap, be_local_class(sortedmap,
2, 2,
NULL, NULL,
be_nested_map(16, be_nested_map(17,
( (struct bmapnode*) &(const bmapnode[]) { ( (struct bmapnode*) &(const bmapnode[]) {
{ be_const_key(_data, -1), be_const_var(0) },
{ be_const_key(remove, -1), be_const_closure(class_sortedmap_remove_closure) },
{ be_const_key(tostring, -1), be_const_closure(class_sortedmap_tostring_closure) }, { be_const_key(tostring, -1), be_const_closure(class_sortedmap_tostring_closure) },
{ be_const_key(remove_by_value, -1), be_const_closure(class_sortedmap_remove_by_value_closure) },
{ be_const_key(clear, -1), be_const_closure(class_sortedmap_clear_closure) },
{ be_const_key(init, -1), be_const_closure(class_sortedmap_init_closure) },
{ be_const_key(setitem, -1), be_const_closure(class_sortedmap_setitem_closure) },
{ be_const_key(data, 0), be_const_var(0) },
{ be_const_key(item, -1), be_const_closure(class_sortedmap_item_closure) }, { be_const_key(item, -1), be_const_closure(class_sortedmap_item_closure) },
{ be_const_key(iter, -1), be_const_closure(class_sortedmap_iter_closure) },
{ be_const_key(insert, 9), be_const_closure(class_sortedmap_insert_closure) },
{ be_const_key(contains, -1), be_const_closure(class_sortedmap_contains_closure) },
{ be_const_key(find, -1), be_const_closure(class_sortedmap_find_closure) },
{ be_const_key(keys, -1), be_const_var(1) },
{ be_const_key(size, 14), be_const_closure(class_sortedmap_size_closure) },
{ be_const_key(remove, 11), be_const_closure(class_sortedmap_remove_closure) },
{ be_const_key(get_keys, -1), be_const_closure(class_sortedmap_get_keys_closure) },
{ be_const_key(_find_insert_position, -1), be_const_closure(class_sortedmap__find_insert_position_closure) }, { be_const_key(_find_insert_position, -1), be_const_closure(class_sortedmap__find_insert_position_closure) },
{ be_const_key(remove_by_value, -1), be_const_closure(class_sortedmap_remove_by_value_closure) },
{ be_const_key(find, -1), be_const_closure(class_sortedmap_find_closure) },
{ be_const_key(insert, -1), be_const_closure(class_sortedmap_insert_closure) },
{ be_const_key(get_keys, -1), be_const_closure(class_sortedmap_get_keys_closure) },
{ be_const_key(keys, 13), be_const_closure(class_sortedmap_keys_closure) },
{ be_const_key(setitem, 1), be_const_closure(class_sortedmap_setitem_closure) },
{ be_const_key(size, -1), be_const_closure(class_sortedmap_size_closure) },
{ be_const_key(contains, -1), be_const_closure(class_sortedmap_contains_closure) },
{ be_const_key(_keys, -1), be_const_var(1) },
{ be_const_key(iter, -1), be_const_closure(class_sortedmap_iter_closure) },
{ be_const_key(init, -1), be_const_closure(class_sortedmap_init_closure) },
{ be_const_key(clear, 0), be_const_closure(class_sortedmap_clear_closure) },
})), })),
(bstring*) &be_const_str_sortedmap (bstring*) &be_const_str_sortedmap
); );