Merge pull request #28 from NotLebedev/block-fixes

Fixes to block handling

corpus/ctrl/match.nu

@@ -22,6 +22,42 @@ match $x {
                 (val_variable
                   (identifier))
                 (val_number))))
-          (val_record))
+          (block))
         (default_arm
-          (val_record))))
+          (block))))
+
+====
+match-002-block
+====
+
+match $x {
+  {key: $val} => {$val | print}
+  _ => {{}}
+}
+
+-----
+
+(nu_script
+  (ctrl_match
+    (val_variable
+      (identifier))
+    (match_arm
+      (match_pattern
+        (val_record
+          (record_entry
+            (identifier)
+            (val_variable
+              (identifier)))))
+      (block
+        (pipeline
+          (pipe_element
+            (val_variable
+              (identifier)))
+          (pipe_element
+            (command
+              (cmd_identifier))))))
+    (default_arm
+      (block
+        (pipeline
+          (pipe_element
+            (val_record)))))))

corpus/expr/unary-expr.nu

@@ -28,8 +28,9 @@ expr-002-smoke-test
     (pipe_element
       (expr_binary
         (expr_unary
-          (pipe_element
-            (expr_binary
-              (val_number)
-              (val_number))))
+          (pipeline
+            (pipe_element
+              (expr_binary
+                (val_number)
+                (val_number)))))
         (val_number)))))

corpus/expr/values.nu

@@ -36,9 +36,10 @@ values-002-booleans
         (val_bool)
         (val_bool)
         (expr_parenthesized
-          (pipe_element
-            (expr_unary
-              (val_bool))))))))
+          (pipeline
+            (pipe_element
+              (expr_unary
+                (val_bool)))))))))
 
 =====
 values-003-nothing

corpus/pipe/blocks.nu

@@ -0,0 +1,143 @@
+====
+blocks-001-block
+====
+
+if $a {
+  print qwe
+  print rty
+}
+
+-----
+
+(nu_script
+  (ctrl_if
+    (val_variable
+      (identifier))
+    (block
+      (pipeline
+        (pipe_element
+          (command
+            (cmd_identifier)
+            (val_string))))
+      (pipeline
+        (pipe_element
+          (command
+            (cmd_identifier)
+            (val_string)))))))
+====
+blocks-002-block-oneline
+====
+
+if $a { print qwe; print rty }
+
+-----
+
+(nu_script
+  (ctrl_if
+    (val_variable
+      (identifier))
+    (block
+      (pipeline
+        (pipe_element
+          (command
+            (cmd_identifier)
+            (val_string))))
+      (pipeline
+        (pipe_element
+          (command
+            (cmd_identifier)
+            (val_string)))))))
+====
+blocks-003-braced
+====
+
+(print qwe; print rty)
+
+-----
+
+(nu_script
+  (pipeline
+    (pipe_element
+      (expr_parenthesized
+        (pipeline
+          (pipe_element
+            (command
+              (cmd_identifier)
+              (val_string))))
+        (pipeline
+          (pipe_element
+            (command
+              (cmd_identifier)
+              (val_string))))))))
+
+====
+blocks-004-multiline-command
+====
+
+(ls
+  --all
+  -l
+  ../
+)
+
+-----
+
+(nu_script
+  (pipeline
+	  (pipe_element
+		  (expr_parenthesized
+			  (pipeline
+				  (pipe_element
+					  (command
+						  (cmd_identifier)
+							(long_flag)
+							(short_flag)
+							(val_string))))))))
+
+
+====
+blocks-005-closures
+====
+
+let a = {||
+  print qwe
+  print rty
+}
+
+let b = {|| print qwe; print rty }
+
+-----
+
+(nu_script
+  (stmt_let
+    (identifier)
+    (pipeline
+      (pipe_element
+        (val_closure
+          (parameter_pipes)
+          (pipeline
+            (pipe_element
+              (command
+                (cmd_identifier)
+                (val_string))))
+          (pipeline
+            (pipe_element
+              (command
+                (cmd_identifier)
+                (val_string))))))))
+  (stmt_let
+    (identifier)
+    (pipeline
+      (pipe_element
+        (val_closure
+          (parameter_pipes)
+          (pipeline
+            (pipe_element
+              (command
+                (cmd_identifier)
+                (val_string))))
+          (pipeline
+            (pipe_element
+              (command
+                (cmd_identifier)
+                (val_string)))))))))

corpus/pipe/commands.nu

@@ -139,3 +139,35 @@ foo this is only for testing
         (val_string)
         (val_string)
         (val_string)))))
+
+====
+cmd-007-if-oneline
+====
+
+if $a { 0 } else { ls | print; ls | print; }
+
+-----
+
+(nu_script
+  (ctrl_if
+    (val_variable
+      (identifier))
+    (block
+      (pipeline
+        (pipe_element
+          (val_number))))
+    (block
+      (pipeline
+        (pipe_element
+          (command
+            (cmd_identifier)))
+        (pipe_element
+          (command
+            (cmd_identifier))))
+      (pipeline
+        (pipe_element
+          (command
+            (cmd_identifier)))
+        (pipe_element
+          (command
+            (cmd_identifier)))))))

corpus/stmt/assignment.nu

@@ -10,9 +10,7 @@ $var = 42
   (assignment
     (val_variable
       (identifier))
-    (pipeline
-      (pipe_element
-        (val_number)))))
+    (val_number)))
 
 =====
 assignment-002-semicolon
@@ -26,37 +24,32 @@ $var += 69;
   (assignment
     (val_variable
       (identifier))
-    (pipeline
-      (pipe_element
-        (val_number)))))
+    (val_number)))
 
 =====
 assignment-003-assignment-to-a-pipeline
 =====
 
-$x ++= [1 2 3] | each {|x| $x + 8}
+$x += 1 | $in + 10
+# Note that rhs of ++= is not a pipeline, but only 1
+# currently nushell parses this as two statements 
+# $x ++= 1 and  $in + 10. Therefore you will get error
+# about adding int to nothing, and $x increased by one
 
 -----
 
 (nu_script
   (assignment
     (val_variable
       (identifier))
-    (pipeline
-      (pipe_element
-        (val_list
-          (val_number)
-          (val_number)
-          (val_number)))
-      (pipe_element
-        (command
-          (cmd_identifier)
-          (val_closure
-            (parameter_pipes
-              (parameter
-                (identifier)))
-            (ERROR
-              (expr_binary
-                (val_variable
-                  (identifier))
-                (val_number)))))))))
+        (val_number))
+    (ERROR)
+      (pipeline
+        (pipe_element
+          (expr_binary
+            (val_variable)
+            (val_number))))
+    (comment)
+    (comment)
+    (comment)
+    (comment))