From 8300daeadece0bf19eb0ca91799027871c663a3e Mon Sep 17 00:00:00 2001
From: Scott Frazer <scott.d.frazer@gmail.com>
Date: Tue, 24 Nov 2015 09:56:22 -0500
Subject: [PATCH] Fixing tests, adding grammar file, updating generation script

---
 .travis.yml                |    2 +-
 generate.sh                |    2 +-
 grammar.hgr                |  344 +++++
 wdl/binding.py             |   12 +-
 wdl/parser.py              | 3538 ++++++++++++++++++++++----------------------
 wdl/test/cases/5/ast       |    2 +-
 wdl/test/cases/5/parsetree |    2 +-
 wdl/test/test_binding.py   |    4 +-
 wdl/values.py              |   24 +-
 9 files changed, 2144 insertions(+), 1786 deletions(-)
 create mode 100644 grammar.hgr

diff --git a/.travis.yml b/.travis.yml
index 85a8a32..d63ccbb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,4 +3,4 @@ python:
   - "2.7"
   - "3.5"
 install: "python setup.py install"
-script: py.test
+script: py.test wdl/test
diff --git a/generate.sh b/generate.sh
index 1e2a977..f62f2be 100644
--- a/generate.sh
+++ b/generate.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-hermes generate ../grammar.hgr --name=wdl --directory=wdl --header
+hermes generate grammar.hgr --name=wdl --directory=wdl --header
 mv wdl/wdl_parser.py wdl/parser.py
diff --git a/grammar.hgr b/grammar.hgr
new file mode 100644
index 0000000..91a2ca2
--- /dev/null
+++ b/grammar.hgr
@@ -0,0 +1,344 @@
+grammar {
+  lexer {
+    partials {
+      r'[a-zA-Z]' -> _identifier_start
+      r'[a-zA-Z0-9_]' -> _identifier_follow
+      r'(Array|Map|Object|Boolean|Int|Float|Uri|File|String)(?!{%_identifier_follow%})' -> _type
+      r'{%_identifier_start%}({%_identifier_follow%})*' -> _identifier
+    }
+
+    r'\s+' -> null
+
+    enum {
+      python: r'/\*(.*?)\*/' (DOTALL)
+      c: r'/\*(.*?)\*/' (PCRE_DOTALL)
+      java: r'/\*(.*?)\*/' (DOTALL)
+      javascript: r'/\*(.*?)\*/' (m)
+    } -> null
+
+    r'#.*' -> null
+    r'task(?!{%_identifier_follow%})' -> task(:task)
+    r'(call)\s+' -> :call[1] @task_fqn
+    r'workflow(?!{%_identifier_follow%})' -> workflow(:workflow)
+    r'import(?!{%_identifier_follow%})' -> :import
+    r'input(?!{%_identifier_follow%})' -> :input
+    r'output(?!{%_identifier_follow%})' -> output(:output)
+    r'as(?!{%_identifier_follow%})' -> :as
+    r'if(?!{%_identifier_follow%})' -> :if
+    r'while(?!{%_identifier_follow%})' -> :while
+    r'runtime(?!{%_identifier_follow%})' -> :runtime
+    r'scatter(?!{%_identifier_follow%})' -> :scatter @scatter
+    r'command\s*(?=<<<)' -> :raw_command  @raw_command2
+    r'command\s*(?=\{)' -> :raw_command  @raw_command
+    r'parameter_meta(?!{%_identifier_follow%})' -> :parameter_meta
+    r'meta(?!{%_identifier_follow%})' -> :meta
+    r'(true|false)(?!{%_identifier_follow%})' -> :boolean
+    r'(object)\s*(\{)' -> :object :lbrace
+    r'{%_type%}(?!{%_identifier_follow%})' -> :type
+    r'{%_identifier%}' -> :identifier
+
+    # TODO: these should probably be partials...
+    enum {
+      python: r'"([^\\\"\n]|\\[\\"\'nrbtfav\?]|\\[0-7]{1,3}|\\x[0-9a-fA-F]+|\\[uU]([0-9a-fA-F]{4})([0-9a-fA-F]{4})?)*"'
+      java: "\\\"(?>[^\\\\\\\"\\n]|\\\\[\\\"\\'nrbtfav\\\\?]|\\\\[0-7]{1,3}|\\\\x[0-9a-fA-F]+|\\\\[uU]([0-9a-fA-F]{4})([0-9a-fA-F]{4})?)*\\\""
+    } -> unescape(:string)
+    enum {
+      python: r'\'([^\\\'\n]|\\[\\"\'nrbtfav\?]|\\[0-7]{1,3}|\\x[0-9a-fA-F]+|\\[uU]([0-9a-fA-F]{4})([0-9a-fA-F]{4})?)*\''
+      java: "'(?>[^\\\\\\'\\n]|\\\\[\\\"\\'nrbtfav\\\\?]|\\\\[0-7]{1,3}|\\\\x[0-9a-fA-F]+|\\\\[uU]([0-9a-fA-F]{4})([0-9a-fA-F]{4})?)*'"
+    } -> unescape(:string)
+
+    r':' -> :colon
+    r',' -> :comma
+    r'==' -> :double_equal
+    r'\|\|' -> :double_pipe
+    r'\&\&' -> :double_ampersand
+    r'!=' -> :not_equal
+    r'=' -> :equal
+    r'\.' -> :dot
+    r'\{' -> :lbrace
+    r'\}' -> :rbrace
+    r'\(' -> :lparen
+    r'\)' -> :rparen
+    r'\[' -> :lsquare
+    r'\]' -> :rsquare
+    r'\+' -> :plus
+    r'\*' -> :asterisk
+    r'-' -> :dash
+    r'/' -> :slash
+    r'%' -> :percent
+    r'<=' -> :lteq
+    r'<' -> :lt
+    r'>=' -> :gteq
+    r'>' -> :gt
+    r'!' -> :not
+    enum {
+      python: r'\?'
+      java: "\\?"
+    } -> :qmark
+    r'-?[0-9]+\.[0-9]+' -> :float
+    r'[0-9]+' -> :integer
+    mode<wf_output> {
+      r'\s+' -> null
+      r'\{' -> :lbrace
+      r'\}' -> :rbrace %pop
+      r',' -> :comma
+      r'\.' -> :dot
+      r'\*' -> :asterisk
+      enum {
+        python: r'{%_identifier%}(\.{%_identifier%})*'
+        java: "{%_identifier%}(\\.{%_identifier%})*"
+      } -> :fqn
+    }
+    mode<task_fqn> {
+      r'\s+' -> null
+      enum {
+        python: r'{%_identifier%}(\.{%_identifier%})*'
+        java: "{%_identifier%}(\\.{%_identifier%})*"
+      } -> :fqn %pop
+    }
+    mode<scatter> {
+      r'\s+' -> null
+      r'\)' -> :rparen %pop
+      r'\(' -> :lparen
+      r'\.' -> :dot
+      r'\[' -> :lsquare
+      r'\]' -> :rsquare
+      r'in(?!{%_identifier_follow%})' -> :in
+      r'{%_identifier%}' -> :identifier
+    }
+    mode<raw_command> {
+      r'\{' -> :raw_cmd_start
+      r'\}' -> :raw_cmd_end %pop
+      r'\$\{' -> :cmd_param_start @cmd_param
+      enum {
+        python: r'(.*?)(?=\$\{|\})' (DOTALL)
+        c: r'(.*?)(?=\$\{|\})' (PCRE_DOTALL)
+        java: r'(.*?)(?=\$\{|\})' (DOTALL)
+        javascript: r'(.*?)(?=\$\{|\})' (m)
+      } -> :cmd_part
+    }
+    mode<raw_command2> {
+      r'<<<' -> :raw_cmd_start
+      r'>>>' -> :raw_cmd_end %pop
+      r'\$\{' -> :cmd_param_start @cmd_param
+      enum {
+        python: r'(.*?)(?=\$\{|>>>)' (DOTALL)
+        c: r'(.*?)(?=\$\{|>>>)' (PCRE_DOTALL)
+        java: r'(.*?)(?=\$\{|>>>)' (DOTALL)
+        javascript: r'(.*?)(?=\$\{|>>>)' (m)
+      } -> :cmd_part
+    }
+    mode<cmd_param> {
+      r'\s+' -> null
+      r'\}' -> :cmd_param_end %pop
+      r'\[' -> :lsquare
+      r'\]' -> :rsquare
+      r'=' -> :equal
+      r'\+' -> :plus
+      r'\*' -> :asterisk
+      r'[0-9]+' -> :integer
+      r'(true|false)(?!{%_identifier_follow%})' -> :boolean
+      r'{%_type%}(?!{%_identifier_follow%})' -> :type
+      r'{%_identifier%}(?=\s*=)' -> :cmd_attr_hint[] :identifier
+      r'{%_identifier%}' -> :identifier
+
+      # Expression tokens
+      r':' -> :colon
+      r',' -> :comma
+      r'\.' -> :dot
+      r'==' -> :double_equal
+      r'\|\|' -> :double_pipe
+      r'\&\&' -> :double_ampersand
+      r'!=' -> :not_equal
+      r'=' -> :equal
+      r'\.' -> :dot
+      r'\{' -> :lbrace
+      r'\(' -> :lparen
+      r'\)' -> :rparen
+      r'\[' -> :lsquare
+      r'\]' -> :rsquare
+      r'\+' -> :plus
+      r'\*' -> :asterisk
+      r'-' -> :dash
+      r'/' -> :slash
+      r'%' -> :percent
+      r'<=' -> :lteq
+      r'<' -> :lt
+      r'>=' -> :gteq
+      r'>' -> :gt
+      r'!' -> :not
+
+      # Literals
+      enum {
+        python: r'"([^\\\"\n]|\\[\\"\'nrbtfav\?]|\\[0-7]{1,3}|\\x[0-9a-fA-F]+|\\[uU]([0-9a-fA-F]{4})([0-9a-fA-F]{4})?)*"'
+        java: "\\\"(?>[^\\\\\\\"\\n]|\\\\[\\\"\\'nrbtfav\\\\?]|\\\\[0-7]{1,3}|\\\\x[0-9a-fA-F]+|\\\\[uU]([0-9a-fA-F]{4})([0-9a-fA-F]{4})?)*\\\""
+      } -> unescape(:string)
+      enum {
+        python: r'\'([^\\\'\n]|\\[\\"\'nrbtfav\?]|\\[0-7]{1,3}|\\x[0-9a-fA-F]+|\\[uU]([0-9a-fA-F]{4})([0-9a-fA-F]{4})?)*\''
+        java: "'(?>[^\\\\\\'\\n]|\\\\[\\\"\\'nrbtfav\\\\?]|\\\\[0-7]{1,3}|\\\\x[0-9a-fA-F]+|\\\\[uU]([0-9a-fA-F]{4})([0-9a-fA-F]{4})?)*'"
+      } -> unescape(:string)
+      r'-?[0-9]+\.[0-9]+' -> :float
+      r'[0-9]+' -> :integer
+    }
+
+    code<python> << PYTHON
+    def init():
+        return {
+            'context': None,
+            'replacements': {
+                re.compile(r"\\n"): 0x000A,
+                re.compile(r"\\r"): 0x000D,
+                re.compile(r"\\b"): 0x0008,
+                re.compile(r"\\t"): 0x0009,
+                re.compile(r"\\a"): 0x0007,
+                re.compile(r"\\v"): 0x000B,
+                re.compile(r'\\"'): 0x0022,
+                re.compile(r"\\'"): 0x0027,
+                re.compile(r"\\\?"): 0x003F
+            },
+            'escapes': {
+                re.compile(r'(\\([0-7]{1,3}))'): 8,
+                re.compile(r'(\\[xX]([0-9a-fA-F]{1,4}))'): 16,
+                re.compile(r'(\\[uU]([0-9a-fA-F]{4}))'): 16
+            }
+        }
+    def workflow(ctx, terminal, source_string, line, col):
+        ctx.user_context['context'] = 'workflow'
+        default_action(ctx, terminal, source_string, line, col)
+    def task(ctx, terminal, source_string, line, col):
+        ctx.user_context['context'] = 'task'
+        default_action(ctx, terminal, source_string, line, col)
+    def output(ctx, terminal, source_string, line, col):
+        if ctx.user_context['context'] == 'workflow':
+            ctx.stack.append('wf_output')
+        default_action(ctx, terminal, source_string, line, col)
+    def unescape(ctx, terminal, source_string, line, col):
+
+        for regex, c in ctx.user_context['replacements'].items():
+            source_string = regex.sub(chr(c), source_string)
+
+        source_string = source_string.replace("\\\\", "\\")
+
+        for regex, base in ctx.user_context['escapes'].items():
+            for escape_sequence, number in regex.findall(source_string):
+                source_string = source_string.replace(escape_sequence, unichr(int(number, base)))
+        default_action(ctx, terminal, source_string[1:-1], line, col)
+    PYTHON
+
+    code<java> << JAVA
+    private class WdlContext {
+        public String wf_or_task = null;
+    }
+    public Object init() {
+        return new WdlContext();
+    }
+    public void workflow(LexerContext ctx, TerminalIdentifier terminal, String source_string, int line, int col) {
+        ((WdlContext) ctx.context).wf_or_task = "workflow";
+        default_action(ctx, terminal, source_string, line, col);
+    }
+    public void task(LexerContext ctx, TerminalIdentifier terminal, String source_string, int line, int col) {
+        ((WdlContext) ctx.context).wf_or_task = "task";
+        default_action(ctx, terminal, source_string, line, col);
+    }
+    public void output(LexerContext ctx, TerminalIdentifier terminal, String source_string, int line, int col) {
+        WdlContext user_ctx = (WdlContext) ctx.context;
+        if (user_ctx.wf_or_task != null && user_ctx.wf_or_task.equals("workflow")) {
+            ctx.stack.push("wf_output");
+        }
+        default_action(ctx, terminal, source_string, line, col);
+    }
+    public void unescape(LexerContext ctx, TerminalIdentifier terminal, String source_string, int line, int col) {
+        default_action(ctx, terminal, StringEscapeUtils.unescapeJava(source_string.substring(1, source_string.length() - 1)), line, col);
+    }
+    JAVA
+  }
+  parser {
+    # Document: https://github.com/broadinstitute/wdl/blob/wdl2/SPEC.md#document
+    $document = list($import) list($workflow_or_task) -> Document(imports=$0, definitions=$1)
+    $workflow_or_task = $workflow | $task
+
+    # Import Statements: https://github.com/broadinstitute/wdl/blob/wdl2/SPEC.md#import-statements
+    $import = :import :string optional($import_namespace) -> Import(uri=$1, namespace=$2)
+    $import_namespace = :as :identifier -> $1
+
+    # Task Definition: https://github.com/broadinstitute/wdl/blob/wdl2/SPEC.md#task-definition
+    $task = :task :identifier :lbrace list($declaration) list($sections) :rbrace -> Task(name=$1, declarations=$3, sections=$4)
+    $sections = $command | $outputs | $runtime | $parameter_meta | $meta
+    $command = :raw_command :raw_cmd_start list($command_part) :raw_cmd_end -> RawCommand(parts=$2)
+    $command_part = :cmd_part | $cmd_param
+    $cmd_param = :cmd_param_start list($cmd_param_kv) $e :cmd_param_end -> CommandParameter(attributes=$1, expr=$2)
+    $cmd_param_kv = :cmd_attr_hint :identifier :equal $e -> CommandParameterAttr(key=$1, value=$3)
+    $outputs = :output :lbrace list($output_kv) :rbrace -> Outputs(attributes=$2)
+    $output_kv = $type_e :identifier :equal $e -> Output(type=$0, var=$1, expression=$3)
+    $runtime = :runtime $map -> Runtime(map=$1)
+    $parameter_meta = :parameter_meta $map -> ParameterMeta(map=$1)
+    $meta = :meta $map -> Meta(map=$1)
+    $map = :lbrace list($kv) :rbrace -> $1
+    $kv = :identifier :colon $e -> RuntimeAttribute(key=$0, value=$2)
+
+    # Declarations: https://github.com/broadinstitute/wdl/blob/wdl2/SPEC.md#declarations
+    $declaration = $type_e optional($postfix_quantifier) :identifier optional($setter) -> Declaration(type=$0, postfix=$1, name=$2, expression=$3)
+    $setter = :equal $e -> $1
+    $postfix_quantifier = :qmark | :plus
+
+    # Types: https://github.com/broadinstitute/wdl/blob/wdl2/SPEC.md#types
+    $type_e = parser<expression> {
+      (*:left) $type_e = :type <=> :lsquare list($type_e, :comma) :rsquare -> Type(name=$0, subtype=$2)
+      $type_e = :type
+    }
+
+    # Expressions: https://github.com/broadinstitute/wdl/blob/wdl2/SPEC.md#expressions
+    $e = parser<expression> {
+      (*:left) $e = $e :double_pipe $e -> LogicalOr(lhs=$0, rhs=$2)
+      (*:left) $e = $e :double_ampersand $e -> LogicalAnd(lhs=$0, rhs=$2)
+      (*:left) $e = $e :double_equal $e -> Equals(lhs=$0, rhs=$2)
+      (-:left) $e = $e :not_equal $e -> NotEquals(lhs=$0, rhs=$2)
+      (*:left) $e = $e :lt $e -> LessThan(lhs=$0, rhs=$2)
+      (-:left) $e = $e :lteq $e -> LessThanOrEqual(lhs=$0, rhs=$2)
+      (-:left) $e = $e :gt $e -> GreaterThan(lhs=$0, rhs=$2)
+      (-:left) $e = $e :gteq $e -> GreaterThanOrEqual(lhs=$0, rhs=$2)
+      (*:left) $e = $e :plus $e -> Add(lhs=$0, rhs=$2)
+      (-:left) $e = $e :dash $e -> Subtract(lhs=$0, rhs=$2)
+      (*:left) $e = $e :asterisk $e -> Multiply(lhs=$0, rhs=$2)
+      (-:left) $e = $e :slash $e -> Divide(lhs=$0, rhs=$2)
+      (-:left) $e = $e :percent $e -> Remainder(lhs=$0, rhs=$2)
+      (*:unary) $e = :not $e -> LogicalNot(expression=$1)
+      (-:unary) $e = :plus $e -> UnaryPlus(expression=$1)
+      (-:unary) $e = :dash $e -> UnaryNegation(expression=$1)
+      (*:left) $e = :identifier <=> :lparen list($e, :comma) :rparen -> FunctionCall(name=$0, params=$2)
+      (*:left) $e = :identifier <=> :lsquare $e :rsquare -> ArrayOrMapLookup(lhs=$0, rhs=$2)
+      (*:left) $e = :identifier <=> :dot :identifier -> MemberAccess(lhs=$0, rhs=$2)
+      # TODO: is there a better object literal syntax?
+      (*:left) $e = :object :lbrace list($object_kv, :comma) :rbrace -> ObjectLiteral(map=$2)
+      (*:left) $e = :lsquare list($e, :comma) :rsquare -> ArrayLiteral(values=$1)
+      (*:left) $e = :lbrace list($map_kv, :comma) :rbrace -> MapLiteral(map=$1)
+      (*:left) $e = :lparen $e :rparen -> $1
+      $e = :string
+      $e = :identifier
+      $e = :boolean
+      $e = :integer
+      $e = :float
+    }
+    $map_kv = $e :colon $e -> MapLiteralKv(key=$0, value=$2)
+
+    # Workflows: https://github.com/broadinstitute/wdl/blob/wdl2/SPEC.md#workflow-definition
+    $workflow = :workflow :identifier :lbrace list($wf_body_element) :rbrace -> Workflow(name=$1, body=$3)
+    $wf_body_element = $call | $declaration | $while_loop | $if_stmt | $scatter | $wf_outputs
+    $call = :call :fqn optional($alias) optional($call_body) -> Call(task=$1, alias=$2, body=$3)
+    $call_body = :lbrace list($declaration) list($call_input) :rbrace -> CallBody(declarations=$1, io=$2)
+    $call_input = :input :colon list($mapping, :comma) -> Inputs(map=$2)
+    $mapping = :identifier :equal $e -> IOMapping(key=$0, value=$2)
+    $alias = :as :identifier -> $1
+    $wf_outputs = :output :lbrace list($wf_output, :comma) :rbrace -> WorkflowOutputs(outputs=$2)
+    $wf_output = :fqn optional($wf_output_wildcard) -> WorkflowOutput(fqn=$0, wildcard=$1)
+    $wf_output_wildcard = :dot :asterisk -> $1
+
+    $while_loop = :while :lparen $e :rparen :lbrace list($wf_body_element) :rbrace -> WhileLoop(expression=$2, body=$5)
+    $if_stmt = :if :lparen $e :rparen :lbrace list($wf_body_element) :rbrace -> If(expression=$2, body=$5)
+
+    $scatter = :scatter :lparen :identifier :in $e :rparen :lbrace list($wf_body_element) :rbrace
+        -> Scatter(item=$2, collection=$4, body=$7)
+
+    $object_kv = :identifier :colon $e -> ObjectKV(key=$0, value=$2)
+  }
+}
diff --git a/wdl/binding.py b/wdl/binding.py
index 3321fa9..ad6d5bf 100644
--- a/wdl/binding.py
+++ b/wdl/binding.py
@@ -488,12 +488,12 @@ def eval(ast, lookup=lambda var: None, functions=None):
             array_or_map = eval(ast.attr('lhs'), lookup, functions)
             index = eval(ast.attr('rhs'), lookup, functions)
 
-	    if isinstance(array_or_map, WdlArray) and isinstance(index, WdlInteger):
-	    	return array_or_map.value[index.value]
-	    elif isinstance(array_or_map, WdlArray):
-	    	raise EvalException('Cannot index array {} with {}'.format(array_or_map, index))
-	    elif isinstance(array_or_map, WdlMap) and isinstance(index.type, WdlPrimitiveType):
-	    	return array_or_map.value[index]
+            if isinstance(array_or_map, WdlArray) and isinstance(index, WdlInteger):
+                return array_or_map.value[index.value]
+            elif isinstance(array_or_map, WdlArray):
+                raise EvalException('Cannot index array {} with {}'.format(array_or_map, index))
+            elif isinstance(array_or_map, WdlMap) and isinstance(index.type, WdlPrimitiveType):
+                return array_or_map.value[index]
             raise EvalException('ArrayOrMapLookup not implemented yet')
         if ast.name == 'MemberAccess':
             object = eval(ast.attr('lhs'), lookup, functions)
diff --git a/wdl/parser.py b/wdl/parser.py
index 57b1447..85e000e 100644
--- a/wdl/parser.py
+++ b/wdl/parser.py
@@ -1,7 +1,7 @@
 
-# This file was generated by Hermes Parser Generator on Mon Nov 23 15:31:20 2015
+# This file was generated by Hermes Parser Generator on Tue Nov 24 09:55:36 2015
 # 
-# Hermes command: hermes generate ../grammar.hgr --name=wdl --directory=wdl --header
+# Hermes command: hermes generate grammar.hgr --name=wdl --directory=wdl --header
 # Run from: .. (relative to this file)
 # Hermes version: hermes-parser 2.0rc4
 # 
