grammar: fix tokenization of "runtime", "meta", and "parameter_meta" (#…

…363 @DavyCats)
chanzuckerberg · Apr 3, 2020 · e86de08 · e86de08
1 parent e7f16e7
commit e86de08
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/WDL/_grammar.py b/WDL/_grammar.py
@@ -64,8 +64,7 @@
 ?meta_value: literal | string_literal
            | meta_object
            | "[" [meta_value ("," meta_value)*] "]" -> meta_array
-META_KIND.2: "meta" | "parameter_meta" | "runtime" // .2 ensures higher priority than CNAME
-meta_section: META_KIND meta_object
+!meta_section: ("meta" | "parameter_meta") meta_object
 
 // task runtime section (key-expression pairs)
 runtime_section: "runtime" "{" [runtime_kv (","? runtime_kv)*] "}"
@@ -336,8 +335,7 @@
 ?meta_value: literal | string_literal
            | meta_object
            | "[" [meta_value ("," meta_value)*] "]" -> meta_array
-META_KIND.2: "meta" | "parameter_meta" | "runtime" // .2 ensures higher priority than CNAME
-meta_section: META_KIND meta_object
+!meta_section: ("meta" | "parameter_meta") meta_object
 
 // task runtime section (key-expression pairs)
 runtime_section: "runtime" "{" [runtime_kv (","? runtime_kv)*] "}"

diff --git a/tests/test_1doc.py b/tests/test_1doc.py
@@ -293,21 +293,27 @@ def test_meta(self):
             parameter_meta {
                 b: { help: "it's a boolean" }
                 n: 'x'
+                IntKey: 999
             }
             command {
                 echo "~{true='yes' false='no' b}"
             }
             runtime {
                 memory: "1 GB"
                 cpu: 42
+                runtime_key: 123
+                meta_key: 321
             }
         }
         """)[0]
         task.typecheck()
         self.assertIsInstance(task.parameter_meta['b']['help'], str)
         self.assertEqual(task.parameter_meta['b']['help'], "it's a boolean")
+        self.assertIsInstance(task.parameter_meta['IntKey'], WDL.Expr.Int)
         self.assertIsInstance(task.runtime['cpu'], WDL.Expr.Int)
         self.assertEqual(task.runtime['cpu'].value, 42)
+        self.assertEqual(task.runtime['runtime_key'].value, 123)
+        self.assertEqual(task.runtime['meta_key'].value, 321)
         self.assertTrue(task.inputs[0].type.optional)
         self.assertFalse(task.inputs[1].type.optional)
         self.assertTrue(task.inputs[1].type.nonempty)