From ee936a21308679654b2d458166ff094ed735fef7 Mon Sep 17 00:00:00 2001
From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Sat, 9 Jan 2010 23:35:54 +0000
Subject: Issue #2335: Backport set literals syntax from Python 3.x.

---
 Grammar/Grammar | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'Grammar')

diff --git a/Grammar/Grammar b/Grammar/Grammar
index a463671326..556e5e43da 100644
--- a/Grammar/Grammar
+++ b/Grammar/Grammar
@@ -102,7 +102,7 @@ factor: ('+'|'-'|'~') factor | power
 power: atom trailer* ['**' factor]
 atom: ('(' [yield_expr|testlist_gexp] ')' |
        '[' [listmaker] ']' |
-       '{' [dictmaker] '}' |
+       '{' [dictorsetmaker] '}' |
        '`' testlist1 '`' |
        NAME | NUMBER | STRING+)
 listmaker: test ( list_for | (',' test)* [','] )
@@ -115,6 +115,8 @@ sliceop: ':' [test]
 exprlist: expr (',' expr)* [',']
 testlist: test (',' test)* [',']
 dictmaker: test ':' test (',' test ':' test)* [',']
+dictorsetmaker: ( (test ':' test (',' test ':' test)* [',']) |
+                  (test (',' test)* [',']) )
 
 classdef: 'class' NAME ['(' [testlist] ')'] ':' suite
 
-- 
cgit v1.2.1