Merge remote-tracking branch 'paweljasinski/master'

Wombatpm · May 15, 2012 · 8446d8b · 8446d8b
2 parents 2e22007 + f8d01c4
commit 8446d8b
Show file tree

Hide file tree

Showing 3 changed files with 1,384 additions and 84 deletions.
diff --git a/Languages/IronPython/IronPython/Compiler/Parser.cs b/Languages/IronPython/IronPython/Compiler/Parser.cs
@@ -2734,7 +2734,7 @@ private Expression FinishDictOrSetValue() {
                             if (!first) {
                                 ReportSyntaxError("invalid syntax");
                             }
-                            return FinishDictComp(e1, e2);
+                            return FinishDictComp(e1, e2, oStart, oEnd);
                         }
 
                         SliceExpression se = new SliceExpression(e1, e2, null, false);
@@ -2752,7 +2752,7 @@ private Expression FinishDictOrSetValue() {
                             if (!first) {
                                 ReportSyntaxError("invalid syntax");
                             }
-                            return FinishSetComp(e1);
+                            return FinishSetComp(e1, oStart, oEnd);
                         }
 
                         // error recovery
@@ -2800,17 +2800,43 @@ private Expression FinishDictOrSetValue() {
         }
 
         // comp_iter '}'
-        private SetComprehension FinishSetComp(Expression item) {
+        private SetComprehension FinishSetComp(Expression item, int oStart, int oEnd) {
             ComprehensionIterator[] iters = ParseCompIter();
             Eat(TokenKind.RightBrace);
-            return new SetComprehension(item, iters);
+
+            var cStart = GetStart();
+            var cEnd = GetEnd();
+            if (_sink != null) {
+                _sink.MatchPair(
+                    new SourceSpan(_tokenizer.IndexToLocation(oStart), _tokenizer.IndexToLocation(oEnd)),
+                    new SourceSpan(_tokenizer.IndexToLocation(cStart), _tokenizer.IndexToLocation(cEnd)),
+                    1
+                );
+            }
+
+            var ret = new SetComprehension(item, iters);
+            ret.SetLoc(_globalParent, oStart, cEnd);
+            return ret;
         }
 
         // comp_iter '}'
-        private DictionaryComprehension FinishDictComp(Expression key, Expression value) {
+        private DictionaryComprehension FinishDictComp(Expression key, Expression value, int oStart, int oEnd) {
             ComprehensionIterator[] iters = ParseCompIter();
             Eat(TokenKind.RightBrace);
-            return new DictionaryComprehension(key, value, iters);
+
+            var cStart = GetStart();
+            var cEnd = GetEnd();
+
+            if (_sink != null) {
+                _sink.MatchPair(
+                    new SourceSpan(_tokenizer.IndexToLocation(oStart), _tokenizer.IndexToLocation(oEnd)),
+                    new SourceSpan(_tokenizer.IndexToLocation(cStart), _tokenizer.IndexToLocation(cEnd)),
+                    1
+                );
+            }
+            var ret = new DictionaryComprehension(key, value, iters);
+            ret.SetLoc(_globalParent, oStart, cEnd);
+            return ret;
         }
 
         // comp_iter: comp_for | comp_if