more work on scoping.
This commit is contained in:
parent
ca7aabd73f
commit
90d7d07e7e
2
Tag.cpp
2
Tag.cpp
@ -205,7 +205,7 @@ namespace jet {
|
|||||||
if(resolveContainerParent)
|
if(resolveContainerParent)
|
||||||
out.write(global.getVariable(in, parent->variables));
|
out.write(global.getVariable(in, parent->variables));
|
||||||
else
|
else
|
||||||
out.write(global.getVariable(in, variables));
|
out.write(global.getVariable(in, local->variables));
|
||||||
} else {
|
} else {
|
||||||
out.write(in.nextChar());
|
out.write(in.nextChar());
|
||||||
}
|
}
|
||||||
|
@ -17,9 +17,9 @@ noeval=[this is the value store in #[name1].]
|
|||||||
nonexistant=[]
|
nonexistant=[]
|
||||||
numbers=[0123456789]
|
numbers=[0123456789]
|
||||||
subtraction=[2]
|
subtraction=[2]
|
||||||
testinclude=[xThis is a container set with ''x]
|
testinclude=[]
|
||||||
theexpr=[bcd]
|
theexpr=[bcd]
|
||||||
thename=[this is the value store in .]
|
thename=[this is the value store in localname.]
|
||||||
tohex=[tohex]
|
tohex=[tohex]
|
||||||
varname1=[vardata]
|
varname1=[vardata]
|
||||||
x=[]
|
x=[]
|
||||||
@ -27,3 +27,4 @@ x=[]
|
|||||||
file=[./testinclude.jet]
|
file=[./testinclude.jet]
|
||||||
localvar=[This is a container set with '']
|
localvar=[This is a container set with '']
|
||||||
name1=[]
|
name1=[]
|
||||||
|
testinclude=[xThis is a container set with ''x]
|
||||||
|
@ -2,6 +2,6 @@
|
|||||||
This is from an include tag.
|
This is from an include tag.
|
||||||
localname='#[name1]'
|
localname='#[name1]'
|
||||||
<set name="include" value="yes" />
|
<set name="include" value="yes" />
|
||||||
<set name="testinclude" value="x#[localvar]x" />
|
<set name="testinclude" value="x#[localvar]x" scope="local" />
|
||||||
test='$[testinclude]'
|
test='$[testinclude]'
|
||||||
<dump file="./dump.txt" />
|
<dump file="./dump.txt" />
|
Loading…
x
Reference in New Issue
Block a user