Lil-Ran/Pyarmor-Static-Unpack-1shot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove unnecessary sequence interface on PycDict

Browse Source
This commit is contained in:
Michael Hansen
2023-11-09 14:20:15 -08:00
parent 9b384ad1fa
commit e27faa1e88
2 changed files with 20 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pyc_sequence.cpp
View File

@@ -65,7 +65,7 @@ bool PycDict::isEqual(PycRef<PycObject> obj) const
return false;
PycRef<PycDict> dictObj = obj.cast<PycDict>();
if (m_size != dictObj->m_size)
if (m_keys.size() != dictObj->m_keys.size())
return false;
auto ki1 = m_keys.cbegin();
@@ -85,28 +85,3 @@ bool PycDict::isEqual(PycRef<PycObject> obj) const
}
return true;
}
PycRef<PycObject> PycDict::get(PycRef<PycObject> key) const
{
auto ki = m_keys.cbegin();
auto vi = m_values.cbegin();
while (ki != m_keys.cend()) {
if ((*ki)->isEqual(key))
return *vi;
++ki, ++vi;
}
return NULL; // Disassembly shouldn't get non-existent keys
}
PycRef<PycObject> PycDict::get(int idx) const
{
if (idx < 0)
throw std::out_of_range("Dict index out of range");
auto it = m_values.cbegin();
while (idx-- && it != m_values.cend())
++it;
if (it == m_values.cend())
throw std::out_of_range("Dict index out of range");
return *it;
}

41
pyc_sequence.h
View File

@@ -46,32 +46,29 @@ public:
PycList(int type = TYPE_LIST) : PycSimpleSequence(type) { }
};
class PycDict : public PycSequence {
public:
typedef std::vector<PycRef<PycObject>> key_t;
typedef std::vector<PycRef<PycObject>> value_t;
PycDict(int type = TYPE_DICT) : PycSequence(type) { }
bool isEqual(PycRef<PycObject> obj) const override;
void load(class PycData* stream, class PycModule* mod) override;
PycRef<PycObject> get(PycRef<PycObject> key) const;
const key_t& keys() const { return m_keys; }
const value_t& values() const { return m_values; }
PycRef<PycObject> get(int idx) const override;
private:
key_t m_keys;
value_t m_values;
};
class PycSet : public PycSimpleSequence {
public:
typedef PycSimpleSequence::value_t value_t;
PycSet(int type = TYPE_SET) : PycSimpleSequence(type) { }
};
class PycDict : public PycObject {
public:
typedef std::vector<PycRef<PycObject>> key_t;
typedef std::vector<PycRef<PycObject>> value_t;
PycDict(int type = TYPE_DICT) : PycObject(type) { }
bool isEqual(PycRef<PycObject> obj) const override;
void load(class PycData* stream, class PycModule* mod) override;
const key_t& keys() const { return m_keys; }
const value_t& values() const { return m_values; }
private:
key_t m_keys;
value_t m_values;
};
#endif