Skip to content

Commit

Permalink
Fixed set construct (was not properly handling an optional ending com…
Browse files Browse the repository at this point in the history 
…ma).
  • Loading branch information
@fabioz
fabioz committed Mar 16, 2011
1 parent 9f29691 commit 7e3128d
Show file tree
Hide file tree
Showing 7 changed files with 142 additions and 89 deletions.
2 changes: 1 addition & 1 deletion fix_new_lines.py
View file
Expand Up @@ -13,7 +13,7 @@
'.html',
'.htm',
'.txt',
'.launch',
# '.launch',
'.diff',
'.jjt',
'.jjt_template',
Expand Down
18 changes: 11 additions & 7 deletions plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar27/python.jjt
View file
Expand Up @@ -1187,18 +1187,22 @@ void dictorsetmaker() #void: {}
test()

(
( {this.findTokenAndAdd(":");}<COLON> try{test()}catch(ParseException e){handleNoValInDict(e);
}

(
{this.findTokenAndAdd(":");}<COLON>
try{
test()
}catch(ParseException e){
handleNoValInDict(e);
}
(
comp_for()|
(LOOKAHEAD(2) {this.findTokenAndAdd(",");}<COMMA> test(){this.findTokenAndAdd(":");}<COLON> test())*
[{this.findTokenAndAdd(",");}<COMMA>]
comp_for()
|
(LOOKAHEAD(2) {this.findTokenAndAdd(",");}<COMMA> test(){this.findTokenAndAdd(":");}<COLON> test())*[{this.findTokenAndAdd(",");}<COMMA>]
)
)
|
(
(LOOKAHEAD(2) comp_for() | ({this.findTokenAndAdd(",");}<COMMA> test())*#set [{this.findTokenAndAdd(",");}<COMMA>] )
(LOOKAHEAD(2) comp_for() | ({this.findTokenAndAdd(",");}<COMMA> [test()])* #set)
)
)
}
Expand Down
154 changes: 89 additions & 65 deletions plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar30/PythonGrammar30.java
View file
Expand Up @@ -6316,12 +6316,12 @@ final public void dictorsetmaker() throws ParseException {
test();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COLON:
this.findTokenAndAdd(":");
this.findTokenAndAdd(":");
jj_consume_token(COLON);
try {
test();
} catch (ParseException e) {
handleNoValInDict(e);
handleNoValInDict(e);
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case FOR:
Expand All @@ -6345,7 +6345,7 @@ final public void dictorsetmaker() throws ParseException {
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
this.findTokenAndAdd(",");
this.findTokenAndAdd(",");
jj_consume_token(COMMA);
break;
default:
Expand Down Expand Up @@ -6376,7 +6376,40 @@ final public void dictorsetmaker() throws ParseException {
}
this.findTokenAndAdd(",");
jj_consume_token(COMMA);
test();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LPAREN:
case LBRACE:
case LBRACKET:
case DOT:
case PLUS:
case MINUS:
case NOT:
case NOT_BOOL:
case LAMBDA:
case FALSE:
case TRUE:
case NONE:
case NAME:
case DECNUMBER:
case HEXNUMBER:
case OCTNUMBER:
case BINNUMBER:
case FLOAT:
case COMPLEX:
case SINGLE_STRING:
case SINGLE_STRING2:
case TRIPLE_STRING:
case TRIPLE_STRING2:
case SINGLE_BSTRING:
case SINGLE_BSTRING2:
case TRIPLE_BSTRING:
case TRIPLE_BSTRING2:
test();
break;
default:
jj_la1[128] = jj_gen;
;
}
}
} catch (Throwable jjte001) {
if (jjtc001) {
Expand All @@ -6398,15 +6431,6 @@ final public void dictorsetmaker() throws ParseException {
jjtreeCloseNodeScope(jjtn001);
}
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
this.findTokenAndAdd(",");
jj_consume_token(COMMA);
break;
default:
jj_la1[128] = jj_gen;
;
}
}
}
}
Expand Down Expand Up @@ -7471,11 +7495,6 @@ private boolean jj_2_33(int xla) {
finally { jj_save(32, xla); }
}

private boolean jj_3R_74() {
if (jj_3R_75()) return true;
return false;
}

