Commit 72f599e1 authored by Evan Simpson's avatar Evan Simpson

Minor change to METAL slot handling. Convert unfilled 'define-slot' to...

Minor change to METAL slot handling.  Convert unfilled 'define-slot' to neutral 'slot' instead of active 'fill-slot' on expansion.
parent 7eb2be50
...@@ -31,6 +31,7 @@ KNOWN_METAL_ATTRIBUTES = [ ...@@ -31,6 +31,7 @@ KNOWN_METAL_ATTRIBUTES = [
"use-macro", "use-macro",
"define-slot", "define-slot",
"fill-slot", "fill-slot",
"slot",
] ]
KNOWN_TAL_ATTRIBUTES = [ KNOWN_TAL_ATTRIBUTES = [
......
...@@ -268,7 +268,7 @@ class TALInterpreter: ...@@ -268,7 +268,7 @@ class TALInterpreter:
name = prefix + "use-macro" name = prefix + "use-macro"
value = macs[-1][0] # Macro name value = macs[-1][0] # Macro name
elif suffix == "define-slot": elif suffix == "define-slot":
name = prefix + "fill-slot" name = prefix + "slot"
elif suffix == "fill-slot": elif suffix == "fill-slot":
pass pass
else: else:
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<span metal:use-macro="OUTER2"> <span metal:use-macro="OUTER2">
AAA AAA
<xxx metal:fill-slot="OUTERSLOT"> <xxx metal:slot="OUTERSLOT">
<span>INNER</span> <span>INNER</span>
</xxx> </xxx>
BBB BBB
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<span metal:use-macro="OUTER3"> <span metal:use-macro="OUTER3">
AAA AAA
<xxx metal:fill-slot="OUTERSLOT"> <xxx metal:slot="OUTERSLOT">
<span>INNER <span>INNER
<xxx>INNERSLOT</xxx> <xxx>INNERSLOT</xxx>
</span> </span>
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</span> </span>
<span metal:use-macro="INNER3">INNER <span metal:use-macro="INNER3">INNER
<xxx metal:fill-slot="INNERSLOT">INNERSLOT</xxx> <xxx metal:slot="INNERSLOT">INNERSLOT</xxx>
</span> </span>
<span metal:use-macro="INNER3">INNER <span metal:use-macro="INNER3">INNER
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment