Woops, sep!() does not support separated_nonempty_list.

progval · progval · commit ff95358a09d9 · 2018-06-10T17:03:50.000+02:00
diff --git a/src/functions.rs b/src/functions.rs
@@ -227,7 +227,7 @@ impl<IIT: IsItTyped> ParamlistParser<IIT> {
            * Parse positional arguments:
            * tfpdef ['=' test] (',' tfpdef ['=' test])*
            */
-          positional_args: separated_nonempty_list!(char!(','), call!(IIT::fpdef_with_default)) >>
+          positional_args: separated_nonempty_list!(ws2!(char!(',')), call!(IIT::fpdef_with_default)) >>
           r: opt!(ws4!(preceded!(char!(','), opt!( // FIXME: ws! is needed here because it does not traverse opt!
 
             alt!(
@@ -246,7 +246,7 @@ impl<IIT: IsItTyped> ParamlistParser<IIT> {
             | do_parse!(
                 char!('*') >>
                 star_args: opt!(call!(IIT::fpdef)) >>
-                keyword_args: opt!(preceded!(char!(','), separated_nonempty_list!(char!(','), call!(IIT::fpdef_with_default)))) >>
+                keyword_args: opt!(ws4!(preceded!(char!(','), separated_nonempty_list!(ws4!(char!(',')), call!(IIT::fpdef_with_default))))) >>
                 star_kwargs: opt!(ws4!(preceded!(char!(','), opt!(preceded!(tag!("**"), call!(IIT::fpdef)))))) >> ( // FIXME: ws! is needed here because it does not traverse opt!
                   IIT::make_list(positional_args.clone(), Some(star_args), keyword_args.unwrap_or(Vec::new()), star_kwargs.unwrap_or(None)) // FIXME: do not clone
                 )
diff --git a/src/statements.rs b/src/statements.rs
@@ -25,7 +25,7 @@ named_args!(pub statement(indent: usize) <StrSpan, Vec<Statement>>,
 // simple_stmt: small_stmt (';' small_stmt)* [';'] NEWLINE
 named_args!(simple_stmt() <StrSpan, Vec<Statement>>,
   do_parse!(
-    stmts: separated_nonempty_list!(semicolon, call!(small_stmt)) >>
+    stmts: separated_nonempty_list!(ws2!(semicolon), call!(small_stmt)) >>
     opt!(semicolon) >> (
       stmts
     )
@@ -181,14 +181,14 @@ named!(raise_stmt<StrSpan, Statement>,
 // global_stmt: 'global' NAME (',' NAME)*
 named!(global_stmt<StrSpan, Statement>,
   map!(preceded!(tuple!(tag!("global"), space_sep2),
-    ws2!(separated_nonempty_list!(char!(','), name))
+    ws2!(separated_nonempty_list!(ws2!(char!(',')), name))
   ), |names| Statement::Global(names))
 );
 
 // nonlocal_stmt: 'nonlocal' NAME (',' NAME)*
 named!(nonlocal_stmt<StrSpan, Statement>,
   map!(preceded!(tuple!(tag!("nonlocal"), space_sep2),
-    ws2!(separated_nonempty_list!(char!(','), name))
+    ws2!(separated_nonempty_list!(ws2!(char!(',')), name))
   ), |names| Statement::Nonlocal(names))
 );
 
@@ -288,19 +288,19 @@ named!(dotted_as_name<StrSpan, (Vec<Name>, Option<Name>)>,
 // import_as_names: import_as_name (',' import_as_name)* [',']
 named!(import_as_names<StrSpan, Vec<(Name, Option<Name>)>>,
   terminated!(
-    separated_nonempty_list!(tuple!(spaces!(), char!(','), spaces!()), call!(Self::import_as_name)),
+    separated_nonempty_list!(ws2!(char!(',')), call!(Self::import_as_name)),
     opt!(tuple!(spaces!(), char!(','), spaces!()))
   )
 );
 
 // dotted_as_names: dotted_as_name (',' dotted_as_name)*
 named!(dotted_as_names<StrSpan, Vec<(Vec<Name>, Option<Name>)>>,
-  separated_nonempty_list!(tuple!(spaces!(), char!(','), spaces!()), call!(Self::dotted_as_name))
+  separated_nonempty_list!(ws2!(char!(',')), call!(Self::dotted_as_name))
 );
 
 // dotted_name: NAME ('.' NAME)*
 named!(pub dotted_name<StrSpan, Vec<Name>>,
-  separated_nonempty_list!(tuple!(spaces!(), char!('.'), spaces!()), name)
+  separated_nonempty_list!(ws2!(char!('.')), name)
 );
 
 } // end ImportParser
