Changeset 5352:62f54a9810b0 in livinglogic.python.xist

Show
Ignore:
Timestamp:
02/17/13 16:49:32 (6 years ago)
Author:
Walter Doerwald <walter@…>
Branch:
default
Message:

Call ASTs UL4ON methods at the end of the Template methods.

Reactivate Java tests.

Files:
2 modified

Legend:

Unmodified
Added
Removed
  • src/ll/ul4c.py

    r5351 r5352  
    407407        # an int, which means: add the int to the indentation level 
    408408        # a string, which means: add this string to the output 
    409         yield self.location.root.source[self.start:self.end].replace("\r\n", " ").replace("\n", " ") 
     409        yield self.location.source[self.start:self.end].replace("\r\n", " ").replace("\n", " ") 
    410410 
    411411    @misc.notimplemented 
     
    21022102 
    21032103    def ul4ondump(self, encoder): 
    2104         # Don't call ``super().ul4ondump()``, as we want the version to be first 
     2104        # Don't call ``super().ul4ondump()`` first, as we want the version to be first 
    21052105        encoder.dump(self.version) 
    21062106        encoder.dump(self.source) 
     
    21092109        encoder.dump(self.startdelim) 
    21102110        encoder.dump(self.enddelim) 
    2111         encoder.dump(self.location) 
    2112         encoder.dump(self.endlocation) 
    2113         encoder.dump(self.content) 
     2111        super().ul4ondump(encoder) 
    21142112 
    21152113    def ul4onload(self, decoder): 
     
    21222120        self.startdelim = decoder.load() 
    21232121        self.enddelim = decoder.load() 
    2124         self.location = decoder.load() 
    2125         self.endlocation = decoder.load() 
    2126         self.content = decoder.load() 
     2122        super().ul4onload(decoder) 
    21272123 
    21282124    @classmethod 
  • test/test_ul4.py

    r5351 r5352  
    445445    # ("js", render_js), 
    446446    # ("php", render_php), 
    447     # ("java_interpreted_by_python", render_java_interpretedtemplate_by_python), 
    448     # ("java_interpreted_by_java", render_java_interpretedtemplate_by_java), 
     447    ("java_interpreted_by_python", render_java_interpretedtemplate_by_python), 
     448    ("java_interpreted_by_java", render_java_interpretedtemplate_by_java), 
    449449] 
    450450 
     
    456456    # ("js", call_js), 
    457457    # ("php", call_php), 
    458     # ("java_interpreted_by_python", call_java_interpretedtemplate_by_python), 
    459     # ("java_interpreted_by_java", call_java_interpretedtemplate_by_java), 
     458    ("java_interpreted_by_python", call_java_interpretedtemplate_by_python), 
     459    ("java_interpreted_by_java", call_java_interpretedtemplate_by_java), 
    460460] 
    461461