Fixed compound assignments not parsed

CircuitCoder · CircuitCoder · commit c17465224d22 · 2019-11-13T02:31:35.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "MeowRust"
+name = "meow_rust"
 version = "0.1.0"
 authors = ["Liu Xiaoyi <circuitcoder0@gmail.com>"]
 edition = "2018"
diff --git a/src/grammar/mod.rs b/src/grammar/mod.rs
@@ -162,7 +162,7 @@ pub enum Expr<'a> {
     rhs: Box<Expr<'a>>,
   },
 
-  CompoundAssign {
+  Assign {
     op: Option<ArithOp>,
     lhs: Box<Expr<'a>>,
     rhs: Box<Expr<'a>>,
diff --git a/src/grammar/type.rs b/src/grammar/type.rs
@@ -7,7 +7,7 @@ pub enum SolidType<'a> {
   Ident(TypePath<'a>),
   Tuple(Vec<Type<'a>>),
   Ref(bool, Box<Type<'a>>),
-  Array(Box<Type<'a>>, usize),
+  Array(Box<Type<'a>>, Box<Expr<'a>>),
   Slice(Box<Type<'a>>),
 
   BareFunc(FnTypeSpec<'a>),
diff --git a/src/parser/expr.rs b/src/parser/expr.rs
@@ -1,6 +1,6 @@
 use nom::{
   alt, call, complete, many0, map, named, one_of, opt, separated_nonempty_list, tag, terminated,
-  value, IResult,
+  IResult,
 };
 
 use super::ident::*;
@@ -84,14 +84,12 @@ macro_rules! bin_ltr_expr {
   };
 }
 
-macro_rules! bin_rtl_expr {
+macro_rules! assign_rtl_expr {
   ($cur:ident, $op_parser:ident, $lower:ident) => {
     pub fn $cur(input: &str) -> IResult<&str, Expr> {
       dbg!(input);
       let (sliced, init) = $lower(input)?;
 
-      use nom::fold_many0;
-
       let (left, terms) = many0!(sliced, complete!(mrws!(tuple!($op_parser, $lower))))?;
 
       let ret = match terms
@@ -101,15 +99,15 @@ macro_rules! bin_rtl_expr {
           None => Some((op, term)),
           Some((cop, dec)) => Some((
             op,
-            Expr::BinaryOp {
+            Expr::Assign {
               op: cop.into(),
               lhs: Box::new(term),
               rhs: Box::new(dec),
             },
           )),
         }) {
         None => init,
-        Some((cop, dec)) => Expr::BinaryOp {
+        Some((cop, dec)) => Expr::Assign {
           op: cop.into(),
           lhs: Box::new(init),
           rhs: Box::new(dec),
@@ -133,7 +131,7 @@ bin_ltr_expr!(logical_t3_expr, logical_op_t3, logical_t2_expr);
 
 // logical_t3_expr falls through compound_assign_expr
 named!(pub t8_expr<&str, Expr>, call!(compound_assign_expr));
-bin_rtl_expr!(compound_assign_expr, compound_assign, logical_t3_expr);
+assign_rtl_expr!(compound_assign_expr, compound_assign, logical_t3_expr);
 
 named!(pub expr_without_block<&str, Expr>, alt!(
     cont_expr
diff --git a/src/parser/literal.rs b/src/parser/literal.rs
@@ -1,6 +1,6 @@
 use nom::{
-  alt, char, complete, fold_many0, fold_many1, many_till, map, multi, named, none_of, one_of, opt,
-  preceded, switch, tag, take, tuple, value, IResult,
+  alt, char, complete, fold_many1, many_till, map, multi, named, none_of, one_of, opt, preceded,
+  switch, tag, take, tuple, value, IResult,
 };
 
 use crate::grammar::{IntSuffix, Literal};
diff --git a/src/parser/mod.rs b/src/parser/mod.rs
@@ -1,6 +1,5 @@
 use crate::grammar;
-use nom::bytes;
-use nom::{call, complete, named, IResult};
+use nom::{call, named, IResult};
 
 // Common
 
diff --git a/src/parser/path.rs b/src/parser/path.rs
@@ -1,4 +1,4 @@
-use nom::{alt, complete, map, named, opt, separated_nonempty_list, tag, IResult};
+use nom::{alt, complete, map, named, opt, separated_nonempty_list, tag};
 use std::collections::HashMap;
 
 use super::ident::*;
diff --git a/src/parser/type.rs b/src/parser/type.rs
@@ -1,5 +1,6 @@
 use nom::{alt, call, complete, map, named, opt, tag};
 
+use super::expr::expr;
 use super::ident::*;
 use super::literal::*;
 use super::path::*;
@@ -57,11 +58,10 @@ named!(array_type<&str, Type>,
       tag!("["),
       r#type,
       tag!(";"),
-      // TODO: EXPR
-      literal,
+      expr,
       tag!("]")
     )),
-    |(_, t, _, n, _)| SolidType::Array(Box::new(t), 0).into() // TODO: compute length
+    |(_, t, _, n, _)| SolidType::Array(Box::new(t), Box::new(n)).into()
   )
 );
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use nom::{alt, complete, map, named, opt, separated_nonempty_list, tag, IResult};`
	`1`	`+use nom::{alt, complete, map, named, opt, separated_nonempty_list, tag};`
`2`	`2`	`use std::collections::HashMap;`
`3`	`3`
`4`	`4`	`use super::ident::*;`