Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
Zope
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
Zope
Commits
877cea94
Commit
877cea94
authored
Feb 05, 2001
by
Guido van Rossum
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Oops. I used "use-slot", but should have used "fill-slot".
parent
b4581536
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
13 additions
and
13 deletions
+13
-13
lib/python/TAL/TALCompiler.py
lib/python/TAL/TALCompiler.py
+2
-2
lib/python/TAL/TALInterpreter.py
lib/python/TAL/TALInterpreter.py
+1
-1
lib/python/TAL/TALVisitor.py
lib/python/TAL/TALVisitor.py
+2
-2
lib/python/TAL/test/out4.xml
lib/python/TAL/test/out4.xml
+1
-1
lib/python/TAL/test/out8.xml
lib/python/TAL/test/out8.xml
+1
-1
lib/python/TAL/test/test4.xml
lib/python/TAL/test/test4.xml
+1
-1
lib/python/TAL/test/test8.xml
lib/python/TAL/test/test8.xml
+1
-1
lib/python/TAL/tests/out4.xml
lib/python/TAL/tests/out4.xml
+1
-1
lib/python/TAL/tests/out8.xml
lib/python/TAL/tests/out8.xml
+1
-1
lib/python/TAL/tests/test4.xml
lib/python/TAL/tests/test4.xml
+1
-1
lib/python/TAL/tests/test8.xml
lib/python/TAL/tests/test8.xml
+1
-1
No files found.
lib/python/TAL/TALCompiler.py
View file @
877cea94
...
...
@@ -205,12 +205,12 @@ class METALCompiler(DOMVisitor):
block
=
self
.
popProgram
()
self
.
emit
(
"defineSlot"
,
slotName
,
block
)
return
slotName
=
node
.
getAttributeNS
(
ZOPE_METAL_NS
,
"
use
-slot"
)
slotName
=
node
.
getAttributeNS
(
ZOPE_METAL_NS
,
"
fill
-slot"
)
if
slotName
:
self
.
pushProgram
()
self
.
compileElement
(
node
)
block
=
self
.
popProgram
()
self
.
emit
(
"
use
Slot"
,
slotName
,
block
)
self
.
emit
(
"
fill
Slot"
,
slotName
,
block
)
return
self
.
compileElement
(
node
)
...
...
lib/python/TAL/TALInterpreter.py
View file @
877cea94
...
...
@@ -200,7 +200,7 @@ class TALInterpreter:
self
.
interpret
(
macro
)
self
.
slots
,
self
.
inMacro
=
save
def
do_
use
Slot
(
self
,
slotName
,
program
):
def
do_
fill
Slot
(
self
,
slotName
,
program
):
self
.
interpret
(
program
)
def
do_defineSlot
(
self
,
slotName
,
program
):
...
...
lib/python/TAL/TALVisitor.py
View file @
877cea94
...
...
@@ -344,7 +344,7 @@ def _macroVisitor(node, macroIndex, __elementNodeType=Node.ELEMENT_NODE):
def slotIndexer(rootNode):
"""
Return a dictionary containing all
use
-slot nodes in a subtree.
Return a dictionary containing all
fill
-slot nodes in a subtree.
The dictionary will have the form {slotName: node, ...}.
"""
...
...
@@ -354,7 +354,7 @@ def slotIndexer(rootNode):
def _slotVisitor(node, slotIndex, __elementNodeType=Node.ELEMENT_NODE):
# Internal routine to efficiently recurse down the tree of elements
slotName = node.getAttributeNS(ZOPE_METAL_NS, "
use
-
slot
")
slotName = node.getAttributeNS(ZOPE_METAL_NS, "
fill
-
slot
")
if slotName:
if slotIndex.has_key(slotName):
print ("
Duplicate
slot
definition
:
%
s
in
<%
s
>
" %
...
...
lib/python/TAL/test/out4.xml
View file @
877cea94
...
...
@@ -33,7 +33,7 @@
<p
m:define-slot=
"whoops"
>
define-slot
</p>
<p
m:
use-slot=
"whoops"
>
use
-slot
</p>
<p
m:
fill-slot=
"whoops"
>
fill
-slot
</p>
</body>
...
...
lib/python/TAL/test/out8.xml
View file @
877cea94
...
...
@@ -7,7 +7,7 @@
</tr>
<tr>
<td>
Bottom left
</td>
<td><span
m:
use
-slot=
"bottomRight"
>
<td><span
m:
fill
-slot=
"bottomRight"
>
<h1>
Some headline
</h1>
<p>
This is the real contents of the bottom right slot.
</p>
<p>
It is supposed to contain a lot of text. Blah, blah, blab.
...
...
lib/python/TAL/test/test4.xml
View file @
877cea94
...
...
@@ -20,7 +20,7 @@
<p
m:define-slot=
"whoops"
>
define-slot
</p>
<p
m:
use-slot=
"whoops"
>
use
-slot
</p>
<p
m:
fill-slot=
"whoops"
>
fill
-slot
</p>
</body>
...
...
lib/python/TAL/test/test8.xml
View file @
877cea94
...
...
@@ -3,7 +3,7 @@
<!-- macro use with slots -->
<tr>
<td>
<span
m:
use
-slot=
"bottomRight"
>
<span
m:
fill
-slot=
"bottomRight"
>
<h1>
Some headline
</h1>
<p>
This is the real contents of the bottom right slot.
</p>
<p>
It is supposed to contain a lot of text. Blah, blah, blab.
...
...
lib/python/TAL/tests/out4.xml
View file @
877cea94
...
...
@@ -33,7 +33,7 @@
<p
m:define-slot=
"whoops"
>
define-slot
</p>
<p
m:
use-slot=
"whoops"
>
use
-slot
</p>
<p
m:
fill-slot=
"whoops"
>
fill
-slot
</p>
</body>
...
...
lib/python/TAL/tests/out8.xml
View file @
877cea94
...
...
@@ -7,7 +7,7 @@
</tr>
<tr>
<td>
Bottom left
</td>
<td><span
m:
use
-slot=
"bottomRight"
>
<td><span
m:
fill
-slot=
"bottomRight"
>
<h1>
Some headline
</h1>
<p>
This is the real contents of the bottom right slot.
</p>
<p>
It is supposed to contain a lot of text. Blah, blah, blab.
...
...
lib/python/TAL/tests/test4.xml
View file @
877cea94
...
...
@@ -20,7 +20,7 @@
<p
m:define-slot=
"whoops"
>
define-slot
</p>
<p
m:
use-slot=
"whoops"
>
use
-slot
</p>
<p
m:
fill-slot=
"whoops"
>
fill
-slot
</p>
</body>
...
...
lib/python/TAL/tests/test8.xml
View file @
877cea94
...
...
@@ -3,7 +3,7 @@
<!-- macro use with slots -->
<tr>
<td>
<span
m:
use
-slot=
"bottomRight"
>
<span
m:
fill
-slot=
"bottomRight"
>
<h1>
Some headline
</h1>
<p>
This is the real contents of the bottom right slot.
</p>
<p>
It is supposed to contain a lot of text. Blah, blah, blab.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment