Fixing #445. Nodes can now inherit from default.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2091 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 247 insertions, 238 deletions

diff --git a/lib/puppet/parser/parser.rb b/lib/puppet/parser/parser.rb
index 764922cad..ec9e43200 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..idda56e83715', 'grammar.ra', 628
+module_eval <<'..end grammar.ra modeval..idfb7e0da18f', 'grammar.ra', 630
 require 'puppet/parser/functions'
 
 attr_reader :file, :interp
@@ -199,7 +199,7 @@ end
 
 # $Id$
 
-..end grammar.ra modeval..idda56e83715
+..end grammar.ra modeval..idfb7e0da18f
 
 ##### racc 1.4.5 generates ###
 
@@ -347,62 +347,64 @@ racc_reduce_table = [
  1, 115, :_reduce_140,
  1, 110, :_reduce_none,
  2, 110, :_reduce_142,
- 1, 72, :_reduce_143,
- 3, 92, :_reduce_144,
- 2, 92, :_reduce_145,
+ 1, 116, :_reduce_none,
+ 1, 116, :_reduce_none,
+ 1, 72, :_reduce_145,
+ 3, 92, :_reduce_146,
+ 2, 92, :_reduce_147,
  1, 96, :_reduce_none,
  1, 96, :_reduce_none,
  0, 78, :_reduce_none,
- 1, 78, :_reduce_149 ]
+ 1, 78, :_reduce_151 ]
 
-racc_reduce_n = 150
+racc_reduce_n = 152
 
