fig 1.22.0 → 1.22.1.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca015854b687910a5db05ec703dfcb8edb7ae1e0
-  data.tar.gz: f5d0d6e2d1d910ab3e730f9cfba39780984553c0
+  metadata.gz: 41b856ed8d7e652bfe33d35e21562d23796d4540
+  data.tar.gz: 10cd044b454eea222d662d29c15a7439d2438d95
 SHA512:
-  metadata.gz: 53df01cee0ba8dc7edc8d5eda77367e6f4c9998a6c251940a404c1ce72c3c7cdd4a4d25740786eafebd1d1b8e383db5aa1c9ebe23d61d21acd072ee136ef5a72
-  data.tar.gz: abd26e9f6cf416cdc2f0c8c877bd0d74c31a8c89966ae8c819e6c94e342fd47fb8eda4de15cc062df2e176cfbc2e7baebe5978fad39ebc236be83c5b30d935ae
+  metadata.gz: 54def14e8dbaac94e63a79a6bc65fab9104f078e21387812f75401910cfa9382463a4c8cd20a6e34b40b0abfe9c97a5edba7c8c35e322f8f538a5793c134654e
+  data.tar.gz: c05690e45a5f453fae00f4bb92cabe4be1a909c0a4f5b632afb84c869efbfc45596dd7ab9e68d3f56a4e1bcb2b0c5be23bd0fba38abfb003b88721760c8376c8

data/Changes

@@ -1,3 +1,16 @@
+v1.22.1.beta.1 - 2014/12/17
+
+  Bug fixes:
+
+  - Net::SSH::Prompt turns off HighLine's EOF detection.  We turn it back on
+    because, otherwise, prompting for credentials barfs when there's no input
+    available from STDIN, e.g. on a continuous integration server.
+
+  Miscellaneous:
+
+  - More tweaks of --options and --help-long output.
+  - Upgraded dependencies.
+
 v1.22.0 - 2014/11/20
 
   New features:

data/lib/fig.rb

@@ -1,3 +1,3 @@
 module Fig
-  VERSION = '1.22.0'
+  VERSION = '1.22.1.beta.1'
 end

data/lib/fig/command/options.rb

@@ -370,7 +370,7 @@ Running commands:
 
     @parser.on(
       '--run-command-statement',
-      'run the command in even in package definition file (i.e. no descriptor)'
+      'run the command in package definition file (i.e. with no package descriptor specified)'
     ) do
       set_base_action(Fig::Command::Action::RunCommandStatement)
     end
@@ -561,7 +561,7 @@ Running commands:
 
   def set_up_listings()
     @parser.separator ''
-    @parser.separator 'Listings:'
+    @parser.separator 'Querying repository contents:'
 
     option_mapping = {
       :local_packages => [
@@ -569,6 +569,25 @@ Running commands:
         Fig::Command::Action::ListLocal
       ],
 
+      :remote_packages => [
+        ['--list-remote', 'list packages in remote repository'],
+        Fig::Command::Action::ListRemote
+      ],
+    }
+
+    option_mapping.each_pair do
+      | type, specification_action_class |
+
+      specification, action_class = *specification_action_class
+      @parser.on(*specification) do
+        set_base_action(action_class)
+      end
+    end
+
+    @parser.separator ''
+    @parser.separator 'Querying package data:'
+
+    option_mapping = {
       :configs => [
         ['--list-configs', 'list configurations'],
         Fig::Command::Action::ListConfigs
@@ -586,11 +605,6 @@ Running commands:
         ],
         Fig::Command::Action::ListVariables
       ],
-
-      :remote_packages => [
-        ['--list-remote', 'list packages in remote repo'],
-        Fig::Command::Action::ListRemote
-      ],
     }
 
     option_mapping.each_pair do

data/lib/fig/grammar/base.rb

