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

Some work on call tag.

Browse Source
This commit is contained in:
Brad Arant 2024-10-14 12:11:39 -07:00
parent f1624b074a
commit 2dd41238de
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
__call.cpp
View File

@ -1,6 +1,7 @@
#include "__call.h" #include "__call.h"
#include "Exception.h" #include "Exception.h"
#include "MString.h" #include "MString.h"
#include <ostream>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
@ -10,8 +11,8 @@ namespace jet {
__call::__call(coreutils::ZString &in, coreutils::MString &out, Global &global) : Tag(in, out, global) { __call::__call(coreutils::ZString &in, coreutils::MString &out, Global &global) : Tag(in, out, global) {
if(hasContainer) if(hasContainer)
throw coreutils::Exception("call cannot have a container."); throw coreutils::Exception("call tag cannot have a container.");
if(!variableDefined(coreutils::ZString("pgm"))) if(!variableDefined("pgm"))
throw coreutils::Exception("pgm keyword must be specified."); throw coreutils::Exception("pgm keyword must be specified.");
argv[0] = variables["pgm"].c_str(); // TODO: Need to peel off the program name only and pass as argv[0]. argv[0] = variables["pgm"].c_str(); // TODO: Need to peel off the program name only and pass as argv[0].
for(ix = 1; ix <= 50; ++ix) { for(ix = 1; ix <= 50; ++ix) {
@ -42,7 +43,6 @@ namespace jet {
} }
rc = execve(variables["pgm"].c_str(), argv, NULL); rc = execve(variables["pgm"].c_str(), argv, NULL);
close(fdo[1]); close(fdo[1]);
std::cout << "rc: " << rc << std::endl;
exit(rc); exit(rc);
} }
close(fdo[1]); close(fdo[1]);
@ -51,6 +51,8 @@ namespace jet {
else else
out.read(fdo[0]); out.read(fdo[0]);
waitpid(pid, &status, 0); waitpid(pid, &status, 0);
if(variableDefined("status"))
global.variables[variables["status"]] = (status >> 8 & 255);
} }
} }

2
__system.cpp
View File

@ -10,7 +10,7 @@ namespace jet {
__system::__system(coreutils::ZString &in, coreutils::MString &out, Global &global) : Tag(in, out, global) { __system::__system(coreutils::ZString &in, coreutils::MString &out, Global &global) : Tag(in, out, global) {
if(hasContainer) if(hasContainer)
throw coreutils::Exception("call cannot have a container."); throw coreutils::Exception("system tag cannot have a container.");
if(!variableDefined(coreutils::ZString("pgm"))) if(!variableDefined(coreutils::ZString("pgm")))
throw coreutils::Exception("pgm keyword must be specified."); throw coreutils::Exception("pgm keyword must be specified.");
argv[0] = variables["pgm"].c_str(); // TODO: Need to peel off the program name only and pass as argv[0]. argv[0] = variables["pgm"].c_str(); // TODO: Need to peel off the program name only and pass as argv[0].

BIN
jet-2.0
View File

Binary file not shown.

5
testjet.jet
View File

@ -50,8 +50,9 @@
<for name="ix" start="1" end="5" step="1"> <for name="ix" start="1" end="5" step="1">
-->#[ix]<-- -->#[ix]<--
</for> </for>
<call pgm="/usr/bin/ls" arg1="-al" name="ls" /> <call status="rc" pgm="/usr/bin/ls" arg1="-al" name="ls" />
$[lsi] $[rc]
$[ls]
<read file="compile" name="file" /> <read file="compile" name="file" />
$[filex] $[filex]
</html> </html>