fig 0.1.77 → 0.1.79

data/lib/fig/grammar/v0.treetop

@@ -35,26 +35,26 @@ module Fig
       end
 
       rule archive
-        statement_start:'archive' ws+ url:asset_url {
+        statement_start:'archive' ws+ location:asset_location {
           def to_package_statement(build_state)
             return build_state.new_asset_statement(
-              Statement::Archive, statement_start, url.url
+              Statement::Archive, statement_start, location.location
             )
           end
         }
       end
 
       rule resource
-        statement_start:'resource' ws+ url:asset_url {
+        statement_start:'resource' ws+ location:asset_location {
           def to_package_statement(build_state)
             return build_state.new_asset_statement(
-              Statement::Resource, statement_start, url.url
+              Statement::Resource, statement_start, location.location
             )
           end
         }
       end
 
-      rule asset_url
+      rule asset_location
         # Unquoted allows globbing for files, quoted does not.
         #
         # Unquoted, anything but:
@@ -62,15 +62,15 @@ module Fig
         #    '      - Future expansion
         #    "<>|   - Characters not allowed in filenames on Windows
         #    \s     - Necessary for the "ws" token to work
-        (url:[^@'"<>|\s]+ ws)
+        (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. :]  (May need to allow space.)
-        / ('"' url:[^@'"<>|*?\[\]{}\s]+ '"' ws)
+        #    \s       - We just don't want these. :]
+        / ('"' location:[^@'"<>|*?\[\]{}\s]+ '"' ws)
       end
 
       rule retrieve
@@ -123,39 +123,45 @@ module Fig
         }
       end
 
-      rule path
-        statement_start:('add' / 'append' / 'path') ws+ name_value:[\S]+ ws+ {
+      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)
             return build_state.new_environment_variable_statement(
-              Statement::Path, statement_start, name_value
+              Statement::Set, statement_start, environment_variable_name_value
             )
           end
         }
       end
 
-      rule environment_variable_name
-        [a-zA-Z0-9_]+
-      end
-
-      rule set
-        statement_start:'set' ws+ name_value:[\S]+ ws+ {
+      rule path
+        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::Set, statement_start, name_value
+              Statement::Path, statement_start, environment_variable_name_value
             )
           end
         }
       end
 
+      rule environment_variable_name_value
+        [\S]+
+      end
+
       rule command
-        statement_start:'command' ws+ string ws+ {
+        statement_start:'command' ws+ command_line ws+ {
           def to_config_statement(build_state)
-            return build_state.new_command_statement(statement_start, string)
+            return build_state.new_command_statement(
+              statement_start, command_line
+            )
           end
         }
       end
 
-      rule string
+      rule command_line
         '"' value:[^"]* '"'
       end
 

data/lib/fig/grammar/v1.rb

@@ -214,7 +214,7 @@ module Fig
           elements[0]
         end
 
-        def url
+        def location
           elements[2]
         end
       end
@@ -222,7 +222,7 @@ module Fig
       module Archive1
         def to_package_statement(build_state)
           return build_state.new_asset_statement(
-            Statement::Archive, statement_start, url
+            Statement::Archive, statement_start, location
           )
         end
       end
@@ -265,7 +265,7 @@ module Fig
           end
           s0 << r2
           if r2
-            r4 = _nt_asset_url
+            r4 = _nt_asset_location
             s0 << r4
           end
         end
@@ -288,7 +288,7 @@ module Fig
           elements[0]
         end
 
-        def url
+        def location
           elements[2]
         end
       end
@@ -296,7 +296,7 @@ module Fig
       module Resource1
         def to_package_statement(build_state)
           return build_state.new_asset_statement(
-            Statement::Resource, statement_start, url
+            Statement::Resource, statement_start, location
           )
         end
       end
@@ -339,7 +339,7 @@ module Fig
           end
           s0 << r2
           if r2
-            r4 = _nt_asset_url
+            r4 = _nt_asset_location
             s0 << r4
           end
         end
@@ -357,16 +357,22 @@ module Fig
         r0
       end
 
-      module AssetUrl0
+      module AssetLocation0
       end
 
-      module AssetUrl1
+      module AssetLocation1
       end
 
-      def _nt_asset_url
+      module AssetLocation2
+      end
+
+      module AssetLocation3
+      end
+
+      def _nt_asset_location
         start_index = index
-        if node_cache[:asset_url].has_key?(index)
-          cached = node_cache[:asset_url][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
@@ -387,11 +393,48 @@ module Fig
         if r2
           s3, i3 = [], index
           loop do
-            if has_terminal?('\G[^"]', true, index)
-              r4 = true
+            i4 = index
+            if has_terminal?('\G[^"\\\\]', true, index)
+              r5 = true
               @index += 1
             else
-              r4 = nil
+              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
@@ -403,18 +446,18 @@ module Fig
           s1 << r3
           if r3
             if has_terminal?('"', false, index)
-              r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
+              r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
               terminal_parse_failure('"')
-              r5 = nil
+              r9 = nil
             end
-            s1 << r5
+            s1 << r9
           end
         end
         if s1.last
           r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
-          r1.extend(AssetUrl0)
+          r1.extend(AssetLocation1)
         else
           @index = i1
           r1 = nil
@@ -422,75 +465,112 @@ module Fig
         if r1
           r0 = r1
         else
-          i6, s6 = index, []
+          i10, s10 = index, []
           if has_terminal?("'", false, index)
-            r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
+            r11 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
             terminal_parse_failure("'")
-            r7 = nil
+            r11 = nil
           end
-          s6 << r7
-          if r7
-            s8, i8 = [], index
+          s10 << r11
+          if r11
+            s12, i12 = [], index
             loop do
-              if has_terminal?('\G[^\']', true, index)
-                r9 = true
+              i13 = index
+              if has_terminal?('\G[^\'\\\\]', true, index)
+                r14 = true
                 @index += 1
               else
-                r9 = nil
+                r14 = nil
               end
-              if r9
-                s8 << r9
+              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
-            r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
-            s6 << r8
-            if r8
+            r12 = instantiate_node(SyntaxNode,input, i12...index, s12)
+            s10 << r12
+            if r12
               if has_terminal?("'", false, index)
-                r10 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                r18 = instantiate_node(SyntaxNode,input, index...(index + 1))
                 @index += 1
               else
                 terminal_parse_failure("'")
-                r10 = nil
+                r18 = nil
               end
-              s6 << r10
+              s10 << r18
             end
           end
-          if s6.last
-            r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
-            r6.extend(AssetUrl1)
+          if s10.last
+            r10 = instantiate_node(SyntaxNode,input, i10...index, s10)
+            r10.extend(AssetLocation3)
           else
-            @index = i6
-            r6 = nil
+            @index = i10
+            r10 = nil
           end
-          if r6
-            r0 = r6
+          if r10
+            r0 = r10
           else
-            s11, i11 = [], index
+            s19, i19 = [], index
             loop do
-              if has_terminal?('\G[\\S]', true, index)
-                r12 = true
+              if has_terminal?('\G[^\\s#]', true, index)
+                r20 = true
                 @index += 1
               else
-                r12 = nil
+                r20 = nil
               end
-              if r12
-                s11 << r12
+              if r20
+                s19 << r20
               else
                 break
               end
             end
-            if s11.empty?
-              @index = i11
-              r11 = nil
+            if s19.empty?
+              @index = i19
+              r19 = nil
             else
-              r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
+              r19 = instantiate_node(SyntaxNode,input, i19...index, s19)
             end
-            if r11
-              r0 = r11
+            if r19
+              r0 = r19
             else
               @index = i0
               r0 = nil
@@ -498,7 +578,7 @@ module Fig
           end
         end
 
-        node_cache[:asset_url][start_index] = r0
+        node_cache[:asset_location][start_index] = r0
 
         r0
       end
@@ -1039,12 +1119,123 @@ 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]
+        end
+
+        def environment_variable_name_value
+          elements[2]
+        end
+      end
+
+      module Set1
+        def to_config_statement(build_state)
+          return build_state.new_environment_variable_statement(
+            Statement::Set, statement_start, environment_variable_name_value
+          )
+        end
+      end
+
+      def _nt_set
+        start_index = index
+        if node_cache[:set].has_key?(index)
+          cached = node_cache[:set][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?('set', false, index)
+          r1 = instantiate_node(SyntaxNode,input, index...(index + 3))
+          @index += 3
+        else
+          terminal_parse_failure('set')
+          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_environment_variable_name_value
+            s0 << r4
+          end
+        end
+        if s0.last
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+          r0.extend(Set0)
+          r0.extend(Set1)
+        else
+          @index = i0
+          r0 = nil
+        end
+
+        node_cache[:set][start_index] = r0
+
+        r0
+      end
+
       module Path0
         def statement_start
           elements[0]
         end
 
-        def name_value
+        def environment_variable_name_value
           elements[2]
         end
       end
@@ -1052,7 +1243,7 @@ module Fig
       module Path1
         def to_config_statement(build_state)
           return build_state.new_environment_variable_statement(
-            Statement::Path, statement_start, name_value
+            Statement::Path, statement_start, environment_variable_name_value
           )
         end
       end
@@ -1124,26 +1315,7 @@ module Fig
           end
           s0 << r5
           if r5
-            s7, i7 = [], index
-            loop do
-              if has_terminal?('\G[\\S]', true, index)
-                r8 = true
-                @index += 1
-              else
-                r8 = nil
-              end
-              if r8
-                s7 << r8
-              else
-                break
-              end
-            end
-            if s7.empty?
-              @index = i7
-              r7 = nil
-            else
-              r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
-            end
+            r7 = _nt_environment_variable_name_value
             s0 << r7
           end
         end
@@ -1161,10 +1333,22 @@ module Fig
         r0
       end
 
-      def _nt_environment_variable_name
+      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].has_key?(index)
-          cached = node_cache[:environment_variable_name][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
             @index = cached.interval.end
@@ -1172,121 +1356,241 @@ module Fig
           return cached
         end
 
-        s0, i0 = [], index
+        i0 = index
+        i1, s1 = index, []
+        s2, i2 = [], index
         loop do
-          if has_terminal?('\G[a-zA-Z0-9_]', true, index)
-            r1 = true
+          if has_terminal?('\G[^\\s#\\\\"]', true, index)
+            r3 = true
             @index += 1
           else
-            r1 = nil
+            r3 = nil
           end
-          if r1
-            s0 << r1
+          if r3
+            s2 << r3
           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]
-        end
-
-        def name_value
-          elements[2]
-        end
-      end
-
-      module Set1
-        def to_config_statement(build_state)
-          return build_state.new_environment_variable_statement(
-            Statement::Set, statement_start, name_value
-          )
-        end
-      end
-
-      def _nt_set
-        start_index = index
-        if node_cache[:set].has_key?(index)
-          cached = node_cache[:set][index]
-          if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-            @index = cached.interval.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(EnvironmentVariableNameValue0)
+                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
-          return cached
         end
-
-        i0, s0 = index, []
-        if has_terminal?('set', false, index)
-          r1 = instantiate_node(SyntaxNode,input, index...(index + 3))
-          @index += 3
+        if s1.last
+          r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+          r1.extend(EnvironmentVariableNameValue1)
         else
-          terminal_parse_failure('set')
+          @index = i1
           r1 = nil
         end
-        s0 << r1
         if r1
-          s2, i2 = [], index
+          r0 = r1
+        else
+          i12, s12 = index, []
+          s13, i13 = [], index
           loop do
-            r3 = _nt_ws_or_comment
-            if r3
-              s2 << r3
+            if has_terminal?('\G[^\\s#\\\\\']', true, index)
+              r14 = true
+              @index += 1
+            else
+              r14 = nil
+            end
+            if r14
+              s13 << r14
             else
               break
             end
           end
-          if s2.empty?
-            @index = i2
-            r2 = nil
+          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(EnvironmentVariableNameValue2)
+                  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(EnvironmentVariableNameValue3)
           else
-            r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+            @index = i12
+            r12 = nil
           end
-          s0 << r2
-          if r2
-            s4, i4 = [], index
+          if r12
+            r0 = r12
+          else
+            s23, i23 = [], index
             loop do
-              if has_terminal?('\G[\\S]', true, index)
-                r5 = true
+              if has_terminal?('\G[^\\s#]', true, index)
+                r24 = true
                 @index += 1
               else
-                r5 = nil
+                r24 = nil
               end
-              if r5
-                s4 << r5
+              if r24
+                s23 << r24
               else
                 break
               end
             end
-            if s4.empty?
-              @index = i4
-              r4 = nil
+            if s23.empty?
+              @index = i23
+              r23 = nil
             else
-              r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+              r23 = instantiate_node(SyntaxNode,input, i23...index, s23)
+            end
+            if r23
+              r0 = r23
+            else
+              @index = i0
+              r0 = nil
             end
-            s0 << r4
           end
         end
-        if s0.last
-          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-          r0.extend(Set0)
-          r0.extend(Set1)
-        else
-          @index = i0
-          r0 = nil
-        end
 
-        node_cache[:set][start_index] = r0
+        node_cache[:environment_variable_name_value][start_index] = r0
 
         r0
       end
@@ -1296,14 +1600,16 @@ module Fig
           elements[0]
         end
 
-        def string
+        def command_line
           elements[2]
         end
       end
 
       module Command1
         def to_config_statement(build_state)
-          return build_state.new_command_statement(statement_start, string)
+          return build_state.new_command_statement(
+            statement_start, command_line
+          )
         end
       end
 
@@ -1345,7 +1651,7 @@ module Fig
           end
           s0 << r2
           if r2
-            r4 = _nt_string
+            r4 = _nt_command_line
             s0 << r4
           end
         end
@@ -1363,17 +1669,17 @@ module Fig
         r0
       end
 
-      module String0
+      module CommandLine0
         def value
           elements[1]
         end
 
       end
 
-      def _nt_string
+      def _nt_command_line
         start_index = index
-        if node_cache[:string].has_key?(index)
-          cached = node_cache[:string][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
@@ -1420,13 +1726,13 @@ module Fig
         end
         if s0.last
           r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-          r0.extend(String0)
+          r0.extend(CommandLine0)
         else
           @index = i0
           r0 = nil
         end
 
-        node_cache[:string][start_index] = r0
+        node_cache[:command_line][start_index] = r0
 
         r0
       end
@@ -1444,7 +1750,7 @@ module Fig
 
         s0, i0 = [], index
         loop do
-          if has_terminal?('\G[\\S]', true, index)
+          if has_terminal?('\G[^\\s#]', true, index)
             r1 = true
             @index += 1
           else