[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.6-1-356-g5718585

James Turnbull james at lovedthanlost.net
Fri Jan 23 14:21:16 UTC 2009


The following commit has been merged in the master branch:
commit 750e9abc64af58e547e7b1ad5698c71feb071bf6
Author: Brice Figureau <brice-puppet at daysofwonder.com>
Date:   Sat Oct 4 16:27:51 2008 +0200

    Fix #381 - Allow multiple resource overrides or references
    
    Allow this syntax:
    Resource[title1,title2] { param => value }
    as a compact form of
    Resource[title1] { param => value }
    Resource[title2] { param => value }
    
    This patch also introduces for free the possibility to group
    class references by type:
    
    exec {
    	test:
    		require => File["file1","file2","File3"]
    }
    
    which is completely equivalent to:
    
    exec {
    	test:
    		require => [ File["file1"],File["file2"],File["File3"] ]
    }

diff --git a/lib/puppet/parser/ast/resource_override.rb b/lib/puppet/parser/ast/resource_override.rb
index f9464ac..8380dcd 100644
--- a/lib/puppet/parser/ast/resource_override.rb
+++ b/lib/puppet/parser/ast/resource_override.rb
@@ -19,7 +19,7 @@ class Puppet::Parser::AST
         # in the current scope.
         def evaluate(scope)
             # Get our object reference.
-            object = @object.safeevaluate(scope)
+            resource = @object.safeevaluate(scope)
 
             hash = {}
 
@@ -30,21 +30,28 @@ class Puppet::Parser::AST
 
             # Now we just create a normal resource, but we call a very different
             # method on the scope.
-            obj = Puppet::Parser::Resource.new(
-                :type => object.type,
-                :title => object.title,
-                :params => params,
-                :file => @file,
-                :line => @line,
-                :source => scope.source,
-                :scope => scope
-            )
-
-            # Now we tell the scope that it's an override, and it behaves as
-            # necessary.
-            scope.compiler.add_override(obj)
-
-            obj
+            resource = [resource] unless resource.is_a?(Array)
+            
+            resource = resource.collect do |r|
+                res = Puppet::Parser::Resource.new(
+                    :type => r.type,
+                    :title => r.title,
+                    :params => params,
+                    :file => @file,
+                    :line => @line,
+                    :source => scope.source,
+                    :scope => scope
+                )
+
+                # Now we tell the scope that it's an override, and it behaves as
+                # necessary.
+                scope.compiler.add_override(res)
+
+                res
+            end
+            # decapsulate array in case of only one item
+            return resource.pop if resource.length == 1
+            return resource
         end
 
         # Create our ResourceDef.  Handles type checking for us.
diff --git a/lib/puppet/parser/ast/resource_reference.rb b/lib/puppet/parser/ast/resource_reference.rb
index 4bb4116..e5e2dce 100644
--- a/lib/puppet/parser/ast/resource_reference.rb
+++ b/lib/puppet/parser/ast/resource_reference.rb
@@ -24,16 +24,20 @@ class Puppet::Parser::AST
         # and name.
         def evaluate(scope)
             title = @title.safeevaluate(scope)
+            title = [title] unless title.is_a?(Array)
+            
             if @type.to_s.downcase == "class"
-                objtype = "class"
-                title = qualified_class(scope, title)
+                resource_type = "class"
+                title = title.collect { |t| qualified_class(scope, t) }
             else
-                objtype = qualified_type(scope)
+                resource_type = qualified_type(scope)
             end
 
-            return Puppet::Parser::Resource::Reference.new(
-                :type => objtype, :title => title
-            )
+            title = title.collect { |t| Puppet::Parser::Resource::Reference.new(
+                :type => resource_type, :title => t
+            ) }
+            return title.pop if title.length == 1
+            return title
         end
 
         # Look up a fully qualified class name.
diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra
index b44cd06..affcc00 100644
--- a/lib/puppet/parser/grammar.ra
+++ b/lib/puppet/parser/grammar.ra
@@ -400,10 +400,10 @@ boolean:    BOOLEAN {
     result = ast AST::Boolean, :value => val[0]
 }
 
-resourceref: NAME LBRACK rvalue RBRACK {
+resourceref: NAME LBRACK rvalues RBRACK {
     Puppet.warning addcontext("Deprecation notice:  Resource references should now be capitalized")
     result = ast AST::ResourceReference, :type => val[0], :title => val[2]
-}               | classref LBRACK rvalue RBRACK {
+}               | classref LBRACK rvalues RBRACK {
     result = ast AST::ResourceReference, :type => val[0], :title => val[2]
 }
 
diff --git a/lib/puppet/parser/parser.rb b/lib/puppet/parser/parser.rb
index b8aa4b5..3858d21 100644
--- a/lib/puppet/parser/parser.rb
+++ b/lib/puppet/parser/parser.rb
@@ -29,7 +29,7 @@ module Puppet
 
     class Parser < Racc::Parser
 
-module_eval <<'..end grammar.ra modeval..id272fb19b12', 'grammar.ra', 717
+module_eval <<'..end grammar.ra modeval..id9567389388', 'grammar.ra', 717
 
 # It got too annoying having code in a file that needs to be compiled.
 require 'puppet/parser/parser_support'
@@ -41,7 +41,7 @@ require 'puppet/parser/parser_support'
 
 # $Id$
 
-..end grammar.ra modeval..id272fb19b12
+..end grammar.ra modeval..id9567389388
 
 ##### racc 1.4.5 generates ###
 
@@ -244,42 +244,42 @@ racc_shift_n = 314
 
 racc_action_table = [
     75,    54,    57,   270,   178,    39,    40,   283,    88,   237,
-    51,   178,    89,   238,   244,   282,   286,   235,   236,   245,
-    72,    75,    54,    57,   135,    90,    39,    40,   235,   236,
-   135,    45,    39,    40,   129,    56,    59,   235,   236,    66,
+    51,   178,    89,   213,   244,   282,   286,   198,   199,   245,
+    72,    75,    54,    57,   136,    90,    39,    40,   235,   236,
+   136,    45,    39,    40,   129,    56,    59,   235,   236,    66,
     41,    72,   154,    44,    52,    76,   177,   162,    62,    92,
    146,    84,    45,    75,    54,    57,    56,    59,    45,   126,
-    66,    41,   178,   167,    44,    52,    76,    41,   188,    62,
-    44,   249,    84,    72,    75,    54,    57,   288,   156,   157,
-   158,   144,   145,   147,    45,   198,    54,    57,    56,    59,
-   287,   233,    66,     8,    72,   154,  -141,    52,    76,   232,
-   162,    62,   137,   146,    84,    45,    75,    54,    57,    56,
-    59,    45,   252,    66,    37,   105,   167,    37,    52,    76,
-   183,     4,    62,    37,     4,    84,    72,    75,    54,    57,
-     4,   156,   157,   158,   144,   145,   147,    45,  -143,   211,
-   256,    56,    59,   212,   213,    66,   136,    72,   154,   258,
-    52,    76,   161,   162,    62,   161,   146,    84,    45,    75,
-    54,    57,    56,    59,    45,   244,    66,    54,    57,   167,
-   245,    52,    76,    33,    34,    62,   212,   296,    84,    72,
-    75,    54,    57,  -145,   156,   157,   158,   144,   145,   147,
-    45,   158,   144,   135,    56,    59,   158,   144,    66,    51,
-    72,   154,   263,    52,    76,  -146,   162,    62,   266,   146,
-    84,    45,    75,    54,    57,    56,    59,    45,  -142,    66,
-   229,  -142,   167,  -147,    52,    76,    88,  -144,    62,  -146,
-  -141,    84,    72,    75,    54,    57,   134,   156,   157,   158,
-   144,   145,   147,    45,  -158,  -145,   132,    56,    59,  -143,
-   161,    66,   269,    72,    37,   172,    52,    76,   173,   108,
-    62,     4,     8,    84,    45,    89,   105,   174,    56,    59,
-   155,   284,    66,   156,   157,   158,   144,    52,    76,   150,
-   154,    62,   285,  -144,    84,   180,   100,   184,   146,   148,
-   151,   153,   188,   186,    75,    54,    57,   156,   157,   158,
-   144,   145,   147,   156,   157,   158,   144,   145,   147,  -141,
-   196,   299,   149,   152,    72,  -141,   156,   157,   158,   144,
-   145,   147,  -144,  -142,  -146,    45,    75,    54,    57,    56,
-    59,  -143,   300,    66,   156,   157,   158,   144,    52,    76,
-   188,    71,    62,   193,   191,    84,    72,    75,    54,    57,
-    38,  -143,   307,  -190,   308,    35,   189,    45,  -142,  -144,
-   nil,    56,    59,   nil,   nil,    66,   nil,    72,   nil,   nil,
+    66,    41,   249,   167,    44,    52,    76,    41,  -141,    62,
+    44,   138,    84,    72,    75,    54,    57,   288,   156,   157,
+   158,   144,   145,   147,    45,   201,   158,   144,    56,    59,
+   287,   233,    66,     8,    72,   154,   252,    52,    76,   232,
+   162,    62,   105,   146,    84,    45,    75,    54,    57,    56,
+    59,    45,  -143,    66,    37,   244,   167,    37,    52,    76,
+   245,     4,    62,   256,     4,    84,    72,    75,    54,    57,
+   137,   156,   157,   158,   144,   145,   147,    45,   258,   197,
+   161,    56,    59,   198,   199,    66,   161,    72,   154,  -145,
+    52,    76,   136,   162,    62,  -146,   146,    84,    45,    75,
+    54,    57,    56,    59,    45,    51,    66,    37,   264,   167,
+   183,    52,    76,  -142,     4,    62,   158,   144,    84,    72,
+    75,    54,    57,   267,   156,   157,   158,   144,   145,   147,
+    45,   178,   238,   188,    56,    59,   235,   236,    66,  -142,
+    72,   154,    88,    52,    76,  -144,   162,    62,  -147,   146,
+    84,    45,    75,    54,    57,    56,    59,    45,  -141,    66,
+    33,    34,   167,   135,    52,    76,    54,    57,    62,   198,
+   296,    84,    72,    75,    54,    57,  -158,   156,   157,   158,
+   144,   145,   147,    45,  -146,   229,   132,    56,    59,   198,
+   199,    66,  -145,    72,    37,  -143,    52,    76,    54,    57,
+    62,     4,     8,    84,    45,   269,   161,   172,    56,    59,
+   155,   108,    66,   156,   157,   158,   144,    52,    76,   150,
+   154,    62,   173,   105,    84,    89,   284,   285,   146,   148,
+   151,   153,  -144,   174,    75,    54,    57,   156,   157,   158,
+   144,   145,   147,   156,   157,   158,   144,   145,   147,   100,
+   180,   188,   149,   152,    72,   184,   156,   157,   158,   144,
+   145,   147,   186,  -141,   299,    45,    75,    54,    57,    56,
+    59,  -141,  -144,    66,   156,   157,   158,   144,    52,    76,
+  -142,  -146,    62,  -143,   300,    84,    72,    75,    54,    57,
+   188,    71,   193,   191,    38,  -143,   307,    45,  -190,   308,
+    35,    56,    59,   189,  -142,    66,  -144,    72,   nil,   nil,
     52,    76,   nil,   nil,    62,   nil,   nil,    84,    45,    75,
     54,    57,    56,    59,   nil,   nil,    66,   nil,   nil,   nil,
    nil,    52,    76,   nil,   nil,    62,   nil,   nil,    84,    72,
@@ -298,14 +298,14 @@ racc_action_table = [
     56,    59,   nil,   nil,    66,   nil,    72,   nil,   nil,    52,
     76,   nil,   nil,    62,   nil,   nil,    84,    45,    75,    54,
     57,    56,    59,   nil,   nil,    66,   nil,   nil,    45,   nil,
-    52,    76,    56,   116,    62,   nil,    66,    84,    72,   nil,
-   nil,   111,    75,    54,    57,    62,   nil,   nil,   nil,    45,
+    52,    76,    56,    59,    62,   nil,    66,    84,    72,   nil,
+   nil,    52,    75,    54,    57,    62,   nil,   nil,   nil,    45,
    nil,   nil,   nil,    56,    59,   nil,   nil,    66,    75,    54,
-    57,   141,    52,    76,   nil,   nil,    62,   nil,   nil,    84,
-   nil,   nil,   nil,    45,    75,    54,    57,    56,    59,   nil,
-   nil,    66,   nil,   nil,   nil,   nil,    52,   nil,   nil,    45,
+    57,   nil,    52,    76,   nil,   nil,    62,   nil,   nil,    84,
+   nil,   nil,   nil,    45,    75,    54,    57,    56,   116,   nil,
+   nil,    66,   nil,   nil,   nil,   nil,   111,   nil,   nil,    45,
     62,   nil,   nil,    56,    59,   nil,   nil,    66,    75,    54,
-    57,   nil,    52,   nil,   nil,    45,    62,   nil,   nil,    56,
+    57,   141,    52,   nil,   nil,    45,    62,   nil,   nil,    56,
     59,   nil,   nil,    66,    75,    54,    57,   nil,    52,   nil,
    nil,   nil,    62,   nil,    75,    54,    57,   nil,   nil,    45,
     75,    54,    57,    56,    59,   nil,   nil,    66,   nil,   nil,
@@ -313,63 +313,55 @@ racc_action_table = [
     59,   nil,   nil,    66,   nil,    45,   nil,   nil,    52,    56,
     59,    45,    62,    66,   nil,    56,    59,   nil,    52,    66,
    nil,   nil,    62,   nil,    52,    75,    54,    57,    62,   nil,
-   nil,    51,    54,    57,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    75,    54,    57,   nil,   nil,   nil,    75,    54,    57,
-   nil,    48,   nil,   nil,   nil,   nil,    45,    75,    54,    57,
-    56,    59,    45,   nil,    66,   nil,    56,    59,   nil,    52,
-    66,   nil,    45,    62,    49,    52,    56,    59,    45,    62,
-    66,   nil,    56,   195,   nil,    52,    66,   nil,    45,    62,
-   nil,   111,    56,    59,   nil,    62,    66,    54,    57,    54,
-    57,    52,   nil,   nil,   nil,    62,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    54,    57,    54,    57,   nil,   nil,   281,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    45,   nil,    45,
-   nil,    56,   195,    56,   195,    66,   nil,    66,    54,    57,
-   111,   nil,   111,    45,    62,    45,    62,    56,   195,    56,
-   195,    66,   nil,    66,   nil,    49,   111,   nil,   111,   nil,
-    62,   nil,    62,    54,    57,    54,    57,   nil,    45,   nil,
-   nil,   nil,    56,   195,   nil,   nil,    66,   nil,   nil,    54,
-    57,   111,   nil,   nil,   nil,    62,    54,    57,   nil,   205,
-   nil,   nil,   nil,    45,   nil,    45,   nil,    56,   195,    56,
-   195,    66,   nil,    66,   nil,   nil,   111,   nil,   111,    45,
-    62,   nil,    62,    56,   195,   nil,    45,    66,    54,    57,
-    56,   195,   111,   nil,    66,   nil,    62,   nil,   nil,   111,
-   nil,   nil,   nil,    62,    54,    57,   nil,   nil,   131,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    45,   nil,
-   nil,   nil,    56,    59,   200,   nil,    66,   nil,   nil,   nil,
-    49,    52,   nil,   nil,    45,    62,   nil,   nil,    56,    59,
-   nil,   nil,    66,   150,   154,   nil,    49,    52,   nil,   nil,
-   nil,    62,   146,   148,   151,   153,   150,   154,   nil,   nil,
-   nil,   nil,   nil,   nil,   209,   146,   148,   151,   153,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   156,   157,   158,   144,   145,   147,   nil,   nil,   nil,   149,
-   152,   150,   154,   156,   157,   158,   144,   145,   147,   nil,
+   nil,    75,    54,    57,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    51,    54,    57,   nil,   nil,
+   nil,    75,    54,    57,   nil,   nil,    45,   nil,   nil,   nil,
+    56,    59,    45,   nil,    66,    48,    56,    59,   nil,    52,
+    66,    54,    57,    62,   nil,    52,    45,    54,    57,    62,
+    56,    59,    45,   nil,    66,   nil,    56,   195,    49,    52,
+    66,    54,    57,    62,   nil,   111,    75,    54,    57,    62,
+   nil,    45,   nil,   nil,   nil,    56,   195,    45,   nil,    66,
+   nil,    56,   195,   nil,   111,    66,    54,    57,    62,   nil,
+   111,    45,    54,    57,    62,    56,   195,    45,   nil,    66,
+   nil,    56,    59,   nil,   111,    66,   nil,   nil,    62,   nil,
+    52,    54,    57,   nil,    62,   281,    45,    54,    57,   nil,
+    56,   195,    45,   nil,    66,   nil,    56,   195,    49,   111,
+    66,    54,    57,    62,   nil,   111,   nil,    54,    57,    62,
+   208,    45,   nil,   nil,   nil,    56,   195,    45,   nil,    66,
+   nil,    56,   195,   nil,   111,    66,    54,    57,    62,   nil,
+   111,    45,    54,    57,    62,    56,   195,    45,   nil,    66,
+   nil,    56,   195,   nil,   111,    66,   131,   nil,    62,   nil,
+   111,   nil,   203,   nil,    62,   nil,    45,   nil,   nil,   nil,
+    56,    59,    45,   nil,    66,   nil,    56,    59,    49,    52,
+    66,   150,   154,    62,    49,    52,   nil,   nil,   nil,    62,
    146,   148,   151,   153,   150,   154,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   146,   148,   151,   153,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   149,   152,   nil,   nil,   156,   157,
-   158,   144,   145,   147,   nil,   nil,   293,   nil,   152,   150,
+   nil,   nil,   212,   146,   148,   151,   153,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   156,   157,
+   158,   144,   145,   147,   nil,   nil,   nil,   149,   152,   150,
    154,   156,   157,   158,   144,   145,   147,   nil,   146,   148,
-   151,   153,   nil,   nil,   nil,   nil,   nil,    16,   nil,    23,
-    27,   291,     1,     5,   nil,    10,   nil,    13,   nil,    20,
-   nil,    28,   149,   152,     4,     8,   156,   157,   158,   144,
-   145,   147,    16,   290,    23,    27,   nil,     1,     5,   nil,
+   151,   153,   150,   154,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   146,   148,   151,   153,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   149,   152,   nil,   nil,   156,   157,   158,   144,
+   145,   147,   nil,   nil,   293,   nil,   152,   150,   154,   156,
+   157,   158,   144,   145,   147,   nil,   146,   148,   151,   153,
+   nil,   nil,   nil,   nil,   nil,    16,   nil,    23,    27,   291,
+     1,     5,   nil,    10,   nil,    13,   nil,    20,   nil,    28,
+   149,   152,     4,     8,   156,   157,   158,   144,   145,   147,
+    16,   290,    23,    27,   nil,     1,     5,   nil,    10,   nil,
+    13,   nil,    20,   nil,    28,   nil,   nil,     4,     8,   nil,
+   268,   nil,    16,   nil,    23,    27,   nil,     1,     5,   nil,
     10,   nil,    13,   nil,    20,   nil,    28,   nil,   nil,     4,
-     8,   nil,   268,   nil,    16,   nil,    23,    27,   nil,     1,
-     5,   nil,    10,   nil,    13,   nil,    20,   nil,    28,   nil,
-   nil,     4,     8,    16,   305,    23,    27,   nil,     1,     5,
+     8,    16,   305,    23,    27,   nil,     1,     5,   nil,    10,
+   nil,    13,   nil,    20,   nil,    28,   nil,   nil,     4,     8,
+   nil,   310,   nil,    16,   nil,    23,    27,   nil,     1,     5,
    nil,    10,   nil,    13,   nil,    20,   nil,    28,   nil,   nil,
-     4,     8,   nil,   310,   nil,    16,   nil,    23,    27,   nil,
-     1,     5,   nil,    10,   nil,    13,   nil,    20,   nil,    28,
-   nil,   nil,     4,     8,    16,   262,    23,    27,   nil,     1,
+     4,     8,    16,   262,    23,    27,   nil,     1,     5,   nil,
+    10,   nil,    13,   nil,    20,   nil,    28,   nil,   nil,     4,
+     8,   nil,   312,   nil,    16,   nil,    23,    27,   nil,     1,
      5,   nil,    10,   nil,    13,   nil,    20,   nil,    28,   nil,
-   nil,     4,     8,   nil,   312,   nil,    16,   nil,    23,    27,
-   nil,     1,     5,   nil,    10,   nil,    13,   nil,    20,   nil,
-    28,   nil,   nil,     4,     8,    16,   255,    23,    27,   nil,
-     1,     5,   nil,    10,   nil,    13,   nil,    20,   nil,    28,
-   nil,   nil,     4,     8,   nil,   313,   nil,    16,   nil,    23,
-    27,   nil,     1,     5,   nil,    10,   nil,    13,   nil,    20,
-   nil,    28,   nil,   nil,     4,     8,    16,   nil,    23,    27,
-   nil,     1,     5,   nil,    10,   nil,    13,   nil,    20,   nil,
-    28,   nil,   nil,     4,     8,    16,   nil,    23,    27,   nil,
+   nil,     4,     8,    16,   255,    23,    27,   nil,     1,     5,
+   nil,    10,   nil,    13,   nil,    20,   nil,    28,   nil,   nil,
+     4,     8,   nil,   313,   nil,    16,   nil,    23,    27,   nil,
      1,     5,   nil,    10,   nil,    13,   nil,    20,   nil,    28,
    nil,   nil,     4,     8,    16,   nil,    23,    27,   nil,     1,
      5,   nil,    10,   nil,    13,   nil,    20,   nil,    28,   nil,
@@ -377,46 +369,49 @@ racc_action_table = [
    nil,    10,   nil,    13,   nil,    20,   nil,    28,   nil,   nil,
      4,     8,    16,   nil,    23,    27,   nil,     1,     5,   nil,
     10,   nil,    13,   nil,    20,   nil,    28,   nil,   nil,     4,
-     8 ]
+     8,    16,   nil,    23,    27,   nil,     1,     5,   nil,    10,
+   nil,    13,   nil,    20,   nil,    28,   nil,   nil,     4,     8,
+    16,   nil,    23,    27,   nil,     1,     5,   nil,    10,   nil,
+    13,   nil,    20,   nil,    28,   nil,   nil,     4,     8 ]
 
 racc_action_check = [
     33,    33,    33,   231,   105,   129,   129,   241,    17,   170,
-    59,   116,    17,   171,   288,   241,   246,   171,   171,   288,
+    59,   116,    17,   140,   174,   241,   246,   140,   140,   174,
     33,   158,   158,   158,   116,    17,    10,    10,   231,   231,
     59,    33,   126,   126,    42,    33,    33,   170,   170,    33,
-   129,   158,   220,   129,    33,    33,   105,    92,    33,    17,
-   220,    33,   158,   144,   144,   144,   158,   158,    92,    42,
-   158,    10,   161,    92,    10,   158,   158,   126,   160,   158,
-   126,   175,   158,   144,    76,    76,    76,   247,   220,   220,
-   220,   220,   220,   220,   144,   134,    23,    23,   144,   144,
-   247,   165,   144,   134,    76,   223,    77,   144,   144,   165,
-   162,   144,    71,   223,   144,    76,   145,   145,   145,    76,
-    76,   162,   179,    76,    27,   180,   162,   108,    76,    76,
-   108,    27,    76,     5,   108,    76,   145,    72,    72,    72,
-     5,   223,   223,   223,   223,   223,   223,   145,    70,   140,
-   185,   145,   145,   140,   140,   145,    68,    72,   221,   187,
-   145,   145,   188,    90,   145,   189,   221,   145,    72,   154,
-   154,   154,    72,    72,    90,   174,    72,   173,   173,    90,
-   174,    72,    72,     1,     1,    72,   265,   265,    72,   154,
-    84,    84,    84,    67,   221,   221,   221,   221,   221,   221,
-   154,   227,   227,   195,   154,   154,   226,   226,   154,   198,
-    84,   218,   199,   154,   154,    65,   234,   154,   206,   218,
-   154,    84,    16,    16,    16,    84,    84,   234,    63,    84,
-   159,    79,   234,    80,    84,    84,    61,    60,    84,    81,
-    58,    84,    16,   146,   146,   146,    53,   218,   218,   218,
-   218,   218,   218,    16,    52,    82,    50,    16,    16,    87,
-    89,    16,   230,   146,    24,    94,    16,    16,    95,    36,
-    16,    24,    24,    16,   146,    97,    35,    99,   146,   146,
-    85,   244,   146,   217,   217,   217,   217,   146,   146,    85,
-    85,   146,   245,    78,   146,   106,    28,   109,    85,    85,
-    85,    85,   260,   112,   153,   153,   153,   224,   224,   224,
-   224,   224,   224,   216,   216,   216,   216,   216,   216,   113,
-   133,   268,    85,    85,   153,   271,    85,    85,    85,    85,
-    85,    85,   273,   274,   275,   153,   152,   152,   152,   153,
-   153,   277,   282,   153,   215,   215,   215,   215,   153,   153,
-   114,    15,   153,   130,   127,   153,   152,   147,   147,   147,
-     6,   125,   295,   296,   299,     2,   119,   152,   118,   115,
-   nil,   152,   152,   nil,   nil,   152,   nil,   147,   nil,   nil,
+   129,   158,   220,   129,    33,    33,   105,    90,    33,    17,
+   220,    33,   158,   144,   144,   144,   158,   158,    90,    42,
+   158,    10,   175,    90,    10,   158,   158,   126,    77,   158,
+   126,    71,   158,   144,    76,    76,    76,   247,   220,   220,
+   220,   220,   220,   220,   144,   135,   227,   227,   144,   144,
+   247,   165,   144,   135,    76,   223,   179,   144,   144,   165,
+    92,   144,   180,   223,   144,    76,   145,   145,   145,    76,
+    76,    92,    70,    76,     5,   288,    92,    27,    76,    76,
+   288,     5,    76,   185,    27,    76,   145,    72,    72,    72,
+    68,   223,   223,   223,   223,   223,   223,   145,   187,   134,
+   188,   145,   145,   134,   134,   145,   189,    72,   221,    67,
+   145,   145,   195,   162,   145,    65,   221,   145,    72,   154,
+   154,   154,    72,    72,   162,   201,    72,   108,   202,   162,
+   108,    72,    72,    63,   108,    72,   226,   226,    72,   154,
+    84,    84,    84,   209,   221,   221,   221,   221,   221,   221,
+   154,   161,   171,   160,   154,   154,   171,   171,   154,    79,
+    84,   218,    61,   154,   154,    60,   234,   154,    80,   218,
+   154,    84,    16,    16,    16,    84,    84,   234,    58,    84,
+     1,     1,   234,    53,    84,    84,    23,    23,    84,   266,
+   266,    84,    16,   146,   146,   146,    52,   218,   218,   218,
+   218,   218,   218,    16,    81,   159,    50,    16,    16,   159,
+   159,    16,    82,   146,    24,    87,    16,    16,   173,   173,
+    16,    24,    24,    16,   146,   230,    89,    94,   146,   146,
+    85,    36,   146,   217,   217,   217,   217,   146,   146,    85,
+    85,   146,    95,    35,   146,    97,   244,   245,    85,    85,
+    85,    85,    78,    99,   153,   153,   153,   224,   224,   224,
+   224,   224,   224,   216,   216,   216,   216,   216,   216,    28,
+   106,   260,    85,    85,   153,   109,    85,    85,    85,    85,
+    85,    85,   112,   113,   268,   153,   152,   152,   152,   153,
+   153,   271,   273,   153,   215,   215,   215,   215,   153,   153,
+   274,   275,   153,   277,   282,   153,   152,   147,   147,   147,
+   114,    15,   130,   127,     6,   125,   295,   152,   296,   299,
+     2,   152,   152,   119,   118,   152,   115,   147,   nil,   nil,
    152,   152,   nil,   nil,   152,   nil,   nil,   152,   147,   148,
    148,   148,   147,   147,   nil,   nil,   147,   nil,   nil,   nil,
    nil,   147,   147,   nil,   nil,   147,   nil,   nil,   147,   148,
@@ -431,124 +426,119 @@ racc_action_check = [
    156,   nil,   nil,   156,    34,   151,   151,   151,    34,    34,
    nil,   nil,    34,   nil,   nil,   nil,   nil,    34,    34,   nil,
    nil,    34,   nil,   nil,    34,   151,   150,   150,   150,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   151,    38,    38,    38,
+   nil,   nil,   nil,   nil,   nil,   nil,   151,   196,   196,   196,
    151,   151,   nil,   nil,   151,   nil,   150,   nil,   nil,   151,
    151,   nil,   nil,   151,   nil,   nil,   151,   150,   157,   157,
-   157,   150,   150,   nil,   nil,   150,   nil,   nil,    38,   nil,
-   150,   150,    38,    38,   150,   nil,    38,   150,   157,   nil,
-   nil,    38,   177,   177,   177,    38,   nil,   nil,   nil,   157,
-   nil,   nil,   nil,   157,   157,   nil,   nil,   157,    75,    75,
-    75,    75,   157,   157,   nil,   nil,   157,   nil,   nil,   157,
-   nil,   nil,   nil,   177,    51,    51,    51,   177,   177,   nil,
-   nil,   177,   nil,   nil,   nil,   nil,   177,   nil,   nil,    75,
-   177,   nil,   nil,    75,    75,   nil,   nil,    75,   285,   285,
-   285,   nil,    75,   nil,   nil,    51,    75,   nil,   nil,    51,
-    51,   nil,   nil,    51,   266,   266,   266,   nil,    51,   nil,
-   nil,   nil,    51,   nil,    88,    88,    88,   nil,   nil,   285,
-   178,   178,   178,   285,   285,   nil,   nil,   285,   nil,   nil,
-   nil,   nil,   285,   nil,   nil,   266,   285,   nil,   nil,   266,
-   266,   nil,   nil,   266,   nil,    88,   nil,   nil,   266,    88,
-    88,   178,   266,    88,   nil,   178,   178,   nil,    88,   178,
-   nil,   nil,    88,   nil,   178,    20,    20,    20,   178,   nil,
-   nil,    13,    13,    13,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   210,   210,   210,   nil,   nil,   nil,   186,   186,   186,
-   nil,    13,   nil,   nil,   nil,   nil,    20,   284,   284,   284,
-    20,    20,    13,   nil,    20,   nil,    13,    13,   nil,    20,
-    13,   nil,   210,    20,    13,    13,   210,   210,   186,    13,
-   210,   nil,   186,   186,   nil,   210,   186,   nil,   284,   210,
-   nil,   186,   284,   284,   nil,   186,   284,   205,   205,   283,
-   283,   284,   nil,   nil,   nil,   284,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   132,   132,   239,   239,   nil,   nil,   239,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   205,   nil,   283,
-   nil,   205,   205,   283,   283,   205,   nil,   283,   233,   233,
-   205,   nil,   283,   132,   205,   239,   283,   132,   132,   239,
-   239,   132,   nil,   239,   nil,   132,   132,   nil,   239,   nil,
-   132,   nil,   239,   294,   294,   232,   232,   nil,   233,   nil,
-   nil,   nil,   233,   233,   nil,   nil,   233,   nil,   nil,   172,
-   172,   233,   nil,   nil,   nil,   233,   136,   136,   nil,   136,
-   nil,   nil,   nil,   294,   nil,   232,   nil,   294,   294,   232,
-   232,   294,   nil,   232,   nil,   nil,   294,   nil,   232,   172,
-   294,   nil,   232,   172,   172,   nil,   136,   172,    48,    48,
-   136,   136,   172,   nil,   136,   nil,   172,   nil,   nil,   136,
-   nil,   nil,   nil,   136,   135,   135,   nil,   nil,    48,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    48,   nil,
-   nil,   nil,    48,    48,   135,   nil,    48,   nil,   nil,   nil,
-    48,    48,   nil,   nil,   135,    48,   nil,   nil,   135,   135,
-   nil,   nil,   135,   222,   222,   nil,   135,   135,   nil,   nil,
-   nil,   135,   222,   222,   222,   222,   138,   138,   nil,   nil,
-   nil,   nil,   nil,   nil,   138,   138,   138,   138,   138,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   222,   222,   222,   222,   222,   222,   nil,   nil,   nil,   138,
-   138,   101,   101,   138,   138,   138,   138,   138,   138,   nil,
-   101,   101,   101,   101,   219,   219,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   219,   219,   219,   219,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   101,   101,   nil,   nil,   101,   101,
-   101,   101,   101,   101,   nil,   nil,   261,   nil,   219,   102,
-   102,   219,   219,   219,   219,   219,   219,   nil,   102,   102,
-   102,   102,   nil,   nil,   nil,   nil,   nil,   261,   nil,   261,
-   261,   254,   261,   261,   nil,   261,   nil,   261,   nil,   261,
-   nil,   261,   102,   102,   261,   261,   102,   102,   102,   102,
-   102,   102,   254,   249,   254,   254,   nil,   254,   254,   nil,
-   254,   nil,   254,   nil,   254,   nil,   254,   nil,   nil,   254,
-   254,   nil,   225,   nil,   249,   nil,   249,   249,   nil,   249,
-   249,   nil,   249,   nil,   249,   nil,   249,   nil,   249,   nil,
-   nil,   249,   249,   225,   289,   225,   225,   nil,   225,   225,
-   nil,   225,   nil,   225,   nil,   225,   nil,   225,   nil,   nil,
-   225,   225,   nil,   300,   nil,   289,   nil,   289,   289,   nil,
-   289,   289,   nil,   289,   nil,   289,   nil,   289,   nil,   289,
-   nil,   nil,   289,   289,   300,   191,   300,   300,   nil,   300,
-   300,   nil,   300,   nil,   300,   nil,   300,   nil,   300,   nil,
-   nil,   300,   300,   nil,   309,   nil,   191,   nil,   191,   191,
-   nil,   191,   191,   nil,   191,   nil,   191,   nil,   191,   nil,
-   191,   nil,   nil,   191,   191,   309,   184,   309,   309,   nil,
-   309,   309,   nil,   309,   nil,   309,   nil,   309,   nil,   309,
-   nil,   nil,   309,   309,   nil,   311,   nil,   184,   nil,   184,
-   184,   nil,   184,   184,   nil,   184,   nil,   184,   nil,   184,
-   nil,   184,   nil,   nil,   184,   184,   311,   nil,   311,   311,
-   nil,   311,   311,   nil,   311,   nil,   311,   nil,   311,   nil,
-   311,   nil,   nil,   311,   311,   308,   nil,   308,   308,   nil,
-   308,   308,   nil,   308,   nil,   308,   nil,   308,   nil,   308,
-   nil,   nil,   308,   308,   155,   nil,   155,   155,   nil,   155,
-   155,   nil,   155,   nil,   155,   nil,   155,   nil,   155,   nil,
-   nil,   155,   155,    19,   nil,    19,    19,   nil,    19,    19,
-   nil,    19,   nil,    19,   nil,    19,   nil,    19,   nil,   nil,
-    19,    19,     0,   nil,     0,     0,   nil,     0,     0,   nil,
-     0,   nil,     0,   nil,     0,   nil,     0,   nil,   nil,     0,
-     0 ]
+   157,   150,   150,   nil,   nil,   150,   nil,   nil,   196,   nil,
+   150,   150,   196,   196,   150,   nil,   196,   150,   157,   nil,
+   nil,   196,    38,    38,    38,   196,   nil,   nil,   nil,   157,
+   nil,   nil,   nil,   157,   157,   nil,   nil,   157,   177,   177,
+   177,   nil,   157,   157,   nil,   nil,   157,   nil,   nil,   157,
+   nil,   nil,   nil,    38,    51,    51,    51,    38,    38,   nil,
+   nil,    38,   nil,   nil,   nil,   nil,    38,   nil,   nil,   177,
+    38,   nil,   nil,   177,   177,   nil,   nil,   177,    75,    75,
+    75,    75,   177,   nil,   nil,    51,   177,   nil,   nil,    51,
+    51,   nil,   nil,    51,   267,   267,   267,   nil,    51,   nil,
+   nil,   nil,    51,   nil,    88,    88,    88,   nil,   nil,    75,
+   285,   285,   285,    75,    75,   nil,   nil,    75,   nil,   nil,
+   nil,   nil,    75,   nil,   nil,   267,    75,   nil,   nil,   267,
+   267,   nil,   nil,   267,   nil,    88,   nil,   nil,   267,    88,
+    88,   285,   267,    88,   nil,   285,   285,   nil,    88,   285,
+   nil,   nil,    88,   nil,   285,    20,    20,    20,   285,   nil,
+   nil,   178,   178,   178,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    13,    13,    13,   nil,   nil,
+   nil,   186,   186,   186,   nil,   nil,    20,   nil,   nil,   nil,
+    20,    20,   178,   nil,    20,    13,   178,   178,   nil,    20,
+   178,   232,   232,    20,   nil,   178,    13,   208,   208,   178,
+    13,    13,   186,   nil,    13,   nil,   186,   186,    13,    13,
+   186,   283,   283,    13,   nil,   186,   284,   284,   284,   186,
+   nil,   232,   nil,   nil,   nil,   232,   232,   208,   nil,   232,
+   nil,   208,   208,   nil,   232,   208,   132,   132,   232,   nil,
+   208,   283,   294,   294,   208,   283,   283,   284,   nil,   283,
+   nil,   284,   284,   nil,   283,   284,   nil,   nil,   283,   nil,
+   284,   239,   239,   nil,   284,   239,   132,   233,   233,   nil,
+   132,   132,   294,   nil,   132,   nil,   294,   294,   132,   132,
+   294,   172,   172,   132,   nil,   294,   nil,   137,   137,   294,
+   137,   239,   nil,   nil,   nil,   239,   239,   233,   nil,   239,
+   nil,   233,   233,   nil,   239,   233,    48,    48,   239,   nil,
+   233,   172,   136,   136,   233,   172,   172,   137,   nil,   172,
+   nil,   137,   137,   nil,   172,   137,    48,   nil,   172,   nil,
+   137,   nil,   136,   nil,   137,   nil,    48,   nil,   nil,   nil,
+    48,    48,   136,   nil,    48,   nil,   136,   136,    48,    48,
+   136,   222,   222,    48,   136,   136,   nil,   nil,   nil,   136,
+   222,   222,   222,   222,   139,   139,   nil,   nil,   nil,   nil,
+   nil,   nil,   139,   139,   139,   139,   139,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   222,   222,
+   222,   222,   222,   222,   nil,   nil,   nil,   139,   139,   101,
+   101,   139,   139,   139,   139,   139,   139,   nil,   101,   101,
+   101,   101,   219,   219,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   219,   219,   219,   219,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   101,   101,   nil,   nil,   101,   101,   101,   101,
+   101,   101,   nil,   nil,   261,   nil,   219,   102,   102,   219,
+   219,   219,   219,   219,   219,   nil,   102,   102,   102,   102,
+   nil,   nil,   nil,   nil,   nil,   261,   nil,   261,   261,   254,
+   261,   261,   nil,   261,   nil,   261,   nil,   261,   nil,   261,
+   102,   102,   261,   261,   102,   102,   102,   102,   102,   102,
+   254,   249,   254,   254,   nil,   254,   254,   nil,   254,   nil,
+   254,   nil,   254,   nil,   254,   nil,   nil,   254,   254,   nil,
+   225,   nil,   249,   nil,   249,   249,   nil,   249,   249,   nil,
+   249,   nil,   249,   nil,   249,   nil,   249,   nil,   nil,   249,
+   249,   225,   289,   225,   225,   nil,   225,   225,   nil,   225,
+   nil,   225,   nil,   225,   nil,   225,   nil,   nil,   225,   225,
+   nil,   300,   nil,   289,   nil,   289,   289,   nil,   289,   289,
+   nil,   289,   nil,   289,   nil,   289,   nil,   289,   nil,   nil,
+   289,   289,   300,   191,   300,   300,   nil,   300,   300,   nil,
+   300,   nil,   300,   nil,   300,   nil,   300,   nil,   nil,   300,
+   300,   nil,   309,   nil,   191,   nil,   191,   191,   nil,   191,
+   191,   nil,   191,   nil,   191,   nil,   191,   nil,   191,   nil,
+   nil,   191,   191,   309,   184,   309,   309,   nil,   309,   309,
+   nil,   309,   nil,   309,   nil,   309,   nil,   309,   nil,   nil,
+   309,   309,   nil,   311,   nil,   184,   nil,   184,   184,   nil,
+   184,   184,   nil,   184,   nil,   184,   nil,   184,   nil,   184,
+   nil,   nil,   184,   184,   311,   nil,   311,   311,   nil,   311,
+   311,   nil,   311,   nil,   311,   nil,   311,   nil,   311,   nil,
+   nil,   311,   311,   308,   nil,   308,   308,   nil,   308,   308,
+   nil,   308,   nil,   308,   nil,   308,   nil,   308,   nil,   nil,
+   308,   308,   155,   nil,   155,   155,   nil,   155,   155,   nil,
+   155,   nil,   155,   nil,   155,   nil,   155,   nil,   nil,   155,
+   155,    19,   nil,    19,    19,   nil,    19,    19,   nil,    19,
+   nil,    19,   nil,    19,   nil,    19,   nil,   nil,    19,    19,
+     0,   nil,     0,     0,   nil,     0,     0,   nil,     0,   nil,
+     0,   nil,     0,   nil,     0,   nil,   nil,     0,     0 ]
 
 racc_action_pointer = [
-  1294,   160,   349,   nil,   nil,    85,   344,   nil,   nil,   nil,
-    23,   nil,   nil,   699,   nil,   341,   210,     6,   nil,  1275,
-   693,   nil,   nil,    83,   216,   nil,   nil,    76,   244,   nil,
-   nil,   nil,   nil,    -2,   451,   228,   224,   nil,   515,   nil,
-   nil,   nil,    24,   nil,   nil,   nil,   nil,   nil,   885,   nil,
-   236,   592,   242,   226,   nil,   nil,   nil,   nil,   209,     8,
-   206,   224,   nil,   197,   nil,   184,   nil,   162,   125,   nil,
-   117,   102,   125,   nil,   nil,   576,    72,    75,   262,   200,
-   202,   208,   224,   nil,   178,   264,   nil,   228,   642,   212,
-   131,   nil,    25,   nil,   249,   248,   nil,   259,   nil,   245,
-   nil,   976,  1024,   nil,   nil,    -5,   275,   nil,    79,   281,
-   nil,   nil,   254,   288,   330,   338,     2,   nil,   337,   338,
-   nil,   nil,   nil,   nil,   nil,   330,    29,   338,   nil,     2,
-   320,   nil,   780,   305,    47,   901,   853,   nil,   941,   nil,
-   134,   nil,   nil,   nil,    51,   104,   231,   345,   377,   398,
-   504,   483,   324,   292,   157,  1256,   430,   536,    19,   215,
-    58,    53,    78,   nil,   nil,    75,   nil,   nil,   nil,   nil,
-   -11,   -31,   846,   164,   132,    65,   nil,   560,   648,   105,
-    77,   nil,   nil,   nil,  1199,   133,   715,   142,   114,   117,
-   nil,  1158,   nil,   nil,   nil,   171,   nil,   nil,   197,   179,
-   nil,   nil,   nil,   nil,   nil,   764,   199,   nil,   nil,   nil,
-   709,   nil,   nil,   nil,   nil,   282,   251,   221,   185,   989,
-    26,   132,   928,    79,   245,  1095,   142,   137,   nil,   nil,
-   245,   -20,   832,   805,   184,   nil,   nil,   nil,   nil,   782,
-   nil,    -3,   nil,   nil,   258,   269,    -7,    67,   nil,  1076,
-   nil,   nil,   nil,   nil,  1054,   nil,   nil,   nil,   nil,   nil,
-   282,  1029,   nil,   nil,   nil,   167,   632,   nil,   282,   nil,
-   nil,   294,   nil,   301,   302,   303,   nil,   310,   nil,   nil,
-   nil,   nil,   326,   766,   725,   616,   nil,   nil,   -19,  1117,
-   nil,   nil,   nil,   nil,   830,   345,   346,   nil,   nil,   348,
-  1136,   nil,   nil,   nil,   nil,   nil,   nil,   nil,  1237,  1177,
-   nil,  1218,   nil,   nil ]
+  1252,   207,   354,   nil,   nil,    76,   348,   nil,   nil,   nil,
+    23,   nil,   nil,   713,   nil,   351,   210,     6,   nil,  1233,
+   693,   nil,   nil,   223,   216,   nil,   nil,    79,   267,   nil,
+   nil,   nil,   nil,    -2,   451,   245,   236,   nil,   560,   nil,
+   nil,   nil,    24,   nil,   nil,   nil,   nil,   nil,   853,   nil,
+   236,   592,   234,   213,   nil,   nil,   nil,   nil,   197,     8,
+   184,   200,   nil,   152,   nil,   134,   nil,   128,   109,   nil,
+    91,    71,   125,   nil,   nil,   616,    72,    47,   271,   178,
+   187,   223,   231,   nil,   178,   264,   nil,   234,   642,   228,
+    25,   nil,    78,   nil,   261,   272,   nil,   279,   nil,   271,
+   nil,   934,   982,   nil,   nil,    -5,   300,   nil,   129,   309,
+   nil,   nil,   283,   302,   340,   345,     2,   nil,   343,   345,
+   nil,   nil,   nil,   nil,   nil,   334,    29,   347,   nil,     2,
+   329,   nil,   783,   nil,   134,    47,   859,   834,   nil,   899,
+     8,   nil,   nil,   nil,    51,   104,   231,   345,   377,   398,
+   504,   483,   324,   292,   157,  1214,   430,   536,    19,   240,
+   183,   182,   131,   nil,   nil,    75,   nil,   nil,   nil,   nil,
+   -11,   148,   828,   255,   -19,    56,   nil,   576,   699,    89,
+    64,   nil,   nil,   nil,  1157,   116,   719,   131,   102,   108,
+   nil,  1116,   nil,   nil,   nil,   130,   515,   nil,   nil,   nil,
+   nil,   163,   145,   nil,   nil,   nil,   nil,   nil,   744,   174,
+   nil,   nil,   nil,   nil,   nil,   282,   251,   221,   185,   947,
+    26,   132,   886,    79,   245,  1053,   122,    32,   nil,   nil,
+   258,   -20,   738,   814,   184,   nil,   nil,   nil,   nil,   808,
+   nil,    -3,   nil,   nil,   273,   274,    -7,    67,   nil,  1034,
+   nil,   nil,   nil,   nil,  1012,   nil,   nil,   nil,   nil,   nil,
+   301,   987,   nil,   nil,   nil,   nil,   220,   632,   295,   nil,
+   nil,   310,   nil,   311,   319,   320,   nil,   322,   nil,   nil,
+   nil,   nil,   338,   758,   764,   648,   nil,   nil,    82,  1075,
+   nil,   nil,   nil,   nil,   789,   349,   351,   nil,   nil,   353,
+  1094,   nil,   nil,   nil,   nil,   nil,   nil,   nil,  1195,  1135,
+   nil,  1176,   nil,   nil ]
 
 racc_action_default = [
   -167,  -191,  -191,    -7,  -160,  -191,  -191,    -8,  -158,    -9,
@@ -564,20 +554,20 @@ racc_action_default = [
    -41,   -70,   -71,   -78,   -80,  -191,  -189,   -77,  -191,  -191,
   -180,   -63,   -59,   -65,  -189,   -68,   -62,   -57,   -66,  -191,
   -146,  -145,   -69,   -67,   -73,   -64,  -191,  -191,  -178,  -191,
-  -191,   -19,  -191,  -191,  -191,  -191,  -191,   314,  -191,   -82,
+  -191,   -19,  -191,   -82,  -191,  -191,  -191,  -191,   314,  -191,
   -191,  -186,  -124,  -117,  -191,  -191,  -191,  -191,  -191,  -191,
   -191,  -191,  -191,  -191,  -191,  -191,  -191,  -191,  -191,  -191,
   -189,  -191,  -167,   -46,   -48,  -191,   -55,   -62,   -54,   -45,
   -191,  -191,  -191,  -191,  -168,  -191,  -169,  -191,  -191,  -191,
   -190,  -181,  -182,  -183,  -191,  -191,   -60,  -191,  -190,   -72,
-  -179,  -191,  -162,   -18,   -24,   -62,  -105,   -34,  -191,  -191,
-  -101,  -136,  -141,  -144,  -142,  -191,  -191,  -143,  -135,  -127,
-  -191,  -185,  -187,  -188,  -113,  -115,  -119,  -116,  -121,  -126,
+  -179,  -191,  -162,   -18,   -24,   -62,  -191,  -105,  -187,  -188,
+   -34,  -191,  -191,  -101,  -136,  -141,  -144,  -142,  -191,  -191,
+  -143,  -135,  -127,  -185,  -113,  -115,  -119,  -116,  -121,  -126,
   -123,  -120,  -125,  -122,  -118,  -191,  -111,  -112,  -114,  -106,
   -191,  -191,  -191,  -191,  -191,   -51,   -50,   -44,   -43,  -191,
   -129,  -191,  -133,  -150,  -177,  -175,  -191,  -191,  -172,  -191,
    -76,   -75,   -38,   -81,  -191,  -155,   -35,   -58,   -36,   -74,
-  -189,  -191,  -157,  -100,  -138,  -189,  -191,   -83,  -108,   -37,
+  -189,  -191,  -157,   -83,  -100,  -138,  -189,  -191,  -108,   -37,
    -49,   -85,   -52,   -89,   -86,   -87,   -88,   -84,   -53,   -47,
   -130,  -128,  -191,  -191,  -191,  -191,  -170,  -171,  -191,  -191,
   -153,  -154,   -56,  -156,  -191,  -191,  -188,  -140,  -107,  -191,
@@ -585,134 +575,126 @@ racc_action_default = [
   -132,  -191,  -131,  -109 ]
 
 racc_goto_table = [
-     2,    69,    19,   206,    17,    93,   179,    70,   122,   107,
-    47,   210,   201,    46,   187,   117,    36,    96,    15,     2,
-   114,    43,    22,    17,    64,   248,   123,   170,    97,   171,
-   104,   240,   125,   272,   278,   279,    69,   140,    99,   242,
-    91,   298,    70,   239,   106,   130,   185,   208,    46,    64,
-    63,   112,   265,    95,   175,   109,    42,   127,   110,    64,
-   230,   194,   246,   247,   128,    98,   181,   nil,   nil,   nil,
-   nil,   160,   206,    94,   nil,   118,   nil,   nil,   nil,   nil,
-   nil,   264,   nil,   nil,   nil,    63,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   280,   231,
-   nil,   nil,   nil,   nil,   133,   nil,   242,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   182,
-    69,   176,   nil,    69,   nil,   nil,    70,   nil,   139,    70,
-   207,   nil,   199,    58,   197,    46,   294,   190,   nil,   304,
-   192,   159,   nil,    64,   nil,   nil,    64,    64,   nil,   nil,
-   301,   nil,   nil,   nil,   107,     2,   122,   225,   113,    17,
-   292,   206,   259,   257,   nil,   295,   207,   243,    58,    63,
-   306,   260,    63,   204,   123,   253,   nil,   nil,   nil,   nil,
-   125,   nil,   nil,    64,     2,   nil,   254,   nil,    17,   nil,
-   nil,     2,   nil,   261,   nil,    17,   nil,    64,   nil,   207,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   204,
-   166,    93,   166,    65,   nil,   nil,    64,   nil,   nil,   nil,
-   276,   276,   nil,   118,   nil,     2,   277,   277,   nil,    17,
-   250,   251,   nil,   207,   nil,   nil,   nil,   nil,   120,    67,
-    93,   nil,   204,    64,    64,   nil,   nil,    93,    65,     2,
-    64,   289,    58,    17,     2,    58,   202,   nil,    17,   nil,
-   nil,     2,   nil,   267,   121,    17,   nil,   nil,   nil,   274,
-   274,   nil,   nil,   nil,    67,    93,   204,   207,   nil,   nil,
-   nil,   nil,   166,   nil,   nil,   nil,   nil,   nil,   207,     2,
-   nil,   nil,   202,    17,    64,    93,   nil,    93,    60,   nil,
-     2,   nil,   309,   nil,    17,    64,   113,   nil,     2,     2,
-   311,     2,    17,    17,   nil,    17,   nil,   nil,   nil,   297,
-   204,   nil,   nil,   115,   nil,   202,   nil,   nil,   nil,   nil,
-   nil,   204,    65,    60,   nil,    65,   120,   302,   303,   nil,
+     2,    70,    19,   122,    17,    93,    47,   104,   117,   107,
+   179,    96,   209,    46,   204,    43,    36,   240,   187,     2,
+    15,   134,   114,    17,    64,   248,   125,   279,    97,    22,
+   170,    91,   171,   272,   278,   294,    70,   298,    99,   239,
+   106,   130,   185,   211,    63,   140,   112,   242,    46,    64,
+   266,    95,   175,    58,   109,    42,   127,   194,   159,    64,
+   246,   247,    98,   181,   230,   110,   nil,   nil,   nil,   118,
+   nil,   128,   nil,   160,   nil,   nil,   nil,   nil,   113,    63,
+   nil,   nil,   nil,   209,   280,   265,   nil,    69,    58,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   271,   271,   166,   nil,   nil,   nil,    67,   202,
-   nil,    67,   121,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    85,   nil,   120,   nil,   nil,   168,   nil,   168,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   120,   101,   102,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   121,   nil,
-   nil,   nil,   nil,   202,   nil,   120,   nil,   nil,   nil,   nil,
-   nil,   nil,   121,   nil,   202,   nil,   nil,    60,   nil,   nil,
-    60,   203,   nil,   nil,   nil,   nil,   138,   nil,   nil,   nil,
-   142,   121,   275,   275,   nil,   nil,   nil,   nil,   143,   120,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   168,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   203,   121,   121,
-   nil,   nil,   nil,   nil,   nil,   121,   nil,   nil,   nil,   nil,
-   nil,   115,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   120,   nil,   nil,   nil,   nil,   nil,   nil,
-   203,   nil,   nil,   nil,   120,   nil,   nil,   nil,   214,   215,
-   216,   217,   218,   219,   220,   221,   222,   223,   224,   121,
-   226,   227,   228,   nil,   nil,   nil,   nil,   273,   273,   168,
-   121,   nil,   nil,   nil,   203,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   231,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    94,   123,   nil,   242,   nil,   nil,   nil,   nil,   182,
+    70,   nil,    69,   nil,    70,   210,   nil,   nil,   176,   202,
+   166,   190,   166,   nil,   192,   200,    46,   nil,   nil,   304,
+   nil,   nil,   133,    64,   nil,   nil,   nil,    64,    64,   nil,
+   nil,   122,   253,   nil,   107,     2,   257,   225,   301,    17,
+   210,   243,   259,    63,   292,   nil,   133,    63,   207,   209,
+   295,   306,    58,   260,   125,   nil,    58,   205,   nil,   133,
+   nil,   nil,   nil,    64,     2,   nil,   254,   nil,    17,   nil,
+   nil,     2,   nil,   261,   nil,    17,   210,    64,    65,   nil,
+   nil,   nil,   166,   207,   nil,   nil,    69,    67,   nil,   nil,
+    69,    93,   205,   nil,   nil,   nil,   nil,   118,   nil,    64,
+   277,   277,   nil,   120,   nil,     2,   113,   210,   nil,    17,
+   nil,   nil,   121,    65,   nil,   nil,   nil,   nil,   nil,   207,
+    93,    60,    67,    64,    64,   nil,   nil,    93,   205,     2,
+    64,   289,   nil,    17,     2,   nil,   nil,   nil,    17,   nil,
+   123,     2,   nil,   274,   274,    17,   115,   nil,   250,   251,
+   207,   210,   271,   271,   166,    93,    60,   nil,   nil,   205,
+   nil,   nil,   210,   nil,   nil,   nil,   nil,   263,   nil,     2,
+   nil,   nil,   nil,    17,    64,    93,   nil,    93,   nil,   nil,
+     2,   nil,   309,   nil,    17,    64,   276,   276,     2,     2,
+   311,     2,    17,    17,   207,    17,   nil,    65,   168,   nil,
+   168,    65,   120,   205,   nil,   207,    67,   nil,   nil,   nil,
+    67,   121,   nil,   nil,   205,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   120,   297,   nil,
+    60,   nil,   nil,   nil,    60,   206,   121,   nil,   nil,   nil,
+   nil,   120,   nil,   nil,   nil,   302,   303,   nil,   nil,   nil,
+   121,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   168,   nil,   nil,   120,   nil,    85,   nil,   nil,   nil,   nil,
+   206,   nil,   121,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   101,   102,   115,   nil,   nil,   275,   275,   nil,
+   nil,   nil,   nil,   nil,   120,   nil,   121,   121,   nil,   nil,
+   nil,   nil,   nil,   121,   nil,   nil,   206,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   139,   nil,   nil,   nil,   142,   nil,   nil,   nil,   nil,
+   273,   273,   168,   143,   nil,   nil,   nil,   206,   120,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   121,   nil,   120,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   121,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   203,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   203 ]
+   nil,   206,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   206,   214,   215,   216,   217,   218,   219,   220,
+   221,   222,   223,   224,   nil,   226,   227,   228 ]
 
 racc_goto_check = [
-    29,    27,     2,    60,    35,     4,    34,    28,    48,    50,
-    18,    55,    62,    29,    34,    45,    30,    28,     1,    29,
-    33,    69,     3,    35,    47,    72,    27,    39,    35,    39,
-    53,    58,    28,    44,    44,    40,    27,    54,    30,    60,
-    38,    56,    28,    57,    36,    18,    32,    61,    29,    47,
-    24,    31,    63,    64,    65,    66,    67,    68,     3,    47,
-    34,    21,    70,    71,     3,     5,    73,   nil,   nil,   nil,
-   nil,    33,    60,    51,   nil,    24,   nil,   nil,   nil,   nil,
-   nil,    62,   nil,   nil,   nil,    24,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    58,    39,
-   nil,   nil,   nil,   nil,    51,   nil,    60,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    30,
-    27,     3,   nil,    27,   nil,   nil,    28,   nil,    51,    28,
-    28,   nil,    18,    22,    29,    29,    55,    69,   nil,    72,
-    69,    51,   nil,    47,   nil,   nil,    47,    47,   nil,   nil,
-    60,   nil,   nil,   nil,    50,    29,    48,     2,    22,    35,
-    34,    60,    50,    45,   nil,    34,    28,    28,    22,    24,
-    62,    33,    24,    24,    27,    53,   nil,   nil,   nil,   nil,
-    28,   nil,   nil,    47,    29,   nil,     2,   nil,    35,   nil,
-   nil,    29,   nil,     2,   nil,    35,   nil,    47,   nil,    28,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    24,
-    22,     4,    22,    25,   nil,   nil,    47,   nil,   nil,   nil,
-    27,    27,   nil,    24,   nil,    29,    28,    28,   nil,    35,
-    51,    51,   nil,    28,   nil,   nil,   nil,   nil,    25,    26,
-     4,   nil,    24,    47,    47,   nil,   nil,     4,    25,    29,
-    47,     2,    22,    35,    29,    22,    22,   nil,    35,   nil,
-   nil,    29,   nil,    51,    26,    35,   nil,   nil,   nil,    24,
-    24,   nil,   nil,   nil,    26,     4,    24,    28,   nil,   nil,
-   nil,   nil,    22,   nil,   nil,   nil,   nil,   nil,    28,    29,
-   nil,   nil,    22,    35,    47,     4,   nil,     4,    23,   nil,
-    29,   nil,     2,   nil,    35,    47,    22,   nil,    29,    29,
-     2,    29,    35,    35,   nil,    35,   nil,   nil,   nil,    51,
-    24,   nil,   nil,    23,   nil,    22,   nil,   nil,   nil,   nil,
-   nil,    24,    25,    23,   nil,    25,    25,    51,    51,   nil,
+    29,    28,     2,    48,    35,     4,    18,    53,    45,    50,
+    34,    28,    60,    29,    62,    69,    30,    58,    34,    29,
+     1,    54,    33,    35,    47,    72,    28,    40,    35,     3,
+    39,    38,    39,    44,    44,    55,    28,    56,    30,    57,
+    36,    18,    32,    61,    24,    54,    31,    60,    29,    47,
+    63,    64,    65,    22,    66,    67,    68,    21,    54,    47,
+    70,    71,     5,    73,    34,     3,   nil,   nil,   nil,    24,
+   nil,     3,   nil,    33,   nil,   nil,   nil,   nil,    22,    24,
+   nil,   nil,   nil,    60,    58,    62,   nil,    27,    22,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    22,    22,    22,   nil,   nil,   nil,    26,    22,
-   nil,    26,    26,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    49,   nil,    25,   nil,   nil,    23,   nil,    23,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    25,    49,    49,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    26,   nil,
-   nil,   nil,   nil,    22,   nil,    25,   nil,   nil,   nil,   nil,
-   nil,   nil,    26,   nil,    22,   nil,   nil,    23,   nil,   nil,
-    23,    23,   nil,   nil,   nil,   nil,    49,   nil,   nil,   nil,
-    49,    26,    25,    25,   nil,   nil,   nil,   nil,    49,    25,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    23,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    23,    26,    26,
-   nil,   nil,   nil,   nil,   nil,    26,   nil,   nil,   nil,   nil,
-   nil,    23,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    25,   nil,   nil,   nil,   nil,   nil,   nil,
-    23,   nil,   nil,   nil,    25,   nil,   nil,   nil,    49,    49,
-    49,    49,    49,    49,    49,    49,    49,    49,    49,    26,
-    49,    49,    49,   nil,   nil,   nil,   nil,    23,    23,    23,
-    26,   nil,   nil,   nil,    23,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    39,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    51,    27,   nil,    60,   nil,   nil,   nil,   nil,    30,
+    28,   nil,    27,   nil,    28,    28,   nil,   nil,     3,    18,
+    22,    69,    22,   nil,    69,    29,    29,   nil,   nil,    72,
+   nil,   nil,    51,    47,   nil,   nil,   nil,    47,    47,   nil,
+   nil,    48,    53,   nil,    50,    29,    45,     2,    60,    35,
+    28,    28,    50,    24,    34,   nil,    51,    24,    24,    60,
+    34,    62,    22,    33,    28,   nil,    22,    22,   nil,    51,
+   nil,   nil,   nil,    47,    29,   nil,     2,   nil,    35,   nil,
+   nil,    29,   nil,     2,   nil,    35,    28,    47,    25,   nil,
+   nil,   nil,    22,    24,   nil,   nil,    27,    26,   nil,   nil,
+    27,     4,    22,   nil,   nil,   nil,   nil,    24,   nil,    47,
+    28,    28,   nil,    25,   nil,    29,    22,    28,   nil,    35,
+   nil,   nil,    26,    25,   nil,   nil,   nil,   nil,   nil,    24,
+     4,    23,    26,    47,    47,   nil,   nil,     4,    22,    29,
+    47,     2,   nil,    35,    29,   nil,   nil,   nil,    35,   nil,
+    27,    29,   nil,    24,    24,    35,    23,   nil,    51,    51,
+    24,    28,    22,    22,    22,     4,    23,   nil,   nil,    22,
+   nil,   nil,    28,   nil,   nil,   nil,   nil,    51,   nil,    29,
+   nil,   nil,   nil,    35,    47,     4,   nil,     4,   nil,   nil,
+    29,   nil,     2,   nil,    35,    47,    27,    27,    29,    29,
+     2,    29,    35,    35,    24,    35,   nil,    25,    23,   nil,
+    23,    25,    25,    22,   nil,    24,    26,   nil,   nil,   nil,
+    26,    26,   nil,   nil,    22,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    25,    51,   nil,
+    23,   nil,   nil,   nil,    23,    23,    26,   nil,   nil,   nil,
+   nil,    25,   nil,   nil,   nil,    51,    51,   nil,   nil,   nil,
+    26,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    23,   nil,   nil,    25,   nil,    49,   nil,   nil,   nil,   nil,
+    23,   nil,    26,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    49,    49,    23,   nil,   nil,    25,    25,   nil,
+   nil,   nil,   nil,   nil,    25,   nil,    26,    26,   nil,   nil,
+   nil,   nil,   nil,    26,   nil,   nil,    23,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    49,   nil,   nil,   nil,    49,   nil,   nil,   nil,   nil,
+    23,    23,    23,    49,   nil,   nil,   nil,    23,    25,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    26,   nil,    25,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    26,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    23,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    23 ]
+   nil,    23,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    23,    49,    49,    49,    49,    49,    49,    49,
+    49,    49,    49,    49,   nil,    49,    49,    49 ]
 
 racc_goto_pointer = [
-   nil,    18,     2,    22,   -14,    41,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    -3,   nil,
-   nil,   -71,   120,   285,    37,   200,   226,   -12,    -6,     0,
-    11,    13,   -66,   -18,  -100,     4,     9,   nil,    23,   -63,
-  -199,   nil,   nil,   nil,  -199,   -23,   nil,    11,   -30,   354,
-   -26,    53,   nil,    -5,   -38,  -129,  -227,  -129,  -141,   nil,
-  -133,   -89,  -124,  -153,    30,   -45,    19,    46,    15,    11,
-  -112,  -111,  -149,   -42 ]
+   nil,    20,     2,    29,   -14,    38,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    -7,   nil,
+   nil,   -75,    40,   228,    31,   185,   194,    74,   -12,     0,
+    11,     8,   -70,   -16,   -96,     4,     5,   nil,    14,   -60,
+  -207,   nil,   nil,   nil,  -199,   -30,   nil,    11,   -35,   379,
+   -26,    91,   nil,   -28,   -30,  -231,  -231,  -133,  -155,   nil,
+  -125,   -94,  -123,  -158,    28,   -47,    18,    45,    14,     5,
+  -114,  -113,  -149,   -45 ]
 
 racc_goto_default = [
    nil,   nil,   nil,   169,    26,    30,    32,     3,     7,     9,
@@ -720,7 +702,7 @@ racc_goto_default = [
     53,    55,    77,    78,    79,    81,    82,    86,    87,    74,
      6,   nil,   nil,   nil,   nil,    61,   nil,    24,   nil,   nil,
    163,   234,   164,   165,   nil,   nil,   119,    80,    83,   nil,
-   124,    73,   103,   nil,   nil,   nil,   nil,   nil,   nil,   241,
+   124,    73,   103,   nil,   nil,   196,   nil,   nil,   nil,   241,
     68,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil ]
 
@@ -940,7 +922,7 @@ Racc_token_to_s_table = [
 'argument',
 'classnameordefault']
 
-Racc_debug_parser = true
+Racc_debug_parser = false
 
 ##### racc system variables end #####
 

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list