Merge pull request #44 from EricCrosson/43-support-multiple-parameter…

…s-to-add-and-copy support multiple parameters to ADD and COPY
camdencheek · Oct 10, 2023 · 33e22c3 · 33e22c3
2 parents 1800d5a + c9351d9
commit 33e22c3
Show file tree

Hide file tree

Showing 5 changed files with 3,602 additions and 3,532 deletions.
diff --git a/corpus/add.txt b/corpus/add.txt
@@ -38,3 +38,18 @@ ADD src1 src2 dst
     (path)
     (path)
     (path)))
+
+==================
+Multiple params
+==================
+
+ADD --chown=a:b --chmod=644 src dst
+
+---
+
+(source_file
+  (add_instruction
+    (param)
+    (param)
+    (path)
+    (path)))
diff --git a/corpus/copy.txt b/corpus/copy.txt
@@ -38,3 +38,18 @@ COPY src1 src2 dst
     (path)
     (path)
     (path)))
+
+==================
+Multiple params
+==================
+
+COPY --chown=a:b --chmod=644 src dst
+
+---
+
+(source_file
+  (copy_instruction
+    (param)
+    (param)
+    (path)
+    (path)))
diff --git a/grammar.js b/grammar.js
@@ -73,7 +73,7 @@ module.exports = grammar({
     add_instruction: ($) =>
       seq(
         alias(/[aA][dD][dD]/, "ADD"),
-        optional($.param),
+        repeat($.param),
         repeat1(
           seq($.path, $._non_newline_whitespace)
         ),
@@ -83,7 +83,7 @@ module.exports = grammar({
     copy_instruction: ($) =>
       seq(
         alias(/[cC][oO][pP][yY]/, "COPY"),
-        optional($.param),
+        repeat($.param),
         repeat1(
           seq($.path, $._non_newline_whitespace)
         ),

diff --git a/src/grammar.json b/src/grammar.json
@@ -336,16 +336,11 @@
           "value": "ADD"
         },
         {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "param"
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
+          "type": "REPEAT",
+          "content": {
+            "type": "SYMBOL",
+            "name": "param"
+          }
         },
         {
           "type": "REPEAT1",
@@ -382,16 +377,11 @@
           "value": "COPY"
         },
         {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "param"
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
+          "type": "REPEAT",
+          "content": {
+            "type": "SYMBOL",
+            "name": "param"
+          }
         },
         {
           "type": "REPEAT1",