@@ -254,809 +254,809 @@ def __init__(self, tokens, errors):
     self.rule_string = None
 # Parser Code #
 terminals = {
-    0: 'raw_cmd_end',
-    1: 'scatter',
-    2: 'type_e',
-    3: 'integer',
-    4: 'dot',
-    5: 'raw_command',
-    6: 'type',
-    7: 'dash',
-    8: 'cmd_attr_hint',
+    0: 'runtime',
+    1: 'type',
+    2: 'double_ampersand',
+    3: 'type_e',
+    4: 'lsquare',
+    5: 'float',
+    6: 'cmd_part',
+    7: 'import',
+    8: 'parameter_meta',
     9: 'lparen',
-    10: 'not',
-    11: 'asterisk',
-    12: 'gt',
-    13: 'parameter_meta',
-    14: 'double_equal',
-    15: 'e',
-    16: 'gteq',
-    17: 'boolean',
-    18: 'float',
-    19: 'slash',
-    20: 'rsquare',
-    21: 'rparen',
-    22: 'colon',
-    23: 'lsquare',
-    24: 'fqn',
-    25: 'task',
-    26: 'as',
-    27: 'identifier',
-    28: 'comma',
-    29: 'string',
-    30: 'cmd_param_start',
-    31: 'if',
-    32: 'lt',
-    33: 'double_pipe',
-    34: 'output',
-    35: 'cmd_part',
-    36: 'runtime',
-    37: 'double_ampersand',
-    38: 'equal',
-    39: 'lteq',
-    40: 'rbrace',
-    41: 'qmark',
+    10: 'rsquare',
+    11: 'plus',
+    12: 'colon',
+    13: 'scatter',
+    14: 'dash',
+    15: 'lbrace',
+    16: 'cmd_param_end',
+    17: 'qmark',
+    18: 'lteq',
+    19: 'raw_command',
+    20: 'asterisk',
+    21: 'if',
+    22: 'not',
+    23: 'output',
+    24: 'cmd_param_start',
+    25: 'integer',
+    26: 'object',
+    27: 'double_pipe',
+    28: 'in',
+    29: 'cmd_attr_hint',
+    30: 'raw_cmd_start',
+    31: 'meta',
+    32: 'gt',
+    33: 'identifier',
+    34: 'gteq',
+    35: 'raw_cmd_end',
+    36: 'call',
+    37: 'comma',
+    38: 'rparen',
+    39: 'boolean',
+    40: 'as',
+    41: 'fqn',
     42: 'percent',
-    43: 'not_equal',
-    44: 'object',
-    45: 'in',
-    46: 'plus',
-    47: 'while',
-    48: 'raw_cmd_start',
-    49: 'meta',
-    50: 'workflow',
-    51: 'input',
-    52: 'lbrace',
-    53: 'call',
-    54: 'import',
-    55: 'cmd_param_end',
-    'raw_cmd_end': 0,
-    'scatter': 1,
-    'type_e': 2,
-    'integer': 3,
-    'dot': 4,
-    'raw_command': 5,
-    'type': 6,
-    'dash': 7,
-    'cmd_attr_hint': 8,
+    43: 'double_equal',
+    44: 'string',
+    45: 'while',
+    46: 'dot',
+    47: 'rbrace',
+    48: 'input',
+    49: 'slash',
+    50: 'lt',
+    51: 'not_equal',
+    52: 'equal',
+    53: 'workflow',
+    54: 'task',
+    55: 'e',
+    'runtime': 0,
+    'type': 1,
+    'double_ampersand': 2,
+    'type_e': 3,
+    'lsquare': 4,
+    'float': 5,
+    'cmd_part': 6,
+    'import': 7,
+    'parameter_meta': 8,
     'lparen': 9,
-    'not': 10,
-    'asterisk': 11,
-    'gt': 12,
-    'parameter_meta': 13,
-    'double_equal': 14,
-    'e': 15,
-    'gteq': 16,
-    'boolean': 17,
-    'float': 18,
-    'slash': 19,
-    'rsquare': 20,
-    'rparen': 21,
-    'colon': 22,
-    'lsquare': 23,
-    'fqn': 24,
-    'task': 25,
-    'as': 26,
-    'identifier': 27,
-    'comma': 28,
-    'string': 29,
-    'cmd_param_start': 30,
-    'if': 31,
-    'lt': 32,
-    'double_pipe': 33,
-    'output': 34,
-    'cmd_part': 35,
-    'runtime': 36,
-    'double_ampersand': 37,
-    'equal': 38,
-    'lteq': 39,
-    'rbrace': 40,
-    'qmark': 41,
+    'rsquare': 10,
+    'plus': 11,
+    'colon': 12,
+    'scatter': 13,
+    'dash': 14,
+    'lbrace': 15,
+    'cmd_param_end': 16,
+    'qmark': 17,
+    'lteq': 18,
+    'raw_command': 19,
+    'asterisk': 20,
+    'if': 21,
+    'not': 22,
+    'output': 23,
+    'cmd_param_start': 24,
+    'integer': 25,
+    'object': 26,
+    'double_pipe': 27,
+    'in': 28,
+    'cmd_attr_hint': 29,
+    'raw_cmd_start': 30,
+    'meta': 31,
+    'gt': 32,
+    'identifier': 33,
+    'gteq': 34,
+    'raw_cmd_end': 35,
+    'call': 36,
+    'comma': 37,
+    'rparen': 38,
+    'boolean': 39,
+    'as': 40,
+    'fqn': 41,
     'percent': 42,
-    'not_equal': 43,
-    'object': 44,
-    'in': 45,
-    'plus': 46,
-    'while': 47,
-    'raw_cmd_start': 48,
-    'meta': 49,
-    'workflow': 50,
-    'input': 51,
-    'lbrace': 52,
-    'call': 53,
-    'import': 54,
-    'cmd_param_end': 55,
+    'double_equal': 43,
+    'string': 44,
+    'while': 45,
+    'dot': 46,
+    'rbrace': 47,
+    'input': 48,
+    'slash': 49,
+    'lt': 50,
+    'not_equal': 51,
+    'equal': 52,
+    'workflow': 53,
+    'task': 54,
+    'e': 55,
 }
 # table[nonterminal][terminal] = rule
 table = [
-    [-1, -1, -1, -1, -1, 20, -1, -1, -1, -1, -1, -1, -1, 20, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 20, -1, 20, -1, -1, -1, 21, -1, -1, -1, -1, -1, -1, -1, -1, 20, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 3, -1, -1, -1, 0, -1],
-    [-1, -1, -1, 65, -1, -1, -1, 65, -1, 65, 65, -1, -1, -1, -1, 65, -1, 65, 65, -1, -1, -1, -1, 65, -1, -1, -1, 65, -1, 65, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 65, -1, 65, -1, -1, -1, -1, -1, 65, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 9, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 35, -1, -1, -1, -1, 34, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 48, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, 16, -1, -1, 17, 16, -1, -1, -1, -1, -1, -1, 17, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 17, -1, 17, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 17, -1, 17, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 51, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 54, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 104, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, 47, -1, -1, -1, 47, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 63, -1, -1, -1, -1, 64, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, 42, -1, -1, -1, 42, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 45, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, 61, -1, -1, -1, 61, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 70, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 88, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 89, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 89, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 56, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 106, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, 49, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [26, -1, -1, -1, -1, -1, -1, -1, 27, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 24, -1, -1, -1, 25, -1, -1, -1, -1, -1, -1, -1, 28, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 98, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, 43, -1, 43, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 44, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 14, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 93, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 85, 82, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, 39, 39, -1, -1, -1, 39, -1, 39, -1, -1, 39, 39, -1, -1, -1, -1, -1, -1, 39, -1, -1, 39, 39, -1, -1, 36, -1, -1, -1, 39, -1, -1, -1, -1, -1, 39, -1, -1, -1, -1, 39, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 39],
+    [-1, 67, -1, 67, -1, -1, -1, -1, -1, -1, -1, -1, -1, 67, -1, -1, -1, -1, -1, -1, -1, 67, -1, 67, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 67, -1, -1, -1, -1, -1, -1, -1, -1, 67, -1, 68, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 56, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, 129, 129, -1, -1, -1, 129, 132, 129, -1, -1, 129, 129, -1, -1, -1, -1, -1, -1, 129, -1, -1, 129, 129, -1, -1, -1, -1, -1, -1, 129, -1, -1, -1, -1, 132, 129, -1, -1, -1, -1, 129, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 129],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 105, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 88, -1, -1, -1, -1, -1, -1, -1, -1, -1, 89, 89, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 102, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, 47, -1, 47, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 46, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 84, 83, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 9, 10, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 95, -1, -1, -1, -1, -1, -1, -1, -1, -1, 96, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 81, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 57, -1, -1, -1, -1, -1, 57, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 58, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 103, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 64, -1, -1, -1, -1, -1, 63, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [60, 60, -1, 60, -1, -1, -1, -1, 60, -1, -1, -1, -1, 60, -1, -1, -1, -1, -1, 60, -1, 60, -1, 60, -1, -1, -1, -1, -1, -1, -1, 60, -1, -1, -1, -1, 60, -1, -1, -1, -1, -1, -1, -1, -1, 60, -1, 60, 60, -1, -1, -1, 59, -1, -1, -1],
+    [-1, 72, -1, 72, -1, -1, -1, -1, -1, -1, -1, -1, -1, 75, -1, -1, -1, -1, -1, -1, -1, 74, -1, 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 71, -1, -1, -1, -1, -1, -1, -1, -1, 73, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, -1, -1, -1, -1, -1, -1, -1, 99, 100, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, 107, -1, 107, -1, -1, -1, -1, -1, -1, 110, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 52, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 53, -1, -1, -1, -1, -1, -1, -1, -1],
     [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, 78, 78, -1, -1, -1, 78, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 77, -1, -1, -1, -1, 78, -1, -1, 78, -1, -1, -1, -1, -1, 78, -1, -1, -1, -1, -1, -1, 78, -1, -1, -1, -1, 78, 78, -1, -1],
-    [-1, -1, -1, 39, -1, -1, -1, 39, 36, 39, 39, -1, -1, -1, -1, 39, -1, 39, 39, -1, -1, -1, -1, 39, -1, -1, -1, 39, -1, 39, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 39, -1, 39, -1, -1, -1, -1, -1, 39, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 85, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 82, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 93, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 95, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 96, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 81, -1, -1],
-    [-1, -1, -1, 129, -1, -1, -1, 129, -1, 129, 129, -1, -1, -1, -1, 129, -1, 129, 129, -1, 132, 132, -1, 129, -1, -1, -1, 129, -1, 129, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 129, -1, 129, -1, -1, -1, -1, -1, 129, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 49, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, 67, 67, -1, -1, -1, 67, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 67, -1, -1, 67, -1, -1, -1, -1, -1, 68, -1, -1, -1, -1, -1, -1, 67, -1, -1, -1, -1, -1, 67, -1, -1],
-    [-1, 60, 60, -1, -1, 60, 60, -1, -1, -1, -1, -1, -1, 60, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 60, -1, -1, 60, -1, 60, -1, 59, -1, 60, -1, -1, -1, -1, -1, -1, 60, -1, 60, -1, 60, -1, 60, -1, -1],
-    [-1, -1, -1, 38, -1, -1, -1, 38, 37, 38, 38, -1, -1, -1, -1, 38, -1, 38, 38, -1, -1, -1, -1, 38, -1, -1, -1, 38, -1, 38, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 38, -1, 38, -1, -1, -1, -1, -1, 38, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 58, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 57, -1, -1, -1, -1, 57, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, 66, 66, -1, -1, -1, 66, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 66, -1, -1, 66, -1, -1, -1, -1, -1, 69, -1, -1, -1, -1, -1, -1, 66, -1, -1, -1, -1, -1, 66, -1, -1],
-    [-1, 105, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 94, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 97, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 84, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 83, -1, -1, -1, -1],
-    [-1, 80, 80, -1, -1, -1, 80, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 80, -1, -1, 80, -1, -1, -1, -1, -1, 80, -1, -1, -1, -1, -1, -1, 80, -1, -1, -1, -1, 79, 80, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 109, -1, -1, -1, -1, -1, -1, -1, 108, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [31, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 30, -1, -1, -1, -1, 30, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 136, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 139, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 8, -1, -1, -1, 8, -1],
-    [-1, 75, 72, -1, -1, -1, 72, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 74, -1, -1, 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 73, -1, -1, -1, -1, -1, 71, -1, -1],
-    [-1, -1, -1, -1, 102, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 12, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 12, -1, -1, -1, 12, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 103, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 5, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 46, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [32, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, -1, 29, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 2, -1, -1, -1, 1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 52, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 53, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 137, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 138, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, 33, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 91, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 13, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, 41, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 131, 131, -1, -1, -1, -1, -1, -1, 130, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, 24, -1, -1, -1, -1, -1, -1, -1, 27, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 25, -1, 26, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 28, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 50, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 23, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 40, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, 107, -1, -1, -1, 107, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 110, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 143, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 144, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, 142, -1, -1, -1, 142, -1, 142, 142, -1, -1, -1, -1, 142, -1, 142, 142, -1, -1, -1, -1, 142, -1, -1, -1, 142, -1, 142, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 145, -1, -1, -1, 142, -1, 142, -1, -1, -1, -1, -1, 142, -1, -1, -1],
-    [-1, -1, 15, -1, -1, 18, 15, -1, -1, -1, -1, -1, -1, 18, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 18, -1, 18, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 18, -1, 18, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 92, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 86, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 14, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, 43, -1, -1, -1, 43, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 44, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, 19, -1, -1, -1, -1, -1, -1, -1, 19, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 19, -1, 19, -1, -1, -1, 22, -1, -1, -1, -1, -1, -1, -1, -1, 19, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 55, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 55, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, 42, -1, 42, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 45, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 92, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, 29, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 32, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 3, 3, -1],
+    [-1, 80, -1, 80, -1, -1, -1, -1, -1, -1, -1, -1, -1, 80, -1, 79, -1, -1, -1, -1, -1, 80, -1, 80, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 80, -1, -1, -1, -1, -1, -1, -1, -1, 80, -1, 80, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, 34, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 35, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, 38, 38, -1, -1, -1, 38, -1, 38, -1, -1, 38, 38, -1, -1, -1, -1, -1, -1, 38, -1, -1, 38, 38, -1, -1, 37, -1, -1, -1, 38, -1, -1, -1, -1, -1, 38, -1, -1, -1, -1, 38, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 38],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 91, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 109, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 108, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, 65, 65, -1, -1, -1, 65, -1, 65, -1, -1, 65, 65, -1, -1, -1, -1, -1, -1, 65, -1, -1, 65, 65, -1, -1, -1, -1, -1, -1, 65, -1, -1, -1, -1, -1, 65, -1, -1, -1, -1, 65, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 65],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 86, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 40, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 106, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 23, -1],
+    [20, -1, -1, -1, -1, -1, -1, -1, 20, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 20, -1, -1, -1, 20, -1, -1, -1, -1, -1, -1, -1, 20, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 21, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, 12, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 12, 12, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, 4, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 51, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 54, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, 78, -1, 78, -1, -1, -1, -1, -1, -1, -1, -1, -1, 78, -1, 78, -1, -1, -1, -1, -1, 78, -1, 78, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 78, -1, -1, -1, 77, -1, -1, -1, -1, 78, -1, 78, -1, -1, -1, -1, -1, -1, -1, -1],
+    [18, 15, -1, 15, -1, -1, -1, -1, 18, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 18, -1, -1, -1, 18, -1, -1, -1, -1, -1, -1, -1, 18, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 18, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 131, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 130, 131, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
     [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
-    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 98, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, 90, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 33, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, 30, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 30, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 31, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 41, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, 142, 142, -1, -1, -1, 142, -1, 142, -1, -1, 142, 142, -1, -1, -1, -1, -1, -1, 142, -1, -1, 142, 142, -1, -1, -1, -1, -1, -1, 142, -1, -1, -1, -1, -1, 142, -1, -1, -1, -1, 142, -1, -1, 145, -1, -1, -1, -1, -1, -1, -1, 142],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 94, -1, -1, -1, -1, -1, 97, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 50, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 136, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 139, -1, -1, -1, -1, -1, -1, -1, -1],
+    [48, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, 61, -1, 61, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 137, -1, -1, -1, -1, -1, -1, -1, -1, -1, 138, -1, -1, -1, -1, -1, -1, -1, -1],
+    [17, 16, -1, 16, -1, -1, -1, -1, 17, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 17, -1, -1, -1, 17, -1, -1, -1, -1, -1, -1, -1, 17, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 17, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 2, 2, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 143, -1, -1, -1, -1, -1, -1, -1, -1, -1, 144, -1, -1, -1, -1, -1, -1, -1, -1],
+    [19, -1, -1, -1, -1, -1, -1, -1, 19, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 19, -1, -1, -1, 19, -1, -1, -1, -1, -1, -1, -1, 19, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, 66, -1, 66, -1, -1, -1, -1, -1, -1, -1, -1, -1, 66, -1, -1, -1, -1, -1, -1, -1, 66, -1, 66, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 66, -1, -1, -1, -1, -1, -1, -1, -1, 66, -1, 69, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 5, 5, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 70, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 104, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1],
+    [-1, -1, -1, -1, -1, -1, -1, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 8, 8, -1],
 ]
 nonterminal_first = {
-    56: [49, 13, 5, -1, 34, 36],
-    57: [54, -1],
-    58: [23, 10, 9, 27, 44, 3, 46, 29, 15, 17, 52, 18, 7],
-    59: [50, 25],
-    60: [30, 35],
-    61: [36],
-    62: [6, -1, 2],
-    63: [-1, 27],
-    64: [31],
-    65: [6, 2],
-    66: [46, 41],
-    67: [6, -1, 2],
-    68: [6, 2],
-    69: [38],
-    70: [50],
-    71: [-1, 28],
-    72: [27],
-    73: [27],
-    74: [23, 10, 9, 27, 44, 3, 46, 29, 15, 17, 52, 18, 7],
-    75: [26, -1],
-    76: [8, -1],
-    77: [51, -1],
-    78: [26],
-    79: [-1, 28],
-    80: [53],
-    81: [23, 27, 3, 29, 7, 10, -1, 9, 44, 46, 15, 17, 52, 18],
-    82: [50, 25, -1],
-    83: [13],
-    84: [-1, 2, 1, 47, 31, 53, 34, 6],
-    85: [38, -1],
-    86: [8, -1],
-    87: [41, 46, -1],
-    88: [-1, 2, 1, 47, 31, 53, 34, 6],
-    89: [1],
-    90: [24, -1],
-    91: [51, -1],
-    92: [52, -1],
-    93: [-1, 28],
-    94: [-1, 30, 35],
-    95: [-1, 27],
-    96: [54, 50, 25, -1],
-    97: [47, 53, 2, 1, 34, 6, 31],
-    98: [4],
-    99: [26, -1],
-    100: [47],
-    101: [-1, 27],
-    102: [50, 25, -1],
-    103: [34],
-    104: [-1, 30, 35],
-    105: [54, -1],
-    106: [-1, 27],
-    107: [-1, 28],
-    108: [5],
-    109: [51],
-    110: [54],
-    111: [8],
-    112: [-1, 28],
-    113: [49, 13, 5, 36, 34],
-    114: [49],
-    115: [25],
-    116: [30],
-    117: [24],
-    118: [4, -1],
-    119: [6, -1, 2],
-    120: [-1, 28],
-    121: [23, 10, -1, 9, 27, 44, 3, 46, 29, 15, 17, 52, 18, 7],
-    122: [6, -1, 2],
-    123: [27],
-    124: [52],
-    125: [26],
-    126: [6, -1, 2],
-    127: [49, 13, 5, -1, 34, 36],
-    128: [52],
-    129: [6, 2],
-    130: [34],
+    56: [8],
+    57: [8, 0, 23, 31, 19],
+    58: [23],
+    59: [3, 1, -1],
+    60: [40],
+    61: [40],
+    62: [48, -1],
+    63: [29, -1],
+    64: [1, -1, 45, 3, 13, 21, 36, 23],
+    65: [33],
+    66: [25, 26, -1, 4, 5, 33, 14, 9, 11, 15, 39, 44, 22, 55],
+    67: [13],
+    68: [37, -1],
+    69: [46],
+    70: [3, 1],
+    71: [23],
+    72: [48, -1],
+    73: [41],
+    74: [53, 54],
+    75: [37, -1],
+    76: [36],
+    77: [17, 11, -1],
+    78: [45],
+    79: [17, 11],
+    80: [52, -1],
+    81: [36, 21, 1, 45, 13, 23, 3],
+    82: [46, -1],
+    83: [3, 1, -1],
+    84: [33, -1],
+    85: [3, 1],
+    86: [15],
+    87: [3, 1, -1],
+    88: [33],
+    89: [24, 6, -1],
+    90: [7, -1],
+    91: [15, -1],
+    92: [24, 6],
+    93: [29, -1],
+    94: [48],
+    95: [37, -1],
+    96: [25, 26, 39, 44, 4, 5, 33, 14, 9, 11, 22, 15, 55],
+    97: [15],
+    98: [24],
+    99: [33],
+    100: [54],
+    101: [8, 0, -1, 31, 23, 19],
+    102: [40, -1],
+    103: [53, 54, -1],
+    104: [33, -1],
+    105: [7],
+    106: [40, -1],
+    107: [3, 1, -1],
+    108: [37, -1],
+    109: [25, 26, 39, 44, 4, 5, 33, 14, 9, 11, 22, 15, 55],
+    110: [33, -1],
+    111: [19],
+    112: [24, 6, -1],
+    113: [29],
+    114: [25, 26, 39, -1, 44, 4, 5, 33, 14, 9, 11, 22, 15, 55],
+    115: [41, -1],
+    116: [31],
+    117: [33, -1],
+    118: [0],
+    119: [3, 1],
+    120: [37, -1],
+    121: [3, 1, -1],
+    122: [52],
+    123: [7, -1],
+    124: [37, -1],
+    125: [8, 0, -1, 31, 23, 19],
+    126: [1, -1, 45, 3, 13, 21, 36, 23],
+    127: [53, 54, -1],
+    128: [53],
+    129: [21],
+    130: [7, 54, 53, -1],
 }
 nonterminal_follow = {
-    56: [40],
-    57: [50, 25, -1],
-    58: [40, 28],
-    59: [50, 25, -1],
-    60: [0, 35, 30],
-    61: [40, 13, 49, 5, 34, 36],
-    62: [49, 51, 13, 5, 34, 36],
-    63: [40],
-    64: [40, 2, 1, 47, 31, 53, 34, 6],
-    65: [6, 40, 2],
-    66: [27],
-    67: [40],
-    68: [40, 2, 1, 47, 13, 31, 49, 51, 5, 53, 34, 6, 36],
-    69: [2, 1, 31, 5, 34, 6, 36, 40, 47, 13, 49, 51, 53],
-    70: [50, 25, -1],
-    71: [51, 40],
-    72: [40, 27],
-    73: [40, 28],
-    74: [2, 3, 1, 5, 6, 7, 8, 10, 9, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 27, 28, 29, 32, 31, 33, 34, 36, 37, 39, 40, 44, 42, 43, 46, 47, 51, 49, 52, 53, 55],
-    75: [40, 2, 1, 47, 31, 52, 53, 34, 6],
-    76: [23, 10, 9, 27, 44, 3, 46, 29, 15, 17, 52, 18, 7],
-    77: [40],
-    78: [40, 2, 1, 47, 31, 52, 53, 34, 6],
-    79: [40],
-    80: [40, 2, 1, 47, 31, 53, 34, 6],
-    81: [20, 21],
-    82: [-1],
-    83: [40, 13, 49, 5, 34, 36],
-    84: [40],
-    85: [2, 1, 31, 5, 34, 6, 36, 40, 47, 13, 49, 51, 53],
-    86: [23, 10, 9, 27, 44, 3, 46, 29, 15, 17, 52, 18, 7],
-    87: [27],
-    88: [40],
-    89: [40, 2, 1, 47, 31, 53, 34, 6],
-    90: [40],
-    91: [40],
-    92: [40, 2, 1, 47, 31, 53, 34, 6],
-    93: [20],
-    94: [0],
-    95: [40],
-    96: [-1],
-    97: [6, 40, 2, 1, 53, 34, 47, 31],
-    98: [40, 28],
-    99: [54, 50, 25, -1],
-    100: [40, 2, 1, 47, 31, 53, 34, 6],
-    101: [51, 40],
-    102: [-1],
-    103: [40, 13, 49, 5, 34, 36],
-    104: [0],
-    105: [50, 25, -1],
-    106: [40],
-    107: [40],
-    108: [40, 13, 49, 5, 34, 36],
-    109: [51, 40],
-    110: [54, 50, 25, -1],
-    111: [8, 23, 10, 9, 27, 44, 3, 46, 29, 15, 17, 52, 18, 7],
-    112: [20, 21],
-    113: [49, 13, 5, 40, 34, 36],
-    114: [40, 13, 49, 5, 34, 36],
-    115: [50, 25, -1],
-    116: [0, 35, 30],
-    117: [40, 28],
-    118: [40, 28],
-    119: [20],
-    120: [40],
-    121: [40],
-    122: [49, 51, 13, 5, 34, 36],
-    123: [51, 40, 28],
-    124: [40, 2, 1, 47, 31, 53, 34, 6],
-    125: [54, 50, 25, -1],
-    126: [40],
-    127: [40],
-    128: [40, 13, 49, 5, 34, 36],
-    129: [28, 20, 46, 41, 27],
-    130: [40, 2, 1, 47, 31, 53, 34, 6],
+    56: [0, 31, 47, 19, 8, 23],
+    57: [8, 0, 31, 23, 47, 19],
+    58: [1, 45, 3, 47, 13, 21, 36, 23],
+    59: [47],
+    60: [7, 54, -1, 53],
+    61: [1, 45, 3, 47, 13, 21, 36, 23, 15],
+    62: [47],
+    63: [25, 26, 39, 44, 4, 5, 33, 14, 9, 11, 22, 15, 55],
+    64: [47],
+    65: [33, 47],
+    66: [38, 10],
+    67: [1, 45, 3, 47, 13, 21, 36, 23],
+    68: [47, 48],
+    69: [47, 37],
+    70: [47, 3, 1],
+    71: [0, 31, 47, 19, 8, 23],
+    72: [47],
+    73: [47, 37],
+    74: [53, 54, -1],
+    75: [47],
+    76: [1, 45, 3, 47, 13, 21, 36, 23],
+    77: [33],
+    78: [1, 45, 3, 47, 13, 21, 36, 23],
+    79: [33],
+    80: [0, 1, 31, 3, 8, 13, 36, 45, 47, 48, 19, 21, 23],
+    81: [21, 1, 13, 36, 45, 23, 3, 47],
+    82: [47, 37],
+    83: [10],
+    84: [47],
+    85: [33, 37, 10, 17, 11],
+    86: [0, 31, 47, 19, 8, 23],
+    87: [47],
+    88: [47, 48, 37],
+    89: [35],
+    90: [53, 54, -1],
+    91: [1, 45, 3, 47, 13, 21, 36, 23],
+    92: [24, 6, 35],
+    93: [25, 26, 39, 44, 4, 5, 33, 14, 9, 11, 22, 15, 55],
+    94: [47, 48],
+    95: [10],
+    96: [47, 37],
+    97: [1, 45, 3, 47, 13, 21, 36, 23],
+    98: [24, 6, 35],
+    99: [47, 37],
+    100: [53, 54, -1],
+    101: [47],
+    102: [7, 54, -1, 53],
+    103: [-1],
+    104: [47],
+    105: [7, 54, -1, 53],
+    106: [1, 45, 3, 47, 13, 21, 36, 23, 15],
+    107: [8, 0, 31, 23, 48, 19],
+    108: [38, 10],
+    109: [0, 1, 2, 3, 4, 5, 10, 14, 9, 8, 11, 12, 13, 15, 16, 18, 19, 20, 21, 22, 23, 25, 26, 27, 29, 31, 32, 33, 34, 36, 37, 38, 39, 42, 43, 44, 45, 49, 47, 48, 50, 51, 55],
+    110: [47, 48],
+    111: [0, 31, 47, 19, 8, 23],
+    112: [35],
+    113: [25, 26, 39, 29, 44, 4, 5, 33, 14, 9, 11, 22, 15, 55],
+    114: [47],
+    115: [47],
+    116: [0, 31, 47, 19, 8, 23],
+    117: [47],
+    118: [0, 31, 47, 19, 8, 23],
+    119: [0, 1, 45, 31, 3, 48, 47, 19, 8, 13, 21, 36, 23],
+    120: [47],
+    121: [8, 0, 31, 23, 48, 19],
+    122: [0, 1, 31, 3, 8, 13, 36, 45, 47, 48, 19, 21, 23],
+    123: [53, 54, -1],
+    124: [47],
+    125: [47],
+    126: [47],
+    127: [-1],
+    128: [53, 54, -1],
+    129: [1, 45, 3, 47, 13, 21, 36, 23],
+    130: [-1],
 }
 rule_first = {
-    0: [54],
-    1: [54],
+    0: [7],
+    1: [7],
     2: [-1],
     3: [-1],
-    4: [50, 25],
-    5: [50, 25],
+    4: [53, 54],
+    5: [53, 54],
     6: [-1],
     7: [-1],
-    8: [54, 50, -1, 25],
-    9: [50],
-    10: [25],
-    11: [26],
+    8: [7, 54, 53, -1],
+    9: [53],
+    10: [54],
+    11: [40],
     12: [-1],
-    13: [54],
-    14: [26],
-    15: [6, 2],
-    16: [6, 2],
+    13: [7],
+    14: [40],
+    15: [3, 1],
+    16: [3, 1],
     17: [-1],
     18: [-1],
-    19: [49, 36, 5, 13, 34],
-    20: [49, 36, 5, 13, 34],
+    19: [8, 0, 23, 31, 19],
+    20: [8, 0, 23, 31, 19],
     21: [-1],
     22: [-1],
-    23: [25],
-    24: [5],
-    25: [34],
-    26: [36],
-    27: [13],
-    28: [49],
-    29: [35, 30],
-    30: [35, 30],
+    23: [54],
+    24: [19],
+    25: [23],
+    26: [0],
+    27: [8],
+    28: [31],
+    29: [24, 6],
+    30: [24, 6],
     31: [-1],
     32: [-1],
-    33: [5],
-    34: [35],
-    35: [30],
-    36: [8],
-    37: [8],
+    33: [19],
+    34: [6],
+    35: [24],
+    36: [29],
+    37: [29],
     38: [-1],
     39: [-1],
-    40: [30],
-    41: [8],
-    42: [6, 2],
-    43: [6, 2],
+    40: [24],
+    41: [29],
+    42: [3, 1],
+    43: [3, 1],
     44: [-1],
     45: [-1],
-    46: [34],
-    47: [6, 2],
-    48: [36],
-    49: [13],
-    50: [49],
-    51: [27],
-    52: [27],
+    46: [23],
+    47: [3, 1],
+    48: [0],
+    49: [8],
+    50: [31],
+    51: [33],
+    52: [33],
     53: [-1],
     54: [-1],
-    55: [52],
-    56: [27],
-    57: [46, 41],
+    55: [15],
+    56: [33],
+    57: [17, 11],
     58: [-1],
-    59: [38],
+    59: [52],
     60: [-1],
-    61: [6, 2],
-    62: [38],
-    63: [41],
-    64: [46],
-    65: [23, 10, 9, 27, 44, 3, 46, 29, 15, 17, 52, 18, 7],
-    66: [6, 1, 2, 53, 34, 47, 31],
-    67: [6, 1, 2, 53, 34, 47, 31],
+    61: [3, 1],
+    62: [52],
+    63: [17],
+    64: [11],
+    65: [25, 26, 39, 44, 4, 5, 33, 14, 9, 11, 22, 15, 55],
+    66: [1, 21, 13, 45, 36, 23, 3],
+    67: [1, 21, 13, 45, 36, 23, 3],
     68: [-1],
     69: [-1],
-    70: [50],
-    71: [53],
-    72: [6, 2],
-    73: [47],
-    74: [31],
-    75: [1],
-    76: [34],
-    77: [26],
+    70: [53],
+    71: [36],
+    72: [3, 1],
+    73: [45],
+    74: [21],
+    75: [13],
+    76: [23],
+    77: [40],
     78: [-1],
-    79: [52],
+    79: [15],
     80: [-1],
-    81: [53],
-    82: [51],
-    83: [51],
+    81: [36],
+    82: [48],
+    83: [48],
     84: [-1],
     85: [-1],
-    86: [52],
-    87: [27],
-    88: [28],
+    86: [15],
+    87: [33],
+    88: [37],
     89: [-1],
     90: [-1],
-    91: [51],
-    92: [27],
-    93: [26],
-    94: [24],
-    95: [28],
+    91: [48],
+    92: [33],
+    93: [40],
+    94: [41],
+    95: [37],
     96: [-1],
     97: [-1],
-    98: [34],
-    99: [4],
+    98: [23],
+    99: [46],
     100: [-1],
-    101: [24],
-    102: [4],
-    103: [47],
-    104: [31],
-    105: [1],
-    106: [27],
-    107: [6, 2],
-    108: [28],
+    101: [41],
+    102: [46],
+    103: [45],
+    104: [21],
+    105: [13],
+    106: [33],
+    107: [3, 1],
+    108: [37],
     109: [-1],
     110: [-1],
-    111: [6],
-    112: [6],
-    113: [23, 10, 9, 27, 44, 3, 46, 29, 15, 17, 52, 18, 7],
-    114: [23, 10, 9, 27, 44, 3, 46, 29, 15, 17, 52, 18, 7],
-    115: [23, 10, 9, 27, 44, 3, 46, 29, 15, 17, 52, 18, 7],
-    116: [23, 10, 9, 27, 44, 3, 46, 29, 15, 17, 52, 18, 7],
-    117: [23, 10, 9, 27, 44, 3, 46, 29, 15, 17, 52, 18, 7],
-    118: [23, 10, 9, 27, 44, 3, 46, 29, 15, 17, 52, 18, 7],
-    119: [23, 10, 9, 27, 44, 3, 46, 29, 15, 17, 52, 18, 7],
-    120: [23, 10, 9, 27, 44, 3, 46, 29, 15, 17, 52, 18, 7],
-    121: [23, 10, 9, 27, 44, 3, 46, 29, 15, 17, 52, 18, 7],
-    122: [23, 10, 9, 27, 44, 3, 46, 29, 15, 17, 52, 18, 7],
-    123: [23, 10, 9, 27, 44, 3, 46, 29, 15, 17, 52, 18, 7],
-    124: [23, 10, 9, 27, 44, 3, 46, 29, 15, 17, 52, 18, 7],
-    125: [23, 10, 9, 27, 44, 3, 46, 29, 15, 17, 52, 18, 7],
-    126: [10],
-    127: [46],
-    128: [7],
-    129: [23, 10, 9, 27, 44, 3, 46, 29, 15, 17, 52, 18, 7],
-    130: [28],
+    111: [1],
+    112: [1],
+    113: [25, 26, 39, 44, 4, 5, 33, 14, 9, 11, 22, 15, 55],
+    114: [25, 26, 39, 44, 4, 5, 33, 14, 9, 11, 22, 15, 55],
+    115: [25, 26, 39, 44, 4, 5, 33, 14, 9, 11, 22, 15, 55],
+    116: [25, 26, 39, 44, 4, 5, 33, 14, 9, 11, 22, 15, 55],
+    117: [25, 26, 39, 44, 4, 5, 33, 14, 9, 11, 22, 15, 55],
+    118: [25, 26, 39, 44, 4, 5, 33, 14, 9, 11, 22, 15, 55],
+    119: [25, 26, 39, 44, 4, 5, 33, 14, 9, 11, 22, 15, 55],
+    120: [25, 26, 39, 44, 4, 5, 33, 14, 9, 11, 22, 15, 55],
+    121: [25, 26, 39, 44, 4, 5, 33, 14, 9, 11, 22, 15, 55],
+    122: [25, 26, 39, 44, 4, 5, 33, 14, 9, 11, 22, 15, 55],
+    123: [25, 26, 39, 44, 4, 5, 33, 14, 9, 11, 22, 15, 55],
+    124: [25, 26, 39, 44, 4, 5, 33, 14, 9, 11, 22, 15, 55],
+    125: [25, 26, 39, 44, 4, 5, 33, 14, 9, 11, 22, 15, 55],
+    126: [22],
+    127: [11],
+    128: [14],
+    129: [25, 26, 39, 44, 4, 5, 33, 14, 9, 11, 22, 15, 55],
+    130: [37],
     131: [-1],
     132: [-1],
-    133: [27],
-    134: [27],
-    135: [27],
-    136: [27],
-    137: [28],
+    133: [33],
+    134: [33],
+    135: [33],
+    136: [33],
+    137: [37],
     138: [-1],
     139: [-1],
-    140: [44],
-    141: [23],
-    142: [23, 10, 9, 27, 44, 3, 46, 29, 15, 17, 52, 18, 7],
-    143: [28],
+    140: [26],
+    141: [4],
+    142: [25, 26, 39, 44, 4, 5, 33, 14, 9, 11, 22, 15, 55],
+    143: [37],
     144: [-1],
     145: [-1],
-    146: [52],
+    146: [15],
     147: [9],
-    148: [29],
-    149: [27],
-    150: [17],
-    151: [3],
-    152: [18],
+    148: [44],
+    149: [33],
+    150: [39],
+    151: [25],
+    152: [5],
 }
 nonterminal_rules = {
     56: [
-        "$_gen8 = $sections $_gen8",
-        "$_gen8 = :_empty",
+        "$parameter_meta = :parameter_meta $map -> ParameterMeta( map=$1 )",
     ],
     57: [
-        "$_gen0 = $import $_gen1",
-        "$_gen0 = :_empty",
+        "$sections = $command",
+        "$sections = $outputs",
+        "$sections = $runtime",
+        "$sections = $parameter_meta",
+        "$sections = $meta",
     ],
     58: [
-        "$map_kv = $e :colon $e -> MapLiteralKv( key=$0, value=$2 )",
+        "$wf_outputs = :output :lbrace $_gen27 :rbrace -> WorkflowOutputs( outputs=$2 )",
     ],
     59: [
-        "$workflow_or_task = $workflow",
-        "$workflow_or_task = $task",
+        "$_gen14 = $output_kv $_gen14",
+        "$_gen14 = :_empty",
     ],
     60: [
-        "$command_part = :cmd_part",
-        "$command_part = $cmd_param",
+        "$import_namespace = :as :identifier -> $1",
     ],
     61: [
-        "$runtime = :runtime $map -> Runtime( map=$1 )",
+        "$alias = :as :identifier -> $1",
     ],
     62: [
-        "$_gen6 = $declaration $_gen6",
-        "$_gen6 = :_empty",
+        "$_gen23 = $call_input $_gen24",
+        "$_gen23 = :_empty",
     ],
     63: [
-        "$_gen15 = $kv $_gen16",
-        "$_gen15 = :_empty",
+        "$_gen11 = $cmd_param_kv $_gen12",
+        "$_gen11 = :_empty",
     ],
     64: [
-        "$if_stmt = :if :lparen $e :rparen :lbrace $_gen19 :rbrace -> If( expression=$2, body=$5 )",
+        "$_gen20 = $wf_body_element $_gen20",
+        "$_gen20 = :_empty",
     ],
     65: [
-        "$output_kv = $type_e :identifier :equal $e -> Output( type=$0, var=$1, expression=$3 )",
+        "$kv = :identifier :colon $e -> RuntimeAttribute( key=$0, value=$2 )",
     ],
     66: [
-        "$postfix_quantifier = :qmark",
-        "$postfix_quantifier = :plus",
+        "$_gen32 = $e $_gen33",
+        "$_gen32 = :_empty",
     ],
     67: [
-        "$_gen13 = $output_kv $_gen14",
-        "$_gen13 = :_empty",
+        "$scatter = :scatter :lparen :identifier :in $e :rparen :lbrace $_gen19 :rbrace -> Scatter( item=$2, collection=$4, body=$7 )",
     ],
     68: [
-        "$declaration = $type_e $_gen17 :identifier $_gen18 -> Declaration( type=$0, postfix=$1, name=$2, expression=$3 )",
+        "$_gen26 = :comma $mapping $_gen26",
+        "$_gen26 = :_empty",
     ],
     69: [
-        "$setter = :equal $e -> $1",
+        "$wf_output_wildcard = :dot :asterisk -> $1",
     ],
     70: [
-        "$workflow = :workflow :identifier :lbrace $_gen19 :rbrace -> Workflow( name=$1, body=$3 )",
+        "$output_kv = $type_e :identifier :equal $e -> Output( type=$0, var=$1, expression=$3 )",
     ],
     71: [
-        "$_gen26 = :comma $mapping $_gen26",
-        "$_gen26 = :_empty",
+        "$outputs = :output :lbrace $_gen13 :rbrace -> Outputs( attributes=$2 )",
     ],
     72: [
-        "$kv = :identifier :colon $e -> RuntimeAttribute( key=$0, value=$2 )",
+        "$_gen24 = $call_input $_gen24",
+        "$_gen24 = :_empty",
     ],
     73: [
-        "$object_kv = :identifier :colon $e -> ObjectKV( key=$0, value=$2 )",
+        "$wf_output = :fqn $_gen29 -> WorkflowOutput( fqn=$0, wildcard=$1 )",
     ],
     74: [
-        "$e = $e :double_pipe $e -> LogicalOr( lhs=$0, rhs=$2 )",
-        "$e = $e :double_ampersand $e -> LogicalAnd( lhs=$0, rhs=$2 )",
-        "$e = $e :double_equal $e -> Equals( lhs=$0, rhs=$2 )",
-        "$e = $e :not_equal $e -> NotEquals( lhs=$0, rhs=$2 )",
-        "$e = $e :lt $e -> LessThan( lhs=$0, rhs=$2 )",
-        "$e = $e :lteq $e -> LessThanOrEqual( lhs=$0, rhs=$2 )",
-        "$e = $e :gt $e -> GreaterThan( lhs=$0, rhs=$2 )",
-        "$e = $e :gteq $e -> GreaterThanOrEqual( lhs=$0, rhs=$2 )",
-        "$e = $e :plus $e -> Add( lhs=$0, rhs=$2 )",
-        "$e = $e :dash $e -> Subtract( lhs=$0, rhs=$2 )",
-        "$e = $e :asterisk $e -> Multiply( lhs=$0, rhs=$2 )",
-        "$e = $e :slash $e -> Divide( lhs=$0, rhs=$2 )",
-        "$e = $e :percent $e -> Remainder( lhs=$0, rhs=$2 )",
-        "$e = :not $e -> LogicalNot( expression=$1 )",
-        "$e = :plus $e -> UnaryPlus( expression=$1 )",
-        "$e = :dash $e -> UnaryNegation( expression=$1 )",
-        "$e = :identifier <=> :lparen $_gen32 :rparen -> FunctionCall( name=$0, params=$2 )",
-        "$e = :identifier <=> :lsquare $e :rsquare -> ArrayOrMapLookup( lhs=$0, rhs=$2 )",
-        "$e = :identifier <=> :dot :identifier -> MemberAccess( lhs=$0, rhs=$2 )",
-        "$e = :object :lbrace $_gen34 :rbrace -> ObjectLiteral( map=$2 )",
-        "$e = :lsquare $_gen32 :rsquare -> ArrayLiteral( values=$1 )",
-        "$e = :lbrace $_gen36 :rbrace -> MapLiteral( map=$1 )",
-        "$e = :lparen $e :rparen -> $1",
-        "$e = :string",
-        "$e = :identifier",
-        "$e = :boolean",
-        "$e = :integer",
-        "$e = :float",
+        "$workflow_or_task = $workflow",
+        "$workflow_or_task = $task",
     ],
     75: [
-        "$_gen21 = $alias",
-        "$_gen21 = :_empty",
+        "$_gen28 = :comma $wf_output $_gen28",
+        "$_gen28 = :_empty",
     ],
     76: [
-        "$_gen11 = $cmd_param_kv $_gen12",
-        "$_gen11 = :_empty",
+        "$call = :call :fqn $_gen21 $_gen22 -> Call( task=$1, alias=$2, body=$3 )",
     ],
     77: [
-        "$_gen23 = $call_input $_gen24",
-        "$_gen23 = :_empty",
+        "$_gen17 = $postfix_quantifier",
+        "$_gen17 = :_empty",
     ],
     78: [
-        "$alias = :as :identifier -> $1",
+        "$while_loop = :while :lparen $e :rparen :lbrace $_gen19 :rbrace -> WhileLoop( expression=$2, body=$5 )",
     ],
     79: [
-        "$_gen28 = :comma $wf_output $_gen28",
-        "$_gen28 = :_empty",
+        "$postfix_quantifier = :qmark",
+        "$postfix_quantifier = :plus",
     ],
     80: [
-        "$call = :call :fqn $_gen21 $_gen22 -> Call( task=$1, alias=$2, body=$3 )",
+        "$_gen18 = $setter",
+        "$_gen18 = :_empty",
     ],
     81: [
-        "$_gen32 = $e $_gen33",
-        "$_gen32 = :_empty",
+        "$wf_body_element = $call",
+        "$wf_body_element = $declaration",
+        "$wf_body_element = $while_loop",
+        "$wf_body_element = $if_stmt",
+        "$wf_body_element = $scatter",
+        "$wf_body_element = $wf_outputs",
     ],
     82: [
-        "$_gen2 = $workflow_or_task $_gen3",
-        "$_gen2 = :_empty",
+        "$_gen29 = $wf_output_wildcard",
+        "$_gen29 = :_empty",
     ],
     83: [
-        "$parameter_meta = :parameter_meta $map -> ParameterMeta( map=$1 )",
+        "$_gen30 = $type_e $_gen31",
+        "$_gen30 = :_empty",
     ],
     84: [
-        "$_gen20 = $wf_body_element $_gen20",
-        "$_gen20 = :_empty",
+        "$_gen16 = $kv $_gen16",
+        "$_gen16 = :_empty",
     ],
     85: [
-        "$_gen18 = $setter",
-        "$_gen18 = :_empty",
+        "$type_e = :type <=> :lsquare $_gen30 :rsquare -> Type( name=$0, subtype=$2 )",
+        "$type_e = :type",
     ],
     86: [
-        "$_gen12 = $cmd_param_kv $_gen12",
-        "$_gen12 = :_empty",
+        "$map = :lbrace $_gen15 :rbrace -> $1",
     ],
     87: [
-        "$_gen17 = $postfix_quantifier",
-        "$_gen17 = :_empty",
+        "$_gen13 = $output_kv $_gen14",
+        "$_gen13 = :_empty",
     ],
     88: [
-        "$_gen19 = $wf_body_element $_gen20",
-        "$_gen19 = :_empty",
+        "$mapping = :identifier :equal $e -> IOMapping( key=$0, value=$2 )",
     ],
     89: [
-        "$scatter = :scatter :lparen :identifier :in $e :rparen :lbrace $_gen19 :rbrace -> Scatter( item=$2, collection=$4, body=$7 )",
+        "$_gen9 = $command_part $_gen10",
+        "$_gen9 = :_empty",
     ],
     90: [
-        "$_gen27 = $wf_output $_gen28",
-        "$_gen27 = :_empty",
+        "$_gen0 = $import $_gen1",
+        "$_gen0 = :_empty",
     ],
     91: [
-        "$_gen24 = $call_input $_gen24",
-        "$_gen24 = :_empty",
-    ],
-    92: [
         "$_gen22 = $call_body",
         "$_gen22 = :_empty",
     ],
+    92: [
+        "$command_part = :cmd_part",
+        "$command_part = $cmd_param",
+    ],
     93: [
-        "$_gen31 = :comma $type_e $_gen31",
-        "$_gen31 = :_empty",
+        "$_gen12 = $cmd_param_kv $_gen12",
+        "$_gen12 = :_empty",
     ],
     94: [
-        "$_gen10 = $command_part $_gen10",
-        "$_gen10 = :_empty",
+        "$call_input = :input :colon $_gen25 -> Inputs( map=$2 )",
     ],
     95: [
-        "$_gen34 = $object_kv $_gen35",
-        "$_gen34 = :_empty",
+        "$_gen31 = :comma $type_e $_gen31",
+        "$_gen31 = :_empty",
     ],
     96: [
-        "$document = $_gen0 $_gen2 -> Document( imports=$0, definitions=$1 )",
+        "$map_kv = $e :colon $e -> MapLiteralKv( key=$0, value=$2 )",
     ],
     97: [
-        "$wf_body_element = $call",
-        "$wf_body_element = $declaration",
-        "$wf_body_element = $while_loop",
-        "$wf_body_element = $if_stmt",
-        "$wf_body_element = $scatter",
-        "$wf_body_element = $wf_outputs",
+        "$call_body = :lbrace $_gen5 $_gen23 :rbrace -> CallBody( declarations=$1, io=$2 )",
     ],
     98: [
-        "$wf_output_wildcard = :dot :asterisk -> $1",
+        "$cmd_param = :cmd_param_start $_gen11 $e :cmd_param_end -> CommandParameter( attributes=$1, expr=$2 )",
     ],
     99: [
-        "$_gen4 = $import_namespace",
-        "$_gen4 = :_empty",
+        "$object_kv = :identifier :colon $e -> ObjectKV( key=$0, value=$2 )",
     ],
     100: [
-        "$while_loop = :while :lparen $e :rparen :lbrace $_gen19 :rbrace -> WhileLoop( expression=$2, body=$5 )",
+        "$task = :task :identifier :lbrace $_gen5 $_gen7 :rbrace -> Task( name=$1, declarations=$3, sections=$4 )",
     ],
     101: [
-        "$_gen25 = $mapping $_gen26",
-        "$_gen25 = :_empty",
+        "$_gen8 = $sections $_gen8",
+        "$_gen8 = :_empty",
     ],
     102: [
-        "$_gen3 = $workflow_or_task $_gen3",
-        "$_gen3 = :_empty",
+        "$_gen4 = $import_namespace",
+        "$_gen4 = :_empty",
     ],
     103: [
-        "$outputs = :output :lbrace $_gen13 :rbrace -> Outputs( attributes=$2 )",
+        "$_gen2 = $workflow_or_task $_gen3",
+        "$_gen2 = :_empty",
     ],
     104: [
-        "$_gen9 = $command_part $_gen10",
-        "$_gen9 = :_empty",
+        "$_gen15 = $kv $_gen16",
+        "$_gen15 = :_empty",
     ],
     105: [
-        "$_gen1 = $import $_gen1",
-        "$_gen1 = :_empty",
+        "$import = :import :string $_gen4 -> Import( uri=$1, namespace=$2 )",
     ],
     106: [
-        "$_gen16 = $kv $_gen16",
-        "$_gen16 = :_empty",
+        "$_gen21 = $alias",
+        "$_gen21 = :_empty",
     ],
     107: [
-        "$_gen35 = :comma $object_kv $_gen35",
-        "$_gen35 = :_empty",
+        "$_gen5 = $declaration $_gen6",
+        "$_gen5 = :_empty",
     ],
     108: [
-        "$command = :raw_command :raw_cmd_start $_gen9 :raw_cmd_end -> RawCommand( parts=$2 )",
+        "$_gen33 = :comma $e $_gen33",
+        "$_gen33 = :_empty",
     ],
     109: [
-        "$call_input = :input :colon $_gen25 -> Inputs( map=$2 )",
+        "$e = $e :double_pipe $e -> LogicalOr( lhs=$0, rhs=$2 )",
+        "$e = $e :double_ampersand $e -> LogicalAnd( lhs=$0, rhs=$2 )",
+        "$e = $e :double_equal $e -> Equals( lhs=$0, rhs=$2 )",
+        "$e = $e :not_equal $e -> NotEquals( lhs=$0, rhs=$2 )",
+        "$e = $e :lt $e -> LessThan( lhs=$0, rhs=$2 )",
+        "$e = $e :lteq $e -> LessThanOrEqual( lhs=$0, rhs=$2 )",
+        "$e = $e :gt $e -> GreaterThan( lhs=$0, rhs=$2 )",
+        "$e = $e :gteq $e -> GreaterThanOrEqual( lhs=$0, rhs=$2 )",
+        "$e = $e :plus $e -> Add( lhs=$0, rhs=$2 )",
+        "$e = $e :dash $e -> Subtract( lhs=$0, rhs=$2 )",
+        "$e = $e :asterisk $e -> Multiply( lhs=$0, rhs=$2 )",
+        "$e = $e :slash $e -> Divide( lhs=$0, rhs=$2 )",
+        "$e = $e :percent $e -> Remainder( lhs=$0, rhs=$2 )",
+        "$e = :not $e -> LogicalNot( expression=$1 )",
+        "$e = :plus $e -> UnaryPlus( expression=$1 )",
+        "$e = :dash $e -> UnaryNegation( expression=$1 )",
+        "$e = :identifier <=> :lparen $_gen32 :rparen -> FunctionCall( name=$0, params=$2 )",
+        "$e = :identifier <=> :lsquare $e :rsquare -> ArrayOrMapLookup( lhs=$0, rhs=$2 )",
+        "$e = :identifier <=> :dot :identifier -> MemberAccess( lhs=$0, rhs=$2 )",
+        "$e = :object :lbrace $_gen34 :rbrace -> ObjectLiteral( map=$2 )",
+        "$e = :lsquare $_gen32 :rsquare -> ArrayLiteral( values=$1 )",
+        "$e = :lbrace $_gen36 :rbrace -> MapLiteral( map=$1 )",
+        "$e = :lparen $e :rparen -> $1",
+        "$e = :string",
+        "$e = :identifier",
+        "$e = :boolean",
+        "$e = :integer",
+        "$e = :float",
     ],
     110: [
-        "$import = :import :string $_gen4 -> Import( uri=$1, namespace=$2 )",
+        "$_gen25 = $mapping $_gen26",
+        "$_gen25 = :_empty",
     ],
     111: [
-        "$cmd_param_kv = :cmd_attr_hint :identifier :equal $e -> CommandParameterAttr( key=$1, value=$3 )",
+        "$command = :raw_command :raw_cmd_start $_gen9 :raw_cmd_end -> RawCommand( parts=$2 )",
     ],
     112: [
-        "$_gen33 = :comma $e $_gen33",
-        "$_gen33 = :_empty",
+        "$_gen10 = $command_part $_gen10",
+        "$_gen10 = :_empty",
     ],
     113: [
-        "$sections = $command",
-        "$sections = $outputs",
-        "$sections = $runtime",
-        "$sections = $parameter_meta",
-        "$sections = $meta",
+        "$cmd_param_kv = :cmd_attr_hint :identifier :equal $e -> CommandParameterAttr( key=$1, value=$3 )",
     ],
     114: [
-        "$meta = :meta $map -> Meta( map=$1 )",
+        "$_gen36 = $map_kv $_gen37",
+        "$_gen36 = :_empty",
     ],
     115: [
-        "$task = :task :identifier :lbrace $_gen5 $_gen7 :rbrace -> Task( name=$1, declarations=$3, sections=$4 )",
+        "$_gen27 = $wf_output $_gen28",
+        "$_gen27 = :_empty",
     ],
     116: [
-        "$cmd_param = :cmd_param_start $_gen11 $e :cmd_param_end -> CommandParameter( attributes=$1, expr=$2 )",
+        "$meta = :meta $map -> Meta( map=$1 )",
     ],
     117: [
-        "$wf_output = :fqn $_gen29 -> WorkflowOutput( fqn=$0, wildcard=$1 )",
+        "$_gen34 = $object_kv $_gen35",
+        "$_gen34 = :_empty",
     ],
     118: [
-        "$_gen29 = $wf_output_wildcard",
-        "$_gen29 = :_empty",
+        "$runtime = :runtime $map -> Runtime( map=$1 )",
     ],
     119: [
-        "$_gen30 = $type_e $_gen31",
-        "$_gen30 = :_empty",
+        "$declaration = $type_e $_gen17 :identifier $_gen18 -> Declaration( type=$0, postfix=$1, name=$2, expression=$3 )",
     ],
     120: [
-        "$_gen37 = :comma $map_kv $_gen37",
-        "$_gen37 = :_empty",
+        "$_gen35 = :comma $object_kv $_gen35",
+        "$_gen35 = :_empty",
     ],
     121: [
-        "$_gen36 = $map_kv $_gen37",
-        "$_gen36 = :_empty",
+        "$_gen6 = $declaration $_gen6",
+        "$_gen6 = :_empty",
     ],
     122: [
-        "$_gen5 = $declaration $_gen6",
-        "$_gen5 = :_empty",
+        "$setter = :equal $e -> $1",
     ],
     123: [
-        "$mapping = :identifier :equal $e -> IOMapping( key=$0, value=$2 )",
+        "$_gen1 = $import $_gen1",
+        "$_gen1 = :_empty",
     ],
     124: [
-        "$call_body = :lbrace $_gen5 $_gen23 :rbrace -> CallBody( declarations=$1, io=$2 )",
+        "$_gen37 = :comma $map_kv $_gen37",
+        "$_gen37 = :_empty",
     ],
     125: [
-        "$import_namespace = :as :identifier -> $1",
+        "$_gen7 = $sections $_gen8",
+        "$_gen7 = :_empty",
     ],
     126: [
-        "$_gen14 = $output_kv $_gen14",
-        "$_gen14 = :_empty",
+        "$_gen19 = $wf_body_element $_gen20",
+        "$_gen19 = :_empty",
     ],
     127: [
-        "$_gen7 = $sections $_gen8",
-        "$_gen7 = :_empty",
+        "$_gen3 = $workflow_or_task $_gen3",
+        "$_gen3 = :_empty",
     ],
     128: [
-        "$map = :lbrace $_gen15 :rbrace -> $1",
+        "$workflow = :workflow :identifier :lbrace $_gen19 :rbrace -> Workflow( name=$1, body=$3 )",
     ],
     129: [
-        "$type_e = :type <=> :lsquare $_gen30 :rsquare -> Type( name=$0, subtype=$2 )",
-        "$type_e = :type",
+        "$if_stmt = :if :lparen $e :rparen :lbrace $_gen19 :rbrace -> If( expression=$2, body=$5 )",
     ],
     130: [
-        "$wf_outputs = :output :lbrace $_gen27 :rbrace -> WorkflowOutputs( outputs=$2 )",
+        "$document = $_gen0 $_gen2 -> Document( imports=$0, definitions=$1 )",
     ],
 }
 rules = {
@@ -1235,94 +1235,29 @@ def expect(ctx, terminal_id):
     if next and not is_terminal(next.id):
         raise ctx.errors.invalid_terminal(ctx.nonterminal, next)
     return current
-# START definitions for expression parser: type_e
-infix_binding_power_type_e = {
-    23: 1000, # $type_e = :type <=> :lsquare list(nt=$type_e, sep=:comma, min=0, sep_terminates=False) :rsquare -> Type( name=$0, subtype=$2 )
-}
-prefix_binding_power_type_e = {
-}
-def get_infix_binding_power_type_e(terminal_id):
-    try:
-        return infix_binding_power_type_e[terminal_id]
-    except:
-        return 0
-def get_prefix_binding_power_type_e(terminal_id):
-    try:
-        return prefix_binding_power_type_e[terminal_id]
-    except:
-        return 0
-def parse_type_e(ctx):
-    return parse_type_e_internal(ctx, rbp=0)
-def parse_type_e_internal(ctx, rbp=0):
-    left = nud_type_e(ctx)
-    if isinstance(left, ParseTree):
-        left.isExpr = True
-        left.isNud = True
-    while ctx.tokens.current() and rbp < get_infix_binding_power_type_e(ctx.tokens.current().id):
-        left = led_type_e(left, ctx)
-    if left:
-        left.isExpr = True
-    return left
-def nud_type_e(ctx):
-    tree = ParseTree(NonTerminal(129, 'type_e'))
-    current = ctx.tokens.current()
-    ctx.nonterminal = "type_e"
-    if not current:
-        return tree
-    if current.id in rule_first[111]:
-        # $type_e = :type <=> :lsquare $_gen30 :rsquare -> Type( name=$0, subtype=$2 )
-        ctx.rule = rules[111]
-        tree.astTransform = AstTransformSubstitution(0)
-        tree.nudMorphemeCount = 1
-        tree.add(expect(ctx, 6))
-    elif current.id in rule_first[112]:
-        # $type_e = :type
-        ctx.rule = rules[112]
-        tree.astTransform = AstTransformSubstitution(0)
-        tree.nudMorphemeCount = 1
-        tree.add(expect(ctx, 6))
-    return tree
-def led_type_e(left, ctx):
-    tree = ParseTree(NonTerminal(129, 'type_e'))
-    current = ctx.tokens.current()
-    ctx.nonterminal = "type_e"
-    if current.id == 23: # :lsquare
-        # $type_e = :type <=> :lsquare $_gen30 :rsquare -> Type( name=$0, subtype=$2 )
-        ctx.rule = rules[111]
-        ast_parameters = OrderedDict([
-            ('name', 0),
-            ('subtype', 2),
-        ])
-        tree.astTransform = AstTransformNodeCreator('Type', ast_parameters)
-        tree.add(left)
-        tree.add(expect(ctx, 23)) # :lsquare
-        tree.add(parse__gen30(ctx))
-        tree.add(expect(ctx, 20)) # :rsquare
-    return tree
-# END definitions for expression parser: type_e
 # START definitions for expression parser: e
 infix_binding_power_e = {
-    33: 2000, # $e = $e :double_pipe $e -> LogicalOr( lhs=$0, rhs=$2 )
-    37: 3000, # $e = $e :double_ampersand $e -> LogicalAnd( lhs=$0, rhs=$2 )
-    14: 4000, # $e = $e :double_equal $e -> Equals( lhs=$0, rhs=$2 )
-    43: 4000, # $e = $e :not_equal $e -> NotEquals( lhs=$0, rhs=$2 )
-    32: 5000, # $e = $e :lt $e -> LessThan( lhs=$0, rhs=$2 )
-    39: 5000, # $e = $e :lteq $e -> LessThanOrEqual( lhs=$0, rhs=$2 )
-    12: 5000, # $e = $e :gt $e -> GreaterThan( lhs=$0, rhs=$2 )
-    16: 5000, # $e = $e :gteq $e -> GreaterThanOrEqual( lhs=$0, rhs=$2 )
-    46: 6000, # $e = $e :plus $e -> Add( lhs=$0, rhs=$2 )
-    7: 6000, # $e = $e :dash $e -> Subtract( lhs=$0, rhs=$2 )
-    11: 7000, # $e = $e :asterisk $e -> Multiply( lhs=$0, rhs=$2 )
-    19: 7000, # $e = $e :slash $e -> Divide( lhs=$0, rhs=$2 )
+    27: 2000, # $e = $e :double_pipe $e -> LogicalOr( lhs=$0, rhs=$2 )
+    2: 3000, # $e = $e :double_ampersand $e -> LogicalAnd( lhs=$0, rhs=$2 )
+    43: 4000, # $e = $e :double_equal $e -> Equals( lhs=$0, rhs=$2 )
+    51: 4000, # $e = $e :not_equal $e -> NotEquals( lhs=$0, rhs=$2 )
+    50: 5000, # $e = $e :lt $e -> LessThan( lhs=$0, rhs=$2 )
+    18: 5000, # $e = $e :lteq $e -> LessThanOrEqual( lhs=$0, rhs=$2 )
+    32: 5000, # $e = $e :gt $e -> GreaterThan( lhs=$0, rhs=$2 )
+    34: 5000, # $e = $e :gteq $e -> GreaterThanOrEqual( lhs=$0, rhs=$2 )
+    11: 6000, # $e = $e :plus $e -> Add( lhs=$0, rhs=$2 )
+    14: 6000, # $e = $e :dash $e -> Subtract( lhs=$0, rhs=$2 )
+    20: 7000, # $e = $e :asterisk $e -> Multiply( lhs=$0, rhs=$2 )
+    49: 7000, # $e = $e :slash $e -> Divide( lhs=$0, rhs=$2 )
     42: 7000, # $e = $e :percent $e -> Remainder( lhs=$0, rhs=$2 )
     9: 9000, # $e = :identifier <=> :lparen list(nt=$e, sep=:comma, min=0, sep_terminates=False) :rparen -> FunctionCall( name=$0, params=$2 )
-    23: 10000, # $e = :identifier <=> :lsquare $e :rsquare -> ArrayOrMapLookup( lhs=$0, rhs=$2 )
-    4: 11000, # $e = :identifier <=> :dot :identifier -> MemberAccess( lhs=$0, rhs=$2 )
+    4: 10000, # $e = :identifier <=> :lsquare $e :rsquare -> ArrayOrMapLookup( lhs=$0, rhs=$2 )
+    46: 11000, # $e = :identifier <=> :dot :identifier -> MemberAccess( lhs=$0, rhs=$2 )
 }
 prefix_binding_power_e = {
-    10: 8000, # $e = :not $e -> LogicalNot( expression=$1 )
-    46: 8000, # $e = :plus $e -> UnaryPlus( expression=$1 )
-    7: 8000, # $e = :dash $e -> UnaryNegation( expression=$1 )
+    22: 8000, # $e = :not $e -> LogicalNot( expression=$1 )
+    11: 8000, # $e = :plus $e -> UnaryPlus( expression=$1 )
+    14: 8000, # $e = :dash $e -> UnaryNegation( expression=$1 )
 }
 def get_infix_binding_power_e(terminal_id):
     try:
@@ -1347,7 +1282,7 @@ def parse_e_internal(ctx, rbp=0):
         left.isExpr = True
     return left
 def nud_e(ctx):
-    tree = ParseTree(NonTerminal(74, 'e'))
+    tree = ParseTree(NonTerminal(109, 'e'))
     current = ctx.tokens.current()
     ctx.nonterminal = "e"
     if not current:
@@ -1360,8 +1295,8 @@ def nud_e(ctx):
         ])
         tree.astTransform = AstTransformNodeCreator('LogicalNot', ast_parameters)
         tree.nudMorphemeCount = 2