private boolean jj_3_8() {
if (jj_scan_token(COMMA)) return true;
if (jj_3R_55()) return true;
Expand Down Expand Up @@ -7906,17 +7925,17 @@ private boolean jj_3R_133() {
return false;
}

private boolean jj_3R_118() {
if (jj_3R_133()) return true;
return false;
}

private boolean jj_3_29() {
if (jj_scan_token(COMMA)) return true;
if (jj_3R_72()) return true;
return false;
}

private boolean jj_3R_118() {
if (jj_3R_133()) return true;
return false;
}

private boolean jj_3R_103() {
if (jj_3R_118()) return true;
return false;
Expand Down Expand Up @@ -7966,6 +7985,11 @@ private boolean jj_3R_59() {
return false;
}

private boolean jj_3R_73() {
if (jj_3R_106()) return true;
return false;
}

private boolean jj_3R_156() {
if (jj_3R_103()) return true;
return false;
Expand All @@ -7976,11 +8000,6 @@ private boolean jj_3R_54() {
return false;
}

private boolean jj_3R_73() {
if (jj_3R_106()) return true;
return false;
}

private boolean jj_3R_55() {
if (jj_3R_59()) return true;
return false;
Expand Down Expand Up @@ -8079,16 +8098,6 @@ private boolean jj_3R_49() {
return false;
}

private boolean jj_3R_52() {
if (jj_scan_token(POWER)) return true;
return false;
}

private boolean jj_3R_48() {
if (jj_3R_77()) return true;
return false;
}

private boolean jj_3R_170() {
if (jj_scan_token(TRIPLE_BSTRING2)) return true;
return false;
Expand All @@ -8104,13 +8113,18 @@ private boolean jj_3R_168() {
return false;
}

private boolean jj_3R_52() {
if (jj_scan_token(POWER)) return true;
return false;
}

private boolean jj_3R_167() {
if (jj_scan_token(SINGLE_BSTRING)) return true;
return false;
}

private boolean jj_3R_78() {
if (jj_scan_token(MULTIPLY)) return true;
private boolean jj_3R_48() {
if (jj_3R_77()) return true;
return false;
}

Expand All @@ -8129,6 +8143,11 @@ private boolean jj_3R_164() {
return false;
}

private boolean jj_3R_78() {
if (jj_scan_token(MULTIPLY)) return true;
return false;
}

private boolean jj_3_32() {
if (jj_scan_token(COMMA)) return true;
if (jj_3R_75()) return true;
Expand Down Expand Up @@ -8253,25 +8272,20 @@ private boolean jj_3R_76() {
return false;
}

private boolean jj_3_14() {
if (jj_scan_token(COMMA)) return true;
if (jj_3R_61()) return true;
return false;
}

private boolean jj_3R_72() {
if (jj_3R_53()) return true;
return false;
}

private boolean jj_3_28() {
private boolean jj_3_14() {
if (jj_scan_token(COMMA)) return true;
if (jj_3R_72()) return true;
if (jj_3R_61()) return true;
return false;
}

private boolean jj_3R_57() {
if (jj_3R_58()) return true;
private boolean jj_3_28() {
if (jj_scan_token(COMMA)) return true;
if (jj_3R_72()) return true;
return false;
}

Expand All @@ -8280,8 +8294,8 @@ private boolean jj_3R_75() {
return false;
}

private boolean jj_3R_69() {
if (jj_3R_104()) return true;
private boolean jj_3R_57() {
if (jj_3R_58()) return true;
return false;
}

Expand All @@ -8290,8 +8304,8 @@ private boolean jj_3R_106() {
return false;
}

private boolean jj_3R_68() {
if (jj_3R_53()) return true;
private boolean jj_3R_69() {
if (jj_3R_104()) return true;
return false;
}

Expand All @@ -8301,13 +8315,13 @@ private boolean jj_3_26() {
return false;
}

private boolean jj_3R_67() {
if (jj_3R_104()) return true;
private boolean jj_3R_68() {
if (jj_3R_53()) return true;
return false;
}

private boolean jj_3R_66() {
if (jj_3R_103()) return true;
private boolean jj_3R_67() {
if (jj_3R_104()) return true;
return false;
}

Expand All @@ -8316,6 +8330,11 @@ private boolean jj_3R_71() {
return false;
}

private boolean jj_3R_66() {
if (jj_3R_103()) return true;
return false;
}

private boolean jj_3R_51() {
if (jj_3R_52()) return true;
return false;
Expand All @@ -8337,13 +8356,13 @@ private boolean jj_3_27() {
return false;
}

private boolean jj_3R_99() {
private boolean jj_3_24() {
if (jj_scan_token(COMMA)) return true;
if (jj_3R_53()) return true;
return false;
}

private boolean jj_3_24() {
if (jj_scan_token(COMMA)) return true;
private boolean jj_3R_99() {
if (jj_3R_53()) return true;
return false;
}
Expand Down Expand Up @@ -8486,6 +8505,11 @@ private boolean jj_3R_100() {
return false;
}

private boolean jj_3R_74() {
if (jj_3R_75()) return true;
return false;
}

/** Generated Token Manager. */
public PythonGrammar30TokenManager token_source;
/** Current token. */
Expand All @@ -8510,16 +8534,16 @@ private boolean jj_3R_100() {
jj_la1_init_4();
}
private static void jj_la1_init_0() {
jj_la1_0 = new int[] {0x5a2a0040,0x5a2a0040,0x20000000,0x5a2a0000,0x20000,0x0,0x40000000,0x1000000,0x40000000,0x1000000,0x1000000,0x1000000,0x40000000,0x0,0x0,0x0,0x1000000,0x40000000,0x1000000,0x1000000,0x1000000,0x40020000,0x0,0x40000000,0x0,0x0,0x20000,0x1000000,0x5a2a0000,0x800000,0x5a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x0,0x5a2a0000,0x0,0x0,0x1a2a0000,0x1a2a0000,0x0,0x1a2a0000,0x0,0x1000000,0x2000000,0x0,0x1000000,0x1000000,0x0,0x40020000,0x0,0x2000000,0x0,0x1000000,0x1000000,0x0,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1a2a0000,0x1000000,0x0,0x5a2a0000,0x5a2a0000,0x5a2a4040,0x0,0x1a2a0000,0x1a2a0000,0x0,0x0,0x1a2a0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18000000,0x18000000,0xc0000000,0xc0000000,0x1a2a0000,0x2220000,0x5a2a0000,0x2220000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x0,0x2280000,0x40020000,0x40020000,0x1000000,0x4000000,0x1e2a0000,0x1a2a0000,0x1a2a0000,0x4000000,0x5a2a0000,0x5a2a0000,0x1000000,0x1000000,0x1000000,0x5a2a0000,0x5a2a0000,0x1000000,0x1000000,0x0,0x1000000,0x1000000,0x4000000,0x0,0x1000000,0x0,0x0,0x0,0x0,0x5a2a0000,0x20000,0x1000000,0x40000000,0x1000000,0x1000000,0x1000000,0x5a2a0000,0x0,0x0,0x0,};
jj_la1_0 = new int[] {0x5a2a0040,0x5a2a0040,0x20000000,0x5a2a0000,0x20000,0x0,0x40000000,0x1000000,0x40000000,0x1000000,0x1000000,0x1000000,0x40000000,0x0,0x0,0x0,0x1000000,0x40000000,0x1000000,0x1000000,0x1000000,0x40020000,0x0,0x40000000,0x0,0x0,0x20000,0x1000000,0x5a2a0000,0x800000,0x5a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x0,0x5a2a0000,0x0,0x0,0x1a2a0000,0x1a2a0000,0x0,0x1a2a0000,0x0,0x1000000,0x2000000,0x0,0x1000000,0x1000000,0x0,0x40020000,0x0,0x2000000,0x0,0x1000000,0x1000000,0x0,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1a2a0000,0x1000000,0x0,0x5a2a0000,0x5a2a0000,0x5a2a4040,0x0,0x1a2a0000,0x1a2a0000,0x0,0x0,0x1a2a0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18000000,0x18000000,0xc0000000,0xc0000000,0x1a2a0000,0x2220000,0x5a2a0000,0x2220000,0x1a2a0000,0x1a2a0000,0x1a2a0000,0x0,0x2280000,0x40020000,0x40020000,0x1000000,0x4000000,0x1e2a0000,0x1a2a0000,0x1a2a0000,0x4000000,0x5a2a0000,0x5a2a0000,0x1000000,0x1000000,0x1000000,0x5a2a0000,0x5a2a0000,0x1000000,0x1000000,0x0,0x1000000,0x1a2a0000,0x4000000,0x0,0x1000000,0x0,0x0,0x0,0x0,0x5a2a0000,0x20000,0x1000000,0x40000000,0x1000000,0x1000000,0x1000000,0x5a2a0000,0x0,0x0,0x0,};
}
private static void jj_la1_init_1() {
jj_la1_1 = new int[] {0x40000020,0x40000020,0x0,0x40000022,0x0,0x0,0x2,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x200,0x200,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x2,0x200,0x200,0x0,0x0,0x40000020,0x0,0x40000020,0x40000020,0x40000020,0x40000020,0x40000020,0x40000020,0x40000020,0x40000020,0x40000020,0x40000020,0x40000020,0x40000020,0x40000020,0x200,0x40000020,0xfff0000,0x0,0x40000020,0x40000020,0x0,0x40000020,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000020,0x0,0x0,0x40000020,0x40000020,0x40000020,0x0,0x40000020,0x40000020,0x10000000,0x20000000,0x40000020,0xc000fc00,0x4000fc00,0x80000000,0x80,0x40,0x100,0xc,0xc,0x0,0x0,0x11,0x11,0x20,0x0,0x40000022,0x0,0x40000020,0x40000020,0x40000020,0x0,0x0,0x2,0x2,0x0,0x0,0x40000020,0x40000020,0x40000020,0x0,0x20,0x20,0x0,0x0,0x0,0x40000020,0x40000020,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000022,0x0,0x0,0x2,0x0,0x0,0x0,0x40000022,0x0,0x0,0x0,};
jj_la1_1 = new int[] {0x40000020,0x40000020,0x0,0x40000022,0x0,0x0,0x2,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x200,0x200,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x2,0x200,0x200,0x0,0x0,0x40000020,0x0,0x40000020,0x40000020,0x40000020,0x40000020,0x40000020,0x40000020,0x40000020,0x40000020,0x40000020,0x40000020,0x40000020,0x40000020,0x40000020,0x200,0x40000020,0xfff0000,0x0,0x40000020,0x40000020,0x0,0x40000020,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000020,0x0,0x0,0x40000020,0x40000020,0x40000020,0x0,0x40000020,0x40000020,0x10000000,0x20000000,0x40000020,0xc000fc00,0x4000fc00,0x80000000,0x80,0x40,0x100,0xc,0xc,0x0,0x0,0x11,0x11,0x20,0x0,0x40000022,0x0,0x40000020,0x40000020,0x40000020,0x0,0x0,0x2,0x2,0x0,0x0,0x40000020,0x40000020,0x40000020,0x0,0x20,0x20,0x0,0x0,0x0,0x40000020,0x40000020,0x0,0x0,0x0,0x0,0x40000020,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000022,0x0,0x0,0x2,0x0,0x0,0x0,0x40000022,0x0,0x0,0x0,};
}
private static void jj_la1_init_2() {
jj_la1_2 = new int[] {0x7efff6e6,0x7efff6e6,0x0,0x5c000002,0x0,0x20000000,0x40000000,0x0,0x0,0x0,0x0,0x0,0x40000000,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000000,0x40000000,0x0,0x0,0x0,0x40000000,0x0,0x7efff6e6,0x0,0x5cfff002,0x5c010002,0x5c010002,0x5c010002,0x5c010002,0x5c010002,0x5c010002,0x5c010002,0x5c010002,0x5c010002,0x5c010002,0x5c010002,0x5c010002,0x0,0x5c010002,0x0,0x11e000,0x5c000002,0x5c000002,0x40000,0x5c000002,0x60000,0x0,0x0,0x40000000,0x0,0x0,0x40000000,0x40000000,0x1000000,0x0,0x1000000,0x0,0x0,0x0,0x0,0x220006e4,0x10,0x8,0x8,0x8,0x100,0x8,0x800,0x900,0x1000000,0x5c000002,0x0,0x1000000,0x7efff6e6,0x7efff6e6,0x5cfff002,0x4,0x5c000002,0x5c000002,0x0,0x0,0x5c000000,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x5c000000,0x0,0x5c000002,0x0,0x5c010002,0x5c000002,0x5c000002,0x0,0x5c000000,0x40000000,0x40000000,0x0,0x0,0x5c000002,0x5c000002,0x5c000002,0x0,0x5c000000,0x5c000000,0x0,0x0,0x0,0x5c000002,0x5c000002,0x0,0x0,0x40,0x0,0x0,0x0,0x40,0x0,0x44,0x44,0x44,0x600,0x5c000002,0x0,0x0,0x0,0x0,0x0,0x0,0x5c000002,0x40,0x0,0x0,};
jj_la1_2 = new int[] {0x7efff6e6,0x7efff6e6,0x0,0x5c000002,0x0,0x20000000,0x40000000,0x0,0x0,0x0,0x0,0x0,0x40000000,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000000,0x40000000,0x0,0x0,0x0,0x40000000,0x0,0x7efff6e6,0x0,0x5cfff002,0x5c010002,0x5c010002,0x5c010002,0x5c010002,0x5c010002,0x5c010002,0x5c010002,0x5c010002,0x5c010002,0x5c010002,0x5c010002,0x5c010002,0x0,0x5c010002,0x0,0x11e000,0x5c000002,0x5c000002,0x40000,0x5c000002,0x60000,0x0,0x0,0x40000000,0x0,0x0,0x40000000,0x40000000,0x1000000,0x0,0x1000000,0x0,0x0,0x0,0x0,0x220006e4,0x10,0x8,0x8,0x8,0x100,0x8,0x800,0x900,0x1000000,0x5c000002,0x0,0x1000000,0x7efff6e6,0x7efff6e6,0x5cfff002,0x4,0x5c000002,0x5c000002,0x0,0x0,0x5c000000,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x5c000000,0x0,0x5c000002,0x0,0x5c010002,0x5c000002,0x5c000002,0x0,0x5c000000,0x40000000,0x40000000,0x0,0x0,0x5c000002,0x5c000002,0x5c000002,0x0,0x5c000000,0x5c000000,0x0,0x0,0x0,0x5c000002,0x5c000002,0x0,0x0,0x40,0x0,0x5c000002,0x0,0x40,0x0,0x44,0x44,0x44,0x600,0x5c000002,0x0,0x0,0x0,0x0,0x0,0x0,0x5c000002,0x40,0x0,0x0,};
}
private static void jj_la1_init_3() {
jj_la1_3 = new int[] {0xff003f,0xff003f,0x0,0xff003f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xff003f,0x0,0xff003f,0xff003f,0xff003f,0xff003f,0xff003f,0xff003f,0xff003f,0xff003f,0xff003f,0xff003f,0xff003f,0xff003f,0xff003f,0x0,0xff003f,0x0,0x0,0xff003f,0xff003f,0x0,0xff003f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xff003f,0x0,0x0,0xff003f,0xff003f,0xff003f,0x0,0xff003f,0xff003f,0x0,0x0,0xff003f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xff003f,0x0,0xff003f,0x0,0xff003f,0xff003f,0xff003f,0xff0000,0xff003f,0x0,0x0,0x0,0x0,0xff003f,0xff003f,0xff003f,0x0,0xff003f,0xff003f,0x0,0x0,0x0,0xff003f,0xff003f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xff003f,0x0,0x0,0x0,0x0,0x0,0x0,0xff003f,0x0,0x3f,0xff0000,};
jj_la1_3 = new int[] {0xff003f,0xff003f,0x0,0xff003f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xff003f,0x0,0xff003f,0xff003f,0xff003f,0xff003f,0xff003f,0xff003f,0xff003f,0xff003f,0xff003f,0xff003f,0xff003f,0xff003f,0xff003f,0x0,0xff003f,0x0,0x0,0xff003f,0xff003f,0x0,0xff003f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xff003f,0x0,0x0,0xff003f,0xff003f,0xff003f,0x0,0xff003f,0xff003f,0x0,0x0,0xff003f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xff003f,0x0,0xff003f,0x0,0xff003f,0xff003f,0xff003f,0xff0000,0xff003f,0x0,0x0,0x0,0x0,0xff003f,0xff003f,0xff003f,0x0,0xff003f,0xff003f,0x0,0x0,0x0,0xff003f,0xff003f,0x0,0x0,0x0,0x0,0xff003f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xff003f,0x0,0x0,0x0,0x0,0x0,0x0,0xff003f,0x0,0x3f,0xff0000,};
}
private static void jj_la1_init_4() {
jj_la1_4 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
Expand Down
18 changes: 11 additions & 7 deletions plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar30/python.jjt
View file
Expand Up @@ -1188,18 +1188,22 @@ void dictorsetmaker() #void: {}
test()

(
( {this.findTokenAndAdd(":");}<COLON> try{test()}catch(ParseException e){handleNoValInDict(e);
}

(
{this.findTokenAndAdd(":");}<COLON>
try{
test()
}catch(ParseException e){
handleNoValInDict(e);
}
(
comp_for()|
(LOOKAHEAD(2) {this.findTokenAndAdd(",");}<COMMA> test(){this.findTokenAndAdd(":");}<COLON> test())*
[{this.findTokenAndAdd(",");}<COMMA>]
comp_for()
|
(LOOKAHEAD(2) {this.findTokenAndAdd(",");}<COMMA> test(){this.findTokenAndAdd(":");}<COLON> test())*[{this.findTokenAndAdd(",");}<COMMA>]
)
)
|
(
(LOOKAHEAD(2) comp_for() | ({this.findTokenAndAdd(",");}<COMMA> test())*#set [{this.findTokenAndAdd(",");}<COMMA>] )
(LOOKAHEAD(2) comp_for() | ({this.findTokenAndAdd(",");}<COMMA> [test()])* #set)
)
)
}
Expand Down

0 comments on commit 7e3128d

Please sign in to comment.