work towards a clean compile on migrating set and get variables from Tag.
This commit is contained in:
1 parent
2549220914
commit
5c27df59da
25 files changed
+178
-306
No files matched your search
+6
-8
@@ -17,21 +17,19 @@ namespace jet {
|
||||
throw coreutils::Exception("header tag cannot have both expr and value.");
|
||||
if(!keywordDefined("expr") && !keywordDefined("value") && !hasContainer)
|
||||
throw coreutils::Exception("header tag must have a value, expr or a container.");
|
||||
resolveKeyword("name");
|
||||
if(keywordDefined("expr")) {
|
||||
if(keywordDefined("eval"))
|
||||
throw coreutils::Exception("Cannot use eval with expr.");
|
||||
global.headers[keywords["name"]] = Operand(keywords["expr"], global, parent->variables, keywords).string;
|
||||
global.headers[keywords[resolveKeyword("name")]] = Operand(keywords["expr"], *this).string;
|
||||
} else if(hasContainer) {
|
||||
processContainer(container);
|
||||
if(evaluate) {
|
||||
global.headers[keywords["name"]] = out;
|
||||
global.headers[keywords[resolveKeyword("name")]] = out;
|
||||
} else {
|
||||
global.headers[keywords["name"]] = container;
|
||||
global.headers[keywords[resolveKeyword("name")]] = container;
|
||||
}
|
||||
} else {
|
||||
resolveKeyword("value");
|
||||
global.headers[keywords["name"]] = keywords["value"];
|
||||
}
|
||||
} else
|
||||
global.headers[keywords[resolveKeyword("name")]] = keywords[resolveKeyword("value")];
|
||||
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user