-        tree.add(expect(ctx, 10))
-        tree.add(parse_e_internal(ctx, get_prefix_binding_power_e(10)))
+        tree.add(expect(ctx, 22))
+        tree.add(parse_e_internal(ctx, get_prefix_binding_power_e(22)))
         tree.isPrefix = True
     elif current.id in rule_first[127]:
         # $e = :plus $e -> UnaryPlus( expression=$1 )
@@ -1371,8 +1306,8 @@ def nud_e(ctx):
         ])
         tree.astTransform = AstTransformNodeCreator('UnaryPlus', ast_parameters)
         tree.nudMorphemeCount = 2
-        tree.add(expect(ctx, 46))
-        tree.add(parse_e_internal(ctx, get_prefix_binding_power_e(46)))
+        tree.add(expect(ctx, 11))
+        tree.add(parse_e_internal(ctx, get_prefix_binding_power_e(11)))
         tree.isPrefix = True
     elif current.id in rule_first[128]:
         # $e = :dash $e -> UnaryNegation( expression=$1 )
@@ -1382,27 +1317,27 @@ def nud_e(ctx):
         ])
         tree.astTransform = AstTransformNodeCreator('UnaryNegation', ast_parameters)
         tree.nudMorphemeCount = 2
-        tree.add(expect(ctx, 7))
-        tree.add(parse_e_internal(ctx, get_prefix_binding_power_e(7)))
+        tree.add(expect(ctx, 14))
+        tree.add(parse_e_internal(ctx, get_prefix_binding_power_e(14)))
         tree.isPrefix = True
     elif current.id in rule_first[133]:
         # $e = :identifier <=> :lparen $_gen32 :rparen -> FunctionCall( name=$0, params=$2 )
         ctx.rule = rules[133]
         tree.astTransform = AstTransformSubstitution(0)
         tree.nudMorphemeCount = 1
-        tree.add(expect(ctx, 27))
+        tree.add(expect(ctx, 33))
     elif current.id in rule_first[134]:
         # $e = :identifier <=> :lsquare $e :rsquare -> ArrayOrMapLookup( lhs=$0, rhs=$2 )
         ctx.rule = rules[134]
         tree.astTransform = AstTransformSubstitution(0)
         tree.nudMorphemeCount = 1
-        tree.add(expect(ctx, 27))
+        tree.add(expect(ctx, 33))
     elif current.id in rule_first[135]:
         # $e = :identifier <=> :dot :identifier -> MemberAccess( lhs=$0, rhs=$2 )
         ctx.rule = rules[135]
         tree.astTransform = AstTransformSubstitution(0)
         tree.nudMorphemeCount = 1
-        tree.add(expect(ctx, 27))
+        tree.add(expect(ctx, 33))
     elif current.id in rule_first[140]:
         # $e = :object :lbrace $_gen34 :rbrace -> ObjectLiteral( map=$2 )
         ctx.rule = rules[140]
@@ -1411,10 +1346,10 @@ def nud_e(ctx):
         ])
         tree.astTransform = AstTransformNodeCreator('ObjectLiteral', ast_parameters)
         tree.nudMorphemeCount = 4
-        tree.add(expect(ctx, 44))
-        tree.add(expect(ctx, 52))
+        tree.add(expect(ctx, 26))
+        tree.add(expect(ctx, 15))
         tree.add(parse__gen34(ctx))
-        tree.add(expect(ctx, 40))
+        tree.add(expect(ctx, 47))
     elif current.id in rule_first[141]:
         # $e = :lsquare $_gen32 :rsquare -> ArrayLiteral( values=$1 )
         ctx.rule = rules[141]
@@ -1423,9 +1358,9 @@ def nud_e(ctx):
         ])
         tree.astTransform = AstTransformNodeCreator('ArrayLiteral', ast_parameters)
         tree.nudMorphemeCount = 3
-        tree.add(expect(ctx, 23))
+        tree.add(expect(ctx, 4))
         tree.add(parse__gen32(ctx))
-        tree.add(expect(ctx, 20))
+        tree.add(expect(ctx, 10))
     elif current.id in rule_first[146]:
         # $e = :lbrace $_gen36 :rbrace -> MapLiteral( map=$1 )
         ctx.rule = rules[146]
@@ -1434,9 +1369,9 @@ def nud_e(ctx):
         ])
         tree.astTransform = AstTransformNodeCreator('MapLiteral', ast_parameters)
         tree.nudMorphemeCount = 3
-        tree.add(expect(ctx, 52))
+        tree.add(expect(ctx, 15))
         tree.add(parse__gen36(ctx))
-        tree.add(expect(ctx, 40))
+        tree.add(expect(ctx, 47))
     elif current.id in rule_first[147]:
         # $e = :lparen $e :rparen -> $1
         ctx.rule = rules[147]
@@ -1444,43 +1379,43 @@ def nud_e(ctx):
         tree.nudMorphemeCount = 3
         tree.add(expect(ctx, 9))
         tree.add(parse_e(ctx))
-        tree.add(expect(ctx, 21))
+        tree.add(expect(ctx, 38))
     elif current.id in rule_first[148]:
         # $e = :string
         ctx.rule = rules[148]
         tree.astTransform = AstTransformSubstitution(0)
         tree.nudMorphemeCount = 1
-        tree.add(expect(ctx, 29))
+        tree.add(expect(ctx, 44))
     elif current.id in rule_first[149]:
         # $e = :identifier
         ctx.rule = rules[149]
         tree.astTransform = AstTransformSubstitution(0)
         tree.nudMorphemeCount = 1
-        tree.add(expect(ctx, 27))
+        tree.add(expect(ctx, 33))
     elif current.id in rule_first[150]:
         # $e = :boolean
         ctx.rule = rules[150]
         tree.astTransform = AstTransformSubstitution(0)
         tree.nudMorphemeCount = 1
-        tree.add(expect(ctx, 17))
+        tree.add(expect(ctx, 39))
     elif current.id in rule_first[151]:
         # $e = :integer
         ctx.rule = rules[151]
         tree.astTransform = AstTransformSubstitution(0)
         tree.nudMorphemeCount = 1
-        tree.add(expect(ctx, 3))
+        tree.add(expect(ctx, 25))
     elif current.id in rule_first[152]:
         # $e = :float
         ctx.rule = rules[152]
         tree.astTransform = AstTransformSubstitution(0)
         tree.nudMorphemeCount = 1
-        tree.add(expect(ctx, 18))
+        tree.add(expect(ctx, 5))
     return tree
 def led_e(left, ctx):
-    tree = ParseTree(NonTerminal(74, 'e'))
+    tree = ParseTree(NonTerminal(109, 'e'))
     current = ctx.tokens.current()
     ctx.nonterminal = "e"
