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

fixed scoping issue on resolveKeyword using parents variables.

Browse Source
This commit is contained in:
Brad Arant 2024-11-19 08:22:16 -08:00
parent b0453fe0cb
commit dd90d2c805
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tag.cpp
View File

@ -108,7 +108,7 @@ namespace jet {
} }
void Tag::resolveKeyword(coreutils::ZString keyword) { void Tag::resolveKeyword(coreutils::ZString keyword) {
variables[keyword] = KeywordValue(variables[keyword], global, variables); variables[keyword] = KeywordValue(variables[keyword], global, parent->variables);
} }
void Tag::processContainer(coreutils::ZString &container, coreutils::ZString container2) { void Tag::processContainer(coreutils::ZString &container, coreutils::ZString container2) {

5
tests/testvar.jet
View File

@ -1,10 +1,14 @@
#!../jet-2.0 #!../jet-2.0
<jet name1="localhost" filterblanklines="true" trimlines="true">
<set name="test1" value="#[name1]" />
test1=[$[test1]]
<set name="ix" value="1" /> <set name="ix" value="1" />
<set name="letterx" value="x" /> <set name="letterx" value="x" />
<set name="var$[ix]" value="this is a test $[ix]" /> <set name="var$[ix]" value="this is a test $[ix]" />
<set name="1var1" value="This is another test" /> <set name="1var1" value="This is another test" />
<set name="var1var" value="Yet another test" /> <set name="var1var" value="Yet another test" />
<set name="var11" value="it seems to work." /> <set name="var11" value="it seems to work." />
name1=[#[name1]]
$[$[ix]var$[ix];binary] $[$[ix]var$[ix];binary]
$[var$[ix]] $[var$[ix]]
$[var$[ix]var] $[var$[ix]var]
@ -15,3 +19,4 @@ $[var$[i$[letterx]]$[i$[letterx]]]
$[ix] $[ix]
<set name="ix" expr="$[ix]+1" /> <set name="ix" expr="$[ix]+1" />
$[ix] $[ix]
</jet>