barant/JetCore
0
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

work towards a clean compile on migrating set and get variables from Tag.

Browse Source
This commit is contained in:
barant committed 2025-01-08 10:27:30 -08:00
1 parent 2549220914
commit 5c27df59da
25 files changed
+178 -306
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

__until.cpp
+15 -15
View File
@@ -21,13 +21,13 @@ namespace jet {
if(!keywordDefined("type"))
throw coreutils::Exception("type expected if value1 and value2 specified.");
int rc = keywords["value1"].compare(keywords["value2"]);
if(((keywords["type"] == "eq") && (rc == 0)) ||
((keywords["type"] == "ne") && (rc != 0)) ||
((keywords["type"] == "lt") && (rc == -1)) ||
((keywords["type"] == "le") && (rc != 1)) ||
((keywords["type"] == "gt") && (rc == 1)) ||
((keywords["type"] == "ge") && (rc != -1)))
int rc = keywords[resolveKeyword("value1")].compare(keywords[resolveKeyword("value2")]);
if(((keywords[resolveKeyword("type")] == "eq") && (rc == 0)) ||
((keywords[resolveKeyword("type")] == "ne") && (rc != 0)) ||
((keywords[resolveKeyword("type")] == "lt") && (rc == -1)) ||
((keywords[resolveKeyword("type")] == "le") && (rc != 1)) ||
((keywords[resolveKeyword("type")] == "gt") && (rc == 1)) ||
((keywords[resolveKeyword("type")] == "ge") && (rc != -1)))
booleanResult = true;
else
throw coreutils::Exception("type value must be 'eq','ne','lt','le','gt','ge'.");
@@ -47,16 +47,16 @@ namespace jet {
keywords["expr"].reset();
keywords["expr"] = exprSaved;
resolveKeyword("expr");
booleanResult = Operand(keywords["expr"], global, parent->variables, keywords).boolean;
booleanResult = Operand(keywords["expr"], *this).boolean;
} else {
booleanResult = false;
int rc = keywords["value1"].compare(keywords["value2"]);
if(((keywords["type"] == "eq") && (rc == 0)) ||
((keywords["type"] == "ne") && (rc != 0)) ||
((keywords["type"] == "lt") && (rc == -1)) ||
((keywords["type"] == "le") && (rc != 1)) ||
((keywords["type"] == "gt") && (rc == 1)) ||
((keywords["type"] == "ge") && (rc != -1)))
int rc = keywords[resolveKeyword("value1")].compare(keywords[resolveKeyword("value2")]);
if(((keywords[resolveKeyword("type")] == "eq") && (rc == 0)) ||
((keywords[resolveKeyword("type")] == "ne") && (rc != 0)) ||
((keywords[resolveKeyword("type")] == "lt") && (rc == -1)) ||
((keywords[resolveKeyword("type")] == "le") && (rc != 1)) ||
((keywords[resolveKeyword("type")] == "gt") && (rc == 1)) ||
((keywords[resolveKeyword("type")] == "ge") && (rc != -1)))
booleanResult = true;
}
} while(booleanResult);