-    if current.id == 33: # :double_pipe
+    if current.id == 27: # :double_pipe
         # $e = $e :double_pipe $e -> LogicalOr( lhs=$0, rhs=$2 )
         ctx.rule = rules[113]
         ast_parameters = OrderedDict([
@@ -1490,11 +1425,11 @@ def led_e(left, ctx):
         tree.astTransform = AstTransformNodeCreator('LogicalOr', ast_parameters)
         tree.isExprNud = True
         tree.add(left)
-        tree.add(expect(ctx, 33)) # :double_pipe
+        tree.add(expect(ctx, 27)) # :double_pipe
         modifier = 0
         tree.isInfix = True
-        tree.add(parse_e_internal(ctx, get_infix_binding_power_e(33) - modifier))
-    if current.id == 37: # :double_ampersand
+        tree.add(parse_e_internal(ctx, get_infix_binding_power_e(27) - modifier))
+    if current.id == 2: # :double_ampersand
         # $e = $e :double_ampersand $e -> LogicalAnd( lhs=$0, rhs=$2 )
         ctx.rule = rules[114]
         ast_parameters = OrderedDict([
@@ -1504,11 +1439,11 @@ def led_e(left, ctx):
         tree.astTransform = AstTransformNodeCreator('LogicalAnd', ast_parameters)
         tree.isExprNud = True
         tree.add(left)
-        tree.add(expect(ctx, 37)) # :double_ampersand
+        tree.add(expect(ctx, 2)) # :double_ampersand
         modifier = 0
         tree.isInfix = True
-        tree.add(parse_e_internal(ctx, get_infix_binding_power_e(37) - modifier))
-    if current.id == 14: # :double_equal
+        tree.add(parse_e_internal(ctx, get_infix_binding_power_e(2) - modifier))
+    if current.id == 43: # :double_equal
         # $e = $e :double_equal $e -> Equals( lhs=$0, rhs=$2 )
         ctx.rule = rules[115]
         ast_parameters = OrderedDict([
@@ -1518,11 +1453,11 @@ def led_e(left, ctx):
         tree.astTransform = AstTransformNodeCreator('Equals', ast_parameters)
         tree.isExprNud = True
         tree.add(left)
-        tree.add(expect(ctx, 14)) # :double_equal
+        tree.add(expect(ctx, 43)) # :double_equal
         modifier = 0
         tree.isInfix = True
-        tree.add(parse_e_internal(ctx, get_infix_binding_power_e(14) - modifier))
-    if current.id == 43: # :not_equal
+        tree.add(parse_e_internal(ctx, get_infix_binding_power_e(43) - modifier))
+    if current.id == 51: # :not_equal
         # $e = $e :not_equal $e -> NotEquals( lhs=$0, rhs=$2 )
         ctx.rule = rules[116]
         ast_parameters = OrderedDict([
@@ -1532,11 +1467,11 @@ def led_e(left, ctx):
         tree.astTransform = AstTransformNodeCreator('NotEquals', ast_parameters)
         tree.isExprNud = True
         tree.add(left)
-        tree.add(expect(ctx, 43)) # :not_equal
+        tree.add(expect(ctx, 51)) # :not_equal
         modifier = 0
         tree.isInfix = True
-        tree.add(parse_e_internal(ctx, get_infix_binding_power_e(43) - modifier))
-    if current.id == 32: # :lt
+        tree.add(parse_e_internal(ctx, get_infix_binding_power_e(51) - modifier))
+    if current.id == 50: # :lt
         # $e = $e :lt $e -> LessThan( lhs=$0, rhs=$2 )
         ctx.rule = rules[117]
         ast_parameters = OrderedDict([
@@ -1546,11 +1481,11 @@ def led_e(left, ctx):
         tree.astTransform = AstTransformNodeCreator('LessThan', ast_parameters)
         tree.isExprNud = True
         tree.add(left)
-        tree.add(expect(ctx, 32)) # :lt
+        tree.add(expect(ctx, 50)) # :lt
         modifier = 0
         tree.isInfix = True
-        tree.add(parse_e_internal(ctx, get_infix_binding_power_e(32) - modifier))
-    if current.id == 39: # :lteq
+        tree.add(parse_e_internal(ctx, get_infix_binding_power_e(50) - modifier))
+    if current.id == 18: # :lteq
         # $e = $e :lteq $e -> LessThanOrEqual( lhs=$0, rhs=$2 )
         ctx.rule = rules[118]
         ast_parameters = OrderedDict([
@@ -1560,11 +1495,11 @@ def led_e(left, ctx):
         tree.astTransform = AstTransformNodeCreator('LessThanOrEqual', ast_parameters)
         tree.isExprNud = True
         tree.add(left)
-        tree.add(expect(ctx, 39)) # :lteq
+        tree.add(expect(ctx, 18)) # :lteq
         modifier = 0
         tree.isInfix = True
-        tree.add(parse_e_internal(ctx, get_infix_binding_power_e(39) - modifier))
-    if current.id == 12: # :gt
+        tree.add(parse_e_internal(ctx, get_infix_binding_power_e(18) - modifier))
+    if current.id == 32: # :gt
         # $e = $e :gt $e -> GreaterThan( lhs=$0, rhs=$2 )
         ctx.rule = rules[119]
         ast_parameters = OrderedDict([
@@ -1574,11 +1509,11 @@ def led_e(left, ctx):
         tree.astTransform = AstTransformNodeCreator('GreaterThan', ast_parameters)
         tree.isExprNud = True
         tree.add(left)
-        tree.add(expect(ctx, 12)) # :gt
+        tree.add(expect(ctx, 32)) # :gt
         modifier = 0
         tree.isInfix = True
-        tree.add(parse_e_internal(ctx, get_infix_binding_power_e(12) - modifier))
-    if current.id == 16: # :gteq
+        tree.add(parse_e_internal(ctx, get_infix_binding_power_e(32) - modifier))
+    if current.id == 34: # :gteq
         # $e = $e :gteq $e -> GreaterThanOrEqual( lhs=$0, rhs=$2 )
         ctx.rule = rules[120]
         ast_parameters = OrderedDict([
@@ -1588,11 +1523,11 @@ def led_e(left, ctx):
         tree.astTransform = AstTransformNodeCreator('GreaterThanOrEqual', ast_parameters)
         tree.isExprNud = True
         tree.add(left)
-        tree.add(expect(ctx, 16)) # :gteq
+        tree.add(expect(ctx, 34)) # :gteq
         modifier = 0
         tree.isInfix = True
-        tree.add(parse_e_internal(ctx, get_infix_binding_power_e(16) - modifier))
-    if current.id == 46: # :plus
+        tree.add(parse_e_internal(ctx, get_infix_binding_power_e(34) - modifier))
+    if current.id == 11: # :plus
         # $e = $e :plus $e -> Add( lhs=$0, rhs=$2 )
         ctx.rule = rules[121]
         ast_parameters = OrderedDict([
@@ -1602,11 +1537,11 @@ def led_e(left, ctx):
         tree.astTransform = AstTransformNodeCreator('Add', ast_parameters)
         tree.isExprNud = True
         tree.add(left)
-        tree.add(expect(ctx, 46)) # :plus
+        tree.add(expect(ctx, 11)) # :plus
         modifier = 0
         tree.isInfix = True
-        tree.add(parse_e_internal(ctx, get_infix_binding_power_e(46) - modifier))
-    if current.id == 7: # :dash
+        tree.add(parse_e_internal(ctx, get_infix_binding_power_e(11) - modifier))
+    if current.id == 14: # :dash
         # $e = $e :dash $e -> Subtract( lhs=$0, rhs=$2 )
         ctx.rule = rules[122]
         ast_parameters = OrderedDict([
@@ -1616,11 +1551,11 @@ def led_e(left, ctx):
         tree.astTransform = AstTransformNodeCreator('Subtract', ast_parameters)
         tree.isExprNud = True
         tree.add(left)
-        tree.add(expect(ctx, 7)) # :dash
+        tree.add(expect(ctx, 14)) # :dash
         modifier = 0
         tree.isInfix = True
-        tree.add(parse_e_internal(ctx, get_infix_binding_power_e(7) - modifier))
-    if current.id == 11: # :asterisk
+        tree.add(parse_e_internal(ctx, get_infix_binding_power_e(14) - modifier))
+    if current.id == 20: # :asterisk
         # $e = $e :asterisk $e -> Multiply( lhs=$0, rhs=$2 )
         ctx.rule = rules[123]
         ast_parameters = OrderedDict([
@@ -1630,11 +1565,11 @@ def led_e(left, ctx):
         tree.astTransform = AstTransformNodeCreator('Multiply', ast_parameters)
         tree.isExprNud = True
         tree.add(left)
-        tree.add(expect(ctx, 11)) # :asterisk
+        tree.add(expect(ctx, 20)) # :asterisk
         modifier = 0
         tree.isInfix = True
-        tree.add(parse_e_internal(ctx, get_infix_binding_power_e(11) - modifier))
-    if current.id == 19: # :slash
+        tree.add(parse_e_internal(ctx, get_infix_binding_power_e(20) - modifier))
+    if current.id == 49: # :slash
         # $e = $e :slash $e -> Divide( lhs=$0, rhs=$2 )
         ctx.rule = rules[124]
         ast_parameters = OrderedDict([
@@ -1644,10 +1579,10 @@ def led_e(left, ctx):
         tree.astTransform = AstTransformNodeCreator('Divide', ast_parameters)
         tree.isExprNud = True
         tree.add(left)
-        tree.add(expect(ctx, 19)) # :slash
+        tree.add(expect(ctx, 49)) # :slash
         modifier = 0
         tree.isInfix = True
-        tree.add(parse_e_internal(ctx, get_infix_binding_power_e(19) - modifier))
+        tree.add(parse_e_internal(ctx, get_infix_binding_power_e(49) - modifier))
     if current.id == 42: # :percent
         # $e = $e :percent $e -> Remainder( lhs=$0, rhs=$2 )
         ctx.rule = rules[125]
@@ -1673,8 +1608,8 @@ def led_e(left, ctx):
         tree.add(left)
         tree.add(expect(ctx, 9)) # :lparen
         tree.add(parse__gen32(ctx))
-        tree.add(expect(ctx, 21)) # :rparen
-    if current.id == 23: # :lsquare
+        tree.add(expect(ctx, 38)) # :rparen
+    if current.id == 4: # :lsquare
         # $e = :identifier <=> :lsquare $e :rsquare -> ArrayOrMapLookup( lhs=$0, rhs=$2 )
         ctx.rule = rules[134]
         ast_parameters = OrderedDict([
@@ -1683,11 +1618,11 @@ def led_e(left, ctx):
         ])
         tree.astTransform = AstTransformNodeCreator('ArrayOrMapLookup', ast_parameters)
         tree.add(left)
-        tree.add(expect(ctx, 23)) # :lsquare
+        tree.add(expect(ctx, 4)) # :lsquare
         modifier = 0
-        tree.add(parse_e_internal(ctx, get_infix_binding_power_e(23) - modifier))
-        tree.add(expect(ctx, 20)) # :rsquare
-    if current.id == 4: # :dot
+        tree.add(parse_e_internal(ctx, get_infix_binding_power_e(4) - modifier))
+        tree.add(expect(ctx, 10)) # :rsquare
+    if current.id == 46: # :dot
         # $e = :identifier <=> :dot :identifier -> MemberAccess( lhs=$0, rhs=$2 )
         ctx.rule = rules[135]
         ast_parameters = OrderedDict([
@@ -1696,403 +1631,395 @@ def led_e(left, ctx):
         ])
         tree.astTransform = AstTransformNodeCreator('MemberAccess', ast_parameters)
         tree.add(left)
-        tree.add(expect(ctx, 4)) # :dot
-        tree.add(expect(ctx, 27)) # :identifier
+        tree.add(expect(ctx, 46)) # :dot
+        tree.add(expect(ctx, 33)) # :identifier
     return tree
 # END definitions for expression parser: e
-def parse__gen8(ctx):
+# START definitions for expression parser: type_e
+infix_binding_power_type_e = {
+    4: 1000, # $type_e = :type <=> :lsquare list(nt=$type_e, sep=:comma, min=0, sep_terminates=False) :rsquare -> Type( name=$0, subtype=$2 )
+}
+prefix_binding_power_type_e = {
+}
+def get_infix_binding_power_type_e(terminal_id):
+    try:
+        return infix_binding_power_type_e[terminal_id]
+    except:
+        return 0
+def get_prefix_binding_power_type_e(terminal_id):
+    try:
+        return prefix_binding_power_type_e[terminal_id]
+    except:
+        return 0
+def parse_type_e(ctx):
+    return parse_type_e_internal(ctx, rbp=0)
+def parse_type_e_internal(ctx, rbp=0):
+    left = nud_type_e(ctx)
+    if isinstance(left, ParseTree):
+        left.isExpr = True
+        left.isNud = True
+    while ctx.tokens.current() and rbp < get_infix_binding_power_type_e(ctx.tokens.current().id):
+        left = led_type_e(left, ctx)
+    if left:
+        left.isExpr = True
+    return left
+def nud_type_e(ctx):
+    tree = ParseTree(NonTerminal(85, 'type_e'))
     current = ctx.tokens.current()
-    rule = table[0][current.id] if current else -1
-    tree = ParseTree(NonTerminal(56, '_gen8'))
-    ctx.nonterminal = "_gen8"
-    tree.list = True
-    if current != None and current.id in nonterminal_follow[56] and current.id not in nonterminal_first[56]:
-        return tree
-    if current == None:
+    ctx.nonterminal = "type_e"
+    if not current:
         return tree
-    if rule == 20: # $_gen8 = $sections $_gen8
-        ctx.rule = rules[20]
+    if current.id in rule_first[111]:
+        # $type_e = :type <=> :lsquare $_gen30 :rsquare -> Type( name=$0, subtype=$2 )
+        ctx.rule = rules[111]
         tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_sections(ctx)
-        tree.add(subtree)
-        subtree = parse__gen8(ctx)
-        tree.add(subtree)
-        return tree
+        tree.nudMorphemeCount = 1
+        tree.add(expect(ctx, 1))
+    elif current.id in rule_first[112]:
+        # $type_e = :type
+        ctx.rule = rules[112]
+        tree.astTransform = AstTransformSubstitution(0)
+        tree.nudMorphemeCount = 1
+        tree.add(expect(ctx, 1))
     return tree
-def parse__gen0(ctx):
+def led_type_e(left, ctx):
+    tree = ParseTree(NonTerminal(85, 'type_e'))
     current = ctx.tokens.current()
-    rule = table[1][current.id] if current else -1
-    tree = ParseTree(NonTerminal(57, '_gen0'))
-    ctx.nonterminal = "_gen0"
-    tree.list = True
-    if current != None and current.id in nonterminal_follow[57] and current.id not in nonterminal_first[57]:
-        return tree
-    if current == None:
-        return tree
-    if rule == 0: # $_gen0 = $import $_gen1
-        ctx.rule = rules[0]
-        tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_import(ctx)
-        tree.add(subtree)
-        subtree = parse__gen1(ctx)
-        tree.add(subtree)
-        return tree
+    ctx.nonterminal = "type_e"
+    if current.id == 4: # :lsquare
+        # $type_e = :type <=> :lsquare $_gen30 :rsquare -> Type( name=$0, subtype=$2 )
+        ctx.rule = rules[111]
+        ast_parameters = OrderedDict([
+            ('name', 0),
+            ('subtype', 2),
+        ])
+        tree.astTransform = AstTransformNodeCreator('Type', ast_parameters)
+        tree.add(left)
+        tree.add(expect(ctx, 4)) # :lsquare
+        tree.add(parse__gen30(ctx))
+        tree.add(expect(ctx, 10)) # :rsquare
     return tree
-def parse_map_kv(ctx):
+# END definitions for expression parser: type_e
+def parse_parameter_meta(ctx):
     current = ctx.tokens.current()
-    rule = table[2][current.id] if current else -1
-    tree = ParseTree(NonTerminal(58, 'map_kv'))
-    ctx.nonterminal = "map_kv"
+    rule = table[0][current.id] if current else -1
+    tree = ParseTree(NonTerminal(56, 'parameter_meta'))
+    ctx.nonterminal = "parameter_meta"
     tree.list = False
     if current == None:
         raise ctx.errors.unexpected_eof()
-    if rule == 65: # $map_kv = $e :colon $e -> MapLiteralKv( key=$0, value=$2 )
-        ctx.rule = rules[65]
+    if rule == 49: # $parameter_meta = :parameter_meta $map -> ParameterMeta( map=$1 )
+        ctx.rule = rules[49]
         ast_parameters = OrderedDict([
-            ('key', 0),
-            ('value', 2),
+            ('map', 1),
         ])
-        tree.astTransform = AstTransformNodeCreator('MapLiteralKv', ast_parameters)
-        subtree = parse_e(ctx)
-        tree.add(subtree)
-        t = expect(ctx, 22) # :colon
+        tree.astTransform = AstTransformNodeCreator('ParameterMeta', ast_parameters)
+        t = expect(ctx, 8) # :parameter_meta
         tree.add(t)
-        subtree = parse_e(ctx)
+        subtree = parse_map(ctx)
         tree.add(subtree)
         return tree
     raise ctx.errors.unexpected_symbol(
       ctx.nonterminal,
       ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[58] if x >=0],
-      rules[65]
+      [terminals[x] for x in nonterminal_first[56] if x >=0],
+      rules[49]
     )
-def parse_workflow_or_task(ctx):
+def parse_sections(ctx):
     current = ctx.tokens.current()
-    rule = table[3][current.id] if current else -1
-    tree = ParseTree(NonTerminal(59, 'workflow_or_task'))
-    ctx.nonterminal = "workflow_or_task"
+    rule = table[1][current.id] if current else -1
+    tree = ParseTree(NonTerminal(57, 'sections'))
+    ctx.nonterminal = "sections"
     tree.list = False
     if current == None:
         raise ctx.errors.unexpected_eof()
-    if rule == 9: # $workflow_or_task = $workflow
-        ctx.rule = rules[9]
+    if rule == 24: # $sections = $command
+        ctx.rule = rules[24]
         tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_workflow(ctx)
+        subtree = parse_command(ctx)
         tree.add(subtree)
         return tree
-    elif rule == 10: # $workflow_or_task = $task
-        ctx.rule = rules[10]
+    elif rule == 25: # $sections = $outputs
+        ctx.rule = rules[25]
         tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_task(ctx)
+        subtree = parse_outputs(ctx)
         tree.add(subtree)
         return tree
-    raise ctx.errors.unexpected_symbol(
-      ctx.nonterminal,
-      ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[59] if x >=0],
-      rules[10]
-    )
-def parse_command_part(ctx):
-    current = ctx.tokens.current()
-    rule = table[4][current.id] if current else -1
-    tree = ParseTree(NonTerminal(60, 'command_part'))
-    ctx.nonterminal = "command_part"
-    tree.list = False
-    if current == None:
-        raise ctx.errors.unexpected_eof()
-    if rule == 34: # $command_part = :cmd_part
-        ctx.rule = rules[34]
-        tree.astTransform = AstTransformSubstitution(0)
-        t = expect(ctx, 35) # :cmd_part
-        tree.add(t)
+    elif rule == 26: # $sections = $runtime
+        ctx.rule = rules[26]
+        tree.astTransform = AstTransformSubstitution(0)
+        subtree = parse_runtime(ctx)
+        tree.add(subtree)
         return tree
-    elif rule == 35: # $command_part = $cmd_param
-        ctx.rule = rules[35]
+    elif rule == 27: # $sections = $parameter_meta
+        ctx.rule = rules[27]
         tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_cmd_param(ctx)
+        subtree = parse_parameter_meta(ctx)
+        tree.add(subtree)
+        return tree
+    elif rule == 28: # $sections = $meta
+        ctx.rule = rules[28]
+        tree.astTransform = AstTransformSubstitution(0)
+        subtree = parse_meta(ctx)
         tree.add(subtree)
         return tree
     raise ctx.errors.unexpected_symbol(
       ctx.nonterminal,
       ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[60] if x >=0],
-      rules[35]
+      [terminals[x] for x in nonterminal_first[57] if x >=0],
+      rules[28]
     )
-def parse_runtime(ctx):
+def parse_wf_outputs(ctx):
     current = ctx.tokens.current()
-    rule = table[5][current.id] if current else -1
-    tree = ParseTree(NonTerminal(61, 'runtime'))
-    ctx.nonterminal = "runtime"
+    rule = table[2][current.id] if current else -1
+    tree = ParseTree(NonTerminal(58, 'wf_outputs'))
+    ctx.nonterminal = "wf_outputs"
     tree.list = False
     if current == None:
         raise ctx.errors.unexpected_eof()
-    if rule == 48: # $runtime = :runtime $map -> Runtime( map=$1 )
-        ctx.rule = rules[48]
+    if rule == 98: # $wf_outputs = :output :lbrace $_gen27 :rbrace -> WorkflowOutputs( outputs=$2 )
+        ctx.rule = rules[98]
         ast_parameters = OrderedDict([
-            ('map', 1),
+            ('outputs', 2),
         ])
-        tree.astTransform = AstTransformNodeCreator('Runtime', ast_parameters)
-        t = expect(ctx, 36) # :runtime
+        tree.astTransform = AstTransformNodeCreator('WorkflowOutputs', ast_parameters)
+        t = expect(ctx, 23) # :output
         tree.add(t)
-        subtree = parse_map(ctx)
+        t = expect(ctx, 15) # :lbrace
+        tree.add(t)
+        subtree = parse__gen27(ctx)
         tree.add(subtree)
+        t = expect(ctx, 47) # :rbrace
+        tree.add(t)
         return tree
     raise ctx.errors.unexpected_symbol(
       ctx.nonterminal,
       ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[61] if x >=0],
-      rules[48]
+      [terminals[x] for x in nonterminal_first[58] if x >=0],
+      rules[98]
     )
-def parse__gen6(ctx):
-    current = ctx.tokens.current()
-    rule = table[6][current.id] if current else -1
-    tree = ParseTree(NonTerminal(62, '_gen6'))
-    ctx.nonterminal = "_gen6"
-    tree.list = True
-    if current != None and current.id in nonterminal_follow[62] and current.id not in nonterminal_first[62]:
-        return tree
-    if current == None:
-        return tree
-    if rule == 16: # $_gen6 = $declaration $_gen6
-        ctx.rule = rules[16]
-        tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_declaration(ctx)
-        tree.add(subtree)
-        subtree = parse__gen6(ctx)
-        tree.add(subtree)
-        return tree
-    return tree
-def parse__gen15(ctx):
+def parse__gen14(ctx):
     current = ctx.tokens.current()
-    rule = table[7][current.id] if current else -1
-    tree = ParseTree(NonTerminal(63, '_gen15'))
-    ctx.nonterminal = "_gen15"
+    rule = table[3][current.id] if current else -1
+    tree = ParseTree(NonTerminal(59, '_gen14'))
+    ctx.nonterminal = "_gen14"
     tree.list = True
-    if current != None and current.id in nonterminal_follow[63] and current.id not in nonterminal_first[63]:
+    if current != None and current.id in nonterminal_follow[59] and current.id not in nonterminal_first[59]:
         return tree
     if current == None:
         return tree
-    if rule == 51: # $_gen15 = $kv $_gen16
-        ctx.rule = rules[51]
+    if rule == 43: # $_gen14 = $output_kv $_gen14
+        ctx.rule = rules[43]
         tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_kv(ctx)
+        subtree = parse_output_kv(ctx)
         tree.add(subtree)
-        subtree = parse__gen16(ctx)
+        subtree = parse__gen14(ctx)
         tree.add(subtree)
         return tree
     return tree
-def parse_if_stmt(ctx):
+def parse_import_namespace(ctx):
     current = ctx.tokens.current()
-    rule = table[8][current.id] if current else -1
-    tree = ParseTree(NonTerminal(64, 'if_stmt'))
-    ctx.nonterminal = "if_stmt"
+    rule = table[4][current.id] if current else -1
+    tree = ParseTree(NonTerminal(60, 'import_namespace'))
+    ctx.nonterminal = "import_namespace"
     tree.list = False
     if current == None:
         raise ctx.errors.unexpected_eof()
-    if rule == 104: # $if_stmt = :if :lparen $e :rparen :lbrace $_gen19 :rbrace -> If( expression=$2, body=$5 )
-        ctx.rule = rules[104]
-        ast_parameters = OrderedDict([
-            ('expression', 2),
-            ('body', 5),
-        ])
-        tree.astTransform = AstTransformNodeCreator('If', ast_parameters)
-        t = expect(ctx, 31) # :if
-        tree.add(t)
-        t = expect(ctx, 9) # :lparen
-        tree.add(t)
-        subtree = parse_e(ctx)
-        tree.add(subtree)
-        t = expect(ctx, 21) # :rparen
-        tree.add(t)
-        t = expect(ctx, 52) # :lbrace
+    if rule == 14: # $import_namespace = :as :identifier -> $1
+        ctx.rule = rules[14]
+        tree.astTransform = AstTransformSubstitution(1)
+        t = expect(ctx, 40) # :as
         tree.add(t)
-        subtree = parse__gen19(ctx)
-        tree.add(subtree)
-        t = expect(ctx, 40) # :rbrace
+        t = expect(ctx, 33) # :identifier
         tree.add(t)
         return tree
     raise ctx.errors.unexpected_symbol(
       ctx.nonterminal,
       ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[64] if x >=0],
-      rules[104]
+      [terminals[x] for x in nonterminal_first[60] if x >=0],
+      rules[14]
     )
-def parse_output_kv(ctx):
+def parse_alias(ctx):
     current = ctx.tokens.current()
-    rule = table[9][current.id] if current else -1
-    tree = ParseTree(NonTerminal(65, 'output_kv'))
-    ctx.nonterminal = "output_kv"
+    rule = table[5][current.id] if current else -1
+    tree = ParseTree(NonTerminal(61, 'alias'))
+    ctx.nonterminal = "alias"
     tree.list = False
     if current == None:
         raise ctx.errors.unexpected_eof()
-    if rule == 47: # $output_kv = $type_e :identifier :equal $e -> Output( type=$0, var=$1, expression=$3 )
-        ctx.rule = rules[47]
-        ast_parameters = OrderedDict([
-            ('type', 0),
-            ('var', 1),
-            ('expression', 3),
-        ])
-        tree.astTransform = AstTransformNodeCreator('Output', ast_parameters)
-        subtree = parse_type_e(ctx)
-        tree.add(subtree)
-        t = expect(ctx, 27) # :identifier
+    if rule == 93: # $alias = :as :identifier -> $1
+        ctx.rule = rules[93]
+        tree.astTransform = AstTransformSubstitution(1)
+        t = expect(ctx, 40) # :as
         tree.add(t)
-        t = expect(ctx, 38) # :equal
+        t = expect(ctx, 33) # :identifier
         tree.add(t)
-        subtree = parse_e(ctx)
-        tree.add(subtree)
         return tree
     raise ctx.errors.unexpected_symbol(
       ctx.nonterminal,
       ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[65] if x >=0],
-      rules[47]
+      [terminals[x] for x in nonterminal_first[61] if x >=0],
+      rules[93]
     )
-def parse_postfix_quantifier(ctx):
+def parse__gen23(ctx):
     current = ctx.tokens.current()
-    rule = table[10][current.id] if current else -1
-    tree = ParseTree(NonTerminal(66, 'postfix_quantifier'))
-    ctx.nonterminal = "postfix_quantifier"
-    tree.list = False
+    rule = table[6][current.id] if current else -1
+    tree = ParseTree(NonTerminal(62, '_gen23'))
+    ctx.nonterminal = "_gen23"
+    tree.list = True
+    if current != None and current.id in nonterminal_follow[62] and current.id not in nonterminal_first[62]:
+        return tree
     if current == None:
-        raise ctx.errors.unexpected_eof()
-    if rule == 63: # $postfix_quantifier = :qmark
-        ctx.rule = rules[63]
+        return tree
+    if rule == 82: # $_gen23 = $call_input $_gen24
+        ctx.rule = rules[82]
         tree.astTransform = AstTransformSubstitution(0)
-        t = expect(ctx, 41) # :qmark
-        tree.add(t)
+        subtree = parse_call_input(ctx)
+        tree.add(subtree)
+        subtree = parse__gen24(ctx)
+        tree.add(subtree)
         return tree
-    elif rule == 64: # $postfix_quantifier = :plus
-        ctx.rule = rules[64]
+    return tree
+def parse__gen11(ctx):
+    current = ctx.tokens.current()
+    rule = table[7][current.id] if current else -1
+    tree = ParseTree(NonTerminal(63, '_gen11'))
+    ctx.nonterminal = "_gen11"
+    tree.list = True
+    if current != None and current.id in nonterminal_follow[63] and current.id not in nonterminal_first[63]:
+        return tree
+    if current == None:
+        return tree
+    if rule == 36: # $_gen11 = $cmd_param_kv $_gen12
+        ctx.rule = rules[36]
         tree.astTransform = AstTransformSubstitution(0)
-        t = expect(ctx, 46) # :plus
-        tree.add(t)
+        subtree = parse_cmd_param_kv(ctx)
+        tree.add(subtree)
+        subtree = parse__gen12(ctx)
+        tree.add(subtree)
         return tree
-    raise ctx.errors.unexpected_symbol(
-      ctx.nonterminal,
-      ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[66] if x >=0],
-      rules[64]
-    )
-def parse__gen13(ctx):
+    return tree
+def parse__gen20(ctx):
     current = ctx.tokens.current()
-    rule = table[11][current.id] if current else -1
-    tree = ParseTree(NonTerminal(67, '_gen13'))
-    ctx.nonterminal = "_gen13"
+    rule = table[8][current.id] if current else -1
+    tree = ParseTree(NonTerminal(64, '_gen20'))
+    ctx.nonterminal = "_gen20"
     tree.list = True
-    if current != None and current.id in nonterminal_follow[67] and current.id not in nonterminal_first[67]:
+    if current != None and current.id in nonterminal_follow[64] and current.id not in nonterminal_first[64]:
         return tree
     if current == None:
         return tree
-    if rule == 42: # $_gen13 = $output_kv $_gen14
-        ctx.rule = rules[42]
+    if rule == 67: # $_gen20 = $wf_body_element $_gen20
+        ctx.rule = rules[67]
         tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_output_kv(ctx)
+        subtree = parse_wf_body_element(ctx)
         tree.add(subtree)
-        subtree = parse__gen14(ctx)
+        subtree = parse__gen20(ctx)
         tree.add(subtree)
         return tree
     return tree
-def parse_declaration(ctx):
+def parse_kv(ctx):
     current = ctx.tokens.current()
-    rule = table[12][current.id] if current else -1
-    tree = ParseTree(NonTerminal(68, 'declaration'))
-    ctx.nonterminal = "declaration"
+    rule = table[9][current.id] if current else -1
+    tree = ParseTree(NonTerminal(65, 'kv'))
+    ctx.nonterminal = "kv"
     tree.list = False
     if current == None:
         raise ctx.errors.unexpected_eof()
-    if rule == 61: # $declaration = $type_e $_gen17 :identifier $_gen18 -> Declaration( type=$0, postfix=$1, name=$2, expression=$3 )
-        ctx.rule = rules[61]
+    if rule == 56: # $kv = :identifier :colon $e -> RuntimeAttribute( key=$0, value=$2 )
+        ctx.rule = rules[56]
         ast_parameters = OrderedDict([
-            ('type', 0),
-            ('postfix', 1),
-            ('name', 2),
-            ('expression', 3),
+            ('key', 0),
+            ('value', 2),
         ])
-        tree.astTransform = AstTransformNodeCreator('Declaration', ast_parameters)
-        subtree = parse_type_e(ctx)
-        tree.add(subtree)
-        subtree = parse__gen17(ctx)
-        tree.add(subtree)
-        t = expect(ctx, 27) # :identifier
+        tree.astTransform = AstTransformNodeCreator('RuntimeAttribute', ast_parameters)
+        t = expect(ctx, 33) # :identifier
         tree.add(t)
-        subtree = parse__gen18(ctx)
+        t = expect(ctx, 12) # :colon
+        tree.add(t)
+        subtree = parse_e(ctx)
         tree.add(subtree)
         return tree
     raise ctx.errors.unexpected_symbol(
       ctx.nonterminal,
       ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[68] if x >=0],
-      rules[61]
+      [terminals[x] for x in nonterminal_first[65] if x >=0],
+      rules[56]
     )
-def parse_setter(ctx):
+def parse__gen32(ctx):
     current = ctx.tokens.current()
-    rule = table[13][current.id] if current else -1
-    tree = ParseTree(NonTerminal(69, 'setter'))
-    ctx.nonterminal = "setter"
-    tree.list = False
+    rule = table[10][current.id] if current else -1
+    tree = ParseTree(NonTerminal(66, '_gen32'))
+    ctx.nonterminal = "_gen32"
+    tree.list = True
+    if current != None and current.id in nonterminal_follow[66] and current.id not in nonterminal_first[66]:
+        return tree
     if current == None:
-        raise ctx.errors.unexpected_eof()
-    if rule == 62: # $setter = :equal $e -> $1
-        ctx.rule = rules[62]
-        tree.astTransform = AstTransformSubstitution(1)
-        t = expect(ctx, 38) # :equal
-        tree.add(t)
+        return tree
+    if rule == 129: # $_gen32 = $e $_gen33
+        ctx.rule = rules[129]
+        tree.astTransform = AstTransformSubstitution(0)
         subtree = parse_e(ctx)
         tree.add(subtree)
+        subtree = parse__gen33(ctx)
+        tree.add(subtree)
         return tree
-    raise ctx.errors.unexpected_symbol(
-      ctx.nonterminal,
-      ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[69] if x >=0],
-      rules[62]
-    )
-def parse_workflow(ctx):
+    return tree
+def parse_scatter(ctx):
     current = ctx.tokens.current()
-    rule = table[14][current.id] if current else -1
-    tree = ParseTree(NonTerminal(70, 'workflow'))
-    ctx.nonterminal = "workflow"
+    rule = table[11][current.id] if current else -1
+    tree = ParseTree(NonTerminal(67, 'scatter'))
+    ctx.nonterminal = "scatter"
     tree.list = False
     if current == None:
         raise ctx.errors.unexpected_eof()
-    if rule == 70: # $workflow = :workflow :identifier :lbrace $_gen19 :rbrace -> Workflow( name=$1, body=$3 )
-        ctx.rule = rules[70]
+    if rule == 105: # $scatter = :scatter :lparen :identifier :in $e :rparen :lbrace $_gen19 :rbrace -> Scatter( item=$2, collection=$4, body=$7 )
+        ctx.rule = rules[105]
         ast_parameters = OrderedDict([
-            ('name', 1),
-            ('body', 3),
+            ('item', 2),
+            ('collection', 4),
+            ('body', 7),
         ])
-        tree.astTransform = AstTransformNodeCreator('Workflow', ast_parameters)
-        t = expect(ctx, 50) # :workflow
+        tree.astTransform = AstTransformNodeCreator('Scatter', ast_parameters)
+        t = expect(ctx, 13) # :scatter
+        tree.add(t)
+        t = expect(ctx, 9) # :lparen
         tree.add(t)
-        t = expect(ctx, 27) # :identifier
+        t = expect(ctx, 33) # :identifier
+        tree.add(t)
+        t = expect(ctx, 28) # :in
+        tree.add(t)
+        subtree = parse_e(ctx)
+        tree.add(subtree)
+        t = expect(ctx, 38) # :rparen
         tree.add(t)
-        t = expect(ctx, 52) # :lbrace
+        t = expect(ctx, 15) # :lbrace
         tree.add(t)
         subtree = parse__gen19(ctx)
         tree.add(subtree)
-        t = expect(ctx, 40) # :rbrace
+        t = expect(ctx, 47) # :rbrace
         tree.add(t)
         return tree
     raise ctx.errors.unexpected_symbol(
       ctx.nonterminal,
       ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[70] if x >=0],
-      rules[70]
+      [terminals[x] for x in nonterminal_first[67] if x >=0],
+      rules[105]
     )
 def parse__gen26(ctx):
     current = ctx.tokens.current()
-    rule = table[15][current.id] if current else -1
-    tree = ParseTree(NonTerminal(71, '_gen26'))
+    rule = table[12][current.id] if current else -1
+    tree = ParseTree(NonTerminal(68, '_gen26'))
     ctx.nonterminal = "_gen26"
     tree.list = True
-    if current != None and current.id in nonterminal_follow[71] and current.id not in nonterminal_first[71]:
+    if current != None and current.id in nonterminal_follow[68] and current.id not in nonterminal_first[68]:
         return tree
     if current == None:
         return tree
     if rule == 88: # $_gen26 = :comma $mapping $_gen26
         ctx.rule = rules[88]
         tree.astTransform = AstTransformSubstitution(0)
-        t = expect(ctx, 28) # :comma
+        t = expect(ctx, 37) # :comma
         tree.add(t)
         tree.listSeparator = t
         subtree = parse_mapping(ctx)
@@ -2101,24 +2028,49 @@ def parse__gen26(ctx):
         tree.add(subtree)
         return tree
     return tree
-def parse_kv(ctx):
+def parse_wf_output_wildcard(ctx):
     current = ctx.tokens.current()
-    rule = table[16][current.id] if current else -1
-    tree = ParseTree(NonTerminal(72, 'kv'))
-    ctx.nonterminal = "kv"
+    rule = table[13][current.id] if current else -1
+    tree = ParseTree(NonTerminal(69, 'wf_output_wildcard'))
+    ctx.nonterminal = "wf_output_wildcard"
     tree.list = False
     if current == None:
         raise ctx.errors.unexpected_eof()
-    if rule == 56: # $kv = :identifier :colon $e -> RuntimeAttribute( key=$0, value=$2 )
-        ctx.rule = rules[56]
-        ast_parameters = OrderedDict([
-            ('key', 0),
-            ('value', 2),
+    if rule == 102: # $wf_output_wildcard = :dot :asterisk -> $1
+        ctx.rule = rules[102]
+        tree.astTransform = AstTransformSubstitution(1)
+        t = expect(ctx, 46) # :dot
+        tree.add(t)
+        t = expect(ctx, 20) # :asterisk
+        tree.add(t)
+        return tree
+    raise ctx.errors.unexpected_symbol(
+      ctx.nonterminal,
+      ctx.tokens.current(),
+      [terminals[x] for x in nonterminal_first[69] if x >=0],
+      rules[102]
+    )
+def parse_output_kv(ctx):
+    current = ctx.tokens.current()
+    rule = table[14][current.id] if current else -1
+    tree = ParseTree(NonTerminal(70, 'output_kv'))
+    ctx.nonterminal = "output_kv"
+    tree.list = False
+    if current == None:
+        raise ctx.errors.unexpected_eof()
+    if rule == 47: # $output_kv = $type_e :identifier :equal $e -> Output( type=$0, var=$1, expression=$3 )
+        ctx.rule = rules[47]
+        ast_parameters = OrderedDict([
+            ('type', 0),
+            ('var', 1),
+            ('expression', 3),
         ])
-        tree.astTransform = AstTransformNodeCreator('RuntimeAttribute', ast_parameters)
-        t = expect(ctx, 27) # :identifier
+        tree.astTransform = AstTransformNodeCreator('Output', ast_parameters)
+        subtree = parse_type_e(ctx)
+        tree.add(subtree)
+        t = expect(ctx, 33) # :identifier
         tree.add(t)
-        t = expect(ctx, 22) # :colon
+        t = expect(ctx, 52) # :equal
         tree.add(t)
         subtree = parse_e(ctx)
         tree.add(subtree)
@@ -2126,128 +2078,123 @@ def parse_kv(ctx):
     raise ctx.errors.unexpected_symbol(
       ctx.nonterminal,
       ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[72] if x >=0],
-      rules[56]
+      [terminals[x] for x in nonterminal_first[70] if x >=0],
+      rules[47]
     )
-def parse_object_kv(ctx):
+def parse_outputs(ctx):
     current = ctx.tokens.current()
-    rule = table[17][current.id] if current else -1
-    tree = ParseTree(NonTerminal(73, 'object_kv'))
-    ctx.nonterminal = "object_kv"
+    rule = table[15][current.id] if current else -1
+    tree = ParseTree(NonTerminal(71, 'outputs'))
+    ctx.nonterminal = "outputs"
     tree.list = False
     if current == None:
         raise ctx.errors.unexpected_eof()
-    if rule == 106: # $object_kv = :identifier :colon $e -> ObjectKV( key=$0, value=$2 )
-        ctx.rule = rules[106]
+    if rule == 46: # $outputs = :output :lbrace $_gen13 :rbrace -> Outputs( attributes=$2 )
+        ctx.rule = rules[46]
         ast_parameters = OrderedDict([
-            ('key', 0),
-            ('value', 2),
+            ('attributes', 2),
         ])
-        tree.astTransform = AstTransformNodeCreator('ObjectKV', ast_parameters)
-        t = expect(ctx, 27) # :identifier
+        tree.astTransform = AstTransformNodeCreator('Outputs', ast_parameters)
+        t = expect(ctx, 23) # :output
         tree.add(t)
-        t = expect(ctx, 22) # :colon
+        t = expect(ctx, 15) # :lbrace
         tree.add(t)
-        subtree = parse_e(ctx)
+        subtree = parse__gen13(ctx)
         tree.add(subtree)
+        t = expect(ctx, 47) # :rbrace
+        tree.add(t)
         return tree
     raise ctx.errors.unexpected_symbol(
       ctx.nonterminal,
       ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[73] if x >=0],
-      rules[106]
+      [terminals[x] for x in nonterminal_first[71] if x >=0],
+      rules[46]
     )
-def parse__gen21(ctx):
-    current = ctx.tokens.current()
-    rule = table[19][current.id] if current else -1
-    tree = ParseTree(NonTerminal(75, '_gen21'))
-    ctx.nonterminal = "_gen21"
-    tree.list = False
-    if current != None and current.id in nonterminal_follow[75] and current.id not in nonterminal_first[75]:
-        return tree
-    if current == None:
-        return tree
-    if rule == 77: # $_gen21 = $alias
-        ctx.rule = rules[77]
-        tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_alias(ctx)
-        tree.add(subtree)
-        return tree
-    return tree
-def parse__gen11(ctx):
+def parse__gen24(ctx):
     current = ctx.tokens.current()
-    rule = table[20][current.id] if current else -1
-    tree = ParseTree(NonTerminal(76, '_gen11'))
-    ctx.nonterminal = "_gen11"
+    rule = table[16][current.id] if current else -1
+    tree = ParseTree(NonTerminal(72, '_gen24'))
+    ctx.nonterminal = "_gen24"
     tree.list = True
-    if current != None and current.id in nonterminal_follow[76] and current.id not in nonterminal_first[76]:
+    if current != None and current.id in nonterminal_follow[72] and current.id not in nonterminal_first[72]:
         return tree
     if current == None:
         return tree
-    if rule == 36: # $_gen11 = $cmd_param_kv $_gen12
-        ctx.rule = rules[36]
+    if rule == 83: # $_gen24 = $call_input $_gen24
+        ctx.rule = rules[83]
         tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_cmd_param_kv(ctx)
+        subtree = parse_call_input(ctx)
         tree.add(subtree)
-        subtree = parse__gen12(ctx)
+        subtree = parse__gen24(ctx)
         tree.add(subtree)
         return tree
     return tree
-def parse__gen23(ctx):
+def parse_wf_output(ctx):
     current = ctx.tokens.current()
-    rule = table[21][current.id] if current else -1
-    tree = ParseTree(NonTerminal(77, '_gen23'))
-    ctx.nonterminal = "_gen23"
-    tree.list = True
-    if current != None and current.id in nonterminal_follow[77] and current.id not in nonterminal_first[77]:
-        return tree
+    rule = table[17][current.id] if current else -1
+    tree = ParseTree(NonTerminal(73, 'wf_output'))
+    ctx.nonterminal = "wf_output"
+    tree.list = False
     if current == None:
-        return tree
-    if rule == 82: # $_gen23 = $call_input $_gen24
-        ctx.rule = rules[82]
-        tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_call_input(ctx)
-        tree.add(subtree)
-        subtree = parse__gen24(ctx)
+        raise ctx.errors.unexpected_eof()
+    if rule == 101: # $wf_output = :fqn $_gen29 -> WorkflowOutput( fqn=$0, wildcard=$1 )
+        ctx.rule = rules[101]
+        ast_parameters = OrderedDict([
+            ('fqn', 0),
+            ('wildcard', 1),
+        ])
+        tree.astTransform = AstTransformNodeCreator('WorkflowOutput', ast_parameters)
+        t = expect(ctx, 41) # :fqn
+        tree.add(t)
+        subtree = parse__gen29(ctx)
         tree.add(subtree)
         return tree
-    return tree
-def parse_alias(ctx):
+    raise ctx.errors.unexpected_symbol(
+      ctx.nonterminal,
+      ctx.tokens.current(),
+      [terminals[x] for x in nonterminal_first[73] if x >=0],
+      rules[101]
+    )
+def parse_workflow_or_task(ctx):
     current = ctx.tokens.current()
-    rule = table[22][current.id] if current else -1
-    tree = ParseTree(NonTerminal(78, 'alias'))
-    ctx.nonterminal = "alias"
+    rule = table[18][current.id] if current else -1
+    tree = ParseTree(NonTerminal(74, 'workflow_or_task'))
+    ctx.nonterminal = "workflow_or_task"
     tree.list = False
     if current == None:
         raise ctx.errors.unexpected_eof()
-    if rule == 93: # $alias = :as :identifier -> $1
-        ctx.rule = rules[93]
-        tree.astTransform = AstTransformSubstitution(1)
-        t = expect(ctx, 26) # :as
-        tree.add(t)
-        t = expect(ctx, 27) # :identifier
-        tree.add(t)
+    if rule == 9: # $workflow_or_task = $workflow
+        ctx.rule = rules[9]
+        tree.astTransform = AstTransformSubstitution(0)
+        subtree = parse_workflow(ctx)
+        tree.add(subtree)
+        return tree
+    elif rule == 10: # $workflow_or_task = $task
+        ctx.rule = rules[10]
+        tree.astTransform = AstTransformSubstitution(0)
+        subtree = parse_task(ctx)
+        tree.add(subtree)
         return tree
     raise ctx.errors.unexpected_symbol(
       ctx.nonterminal,
       ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[78] if x >=0],
-      rules[93]
+      [terminals[x] for x in nonterminal_first[74] if x >=0],
+      rules[10]
     )
 def parse__gen28(ctx):
     current = ctx.tokens.current()
-    rule = table[23][current.id] if current else -1
-    tree = ParseTree(NonTerminal(79, '_gen28'))
+    rule = table[19][current.id] if current else -1
+    tree = ParseTree(NonTerminal(75, '_gen28'))
     ctx.nonterminal = "_gen28"
     tree.list = True
-    if current != None and current.id in nonterminal_follow[79] and current.id not in nonterminal_first[79]:
+    if current != None and current.id in nonterminal_follow[75] and current.id not in nonterminal_first[75]:
         return tree
     if current == None:
         return tree
     if rule == 95: # $_gen28 = :comma $wf_output $_gen28
         ctx.rule = rules[95]
         tree.astTransform = AstTransformSubstitution(0)
-        t = expect(ctx, 28) # :comma
+        t = expect(ctx, 37) # :comma
         tree.add(t)
         tree.listSeparator = t
         subtree = parse_wf_output(ctx)
@@ -2258,8 +2205,8 @@ def parse__gen28(ctx):
     return tree
 def parse_call(ctx):
     current = ctx.tokens.current()
-    rule = table[24][current.id] if current else -1
-    tree = ParseTree(NonTerminal(80, 'call'))
+    rule = table[20][current.id] if current else -1
+    tree = ParseTree(NonTerminal(76, 'call'))
     ctx.nonterminal = "call"
     tree.list = False
     if current == None:
@@ -2272,9 +2219,9 @@ def parse_call(ctx):
             ('body', 3),
         ])
         tree.astTransform = AstTransformNodeCreator('Call', ast_parameters)
-        t = expect(ctx, 53) # :call
+        t = expect(ctx, 36) # :call
         tree.add(t)
-        t = expect(ctx, 24) # :fqn
+        t = expect(ctx, 41) # :fqn
         tree.add(t)
         subtree = parse__gen21(ctx)
         tree.add(subtree)
@@ -2284,249 +2231,326 @@ def parse_call(ctx):
     raise ctx.errors.unexpected_symbol(
       ctx.nonterminal,
       ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[80] if x >=0],
+      [terminals[x] for x in nonterminal_first[76] if x >=0],
       rules[81]
     )
-def parse__gen32(ctx):
+def parse__gen17(ctx):
     current = ctx.tokens.current()
-    rule = table[25][current.id] if current else -1
-    tree = ParseTree(NonTerminal(81, '_gen32'))
-    ctx.nonterminal = "_gen32"
-    tree.list = True
-    if current != None and current.id in nonterminal_follow[81] and current.id not in nonterminal_first[81]:
+    rule = table[21][current.id] if current else -1
+    tree = ParseTree(NonTerminal(77, '_gen17'))
+    ctx.nonterminal = "_gen17"
+    tree.list = False
+    if current != None and current.id in nonterminal_follow[77] and current.id not in nonterminal_first[77]:
         return tree
     if current == None:
         return tree
-    if rule == 129: # $_gen32 = $e $_gen33
-        ctx.rule = rules[129]
+    if rule == 57: # $_gen17 = $postfix_quantifier
+        ctx.rule = rules[57]
         tree.astTransform = AstTransformSubstitution(0)
+        subtree = parse_postfix_quantifier(ctx)
+        tree.add(subtree)
+        return tree
+    return tree
+def parse_while_loop(ctx):
+    current = ctx.tokens.current()
+    rule = table[22][current.id] if current else -1
+    tree = ParseTree(NonTerminal(78, 'while_loop'))
+    ctx.nonterminal = "while_loop"
+    tree.list = False
+    if current == None:
+        raise ctx.errors.unexpected_eof()
+    if rule == 103: # $while_loop = :while :lparen $e :rparen :lbrace $_gen19 :rbrace -> WhileLoop( expression=$2, body=$5 )
+        ctx.rule = rules[103]
+        ast_parameters = OrderedDict([
+            ('expression', 2),
+            ('body', 5),
+        ])
+        tree.astTransform = AstTransformNodeCreator('WhileLoop', ast_parameters)
+        t = expect(ctx, 45) # :while
+        tree.add(t)
+        t = expect(ctx, 9) # :lparen
+        tree.add(t)
         subtree = parse_e(ctx)
         tree.add(subtree)
-        subtree = parse__gen33(ctx)
+        t = expect(ctx, 38) # :rparen
+        tree.add(t)
+        t = expect(ctx, 15) # :lbrace
+        tree.add(t)
+        subtree = parse__gen19(ctx)
         tree.add(subtree)
+        t = expect(ctx, 47) # :rbrace
+        tree.add(t)
         return tree
-    return tree
-def parse__gen2(ctx):
+    raise ctx.errors.unexpected_symbol(
+      ctx.nonterminal,
+      ctx.tokens.current(),
+      [terminals[x] for x in nonterminal_first[78] if x >=0],
+      rules[103]
+    )
+def parse_postfix_quantifier(ctx):
     current = ctx.tokens.current()
-    rule = table[26][current.id] if current else -1
-    tree = ParseTree(NonTerminal(82, '_gen2'))
-    ctx.nonterminal = "_gen2"
-    tree.list = True
-    if current != None and current.id in nonterminal_follow[82] and current.id not in nonterminal_first[82]:
+    rule = table[23][current.id] if current else -1
+    tree = ParseTree(NonTerminal(79, 'postfix_quantifier'))
+    ctx.nonterminal = "postfix_quantifier"
+    tree.list = False
+    if current == None:
+        raise ctx.errors.unexpected_eof()
+    if rule == 63: # $postfix_quantifier = :qmark
+        ctx.rule = rules[63]
+        tree.astTransform = AstTransformSubstitution(0)
+        t = expect(ctx, 17) # :qmark
+        tree.add(t)
+        return tree
+    elif rule == 64: # $postfix_quantifier = :plus
+        ctx.rule = rules[64]
+        tree.astTransform = AstTransformSubstitution(0)
+        t = expect(ctx, 11) # :plus
+        tree.add(t)
+        return tree
+    raise ctx.errors.unexpected_symbol(
+      ctx.nonterminal,
+      ctx.tokens.current(),
+      [terminals[x] for x in nonterminal_first[79] if x >=0],
+      rules[64]
+    )
+def parse__gen18(ctx):
+    current = ctx.tokens.current()
+    rule = table[24][current.id] if current else -1
+    tree = ParseTree(NonTerminal(80, '_gen18'))
+    ctx.nonterminal = "_gen18"
+    tree.list = False
+    if current != None and current.id in nonterminal_follow[80] and current.id not in nonterminal_first[80]:
         return tree
     if current == None:
         return tree
-    if rule == 4: # $_gen2 = $workflow_or_task $_gen3
-        ctx.rule = rules[4]
+    if rule == 59: # $_gen18 = $setter
+        ctx.rule = rules[59]
         tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_workflow_or_task(ctx)
-        tree.add(subtree)
-        subtree = parse__gen3(ctx)
+        subtree = parse_setter(ctx)
         tree.add(subtree)
         return tree
     return tree
-def parse_parameter_meta(ctx):
+def parse_wf_body_element(ctx):
     current = ctx.tokens.current()
-    rule = table[27][current.id] if current else -1
-    tree = ParseTree(NonTerminal(83, 'parameter_meta'))
-    ctx.nonterminal = "parameter_meta"
+    rule = table[25][current.id] if current else -1
+    tree = ParseTree(NonTerminal(81, 'wf_body_element'))
+    ctx.nonterminal = "wf_body_element"
     tree.list = False
     if current == None:
         raise ctx.errors.unexpected_eof()
-    if rule == 49: # $parameter_meta = :parameter_meta $map -> ParameterMeta( map=$1 )
-        ctx.rule = rules[49]
-        ast_parameters = OrderedDict([
-            ('map', 1),
-        ])
-        tree.astTransform = AstTransformNodeCreator('ParameterMeta', ast_parameters)
-        t = expect(ctx, 13) # :parameter_meta
-        tree.add(t)
-        subtree = parse_map(ctx)
+    if rule == 71: # $wf_body_element = $call
+        ctx.rule = rules[71]
+        tree.astTransform = AstTransformSubstitution(0)
+        subtree = parse_call(ctx)
+        tree.add(subtree)
+        return tree
+    elif rule == 72: # $wf_body_element = $declaration
+        ctx.rule = rules[72]
+        tree.astTransform = AstTransformSubstitution(0)
+        subtree = parse_declaration(ctx)
+        tree.add(subtree)
+        return tree
+    elif rule == 73: # $wf_body_element = $while_loop
+        ctx.rule = rules[73]
+        tree.astTransform = AstTransformSubstitution(0)
+        subtree = parse_while_loop(ctx)
+        tree.add(subtree)
+        return tree
+    elif rule == 74: # $wf_body_element = $if_stmt
+        ctx.rule = rules[74]
+        tree.astTransform = AstTransformSubstitution(0)
+        subtree = parse_if_stmt(ctx)
+        tree.add(subtree)
+        return tree
+    elif rule == 75: # $wf_body_element = $scatter
+        ctx.rule = rules[75]
+        tree.astTransform = AstTransformSubstitution(0)
+        subtree = parse_scatter(ctx)
+        tree.add(subtree)
+        return tree
+    elif rule == 76: # $wf_body_element = $wf_outputs
+        ctx.rule = rules[76]
+        tree.astTransform = AstTransformSubstitution(0)
+        subtree = parse_wf_outputs(ctx)
         tree.add(subtree)
         return tree
     raise ctx.errors.unexpected_symbol(
       ctx.nonterminal,
       ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[83] if x >=0],
-      rules[49]
+      [terminals[x] for x in nonterminal_first[81] if x >=0],
+      rules[76]
     )
-def parse__gen20(ctx):
+def parse__gen29(ctx):
     current = ctx.tokens.current()
-    rule = table[28][current.id] if current else -1
-    tree = ParseTree(NonTerminal(84, '_gen20'))
-    ctx.nonterminal = "_gen20"
-    tree.list = True
-    if current != None and current.id in nonterminal_follow[84] and current.id not in nonterminal_first[84]:
+    rule = table[26][current.id] if current else -1
+    tree = ParseTree(NonTerminal(82, '_gen29'))
+    ctx.nonterminal = "_gen29"
+    tree.list = False
+    if current != None and current.id in nonterminal_follow[82] and current.id not in nonterminal_first[82]:
         return tree
     if current == None:
         return tree
-    if rule == 67: # $_gen20 = $wf_body_element $_gen20
-        ctx.rule = rules[67]
+    if rule == 99: # $_gen29 = $wf_output_wildcard
+        ctx.rule = rules[99]
         tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_wf_body_element(ctx)
-        tree.add(subtree)
-        subtree = parse__gen20(ctx)
+        subtree = parse_wf_output_wildcard(ctx)
         tree.add(subtree)
         return tree
     return tree
-def parse__gen18(ctx):
+def parse__gen30(ctx):
     current = ctx.tokens.current()
-    rule = table[29][current.id] if current else -1
-    tree = ParseTree(NonTerminal(85, '_gen18'))
-    ctx.nonterminal = "_gen18"
-    tree.list = False
-    if current != None and current.id in nonterminal_follow[85] and current.id not in nonterminal_first[85]:
+    rule = table[27][current.id] if current else -1
+    tree = ParseTree(NonTerminal(83, '_gen30'))
+    ctx.nonterminal = "_gen30"
+    tree.list = True
+    if current != None and current.id in nonterminal_follow[83] and current.id not in nonterminal_first[83]:
         return tree
     if current == None:
         return tree
-    if rule == 59: # $_gen18 = $setter
-        ctx.rule = rules[59]
+    if rule == 107: # $_gen30 = $type_e $_gen31
+        ctx.rule = rules[107]
         tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_setter(ctx)
+        subtree = parse_type_e(ctx)
+        tree.add(subtree)
+        subtree = parse__gen31(ctx)
         tree.add(subtree)
         return tree
     return tree
-def parse__gen12(ctx):
+def parse__gen16(ctx):
     current = ctx.tokens.current()
-    rule = table[30][current.id] if current else -1
-    tree = ParseTree(NonTerminal(86, '_gen12'))
-    ctx.nonterminal = "_gen12"
+    rule = table[28][current.id] if current else -1
+    tree = ParseTree(NonTerminal(84, '_gen16'))
+    ctx.nonterminal = "_gen16"
     tree.list = True
-    if current != None and current.id in nonterminal_follow[86] and current.id not in nonterminal_first[86]:
+    if current != None and current.id in nonterminal_follow[84] and current.id not in nonterminal_first[84]:
         return tree
     if current == None:
         return tree
-    if rule == 37: # $_gen12 = $cmd_param_kv $_gen12
-        ctx.rule = rules[37]
+    if rule == 52: # $_gen16 = $kv $_gen16
+        ctx.rule = rules[52]
         tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_cmd_param_kv(ctx)
+        subtree = parse_kv(ctx)
         tree.add(subtree)
-        subtree = parse__gen12(ctx)
+        subtree = parse__gen16(ctx)
         tree.add(subtree)
         return tree
     return tree
-def parse__gen17(ctx):
+def parse_map(ctx):
     current = ctx.tokens.current()
-    rule = table[31][current.id] if current else -1
-    tree = ParseTree(NonTerminal(87, '_gen17'))
-    ctx.nonterminal = "_gen17"
+    rule = table[30][current.id] if current else -1
+    tree = ParseTree(NonTerminal(86, 'map'))
+    ctx.nonterminal = "map"
     tree.list = False
-    if current != None and current.id in nonterminal_follow[87] and current.id not in nonterminal_first[87]:
-        return tree
     if current == None:
-        return tree
-    if rule == 57: # $_gen17 = $postfix_quantifier
-        ctx.rule = rules[57]
-        tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_postfix_quantifier(ctx)
+        raise ctx.errors.unexpected_eof()
+    if rule == 55: # $map = :lbrace $_gen15 :rbrace -> $1
+        ctx.rule = rules[55]
+        tree.astTransform = AstTransformSubstitution(1)
+        t = expect(ctx, 15) # :lbrace
+        tree.add(t)
+        subtree = parse__gen15(ctx)
         tree.add(subtree)
+        t = expect(ctx, 47) # :rbrace
+        tree.add(t)
         return tree
-    return tree
-def parse__gen19(ctx):
+    raise ctx.errors.unexpected_symbol(
+      ctx.nonterminal,
+      ctx.tokens.current(),
+      [terminals[x] for x in nonterminal_first[86] if x >=0],
+      rules[55]
+    )
+def parse__gen13(ctx):
     current = ctx.tokens.current()
-    rule = table[32][current.id] if current else -1
-    tree = ParseTree(NonTerminal(88, '_gen19'))
-    ctx.nonterminal = "_gen19"
+    rule = table[31][current.id] if current else -1
+    tree = ParseTree(NonTerminal(87, '_gen13'))
+    ctx.nonterminal = "_gen13"
     tree.list = True
-    if current != None and current.id in nonterminal_follow[88] and current.id not in nonterminal_first[88]:
+    if current != None and current.id in nonterminal_follow[87] and current.id not in nonterminal_first[87]:
         return tree
     if current == None:
         return tree
-    if rule == 66: # $_gen19 = $wf_body_element $_gen20
-        ctx.rule = rules[66]
+    if rule == 42: # $_gen13 = $output_kv $_gen14
+        ctx.rule = rules[42]
         tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_wf_body_element(ctx)
+        subtree = parse_output_kv(ctx)
         tree.add(subtree)
-        subtree = parse__gen20(ctx)
+        subtree = parse__gen14(ctx)
         tree.add(subtree)
         return tree
     return tree
-def parse_scatter(ctx):
+def parse_mapping(ctx):
     current = ctx.tokens.current()
-    rule = table[33][current.id] if current else -1
-    tree = ParseTree(NonTerminal(89, 'scatter'))
-    ctx.nonterminal = "scatter"
+    rule = table[32][current.id] if current else -1
+    tree = ParseTree(NonTerminal(88, 'mapping'))
+    ctx.nonterminal = "mapping"
     tree.list = False
     if current == None:
         raise ctx.errors.unexpected_eof()
-    if rule == 105: # $scatter = :scatter :lparen :identifier :in $e :rparen :lbrace $_gen19 :rbrace -> Scatter( item=$2, collection=$4, body=$7 )
-        ctx.rule = rules[105]
+    if rule == 92: # $mapping = :identifier :equal $e -> IOMapping( key=$0, value=$2 )
+        ctx.rule = rules[92]
         ast_parameters = OrderedDict([
-            ('item', 2),
-            ('collection', 4),
-            ('body', 7),
+            ('key', 0),
+            ('value', 2),
         ])
-        tree.astTransform = AstTransformNodeCreator('Scatter', ast_parameters)
-        t = expect(ctx, 1) # :scatter
-        tree.add(t)
-        t = expect(ctx, 9) # :lparen
-        tree.add(t)
-        t = expect(ctx, 27) # :identifier
+        tree.astTransform = AstTransformNodeCreator('IOMapping', ast_parameters)
+        t = expect(ctx, 33) # :identifier
         tree.add(t)
-        t = expect(ctx, 45) # :in
+        t = expect(ctx, 52) # :equal
         tree.add(t)
         subtree = parse_e(ctx)
         tree.add(subtree)
-        t = expect(ctx, 21) # :rparen
-        tree.add(t)
-        t = expect(ctx, 52) # :lbrace
-        tree.add(t)
-        subtree = parse__gen19(ctx)
-        tree.add(subtree)
-        t = expect(ctx, 40) # :rbrace
-        tree.add(t)
         return tree
     raise ctx.errors.unexpected_symbol(
       ctx.nonterminal,
       ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[89] if x >=0],
-      rules[105]
+      [terminals[x] for x in nonterminal_first[88] if x >=0],
+      rules[92]
     )
-def parse__gen27(ctx):
+def parse__gen9(ctx):
     current = ctx.tokens.current()
-    rule = table[34][current.id] if current else -1
-    tree = ParseTree(NonTerminal(90, '_gen27'))
-    ctx.nonterminal = "_gen27"
+    rule = table[33][current.id] if current else -1
+    tree = ParseTree(NonTerminal(89, '_gen9'))
+    ctx.nonterminal = "_gen9"
     tree.list = True
-    if current != None and current.id in nonterminal_follow[90] and current.id not in nonterminal_first[90]:
+    if current != None and current.id in nonterminal_follow[89] and current.id not in nonterminal_first[89]:
         return tree
     if current == None:
         return tree
-    if rule == 94: # $_gen27 = $wf_output $_gen28
-        ctx.rule = rules[94]
+    if rule == 29: # $_gen9 = $command_part $_gen10
+        ctx.rule = rules[29]
         tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_wf_output(ctx)
+        subtree = parse_command_part(ctx)
         tree.add(subtree)
-        subtree = parse__gen28(ctx)
+        subtree = parse__gen10(ctx)
         tree.add(subtree)
         return tree
     return tree
-def parse__gen24(ctx):
+def parse__gen0(ctx):
     current = ctx.tokens.current()
-    rule = table[35][current.id] if current else -1
-    tree = ParseTree(NonTerminal(91, '_gen24'))
-    ctx.nonterminal = "_gen24"
+    rule = table[34][current.id] if current else -1
+    tree = ParseTree(NonTerminal(90, '_gen0'))
+    ctx.nonterminal = "_gen0"
     tree.list = True
-    if current != None and current.id in nonterminal_follow[91] and current.id not in nonterminal_first[91]:
+    if current != None and current.id in nonterminal_follow[90] and current.id not in nonterminal_first[90]:
         return tree
     if current == None:
         return tree
-    if rule == 83: # $_gen24 = $call_input $_gen24
-        ctx.rule = rules[83]
+    if rule == 0: # $_gen0 = $import $_gen1
+        ctx.rule = rules[0]
         tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_call_input(ctx)
+        subtree = parse_import(ctx)
         tree.add(subtree)
-        subtree = parse__gen24(ctx)
+        subtree = parse__gen1(ctx)
         tree.add(subtree)
         return tree
     return tree
 def parse__gen22(ctx):
     current = ctx.tokens.current()
-    rule = table[36][current.id] if current else -1
-    tree = ParseTree(NonTerminal(92, '_gen22'))
+    rule = table[35][current.id] if current else -1
+    tree = ParseTree(NonTerminal(91, '_gen22'))
     ctx.nonterminal = "_gen22"
     tree.list = False
-    if current != None and current.id in nonterminal_follow[92] and current.id not in nonterminal_first[92]:
+    if current != None and current.id in nonterminal_follow[91] and current.id not in nonterminal_first[91]:
         return tree
     if current == None:
         return tree
@@ -2537,245 +2561,299 @@ def parse__gen22(ctx):
         tree.add(subtree)
         return tree
     return tree
-def parse__gen31(ctx):
+def parse_command_part(ctx):
+    current = ctx.tokens.current()
+    rule = table[36][current.id] if current else -1
+    tree = ParseTree(NonTerminal(92, 'command_part'))
+    ctx.nonterminal = "command_part"
+    tree.list = False
+    if current == None:
+        raise ctx.errors.unexpected_eof()
+    if rule == 34: # $command_part = :cmd_part
+        ctx.rule = rules[34]
+        tree.astTransform = AstTransformSubstitution(0)
+        t = expect(ctx, 6) # :cmd_part
+        tree.add(t)
+        return tree
+    elif rule == 35: # $command_part = $cmd_param
+        ctx.rule = rules[35]
+        tree.astTransform = AstTransformSubstitution(0)
+        subtree = parse_cmd_param(ctx)
+        tree.add(subtree)
+        return tree
+    raise ctx.errors.unexpected_symbol(
+      ctx.nonterminal,
+      ctx.tokens.current(),
+      [terminals[x] for x in nonterminal_first[92] if x >=0],
+      rules[35]
+    )
+def parse__gen12(ctx):
     current = ctx.tokens.current()
     rule = table[37][current.id] if current else -1
-    tree = ParseTree(NonTerminal(93, '_gen31'))
-    ctx.nonterminal = "_gen31"
+    tree = ParseTree(NonTerminal(93, '_gen12'))
+    ctx.nonterminal = "_gen12"
     tree.list = True
     if current != None and current.id in nonterminal_follow[93] and current.id not in nonterminal_first[93]:
         return tree
     if current == None:
         return tree
-    if rule == 108: # $_gen31 = :comma $type_e $_gen31
-        ctx.rule = rules[108]
+    if rule == 37: # $_gen12 = $cmd_param_kv $_gen12
+        ctx.rule = rules[37]
         tree.astTransform = AstTransformSubstitution(0)
-        t = expect(ctx, 28) # :comma
-        tree.add(t)
-        tree.listSeparator = t
-        subtree = parse_type_e(ctx)
+        subtree = parse_cmd_param_kv(ctx)
         tree.add(subtree)
-        subtree = parse__gen31(ctx)
+        subtree = parse__gen12(ctx)
         tree.add(subtree)
         return tree
     return tree
-def parse__gen10(ctx):
+def parse_call_input(ctx):
     current = ctx.tokens.current()
     rule = table[38][current.id] if current else -1
-    tree = ParseTree(NonTerminal(94, '_gen10'))
-    ctx.nonterminal = "_gen10"
-    tree.list = True
-    if current != None and current.id in nonterminal_follow[94] and current.id not in nonterminal_first[94]:
-        return tree
+    tree = ParseTree(NonTerminal(94, 'call_input'))
+    ctx.nonterminal = "call_input"
+    tree.list = False
     if current == None:
-        return tree
-    if rule == 30: # $_gen10 = $command_part $_gen10
-        ctx.rule = rules[30]
-        tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_command_part(ctx)
-        tree.add(subtree)
-        subtree = parse__gen10(ctx)
+        raise ctx.errors.unexpected_eof()
+    if rule == 91: # $call_input = :input :colon $_gen25 -> Inputs( map=$2 )
+        ctx.rule = rules[91]
+        ast_parameters = OrderedDict([
+            ('map', 2),
+        ])
+        tree.astTransform = AstTransformNodeCreator('Inputs', ast_parameters)
+        t = expect(ctx, 48) # :input
+        tree.add(t)
+        t = expect(ctx, 12) # :colon
+        tree.add(t)
+        subtree = parse__gen25(ctx)
         tree.add(subtree)
         return tree
-    return tree
-def parse__gen34(ctx):
+    raise ctx.errors.unexpected_symbol(
+      ctx.nonterminal,
+      ctx.tokens.current(),
+      [terminals[x] for x in nonterminal_first[94] if x >=0],
+      rules[91]
+    )
+def parse__gen31(ctx):
     current = ctx.tokens.current()
     rule = table[39][current.id] if current else -1
-    tree = ParseTree(NonTerminal(95, '_gen34'))
-    ctx.nonterminal = "_gen34"
+    tree = ParseTree(NonTerminal(95, '_gen31'))
+    ctx.nonterminal = "_gen31"
     tree.list = True
     if current != None and current.id in nonterminal_follow[95] and current.id not in nonterminal_first[95]:
         return tree
     if current == None:
         return tree
-    if rule == 136: # $_gen34 = $object_kv $_gen35
-        ctx.rule = rules[136]
+    if rule == 108: # $_gen31 = :comma $type_e $_gen31
+        ctx.rule = rules[108]
         tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_object_kv(ctx)
-        tree.add(subtree)
-        subtree = parse__gen35(ctx)
-        tree.add(subtree)
-        return tree
-    return tree
-def parse_document(ctx):
-    current = ctx.tokens.current()
-    rule = table[40][current.id] if current else -1
-    tree = ParseTree(NonTerminal(96, 'document'))
-    ctx.nonterminal = "document"
-    tree.list = False
-    if current != None and current.id in nonterminal_follow[96] and current.id not in nonterminal_first[96]:
-        return tree
-    if current == None:
-        return tree
-    if rule == 8: # $document = $_gen0 $_gen2 -> Document( imports=$0, definitions=$1 )
-        ctx.rule = rules[8]
-        ast_parameters = OrderedDict([
-            ('imports', 0),
-            ('definitions', 1),
-        ])
-        tree.astTransform = AstTransformNodeCreator('Document', ast_parameters)
-        subtree = parse__gen0(ctx)
+        t = expect(ctx, 37) # :comma
+        tree.add(t)
+        tree.listSeparator = t
+        subtree = parse_type_e(ctx)
         tree.add(subtree)
-        subtree = parse__gen2(ctx)
+        subtree = parse__gen31(ctx)
         tree.add(subtree)
         return tree
     return tree
-def parse_wf_body_element(ctx):
+def parse_map_kv(ctx):
     current = ctx.tokens.current()
-    rule = table[41][current.id] if current else -1
-    tree = ParseTree(NonTerminal(97, 'wf_body_element'))
-    ctx.nonterminal = "wf_body_element"
+    rule = table[40][current.id] if current else -1
+    tree = ParseTree(NonTerminal(96, 'map_kv'))
+    ctx.nonterminal = "map_kv"
     tree.list = False
     if current == None:
         raise ctx.errors.unexpected_eof()
-    if rule == 71: # $wf_body_element = $call
-        ctx.rule = rules[71]
-        tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_call(ctx)
-        tree.add(subtree)
-        return tree
-    elif rule == 72: # $wf_body_element = $declaration
-        ctx.rule = rules[72]
-        tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_declaration(ctx)
-        tree.add(subtree)
-        return tree
-    elif rule == 73: # $wf_body_element = $while_loop
-        ctx.rule = rules[73]
-        tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_while_loop(ctx)
+    if rule == 65: # $map_kv = $e :colon $e -> MapLiteralKv( key=$0, value=$2 )
+        ctx.rule = rules[65]
+        ast_parameters = OrderedDict([
+            ('key', 0),
+            ('value', 2),
+        ])
+        tree.astTransform = AstTransformNodeCreator('MapLiteralKv', ast_parameters)
+        subtree = parse_e(ctx)
         tree.add(subtree)
-        return tree
-    elif rule == 74: # $wf_body_element = $if_stmt
-        ctx.rule = rules[74]
-        tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_if_stmt(ctx)
+        t = expect(ctx, 12) # :colon
+        tree.add(t)
+        subtree = parse_e(ctx)
         tree.add(subtree)
         return tree
-    elif rule == 75: # $wf_body_element = $scatter
-        ctx.rule = rules[75]
-        tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_scatter(ctx)
+    raise ctx.errors.unexpected_symbol(
+      ctx.nonterminal,
+      ctx.tokens.current(),
+      [terminals[x] for x in nonterminal_first[96] if x >=0],
+      rules[65]
+    )
+def parse_call_body(ctx):
+    current = ctx.tokens.current()
+    rule = table[41][current.id] if current else -1
+    tree = ParseTree(NonTerminal(97, 'call_body'))
+    ctx.nonterminal = "call_body"
+    tree.list = False
+    if current == None:
+        raise ctx.errors.unexpected_eof()
+    if rule == 86: # $call_body = :lbrace $_gen5 $_gen23 :rbrace -> CallBody( declarations=$1, io=$2 )
+        ctx.rule = rules[86]
+        ast_parameters = OrderedDict([
+            ('declarations', 1),
+            ('io', 2),
+        ])
+        tree.astTransform = AstTransformNodeCreator('CallBody', ast_parameters)
+        t = expect(ctx, 15) # :lbrace
+        tree.add(t)
+        subtree = parse__gen5(ctx)
         tree.add(subtree)
-        return tree
-    elif rule == 76: # $wf_body_element = $wf_outputs
-        ctx.rule = rules[76]
-        tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_wf_outputs(ctx)
+        subtree = parse__gen23(ctx)
         tree.add(subtree)
+        t = expect(ctx, 47) # :rbrace
+        tree.add(t)
         return tree
     raise ctx.errors.unexpected_symbol(
       ctx.nonterminal,
       ctx.tokens.current(),
       [terminals[x] for x in nonterminal_first[97] if x >=0],
-      rules[76]
+      rules[86]
     )
-def parse_wf_output_wildcard(ctx):
+def parse_cmd_param(ctx):
     current = ctx.tokens.current()
     rule = table[42][current.id] if current else -1
-    tree = ParseTree(NonTerminal(98, 'wf_output_wildcard'))
-    ctx.nonterminal = "wf_output_wildcard"
+    tree = ParseTree(NonTerminal(98, 'cmd_param'))
+    ctx.nonterminal = "cmd_param"
     tree.list = False
     if current == None:
         raise ctx.errors.unexpected_eof()
-    if rule == 102: # $wf_output_wildcard = :dot :asterisk -> $1
-        ctx.rule = rules[102]
-        tree.astTransform = AstTransformSubstitution(1)
-        t = expect(ctx, 4) # :dot
+    if rule == 40: # $cmd_param = :cmd_param_start $_gen11 $e :cmd_param_end -> CommandParameter( attributes=$1, expr=$2 )
+        ctx.rule = rules[40]
+        ast_parameters = OrderedDict([
+            ('attributes', 1),
+            ('expr', 2),
+        ])
+        tree.astTransform = AstTransformNodeCreator('CommandParameter', ast_parameters)
+        t = expect(ctx, 24) # :cmd_param_start
         tree.add(t)
-        t = expect(ctx, 11) # :asterisk
+        subtree = parse__gen11(ctx)
+        tree.add(subtree)
+        subtree = parse_e(ctx)
+        tree.add(subtree)
+        t = expect(ctx, 16) # :cmd_param_end
         tree.add(t)
         return tree
     raise ctx.errors.unexpected_symbol(
       ctx.nonterminal,
       ctx.tokens.current(),
       [terminals[x] for x in nonterminal_first[98] if x >=0],
-      rules[102]
+      rules[40]
     )
-def parse__gen4(ctx):
+def parse_object_kv(ctx):
     current = ctx.tokens.current()
     rule = table[43][current.id] if current else -1
-    tree = ParseTree(NonTerminal(99, '_gen4'))
-    ctx.nonterminal = "_gen4"
+    tree = ParseTree(NonTerminal(99, 'object_kv'))
+    ctx.nonterminal = "object_kv"
     tree.list = False
-    if current != None and current.id in nonterminal_follow[99] and current.id not in nonterminal_first[99]:
-        return tree
     if current == None:
-        return tree
-    if rule == 11: # $_gen4 = $import_namespace
-        ctx.rule = rules[11]
-        tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_import_namespace(ctx)
+        raise ctx.errors.unexpected_eof()
+    if rule == 106: # $object_kv = :identifier :colon $e -> ObjectKV( key=$0, value=$2 )
+        ctx.rule = rules[106]
+        ast_parameters = OrderedDict([
+            ('key', 0),
+            ('value', 2),
+        ])
+        tree.astTransform = AstTransformNodeCreator('ObjectKV', ast_parameters)
+        t = expect(ctx, 33) # :identifier
+        tree.add(t)
+        t = expect(ctx, 12) # :colon
+        tree.add(t)
+        subtree = parse_e(ctx)
         tree.add(subtree)
         return tree
-    return tree
-def parse_while_loop(ctx):
+    raise ctx.errors.unexpected_symbol(
+      ctx.nonterminal,
+      ctx.tokens.current(),
+      [terminals[x] for x in nonterminal_first[99] if x >=0],
+      rules[106]
+    )
+def parse_task(ctx):
     current = ctx.tokens.current()
     rule = table[44][current.id] if current else -1
-    tree = ParseTree(NonTerminal(100, 'while_loop'))
-    ctx.nonterminal = "while_loop"
+    tree = ParseTree(NonTerminal(100, 'task'))
+    ctx.nonterminal = "task"
     tree.list = False
     if current == None:
         raise ctx.errors.unexpected_eof()
-    if rule == 103: # $while_loop = :while :lparen $e :rparen :lbrace $_gen19 :rbrace -> WhileLoop( expression=$2, body=$5 )
-        ctx.rule = rules[103]
+    if rule == 23: # $task = :task :identifier :lbrace $_gen5 $_gen7 :rbrace -> Task( name=$1, declarations=$3, sections=$4 )
+        ctx.rule = rules[23]
         ast_parameters = OrderedDict([
-            ('expression', 2),
-            ('body', 5),
+            ('name', 1),
+            ('declarations', 3),
+            ('sections', 4),
         ])
-        tree.astTransform = AstTransformNodeCreator('WhileLoop', ast_parameters)
-        t = expect(ctx, 47) # :while
-        tree.add(t)
-        t = expect(ctx, 9) # :lparen
+        tree.astTransform = AstTransformNodeCreator('Task', ast_parameters)
+        t = expect(ctx, 54) # :task
         tree.add(t)
-        subtree = parse_e(ctx)
-        tree.add(subtree)
-        t = expect(ctx, 21) # :rparen
+        t = expect(ctx, 33) # :identifier
         tree.add(t)
-        t = expect(ctx, 52) # :lbrace
+        t = expect(ctx, 15) # :lbrace
         tree.add(t)
-        subtree = parse__gen19(ctx)
+        subtree = parse__gen5(ctx)
+        tree.add(subtree)
+        subtree = parse__gen7(ctx)
         tree.add(subtree)
-        t = expect(ctx, 40) # :rbrace
+        t = expect(ctx, 47) # :rbrace
         tree.add(t)
         return tree
     raise ctx.errors.unexpected_symbol(
       ctx.nonterminal,
       ctx.tokens.current(),
       [terminals[x] for x in nonterminal_first[100] if x >=0],
-      rules[103]
+      rules[23]
     )
-def parse__gen25(ctx):
+def parse__gen8(ctx):
     current = ctx.tokens.current()
     rule = table[45][current.id] if current else -1
-    tree = ParseTree(NonTerminal(101, '_gen25'))
-    ctx.nonterminal = "_gen25"
+    tree = ParseTree(NonTerminal(101, '_gen8'))
+    ctx.nonterminal = "_gen8"
     tree.list = True
     if current != None and current.id in nonterminal_follow[101] and current.id not in nonterminal_first[101]:
         return tree
     if current == None:
         return tree
-    if rule == 87: # $_gen25 = $mapping $_gen26
-        ctx.rule = rules[87]
+    if rule == 20: # $_gen8 = $sections $_gen8
+        ctx.rule = rules[20]
         tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_mapping(ctx)
+        subtree = parse_sections(ctx)
         tree.add(subtree)
-        subtree = parse__gen26(ctx)
+        subtree = parse__gen8(ctx)
         tree.add(subtree)
         return tree
     return tree
-def parse__gen3(ctx):
+def parse__gen4(ctx):
     current = ctx.tokens.current()
     rule = table[46][current.id] if current else -1
-    tree = ParseTree(NonTerminal(102, '_gen3'))
-    ctx.nonterminal = "_gen3"
-    tree.list = True
+    tree = ParseTree(NonTerminal(102, '_gen4'))
+    ctx.nonterminal = "_gen4"
+    tree.list = False
     if current != None and current.id in nonterminal_follow[102] and current.id not in nonterminal_first[102]:
         return tree
     if current == None:
         return tree
-    if rule == 5: # $_gen3 = $workflow_or_task $_gen3
-        ctx.rule = rules[5]
+    if rule == 11: # $_gen4 = $import_namespace
+        ctx.rule = rules[11]
+        tree.astTransform = AstTransformSubstitution(0)
+        subtree = parse_import_namespace(ctx)
+        tree.add(subtree)
+        return tree
+    return tree
+def parse__gen2(ctx):
+    current = ctx.tokens.current()
+    rule = table[47][current.id] if current else -1
+    tree = ParseTree(NonTerminal(103, '_gen2'))
+    ctx.nonterminal = "_gen2"
+    tree.list = True
+    if current != None and current.id in nonterminal_follow[103] and current.id not in nonterminal_first[103]:
+        return tree
+    if current == None:
+        return tree
+    if rule == 4: # $_gen2 = $workflow_or_task $_gen3
+        ctx.rule = rules[4]
         tree.astTransform = AstTransformSubstitution(0)
         subtree = parse_workflow_or_task(ctx)
         tree.add(subtree)
@@ -2783,118 +2861,134 @@ def parse__gen3(ctx):
         tree.add(subtree)
         return tree
     return tree
-def parse_outputs(ctx):
+def parse__gen15(ctx):
     current = ctx.tokens.current()
-    rule = table[47][current.id] if current else -1
-    tree = ParseTree(NonTerminal(103, 'outputs'))
-    ctx.nonterminal = "outputs"
+    rule = table[48][current.id] if current else -1
+    tree = ParseTree(NonTerminal(104, '_gen15'))
+    ctx.nonterminal = "_gen15"
+    tree.list = True
+    if current != None and current.id in nonterminal_follow[104] and current.id not in nonterminal_first[104]:
+        return tree
+    if current == None:
+        return tree
+    if rule == 51: # $_gen15 = $kv $_gen16
+        ctx.rule = rules[51]
+        tree.astTransform = AstTransformSubstitution(0)
+        subtree = parse_kv(ctx)
+        tree.add(subtree)
+        subtree = parse__gen16(ctx)
+        tree.add(subtree)
+        return tree
+    return tree
+def parse_import(ctx):
+    current = ctx.tokens.current()
+    rule = table[49][current.id] if current else -1
+    tree = ParseTree(NonTerminal(105, 'import'))
+    ctx.nonterminal = "import"
     tree.list = False
     if current == None:
         raise ctx.errors.unexpected_eof()
-    if rule == 46: # $outputs = :output :lbrace $_gen13 :rbrace -> Outputs( attributes=$2 )
-        ctx.rule = rules[46]
+    if rule == 13: # $import = :import :string $_gen4 -> Import( uri=$1, namespace=$2 )
+        ctx.rule = rules[13]
         ast_parameters = OrderedDict([
-            ('attributes', 2),
+            ('uri', 1),
+            ('namespace', 2),
         ])
-        tree.astTransform = AstTransformNodeCreator('Outputs', ast_parameters)
-        t = expect(ctx, 34) # :output
+        tree.astTransform = AstTransformNodeCreator('Import', ast_parameters)
+        t = expect(ctx, 7) # :import
         tree.add(t)
-        t = expect(ctx, 52) # :lbrace
+        t = expect(ctx, 44) # :string
         tree.add(t)
-        subtree = parse__gen13(ctx)
+        subtree = parse__gen4(ctx)
         tree.add(subtree)
-        t = expect(ctx, 40) # :rbrace
-        tree.add(t)
         return tree
     raise ctx.errors.unexpected_symbol(
       ctx.nonterminal,
       ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[103] if x >=0],
-      rules[46]
+      [terminals[x] for x in nonterminal_first[105] if x >=0],
+      rules[13]
     )
-def parse__gen9(ctx):
+def parse__gen21(ctx):
     current = ctx.tokens.current()
-    rule = table[48][current.id] if current else -1
-    tree = ParseTree(NonTerminal(104, '_gen9'))
-    ctx.nonterminal = "_gen9"
-    tree.list = True
-    if current != None and current.id in nonterminal_follow[104] and current.id not in nonterminal_first[104]:
+    rule = table[50][current.id] if current else -1
+    tree = ParseTree(NonTerminal(106, '_gen21'))
+    ctx.nonterminal = "_gen21"
+    tree.list = False
+    if current != None and current.id in nonterminal_follow[106] and current.id not in nonterminal_first[106]:
         return tree
     if current == None:
         return tree
-    if rule == 29: # $_gen9 = $command_part $_gen10
-        ctx.rule = rules[29]
+    if rule == 77: # $_gen21 = $alias
+        ctx.rule = rules[77]
         tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_command_part(ctx)
-        tree.add(subtree)
-        subtree = parse__gen10(ctx)
+        subtree = parse_alias(ctx)
         tree.add(subtree)
         return tree
     return tree
-def parse__gen1(ctx):
+def parse__gen5(ctx):
     current = ctx.tokens.current()
-    rule = table[49][current.id] if current else -1
-    tree = ParseTree(NonTerminal(105, '_gen1'))
-    ctx.nonterminal = "_gen1"
+    rule = table[51][current.id] if current else -1
+    tree = ParseTree(NonTerminal(107, '_gen5'))
+    ctx.nonterminal = "_gen5"
     tree.list = True
-    if current != None and current.id in nonterminal_follow[105] and current.id not in nonterminal_first[105]:
+    if current != None and current.id in nonterminal_follow[107] and current.id not in nonterminal_first[107]:
         return tree
     if current == None:
         return tree
-    if rule == 1: # $_gen1 = $import $_gen1
-        ctx.rule = rules[1]
+    if rule == 15: # $_gen5 = $declaration $_gen6
+        ctx.rule = rules[15]
         tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_import(ctx)
+        subtree = parse_declaration(ctx)
         tree.add(subtree)
-        subtree = parse__gen1(ctx)
+        subtree = parse__gen6(ctx)
         tree.add(subtree)
         return tree
     return tree
-def parse__gen16(ctx):
+def parse__gen33(ctx):
     current = ctx.tokens.current()
-    rule = table[50][current.id] if current else -1
-    tree = ParseTree(NonTerminal(106, '_gen16'))
-    ctx.nonterminal = "_gen16"
+    rule = table[52][current.id] if current else -1
+    tree = ParseTree(NonTerminal(108, '_gen33'))
+    ctx.nonterminal = "_gen33"
     tree.list = True
-    if current != None and current.id in nonterminal_follow[106] and current.id not in nonterminal_first[106]:
+    if current != None and current.id in nonterminal_follow[108] and current.id not in nonterminal_first[108]:
         return tree
     if current == None:
         return tree
-    if rule == 52: # $_gen16 = $kv $_gen16
-        ctx.rule = rules[52]
+    if rule == 130: # $_gen33 = :comma $e $_gen33
+        ctx.rule = rules[130]
         tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_kv(ctx)
+        t = expect(ctx, 37) # :comma
+        tree.add(t)
+        tree.listSeparator = t
+        subtree = parse_e(ctx)
         tree.add(subtree)
-        subtree = parse__gen16(ctx)
+        subtree = parse__gen33(ctx)
         tree.add(subtree)
         return tree
     return tree
-def parse__gen35(ctx):
+def parse__gen25(ctx):
     current = ctx.tokens.current()
-    rule = table[51][current.id] if current else -1
-    tree = ParseTree(NonTerminal(107, '_gen35'))
-    ctx.nonterminal = "_gen35"
+    rule = table[54][current.id] if current else -1
+    tree = ParseTree(NonTerminal(110, '_gen25'))
+    ctx.nonterminal = "_gen25"
     tree.list = True
-    if current != None and current.id in nonterminal_follow[107] and current.id not in nonterminal_first[107]:
+    if current != None and current.id in nonterminal_follow[110] and current.id not in nonterminal_first[110]:
         return tree
     if current == None:
         return tree
-    if rule == 137: # $_gen35 = :comma $object_kv $_gen35
-        ctx.rule = rules[137]
+    if rule == 87: # $_gen25 = $mapping $_gen26
+        ctx.rule = rules[87]
         tree.astTransform = AstTransformSubstitution(0)
-        t = expect(ctx, 28) # :comma
-        tree.add(t)
-        tree.listSeparator = t
-        subtree = parse_object_kv(ctx)
+        subtree = parse_mapping(ctx)
         tree.add(subtree)
-        subtree = parse__gen35(ctx)
+        subtree = parse__gen26(ctx)
         tree.add(subtree)
         return tree
     return tree
 def parse_command(ctx):
     current = ctx.tokens.current()
-    rule = table[52][current.id] if current else -1
-    tree = ParseTree(NonTerminal(108, 'command'))
+    rule = table[55][current.id] if current else -1
+    tree = ParseTree(NonTerminal(111, 'command'))
     ctx.nonterminal = "command"
     tree.list = False
     if current == None:
@@ -2905,80 +2999,44 @@ def parse_command(ctx):
             ('parts', 2),
         ])
         tree.astTransform = AstTransformNodeCreator('RawCommand', ast_parameters)
-        t = expect(ctx, 5) # :raw_command
+        t = expect(ctx, 19) # :raw_command
         tree.add(t)
-        t = expect(ctx, 48) # :raw_cmd_start
+        t = expect(ctx, 30) # :raw_cmd_start
         tree.add(t)
         subtree = parse__gen9(ctx)
         tree.add(subtree)
-        t = expect(ctx, 0) # :raw_cmd_end
+        t = expect(ctx, 35) # :raw_cmd_end
         tree.add(t)
         return tree
     raise ctx.errors.unexpected_symbol(
       ctx.nonterminal,
       ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[108] if x >=0],
+      [terminals[x] for x in nonterminal_first[111] if x >=0],
       rules[33]
     )
-def parse_call_input(ctx):
+def parse__gen10(ctx):
     current = ctx.tokens.current()
-    rule = table[53][current.id] if current else -1
-    tree = ParseTree(NonTerminal(109, 'call_input'))
-    ctx.nonterminal = "call_input"
-    tree.list = False
-    if current == None:
-        raise ctx.errors.unexpected_eof()
-    if rule == 91: # $call_input = :input :colon $_gen25 -> Inputs( map=$2 )
-        ctx.rule = rules[91]
-        ast_parameters = OrderedDict([
-            ('map', 2),
-        ])
-        tree.astTransform = AstTransformNodeCreator('Inputs', ast_parameters)
-        t = expect(ctx, 51) # :input
-        tree.add(t)
-        t = expect(ctx, 22) # :colon
-        tree.add(t)
-        subtree = parse__gen25(ctx)
-        tree.add(subtree)
+    rule = table[56][current.id] if current else -1
+    tree = ParseTree(NonTerminal(112, '_gen10'))
+    ctx.nonterminal = "_gen10"
+    tree.list = True
+    if current != None and current.id in nonterminal_follow[112] and current.id not in nonterminal_first[112]:
         return tree
-    raise ctx.errors.unexpected_symbol(
-      ctx.nonterminal,
-      ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[109] if x >=0],
-      rules[91]
-    )
-def parse_import(ctx):
-    current = ctx.tokens.current()
-    rule = table[54][current.id] if current else -1
-    tree = ParseTree(NonTerminal(110, 'import'))
-    ctx.nonterminal = "import"
-    tree.list = False
     if current == None:
-        raise ctx.errors.unexpected_eof()
-    if rule == 13: # $import = :import :string $_gen4 -> Import( uri=$1, namespace=$2 )
-        ctx.rule = rules[13]
-        ast_parameters = OrderedDict([
-            ('uri', 1),
-            ('namespace', 2),
-        ])
-        tree.astTransform = AstTransformNodeCreator('Import', ast_parameters)
-        t = expect(ctx, 54) # :import
-        tree.add(t)
-        t = expect(ctx, 29) # :string
-        tree.add(t)
-        subtree = parse__gen4(ctx)
+        return tree
+    if rule == 30: # $_gen10 = $command_part $_gen10
+        ctx.rule = rules[30]
+        tree.astTransform = AstTransformSubstitution(0)
+        subtree = parse_command_part(ctx)
+        tree.add(subtree)
+        subtree = parse__gen10(ctx)
         tree.add(subtree)
         return tree
-    raise ctx.errors.unexpected_symbol(
-      ctx.nonterminal,
-      ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[110] if x >=0],
-      rules[13]
-    )
+    return tree
 def parse_cmd_param_kv(ctx):
     current = ctx.tokens.current()
-    rule = table[55][current.id] if current else -1
-    tree = ParseTree(NonTerminal(111, 'cmd_param_kv'))
+    rule = table[57][current.id] if current else -1
+    tree = ParseTree(NonTerminal(113, 'cmd_param_kv'))
     ctx.nonterminal = "cmd_param_kv"
     tree.list = False
     if current == None:
@@ -2990,11 +3048,11 @@ def parse_cmd_param_kv(ctx):
             ('value', 3),
         ])
         tree.astTransform = AstTransformNodeCreator('CommandParameterAttr', ast_parameters)
