Fix dummy position generated in binary_expr's grammar

Author: polybuildr

src/grammar.rustpeg

@@ -94,29 +94,30 @@ comma_args -> Vec<ExprNode>
     = expr_node ** COMMA
 
 binary_expr_node -> ExprNode
-    = __ lpos:#position e:binary_expr rpos:#position __ {
-        // hackily check if e is a proper binary expr
-        if e.pos == (0, 0) {
-            ExprNode { pos: (lpos, rpos), data: e.data }
-        } else {
-            // e is actually a single_expr, so just propagate
-            e
-        }
-    }
+    = binary_expr
+    // __ lpos:#position e:binary_expr rpos:#position __ {
+    //     // hackily check if e is a proper binary expr
+    //     if e.pos == (0, 0) {
+    //         ExprNode { pos: (lpos, rpos), data: e.data }
+    //     } else {
+    //         // e is actually a single_expr, so just propagate
+    //         e
+    //     }
+    // }
 
 binary_expr -> ExprNode = #infix<single_expr_node> {
-    #L x AND y { ExprNode { pos: (0, 0), data: Expr::BinaryLogical(Box::new(x), LogicalBinOp::And, Box::new(y)) } }
-       x OR y { ExprNode { pos: (0, 0), data: Expr::BinaryLogical(Box::new(x), LogicalBinOp::Or, Box::new(y)) } }
-    #L x OP_STRICT_EQUALS y { ExprNode { pos: (0, 0), data: Expr::Binary(Box::new(x), BinOp::Eq, Box::new(y)) } }
-    #L x OP_LESS_THAN y { ExprNode { pos: (0, 0), data: Expr::Binary(Box::new(x), BinOp::Lt, Box::new(y)) } }
-       x OP_LESS_THAN_OR_EQUAL y { ExprNode { pos: (0, 0), data: Expr::Binary(Box::new(x), BinOp::Lte, Box::new(y)) } }
-       x OP_GREATER_THAN y { ExprNode { pos: (0, 0), data: Expr::Binary(Box::new(x), BinOp::Gt, Box::new(y)) } }
-       x OP_GREATER_THAN_OR_EQUAL y { ExprNode { pos: (0, 0), data: Expr::Binary(Box::new(x), BinOp::Gte, Box::new(y)) } }
-    #L x OP_PLUS y { ExprNode { pos: (0, 0), data: Expr::Binary(Box::new(x), BinOp::Add, Box::new(y)) } }
-       x OP_MINUS y { ExprNode { pos: (0, 0), data: Expr::Binary(Box::new(x), BinOp::Sub, Box::new(y)) } }
-    #L x OP_ASTERISK y { ExprNode { pos: (0, 0), data: Expr::Binary(Box::new(x), BinOp::Mul, Box::new(y)) } }
-       x OP_SLASH y { ExprNode { pos: (0, 0), data: Expr::Binary(Box::new(x), BinOp::Div, Box::new(y)) } }
-       x OP_MOD y { ExprNode { pos: (0, 0), data: Expr::Binary(Box::new(x), BinOp::Mod, Box::new(y)) } }
+    #L x AND y { ExprNode { pos: (x.pos.0, y.pos.1), data: Expr::BinaryLogical(Box::new(x), LogicalBinOp::And, Box::new(y)) } }
+       x OR y { ExprNode { pos : (x.pos.0, y.pos.1), data: Expr::BinaryLogical(Box::new(x), LogicalBinOp::Or, Box::new(y)) } }
+    #L x OP_STRICT_EQUALS y { ExprNode { pos : (x.pos.0, y.pos.1), data: Expr::Binary(Box::new(x), BinOp::Eq, Box::new(y)) } }
+    #L x OP_LESS_THAN y { ExprNode { pos : (x.pos.0, y.pos.1), data: Expr::Binary(Box::new(x), BinOp::Lt, Box::new(y)) } }
+       x OP_LESS_THAN_OR_EQUAL y { ExprNode { pos : (x.pos.0, y.pos.1), data: Expr::Binary(Box::new(x), BinOp::Lte, Box::new(y)) } }
+       x OP_GREATER_THAN y { ExprNode { pos : (x.pos.0, y.pos.1), data: Expr::Binary(Box::new(x), BinOp::Gt, Box::new(y)) } }
+       x OP_GREATER_THAN_OR_EQUAL y { ExprNode { pos : (x.pos.0, y.pos.1), data: Expr::Binary(Box::new(x), BinOp::Gte, Box::new(y)) } }
+    #L x OP_PLUS y { ExprNode { pos : (x.pos.0, y.pos.1), data: Expr::Binary(Box::new(x), BinOp::Add, Box::new(y)) } }
+       x OP_MINUS y { ExprNode { pos : (x.pos.0, y.pos.1), data: Expr::Binary(Box::new(x), BinOp::Sub, Box::new(y)) } }
+    #L x OP_ASTERISK y { ExprNode { pos : (x.pos.0, y.pos.1), data: Expr::Binary(Box::new(x), BinOp::Mul, Box::new(y)) } }
+       x OP_SLASH y { ExprNode { pos : (x.pos.0, y.pos.1), data: Expr::Binary(Box::new(x), BinOp::Div, Box::new(y)) } }
+       x OP_MOD y { ExprNode { pos : (x.pos.0, y.pos.1), data: Expr::Binary(Box::new(x), BinOp::Mod, Box::new(y)) } }
 }
 
 single_expr_node -> ExprNode