# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1412604716 -7200
# Node ID 75f8971706a198ec7dc642303c556ee5d3553a5c
# Parent  5c163feb89b58da90ecd2cd5d50ff6f3475adc76
Simplified the combination of qualifier and context information.

diff -r 5c163feb89b5 -r 75f8971706a1 vRecurrence.py
--- a/vRecurrence.py	Mon Oct 06 15:04:31 2014 +0200
+++ b/vRecurrence.py	Mon Oct 06 16:11:56 2014 +0200
@@ -175,24 +175,16 @@
                     repeat = Pattern(level - 1, {"interval" : 1}, "REPEAT")
                     repeat.context = tuple(context)
                     l.append(repeat)
-                else:
-                    from_q.context = tuple(context)
                 have_q = True
 
-            # Either introduce the qualifier first.
-
-            if _level > level:
-                l.append(from_q)
+            from_q.context = tuple(context)
+            l.append(from_q)
+            from_q = get_next(iter_q)
 
-            # Or combine the qualifier and value details.
-
-            else:
-                l.append(combine_context_with_qualifier(context, from_q))
+            if _level == level:
                 from_dt = get_next(iter_dt)
                 context.append(from_dt.args["values"][0])
 
-            from_q = get_next(iter_q)
-
     # Complete the list.
 
     while from_dt:
@@ -205,24 +197,14 @@
                 repeat = Pattern(level - 1, {"interval" : 1}, "REPEAT")
                 repeat.context = tuple(context)
                 l.append(repeat)
-            else:
-                from_q.context = tuple(context)
             have_q = True
+
+        from_q.context = tuple(context)
         l.append(from_q)
         from_q = get_next(iter_q)
 
     return l
 
-def combine_context_with_qualifier(context, from_q):
-
-    """
-    Combine 'context' information (a datetime) and 'from_q' (a qualifier),
-    imposing the datetime value information on any qualifiers.
-    """
-
-    from_q.context = tuple(context)
-    return from_q
-
 # Datetime arithmetic.
 
 def combine(t1, t2):