-        t = expect(ctx, 8) # :cmd_attr_hint
+        t = expect(ctx, 29) # :cmd_attr_hint
         tree.add(t)
-        t = expect(ctx, 27) # :identifier
+        t = expect(ctx, 33) # :identifier
         tree.add(t)
-        t = expect(ctx, 38) # :equal
+        t = expect(ctx, 52) # :equal
         tree.add(t)
         subtree = parse_e(ctx)
         tree.add(subtree)
@@ -3002,79 +3060,51 @@ def parse_cmd_param_kv(ctx):
     raise ctx.errors.unexpected_symbol(
       ctx.nonterminal,
       ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[111] if x >=0],
+      [terminals[x] for x in nonterminal_first[113] if x >=0],
       rules[41]
     )
-def parse__gen33(ctx):
+def parse__gen36(ctx):
     current = ctx.tokens.current()
-    rule = table[56][current.id] if current else -1
-    tree = ParseTree(NonTerminal(112, '_gen33'))
-    ctx.nonterminal = "_gen33"
+    rule = table[58][current.id] if current else -1
+    tree = ParseTree(NonTerminal(114, '_gen36'))
+    ctx.nonterminal = "_gen36"
     tree.list = True
-    if current != None and current.id in nonterminal_follow[112] and current.id not in nonterminal_first[112]:
+    if current != None and current.id in nonterminal_follow[114] and current.id not in nonterminal_first[114]:
         return tree
     if current == None:
         return tree
