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

Added parent tag pointer throughout call hierarchy.Cleaned up output hierarchy parameter names.

Browse Source
This commit is contained in:
Brad Arant 2024-10-30 15:23:13 -07:00
parent 7138e046e2
commit ad48c530a0
46 changed files with 87 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Tag.cpp
View File

@ -27,8 +27,8 @@
namespace jet {
Tag::Tag(coreutils::ZString &in, coreutils::MString &parent, Global &global, coreutils::ZString splitTagName)
: ZString(in), parent(parent), global(global) {
Tag::Tag(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent, coreutils::ZString splitTagName)
: ZString(in), parentOut(parentOut), global(global), parent(parent) {
this->splitTagName = splitTagName;
if(in.ifNext("<")) {
name = in.getTokenInclude("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_!");
@ -101,10 +101,9 @@ namespace jet {
Tag::~Tag() {
if(evaluate)
if(output)
copyContainer(out, parent);
else
if(output)
copyContainer(container, parent);
copyContainer(out, parentOut);
else if(output)
copyContainer(container, parentOut);
}
void Tag::processContainer(coreutils::ZString &container, coreutils::ZString container2) {
@ -118,64 +117,64 @@ namespace jet {
while(!in.eod()) {
if(in.startsWith("<")) {
if(ifTagName(in, "mysql")) {
__mysql _mysql(in, out, global);
__mysql _mysql(in, out, global, this);
continue;
} else if(ifTagName(in, "comment")) {
__comment _comment(in, out, global);
__comment _comment(in, out, global, this);
continue;
} else if(ifTagName(in, "sql")) {
__sql _sql(in, out, global);
__sql _sql(in, out, global, this);
continue;
} else if(ifTagName(in, "whilerow")) {
__whilerow _whilerow(in, out, global);
__whilerow _whilerow(in, out, global, this);
continue;
} else if(ifTagName(in, "for")) {
__for _for(in, out, global);
__for _for(in, out, global, this);
continue;
} else if(ifTagName(in, "if")) {
__if _if(in, out, global);
__if _if(in, out, global, this);
continue;
} else if(ifTagName(in, "ifrow")) {
__ifrow _ifrow(in, out, global);
__ifrow _ifrow(in, out, global, this);
continue;
} else if(ifTagName(in, "include")) {
__include _include(in, out, global);
__include _include(in, out, global, this);
continue;
} else if(ifTagName(in, "jet")) {
__jet _jet(in, out, global);
__jet _jet(in, out, global, this);
continue;
} else if(ifTagName(in, "read")) {
__read _read(in, out, global);
__read _read(in, out, global, this);
continue;
} else if(ifTagName(in, "write")) {
__write _write(in, out, global);
__write _write(in, out, global, this);
continue;
} else if(ifTagName(in, "set")) {
__set _set(in, out, global);
__set _set(in, out, global, this);
continue;
} else if(ifTagName(in, "call")) {
__call _call(in, out, global);
__call _call(in, out, global, this);
continue;
} else if(ifTagName(in, "system")) {
__system _system(in, out, global);
__system _system(in, out, global, this);
continue;
} else if(ifTagName(in, "while")) {
__while _while(in, out, global);
__while _while(in, out, global, this);
continue;
} else if(ifTagName(in, "header")) {
__header _header(in, out, global);
__header _header(in, out, global, this);
continue;
} else if(ifTagName(in, "whiledir")) {
__whiledir _whiledir(in, out, global);
__whiledir _whiledir(in, out, global, this);
continue;
} else if(ifTagName(in, "stream")) {
__stream _stream(in, out, global);
__stream _stream(in, out, global, this);
continue;
} else if(ifTagName(in, "tag")) {
__tag _tag(in, out, global);
__tag _tag(in, out, global, this);
continue;
} else if(ifTagDefined(in, tag)) {
__dotag _dotag(in, out, global);
__dotag _dotag(in, out, global, this);
continue;
} else if(ifTagName(in, "container")) {
processContainer(container2);

5
Tag.h
View File

@ -11,7 +11,7 @@ namespace jet {
class Tag : public coreutils::ZString {
public:
Tag(coreutils::ZString &in, coreutils::MString &parent, Global &global, coreutils::ZString splitTagName = "");
Tag(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent, coreutils::ZString splitTagName = "");
virtual ~Tag();
coreutils::ZString name;
coreutils::ZString container;
@ -27,8 +27,9 @@ namespace jet {
void copyContainer(coreutils::ZString &in, coreutils::MString &out);
Global &global;
coreutils::MString &parent;
Tag *parent;
coreutils::MString &parentOut;
coreutils::MString out;
bool output = true;

2
__call.cpp
View File

@ -9,7 +9,7 @@
namespace jet {
__call::__call(coreutils::ZString &in, coreutils::MString &out, Global &global) : Tag(in, out, global) {
__call::__call(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent) : Tag(in, parentOut, global, parent) {
if(hasContainer)
throw coreutils::Exception("call tag cannot have a container.");
if(!variableDefined("pgm"))

2
__call.h
View File

@ -8,7 +8,7 @@ namespace jet {
class __call : public Tag {
public:
__call(coreutils::ZString &in, coreutils::MString &out, Global &global);
__call(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent);
private:
int pid;

2
__comment.cpp
View File

@ -3,7 +3,7 @@
namespace jet {
__comment::__comment(coreutils::ZString &in, coreutils::MString &out, Global &global) : Tag(in, out, global) {
__comment::__comment(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent) : Tag(in, parentOut, global, parent) {
if(!hasContainer)
throw coreutils::Exception("comment must have a container.");
output = false;

2
__comment.h
View File

@ -8,7 +8,7 @@ namespace jet {
class __comment : public Tag {
public:
__comment(coreutils::ZString &in, coreutils::MString &out, Global &global);
__comment(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent);
};

2
__dotag.cpp
View File

@ -3,7 +3,7 @@
namespace jet {
__dotag::__dotag(coreutils::ZString &in, coreutils::MString &parent, Global &global) : Tag(in, parent, global) {
__dotag::__dotag(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent) : Tag(in, parentOut, global, parent) {
hasContainer = true;
coreutils::ZString container3 = global.tags[name];
processContainer(container3, container);

2
__dotag.h
View File

@ -9,7 +9,7 @@ namespace jet {
class __dotag : public Tag {
public:
__dotag(coreutils::ZString &in, coreutils::MString &parent, Global &global);
__dotag(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent);
};

2
__for.cpp
View File

@ -4,7 +4,7 @@
namespace jet {
__for::__for(coreutils::ZString &in, coreutils::MString &out, Global &global) : Tag(in, out, global) {
__for::__for(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent) : Tag(in, parentOut, global, parent) {
double counter = 0.0f;
double end = 0.0f;
double step = 0.0f;

2
__for.h
View File

@ -9,7 +9,7 @@ namespace jet {
class __for : public Tag {
public:
__for(coreutils::ZString &in, coreutils::MString &parent, Global &global);
__for(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent);
};

2
__header.cpp
View File

@ -5,7 +5,7 @@
namespace jet {
__header::__header(coreutils::ZString &in, coreutils::MString &parent, Global &global) : Tag(in, parent, global) {
__header::__header(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent) : Tag(in, parentOut, global, parent) {
output = false;
if(!variableDefined("name"))
throw coreutils::Exception("header tag must have name defined.");

2
__header.h
View File

@ -11,7 +11,7 @@ namespace jet {
class __header : public Tag {
public:
__header(coreutils::ZString &in, coreutils::MString &parent, Global &global);
__header(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent);
protected:

2
__if.cpp
View File

@ -5,7 +5,7 @@
namespace jet {
__if::__if(coreutils::ZString &in, coreutils::MString &parent, Global &global) : Tag(in, parent, global, "else") {
__if::__if(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent) : Tag(in, parentOut, global, parent, "else") {
coreutils::MString result;
bool booleanResult = false;

2
__if.h
View File

@ -11,7 +11,7 @@ namespace jet {
class __if : public Tag {
public:
__if(coreutils::ZString &in, coreutils::MString &parent, Global &global);
__if(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent);
};

2
__ifrow.cpp
View File

@ -7,7 +7,7 @@
namespace jet {
__ifrow::__ifrow(coreutils::ZString &in, coreutils::MString &parent, Global &global) : Tag(in, parent, global, "else") {
__ifrow::__ifrow(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent) : Tag(in, parentOut, global, parent, "else") {
output = false;
if(!hasContainer)
throw coreutils::Exception("ifrow tag must have a container.");

2
__ifrow.h
View File

@ -8,7 +8,7 @@ namespace jet {
class __ifrow : public Tag {
public:
__ifrow(coreutils::ZString &in, coreutils::MString &parent, Global &global);
__ifrow(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent);
};

2
__include.cpp
View File

@ -4,7 +4,7 @@
namespace jet {
__include::__include(coreutils::ZString &in, coreutils::MString &out, Global &global) : Tag(in, out, global) {
__include::__include(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent) : Tag(in, parentOut, global, parent) {
if(!variableDefined("file"))
throw coreutils::Exception("file keyword must be specified.");
if(hasContainer)

2
__include.h
View File

@ -8,7 +8,7 @@ namespace jet {
class __include : public Tag {
public:
__include(coreutils::ZString &in, coreutils::MString &out, Global &global);
__include(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent);
};

2
__jet.cpp
View File

@ -4,7 +4,7 @@
namespace jet {
__jet::__jet(coreutils::ZString &in, coreutils::MString &parent, Global &global) : Tag(in, parent, global) {
__jet::__jet(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent) : Tag(in, parentOut, global, parent) {
if(variables["cgi"] == "true") {
coreutils::ZString requestMethod(getenv("REQUEST_METHOD"));
if(requestMethod == "POST") {

2
__jet.h
View File

@ -10,7 +10,7 @@ namespace jet {
class __jet : public Tag {
public:
__jet(coreutils::ZString &in, coreutils::MString &parent, Global &global);
__jet(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent);
};

2
__mysql.cpp
View File

@ -4,7 +4,7 @@
namespace jet {
__mysql::__mysql(coreutils::ZString &in, coreutils::MString &parent, Global &global) : Tag(in, parent, global) {
__mysql::__mysql(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent) : Tag(in, parentOut, global, parent) {
if(!variableDefined("host"))
throw coreutils::Exception("host must be specified for mysql tag.");

2
__mysql.h
View File

@ -12,7 +12,7 @@ namespace jet {
class __mysql : public Tag {
public:
__mysql(coreutils::ZString &in, coreutils::MString &parent, Global &global);
__mysql(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent);
~__mysql();
void query(coreutils::MString query);

2
__read.cpp
View File

@ -6,7 +6,7 @@
namespace jet {
__read::__read(coreutils::ZString &in, coreutils::MString &parent, Global &global) : Tag(in, parent, global) {
__read::__read(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent) : Tag(in, parentOut, global, parent) {
if(!variableDefined("file"))
throw coreutils::Exception("file keyword must be specified.");
if(!variableDefined("name"))

2
__read.h
View File

@ -8,7 +8,7 @@ namespace jet {
class __read : public Tag {
public:
__read(coreutils::ZString &in, coreutils::MString &parent, Global &global);
__read(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent);
private:
int fd;

2
__set.cpp
View File

@ -5,7 +5,7 @@
namespace jet {
__set::__set(coreutils::ZString &in, coreutils::MString &parent, Global &global) : Tag(in, parent, global) {
__set::__set(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent) : Tag(in, parentOut, global, parent) {
output = false;
if(!variableDefined("name"))
throw coreutils::Exception("set tag must have name defined.");

2
__set.h
View File

@ -11,7 +11,7 @@ namespace jet {
class __set : public Tag {
public:
__set(coreutils::ZString &in, coreutils::MString &parent, Global &global);
__set(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent);
protected:

2
__sql.cpp
View File

@ -9,7 +9,7 @@
namespace jet {
__sql::__sql(coreutils::ZString &in, coreutils::MString &parent, Global &global) : Tag(in, parent, global) {
__sql::__sql(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent) : Tag(in, parentOut, global, parent) {
output = false;
if(!hasContainer)
throw coreutils::Exception("sql tag must have a container.");

2
__sql.h
View File

@ -8,7 +8,7 @@ namespace jet {
class __sql : public Tag {
public:
__sql(coreutils::ZString &in, coreutils::MString &parent, Global &global);
__sql(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent);
};

2
__stream.cpp
View File

@ -3,7 +3,7 @@
namespace jet {
__stream::__stream(coreutils::ZString &in, coreutils::MString &parent, Global &global) : Tag(in, parent, global) {
__stream::__stream(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent) : Tag(in, parentOut, global, parent) {
if(!variableDefined("name"))
throw coreutils::Exception("stream tag must have a file name to stream.");

2
__stream.h
View File

@ -9,7 +9,7 @@ namespace jet {
class __stream : public Tag {
public:
__stream(coreutils::ZString &in, coreutils::MString &parent, Global &global);
__stream(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent);
};

2
__system.cpp
View File

@ -8,7 +8,7 @@
namespace jet {
__system::__system(coreutils::ZString &in, coreutils::MString &out, Global &global) : Tag(in, out, global) {
__system::__system(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent) : Tag(in, parentOut, global, parent) {
if(hasContainer)
throw coreutils::Exception("system tag cannot have a container.");
if(!variableDefined(coreutils::ZString("pgm")))

2
__system.h
View File

@ -8,7 +8,7 @@ namespace jet {
class __system : public Tag {
public:
__system(coreutils::ZString &in, coreutils::MString &out, Global &global);
__system(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent);
private:
int pid;

2
__tag.cpp
View File

@ -3,7 +3,7 @@
namespace jet {
__tag::__tag(coreutils::ZString &in, coreutils::MString &parent, Global &global) : Tag(in, parent, global) {
__tag::__tag(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent) : Tag(in, parentOut, global, parent) {
evaluate = false;
output = false;
if(!variableDefined("name"))

2
__tag.h
View File

@ -9,7 +9,7 @@ namespace jet {
class __tag : public Tag {
public:
__tag(coreutils::ZString &in, coreutils::MString &parent, Global &global);
__tag(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent);
};

2
__while.cpp
View File

@ -4,7 +4,7 @@
namespace jet {
__while::__while(coreutils::ZString &in, coreutils::MString &out, Global &global) : Tag(in, out, global) {
__while::__while(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent) : Tag(in, parentOut, global, parent) {
if(variableDefined(coreutils::ZString("value1"))) {
if(variableDefined(coreutils::ZString("expr")))

2
__while.h
View File

@ -9,7 +9,7 @@ namespace jet {
class __while : public Tag {
public:
__while(coreutils::ZString &in, coreutils::MString &out, Global &global);
__while(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent);
};

2
__whiledir.cpp
View File

@ -8,7 +8,7 @@
namespace jet {
__whiledir::__whiledir(coreutils::ZString &in, coreutils::MString &parent, Global &global) : Tag(in, parent, global) {
__whiledir::__whiledir(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent) : Tag(in, parentOut, global, parent) {
if(!variableDefined("path"))
throw coreutils::Exception("whiledir tag must specify a path.");
if(variableDefined("sort") && (variables["sort"] == "true")) {

2
__whiledir.h
View File

@ -10,7 +10,7 @@ namespace jet {
class __whiledir : public Tag {
public:
__whiledir(coreutils::ZString &in, coreutils::MString &parent, Global &global);
__whiledir(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent);
};

2
__whilerow.cpp
View File

@ -5,7 +5,7 @@
namespace jet {
__whilerow::__whilerow(coreutils::ZString &in, coreutils::MString &parent, Global &global) : Tag(in, parent, global) {
__whilerow::__whilerow(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent) : Tag(in, parentOut, global, parent) {
int count = variables["count"].asInteger();

2
__whilerow.h
View File

@ -10,7 +10,7 @@ namespace jet {
class __whilerow : public Tag {
public:
__whilerow(coreutils::ZString &in, coreutils::MString &parent, Global &global);
__whilerow(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent);
};

2
__write.cpp
View File

@ -7,7 +7,7 @@
namespace jet {
__write::__write(coreutils::ZString &in, coreutils::MString &parent, Global &global) : Tag(in, parent, global) {
__write::__write(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent) : Tag(in, parentOut, global, parent) {
output = false;
int mode = 0;
int len;

2
__write.h
View File

@ -11,7 +11,7 @@ namespace jet {
class __write : public Tag {
public:
__write(coreutils::ZString &in, coreutils::MString &parent, Global &global);
__write(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent);
protected:

2
jet-2.0.cpp
View File

@ -16,7 +16,7 @@ int main(int argc, char **argv) {
try {
coreutils::MString out;
jet::__jet *jet = new jet::__jet(data, out, global);
jet::__jet *jet = new jet::__jet(data, out, global, NULL);
delete jet;
global.outputHeaders();
std::cout << out;

9
testdb.jet Executable file
View File

@ -0,0 +1,9 @@
#!./jet-2.0
<jet cgi="true" name1="localname" filterblanklines="true" trimlines="true">
<mysql host="localhost" database="barant" user="barant" password="uversa" sessionid="1">
<sql sessionid="1">select * from testdata</sql>
<whilerow name="index" count="10" sessionid="1">
$[1.id] $[1.text] $[1.value]
</whilerow>
</mysql>
</jet>

6
testfor.jet Executable file
View File

@ -0,0 +1,6 @@
#!./jet-2.0
<jet cgi="true" name1="localname" filterblanklines="true" trimlines="true">
<for name="ix" start="1" end="5" step="1">
-->#[ix]<--
</for>
</jet>

6
testjet.jet
View File

@ -11,12 +11,6 @@
---
$[nonexistant]
$[%HOME]
<mysql host="localhost" database="barant" user="barant" password="uversa" sessionid="1">
<sql sessionid="1">select * from testdata</sql>
<whilerow name="index" count="10" sessionid="1">
$[1.id] $[1.text] $[1.value]
</whilerow>
</mysql>
<set name="ix" value="1" />
<set name="theexpr" expr="SUBSTRING('abcdefg', 5 - 4, 20 - 17)" />
<set name="addition" expr="5+3" />