-racc_shift_n = 248
+racc_shift_n = 250
 
 racc_action_table = [
     62,    50,    52,    50,    52,    92,    62,    50,    52,    48,
    105,    79,    62,    50,    52,    80,    73,  -110,    62,    50,
-    52,  -114,    73,   213,    62,    50,    52,  -111,    73,   127,
+    52,   160,    73,   215,    62,    50,    52,    79,    73,   127,
     89,    45,    43,    45,   118,    65,    70,    45,    94,    74,
-   118,    65,    70,    45,    79,    74,   145,    65,    70,    45,
-  -111,    74,  -112,    65,   168,    45,    44,    74,   179,    65,
-   114,    50,    52,    74,    62,    50,    52,    58,   192,   155,
-    62,    50,    52,   157,   142,   143,    62,    50,    52,   155,
-    73,  -113,    62,    50,    52,   187,    73,   152,    62,    50,
-    52,    45,    73,   142,   143,    45,    94,   157,    73,    65,
+   118,    65,    70,    45,  -111,    74,   147,    65,    70,    45,
+  -112,    74,   181,    65,   170,    45,    44,    74,   157,    65,
+   114,    50,    52,    74,    62,    50,    52,    58,   194,   159,
+    62,    50,    52,   157,   144,   145,    62,    50,    52,  -111,
+    73,   189,    62,    50,    52,  -113,    73,   154,    62,    50,
+    52,    45,    73,   144,   145,    45,    94,   159,    73,    65,
     70,    45,    36,    74,    73,    65,    70,    45,  -109,    74,
-   127,    65,    70,    45,  -109,    74,   147,    65,    70,    45,
-   223,    74,    35,    65,    70,   146,   126,    74,    62,    50,
-    52,   123,   217,   222,    62,    50,    52,  -110,    32,   216,
-    62,    50,    52,  -110,    73,    31,   122,    50,    52,    48,
-    73,    32,   182,    50,    52,   202,    73,   185,    31,    45,
-    39,   131,   118,    65,    70,    45,    39,    74,   118,    65,
-    70,    45,   131,    74,    79,    65,    70,    45,    48,    74,
-   207,    65,   168,    45,   106,    74,   105,    65,   168,    50,
-    52,    74,   210,   182,    40,    50,    52,    41,   185,   127,
-    40,    50,    52,    41,   118,   233,   156,   163,   164,   155,
-   118,    50,    52,   128,   170,   150,   118,    50,    52,    45,
-   218,   215,   219,    65,   168,    45,   118,    74,   220,    65,
-   168,    45,   118,    74,   221,    65,   168,    93,   149,    74,
-   224,    45,    50,    52,    80,    65,   168,    45,    45,    74,
-    56,    65,   168,    94,    93,    74,    89,   118,    48,    50,
-    52,   158,    56,  -109,   247,    45,    50,    52,    93,  -112,
-    94,  -111,    45,  -114,    58,    17,    65,   168,    46,    45,
-    74,    58,    50,    52,    94,    14,   155,    20,    24,    45,
-     1,     4,   208,     8,    54,    12,    45,    16,   231,    25,
-   161,    54,    86,    17,   163,   164,    93,   148,   131,   246,
-   235,   142,   143,    14,   131,    20,    24,    45,     1,     4,
-    17,     8,    94,    12,    83,    16,   225,    25,   132,   139,
-    14,    81,    20,    24,   241,     1,     4,    17,     8,   138,
-    12,   137,    16,   227,    25,   134,    30,    14,  -112,    20,
-    24,   nil,     1,     4,    17,     8,   nil,    12,   nil,    16,
-   228,    25,   nil,   nil,    14,   nil,    20,    24,   nil,     1,
-     4,    17,     8,   nil,    12,   nil,    16,   240,    25,   nil,
+   127,    65,    70,    45,   126,    74,   149,    65,    70,    45,
+   225,    74,    35,    65,    70,   148,  -109,    74,    62,    50,
+    52,   123,   219,   224,    62,    50,    52,  -110,    32,   218,
+    62,    50,    52,   138,    73,    31,   140,    50,    52,   122,
+    73,    32,   184,    50,    52,    48,    73,   187,    31,    45,
+    39,   204,   118,    65,    70,    45,    39,    74,   118,    65,
+    70,    45,   131,    74,   131,    65,    70,    45,    79,    74,
+    48,    65,   170,    45,   209,    74,   106,    65,   170,    50,
+    52,    74,   105,   184,    40,    50,    52,    41,   187,   212,
+    40,    50,    52,    41,   118,   235,   127,   165,   166,  -110,
+   118,    50,    52,   158,   172,   157,   118,    50,    52,    45,
+   128,   217,   220,    65,   170,    45,   118,    74,   221,    65,
+   170,    45,   118,    74,   222,    65,   170,    93,   223,    74,
+   152,    45,    50,    52,   226,    65,   170,    45,    45,    74,
+    80,    65,   170,    94,    93,    74,    56,   118,    48,    50,
+    52,    89,    56,  -114,   249,    45,    50,    52,    93,  -109,
+    94,  -112,    45,  -111,    58,    17,    65,   170,    46,    45,
+    74,    58,    50,    52,    94,    14,  -114,    20,    24,    45,
+     1,     4,   210,     8,    54,    12,    45,    16,   157,    25,
+   150,    54,   233,    17,   144,   145,    93,   163,    86,   248,
+   151,   165,   166,    14,   237,    20,    24,    45,     1,     4,
+    17,     8,    94,    12,   131,    16,   227,    25,    83,   132,
+    14,   141,    20,    24,    81,     1,     4,    17,     8,   243,
+    12,   131,    16,   229,    25,   137,   134,    14,    30,    20,
+    24,  -112,     1,     4,    17,     8,   nil,    12,   nil,    16,
+   230,    25,   nil,   nil,    14,   nil,    20,    24,   nil,     1,
+     4,    17,     8,   nil,    12,   nil,    16,   242,    25,   nil,
    nil,    14,   nil,    20,    24,   nil,     1,     4,    17,     8,
-   nil,    12,   nil,    16,   243,    25,   nil,   nil,    14,   nil,
+   nil,    12,   nil,    16,   245,    25,   nil,   nil,    14,   nil,
     20,    24,   nil,     1,     4,    17,     8,   nil,    12,   nil,
-    16,   188,    25,   nil,   nil,    14,   nil,    20,    24,   nil,
-     1,     4,    17,     8,   nil,    12,   nil,    16,   190,    25,
+    16,   190,    25,   nil,   nil,    14,   nil,    20,    24,   nil,
+     1,     4,    17,     8,   nil,    12,   nil,    16,   192,    25,
    nil,   nil,    14,   nil,    20,    24,   nil,     1,     4,    17,
      8,   nil,    12,   nil,    16,   nil,    25,   nil,   nil,    14,
    nil,    20,    24,   nil,     1,     4,    17,     8,   nil,    12,
@@ -417,54 +419,54 @@ racc_action_table = [
 
 racc_action_check = [
     48,    48,    48,   105,   105,    37,    79,    79,    79,    70,
-   174,    17,   162,   162,   162,    17,    48,   194,   158,   158,
-   158,    76,    79,   174,    56,    56,    56,   117,   162,    70,
-    37,    48,     9,   105,   158,    48,    48,    79,   105,    48,
-    56,    79,    79,   162,    73,    79,    96,   162,   162,   158,
-    72,   162,    71,   158,   158,    56,     9,   158,   129,    56,
-    56,   127,   127,    56,   157,   157,   157,   106,   141,   130,
-    30,    30,    30,   131,    96,    96,    14,    14,    14,   133,
-   157,    77,    16,    16,    16,   136,    30,   106,   210,   210,
-   210,   127,    14,   141,   141,   157,   127,   114,    16,   157,
-   157,    30,     6,   157,   210,    30,    30,    14,   113,    30,
-   114,    14,    14,    16,    69,    14,   100,    16,    16,   210,
-   184,    16,     6,   210,   210,   100,    67,   210,    62,    62,
-    62,    62,   177,   184,   224,   224,   224,   110,     4,   177,
-   220,   220,   220,    63,    62,     4,    61,   146,   146,   152,
-   224,    24,   223,   217,   217,   154,   220,   223,    24,    62,
-     8,   155,   146,    62,    62,   224,    92,    62,   217,   224,
-   224,   220,   156,   224,    58,   220,   220,   146,    54,   220,
-   159,   146,   146,   217,    51,   146,    49,   217,   217,   234,
-   234,   217,   167,   134,     8,   170,   170,     8,   134,   168,
-    92,   147,   147,    92,   234,   212,   109,   212,   212,   108,
-   170,   126,   126,    78,   126,   104,   147,   175,   175,   234,
-   180,   175,   181,   234,   234,   170,   126,   234,   182,   170,
-   170,   147,   175,   170,   183,   147,   147,    93,   103,   147,
-   185,   126,   128,   128,    36,   126,   126,   175,    93,   126,
-    35,   175,   175,    93,    43,   175,    33,   128,    12,    12,
-    12,   120,    12,   196,   245,    43,    46,    46,    44,   197,
-    43,   198,   128,   199,    12,   245,   128,   128,    12,    44,
-   128,    46,    20,    20,    44,   245,   204,   245,   245,    12,
-   245,   245,   160,   245,    12,   245,    46,   245,   208,   245,
-   125,    46,    25,   160,   125,   125,   144,   102,    80,   244,
-   216,   102,   102,   160,    83,   160,   160,   144,   160,   160,
-   244,   160,   144,   160,    21,   160,   187,   160,    81,    91,
-   244,    19,   244,   244,   231,   244,   244,   187,   244,    89,
-   244,    88,   244,   189,   244,    85,     1,   187,   116,   187,
-   187,   nil,   187,   187,   189,   187,   nil,   187,   nil,   187,
-   191,   187,   nil,   nil,   189,   nil,   189,   189,   nil,   189,
-   189,   191,   189,   nil,   189,   nil,   189,   226,   189,   nil,
-   nil,   191,   nil,   191,   191,   nil,   191,   191,   226,   191,
-   nil,   191,   nil,   191,   235,   191,   nil,   nil,   226,   nil,
-   226,   226,   nil,   226,   226,   235,   226,   nil,   226,   nil,
-   226,   137,   226,   nil,   nil,   235,   nil,   235,   235,   nil,
-   235,   235,   137,   235,   nil,   235,   nil,   235,   139,   235,
-   nil,   nil,   137,   nil,   137,   137,   nil,   137,   137,   139,
-   137,   nil,   137,   nil,   137,   nil,   137,   nil,   nil,   139,
-   nil,   139,   139,   nil,   139,   139,   241,   139,   nil,   139,
-   nil,   139,   nil,   139,   nil,   nil,   241,   nil,   241,   241,
-   nil,   241,   241,    23,   241,   nil,   241,   nil,   241,   nil,
-   241,   nil,   nil,    23,   nil,    23,    23,   nil,    23,    23,
+   176,    17,   164,   164,   164,    17,    48,   196,   160,   160,
+   160,   120,    79,   176,    56,    56,    56,    73,   164,    70,
+    37,    48,     9,   105,   160,    48,    48,    79,   105,    48,
+    56,    79,    79,   164,    72,    79,    96,   164,   164,   160,
+    71,   164,   129,   160,   160,    56,     9,   160,   130,    56,
+    56,   127,   127,    56,   159,   159,   159,   106,   143,   131,
+    30,    30,    30,   133,    96,    96,    14,    14,    14,   117,
+   159,   136,    16,    16,    16,    77,    30,   106,   212,   212,
+   212,   127,    14,   143,   143,   159,   127,   114,    16,   159,
+   159,    30,     6,   159,   212,    30,    30,    14,    69,    30,
+   114,    14,    14,    16,    67,    14,   100,    16,    16,   212,
+   186,    16,     6,   212,   212,   100,   113,   212,    62,    62,
+    62,    62,   179,   186,   226,   226,   226,    63,    24,   179,
+   222,   222,   222,    89,    62,    24,    89,   148,   148,    61,
+   226,     4,   225,   219,   219,   154,   222,   225,     4,    62,
+     8,   156,   148,    62,    62,   226,    92,    62,   219,   226,
+   226,   222,   157,   226,   158,   222,   222,   148,    58,   222,
+    54,   148,   148,   219,   161,   148,    51,   219,   219,   236,
+   236,   219,    49,   134,     8,   172,   172,     8,   134,   169,
+    92,   149,   149,    92,   236,   214,   170,   214,   214,   110,
+   172,   126,   126,   109,   126,   108,   149,   177,   177,   236,
+    78,   177,   182,   236,   236,   172,   126,   236,   183,   172,
+   172,   149,   177,   172,   184,   149,   149,    44,   185,   149,
+   104,   126,   128,   128,   187,   126,   126,   177,    44,   126,
+    36,   177,   177,    44,    43,   177,    35,   128,    12,    12,
+    12,    33,    12,    76,   247,    43,    46,    46,   146,   198,
+    43,   199,   128,   200,    12,   247,   128,   128,    12,   146,
+   128,    46,    20,    20,   146,   247,   201,   247,   247,    12,
+   247,   247,   162,   247,    12,   247,    46,   247,   206,   247,
+   102,    46,   210,   162,   102,   102,    93,   125,    25,   246,
+   103,   125,   125,   162,   218,   162,   162,    93,   162,   162,
+   246,   162,    93,   162,    80,   162,   189,   162,    21,    81,
+   246,    91,   246,   246,    19,   246,   246,   189,   246,   233,
+   246,    83,   246,   191,   246,    88,    85,   189,     1,   189,
+   189,   116,   189,   189,   191,   189,   nil,   189,   nil,   189,
+   193,   189,   nil,   nil,   191,   nil,   191,   191,   nil,   191,
+   191,   193,   191,   nil,   191,   nil,   191,   228,   191,   nil,
+   nil,   193,   nil,   193,   193,   nil,   193,   193,   228,   193,
+   nil,   193,   nil,   193,   237,   193,   nil,   nil,   228,   nil,
+   228,   228,   nil,   228,   228,   237,   228,   nil,   228,   nil,
+   228,   137,   228,   nil,   nil,   237,   nil,   237,   237,   nil,
+   237,   237,   137,   237,   nil,   237,   nil,   237,   141,   237,
+   nil,   nil,   137,   nil,   137,   137,   nil,   137,   137,   141,
+   137,   nil,   137,   nil,   137,   nil,   137,   nil,   nil,   141,
+   nil,   141,   141,   nil,   141,   141,   243,   141,   nil,   141,
+   nil,   141,   nil,   141,   nil,   nil,   243,   nil,   243,   243,
+   nil,   243,   243,    23,   243,   nil,   243,   nil,   243,   nil,
+   243,   nil,   nil,    23,   nil,    23,    23,   nil,    23,    23,
    122,    23,   nil,    23,   nil,    23,   nil,    23,   nil,   nil,
    122,   nil,   122,   122,   nil,   122,   122,     0,   122,   nil,
    122,   nil,   122,   nil,   122,   nil,   nil,     0,   nil,     0,
@@ -472,156 +474,158 @@ racc_action_check = [
    nil,     0 ]
 
 racc_action_pointer = [
-   489,   333,   nil,   nil,   100,   nil,    84,   nil,   156,    13,
-   nil,   nil,   256,   nil,    74,   nil,    80,     9,   nil,   331,
-   279,   318,   nil,   455,   113,   260,   nil,   nil,   nil,   nil,
-    68,   nil,   nil,   221,   nil,   244,   238,    -5,   nil,   nil,
-   nil,   nil,   nil,   232,   246,   nil,   263,   nil,    -2,   176,
-   nil,   174,   nil,   nil,   176,   nil,    22,   nil,   172,   nil,
-   nil,   140,   126,   122,   nil,   nil,   nil,   105,   nil,    93,
-     7,    31,    29,    42,   nil,   nil,     0,    60,   207,     4,
-   270,   328,   nil,   276,   nil,   323,   nil,   nil,   335,   301,
-   nil,   323,   162,   215,   nil,   nil,    26,   nil,   nil,   nil,
-   101,   nil,   263,   215,   210,     0,    49,   nil,   199,   189,
-   116,   nil,   nil,    87,    88,   nil,   327,     6,   nil,   nil,
-   222,   nil,   472,   nil,   nil,   295,   208,    58,   239,    53,
-    59,    64,   nil,    69,   160,   nil,    79,   404,   nil,   421,
-   nil,    45,   nil,   nil,   284,   nil,   144,   198,   nil,   nil,
-   nil,   nil,   147,   nil,   148,   123,   134,    62,    16,   173,
-   285,   nil,    10,   nil,   nil,   nil,   nil,   183,   177,   nil,
-   192,   nil,   nil,   nil,     0,   214,   nil,   122,   nil,   nil,
-   213,   215,   215,   211,   110,   227,   nil,   319,   nil,   336,
-   nil,   353,   nil,   nil,    -4,   nil,   242,   248,   250,   252,
-   nil,   nil,   nil,   nil,   276,   nil,   nil,   nil,   269,   nil,
-    86,   nil,   198,   nil,   nil,   nil,   304,   150,   nil,   nil,
-   138,   nil,   nil,   119,   132,   nil,   370,   nil,   nil,   nil,
-   nil,   328,   nil,   nil,   186,   387,   nil,   nil,   nil,   nil,
-   nil,   438,   nil,   nil,   302,   257,   nil,   nil ]
+   489,   335,   nil,   nil,   113,   nil,    84,   nil,   156,    13,
+   nil,   nil,   256,   nil,    74,   nil,    80,     9,   nil,   334,
+   279,   322,   nil,   455,   100,   266,   nil,   nil,   nil,   nil,
+    68,   nil,   nil,   226,   nil,   250,   244,    -5,   nil,   nil,
+   nil,   nil,   nil,   232,   215,   nil,   263,   nil,    -2,   182,
+   nil,   176,   nil,   nil,   178,   nil,    22,   nil,   176,   nil,
+   nil,   143,   126,   116,   nil,   nil,   nil,    93,   nil,    87,
+     7,    29,    23,    25,   nil,   nil,   242,    64,   214,     4,
+   286,   329,   nil,   303,   nil,   324,   nil,   nil,   339,   105,
+   nil,   325,   162,   284,   nil,   nil,    26,   nil,   nil,   nil,
+   101,   nil,   256,   287,   235,     0,    49,   nil,   205,   196,
+   188,   nil,   nil,   105,    88,   nil,   330,    58,   nil,   nil,
+   -18,   nil,   472,   nil,   nil,   302,   208,    58,   239,    47,
+    48,    60,   nil,    63,   160,   nil,    75,   404,   nil,   nil,
+   nil,   421,   nil,    45,   nil,   nil,   246,   nil,   144,   198,
+   nil,   nil,   nil,   nil,   153,   nil,   154,   134,   136,    62,
+    16,   177,   285,   nil,    10,   nil,   nil,   nil,   nil,   190,
+   184,   nil,   192,   nil,   nil,   nil,     0,   214,   nil,   122,
+   nil,   nil,   215,   221,   221,   215,   110,   231,   nil,   319,
+   nil,   336,   nil,   353,   nil,   nil,    -4,   nil,   248,   250,
+   252,   265,   nil,   nil,   nil,   nil,   288,   nil,   nil,   nil,
+   273,   nil,    86,   nil,   198,   nil,   nil,   nil,   308,   150,
+   nil,   nil,   138,   nil,   nil,   119,   132,   nil,   370,   nil,
+   nil,   nil,   nil,   333,   nil,   nil,   186,   387,   nil,   nil,
+   nil,   nil,   nil,   438,   nil,   nil,   302,   257,   nil,   nil ]
 
 racc_action_default = [
-  -130,  -150,   -16,    -5,  -150,    -6,  -150,    -7,  -150,  -150,
-    -8,    -9,   -37,   -10,  -150,   -11,  -150,   -36,   -12,  -150,
-  -150,  -150,   -13,    -1,  -150,   -33,   -14,    -2,   -15,    -3,
-  -150,  -124,  -123,  -130,   -32,  -150,  -150,  -130,  -125,  -128,
-  -127,  -129,   -35,  -130,  -130,  -143,  -150,   -18,  -150,   -19,
-   -87,   -20,   -88,   -21,   -56,   -23,   -65,   -24,  -150,   -25,
-   -26,  -150,  -150,   -79,   -81,   -89,   -83,  -150,   -95,   -78,
-   -56,   -82,   -77,   -57,  -115,   -84,   -80,   -85,  -150,  -150,
-   -65,  -150,  -116,   -65,    -4,  -130,   -34,   -64,  -150,  -150,
-  -141,  -150,  -150,  -130,   -56,   -50,  -150,   -49,   -41,   -43,
-  -150,   -40,  -150,  -150,  -150,  -150,  -150,   -52,  -148,  -150,
+  -130,  -152,   -16,    -5,  -152,    -6,  -152,    -7,  -152,  -152,
+    -8,    -9,   -37,   -10,  -152,   -11,  -152,   -36,   -12,  -152,
+  -152,  -152,   -13,    -1,  -152,   -33,   -14,    -2,   -15,    -3,
+  -152,  -124,  -123,  -130,   -32,  -152,  -152,  -130,  -125,  -128,
+  -127,  -129,   -35,  -130,  -130,  -145,  -152,   -18,  -152,   -19,
+   -87,   -20,   -88,   -21,   -56,   -23,   -65,   -24,  -152,   -25,
+   -26,  -152,  -152,   -79,   -81,   -89,   -83,  -152,   -95,   -78,
+   -56,   -82,   -77,   -57,  -115,   -84,   -80,   -85,  -152,  -152,
+   -65,  -152,  -116,   -65,    -4,  -130,   -34,   -64,  -152,  -152,
+  -141,  -152,  -152,  -130,   -56,   -50,  -152,   -49,   -41,   -43,
+  -152,   -40,  -152,  -152,  -152,  -152,  -152,   -52,  -150,  -152,
    -60,   -61,   -63,   -59,   -56,   -66,   -62,   -58,   -57,  -114,
-   -54,  -113,  -150,  -145,   -69,  -150,  -150,  -150,  -150,  -150,
-  -148,  -150,   248,  -148,  -131,  -132,  -150,  -150,  -142,  -150,
-  -126,  -150,   -46,   -45,  -150,   -39,  -150,  -150,   -38,   -17,
-   -90,   -22,  -150,   -27,  -150,  -149,   -65,  -150,   -55,  -150,
-  -150,  -144,  -150,  -146,  -147,  -110,  -109,  -150,   -56,  -112,
-  -150,  -103,  -111,  -104,  -150,  -150,   -97,  -150,  -101,   -91,
-  -150,  -150,  -140,  -150,  -150,  -138,  -135,  -150,  -120,  -150,
-  -122,  -150,   -44,   -42,   -73,   -75,   -72,   -76,   -71,   -74,
-   -47,   -48,   -29,   -67,  -148,   -68,   -53,   -28,   -93,   -70,
-  -150,  -106,  -150,   -86,   -98,   -96,  -150,  -150,   -30,   -31,
-  -150,  -133,  -134,  -150,  -150,  -118,  -150,  -119,  -121,   -51,
-   -92,  -150,  -108,  -105,  -150,  -150,  -102,  -139,  -136,  -137,
-  -117,  -150,  -107,  -100,  -150,  -150,   -99,   -94 ]
+   -54,  -113,  -152,  -147,   -69,  -152,  -152,  -152,  -152,  -152,
+  -150,  -152,   250,  -150,  -131,  -132,  -152,  -152,  -143,  -142,
+  -144,  -152,  -126,  -152,   -46,   -45,  -152,   -39,  -152,  -152,
+   -38,   -17,   -90,   -22,  -152,   -27,  -152,  -151,   -65,  -152,
+   -55,  -152,  -152,  -146,  -152,  -148,  -149,  -110,  -109,  -152,
+   -56,  -112,  -152,  -103,  -111,  -104,  -152,  -152,   -97,  -152,
+  -101,   -91,  -152,  -152,  -140,  -152,  -152,  -138,  -135,  -152,
+  -120,  -152,  -122,  -152,   -44,   -42,   -73,   -75,   -72,   -76,
+   -71,   -74,   -47,   -48,   -29,   -67,  -150,   -68,   -53,   -28,
+   -93,   -70,  -152,  -106,  -152,   -86,   -98,   -96,  -152,  -152,
+   -30,   -31,  -152,  -133,  -134,  -152,  -152,  -118,  -152,  -119,
+  -121,   -51,   -92,  -152,  -108,  -105,  -152,  -152,  -102,  -139,
+  -136,  -137,  -117,  -152,  -107,  -100,  -152,  -152,   -99,   -94 ]
 
 racc_goto_table = [
-    23,    59,   173,   107,    84,   111,   112,    33,    38,    82,
-    57,   186,   108,   167,   162,   178,    55,   176,    68,    88,
-    78,    96,   102,    91,    47,   175,    27,    85,   200,   201,
-   174,   154,   203,    61,    87,    59,   130,   230,   125,   133,
-   151,    97,    97,    34,    57,   117,   211,    95,    95,   171,
-    55,   120,   104,   180,   116,   212,   181,   167,   103,    90,
-   113,   159,   178,    90,   214,   136,   124,    42,    37,   193,
-   183,   141,   184,    19,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   129,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    97,   140,   nil,    59,   195,   195,    95,   nil,   nil,
-   238,   234,   nil,    57,   236,   206,   nil,   111,   112,    55,
-   242,   135,   204,   nil,   nil,   172,    59,   172,   nil,   nil,
-   119,   167,   160,   nil,   169,    57,   169,   229,   nil,   nil,
-   166,    55,   166,   nil,   nil,   198,   198,   189,   nil,   191,
-   nil,    84,    97,   nil,   197,   197,   121,   117,    95,   nil,
-   196,   196,   nil,   nil,   nil,   nil,   116,   nil,   nil,   172,
-   nil,   205,   113,    60,   172,    75,   209,    75,   169,   nil,
-    84,   nil,    84,   169,   166,   nil,   nil,   110,   nil,   166,
-   nil,    75,   nil,   nil,   nil,   nil,   nil,   226,   nil,   nil,
-   119,   nil,   119,   nil,   nil,   nil,   nil,    60,   nil,    75,
-   nil,   nil,   nil,   nil,   nil,   nil,   172,    84,   nil,   nil,
-   199,   199,   nil,    75,   232,   169,   121,   nil,   121,   nil,
-   nil,   166,   119,   172,   237,    84,    84,   nil,   239,   nil,
-    75,   nil,   169,   nil,   119,   244,   121,   121,   166,   119,
-   nil,   245,   nil,   nil,   nil,   nil,   nil,   165,   121,   165,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   153,   nil,   nil,
-   121,   nil,   nil,   nil,   nil,   121,   nil,   194,   194,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   110,
-   nil,   119,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   165,   nil,   nil,   nil,   nil,   165,   nil,   119,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   121,    75,   nil,
-   nil,   nil,   nil,    75,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   121,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   165,   nil,
+    23,   169,    59,   180,   175,    84,   188,   108,   112,    55,
+    82,   107,   164,    96,   102,   111,    38,    57,   178,    33,
+    88,    27,    47,    19,    91,   202,   203,   205,   125,    61,
+   232,   130,   177,   195,   133,    42,    59,   156,   173,    85,
+    95,    95,   161,    55,   214,   120,   117,   169,    97,    97,
+   213,    57,   180,   113,    90,    68,   103,    78,    90,   182,
+   136,   116,   183,   143,   153,    37,   176,   216,   185,   186,
+    34,    87,   139,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   104,
+    95,   119,   nil,   nil,   238,    59,   nil,   240,    97,   nil,
+   142,   236,    55,   124,   nil,   nil,   135,   197,   197,   206,
+    57,   169,   112,   nil,   244,   208,   174,    59,   174,   111,
+   129,   nil,   162,   168,    55,   168,   nil,   nil,   nil,   nil,
+   nil,   171,    57,   171,   nil,   231,   nil,   191,   200,   200,
+   nil,   193,   nil,    95,    84,   198,   198,   nil,   nil,   nil,
+   117,    97,   nil,   199,   199,   nil,   nil,   113,   nil,   nil,
+   nil,   119,   174,   119,   121,   116,   nil,   174,    60,   168,
+    75,   nil,    75,    84,   168,    84,   nil,   171,   nil,   nil,
+   110,   nil,   171,   201,   201,   nil,    75,   nil,   nil,   228,
+   nil,   nil,   nil,   nil,   nil,   119,   nil,   nil,   nil,   nil,
+   207,   nil,    60,   nil,    75,   211,   nil,   119,   nil,   174,
+    84,   nil,   119,   nil,   nil,   nil,   168,   nil,    75,   nil,
+   nil,   nil,   nil,   nil,   171,   nil,   174,   nil,    84,    84,
+   nil,   nil,   nil,   168,   121,    75,   121,   246,   nil,   nil,
+   nil,   171,   nil,   247,   nil,   nil,   nil,   nil,   nil,   nil,
+   167,   nil,   167,   234,   119,   nil,   121,   121,   nil,   nil,
+   nil,   nil,   155,   239,   nil,   nil,   nil,   241,   121,   nil,
+   nil,   119,   196,   196,   nil,   nil,   nil,   nil,   nil,   nil,
+   121,   nil,   nil,   nil,   110,   121,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   167,   nil,   nil,   nil,
+   nil,   167,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    75,   nil,   nil,   nil,   nil,
+    75,   nil,   nil,   nil,   nil,   nil,   nil,   121,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   165,   nil,   nil,   nil,   nil,
-   nil,    75,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    75,   nil,   nil,   nil,    75 ]
+   nil,   nil,   nil,   167,   121,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   167,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    75,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    75,   nil,
+   nil,   nil,    75 ]
 
 racc_goto_check = [
-     2,    23,    56,    38,     4,    41,    42,    58,    62,    23,
-    22,    65,    27,    54,    46,    54,    21,    52,    43,    60,
-    43,    32,    32,    60,    17,    51,     3,    58,    37,    37,
-    18,    28,    44,    49,    43,    23,    27,    50,    45,    27,
-    20,    22,    22,     5,    22,    23,    56,    21,    21,    55,
-    21,    25,    43,    28,    22,    57,    28,    54,    17,     3,
-    21,    26,    54,     3,    52,    59,    43,    31,    61,    33,
-    63,    32,    64,     1,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    43,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    22,    62,   nil,    23,    41,    41,    21,   nil,   nil,
-    65,    46,   nil,    22,    54,    38,   nil,    41,    42,    21,
-    56,     3,    27,   nil,   nil,    23,    23,    23,   nil,   nil,
-    47,    54,     2,   nil,    22,    22,    22,    28,   nil,   nil,
-    21,    21,    21,   nil,   nil,    23,    23,     2,   nil,     2,
-   nil,     4,    22,   nil,    22,    22,    48,    23,    21,   nil,
-    21,    21,   nil,   nil,   nil,   nil,    22,   nil,   nil,    23,
-   nil,    43,    21,    24,    23,    24,    43,    24,    22,   nil,
-     4,   nil,     4,    22,    21,   nil,   nil,    40,   nil,    21,
-   nil,    24,   nil,   nil,   nil,   nil,   nil,     2,   nil,   nil,
-    47,   nil,    47,   nil,   nil,   nil,   nil,    24,   nil,    24,
-   nil,   nil,   nil,   nil,   nil,   nil,    23,     4,   nil,   nil,
-    47,    47,   nil,    24,    43,    22,    48,   nil,    48,   nil,
-   nil,    21,    47,    23,    43,     4,     4,   nil,    43,   nil,
-    24,   nil,    22,   nil,    47,     2,    48,    48,    21,    47,
-   nil,     2,   nil,   nil,   nil,   nil,   nil,    40,    48,    40,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    24,   nil,   nil,
-    48,   nil,   nil,   nil,   nil,    48,   nil,    40,    40,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    40,
-   nil,    47,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    40,   nil,   nil,   nil,   nil,    40,   nil,    47,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    48,    24,   nil,
-   nil,   nil,   nil,    24,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    48,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    40,   nil,
+     2,    54,    23,    54,    56,     4,    65,    27,    42,    21,
+    23,    38,    46,    32,    32,    41,    62,    22,    52,    58,
+    60,     3,    17,     1,    60,    37,    37,    44,    45,    49,
+    50,    27,    51,    33,    27,    31,    23,    28,    55,    58,
+    21,    21,    26,    21,    57,    25,    23,    54,    22,    22,
+    56,    22,    54,    21,     3,    43,    17,    43,     3,    28,
+    59,    22,    28,    32,    20,    61,    18,    52,    63,    64,
+     5,    43,    66,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    43,
+    21,    47,   nil,   nil,    54,    23,   nil,    65,    22,   nil,
+    62,    46,    21,    43,   nil,   nil,     3,    41,    41,    27,
+    22,    54,    42,   nil,    56,    38,    23,    23,    23,    41,
+    43,   nil,     2,    21,    21,    21,   nil,   nil,   nil,   nil,
+   nil,    22,    22,    22,   nil,    28,   nil,     2,    23,    23,
+   nil,     2,   nil,    21,     4,    21,    21,   nil,   nil,   nil,
+    23,    22,   nil,    22,    22,   nil,   nil,    21,   nil,   nil,
+   nil,    47,    23,    47,    48,    22,   nil,    23,    24,    21,
+    24,   nil,    24,     4,    21,     4,   nil,    22,   nil,   nil,
+    40,   nil,    22,    47,    47,   nil,    24,   nil,   nil,     2,
+   nil,   nil,   nil,   nil,   nil,    47,   nil,   nil,   nil,   nil,
+    43,   nil,    24,   nil,    24,    43,   nil,    47,   nil,    23,
+     4,   nil,    47,   nil,   nil,   nil,    21,   nil,    24,   nil,
+   nil,   nil,   nil,   nil,    22,   nil,    23,   nil,     4,     4,
+   nil,   nil,   nil,    21,    48,    24,    48,     2,   nil,   nil,
+   nil,    22,   nil,     2,   nil,   nil,   nil,   nil,   nil,   nil,
+    40,   nil,    40,    43,    47,   nil,    48,    48,   nil,   nil,
+   nil,   nil,    24,    43,   nil,   nil,   nil,    43,    48,   nil,
+   nil,    47,    40,    40,   nil,   nil,   nil,   nil,   nil,   nil,
+    48,   nil,   nil,   nil,    40,    48,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    40,   nil,   nil,   nil,
+   nil,    40,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    24,   nil,   nil,   nil,   nil,
+    24,   nil,   nil,   nil,   nil,   nil,   nil,    48,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    40,    48,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    40,   nil,   nil,   nil,   nil,
-   nil,    24,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    24,   nil,   nil,   nil,    24 ]
+    40,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    24,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    24,   nil,
+   nil,   nil,    24 ]
 
 racc_goto_pointer = [
-   nil,    73,     0,    26,   -19,    37,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    12,   -97,   nil,
-   -65,     4,    -2,   -11,   151,    -5,   -59,   -44,   -77,   nil,
-   nil,    58,   -22,   -75,   nil,   nil,   nil,  -118,   -53,   nil,
-   121,   -51,   -50,     4,  -123,   -24,  -111,    64,    90,    19,
-  -171,  -103,  -111,   nil,  -113,   -77,  -124,  -115,     3,   -20,
-   -14,    60,     0,   -64,   -62,  -123 ]
+   nil,    23,     0,    21,   -18,    64,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    10,   -61,   nil,
+   -41,    -3,     5,   -10,   156,   -11,   -78,   -49,   -71,   nil,
+   nil,    26,   -30,  -113,   nil,   nil,   nil,  -123,   -45,   nil,
+   124,   -41,   -48,    41,  -130,   -34,  -113,    35,   108,    15,
+  -180,   -96,  -110,   nil,  -125,   -88,  -122,  -128,    15,   -25,
+   -13,    57,     8,   -66,   -65,  -128,   -17 ]
 
 racc_goto_default = [
    nil,   nil,   nil,   101,    29,     3,     5,     7,    10,    11,
     13,    15,    18,    22,    26,    28,     2,   nil,    49,    51,
     53,    69,    71,    72,    21,   nil,   nil,   nil,   nil,     6,
-     9,   nil,   nil,    98,   144,    99,   100,   nil,   nil,   109,
+     9,   nil,   nil,    98,   146,    99,   100,   nil,   nil,   109,
     63,    64,    66,   nil,   115,   nil,   nil,    76,    77,   nil,
-   nil,   nil,   nil,   177,    67,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil ]
+   nil,   nil,   nil,   179,    67,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
 
 racc_token_table = {
  false => 0,
@@ -811,7 +815,8 @@ Racc_token_to_s_table = [
 'hostname',
 'nothing',
 'arguments',
-'argument']
+'argument',
+'nameordefault']
 
 Racc_debug_parser = false
 
@@ -1673,15 +1678,19 @@ module_eval <<'.,.,', 'grammar.ra', 588
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 592
-  def _reduce_143( val, _values, result )
+ # reduce 143 omitted
+
+ # reduce 144 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 594
+  def _reduce_145( val, _values, result )
     result = ast AST::Variable, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 600
-  def _reduce_144( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 602
+  def _reduce_146( val, _values, result )
     if val[1].instance_of?(AST::ASTArray)
         result = val[1]
     else
@@ -1691,21 +1700,21 @@ module_eval <<'.,.,', 'grammar.ra', 600
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 602
-  def _reduce_145( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 604
+  def _reduce_147( val, _values, result )
     result = ast AST::ASTArray
    result
   end
 .,.,
 
- # reduce 146 omitted
+ # reduce 148 omitted
 
- # reduce 147 omitted
+ # reduce 149 omitted
 
- # reduce 148 omitted
+ # reduce 150 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 607
-  def _reduce_149( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 609
+  def _reduce_151( val, _values, result )
  result = nil
    result
   end