Changeset 98:f61a486afd5b

Timestamp:

02/13/10 17:43:55 (7 months ago)

Author:

Roger Gammans <rgammans@…>

Branch:

default

Message:

Fix issues with role re-definition accrue setting from precious parse runs.

• Adds a tst which seems to trigger the broken behavoir

Files:

• MysteryMachine/parsetools/MMParser.py (modified) (3 diffs)
• tests/Parser.py (modified) (2 diffs)

MysteryMachine/parsetools/MMParser.py

@@ -81 +81 @@
         src =repr(self.myobject)+":unknown"
     src = repr(self.myobject.parent)+":"+src
-    role_def = ".. role:: mm(mm)\n :systemcntxt: %s\n\n" % src
+    role_def = ".. role:: mm(mmbase)\n :systemcntxt: %s\n\n" % src
     role_def+= "\n".join(map(lambda x: " "+x,src_stack))
     role_def+= "\n\n"
@@ -131 +131 @@
     modlogger.debug( "role-content:%s"%str(content))
 
+
     mainobj = None
     if 'systemcntxt' in options:
@@ -168 +169 @@
 
 role_handler.content = True
-roles.register_canonical_role('mm',role_handler)
-roles.register_local_role('mm',role_handler)
+roles.register_canonical_role('mmbase',role_handler)
+roles.register_local_role('mmbase',role_handler)
 

tests/Parser.py

@@ -34 +34 @@
         self.p=self.sys.NewObject("template")
         self.p[".defname"] = ":mm:`:name`"
+        self.p["name"] = "Dummy"
         self.sys.NewCategory("Item")
         self.i=self.sys.NewObject("Item")
@@ -47 +48 @@
     def testParser(self):
         self.assertEquals(self.c["carries"].GetFullExpansion(),"The one ring")
+        self.assertEquals(str(self.c),"Frodo")
 
     def testCycle(self):