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

fixed call tag completely. Should be done for now.

Browse Source
This commit is contained in:
barant 2025-01-09 13:57:12 -08:00
parent 4f616021f3
commit 3f4ca13f3f
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tag.cpp
View File

@ -443,6 +443,12 @@ namespace jet {
} }
void Tag::storeVariable(coreutils::ZString variable, coreutils::MString value, coreutils::ZString scope) { void Tag::storeVariable(coreutils::ZString variable, coreutils::MString value, coreutils::ZString scope) {
if((scope == "global") || (scope == ""))
global.variables[variable] = value;
else if(scope == "local")
local->variables[variable] = value;
else if(scope == "parent")
local->parent->variables[variable] = value;
} }
void Tag::storeVariable(coreutils::ZString variable) { void Tag::storeVariable(coreutils::ZString variable) {

6
__call.cpp
View File

@ -31,7 +31,7 @@ namespace jet {
close(fdo[0]); close(fdo[0]);
dup2(fdo[1], 1); dup2(fdo[1], 1);
if(keywordDefined("input")) { if(keywordDefined("input")) {
coreutils::ZString input(resolveKeyword("input")); coreutils::MString input(resolveKeyword("input"));
pipe(fdi); pipe(fdi);
if(fork() == 0) { if(fork() == 0) {
close(fdi[0]); close(fdi[0]);
@ -48,7 +48,9 @@ namespace jet {
} }
close(fdo[1]); close(fdo[1]);
if(keywordDefined("name")) { if(keywordDefined("name")) {
storeVariable(resolveKeyword("name")); coreutils::MString value;
value.read(fdo[0]);
storeVariable(resolveKeyword("name"), value, resolveKeyword("scope"));
} else } else
out.read(fdo[0]); out.read(fdo[0]);
waitpid(pid, &status, 0); waitpid(pid, &status, 0);

2
tests/testcall.jet
View File

@ -3,6 +3,6 @@
<set name="abc" value="abcdefg" /> <set name="abc" value="abcdefg" />
<call pgm="cat" error="error" input="$[abc]xyz" name="test1" /> <call pgm="cat" error="error" input="$[abc]xyz" name="test1" />
test1=$[test1] test1=$[test1]
name1=#[localname] name1=$[%name1]
error=$[error] error=$[error]
</jet> </jet>