Added support for the experimental pipe operators (#167)

Cargo.toml

@@ -6,7 +6,7 @@ license = "MIT"
 name = "rnix"
 readme = "README.md"
 repository = "https://github.com/nix-community/rnix-parser"
-version = "0.11.0"
+version = "0.11.1"
 
 [[bench]]
 harness = false

src/ast/operators.rs

@@ -19,6 +19,8 @@ pub enum BinOpKind {
     MoreOrEq,
     NotEqual,
     Or,
+    PipeRight,
+    PipeLeft,
 }
 
 impl BinOpKind {
@@ -43,6 +45,9 @@ impl BinOpKind {
             TOKEN_NOT_EQUAL => Some(BinOpKind::NotEqual),
             TOKEN_OR_OR => Some(BinOpKind::Or),
 
+            TOKEN_PIPE_RIGHT => Some(BinOpKind::PipeRight),
+            TOKEN_PIPE_LEFT => Some(BinOpKind::PipeLeft),
+
             _ => None,
         }
     }

src/kinds.rs

@@ -54,6 +54,8 @@ pub enum SyntaxKind {
     TOKEN_MORE_OR_EQ,
     TOKEN_NOT_EQUAL,
     TOKEN_OR_OR,
+    TOKEN_PIPE_RIGHT,
+    TOKEN_PIPE_LEFT,
 
     // Identifiers and values
     TOKEN_FLOAT,

src/macros.rs

@@ -45,5 +45,7 @@ macro_rules! T {
     (>=)      => ($crate::SyntaxKind::TOKEN_MORE_OR_EQ);
     (!=)      => ($crate::SyntaxKind::TOKEN_NOT_EQUAL);
     (||)      => ($crate::SyntaxKind::TOKEN_OR_OR);
+    ("|>")      => ($crate::SyntaxKind::TOKEN_PIPE_RIGHT);
+    ("<|")      => ($crate::SyntaxKind::TOKEN_PIPE_LEFT);
     ($kind:ident) => ($crate::SyntaxKind::$kind);
 }

src/parser.rs

@@ -693,6 +693,12 @@ where
         // Always point this to the lowest-level math function there is
         self.parse_implication()
     }
+    fn parse_pipe_right(&mut self) -> Checkpoint {
+        self.parse_left_assoc(Self::parse_math, T!["|>"] | ())
+    }
+    fn parse_pipe_left(&mut self) -> Checkpoint {
+        self.parse_right_assoc(Self::parse_pipe_right, T!["<|"] | ())
+    }
     /// Parse Nix code into an AST
     pub fn parse_expr(&mut self) -> Checkpoint {
         // Limit chosen somewhat arbitrarily
@@ -758,7 +764,7 @@ where
                 self.finish_node();
                 checkpoint
             }
-            _ => self.parse_math(),
+            _ => self.parse_pipe_left(),
         };
         self.depth -= 1;
         out

src/tokenizer.rs

@@ -364,6 +364,10 @@ impl Tokenizer<'_> {
             '-' => TOKEN_SUB,
             '*' => TOKEN_MUL,
             '/' => TOKEN_DIV,
+            '<' if self.peek() == Some('|') => {
+                self.next().unwrap();
+                TOKEN_PIPE_LEFT
+            }
             '<' if kind == Some(IdentType::Store) => {
                 self.consume(is_valid_path_char);
                 if self.next() != Some('>') {
@@ -376,6 +380,10 @@ impl Tokenizer<'_> {
                 self.next().unwrap();
                 TOKEN_AND_AND
             }
+            '|' if self.peek() == Some('>') => {
+                self.next().unwrap();
+                TOKEN_PIPE_RIGHT
+            }
             '|' if self.peek() == Some('|') => {
                 self.next().unwrap();
                 TOKEN_OR_OR

test_data/parser/success/pipe_left.expect

@@ -0,0 +1,15 @@
+[email protected]
+  [email protected]
+    [email protected]
+      [email protected]
+        [email protected] "builtins"
+      [email protected] "."
+      [email protected]
+        [email protected]
+          [email protected] "toString"
+    [email protected] " "
+    [email protected] "<|"
+    [email protected] " "
+    [email protected]
+      [email protected] "1"
+

test_data/parser/success/pipe_left.nix

@@ -0,0 +1 @@
+builtins.toString <| 1

test_data/parser/success/pipe_left_assoc.expect

@@ -0,0 +1,21 @@
+[email protected]
+  [email protected]
+    [email protected]
+      [email protected] "foo"
+    [email protected] " "
+    [email protected] "<|"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected] "builtins"
+        [email protected] "."
+        [email protected]
+          [email protected]
+            [email protected] "toString"
+      [email protected] " "
+      [email protected] "<|"
+      [email protected] " "
+      [email protected]
+        [email protected] "1"
+

test_data/parser/success/pipe_left_assoc.nix

@@ -0,0 +1 @@
+foo <| builtins.toString <| 1

test_data/parser/success/pipe_left_math.expect

@@ -0,0 +1,21 @@
+[email protected]
+  [email protected]
+    [email protected]
+      [email protected]
+        [email protected] "builtins"
+      [email protected] "."
+      [email protected]
+        [email protected]
+          [email protected] "toString"
+    [email protected] " "
+    [email protected] "<|"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected] "1"
+      [email protected] " "
+      [email protected] "+"
+      [email protected] " "
+      [email protected]
+        [email protected] "1"
+