-    if rule == 130: # $_gen33 = :comma $e $_gen33
-        ctx.rule = rules[130]
+    if rule == 142: # $_gen36 = $map_kv $_gen37
+        ctx.rule = rules[142]
         tree.astTransform = AstTransformSubstitution(0)
-        t = expect(ctx, 28) # :comma
-        tree.add(t)
-        tree.listSeparator = t
-        subtree = parse_e(ctx)
+        subtree = parse_map_kv(ctx)
         tree.add(subtree)
-        subtree = parse__gen33(ctx)
+        subtree = parse__gen37(ctx)
         tree.add(subtree)
         return tree
     return tree
-def parse_sections(ctx):
+def parse__gen27(ctx):
     current = ctx.tokens.current()
-    rule = table[57][current.id] if current else -1
-    tree = ParseTree(NonTerminal(113, 'sections'))
-    ctx.nonterminal = "sections"
-    tree.list = False
-    if current == None:
-        raise ctx.errors.unexpected_eof()
-    if rule == 24: # $sections = $command
-        ctx.rule = rules[24]
-        tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_command(ctx)
-        tree.add(subtree)
-        return tree
-    elif rule == 25: # $sections = $outputs
-        ctx.rule = rules[25]
-        tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_outputs(ctx)
-        tree.add(subtree)
+    rule = table[59][current.id] if current else -1
+    tree = ParseTree(NonTerminal(115, '_gen27'))
+    ctx.nonterminal = "_gen27"
+    tree.list = True
+    if current != None and current.id in nonterminal_follow[115] and current.id not in nonterminal_first[115]:
         return tree
-    elif rule == 26: # $sections = $runtime
-        ctx.rule = rules[26]
-        tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_runtime(ctx)
-        tree.add(subtree)
+    if current == None:
         return tree
-    elif rule == 27: # $sections = $parameter_meta
-        ctx.rule = rules[27]
+    if rule == 94: # $_gen27 = $wf_output $_gen28
+        ctx.rule = rules[94]
         tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_parameter_meta(ctx)
+        subtree = parse_wf_output(ctx)
         tree.add(subtree)
-        return tree
-    elif rule == 28: # $sections = $meta
-        ctx.rule = rules[28]
-        tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_meta(ctx)
+        subtree = parse__gen28(ctx)
         tree.add(subtree)
         return tree
-    raise ctx.errors.unexpected_symbol(
-      ctx.nonterminal,
-      ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[113] if x >=0],
-      rules[28]
-    )
+    return tree
 def parse_meta(ctx):
     current = ctx.tokens.current()
-    rule = table[58][current.id] if current else -1
-    tree = ParseTree(NonTerminal(114, 'meta'))
+    rule = table[60][current.id] if current else -1
+    tree = ParseTree(NonTerminal(116, 'meta'))
     ctx.nonterminal = "meta"
     tree.list = False
     if current == None:
