fig 0.1.81 → 0.2.1

data/lib/fig/grammar/v0.treetop

@@ -21,7 +21,12 @@ module Fig
       include Fig::Grammar::Version
 
       rule package
-        optional_ws grammar_version:grammar_version? ws* statements:(package_statement*) optional_ws {
+        optional_ws
+        grammar_version:grammar_version?
+        ws*
+        statements:(package_statement*)
+        optional_ws
+        {
           def to_package(directory, build_state)
             return build_state.new_package_statement(
               directory, grammar_version, statements
@@ -54,39 +59,29 @@ module Fig
         }
       end
 
-      rule asset_location
-        # Unquoted allows globbing for files, quoted does not.
-        #
-        # Unquoted, anything but:
-        #    @      - To allow for package substitution
-        #    '      - Future expansion
-        #    "<>|   - Characters not allowed in filenames on Windows
-        #    \s     - Necessary for the "ws" token to work
-        (location:[^@'"<>|\s]+ ws)
-
-        # Quoted, anything but:
-        #    @        - To allow for package substitution
-        #    '        - Future expansion
-        #    "<>|     - Characters not allowed in filenames on Windows
-        #    *?\[\]{} - Characters significant to Dir.glob()
-        #    \s       - We just don't want these. :]
-        / ('"' location:[^@'"<>|*?\[\]{}\s]+ '"' ws)
-      end
-
       rule retrieve
-        statement_start:'retrieve' ws+ var:environment_variable_name '->' path:retrieve_path ws+ {
+        statement_start:'retrieve'
+        ws+
+        variable:environment_variable_name '->' path:retrieve_path
+        ws+
+        {
           def to_package_statement(build_state)
-            return build_state.new_retrieve_statement(statement_start, var, path)
+            return build_state.new_retrieve_statement(
+              statement_start, variable, path
+            )
           end
         }
       end
 
-      rule retrieve_path
-        [a-zA-Z0-9_/.\[\]-]+
-      end
-
       rule config
-        statement_start:'config' ws+ config_name ws+ statements:config_statement* 'end' ws+ {
+        statement_start:'config'
+        ws+
+        config_name
+        ws+
+        statements:config_statement*
+        'end'
+        ws+
+        {
           def to_package_statement(build_state)
             return build_state.new_configuration_statement(
               statement_start, config_name, statements
@@ -95,10 +90,6 @@ module Fig
         }
       end
 
-      rule config_name
-        [a-zA-Z0-9_.-]+
-      end
-
       rule config_statement
         override / include / command / path / set
       end
@@ -123,10 +114,6 @@ module Fig
         }
       end
 
-      rule environment_variable_name
-        [a-zA-Z0-9_]+
-      end
-
       rule set
         statement_start:'set' ws+ environment_variable_name_value ws+ {
           def to_config_statement(build_state)
@@ -138,7 +125,11 @@ module Fig
       end
 
       rule path
-        statement_start:('add' / 'append' / 'path') ws+ environment_variable_name_value ws+ {
+        statement_start:('add' / 'append' / 'path')
+        ws+
+        environment_variable_name_value
+        ws+
+        {
           def to_config_statement(build_state)
             return build_state.new_environment_variable_statement(
               Statement::Path, statement_start, environment_variable_name_value
@@ -147,14 +138,10 @@ module Fig
         }
       end
 
-      rule environment_variable_name_value
-        [\S]+
-      end
-
       rule command
         statement_start:'command' ws+ command_line ws+ {
           def to_config_statement(build_state)
-            return build_state.new_command_statement(
+            return build_state.new_v0_command_statement(
               statement_start, command_line
             )
           end
@@ -162,12 +149,49 @@ module Fig
       end
 
       rule command_line
-        '"' value:[^"]* '"'
+        '"' [^"]* '"'
       end
 
+      # Terminals
+
       rule descriptor_string
         [\S]+
       end
+
+      rule config_name
+        [a-zA-Z0-9_.-]+
+      end
+
+      rule environment_variable_name
+        [a-zA-Z0-9_]+
+      end
+
+      rule environment_variable_name_value
+        [\S]+
+      end
+
+      rule asset_location
+        # Unquoted allows globbing for files, quoted does not.
+        #
+        # Unquoted, anything but:
+        #    @      - To allow for package substitution
+        #    '      - Future expansion
+        #    "<>|   - Characters not allowed in filenames on Windows
+        #    \s     - Necessary for the "ws" token to work
+        (location:[^@'"<>|\s]+ ws)
+
+        # Quoted, anything but:
+        #    @        - To allow for package substitution
+        #    '        - Future expansion
+        #    "<>|     - Characters not allowed in filenames on Windows
+        #    *?\[\]{} - Characters significant to Dir.glob()
+        #    \s       - We just don't want these. :]
+        / ('"' location:[^@'"<>|*?\[\]{}\s]+ '"' ws)
+      end
+
+      rule retrieve_path
+        [a-zA-Z0-9_/.\[\]-]+
+      end
     end
   end
 end

data/lib/fig/grammar/v1.rb

@@ -265,7 +265,7 @@ module Fig
           end
           s0 << r2
           if r2
-            r4 = _nt_asset_location
+            r4 = _nt_quoted_or_bare_string
             s0 << r4
           end
         end
@@ -339,7 +339,7 @@ module Fig
           end
           s0 << r2
           if r2
-            r4 = _nt_asset_location
+            r4 = _nt_quoted_or_bare_string
             s0 << r4
           end
         end
@@ -357,238 +357,12 @@ module Fig
         r0
       end
 
-      module AssetLocation0
-      end
-
-      module AssetLocation1
-      end
-
-      module AssetLocation2
-      end
-
-      module AssetLocation3
-      end
-
-      def _nt_asset_location
-        start_index = index
-        if node_cache[:asset_location].has_key?(index)
-          cached = node_cache[:asset_location][index]
-          if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-            @index = cached.interval.end
-          end
-          return cached
-        end
-
-        i0 = index
-        i1, s1 = index, []
-        if has_terminal?('"', false, index)
-          r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
-        else
-          terminal_parse_failure('"')
-          r2 = nil
-        end
-        s1 << r2
-        if r2
-          s3, i3 = [], index
-          loop do
-            i4 = index
-            if has_terminal?('\G[^"\\\\]', true, index)
-              r5 = true
-              @index += 1
-            else
-              r5 = nil
-            end
-            if r5
-              r4 = r5
-            else
-              i6, s6 = index, []
-              if has_terminal?('\\', false, index)
-                r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                @index += 1
-              else
-                terminal_parse_failure('\\')
-                r7 = nil
-              end
-              s6 << r7
-              if r7
-                if index < input_length
-                  r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                  @index += 1
-                else
-                  terminal_parse_failure("any character")
-                  r8 = nil
-                end
-                s6 << r8
-              end
-              if s6.last
-                r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
-                r6.extend(AssetLocation0)
-              else
-                @index = i6
-                r6 = nil
-              end
-              if r6
-                r4 = r6
-              else
-                @index = i4
-                r4 = nil
-              end
-            end
-            if r4
-              s3 << r4
-            else
-              break
-            end
-          end
-          r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
-          s1 << r3
-          if r3
-            if has_terminal?('"', false, index)
-              r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
-              @index += 1
-            else
-              terminal_parse_failure('"')
-              r9 = nil
-            end
-            s1 << r9
-          end
-        end
-        if s1.last
-          r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
-          r1.extend(AssetLocation1)
-        else
-          @index = i1
-          r1 = nil
-        end
-        if r1
-          r0 = r1
-        else
-          i10, s10 = index, []
-          if has_terminal?("'", false, index)
-            r11 = instantiate_node(SyntaxNode,input, index...(index + 1))
-            @index += 1
-          else
-            terminal_parse_failure("'")
-            r11 = nil
-          end
-          s10 << r11
-          if r11
-            s12, i12 = [], index
-            loop do
-              i13 = index
-              if has_terminal?('\G[^\'\\\\]', true, index)
-                r14 = true
-                @index += 1
-              else
-                r14 = nil
-              end
-              if r14
-                r13 = r14
-              else
-                i15, s15 = index, []
-                if has_terminal?('\\', false, index)
-                  r16 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                  @index += 1
-                else
-                  terminal_parse_failure('\\')
-                  r16 = nil
-                end
-                s15 << r16
-                if r16
-                  if index < input_length
-                    r17 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                    @index += 1
-                  else
-                    terminal_parse_failure("any character")
-                    r17 = nil
-                  end
-                  s15 << r17
-                end
-                if s15.last
-                  r15 = instantiate_node(SyntaxNode,input, i15...index, s15)
-                  r15.extend(AssetLocation2)
-                else
-                  @index = i15
-                  r15 = nil
-                end
-                if r15
-                  r13 = r15
-                else
-                  @index = i13
-                  r13 = nil
-                end
-              end
-              if r13
-                s12 << r13
-              else
-                break
-              end
-            end
-            r12 = instantiate_node(SyntaxNode,input, i12...index, s12)
-            s10 << r12
-            if r12
-              if has_terminal?("'", false, index)
-                r18 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                @index += 1
-              else
-                terminal_parse_failure("'")
-                r18 = nil
-              end
-              s10 << r18
-            end
-          end
-          if s10.last
-            r10 = instantiate_node(SyntaxNode,input, i10...index, s10)
-            r10.extend(AssetLocation3)
-          else
-            @index = i10
-            r10 = nil
-          end
-          if r10
-            r0 = r10
-          else
-            s19, i19 = [], index
-            loop do
-              if has_terminal?('\G[^\\s#]', true, index)
-                r20 = true
-                @index += 1
-              else
-                r20 = nil
-              end
-              if r20
-                s19 << r20
-              else
-                break
-              end
-            end
-            if s19.empty?
-              @index = i19
-              r19 = nil
-            else
-              r19 = instantiate_node(SyntaxNode,input, i19...index, s19)
-            end
-            if r19
-              r0 = r19
-            else
-              @index = i0
-              r0 = nil
-            end
-          end
-        end
-
-        node_cache[:asset_location][start_index] = r0
-
-        r0
-      end
-
       module Retrieve0
         def statement_start
           elements[0]
         end
 
-        def var
+        def variable
           elements[2]
         end
 
@@ -599,7 +373,9 @@ module Fig
 
       module Retrieve1
         def to_package_statement(build_state)
-          return build_state.new_retrieve_statement(statement_start, var, path)
+          return build_state.new_retrieve_statement(
+            statement_start, variable, path
+          )
         end
       end
 
@@ -653,7 +429,7 @@ module Fig
               end
               s0 << r5
               if r5
-                r6 = _nt_retrieve_path
+                r6 = _nt_quoted_or_bare_string
                 s0 << r6
               end
             end
@@ -673,43 +449,6 @@ module Fig
         r0
       end
 
-      def _nt_retrieve_path
-        start_index = index
-        if node_cache[:retrieve_path].has_key?(index)
-          cached = node_cache[:retrieve_path][index]
-          if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-            @index = cached.interval.end
-          end
-          return cached
-        end
-
-        s0, i0 = [], index
-        loop do
-          if has_terminal?('\G[a-zA-Z0-9_/.\\[\\]-]', true, index)
-            r1 = true
-            @index += 1
-          else
-            r1 = nil
-          end
-          if r1
-            s0 << r1
-          else
-            break
-          end
-        end
-        if s0.empty?
-          @index = i0
-          r0 = nil
-        else
-          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-        end
-
-        node_cache[:retrieve_path][start_index] = r0
-
-        r0
-      end
-
       module Config0
         def statement_start
           elements[0]
@@ -830,43 +569,6 @@ module Fig
         r0
       end
 
-      def _nt_config_name
-        start_index = index
-        if node_cache[:config_name].has_key?(index)
-          cached = node_cache[:config_name][index]
-          if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-            @index = cached.interval.end
-          end
-          return cached
-        end
-
-        s0, i0 = [], index
-        loop do
-          if has_terminal?('\G[a-zA-Z0-9_.-]', true, index)
-            r1 = true
-            @index += 1
-          else
-            r1 = nil
-          end
-          if r1
-            s0 << r1
-          else
-            break
-          end
-        end
-        if s0.empty?
-          @index = i0
-          r0 = nil
-        else
-          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-        end
-
-        node_cache[:config_name][start_index] = r0
-
-        r0
-      end
-
       module ConfigStatementWithWs0
         def config_statement
           elements[0]
@@ -1119,43 +821,6 @@ module Fig
         r0
       end
 
-      def _nt_environment_variable_name
-        start_index = index
-        if node_cache[:environment_variable_name].has_key?(index)
-          cached = node_cache[:environment_variable_name][index]
-          if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-            @index = cached.interval.end
-          end
-          return cached
-        end
-
-        s0, i0 = [], index
-        loop do
-          if has_terminal?('\G[a-zA-Z0-9_]', true, index)
-            r1 = true
-            @index += 1
-          else
-            r1 = nil
-          end
-          if r1
-            s0 << r1
-          else
-            break
-          end
-        end
-        if s0.empty?
-          @index = i0
-          r0 = nil
-        else
-          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-        end
-
-        node_cache[:environment_variable_name][start_index] = r0
-
-        r0
-      end
-
       module Set0
         def statement_start
           elements[0]
@@ -1333,21 +998,631 @@ module Fig
         r0
       end
 
-      module EnvironmentVariableNameValue0
-      end
+      module Command0
+        def statement_start
+          elements[0]
+        end
 
-      module EnvironmentVariableNameValue1
-      end
+        def command_line
+          elements[2]
+        end
 
-      module EnvironmentVariableNameValue2
       end
 
-      module EnvironmentVariableNameValue3
-      end
+      module Command1
+        def to_config_statement(build_state)
+          return build_state.new_v1_command_statement(
+            statement_start, gather_command_argument_nodes(command_line)
+          )
+        end
 
-      def _nt_environment_variable_name_value
-        start_index = index
-        if node_cache[:environment_variable_name_value].has_key?(index)
+        def gather_command_argument_nodes(node, arguments = [])
+          if node.respond_to? 'quoted_or_bare_string?'
+            arguments << node
+            return arguments
+          end
+
+          return arguments if not node.elements
+
+          node.elements.each do
+            |element|
+            gather_command_argument_nodes(element, arguments)
+          end
+
+          return arguments
+        end
+      end
+
+      def _nt_command
+        start_index = index
+        if node_cache[:command].has_key?(index)
+          cached = node_cache[:command][index]
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
+          return cached
+        end
+
+        i0, s0 = index, []
+        if has_terminal?('command', false, index)
+          r1 = instantiate_node(SyntaxNode,input, index...(index + 7))
+          @index += 7
+        else
+          terminal_parse_failure('command')
+          r1 = nil
+        end
+        s0 << r1
+        if r1
+          s2, i2 = [], index
+          loop do
+            r3 = _nt_ws_or_comment
+            if r3
+              s2 << r3
+            else
+              break
+            end
+          end
+          if s2.empty?
+            @index = i2
+            r2 = nil
+          else
+            r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+          end
+          s0 << r2
+          if r2
+            r4 = _nt_command_line
+            s0 << r4
+            if r4
+              s5, i5 = [], index
+              loop do
+                r6 = _nt_ws_or_comment
+                if r6
+                  s5 << r6
+                else
+                  break
+                end
+              end
+              if s5.empty?
+                @index = i5
+                r5 = nil
+              else
+                r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+              end
+              s0 << r5
+              if r5
+                if has_terminal?('end', false, index)
+                  r7 = instantiate_node(SyntaxNode,input, index...(index + 3))
+                  @index += 3
+                else
+                  terminal_parse_failure('end')
+                  r7 = nil
+                end
+                s0 << r7
+              end
+            end
+          end
+        end
+        if s0.last
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+          r0.extend(Command0)
+          r0.extend(Command1)
+        else
+          @index = i0
+          r0 = nil
+        end
+
+        node_cache[:command][start_index] = r0
+
+        r0
+      end
+
+      module CommandLine0
+        def quoted_or_bare_string
+          elements[1]
+        end
+
+      end
+
+      module CommandLine1
+        def quoted_or_bare_string
+          elements[0]
+        end
+
+      end
+
+      def _nt_command_line
+        start_index = index
+        if node_cache[:command_line].has_key?(index)
+          cached = node_cache[:command_line][index]
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
+          return cached
+        end
+
+        i0, s0 = index, []
+        r1 = _nt_quoted_or_bare_string
+        s0 << r1
+        if r1
+          i2 = index
+          r3 = lambda { |sequence| sequence[-1].text_value == 'end' }.call(s0)
+          if r3
+            r2 = nil
+          else
+            @index = i2
+            r2 = instantiate_node(SyntaxNode,input, index...index)
+          end
+          s0 << r2
+          if r2
+            s4, i4 = [], index
+            loop do
+              i5, s5 = index, []
+              s6, i6 = [], index
+              loop do
+                r7 = _nt_ws_or_comment
+                if r7
+                  s6 << r7
+                else
+                  break
+                end
+              end
+              if s6.empty?
+                @index = i6
+                r6 = nil
+              else
+                r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+              end
+              s5 << r6
+              if r6
+                r8 = _nt_quoted_or_bare_string
+                s5 << r8
+                if r8
+                  i9 = index
+                  r10 = lambda { |sequence| sequence[-1].text_value == 'end' }.call(s5)
+                  if r10
+                    r9 = nil
+                  else
+                    @index = i9
+                    r9 = instantiate_node(SyntaxNode,input, index...index)
+                  end
+                  s5 << r9
+                end
+              end
+              if s5.last
+                r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+                r5.extend(CommandLine0)
+              else
+                @index = i5
+                r5 = nil
+              end
+              if r5
+                s4 << r5
+              else
+                break
+              end
+            end
+            r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+            s0 << r4
+          end
+        end
+        if s0.last
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+          r0.extend(CommandLine1)
+        else
+          @index = i0
+          r0 = nil
+        end
+
+        node_cache[:command_line][start_index] = r0
+
+        r0
+      end
+
+      def _nt_descriptor_string
+        start_index = index
+        if node_cache[:descriptor_string].has_key?(index)
+          cached = node_cache[:descriptor_string][index]
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
+          return cached
+        end
+
+        s0, i0 = [], index
+        loop do
+          if has_terminal?('\G[^\\s#]', true, index)
+            r1 = true
+            @index += 1
+          else
+            r1 = nil
+          end
+          if r1
+            s0 << r1
+          else
+            break
+          end
+        end
+        if s0.empty?
+          @index = i0
+          r0 = nil
+        else
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+        end
+
+        node_cache[:descriptor_string][start_index] = r0
+
+        r0
+      end
+
+      def _nt_config_name
+        start_index = index
+        if node_cache[:config_name].has_key?(index)
+          cached = node_cache[:config_name][index]
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
+          return cached
+        end
+
+        s0, i0 = [], index
+        loop do
+          if has_terminal?('\G[a-zA-Z0-9_.-]', true, index)
+            r1 = true
+            @index += 1
+          else
+            r1 = nil
+          end
+          if r1
+            s0 << r1
+          else
+            break
+          end
+        end
+        if s0.empty?
+          @index = i0
+          r0 = nil
+        else
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+        end
+
+        node_cache[:config_name][start_index] = r0
+
+        r0
+      end
+
+      module QuotedOrBareString0
+      end
+
+      module QuotedOrBareString1
+      end
+
+      module QuotedOrBareString2
+        def quoted_or_bare_string?() return true end
+      end
+
+      module QuotedOrBareString3
+      end
+
+      module QuotedOrBareString4
+      end
+
+      module QuotedOrBareString5
+        def quoted_or_bare_string?() return true end
+      end
+
+      module QuotedOrBareString6
+        def quoted_or_bare_string?() return true end
+      end
+
+      def _nt_quoted_or_bare_string
+        start_index = index
+        if node_cache[:quoted_or_bare_string].has_key?(index)
+          cached = node_cache[:quoted_or_bare_string][index]
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
+          return cached
+        end
+
+        i0 = index
+        i1, s1 = index, []
+        s2, i2 = [], index
+        loop do
+          if has_terminal?('\G[^\\s#\\\\"]', true, index)
+            r3 = true
+            @index += 1
+          else
+            r3 = nil
+          end
+          if r3
+            s2 << r3
+          else
+            break
+          end
+        end
+        r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+        s1 << r2
+        if r2
+          if has_terminal?('"', false, index)
+            r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
+            @index += 1
+          else
+            terminal_parse_failure('"')
+            r4 = nil
+          end
+          s1 << r4
+          if r4
+            s5, i5 = [], index
+            loop do
+              i6 = index
+              if has_terminal?('\G[^"\\\\]', true, index)
+                r7 = true
+                @index += 1
+              else
+                r7 = nil
+              end
+              if r7
+                r6 = r7
+              else
+                i8, s8 = index, []
+                if has_terminal?('\\', false, index)
+                  r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                  @index += 1
+                else
+                  terminal_parse_failure('\\')
+                  r9 = nil
+                end
+                s8 << r9
+                if r9
+                  if index < input_length
+                    r10 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                    @index += 1
+                  else
+                    terminal_parse_failure("any character")
+                    r10 = nil
+                  end
+                  s8 << r10
+                end
+                if s8.last
+                  r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
+                  r8.extend(QuotedOrBareString0)
+                else
+                  @index = i8
+                  r8 = nil
+                end
+                if r8
+                  r6 = r8
+                else
+                  @index = i6
+                  r6 = nil
+                end
+              end
+              if r6
+                s5 << r6
+              else
+                break
+              end
+            end
+            r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+            s1 << r5
+            if r5
+              if has_terminal?('"', false, index)
+                r11 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                @index += 1
+              else
+                terminal_parse_failure('"')
+                r11 = nil
+              end
+              s1 << r11
+            end
+          end
+        end
+        if s1.last
+          r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+          r1.extend(QuotedOrBareString1)
+          r1.extend(QuotedOrBareString2)
+        else
+          @index = i1
+          r1 = nil
+        end
+        if r1
+          r0 = r1
+        else
+          i12, s12 = index, []
+          s13, i13 = [], index
+          loop do
+            if has_terminal?('\G[^\\s#\\\\\']', true, index)
+              r14 = true
+              @index += 1
+            else
+              r14 = nil
+            end
+            if r14
+              s13 << r14
+            else
+              break
+            end
+          end
+          r13 = instantiate_node(SyntaxNode,input, i13...index, s13)
+          s12 << r13
+          if r13
+            if has_terminal?("'", false, index)
+              r15 = instantiate_node(SyntaxNode,input, index...(index + 1))
+              @index += 1
+            else
+              terminal_parse_failure("'")
+              r15 = nil
+            end
+            s12 << r15
+            if r15
+              s16, i16 = [], index
+              loop do
+                i17 = index
+                if has_terminal?('\G[^\'\\\\]', true, index)
+                  r18 = true
+                  @index += 1
+                else
+                  r18 = nil
+                end
+                if r18
+                  r17 = r18
+                else
+                  i19, s19 = index, []
+                  if has_terminal?('\\', false, index)
+                    r20 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                    @index += 1
+                  else
+                    terminal_parse_failure('\\')
+                    r20 = nil
+                  end
+                  s19 << r20
+                  if r20
+                    if index < input_length
+                      r21 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                      @index += 1
+                    else
+                      terminal_parse_failure("any character")
+                      r21 = nil
+                    end
+                    s19 << r21
+                  end
+                  if s19.last
+                    r19 = instantiate_node(SyntaxNode,input, i19...index, s19)
+                    r19.extend(QuotedOrBareString3)
+                  else
+                    @index = i19
+                    r19 = nil
+                  end
+                  if r19
+                    r17 = r19
+                  else
+                    @index = i17
+                    r17 = nil
+                  end
+                end
+                if r17
+                  s16 << r17
+                else
+                  break
+                end
+              end
+              r16 = instantiate_node(SyntaxNode,input, i16...index, s16)
+              s12 << r16
+              if r16
+                if has_terminal?("'", false, index)
+                  r22 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                  @index += 1
+                else
+                  terminal_parse_failure("'")
+                  r22 = nil
+                end
+                s12 << r22
+              end
+            end
+          end
+          if s12.last
+            r12 = instantiate_node(SyntaxNode,input, i12...index, s12)
+            r12.extend(QuotedOrBareString4)
+            r12.extend(QuotedOrBareString5)
+          else
+            @index = i12
+            r12 = nil
+          end
+          if r12
+            r0 = r12
+          else
+            s23, i23 = [], index
+            loop do
+              if has_terminal?('\G[^\\s#]', true, index)
+                r24 = true
+                @index += 1
+              else
+                r24 = nil
+              end
+              if r24
+                s23 << r24
+              else
+                break
+              end
+            end
+            if s23.empty?
+              @index = i23
+              r23 = nil
+            else
+              r23 = instantiate_node(SyntaxNode,input, i23...index, s23)
+              r23.extend(QuotedOrBareString6)
+            end
+            if r23
+              r0 = r23
+            else
+              @index = i0
+              r0 = nil
+            end
+          end
+        end
+
+        node_cache[:quoted_or_bare_string][start_index] = r0
+
+        r0
+      end
+
+      def _nt_environment_variable_name
+        start_index = index
+        if node_cache[:environment_variable_name].has_key?(index)
+          cached = node_cache[:environment_variable_name][index]
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
+          return cached
+        end
+
+        s0, i0 = [], index
+        loop do
+          if has_terminal?('\G[a-zA-Z0-9_]', true, index)
+            r1 = true
+            @index += 1
+          else
+            r1 = nil
+          end
+          if r1
+            s0 << r1
+          else
+            break
+          end
+        end
+        if s0.empty?
+          @index = i0
+          r0 = nil
+        else
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+        end
+
+        node_cache[:environment_variable_name][start_index] = r0
+
+        r0
+      end
+
+      module EnvironmentVariableNameValue0
+      end
+
+      module EnvironmentVariableNameValue1
+      end
+
+      module EnvironmentVariableNameValue2
+      end
+
+      module EnvironmentVariableNameValue3
+      end
+
+      def _nt_environment_variable_name_value
+        start_index = index
+        if node_cache[:environment_variable_name_value].has_key?(index)
           cached = node_cache[:environment_variable_name_value][index]
           if cached
             cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
@@ -1360,7 +1635,7 @@ module Fig
         i1, s1 = index, []
         s2, i2 = [], index
         loop do
-          if has_terminal?('\G[^\\s#\\\\"]', true, index)
+          if has_terminal?('\G[^\\s#\\\\\'"]', true, index)
             r3 = true
             @index += 1
           else
@@ -1462,7 +1737,7 @@ module Fig
           i12, s12 = index, []
           s13, i13 = [], index
           loop do
-            if has_terminal?('\G[^\\s#\\\\\']', true, index)
+            if has_terminal?('\G[^\\s#\\\\\'"]', true, index)
               r14 = true
               @index += 1
             else
@@ -1595,185 +1870,6 @@ module Fig
         r0
       end
 
-      module Command0
-        def statement_start
-          elements[0]
-        end
-
-        def command_line
-          elements[2]
-        end
-      end
-
-      module Command1
-        def to_config_statement(build_state)
-          return build_state.new_command_statement(
-            statement_start, command_line
-          )
-        end
-      end
-
-      def _nt_command
-        start_index = index
-        if node_cache[:command].has_key?(index)
-          cached = node_cache[:command][index]
-          if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-            @index = cached.interval.end
-          end
-          return cached
-        end
-
-        i0, s0 = index, []
-        if has_terminal?('command', false, index)
-          r1 = instantiate_node(SyntaxNode,input, index...(index + 7))
-          @index += 7
-        else
-          terminal_parse_failure('command')
-          r1 = nil
-        end
-        s0 << r1
-        if r1
-          s2, i2 = [], index
-          loop do
-            r3 = _nt_ws_or_comment
-            if r3
-              s2 << r3
-            else
-              break
-            end
-          end
-          if s2.empty?
-            @index = i2
-            r2 = nil
-          else
-            r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
-          end
-          s0 << r2
-          if r2
-            r4 = _nt_command_line
-            s0 << r4
-          end
-        end
-        if s0.last
-          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-          r0.extend(Command0)
-          r0.extend(Command1)
-        else
-          @index = i0
-          r0 = nil
-        end
-
-        node_cache[:command][start_index] = r0
-
-        r0
-      end
-
-      module CommandLine0
-        def value
-          elements[1]
-        end
-
-      end
-
-      def _nt_command_line
-        start_index = index
-        if node_cache[:command_line].has_key?(index)
-          cached = node_cache[:command_line][index]
-          if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-            @index = cached.interval.end
-          end
-          return cached
-        end
-
-        i0, s0 = index, []
-        if has_terminal?('"', false, index)
-          r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
-        else
-          terminal_parse_failure('"')
-          r1 = nil
-        end
-        s0 << r1
-        if r1
-          s2, i2 = [], index
-          loop do
-            if has_terminal?('\G[^"]', true, index)
-              r3 = true
-              @index += 1
-            else
-              r3 = nil
-            end
-            if r3
-              s2 << r3
-            else
-              break
-            end
-          end
-          r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
-          s0 << r2
-          if r2
-            if has_terminal?('"', false, index)
-              r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
-              @index += 1
-            else
-              terminal_parse_failure('"')
-              r4 = nil
-            end
-            s0 << r4
-          end
-        end
-        if s0.last
-          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-          r0.extend(CommandLine0)
-        else
-          @index = i0
-          r0 = nil
-        end
-
-        node_cache[:command_line][start_index] = r0
-
-        r0
-      end
-
-      def _nt_descriptor_string
-        start_index = index
-        if node_cache[:descriptor_string].has_key?(index)
-          cached = node_cache[:descriptor_string][index]
-          if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-            @index = cached.interval.end
-          end
-          return cached
-        end
-
-        s0, i0 = [], index
-        loop do
-          if has_terminal?('\G[^\\s#]', true, index)
-            r1 = true
-            @index += 1
-          else
-            r1 = nil
-          end
-          if r1
-            s0 << r1
-          else
-            break
-          end
-        end
-        if s0.empty?
-          @index = i0
-          r0 = nil
-        else
-          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-        end
-
-        node_cache[:descriptor_string][start_index] = r0
-
-        r0
-      end
-
     end
 
     class V1Parser < Treetop::Runtime::CompiledParser