SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

Merge branch 'master' of https://git.shs.tools/SHS/pip

Browse Source
This commit is contained in:
Бычков Андрей
2020-06-10 15:36:41 +03:00
parent 5f8f8e0050 99e93dfc62
commit f662a92380
2 changed files with 15 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
main.cpp
View File

@@ -117,27 +117,14 @@ PIKbdListener kbd(0, 0, false);
int main(int argc, char * argv[]) {
PIMathMatrixd m2(3,3); m2.fill(5);
PIMathVectord v(3); v.fill(4);
//m.fill(7);
piCout << v*m2;
//piCout << m1*m2.transposed();
// PIMathMatrixd m2;
// m2 = m; m2.resize(3,5, 99);
// piCout << m2;
// m2 = m; m2.resize(5,3, 88);
// piCout << m2;
// m2 = m; m2.resize(4,9, 77);
// piCout << m2;
// m2 = m; m2.resize(2,2, 66);
// piCout << m2;
// m2 = m; m2.resize(2,8, 66);
// piCout << m2;
// piCout << m.transposed() << m.transposed()*m;
// piCout << "zzzzzzzz";
PIMathMatrixT<3u, 3u, double> n1 = PIMathMatrixT<3u, 3u, double>::filled(5);
PIMathMatrixT<1u, 3u, double> n2 = PIMathMatrixT<1u, 3u, double>::filled(4);
piCout << n2*n1;
// piCout << n.transposed() << n.transposed()*n;
PIMap<uint, PIObject::__MetaData> & m(PIObject::__meta_data());
for (auto it = m.constBegin(); it != m.constEnd(); ++it) {
const PIObject::__MetaData & md(it.value());
piCout << it.key() << md.scope_list << md.scope_id << ":";
for (auto j = md.eh_func.constBegin(); j != md.eh_func.constEnd(); ++j) {
piCout << " " << j.value().fullFormat();
}
piCout << "";
}
return 0;
}

31
src_main/core/piinit.cpp
View File

@@ -63,7 +63,6 @@ void __PISetTimerResolution() {
# include <mach/mach_traps.h>
# include <mach/mach.h>
# include <mach/clock.h>
//# include <crt_externs.h>
extern clock_serv_t __pi_mac_clock;
#endif
#ifdef PIP_ICU
@@ -179,20 +178,12 @@ PIInit::PIInit() {
__syslocname__ = __sysoemname__ = 0;
__utf8name__ = const_cast<char*>("UTF-8");
#ifdef PIP_ICU
//__syslocname__ = new char[256];
//memset(__syslocname__, 0, 256);
UErrorCode e((UErrorCode)0);
u_init(&e);
# ifdef WINDOWS
PRIVATE->delete_locs = true;
CPINFOEX cpinfo;
int l = 0;
/*GetCPInfoEx(CP_ACP, 0, &cpinfo);
for (l = 0; l < MAX_PATH; ++l)
if (cpinfo.CodePageName[l] == '\0' || cpinfo.CodePageName[l] == ' ')
break;
memcpy(__syslocname__, "windows-", 8);
memcpy(&(__syslocname__[8]), cpinfo.CodePageName, l);*/
GetCPInfoEx(CP_OEMCP, 0, &cpinfo);
for (l = 0; l < MAX_PATH; ++l)
if (cpinfo.CodePageName[l] == '\0' || cpinfo.CodePageName[l] == ' ')
@@ -274,28 +265,18 @@ PIInit::PIInit() {
sinfo->OS_name =
#ifdef WINDOWS
PIStringAscii("Windows");
#else
# ifdef QNX
#elif defined(QNX)
PIStringAscii("QNX");
# else
# ifdef MAC_OS
#elif defined(MAC_OS)
PIStringAscii("MacOS");
# else
# ifdef ANDROID
#elif defined(ANDROID)
PIStringAscii("Android");
# else
# ifdef FREE_BSD
#elif defined(FREE_BSD)
PIStringAscii("FreeBSD");
# else
# ifdef FREERTOS
#elif defined(FREERTOS)
PIStringAscii("FreeRTOS");
# else
#else
uns.sysname;
# endif
# endif
# endif
# endif
# endif
#endif
}