[cig-commits] r5044 - cs/pythia/trunk/pythia/pyre/parsing/locators

[leif at geodynamics.org]

Author: leif
Date: 2006-10-15 00:29:02 -0700 (Sun, 15 Oct 2006)
New Revision: 5044

Modified:
   cs/pythia/trunk/pythia/pyre/parsing/locators/Traceable.py
Log:
Fixed bug in setLocator().  Nested/recursive .odb component
lookups should have locators which read

    from {file='inner.odb'} via {file='outer.odb'}

instead of

    from {file='outer.odb'} via {file='inner.odb'}

I suppose one might want to chain locators in the other
direction in a non-stack-oriented context.  However,
I couldn't think of such a context, and setLocator() is
only called from one place, so we can cross that bridge
when we come to it.


Modified: cs/pythia/trunk/pythia/pyre/parsing/locators/Traceable.py
===================================================================
--- cs/pythia/trunk/pythia/pyre/parsing/locators/Traceable.py	2006-10-14 22:24:52 UTC (rev 5043)
+++ cs/pythia/trunk/pythia/pyre/parsing/locators/Traceable.py	2006-10-15 07:29:02 UTC (rev 5044)
@@ -20,7 +20,7 @@
         
         if self.locator is not None:
             import pyre.parsing.locators
-            locator = pyre.parsing.locators.chain(locator, self.locator)
+            locator = pyre.parsing.locators.chain(self.locator, locator)
 
         self.locator = locator