set version to 3.4.6

This commit is contained in:
ussrhero 2019-04-20 21:40:34 +03:00
parent 1420b5b1a3
commit 20a3c5904a
4 changed files with 20 additions and 14 deletions

View File

@ -2,7 +2,7 @@
#define PYKD_VERSION_MAJOR 0 #define PYKD_VERSION_MAJOR 0
#define PYKD_VERSION_MINOR 3 #define PYKD_VERSION_MINOR 3
#define PYKD_VERSION_SUBVERSION 4 #define PYKD_VERSION_SUBVERSION 4
#define PYKD_VERSION_BUILDNO 5 #define PYKD_VERSION_BUILDNO 6
#define __VER_STR2__(x) #x #define __VER_STR2__(x) #x
#define __VER_STR1__(x) __VER_STR2__(x) #define __VER_STR1__(x) __VER_STR2__(x)

View File

@ -1441,18 +1441,18 @@ void pykd_init()
; ;
python::enum_<kdlib::OutputFlag>("outputFlag", "Set of output mask") python::enum_<kdlib::OutputFlag>("outputFlag", "Set of output mask")
.value("Normal", kdlib::Normal) .value("Normal", kdlib::Normal)
.value("Error", kdlib::Error) .value("Error", kdlib::Error)
.value("Warning", kdlib::Warning) .value("Warning", kdlib::Warning)
.value("Verbose", kdlib::Verbose) .value("Verbose", kdlib::Verbose)
.value("Prompt", kdlib::Prompt) .value("Prompt", kdlib::Prompt)
.value("PromptRegister", kdlib::PromptRegister) .value("PromptRegister", kdlib::PromptRegister)
.value("ExtensionWarning", kdlib::ExtensionWarning) .value("ExtensionWarning", kdlib::ExtensionWarning)
.value("Debuggee", kdlib::Debuggee) .value("Debuggee", kdlib::Debuggee)
.value("DebuggeePrompt", kdlib::DebuggeePrompt) .value("DebuggeePrompt", kdlib::DebuggeePrompt)
.value("Symbols", kdlib::Symbols) .value("Symbols", kdlib::Symbols)
.value("Status", kdlib::Status) .value("Status", kdlib::Status)
.value("All", kdlib::All) .value("All", kdlib::All)
; ;
// C++ exception translation to python // C++ exception translation to python

View File

@ -285,7 +285,7 @@ public:
static std::string hex(kdlib::NumConvertable& var) { static std::string hex(kdlib::NumConvertable& var) {
kdlib::NumVariant v = var; kdlib::NumVariant v = var;
return std::string("0x") + std::string(_bstr_t(v.asHex().c_str())); return _bstr_t(v.asHex().c_str());
} }
static bool isInteger(kdlib::NumConvertable& var) { static bool isInteger(kdlib::NumConvertable& var) {

View File

@ -469,6 +469,12 @@ class TypedVarTest( unittest.TestCase ):
self.assertEqual(var.m_field1, pykd.evalExpr("m_field1", var)) self.assertEqual(var.m_field1, pykd.evalExpr("m_field1", var))
self.assertEqual(var.m_field4.deref().m_field1, pykd.evalExpr("m_field4->m_field1", var)) self.assertEqual(var.m_field4.deref().m_field1, pykd.evalExpr("m_field4->m_field1", var))
def testEvalExprSizeof(self):
self.assertEqual(4, pykd.evalExpr("sizeof(int)"))
self.assertEqual(4, pykd.evalExpr("sizeof(int&)"))
self.assertEqual(pykd.ptrSize() * 10, pykd.evalExpr("sizeof(int*[10])"))
self.assertEqual(pykd.ptrSize(), pykd.evalExpr("sizeof(int(*)[10])"))
def testContain(self): def testContain(self):
var = pykd.typedVar("g_structTest") var = pykd.typedVar("g_structTest")
self.assertTrue("m_field1" in var) self.assertTrue("m_field1" in var)