Skip to content

Commit 73cd680

Browse files
windelbouwmanwindelbouwman
committed
Add support for trailing comma in function defs. Parser code simplications.
1 parent 149aefe commit 73cd680

File tree

3 files changed

+42
-52
lines changed

3 files changed

+42
-52
lines changed

‎parser/src/lexer.rs

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -466,8 +466,16 @@ where
466466
loop {
467467
match self.next_char() {
468468
Some('\\') => {
469-
if is_raw {
469+
if self.chr0 == Some(quote_char) {
470+
string_content.push(quote_char);
471+
self.next_char();
472+
} else if is_raw {
470473
string_content.push('\\');
474+
if let Some(c) = self.next_char() {
475+
string_content.push(c)
476+
} else {
477+
return Err(LexicalError::StringError);
478+
}
471479
} else {
472480
match self.next_char() {
473481
Some('\\') => {
@@ -711,7 +719,6 @@ where
711719
let tok_start = self.get_pos();
712720
self.next_char();
713721
let tok_end = self.get_pos();
714-
println!("Emoji: {}", c);
715722
return Some(Ok((
716723
tok_start,
717724
Tok::Name {
@@ -1438,7 +1445,7 @@ mod tests {
14381445

14391446
#[test]
14401447
fn test_string() {
1441-
let source = String::from(r#""double" 'single' 'can\'t' "\\\"" '\t\r\n' '\g'"#);
1448+
let source = String::from(r#""double" 'single' 'can\'t' "\\\"" '\t\r\n' '\g' r'raw\''"#);
14421449
let tokens = lex_source(&source);
14431450
assert_eq!(
14441451
tokens,
@@ -1467,6 +1474,10 @@ mod tests {
14671474
value: String::from("\\g"),
14681475
is_fstring: false,
14691476
},
1477+
Tok::String {
1478+
value: String::from("raw\'"),
1479+
is_fstring: false,
1480+
},
14701481
]
14711482
);
14721483
}

‎parser/src/python.lalrpop

Lines changed: 23 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -337,10 +337,7 @@ CompoundStatement: ast::LocatedStatement = {
337337
IfStatement: ast::LocatedStatement = {
338338
<loc:@L> "if" <t:Test> ":" <s1:Suite> <s2:(@L "elif" Test ":" Suite)*> <s3:("else" ":" Suite)?> => {
339339
// Determine last else:
340-
let mut last = match s3 {
341-
Some(s) => Some(s.2),
342-
None => None,
343-
};
340+
let mut last = s3.map(|s| s.2);
344341

345342
// handle elif:
346343
for i in s2.into_iter().rev() {
@@ -360,10 +357,7 @@ IfStatement: ast::LocatedStatement = {
360357

361358
WhileStatement: ast::LocatedStatement = {
362359
<loc:@L> "while" <e:Test> ":" <s:Suite> <s2:("else" ":" Suite)?> => {
363-
let or_else = match s2 {
364-
Some(s) => Some(s.2),
365-
None => None,
366-
};
360+
let or_else = s2.map(|s| s.2);
367361
ast::LocatedStatement {
368362
location: loc,
369363
node: ast::Statement::While { test: e, body: s, orelse: or_else },
@@ -373,10 +367,7 @@ WhileStatement: ast::LocatedStatement = {
373367

374368
ForStatement: ast::LocatedStatement = {
375369
<loc:@L> "for" <e:ExpressionList> "in" <t:TestList> ":" <s:Suite> <s2:("else" ":" Suite)?> => {
376-
let or_else = match s2 {
377-
Some(s) => Some(s.2),
378-
None => None,
379-
};
370+
let or_else = s2.map(|s| s.2);
380371
ast::LocatedStatement {
381372
location: loc,
382373
node: ast::Statement::For {
@@ -389,14 +380,8 @@ ForStatement: ast::LocatedStatement = {
389380

390381
TryStatement: ast::LocatedStatement = {
391382
<loc:@L> "try" ":" <body:Suite> <handlers:ExceptClause*> <else_suite:("else" ":" Suite)?> <finally:("finally" ":" Suite)?> => {
392-
let or_else = match else_suite {
393-
Some(s) => Some(s.2),
394-
None => None,
395-
};
396-
let finalbody = match finally {
397-
Some(s) => Some(s.2),
398-
None => None,
399-
};
383+
let or_else = else_suite.map(|s| s.2);
384+
let finalbody = finally.map(|s| s.2);
400385
ast::LocatedStatement {
401386
location: loc,
402387
node: ast::Statement::Try {
@@ -437,10 +422,7 @@ WithStatement: ast::LocatedStatement = {
437422

438423
WithItem: ast::WithItem = {
439424
<t:Test> <n:("as" Expression)?> => {
440-
let optional_vars = match n {
441-
Some(val) => Some(val.1),
442-
None => None,
443-
};
425+
let optional_vars = n.map(|val| val.1);
444426
ast::WithItem { context_expr: t, optional_vars }
445427
},
446428
};
@@ -461,27 +443,19 @@ FuncDef: ast::LocatedStatement = {
461443
};
462444

463445
Parameters: ast::Parameters = {
464-
"(" <a: (TypedArgsList<TypedParameter>)?> ")" => {
465-
match a {
466-
Some(a) => a,
467-
None => Default::default(),
468-
}
446+
"(" <a: (ParameterList<TypedParameter>)?> ")" => {
447+
a.unwrap_or_else(Default::default)
469448
},
470449
};
471450

472-
// parameters are (String, None), kwargs are (String, Some(Test)) where Test is
473-
// the default
474451
// Note that this is a macro which is used once for function defs, and
475452
// once for lambda defs.
476-
TypedArgsList<ArgType>: ast::Parameters = {
477-
<param1:TypedParameters<ArgType>> <args2:("," ParameterListStarArgs<ArgType>)?> => {
453+
ParameterList<ArgType>: ast::Parameters = {
454+
<param1:ParameterDefs<ArgType>> <args2:("," ParameterListStarArgs<ArgType>)?> ","? => {
478455
let (names, default_elements) = param1;
479456

480457
// Now gather rest of parameters:
481-
let (vararg, kwonlyargs, kw_defaults, kwarg) = match args2 {
482-
Some((_, x)) => x,
483-
None => (None, vec![], vec![], None),
484-
};
458+
let (vararg, kwonlyargs, kw_defaults, kwarg) = args2.map_or((None, vec![], vec![], None), |x| x.1);
485459

486460
ast::Parameters {
487461
args: names,
@@ -492,7 +466,7 @@ TypedArgsList<ArgType>: ast::Parameters = {
492466
kw_defaults: kw_defaults,
493467
}
494468
},
495-
<param1:TypedParameters<ArgType>> <kw:("," KwargParameter<ArgType>)> => {
469+
<param1:ParameterDefs<ArgType>> <kw:("," KwargParameter<ArgType>)> ","? => {
496470
let (names, default_elements) = param1;
497471

498472
// Now gather rest of parameters:
@@ -510,7 +484,7 @@ TypedArgsList<ArgType>: ast::Parameters = {
510484
kw_defaults: kw_defaults,
511485
}
512486
},
513-
<params:ParameterListStarArgs<ArgType>> => {
487+
<params:ParameterListStarArgs<ArgType>> ","? => {
514488
let (vararg, kwonlyargs, kw_defaults, kwarg) = params;
515489
ast::Parameters {
516490
args: vec![],
@@ -521,7 +495,7 @@ TypedArgsList<ArgType>: ast::Parameters = {
521495
kw_defaults: kw_defaults,
522496
}
523497
},
524-
<kw:KwargParameter<ArgType>> => {
498+
<kw:KwargParameter<ArgType>> ","? => {
525499
ast::Parameters {
526500
args: vec![],
527501
kwonlyargs: vec![],
@@ -535,8 +509,8 @@ TypedArgsList<ArgType>: ast::Parameters = {
535509

536510
// Use inline here to make sure the "," is not creating an ambiguity.
537511
#[inline]
538-
TypedParameters<ArgType>: (Vec<ast::Parameter>, Vec<ast::Expression>) = {
539-
<param1:TypedParameterDef<ArgType>> <param2:("," TypedParameterDef<ArgType>)*> => {
512+
ParameterDefs<ArgType>: (Vec<ast::Parameter>, Vec<ast::Expression>) = {
513+
<param1:ParameterDef<ArgType>> <param2:("," ParameterDef<ArgType>)*> => {
540514
// Combine first parameters:
541515
let mut args = vec![param1];
542516
args.extend(param2.into_iter().map(|x| x.1));
@@ -564,7 +538,7 @@ TypedParameters<ArgType>: (Vec<ast::Parameter>, Vec<ast::Expression>) = {
564538
}
565539
};
566540

567-
TypedParameterDef<ArgType>: (ast::Parameter, Option<ast::Expression>) = {
541+
ParameterDef<ArgType>: (ast::Parameter, Option<ast::Expression>) = {
568542
<i:ArgType> => (i, None),
569543
<i:ArgType> "=" <e:Test> => (i, Some(e)),
570544
};
@@ -580,8 +554,11 @@ TypedParameter: ast::Parameter = {
580554
},
581555
};
582556

557+
// Use inline here to make sure the "," is not creating an ambiguity.
558+
// TODO: figure out another grammar that makes this inline no longer required.
559+
#[inline]
583560
ParameterListStarArgs<ArgType>: (Option<Option<ast::Parameter>>, Vec<ast::Parameter>, Vec<Option<ast::Expression>>, Option<Option<ast::Parameter>>) = {
584-
"*" <va:ArgType?> <kw:("," TypedParameterDef<ArgType>)*> <kwarg:("," KwargParameter<ArgType>)?> => {
561+
"*" <va:ArgType?> <kw:("," ParameterDef<ArgType>)*> <kwarg:("," KwargParameter<ArgType>)?> => {
585562
// Extract keyword arguments:
586563
let mut kwonlyargs = vec![];
587564
let mut kw_defaults = vec![];
@@ -590,10 +567,7 @@ ParameterListStarArgs<ArgType>: (Option<Option<ast::Parameter>>, Vec<ast::Parame
590567
kw_defaults.push(value);
591568
}
592569

593-
let kwarg = match kwarg {
594-
Some((_, name)) => Some(name),
595-
None => None,
596-
};
570+
let kwarg = kwarg.map(|n| n.1);
597571

598572
(Some(va), kwonlyargs, kw_defaults, kwarg)
599573
}
@@ -684,7 +658,7 @@ Test: ast::Expression = {
684658
};
685659

686660
LambdaDef: ast::Expression = {
687-
"lambda" <p:TypedArgsList<UntypedParameter>?> ":" <b:Test> =>
661+
"lambda" <p:ParameterList<UntypedParameter>?> ":" <b:Test> =>
688662
ast::Expression::Lambda {
689663
args: p.unwrap_or(Default::default()),
690664
body:Box::new(b)

‎tests/snippets/function.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,8 @@ def foo():
22
return 42
33

44
assert foo() == 42
5+
6+
def my_func(a,):
7+
return a+2
8+
9+
assert my_func(2) == 4

0 commit comments

Comments
 (0)