Merge pull request #5376 from cakebaker/expr_add_empty_lines

sylvestre · web-flow · commit 0997493038f6 · 2023-10-08T17:13:27.000+02:00
expr: add some empty lines
diff --git a/src/uu/expr/src/syntax_tree.rs b/src/uu/expr/src/syntax_tree.rs
@@ -31,10 +31,12 @@ pub enum AstNode {
         operands: OperandsList,
     },
 }
+
 impl AstNode {
     fn debug_dump(&self) {
         self.debug_dump_impl(1);
     }
+
     fn debug_dump_impl(&self, depth: usize) {
         for _ in 0..depth {
             print!("\t",);
@@ -71,12 +73,14 @@ impl AstNode {
             operands,
         })
     }
+
     fn new_leaf(token_idx: usize, value: &str) -> Box<Self> {
         Box::new(Self::Leaf {
             token_idx,
             value: value.into(),
         })
     }
+
     pub fn evaluate(&self) -> Result<String, String> {
         match self {
             Self::Leaf { value, .. } => Ok(value.clone()),
@@ -154,6 +158,7 @@ impl AstNode {
             },
         }
     }
+
     pub fn operand_values(&self) -> Result<Vec<String>, String> {
         if let Self::Node {
             operands, op_type, ..
@@ -257,6 +262,7 @@ fn ast_from_rpn(rpn: &mut TokenStack) -> Result<Box<AstNode>, String> {
         }
     }
 }
+
 fn maybe_ast_node(
     token_idx: usize,
     op_type: &str,
@@ -520,13 +526,15 @@ fn prefix_operator_substr(values: &[String]) -> String {
 fn bool_as_int(b: bool) -> u8 {
     u8::from(b)
 }
+
 fn bool_as_string(b: bool) -> String {
     if b {
         "1".to_string()
     } else {
         "0".to_string()
     }
 }
+
 fn value_as_bool(s: &str) -> bool {
     if s.is_empty() {
         return false;
diff --git a/src/uu/expr/src/tokens.rs b/src/uu/expr/src/tokens.rs
@@ -38,6 +38,7 @@ pub enum Token {
         value: String,
     },
 }
+
 impl Token {
     fn new_infix_op(v: &str, left_assoc: bool, precedence: u8) -> Self {
         Self::InfixOp {
@@ -46,6 +47,7 @@ impl Token {
             value: v.into(),
         }
     }
+
     fn new_value(v: &str) -> Self {
         Self::Value { value: v.into() }
     }
@@ -56,12 +58,14 @@ impl Token {
             _ => false,
         }
     }
+
     fn is_a_number(&self) -> bool {
         match self {
             Self::Value { value, .. } => value.parse::<BigInt>().is_ok(),
             _ => false,
         }
     }
+
     fn is_a_close_paren(&self) -> bool {
         matches!(*self, Self::ParClose)
     }

Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,12 @@ pub enum AstNode {`
`31`	`31`	`operands: OperandsList,`
`32`	`32`	`},`
`33`	`33`	`}`
	`34`	`+`
`34`	`35`	`impl AstNode {`
`35`	`36`	`fn debug_dump(&self) {`
`36`	`37`	`self.debug_dump_impl(1);`
`37`	`38`	`}`
	`39`	`+`
`38`	`40`	`fn debug_dump_impl(&self, depth: usize) {`
`39`	`41`	`for _ in 0..depth {`
`40`	`42`	`print!("\t",);`
`@@ -71,12 +73,14 @@ impl AstNode {`
`71`	`73`	`operands,`
`72`	`74`	`})`
`73`	`75`	`}`
	`76`	`+`
`74`	`77`	`fn new_leaf(token_idx: usize, value: &str) -> Box<Self> {`
`75`	`78`	`Box::new(Self::Leaf {`
`76`	`79`	`token_idx,`
`77`	`80`	`value: value.into(),`
`78`	`81`	`})`
`79`	`82`	`}`
	`83`	`+`
`80`	`84`	`pub fn evaluate(&self) -> Result<String, String> {`
`81`	`85`	`match self {`
`82`	`86`	`Self::Leaf { value, .. } => Ok(value.clone()),`
`@@ -154,6 +158,7 @@ impl AstNode {`
`154`	`158`	`},`
`155`	`159`	`}`
`156`	`160`	`}`
	`161`	`+`
`157`	`162`	`pub fn operand_values(&self) -> Result<Vec<String>, String> {`
`158`	`163`	`if let Self::Node {`
`159`	`164`	`operands, op_type, ..`
`@@ -257,6 +262,7 @@ fn ast_from_rpn(rpn: &mut TokenStack) -> Result<Box<AstNode>, String> {`
`257`	`262`	`}`
`258`	`263`	`}`
`259`	`264`	`}`
	`265`	`+`
`260`	`266`	`fn maybe_ast_node(`
`261`	`267`	`token_idx: usize,`
`262`	`268`	`op_type: &str,`
`@@ -520,13 +526,15 @@ fn prefix_operator_substr(values: &[String]) -> String {`
`520`	`526`	`fn bool_as_int(b: bool) -> u8 {`
`521`	`527`	`u8::from(b)`
`522`	`528`	`}`
	`529`	`+`
`523`	`530`	`fn bool_as_string(b: bool) -> String {`
`524`	`531`	`if b {`
`525`	`532`	`"1".to_string()`
`526`	`533`	`} else {`
`527`	`534`	`"0".to_string()`
`528`	`535`	`}`
`529`	`536`	`}`
	`537`	`+`
`530`	`538`	`fn value_as_bool(s: &str) -> bool {`
`531`	`539`	`if s.is_empty() {`
`532`	`540`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ pub enum Token {`
`38`	`38`	`value: String,`
`39`	`39`	`},`
`40`	`40`	`}`
	`41`	`+`
`41`	`42`	`impl Token {`
`42`	`43`	`fn new_infix_op(v: &str, left_assoc: bool, precedence: u8) -> Self {`
`43`	`44`	`Self::InfixOp {`
`@@ -46,6 +47,7 @@ impl Token {`
`46`	`47`	`value: v.into(),`
`47`	`48`	`}`
`48`	`49`	`}`
	`50`	`+`
`49`	`51`	`fn new_value(v: &str) -> Self {`
`50`	`52`	`Self::Value { value: v.into() }`
`51`	`53`	`}`
`@@ -56,12 +58,14 @@ impl Token {`
`56`	`58`	`_ => false,`
`57`	`59`	`}`
`58`	`60`	`}`
	`61`	`+`
`59`	`62`	`fn is_a_number(&self) -> bool {`
`60`	`63`	`match self {`
`61`	`64`	`Self::Value { value, .. } => value.parse::<BigInt>().is_ok(),`
`62`	`65`	`_ => false,`
`63`	`66`	`}`
`64`	`67`	`}`
	`68`	`+`
`65`	`69`	`fn is_a_close_paren(&self) -> bool {`
`66`	`70`	`matches!(*self, Self::ParClose)`
`67`	`71`	`}`