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[]) { int main(int argc, char * argv[]) {
PIMathMatrixd m2(3,3); m2.fill(5); PIMap<uint, PIObject::__MetaData> & m(PIObject::__meta_data());
PIMathVectord v(3); v.fill(4); for (auto it = m.constBegin(); it != m.constEnd(); ++it) {
//m.fill(7); const PIObject::__MetaData & md(it.value());
piCout << v*m2; piCout << it.key() << md.scope_list << md.scope_id << ":";
//piCout << m1*m2.transposed(); for (auto j = md.eh_func.constBegin(); j != md.eh_func.constEnd(); ++j) {
// PIMathMatrixd m2; piCout << " " << j.value().fullFormat();
// m2 = m; m2.resize(3,5, 99); }
// piCout << m2; piCout << "";
// 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;
return 0; return 0;
} }

31
src_main/core/piinit.cpp
View File

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