Commit 858cfcf8 authored by Jim Fulton's avatar Jim Fulton

Added 'call' tag.

parent 45a72e57
...@@ -26,6 +26,7 @@ class String: ...@@ -26,6 +26,7 @@ class String:
commands={ commands={
'var': DT_Var.Var, 'var': DT_Var.Var,
'call': DT_Var.Call,
'in': DT_In.In, 'in': DT_In.In,
'if': DT_If.If, 'if': DT_If.If,
'unless': DT_If.Unless, 'unless': DT_If.Unless,
......
...@@ -106,7 +106,7 @@ __doc__='''Variable insertion parameters ...@@ -106,7 +106,7 @@ __doc__='''Variable insertion parameters
'"blah blah blah blah"', then the tag '"blah blah blah blah"', then the tag
'<!--#var spam size=10-->' inserts '"blah blah ..."'. '<!--#var spam size=10-->' inserts '"blah blah ..."'.
''' # ' ''' # '
__rcs_id__='$Id: DT_Var.py,v 1.10 1998/03/10 20:32:32 jim Exp $' __rcs_id__='$Id: DT_Var.py,v 1.11 1998/03/24 20:21:39 jim Exp $'
############################################################################ ############################################################################
# Copyright # Copyright
...@@ -160,7 +160,7 @@ __rcs_id__='$Id: DT_Var.py,v 1.10 1998/03/10 20:32:32 jim Exp $' ...@@ -160,7 +160,7 @@ __rcs_id__='$Id: DT_Var.py,v 1.10 1998/03/10 20:32:32 jim Exp $'
# (540) 371-6909 # (540) 371-6909
# #
############################################################################ ############################################################################
__version__='$Revision: 1.10 $'[11:-2] __version__='$Revision: 1.11 $'[11:-2]
from DT_Util import * from DT_Util import *
...@@ -253,6 +253,23 @@ class Var: ...@@ -253,6 +253,23 @@ class Var:
__call__=render __call__=render
class Call:
name='call'
expr=None
def __init__(self, args):
args = parse_params(args, name='', expr='')
self.__name__, self.expr = name_param(args,'call',1)
def render(self, md):
name=self.__name__
val=self.expr
if val is None: md[name]
else: val.eval(md)
return ''
__call__=render
def html_quote(v, name='(Unknown name)', md={}, def html_quote(v, name='(Unknown name)', md={},
character_entities=( character_entities=(
(regex.compile('&'), '&amp;'), (regex.compile('&'), '&amp;'),
...@@ -343,6 +360,9 @@ modifiers=map(lambda f: (f.__name__, f), modifiers) ...@@ -343,6 +360,9 @@ modifiers=map(lambda f: (f.__name__, f), modifiers)
############################################################################ ############################################################################
# $Log: DT_Var.py,v $ # $Log: DT_Var.py,v $
# Revision 1.11 1998/03/24 20:21:39 jim
# Added 'call' tag.
#
# Revision 1.10 1998/03/10 20:32:32 jim # Revision 1.10 1998/03/10 20:32:32 jim
# Fixed miss-spelling of newline_to_br # Fixed miss-spelling of newline_to_br
# #
......
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