Changeset 19

Show
Ignore:
Timestamp:
18/08/04 12:53:02 (4 years ago)
Author:
steve
Message:

removed "Element" from class names

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/airspeed.py

    r18 r19  
    203203 
    204204 
    205 class Comment(_Element): 
     205class Null: 
     206    def evaluate(self, namespace, stream): pass 
     207 
     208 
     209class Comment(_Element, Null): 
    206210    COMMENT_PATTERN = re.compile('^#(?:#.*?(?:\n|$)|\*.*?\*#(?:[ \t]*\n)?)(.*)$', re.M + re.S) 
    207211    def __init__(self, text): 
    208212        self.remaining_text, = self.match_or_reject(self.COMMENT_PATTERN, text) 
    209  
    210     def evaluate(self, namespace, stream): 
    211         pass 
    212213 
    213214 
     
    223224        return self.expression.calculate(namespace) 
    224225 
     226 
    225227class End(_Element): 
    226228    END = re.compile(r'^#end(.*)', re.I + re.S) 
     
    228230        self.remaining_text, = self.match_or_reject(self.END, text) 
    229231 
    230 class Null: 
    231     def evaluate(self, namespace, stream): pass 
    232232 
    233233class IfDirective(_Element): 
  • trunk/airspeed_test.py

    r18 r19  
    237237# TODO: 
    238238# 
    239 Directives inside string literals 
     239Comparative operators >=, ==, !=, <=, ! 
    240240#  Math expressions 
    241241#  Gobbling up whitespace (tricky!) 
    242 #  #elseif 
     242#  range literals 
     243#  list literals 
    243244#  #parse, #include 
    244245#  #macro 
    245 map literals, range literals, list literals 
    246 Comparative operators >=, ==, !=, <=, ! 
     246Directives inside string literals 
     247map literals 
    247248#  Sub-object assignment:  #set( $customer.Behavior = $primate ) 
    248249#  Q. What is scope of #set ($customer.Name = 'john')  ??? 
    249250#  Scope of #set across if/elseif/else? 
     251# 
    250252 
    251253