@@ -19,7 +19,7 @@ module Fig
         if node_cache[:ws].has_key?(index)
           cached = node_cache[:ws][index]
           if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            node_cache[:ws][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
@@ -27,10 +27,11 @@ module Fig
 
         s0, i0 = [], index
         loop do
-          if has_terminal?('\G[ \\n\\r\\t]', true, index)
+          if has_terminal?(@regexps[gr = '\A[ \\n\\r\\t]'] ||= Regexp.new(gr), :regexp, index)
             r1 = true
             @index += 1
           else
+            terminal_parse_failure('[ \\n\\r\\t]')
             r1 = nil
           end
           if r1
@@ -56,7 +57,7 @@ module Fig
         if node_cache[:optional_ws].has_key?(index)
           cached = node_cache[:optional_ws][index]
           if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            node_cache[:optional_ws][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
@@ -64,10 +65,11 @@ module Fig
 
         s0, i0 = [], index
         loop do
-          if has_terminal?('\G[ \\n\\r\\t]', true, index)
+          if has_terminal?(@regexps[gr = '\A[ \\n\\r\\t]'] ||= Regexp.new(gr), :regexp, index)
             r1 = true
             @index += 1
           else
+            terminal_parse_failure('[ \\n\\r\\t]')
             r1 = nil
           end
           if r1
@@ -91,16 +93,16 @@ module Fig
         if node_cache[:comment].has_key?(index)
           cached = node_cache[:comment][index]
           if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            node_cache[:comment][index] = 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
+        if (match_len = has_terminal?('#', false, index))
+          r1 = true
+          @index += match_len
         else
           terminal_parse_failure('#')
           r1 = nil
@@ -109,10 +111,11 @@ module Fig
         if r1
           s2, i2 = [], index
           loop do
-            if has_terminal?('\G[^\\n]', true, index)
+            if has_terminal?(@regexps[gr = '\A[^\\n]'] ||= Regexp.new(gr), :regexp, index)
               r3 = true
               @index += 1
             else
+              terminal_parse_failure('[^\\n]')
               r3 = nil
             end
             if r3
@@ -124,9 +127,9 @@ module Fig
           r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
           s0 << r2
           if r2
-            if has_terminal?("\n", false, index)
-              r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
-              @index += 1
+            if (match_len = has_terminal?("\n", false, index))
+              r4 = true
+              @index += match_len
             else
               terminal_parse_failure("\n")
               r4 = nil
@@ -152,7 +155,7 @@ module Fig
         if node_cache[:ws_or_comment].has_key?(index)
           cached = node_cache[:ws_or_comment][index]
           if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            node_cache[:ws_or_comment][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
@@ -161,10 +164,12 @@ module Fig
         i0 = index
         r1 = _nt_ws
         if r1
+          r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
           r0 = r1
         else
           r2 = _nt_comment
           if r2
+            r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
             r0 = r2
           else
             @index = i0
@@ -182,7 +187,7 @@ module Fig
         if node_cache[:optional_ws_or_comment].has_key?(index)
           cached = node_cache[:optional_ws_or_comment][index]
           if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            node_cache[:optional_ws_or_comment][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached

data/lib/fig/grammar/v0.rb

@@ -63,7 +63,7 @@ module Fig
         if node_cache[:package].has_key?(index)
           cached = node_cache[:package][index]
           if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            node_cache[:package][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
@@ -130,7 +130,7 @@ module Fig
         if node_cache[:package_statement].has_key?(index)
           cached = node_cache[:package_statement][index]
           if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            node_cache[:package_statement][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
@@ -139,18 +139,22 @@ module Fig
         i0 = index
         r1 = _nt_archive
         if r1
+          r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
           r0 = r1
         else
           r2 = _nt_resource
           if r2
+            r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
             r0 = r2
           else
             r3 = _nt_retrieve
             if r3
+              r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
               r0 = r3
             else
               r4 = _nt_config
               if r4
+                r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
                 r0 = r4
               else
                 @index = i0
@@ -188,16 +192,16 @@ module Fig
         if node_cache[:archive].has_key?(index)
           cached = node_cache[:archive][index]
           if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            node_cache[:archive][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
         end
 
         i0, s0 = index, []
-        if has_terminal?('archive', false, index)
-          r1 = instantiate_node(SyntaxNode,input, index...(index + 7))
-          @index += 7
+        if (match_len = has_terminal?('archive', false, index))
+          r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
           terminal_parse_failure('archive')
           r1 = nil
@@ -262,16 +266,16 @@ module Fig
         if node_cache[:resource].has_key?(index)
           cached = node_cache[:resource][index]
           if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            node_cache[:resource][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
         end
 
         i0, s0 = index, []
-        if has_terminal?('resource', false, index)
-          r1 = instantiate_node(SyntaxNode,input, index...(index + 8))
-          @index += 8
+        if (match_len = has_terminal?('resource', false, index))
+          r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
           terminal_parse_failure('resource')
           r1 = nil
@@ -341,16 +345,16 @@ module Fig
         if node_cache[:retrieve].has_key?(index)
           cached = node_cache[:retrieve][index]
           if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            node_cache[:retrieve][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
         end
 
         i0, s0 = index, []
-        if has_terminal?('retrieve', false, index)
-          r1 = instantiate_node(SyntaxNode,input, index...(index + 8))
-          @index += 8
+        if (match_len = has_terminal?('retrieve', false, index))
+          r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
           terminal_parse_failure('retrieve')
           r1 = nil
@@ -377,9 +381,9 @@ module Fig
             r4 = _nt_environment_variable_name
             s0 << r4
             if r4
-              if has_terminal?('->', false, index)
-                r5 = instantiate_node(SyntaxNode,input, index...(index + 2))
-                @index += 2
+              if (match_len = has_terminal?('->', false, index))
+                r5 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                @index += match_len
               else
                 terminal_parse_failure('->')
                 r5 = nil
@@ -452,16 +456,16 @@ module Fig
         if node_cache[:config].has_key?(index)
           cached = node_cache[:config][index]
           if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            node_cache[:config][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
         end
 
         i0, s0 = index, []
-        if has_terminal?('config', false, index)
-          r1 = instantiate_node(SyntaxNode,input, index...(index + 6))
-          @index += 6
+        if (match_len = has_terminal?('config', false, index))
+          r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
           terminal_parse_failure('config')
           r1 = nil
@@ -517,9 +521,9 @@ module Fig
                 r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
                 s0 << r7
                 if r7
-                  if has_terminal?('end', false, index)
-                    r9 = instantiate_node(SyntaxNode,input, index...(index + 3))
-                    @index += 3
+                  if (match_len = has_terminal?('end', false, index))
+                    r9 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                    @index += match_len
                   else
                     terminal_parse_failure('end')
                     r9 = nil
@@ -567,7 +571,7 @@ module Fig
         if node_cache[:config_statement].has_key?(index)
           cached = node_cache[:config_statement][index]
           if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            node_cache[:config_statement][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
@@ -576,22 +580,27 @@ module Fig
         i0 = index
         r1 = _nt_override
         if r1
+          r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
           r0 = r1
         else
           r2 = _nt_include
           if r2
+            r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
             r0 = r2
           else
             r3 = _nt_command
             if r3
+              r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
               r0 = r3
             else
               r4 = _nt_path
               if r4
+                r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
                 r0 = r4
               else
                 r5 = _nt_set
                 if r5
+                  r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
                   r0 = r5
                 else
                   @index = i0
@@ -631,16 +640,16 @@ module Fig
         if node_cache[:include].has_key?(index)
           cached = node_cache[:include][index]
           if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            node_cache[:include][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
         end
 
         i0, s0 = index, []
-        if has_terminal?('include', false, index)
-          r1 = instantiate_node(SyntaxNode,input, index...(index + 7))
-          @index += 7
+        if (match_len = has_terminal?('include', false, index))
+          r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
           terminal_parse_failure('include')
           r1 = nil
@@ -724,16 +733,16 @@ module Fig
         if node_cache[:override].has_key?(index)
           cached = node_cache[:override][index]
           if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            node_cache[:override][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
         end
 
         i0, s0 = index, []
-        if has_terminal?('override', false, index)
-          r1 = instantiate_node(SyntaxNode,input, index...(index + 8))
-          @index += 8
+        if (match_len = has_terminal?('override', false, index))
+          r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
           terminal_parse_failure('override')
           r1 = nil
@@ -817,16 +826,16 @@ module Fig
         if node_cache[:set].has_key?(index)
           cached = node_cache[:set][index]
           if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            node_cache[:set][index] = 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
+        if (match_len = has_terminal?('set', false, index))
+          r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
           terminal_parse_failure('set')
           r1 = nil
@@ -910,7 +919,7 @@ module Fig
         if node_cache[:path].has_key?(index)
           cached = node_cache[:path][index]
           if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            node_cache[:path][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
@@ -918,34 +927,37 @@ module Fig
 
         i0, s0 = index, []
         i1 = index
-        if has_terminal?('add', false, index)
-          r2 = instantiate_node(SyntaxNode,input, index...(index + 3))
-          @index += 3
+        if (match_len = has_terminal?('add', false, index))
+          r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
           terminal_parse_failure('add')
           r2 = nil
         end
         if r2
+          r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
           r1 = r2
         else
-          if has_terminal?('append', false, index)
-            r3 = instantiate_node(SyntaxNode,input, index...(index + 6))
-            @index += 6
+          if (match_len = has_terminal?('append', false, index))
+            r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+            @index += match_len
           else
             terminal_parse_failure('append')
             r3 = nil
           end
           if r3
+            r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
             r1 = r3
           else
-            if has_terminal?('path', false, index)
-              r4 = instantiate_node(SyntaxNode,input, index...(index + 4))
-              @index += 4
+            if (match_len = has_terminal?('path', false, index))
+              r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+              @index += match_len
             else
               terminal_parse_failure('path')
               r4 = nil
             end
             if r4
+              r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
               r1 = r4
             else
               @index = i1
@@ -1032,16 +1044,16 @@ module Fig
         if node_cache[:command].has_key?(index)
           cached = node_cache[:command][index]
           if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            node_cache[:command][index] = 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
+        if (match_len = has_terminal?('command', false, index))
+          r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
           terminal_parse_failure('command')
           r1 = nil
@@ -1109,16 +1121,16 @@ module Fig
         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
+            node_cache[:command_line][index] = 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
+        if (match_len = has_terminal?('"', false, index))
+          r1 = true
+          @index += match_len
         else
           terminal_parse_failure('"')
           r1 = nil
@@ -1127,10 +1139,11 @@ module Fig
         if r1
           s2, i2 = [], index
           loop do
-            if has_terminal?('\G[^"]', true, index)
+            if has_terminal?(@regexps[gr = '\A[^"]'] ||= Regexp.new(gr), :regexp, index)
               r3 = true
               @index += 1
             else
+              terminal_parse_failure('[^"]')
               r3 = nil
             end
             if r3
@@ -1142,9 +1155,9 @@ module Fig
           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
+            if (match_len = has_terminal?('"', false, index))
+              r4 = true
+              @index += match_len
             else
               terminal_parse_failure('"')
               r4 = nil
@@ -1170,7 +1183,7 @@ module Fig
         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
+            node_cache[:descriptor_string][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
@@ -1178,10 +1191,11 @@ module Fig
 
         s0, i0 = [], index
         loop do
-          if has_terminal?('\G[\\S]', true, index)
+          if has_terminal?(@regexps[gr = '\A[\\S]'] ||= Regexp.new(gr), :regexp, index)
             r1 = true
             @index += 1
           else
+            terminal_parse_failure('[\\S]')
             r1 = nil
           end
           if r1
@@ -1207,7 +1221,7 @@ module Fig
         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
+            node_cache[:config_name][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
@@ -1215,10 +1229,11 @@ module Fig
 
         s0, i0 = [], index
         loop do
-          if has_terminal?('\G[a-zA-Z0-9_.-]', true, index)
+          if has_terminal?(@regexps[gr = '\A[a-zA-Z0-9_.-]'] ||= Regexp.new(gr), :regexp, index)
             r1 = true
             @index += 1
           else
+            terminal_parse_failure('[a-zA-Z0-9_.-]')
             r1 = nil
           end
           if r1
@@ -1244,7 +1259,7 @@ module Fig
         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
+            node_cache[:environment_variable_name][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
@@ -1252,10 +1267,11 @@ module Fig
 
         s0, i0 = [], index
         loop do
-          if has_terminal?('\G[a-zA-Z0-9_]', true, index)
+          if has_terminal?(@regexps[gr = '\A[a-zA-Z0-9_]'] ||= Regexp.new(gr), :regexp, index)
             r1 = true
             @index += 1
           else
+            terminal_parse_failure('[a-zA-Z0-9_]')
             r1 = nil
           end
           if r1
@@ -1281,7 +1297,7 @@ module Fig
         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
+            node_cache[:environment_variable_name_value][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
@@ -1289,10 +1305,11 @@ module Fig
 
         s0, i0 = [], index
         loop do
-          if has_terminal?('\G[\\S]', true, index)
+          if has_terminal?(@regexps[gr = '\A[\\S]'] ||= Regexp.new(gr), :regexp, index)
             r1 = true
             @index += 1
           else
+            terminal_parse_failure('[\\S]')
             r1 = nil
           end
           if r1
@@ -1338,7 +1355,7 @@ module Fig
         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
+            node_cache[:asset_location][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
@@ -1348,10 +1365,11 @@ module Fig
         i1, s1 = index, []
         s2, i2 = [], index
         loop do
-          if has_terminal?('\G[^@\'"<>|\\s]', true, index)
+          if has_terminal?(@regexps[gr = '\A[^@\'"<>|\\s]'] ||= Regexp.new(gr), :regexp, index)
             r3 = true
             @index += 1
           else
+            terminal_parse_failure('[^@\'"<>|\\s]')
             r3 = nil
           end
           if r3
@@ -1379,12 +1397,13 @@ module Fig
           r1 = nil
         end
         if r1
+          r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
           r0 = r1
         else
           i5, s5 = index, []
-          if has_terminal?('"', false, index)
-            r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
-            @index += 1
+          if (match_len = has_terminal?('"', false, index))
+            r6 = true
+            @index += match_len
           else
             terminal_parse_failure('"')
             r6 = nil
@@ -1393,10 +1412,11 @@ module Fig
           if r6
             s7, i7 = [], index
             loop do
-              if has_terminal?('\G[^@\'"<>|*?\\[\\]{}\\s]', true, index)
+              if has_terminal?(@regexps[gr = '\A[^@\'"<>|*?\\[\\]{}\\s]'] ||= Regexp.new(gr), :regexp, index)
                 r8 = true
                 @index += 1
               else
+                terminal_parse_failure('[^@\'"<>|*?\\[\\]{}\\s]')
                 r8 = nil
               end
               if r8
@@ -1413,9 +1433,9 @@ module Fig
             end
             s5 << r7
             if r7
-              if has_terminal?('"', false, index)
-                r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                @index += 1
+              if (match_len = has_terminal?('"', false, index))
+                r9 = true
+                @index += match_len
               else
                 terminal_parse_failure('"')
                 r9 = nil
@@ -1435,6 +1455,7 @@ module Fig
             r5 = nil
           end
           if r5
+            r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
             r0 = r5
           else
             @index = i0
@@ -1452,7 +1473,7 @@ module Fig
         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
+            node_cache[:retrieve_path][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
@@ -1460,10 +1481,11 @@ module Fig
 
         s0, i0 = [], index
         loop do
-          if has_terminal?('\G[a-zA-Z0-9_/.\\[\\]-]', true, index)
+          if has_terminal?(@regexps[gr = '\A[a-zA-Z0-9_/.\\[\\]-]'] ||= Regexp.new(gr), :regexp, index)
             r1 = true
             @index += 1
           else
+            terminal_parse_failure('[a-zA-Z0-9_/.\\[\\]-]')
             r1 = nil
           end
           if r1