actually parse augassign.

progval · progval · commit 56466d1eb219 · 2018-06-10T08:00:40.000+02:00
diff --git a/src/expressions.rs b/src/expressions.rs
@@ -337,15 +337,15 @@ named!(testlist_comp<StrSpan, TestlistCompReturn>,
 
 // subscript: test | [test] ':' [test] [sliceop]
 named!(subscript<StrSpan, Subscript>,
-  alt!(
+  ws4!(alt!(
     preceded!(char!(':'), call!(Self::subscript_trail, None))
   | do_parse!(
       first: call!(Self::test) >>
-      r: opt!(preceded!(char!(':'), call!(Self::subscript_trail, Some(*first.clone())))) >> ( // FIXME: remove this clone
+      r: opt!(ws4!(preceded!(char!(':'), call!(Self::subscript_trail, Some(*first.clone()))))) >> ( // FIXME: remove this clone
         r.unwrap_or(Subscript::Simple(*first))
       )
     )
-  )
+  ))
 );
 named_args!(subscript_trail(first: Option<Expression>) <StrSpan, Subscript>,
   do_parse!(
diff --git a/src/statements.rs b/src/statements.rs
@@ -68,24 +68,24 @@ named!(expr_stmt<StrSpan, Statement>,
         )
       )
 
-    | // Case 2: "foo", "foo = bar", "foo = bar = baz", ...
+    | // Case 2: "Foo += bar" (and other operators)
       do_parse!(
-        rhs: many0!(ws2!(preceded!(char!('='), alt!(
+        op: augassign >>
+        rhs: alt!(
           call!(ExpressionParser::<NewlinesAreNotSpaces>::yield_expr) => { |e| vec![e] }
-        | testlist_star_expr
-        )))) >> (
-          Statement::Assignment(lhs.clone(), rhs)
+        | call!(ExpressionParser::<NewlinesAreNotSpaces>::testlist)
+        ) >> (
+          Statement::AugmentedAssignment(lhs.clone(), op, rhs)
         )
       )
 
-    | // Case 3: "Foo += bar" (and other operators)
+    | // Case 3: "foo", "foo = bar", "foo = bar = baz", ...
       do_parse!(
-        op: augassign >>
-        rhs: alt!(
+        rhs: many0!(ws2!(preceded!(char!('='), alt!(
           call!(ExpressionParser::<NewlinesAreNotSpaces>::yield_expr) => { |e| vec![e] }
-        | call!(ExpressionParser::<NewlinesAreNotSpaces>::testlist)
-        ) >> (
-          Statement::AugmentedAssignment(lhs, op, rhs)
+        | testlist_star_expr
+        )))) >> (
+          Statement::Assignment(lhs, rhs)
         )
       )
     )) >>

Original file line number	Diff line number	Diff line change
`@@ -68,24 +68,24 @@ named!(expr_stmt<StrSpan, Statement>,`
`68`	`68`	`)`
`69`	`69`	`)`
`70`	`70`
`71`		`- \| // Case 2: "foo", "foo = bar", "foo = bar = baz", ...`
	`71`	`+ \| // Case 2: "Foo += bar" (and other operators)`
`72`	`72`	`do_parse!(`
`73`		`- rhs: many0!(ws2!(preceded!(char!('='), alt!(`
	`73`	`+ op: augassign >>`
	`74`	`+ rhs: alt!(`
`74`	`75`	`call!(ExpressionParser::<NewlinesAreNotSpaces>::yield_expr) => { \|e\| vec![e] }`
`75`		`- \| testlist_star_expr`
`76`		`- )))) >> (`
`77`		`- Statement::Assignment(lhs.clone(), rhs)`
	`76`	`+ \| call!(ExpressionParser::<NewlinesAreNotSpaces>::testlist)`
	`77`	`+ ) >> (`
	`78`	`+ Statement::AugmentedAssignment(lhs.clone(), op, rhs)`
`78`	`79`	`)`
`79`	`80`	`)`
`80`	`81`
`81`		`- \| // Case 3: "Foo += bar" (and other operators)`
	`82`	`+ \| // Case 3: "foo", "foo = bar", "foo = bar = baz", ...`
`82`	`83`	`do_parse!(`
`83`		`- op: augassign >>`
`84`		`- rhs: alt!(`
	`84`	`+ rhs: many0!(ws2!(preceded!(char!('='), alt!(`
`85`	`85`	`call!(ExpressionParser::<NewlinesAreNotSpaces>::yield_expr) => { \|e\| vec![e] }`
`86`		`- \| call!(ExpressionParser::<NewlinesAreNotSpaces>::testlist)`
`87`		`- ) >> (`
`88`		`- Statement::AugmentedAssignment(lhs, op, rhs)`
	`86`	`+ \| testlist_star_expr`
	`87`	`+ )))) >> (`
	`88`	`+ Statement::Assignment(lhs, rhs)`
`89`	`89`	`)`
`90`	`90`	`)`
`91`	`91`	`)) >>`