UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/code] Status at the beginning of a script is one byte long

Browse Source 
This saves space + avoids clashes with the NumWorks Workshop when
exchanging scripts
This commit is contained in:
Léa Saviot
2020-06-05 11:28:12 +02:00
parent d53a16eb91
commit 9a1ff2bd33
6 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/code/script.cpp
View File

@@ -68,19 +68,19 @@ bool Script::nameCompliant(const char * name) {
bool Script::autoImportationStatus() const {
assert(!isNull());
Data d = value();
return (((char *)d.buffer)[0] == 1);
return (*statusFromData(d) & k_autoImportationStatusMask) == 1;
}
void Script::toggleAutoimportationStatus() {
assert(!isNull());
Data d = value();
((char *)d.buffer)[0] = (((char *)d.buffer)[0] == 1 ? 0 : 1);
*statusFromData(d) ^= k_autoImportationStatusMask;
setValue(d);
}
const char * Script::content() const {
Data d = value();
return ((const char *)d.buffer) + InformationSize();
return ((const char *)d.buffer) + StatusSize();
}
bool Script::contentFetchedFromConsole() const {
@@ -106,19 +106,23 @@ void Script::resetContentFetchedStatus() {
Script::FetchedStatus Script::fetchedStatus() const {
assert(!isNull());
Data d = value();
uint8_t status = const_cast<uint8_t *>(static_cast<const uint8_t *>(d.buffer))[k_autoImportationStatusSize];
uint8_t status = (*statusFromData(d)) >> k_fetchedStatusOffset;
assert(status == static_cast<uint8_t>(FetchedStatus::None)
|| status == static_cast<uint8_t>(FetchedStatus::FromConsole)
|| status == static_cast<uint8_t>(FetchedStatus::ForVariableBox));
return static_cast<FetchedStatus>(status);
}
void Script::setFetchedStatus(FetchedStatus status) {
void Script::setFetchedStatus(FetchedStatus fetchedStatus) {
assert(!isNull());
Data d = value();
const_cast<uint8_t *>(static_cast<const uint8_t *>(d.buffer))[k_autoImportationStatusSize] = static_cast<uint8_t>(status);
uint8_t * status = statusFromData(d);
*status = ((*status) & ~k_fetchedStatusMask) | (static_cast<uint8_t>(fetchedStatus) << k_fetchedStatusOffset); //TODO Create and use a bit operations library
setValue(d);
}
uint8_t * Script::statusFromData(Data d) const {
return const_cast<uint8_t *>(static_cast<const uint8_t *>(d.buffer));
}
}