@@ -3085,7 +3115,7 @@ def parse_meta(ctx):
             ('map', 1),
         ])
         tree.astTransform = AstTransformNodeCreator('Meta', ast_parameters)
-        t = expect(ctx, 49) # :meta
+        t = expect(ctx, 31) # :meta
         tree.add(t)
         subtree = parse_map(ctx)
         tree.add(subtree)
@@ -3093,189 +3123,119 @@ def parse_meta(ctx):
     raise ctx.errors.unexpected_symbol(
       ctx.nonterminal,
       ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[114] if x >=0],
+      [terminals[x] for x in nonterminal_first[116] if x >=0],
       rules[50]
     )
-def parse_task(ctx):
+def parse__gen34(ctx):
     current = ctx.tokens.current()
-    rule = table[59][current.id] if current else -1
-    tree = ParseTree(NonTerminal(115, 'task'))
-    ctx.nonterminal = "task"
-    tree.list = False
-    if current == None:
-        raise ctx.errors.unexpected_eof()
-    if rule == 23: # $task = :task :identifier :lbrace $_gen5 $_gen7 :rbrace -> Task( name=$1, declarations=$3, sections=$4 )
-        ctx.rule = rules[23]
-        ast_parameters = OrderedDict([
-            ('name', 1),
-            ('declarations', 3),
-            ('sections', 4),
-        ])
-        tree.astTransform = AstTransformNodeCreator('Task', ast_parameters)
-        t = expect(ctx, 25) # :task
-        tree.add(t)
-        t = expect(ctx, 27) # :identifier
-        tree.add(t)
-        t = expect(ctx, 52) # :lbrace
-        tree.add(t)
-        subtree = parse__gen5(ctx)
-        tree.add(subtree)
-        subtree = parse__gen7(ctx)
-        tree.add(subtree)
-        t = expect(ctx, 40) # :rbrace
-        tree.add(t)
+    rule = table[61][current.id] if current else -1
+    tree = ParseTree(NonTerminal(117, '_gen34'))
+    ctx.nonterminal = "_gen34"
+    tree.list = True
+    if current != None and current.id in nonterminal_follow[117] and current.id not in nonterminal_first[117]:
         return tree
-    raise ctx.errors.unexpected_symbol(
-      ctx.nonterminal,
-      ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[115] if x >=0],
-      rules[23]
-    )
-def parse_cmd_param(ctx):
-    current = ctx.tokens.current()
-    rule = table[60][current.id] if current else -1
-    tree = ParseTree(NonTerminal(116, 'cmd_param'))
-    ctx.nonterminal = "cmd_param"
-    tree.list = False
     if current == None:
-        raise ctx.errors.unexpected_eof()
-    if rule == 40: # $cmd_param = :cmd_param_start $_gen11 $e :cmd_param_end -> CommandParameter( attributes=$1, expr=$2 )
-        ctx.rule = rules[40]
-        ast_parameters = OrderedDict([
-            ('attributes', 1),
-            ('expr', 2),
-        ])
-        tree.astTransform = AstTransformNodeCreator('CommandParameter', ast_parameters)
-        t = expect(ctx, 30) # :cmd_param_start
-        tree.add(t)
-        subtree = parse__gen11(ctx)
+        return tree
+    if rule == 136: # $_gen34 = $object_kv $_gen35
+        ctx.rule = rules[136]
+        tree.astTransform = AstTransformSubstitution(0)
+        subtree = parse_object_kv(ctx)
         tree.add(subtree)
-        subtree = parse_e(ctx)
+        subtree = parse__gen35(ctx)
         tree.add(subtree)
-        t = expect(ctx, 55) # :cmd_param_end
-        tree.add(t)
         return tree
-    raise ctx.errors.unexpected_symbol(
-      ctx.nonterminal,
-      ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[116] if x >=0],
-      rules[40]
-    )
-def parse_wf_output(ctx):
+    return tree
+def parse_runtime(ctx):
     current = ctx.tokens.current()
-    rule = table[61][current.id] if current else -1
-    tree = ParseTree(NonTerminal(117, 'wf_output'))
-    ctx.nonterminal = "wf_output"
+    rule = table[62][current.id] if current else -1
+    tree = ParseTree(NonTerminal(118, 'runtime'))
+    ctx.nonterminal = "runtime"
     tree.list = False
     if current == None:
         raise ctx.errors.unexpected_eof()
-    if rule == 101: # $wf_output = :fqn $_gen29 -> WorkflowOutput( fqn=$0, wildcard=$1 )
-        ctx.rule = rules[101]
+    if rule == 48: # $runtime = :runtime $map -> Runtime( map=$1 )
+        ctx.rule = rules[48]
         ast_parameters = OrderedDict([
-            ('fqn', 0),
-            ('wildcard', 1),
+            ('map', 1),
         ])
-        tree.astTransform = AstTransformNodeCreator('WorkflowOutput', ast_parameters)
-        t = expect(ctx, 24) # :fqn
+        tree.astTransform = AstTransformNodeCreator('Runtime', ast_parameters)
+        t = expect(ctx, 0) # :runtime
         tree.add(t)
-        subtree = parse__gen29(ctx)
-        tree.add(subtree)
-        return tree
-    raise ctx.errors.unexpected_symbol(
-      ctx.nonterminal,
-      ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[117] if x >=0],
-      rules[101]
-    )
-def parse__gen29(ctx):
-    current = ctx.tokens.current()
-    rule = table[62][current.id] if current else -1
-    tree = ParseTree(NonTerminal(118, '_gen29'))
-    ctx.nonterminal = "_gen29"
-    tree.list = False
-    if current != None and current.id in nonterminal_follow[118] and current.id not in nonterminal_first[118]:
-        return tree
-    if current == None:
-        return tree
-    if rule == 99: # $_gen29 = $wf_output_wildcard
-        ctx.rule = rules[99]
-        tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_wf_output_wildcard(ctx)
+        subtree = parse_map(ctx)
         tree.add(subtree)
-        return tree
-    return tree
-def parse__gen30(ctx):
+        return tree
+    raise ctx.errors.unexpected_symbol(
+      ctx.nonterminal,
+      ctx.tokens.current(),
+      [terminals[x] for x in nonterminal_first[118] if x >=0],
+      rules[48]
+    )
+def parse_declaration(ctx):
     current = ctx.tokens.current()
     rule = table[63][current.id] if current else -1
-    tree = ParseTree(NonTerminal(119, '_gen30'))
-    ctx.nonterminal = "_gen30"
-    tree.list = True
-    if current != None and current.id in nonterminal_follow[119] and current.id not in nonterminal_first[119]:
-        return tree
+    tree = ParseTree(NonTerminal(119, 'declaration'))
+    ctx.nonterminal = "declaration"
+    tree.list = False
     if current == None:
-        return tree
-    if rule == 107: # $_gen30 = $type_e $_gen31
-        ctx.rule = rules[107]
-        tree.astTransform = AstTransformSubstitution(0)
+        raise ctx.errors.unexpected_eof()
+    if rule == 61: # $declaration = $type_e $_gen17 :identifier $_gen18 -> Declaration( type=$0, postfix=$1, name=$2, expression=$3 )
+        ctx.rule = rules[61]
+        ast_parameters = OrderedDict([
+            ('type', 0),
+            ('postfix', 1),
+            ('name', 2),
+            ('expression', 3),
+        ])
+        tree.astTransform = AstTransformNodeCreator('Declaration', ast_parameters)
         subtree = parse_type_e(ctx)
         tree.add(subtree)
-        subtree = parse__gen31(ctx)
+        subtree = parse__gen17(ctx)
+        tree.add(subtree)
+        t = expect(ctx, 33) # :identifier
+        tree.add(t)
+        subtree = parse__gen18(ctx)
         tree.add(subtree)
         return tree
-    return tree
-def parse__gen37(ctx):
+    raise ctx.errors.unexpected_symbol(
+      ctx.nonterminal,
+      ctx.tokens.current(),
+      [terminals[x] for x in nonterminal_first[119] if x >=0],
+      rules[61]
+    )
+def parse__gen35(ctx):
     current = ctx.tokens.current()
     rule = table[64][current.id] if current else -1
-    tree = ParseTree(NonTerminal(120, '_gen37'))
-    ctx.nonterminal = "_gen37"
+    tree = ParseTree(NonTerminal(120, '_gen35'))
+    ctx.nonterminal = "_gen35"
     tree.list = True
     if current != None and current.id in nonterminal_follow[120] and current.id not in nonterminal_first[120]:
         return tree
     if current == None:
         return tree
-    if rule == 143: # $_gen37 = :comma $map_kv $_gen37
-        ctx.rule = rules[143]
+    if rule == 137: # $_gen35 = :comma $object_kv $_gen35
+        ctx.rule = rules[137]
         tree.astTransform = AstTransformSubstitution(0)
-        t = expect(ctx, 28) # :comma
+        t = expect(ctx, 37) # :comma
         tree.add(t)
         tree.listSeparator = t
-        subtree = parse_map_kv(ctx)
+        subtree = parse_object_kv(ctx)
         tree.add(subtree)
-        subtree = parse__gen37(ctx)
+        subtree = parse__gen35(ctx)
         tree.add(subtree)
         return tree
     return tree
-def parse__gen36(ctx):
+def parse__gen6(ctx):
     current = ctx.tokens.current()
     rule = table[65][current.id] if current else -1
-    tree = ParseTree(NonTerminal(121, '_gen36'))
-    ctx.nonterminal = "_gen36"
+    tree = ParseTree(NonTerminal(121, '_gen6'))
+    ctx.nonterminal = "_gen6"
     tree.list = True
     if current != None and current.id in nonterminal_follow[121] and current.id not in nonterminal_first[121]:
         return tree
     if current == None:
         return tree
-    if rule == 142: # $_gen36 = $map_kv $_gen37
-        ctx.rule = rules[142]
-        tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_map_kv(ctx)
-        tree.add(subtree)
-        subtree = parse__gen37(ctx)
-        tree.add(subtree)
-        return tree
-    return tree
-def parse__gen5(ctx):
-    current = ctx.tokens.current()
-    rule = table[66][current.id] if current else -1
-    tree = ParseTree(NonTerminal(122, '_gen5'))
-    ctx.nonterminal = "_gen5"
-    tree.list = True
-    if current != None and current.id in nonterminal_follow[122] and current.id not in nonterminal_first[122]:
-        return tree
-    if current == None:
-        return tree
-    if rule == 15: # $_gen5 = $declaration $_gen6
-        ctx.rule = rules[15]
+    if rule == 16: # $_gen6 = $declaration $_gen6
+        ctx.rule = rules[16]
         tree.astTransform = AstTransformSubstitution(0)
         subtree = parse_declaration(ctx)
         tree.add(subtree)
@@ -3283,24 +3243,18 @@ def parse__gen5(ctx):
         tree.add(subtree)
         return tree
     return tree
-def parse_mapping(ctx):
+def parse_setter(ctx):
     current = ctx.tokens.current()
-    rule = table[67][current.id] if current else -1
-    tree = ParseTree(NonTerminal(123, 'mapping'))
-    ctx.nonterminal = "mapping"
+    rule = table[66][current.id] if current else -1
+    tree = ParseTree(NonTerminal(122, 'setter'))
+    ctx.nonterminal = "setter"
     tree.list = False
     if current == None:
         raise ctx.errors.unexpected_eof()
-    if rule == 92: # $mapping = :identifier :equal $e -> IOMapping( key=$0, value=$2 )
-        ctx.rule = rules[92]
-        ast_parameters = OrderedDict([
-            ('key', 0),
-            ('value', 2),
-        ])
-        tree.astTransform = AstTransformNodeCreator('IOMapping', ast_parameters)
-        t = expect(ctx, 27) # :identifier
-        tree.add(t)
-        t = expect(ctx, 38) # :equal
+    if rule == 62: # $setter = :equal $e -> $1
+        ctx.rule = rules[62]
+        tree.astTransform = AstTransformSubstitution(1)
+        t = expect(ctx, 52) # :equal
         tree.add(t)
         subtree = parse_e(ctx)
         tree.add(subtree)
@@ -3308,152 +3262,198 @@ def parse_mapping(ctx):
     raise ctx.errors.unexpected_symbol(
       ctx.nonterminal,
       ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[123] if x >=0],
-      rules[92]
+      [terminals[x] for x in nonterminal_first[122] if x >=0],
+      rules[62]
     )
-def parse_call_body(ctx):
+def parse__gen1(ctx):
+    current = ctx.tokens.current()
+    rule = table[67][current.id] if current else -1
+    tree = ParseTree(NonTerminal(123, '_gen1'))
+    ctx.nonterminal = "_gen1"
+    tree.list = True
+    if current != None and current.id in nonterminal_follow[123] and current.id not in nonterminal_first[123]:
+        return tree
+    if current == None:
+        return tree
+    if rule == 1: # $_gen1 = $import $_gen1
+        ctx.rule = rules[1]
+        tree.astTransform = AstTransformSubstitution(0)
+        subtree = parse_import(ctx)
+        tree.add(subtree)
+        subtree = parse__gen1(ctx)
+        tree.add(subtree)
+        return tree
+    return tree
+def parse__gen37(ctx):
     current = ctx.tokens.current()
     rule = table[68][current.id] if current else -1
-    tree = ParseTree(NonTerminal(124, 'call_body'))
-    ctx.nonterminal = "call_body"
-    tree.list = False
+    tree = ParseTree(NonTerminal(124, '_gen37'))
+    ctx.nonterminal = "_gen37"
+    tree.list = True
+    if current != None and current.id in nonterminal_follow[124] and current.id not in nonterminal_first[124]:
+        return tree
     if current == None:
-        raise ctx.errors.unexpected_eof()
-    if rule == 86: # $call_body = :lbrace $_gen5 $_gen23 :rbrace -> CallBody( declarations=$1, io=$2 )
-        ctx.rule = rules[86]
-        ast_parameters = OrderedDict([
-            ('declarations', 1),
-            ('io', 2),
-        ])
-        tree.astTransform = AstTransformNodeCreator('CallBody', ast_parameters)
-        t = expect(ctx, 52) # :lbrace
+        return tree
+    if rule == 143: # $_gen37 = :comma $map_kv $_gen37
+        ctx.rule = rules[143]
+        tree.astTransform = AstTransformSubstitution(0)
+        t = expect(ctx, 37) # :comma
         tree.add(t)
-        subtree = parse__gen5(ctx)
+        tree.listSeparator = t
+        subtree = parse_map_kv(ctx)
         tree.add(subtree)
-        subtree = parse__gen23(ctx)
+        subtree = parse__gen37(ctx)
         tree.add(subtree)
-        t = expect(ctx, 40) # :rbrace
-        tree.add(t)
         return tree
-    raise ctx.errors.unexpected_symbol(
-      ctx.nonterminal,
-      ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[124] if x >=0],
-      rules[86]
-    )
-def parse_import_namespace(ctx):
+    return tree
+def parse__gen7(ctx):
     current = ctx.tokens.current()
     rule = table[69][current.id] if current else -1
-    tree = ParseTree(NonTerminal(125, 'import_namespace'))
-    ctx.nonterminal = "import_namespace"
-    tree.list = False
+    tree = ParseTree(NonTerminal(125, '_gen7'))
+    ctx.nonterminal = "_gen7"
+    tree.list = True
+    if current != None and current.id in nonterminal_follow[125] and current.id not in nonterminal_first[125]:
+        return tree
     if current == None:
-        raise ctx.errors.unexpected_eof()
-    if rule == 14: # $import_namespace = :as :identifier -> $1
-        ctx.rule = rules[14]
-        tree.astTransform = AstTransformSubstitution(1)
-        t = expect(ctx, 26) # :as
-        tree.add(t)
-        t = expect(ctx, 27) # :identifier
-        tree.add(t)
         return tree
-    raise ctx.errors.unexpected_symbol(
-      ctx.nonterminal,
-      ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[125] if x >=0],
-      rules[14]
-    )
-def parse__gen14(ctx):
+    if rule == 19: # $_gen7 = $sections $_gen8
+        ctx.rule = rules[19]
+        tree.astTransform = AstTransformSubstitution(0)
+        subtree = parse_sections(ctx)
+        tree.add(subtree)
+        subtree = parse__gen8(ctx)
+        tree.add(subtree)
+        return tree
+    return tree
+def parse__gen19(ctx):
     current = ctx.tokens.current()
     rule = table[70][current.id] if current else -1
-    tree = ParseTree(NonTerminal(126, '_gen14'))
-    ctx.nonterminal = "_gen14"
+    tree = ParseTree(NonTerminal(126, '_gen19'))
+    ctx.nonterminal = "_gen19"
     tree.list = True
     if current != None and current.id in nonterminal_follow[126] and current.id not in nonterminal_first[126]:
         return tree
     if current == None:
         return tree
-    if rule == 43: # $_gen14 = $output_kv $_gen14
-        ctx.rule = rules[43]
+    if rule == 66: # $_gen19 = $wf_body_element $_gen20
+        ctx.rule = rules[66]
         tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_output_kv(ctx)
+        subtree = parse_wf_body_element(ctx)
         tree.add(subtree)
-        subtree = parse__gen14(ctx)
+        subtree = parse__gen20(ctx)
         tree.add(subtree)
         return tree
     return tree
-def parse__gen7(ctx):
+def parse__gen3(ctx):
     current = ctx.tokens.current()
     rule = table[71][current.id] if current else -1
-    tree = ParseTree(NonTerminal(127, '_gen7'))
-    ctx.nonterminal = "_gen7"
+    tree = ParseTree(NonTerminal(127, '_gen3'))
+    ctx.nonterminal = "_gen3"
     tree.list = True
     if current != None and current.id in nonterminal_follow[127] and current.id not in nonterminal_first[127]:
         return tree
     if current == None:
         return tree
-    if rule == 19: # $_gen7 = $sections $_gen8
-        ctx.rule = rules[19]
+    if rule == 5: # $_gen3 = $workflow_or_task $_gen3
+        ctx.rule = rules[5]
         tree.astTransform = AstTransformSubstitution(0)
-        subtree = parse_sections(ctx)
+        subtree = parse_workflow_or_task(ctx)
         tree.add(subtree)
-        subtree = parse__gen8(ctx)
+        subtree = parse__gen3(ctx)
         tree.add(subtree)
         return tree
     return tree
-def parse_map(ctx):
+def parse_workflow(ctx):
     current = ctx.tokens.current()
     rule = table[72][current.id] if current else -1
-    tree = ParseTree(NonTerminal(128, 'map'))
-    ctx.nonterminal = "map"
+    tree = ParseTree(NonTerminal(128, 'workflow'))
+    ctx.nonterminal = "workflow"
     tree.list = False
     if current == None:
         raise ctx.errors.unexpected_eof()
-    if rule == 55: # $map = :lbrace $_gen15 :rbrace -> $1
-        ctx.rule = rules[55]
-        tree.astTransform = AstTransformSubstitution(1)
-        t = expect(ctx, 52) # :lbrace
+    if rule == 70: # $workflow = :workflow :identifier :lbrace $_gen19 :rbrace -> Workflow( name=$1, body=$3 )
+        ctx.rule = rules[70]
+        ast_parameters = OrderedDict([
+            ('name', 1),
+            ('body', 3),
+        ])
+        tree.astTransform = AstTransformNodeCreator('Workflow', ast_parameters)
+        t = expect(ctx, 53) # :workflow
         tree.add(t)
-        subtree = parse__gen15(ctx)
+        t = expect(ctx, 33) # :identifier
+        tree.add(t)
+        t = expect(ctx, 15) # :lbrace
+        tree.add(t)
+        subtree = parse__gen19(ctx)
         tree.add(subtree)
-        t = expect(ctx, 40) # :rbrace
+        t = expect(ctx, 47) # :rbrace
         tree.add(t)
         return tree
     raise ctx.errors.unexpected_symbol(
       ctx.nonterminal,
       ctx.tokens.current(),
       [terminals[x] for x in nonterminal_first[128] if x >=0],
-      rules[55]
+      rules[70]
     )
-def parse_wf_outputs(ctx):
+def parse_if_stmt(ctx):
     current = ctx.tokens.current()
-    rule = table[74][current.id] if current else -1
-    tree = ParseTree(NonTerminal(130, 'wf_outputs'))
-    ctx.nonterminal = "wf_outputs"
+    rule = table[73][current.id] if current else -1
+    tree = ParseTree(NonTerminal(129, 'if_stmt'))
+    ctx.nonterminal = "if_stmt"
     tree.list = False
     if current == None:
         raise ctx.errors.unexpected_eof()
-    if rule == 98: # $wf_outputs = :output :lbrace $_gen27 :rbrace -> WorkflowOutputs( outputs=$2 )
-        ctx.rule = rules[98]
+    if rule == 104: # $if_stmt = :if :lparen $e :rparen :lbrace $_gen19 :rbrace -> If( expression=$2, body=$5 )
+        ctx.rule = rules[104]
         ast_parameters = OrderedDict([
-            ('outputs', 2),
+            ('expression', 2),
+            ('body', 5),
         ])
-        tree.astTransform = AstTransformNodeCreator('WorkflowOutputs', ast_parameters)
-        t = expect(ctx, 34) # :output
+        tree.astTransform = AstTransformNodeCreator('If', ast_parameters)
+        t = expect(ctx, 21) # :if
         tree.add(t)
-        t = expect(ctx, 52) # :lbrace
+        t = expect(ctx, 9) # :lparen
         tree.add(t)
-        subtree = parse__gen27(ctx)
+        subtree = parse_e(ctx)
+        tree.add(subtree)
+        t = expect(ctx, 38) # :rparen
+        tree.add(t)
+        t = expect(ctx, 15) # :lbrace
+        tree.add(t)
+        subtree = parse__gen19(ctx)
         tree.add(subtree)
-        t = expect(ctx, 40) # :rbrace
+        t = expect(ctx, 47) # :rbrace
         tree.add(t)
         return tree
     raise ctx.errors.unexpected_symbol(
       ctx.nonterminal,
       ctx.tokens.current(),
-      [terminals[x] for x in nonterminal_first[130] if x >=0],
-      rules[98]
+      [terminals[x] for x in nonterminal_first[129] if x >=0],
+      rules[104]
     )
+def parse_document(ctx):
+    current = ctx.tokens.current()
+    rule = table[74][current.id] if current else -1
+    tree = ParseTree(NonTerminal(130, 'document'))
+    ctx.nonterminal = "document"
+    tree.list = False
+    if current != None and current.id in nonterminal_follow[130] and current.id not in nonterminal_first[130]:
+        return tree
+    if current == None:
+        return tree
+    if rule == 8: # $document = $_gen0 $_gen2 -> Document( imports=$0, definitions=$1 )
+        ctx.rule = rules[8]
+        ast_parameters = OrderedDict([
+            ('imports', 0),
+            ('definitions', 1),
+        ])
+        tree.astTransform = AstTransformNodeCreator('Document', ast_parameters)
+        subtree = parse__gen0(ctx)
+        tree.add(subtree)
+        subtree = parse__gen2(ctx)
+        tree.add(subtree)
+        return tree
+    return tree
 # Lexer Code #
 # START USER CODE
 def init():
@@ -3489,7 +3489,7 @@ def output(ctx, terminal, source_string, line, col):
 def unescape(ctx, terminal, source_string, line, col):
     for regex, c in ctx.user_context['replacements'].items():
         source_string = regex.sub(chr(c), source_string)
-    source_string = source_string.replace("\u005C\u005C", "\u005C")
+    source_string = source_string.replace("\\\\", "\\")
     for regex, base in ctx.user_context['escapes'].items():
         for escape_sequence, number in regex.findall(source_string):
             source_string = source_string.replace(escape_sequence, unichr(int(number, base)))
diff --git a/wdl/test/cases/5/ast b/wdl/test/cases/5/ast
index 7a48e91..b1a64f5 100644
--- a/wdl/test/cases/5/ast
+++ b/wdl/test/cases/5/ast
@@ -393,7 +393,7 @@
                   ),
                   (IOMapping:
                     key=<string:85:28 identifier "cGF0dGVybg==">,
-                    value=<string:85:36 string "XFwucHkk">
+                    value=<string:85:36 string "XC5weSQ=">
                   )
                 ]
               )
diff --git a/wdl/test/cases/5/parsetree b/wdl/test/cases/5/parsetree
index 3f46b5d..9131d98 100644
--- a/wdl/test/cases/5/parsetree
+++ b/wdl/test/cases/5/parsetree
@@ -880,7 +880,7 @@
                                                       <string:85:28 identifier "cGF0dGVybg==">,
                                                       <string:85:35 equal "PQ==">,
                                                       (e:
-                                                        <string:85:36 string "XFwucHkk">
+                                                        <string:85:36 string "XC5weSQ=">
                                                       )
                                                     ),
                                                     (_gen26: )
diff --git a/wdl/test/test_binding.py b/wdl/test/test_binding.py
index b66c5a4..5cd20c2 100644
--- a/wdl/test/test_binding.py
+++ b/wdl/test/test_binding.py
@@ -106,7 +106,7 @@ def lookup(name):
 CODE"""
 
     assert task.outputs == []
-    assert task.runtime.keys() == ['docker']
+    assert list(task.runtime.keys()) == ['docker']
     assert task.runtime['docker'].wdl_string() == '"${docker}"'
 
     def lookup(name):
@@ -142,7 +142,7 @@ def lookup(name):
     assert task.outputs[1].name == 'foo'
     assert task.outputs[1].expression.wdl_string() == '1+1'
     assert task.outputs[1].type == WdlIntegerType()
-    assert task.runtime.keys() == ['docker']
+    assert list(task.runtime.keys()) == ['docker']
     assert task.runtime['docker'].wdl_string() == '"${docker}"'
 
     def lookup(name):
diff --git a/wdl/values.py b/wdl/values.py
index 00b30dd..85ed33e 100644
--- a/wdl/values.py
+++ b/wdl/values.py
@@ -40,9 +40,16 @@ def __str__(self): return repr(self)
 class WdlString(WdlValue):
     type = WdlStringType()
     def check_compatible(self, value):
-        if isinstance(value, unicode): value = value.encode('utf-8')
+        try:
+            if not isinstance(value, str): value = value.encode('utf-8')
+        except AttributeError:
+            pass
+        try:
+            if not isinstance(value, str): value = value.decode('utf-8')
+        except AttributeError:
+            pass
         if not isinstance(value, str):
-            raise EvalException("WdlString must hold a python 'str': {}".format(value.encode('utf-8')))
+            raise EvalException("WdlString must hold a python 'str': {} ({})".format(value, value.__class__))
     def add(self, rhs):
         if assert_type(rhs, [WdlIntegerType, WdlFloatType, WdlStringType, WdlFileType]):
             return WdlString(self.value + str(rhs.value))
@@ -87,7 +94,7 @@ def multiply(self, rhs):
         super(WdlInteger, self).multiply(rhs)
     def divide(self, rhs):
         if assert_type(rhs, [WdlIntegerType]):
-            return WdlInteger(self.value / rhs.value)
+            return WdlInteger(int(self.value / rhs.value))
         if assert_type(rhs, [WdlFloatType]):
             return WdlFloat(self.value / rhs.value)
         super(WdlInteger, self).divide(rhs)
@@ -189,9 +196,16 @@ def unary_plus(self):
 class WdlFile(WdlString):
     type = WdlFileType()
     def check_compatible(self, value):
-        if isinstance(value, unicode): value = value.encode('utf-8')
+        try:
+            if not isinstance(value, str): value = value.encode('utf-8')
+        except AttributeError:
+            pass
+        try:
+            if not isinstance(value, str): value = value.decode('utf-8')
+        except AttributeError:
+            pass
         if not isinstance(value, str):
-            raise EvalException("WdlFile must hold a python 'str': {}".format(value.encode('utf-8')))
+            raise EvalException("WdlString must hold a python 'str': {} ({})".format(value, value.__class__))
     def add(self, rhs):
         if assert_type(rhs, [WdlFileType, WdlStringType]):
             return WdlFile(self.value + str(rhs.value))