test_data/parser/success/pipe_left_math.nix

@@ -0,0 +1 @@
+builtins.toString <| 1 + 1

test_data/parser/success/pipe_mixed.expect

@@ -0,0 +1,21 @@
+[email protected]
+  [email protected]
+    [email protected]
+      [email protected]
+        [email protected] "builtins"
+      [email protected] "."
+      [email protected]
+        [email protected]
+          [email protected] "toString"
+    [email protected] " "
+    [email protected] "<|"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected] "1"
+      [email protected] " "
+      [email protected] "|>"
+      [email protected] " "
+      [email protected]
+        [email protected] "foo"
+

test_data/parser/success/pipe_mixed.nix

@@ -0,0 +1 @@
+builtins.toString <| 1 |> foo

test_data/parser/success/pipe_mixed_math.expect

@@ -0,0 +1,27 @@
+[email protected]
+  [email protected]
+    [email protected]
+      [email protected]
+        [email protected] "builtins"
+      [email protected] "."
+      [email protected]
+        [email protected]
+          [email protected] "toString"
+    [email protected] " "
+    [email protected] "<|"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected] "1"
+        [email protected] " "
+        [email protected] "+"
+        [email protected] " "
+        [email protected]
+          [email protected] "1"
+      [email protected] " "
+      [email protected] "|>"
+      [email protected] " "
+      [email protected]
+        [email protected] "foo"
+

test_data/parser/success/pipe_mixed_math.nix

@@ -0,0 +1 @@
+builtins.toString <| 1 + 1 |> foo

test_data/parser/success/pipe_right.expect

@@ -0,0 +1,15 @@
+[email protected]
+  [email protected]
+    [email protected]
+      [email protected] "1"
+    [email protected] " "
+    [email protected] "|>"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected] "builtins"
+      [email protected] "."
+      [email protected]
+        [email protected]
+          [email protected] "toString"
+

test_data/parser/success/pipe_right.nix

@@ -0,0 +1 @@
+1 |> builtins.toString

test_data/parser/success/pipe_right_assoc.expect

@@ -0,0 +1,21 @@
+[email protected]
+  [email protected]
+    [email protected]
+      [email protected]
+        [email protected] "1"
+      [email protected] " "
+      [email protected] "|>"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "builtins"
+        [email protected] "."
+        [email protected]
+          [email protected]
+            [email protected] "toString"
+    [email protected] " "
+    [email protected] "|>"
+    [email protected] " "
+    [email protected]
+      [email protected] "foo"
+

test_data/parser/success/pipe_right_assoc.nix

@@ -0,0 +1 @@
+1 |> builtins.toString |> foo

test_data/parser/success/pipe_right_math.expect

@@ -0,0 +1,21 @@
+[email protected]
+  [email protected]
+    [email protected]
+      [email protected]
+        [email protected] "1"
+      [email protected] " "
+      [email protected] "+"
+      [email protected] " "
+      [email protected]
+        [email protected] "1"
+    [email protected] " "
+    [email protected] "|>"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected] "builtins"
+      [email protected] "."
+      [email protected]
+        [email protected]
+          [email protected] "toString"
+

test_data/parser/success/pipe_right_math.nix

@@ -0,0 +1 @@
+1 + 1 |> builtins.toString