Partially fixing #460, take 2 -- fully-qualified definitions can now be used.

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

6 files changed, 434 insertions, 404 deletions

diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra
index 734c6b084..26ffb5410 100644
--- a/lib/puppet/parser/grammar.ra
+++ b/lib/puppet/parser/grammar.ra
@@ -102,10 +102,7 @@ resourcerefs:     resourceref
     result = val[0]
 }
 
-resource:       NAME LBRACE resourceinstances endsemi RBRACE {
-    if val[0].instance_of?(AST::ASTArray)
-        error "Invalid name"
-    end
+resource:       fqname LBRACE resourceinstances endsemi RBRACE {
     array = val[2]
     if array.instance_of?(AST::ResourceInst)
         array = [array]
@@ -124,14 +121,11 @@ resource:       NAME LBRACE resourceinstances endsemi RBRACE {
             :title => instance[0],
             :params => instance[1])
     }
-}           | NAME LBRACE params endcomma RBRACE {
+}           | fqname LBRACE params endcomma RBRACE {
     # This is a deprecated syntax.
     error "All resource specifications require names"
 }           | TYPE LBRACE params endcomma RBRACE {
-    # a template setting for a type
-    if val[0].instance_of?(AST::ASTArray)
-        error "Invalid type"
-    end
+    # a defaults setting for a type
     result = ast(AST::ResourceDefaults, :type => val[0], :params => val[2])
 }
 
diff --git a/lib/puppet/parser/parser.rb b/lib/puppet/parser/parser.rb
index 8ea7a8034..2ea7aa365 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..iddf5e17e6fb', 'grammar.ra', 636
+module_eval <<'..end grammar.ra modeval..idcac66c31eb', 'grammar.ra', 630
 require 'puppet/parser/functions'
 
 attr_reader :file, :interp
@@ -199,7 +199,7 @@ end
 
 # $Id$
 
-..end grammar.ra modeval..iddf5e17e6fb
+..end grammar.ra modeval..idcac66c31eb
 
 ##### racc 1.4.5 generates ###
 
@@ -237,89 +237,89 @@ racc_reduce_table = [
  5, 55, :_reduce_30,
  5, 66, :_reduce_31,
  2, 56, :_reduce_32,
- 1, 79, :_reduce_33,
- 2, 79, :_reduce_34,
+ 1, 80, :_reduce_33,
+ 2, 80, :_reduce_34,
  2, 57, :_reduce_35,
- 1, 80, :_reduce_none,
- 1, 80, :_reduce_none,
- 3, 81, :_reduce_38,
- 3, 81, :_reduce_39,
- 1, 82, :_reduce_none,
- 1, 82, :_reduce_none,
- 3, 82, :_reduce_42,
+ 1, 81, :_reduce_none,
+ 1, 81, :_reduce_none,
+ 3, 82, :_reduce_38,
+ 3, 82, :_reduce_39,
  1, 83, :_reduce_none,
- 3, 83, :_reduce_44,
- 1, 84, :_reduce_none,
+ 1, 83, :_reduce_none,
+ 3, 83, :_reduce_42,
  1, 84, :_reduce_none,
- 3, 85, :_reduce_47,
- 3, 85, :_reduce_48,
- 1, 86, :_reduce_none,
- 1, 86, :_reduce_none,
- 4, 88, :_reduce_51,
- 1, 75, :_reduce_none,
- 3, 75, :_reduce_53,
- 0, 76, :_reduce_none,
+ 3, 84, :_reduce_44,
+ 1, 85, :_reduce_none,
+ 1, 85, :_reduce_none,
+ 3, 86, :_reduce_47,
+ 3, 86, :_reduce_48,
+ 1, 87, :_reduce_none,
+ 1, 87, :_reduce_none,
+ 4, 89, :_reduce_51,
  1, 76, :_reduce_none,
+ 3, 76, :_reduce_53,
+ 0, 77, :_reduce_none,
+ 1, 77, :_reduce_none,
  1, 71, :_reduce_56,
- 1, 90, :_reduce_57,
- 1, 89, :_reduce_none,
- 1, 89, :_reduce_none,
- 1, 89, :_reduce_none,
- 1, 89, :_reduce_none,
- 1, 89, :_reduce_none,
- 1, 89, :_reduce_none,
+ 1, 91, :_reduce_57,
+ 1, 90, :_reduce_none,
+ 1, 90, :_reduce_none,
+ 1, 90, :_reduce_none,
+ 1, 90, :_reduce_none,
+ 1, 90, :_reduce_none,
+ 1, 90, :_reduce_none,
  3, 58, :_reduce_64,
- 0, 77, :_reduce_65,
- 1, 77, :_reduce_66,
- 3, 77, :_reduce_67,
- 3, 94, :_reduce_68,
- 1, 95, :_reduce_none,
- 3, 95, :_reduce_70,
- 1, 87, :_reduce_none,
- 1, 87, :_reduce_none,
- 1, 87, :_reduce_none,
- 1, 87, :_reduce_none,
- 1, 87, :_reduce_none,
- 1, 87, :_reduce_none,
- 1, 93, :_reduce_none,
- 1, 93, :_reduce_none,
- 1, 93, :_reduce_none,
- 1, 93, :_reduce_none,
- 1, 93, :_reduce_none,
- 1, 93, :_reduce_none,
- 1, 93, :_reduce_none,
- 1, 93, :_reduce_none,
- 1, 93, :_reduce_none,
- 4, 98, :_reduce_86,
+ 0, 78, :_reduce_65,
+ 1, 78, :_reduce_66,
+ 3, 78, :_reduce_67,
+ 3, 95, :_reduce_68,
+ 1, 96, :_reduce_none,
+ 3, 96, :_reduce_70,
+ 1, 88, :_reduce_none,
+ 1, 88, :_reduce_none,
+ 1, 88, :_reduce_none,
+ 1, 88, :_reduce_none,
+ 1, 88, :_reduce_none,
+ 1, 88, :_reduce_none,
+ 1, 94, :_reduce_none,
+ 1, 94, :_reduce_none,
+ 1, 94, :_reduce_none,
+ 1, 94, :_reduce_none,
+ 1, 94, :_reduce_none,
+ 1, 94, :_reduce_none,
+ 1, 94, :_reduce_none,
+ 1, 94, :_reduce_none,
+ 1, 94, :_reduce_none,
+ 4, 99, :_reduce_86,
  1, 73, :_reduce_87,
  1, 73, :_reduce_88,
- 1, 97, :_reduce_89,
+ 1, 98, :_reduce_89,
  4, 74, :_reduce_90,
  4, 74, :_reduce_91,
  6, 60, :_reduce_92,
- 0, 100, :_reduce_none,
- 4, 100, :_reduce_94,
- 1, 99, :_reduce_none,
+ 0, 101, :_reduce_none,
+ 4, 101, :_reduce_94,
+ 1, 100, :_reduce_none,
  5, 59, :_reduce_96,
- 1, 101, :_reduce_none,
- 2, 101, :_reduce_98,
- 5, 102, :_reduce_99,
- 4, 102, :_reduce_100,
- 1, 103, :_reduce_none,
- 3, 103, :_reduce_102,
- 3, 91, :_reduce_103,
- 1, 105, :_reduce_none,
- 3, 105, :_reduce_105,
- 1, 107, :_reduce_none,
- 3, 107, :_reduce_107,
- 3, 106, :_reduce_108,
- 1, 104, :_reduce_none,
- 1, 104, :_reduce_none,
+ 1, 102, :_reduce_none,
+ 2, 102, :_reduce_98,
+ 5, 103, :_reduce_99,
+ 4, 103, :_reduce_100,
  1, 104, :_reduce_none,
- 1, 104, :_reduce_none,
- 1, 104, :_reduce_none,
- 1, 104, :_reduce_none,
- 1, 104, :_reduce_115,
+ 3, 104, :_reduce_102,
+ 3, 92, :_reduce_103,
+ 1, 106, :_reduce_none,
+ 3, 106, :_reduce_105,
+ 1, 108, :_reduce_none,
+ 3, 108, :_reduce_107,
+ 3, 107, :_reduce_108,
+ 1, 105, :_reduce_none,
+ 1, 105, :_reduce_none,
+ 1, 105, :_reduce_none,
+ 1, 105, :_reduce_none,
+ 1, 105, :_reduce_none,
+ 1, 105, :_reduce_none,
+ 1, 105, :_reduce_115,
  2, 61, :_reduce_116,
  6, 63, :_reduce_117,
  5, 63, :_reduce_118,
@@ -327,8 +327,8 @@ racc_reduce_table = [
  5, 64, :_reduce_120,
  6, 65, :_reduce_121,
  5, 65, :_reduce_122,
- 1, 108, :_reduce_none,
- 1, 108, :_reduce_none,
+ 1, 75, :_reduce_none,
+ 1, 75, :_reduce_none,
  1, 111, :_reduce_none,
  3, 111, :_reduce_126,
  1, 113, :_reduce_none,
@@ -354,279 +354,277 @@ racc_reduce_table = [
  1, 118, :_reduce_none,
  1, 118, :_reduce_none,
  1, 72, :_reduce_149,
- 3, 92, :_reduce_150,
- 2, 92, :_reduce_151,
- 1, 96, :_reduce_none,
- 1, 96, :_reduce_none,
- 0, 78, :_reduce_none,
- 1, 78, :_reduce_155 ]
+ 3, 93, :_reduce_150,
+ 2, 93, :_reduce_151,
+ 1, 97, :_reduce_none,
+ 1, 97, :_reduce_none,
+ 0, 79, :_reduce_none,
+ 1, 79, :_reduce_155 ]
 
 racc_reduce_n = 156
 
 racc_shift_n = 255
 
 racc_action_table = [
-    62,    50,    52,    50,    52,    94,    62,    50,    52,    58,
-   164,    79,    62,    50,    52,    80,    73,    89,    62,    50,
-    52,   165,    73,   129,    62,    50,    52,    79,    73,   159,
-    91,    45,    43,    45,   120,    65,    70,    45,    96,    74,
-   120,    65,    70,    45,  -111,    74,   152,    65,    70,    45,
-  -112,    74,   186,    65,   175,    45,    44,    74,   162,    65,
-   116,    50,    52,    74,    62,    50,    52,    48,   199,   164,
-    62,    50,    52,   162,   149,   150,    62,    50,    52,  -111,
-    73,   194,    62,    50,    52,  -113,    73,   129,    62,    50,
-    52,    45,    73,   149,   150,    45,    96,   231,    73,    65,
-    70,    45,    36,    74,    73,    65,    70,    45,  -109,    74,
-   230,    65,    70,    45,   128,    74,   154,    65,    70,    45,
-   107,    74,    35,    65,    70,   153,  -109,    74,    62,    50,
-    52,   125,    32,   220,    62,    50,    52,  -110,   224,    31,
-    62,    50,    52,   143,    73,   223,   145,    50,    52,   124,
-    73,    32,   189,    50,    52,    48,    73,   191,    31,    45,
-    39,   209,   120,    65,    70,    45,    39,    74,   120,    65,
-    70,    45,   133,    74,   133,    65,    70,    45,    79,    74,
-    48,    65,   175,    45,   214,    74,   108,    65,   175,    50,
-    52,    74,   107,   189,    40,    50,    52,    41,   191,   217,
-    40,    50,    52,    41,   120,   240,    32,   170,   171,   140,
-   120,    50,    52,    31,   177,   129,   120,    50,    52,    45,
-  -110,   222,   163,    65,   175,    45,   120,    74,   162,    65,
-   175,    45,   120,    74,   130,    65,   175,    95,   225,    74,
-   226,    45,    50,    52,   227,    65,   175,    45,    45,    74,
-   228,    65,   175,    96,    95,    74,   229,   120,    48,    50,
-    52,   157,    56,    80,   254,    45,    50,    52,    95,    56,
-    96,  -114,    45,  -110,    58,    17,    65,   175,    46,    45,
-    74,    58,    50,    52,    96,    14,  -109,    20,    24,    45,
-     1,     4,   215,     8,    54,    12,    45,    16,  -112,    25,
-   155,    54,  -111,    17,   149,   150,    95,   168,  -114,   253,
-   162,   170,   171,    14,   238,    20,    24,    45,     1,     4,
-    17,     8,    96,    12,    86,    16,   232,    25,   156,   242,
-    14,   133,    20,    24,    83,     1,     4,    17,     8,   134,
-    12,   146,    16,   234,    25,    81,   248,    14,   133,    20,
-    24,   139,     1,     4,    17,     8,   136,    12,    30,    16,
-   235,    25,  -112,   nil,    14,   nil,    20,    24,   nil,     1,
-     4,    17,     8,   nil,    12,   nil,    16,   247,    25,   nil,
-   nil,    14,   nil,    20,    24,   nil,     1,     4,    17,     8,
-   nil,    12,   nil,    16,   250,    25,   nil,   nil,    14,   nil,
-    20,    24,   nil,     1,     4,    17,     8,   nil,    12,   nil,
-    16,   195,    25,   nil,   nil,    14,   nil,    20,    24,   nil,
-     1,     4,    17,     8,   nil,    12,   nil,    16,   197,    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,
-   nil,    16,   nil,    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,   nil,    16,   nil,    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,   nil,     8,   nil,    12,   nil,    16,
-   nil,    25 ]
+    62,    50,    52,    50,    52,    94,    62,    50,    52,   110,
+   183,    78,    62,    50,    52,    79,    73,    89,    62,    50,
+    52,   183,    73,   113,    62,    50,    52,   190,    73,   182,
+    91,    45,    43,    45,    73,    64,    68,    45,    96,    74,
+    73,    64,    68,    45,   192,    74,   152,    64,    68,    45,
+  -110,    74,  -109,    64,    68,    45,    44,    74,   182,    64,
+    68,    50,    52,    74,    62,    50,    52,    41,   227,  -112,
+    62,    50,    52,    48,   149,   150,    62,    50,    52,  -111,
+    73,   226,    62,    50,    52,   194,   136,    33,    62,    50,
+    52,    45,    73,   113,     4,    45,    96,   107,    73,    64,
+    68,    45,  -109,    74,    73,    64,   169,    45,  -110,    74,
+   211,    64,    68,    45,   180,    74,   154,    64,    68,    45,
+   114,    74,   254,    64,    68,   153,   185,    74,    62,    50,
+    52,   187,    33,    18,    62,    50,    52,   109,    57,     4,
+    62,    50,    52,    15,    73,    21,    25,    37,     1,     5,
+    73,     8,    37,    13,   218,    17,   136,    26,   159,    45,
+     4,   217,   199,    64,    68,    45,  -113,    74,    48,    64,
+    68,    45,    78,    74,    95,    64,   133,    50,    52,    74,
+    48,    38,  -112,    95,    39,    45,    38,   149,   150,    39,
+    96,    33,   136,   246,    45,    50,    52,    95,     4,    96,
+   143,   185,    33,   145,    18,   140,   187,    45,    45,     4,
+    57,    64,   169,    96,    15,    74,    21,    25,   235,     1,
+     5,    95,     8,   113,    13,    45,    17,   212,    26,    18,
+    54,     4,    45,    50,    52,    50,    52,    96,   108,    15,
+   107,    21,    25,  -111,     1,     5,   219,     8,   136,    13,
+   118,    17,    78,    26,   234,   155,     4,   157,   223,   149,
+   150,    50,    52,    45,   172,    18,   224,    64,   169,   162,
+   225,    74,   156,   163,   165,    15,   136,    21,    25,   228,
+     1,     5,    79,     8,   230,    13,   118,    17,   232,    26,
+    18,    45,     4,  -114,   182,    64,   169,    86,   250,    74,
+    15,  -110,    21,    25,  -109,     1,     5,  -112,     8,    18,
+    13,  -111,    17,  -114,    26,    50,    52,     4,   237,    15,
+    85,    21,    25,   115,     1,     5,   241,     8,   146,    13,
+   136,    17,    82,    26,   120,   195,     4,   239,   139,   163,
+   165,    80,   182,   248,   118,    45,    18,   122,   118,    64,
+   169,    32,   222,    74,   197,   nil,    15,   nil,    21,    25,
+   nil,     1,     5,   nil,     8,    18,    13,   nil,    17,   nil,
+    26,    50,    52,     4,   nil,    15,   nil,    21,    25,   nil,
+     1,     5,   nil,     8,   nil,    13,   136,    17,   nil,    26,
+   nil,   253,     4,    50,    52,   nil,   nil,   nil,   nil,   nil,
+   nil,    45,    18,   nil,   nil,    64,   169,   nil,   136,    74,
+   nil,   nil,    15,   nil,    21,    25,   nil,     1,     5,   209,
+     8,   nil,    13,    45,    17,   nil,    26,    64,   169,     4,
+    18,    74,    50,    52,    50,    52,   nil,   nil,   216,   nil,
+    15,   nil,    21,    25,   nil,     1,     5,   136,     8,   136,
+    13,   nil,    17,   nil,    26,   nil,   nil,     4,   nil,    48,
+    50,    52,    45,  -123,    45,   nil,    64,   169,    64,   169,
+    74,   nil,    74,   nil,   nil,    57,    18,   nil,   nil,    46,
+   nil,   nil,   nil,   nil,   nil,   nil,    15,   nil,    21,    25,
+    45,     1,     5,   nil,     8,    54,    13,    18,    17,   nil,
+    26,   nil,   nil,     4,   nil,   nil,   nil,    15,   nil,    21,
+    25,   nil,     1,     5,   nil,     8,    18,    13,   nil,    17,
+   nil,    26,   nil,   nil,     4,   nil,    15,   nil,    21,    25,
+   nil,     1,     5,   nil,     8,    18,    13,   nil,    17,   nil,
+    26,   nil,   nil,     4,   nil,    15,   nil,    21,    25,   nil,
+     1,     5,   nil,     8,   nil,    13,   nil,    17,   nil,    26,
+   nil,   nil,     4 ]
 
 racc_action_check = [
-    48,    48,    48,   107,   107,    37,    79,    79,    79,   108,
-   116,    17,   169,   169,   169,    17,    48,    33,   165,   165,
-   165,   122,    79,   116,    56,    56,    56,    73,   169,   108,
-    37,    48,     9,   107,   165,    48,    48,    79,   107,    48,
-    56,    79,    79,   169,    72,    79,    98,   169,   169,   165,
-    71,   169,   131,   165,   165,    56,     9,   165,   132,    56,
-    56,   129,   129,    56,   164,   164,   164,    70,   148,   133,
-    30,    30,    30,   135,    98,    98,    14,    14,    14,   119,
-   164,   138,    16,    16,    16,    77,    30,    70,   217,   217,
-   217,   129,    14,   148,   148,   164,   129,   192,    16,   164,
-   164,    30,     6,   164,   217,    30,    30,    14,    69,    30,
-   192,    14,    14,    16,    67,    14,   102,    16,    16,   217,
-   181,    16,     6,   217,   217,   102,   115,   217,    62,    62,
-    62,    62,    24,   181,   229,   229,   229,    63,   184,    24,
-   227,   227,   227,    91,    62,   184,    91,   153,   153,    61,
-   229,     4,   231,   224,   224,   159,   227,   231,     4,    62,
-     8,   161,   153,    62,    62,   229,    94,    62,   224,   229,
-   229,   227,   162,   229,   163,   227,   227,   153,    58,   227,
-    54,   153,   153,   224,   166,   153,    51,   224,   224,   241,
-   241,   224,    49,   136,     8,   177,   177,     8,   136,   174,
-    94,   154,   154,    94,   241,   219,    89,   219,   219,    89,
-   177,   128,   128,    89,   128,   175,   154,   182,   182,   241,
-   112,   182,   111,   241,   241,   177,   128,   241,   110,   177,
-   177,   154,   182,   177,    78,   154,   154,    44,   187,   154,
-   188,   128,   130,   130,   189,   128,   128,   182,    44,   128,
-   190,   182,   182,    44,   151,   182,   191,   130,    12,    12,
-    12,   106,    12,    36,   252,   151,    46,    46,    43,    35,
-   151,    76,   130,   201,    12,   252,   130,   130,    12,    43,
-   130,    46,    20,    20,    43,   252,   203,   252,   252,    12,
-   252,   252,   167,   252,    12,   252,    46,   252,   204,   252,
-   104,    46,   205,   167,   104,   104,    95,   127,   206,   251,
-   211,   127,   127,   167,   215,   167,   167,    95,   167,   167,
-   251,   167,    95,   167,    25,   167,   194,   167,   105,   223,
-   251,    80,   251,   251,    21,   251,   251,   194,   251,    81,
-   251,    92,   251,   196,   251,    19,   238,   194,    83,   194,
-   194,    88,   194,   194,   196,   194,    85,   194,     1,   194,
-   198,   194,   118,   nil,   196,   nil,   196,   196,   nil,   196,
-   196,   198,   196,   nil,   196,   nil,   196,   233,   196,   nil,
-   nil,   198,   nil,   198,   198,   nil,   198,   198,   233,   198,
-   nil,   198,   nil,   198,   242,   198,   nil,   nil,   233,   nil,
-   233,   233,   nil,   233,   233,   242,   233,   nil,   233,   nil,
-   233,   139,   233,   nil,   nil,   242,   nil,   242,   242,   nil,
-   242,   242,   139,   242,   nil,   242,   nil,   242,   146,   242,
-   nil,   nil,   139,   nil,   139,   139,   nil,   139,   139,   146,
-   139,   nil,   139,   nil,   139,   nil,   139,   nil,   nil,   146,
-   nil,   146,   146,   nil,   146,   146,   248,   146,   nil,   146,
-   nil,   146,   nil,   146,   nil,   nil,   248,   nil,   248,   248,
-   nil,   248,   248,    23,   248,   nil,   248,   nil,   248,   nil,
-   248,   nil,   nil,    23,   nil,    23,    23,   nil,    23,    23,
-   124,    23,   nil,    23,   nil,    23,   nil,    23,   nil,   nil,
-   124,   nil,   124,   124,   nil,   124,   124,     0,   124,   nil,
-   124,   nil,   124,   nil,   124,   nil,   nil,     0,   nil,     0,
-     0,   nil,     0,     0,   nil,     0,   nil,     0,   nil,     0,
-   nil,     0 ]
+    78,    78,    78,   113,   113,    35,    62,    62,    62,    62,
+   133,    18,   164,   164,   164,    18,    78,    34,    48,    48,
+    48,   118,    62,   133,   183,   183,   183,   124,   164,   127,
+    35,    78,    11,   113,    48,    78,    78,    62,   113,    78,
+   183,    62,    62,   164,   128,    62,    99,   164,   164,    48,
+   129,   164,   132,    48,    48,   183,    11,    48,   117,   183,
+   183,   107,   107,   183,   223,   223,   223,     9,   188,   134,
+   194,   194,   194,    68,    99,    99,    15,    15,    15,   135,
+   223,   188,    17,    17,    17,   138,   194,     9,    32,    32,
+    32,   107,    15,    68,     9,   223,   107,   166,    17,   223,
+   223,   194,    67,   223,    32,   194,   194,    15,    63,   194,
+   166,    15,    15,    17,   116,    15,   103,    17,    17,    32,
+    69,    17,   252,    32,    32,   103,   227,    32,   212,   212,
+   212,   227,    25,   252,   225,   225,   225,    61,   108,    25,
+    86,    86,    86,   252,   212,   252,   252,    94,   252,   252,
+   225,   252,     8,   252,   178,   252,    86,   252,   108,   212,
+   252,   178,   148,   212,   212,   225,    60,   212,   159,   225,
+   225,    86,    57,   225,    43,    86,    86,   218,   218,    86,
+    54,    94,    71,   151,    94,    43,     8,   148,   148,     8,
+    43,     5,   218,   229,   151,    46,    46,    95,     5,   151,
+    91,   122,    89,    91,   229,    89,   122,   218,    95,    89,
+    46,   218,   218,    95,   229,   218,   229,   229,   198,   229,
+   229,    44,   229,   169,   229,    46,   229,   171,   229,   198,
+    46,   229,    44,   240,   240,    21,    21,    44,    51,   198,
+    49,   198,   198,    72,   198,   198,   181,   198,   240,   198,
+   182,   198,    73,   198,   196,   104,   198,   106,   185,   104,
+   104,   114,   114,   240,   114,   196,   186,   240,   240,   112,
+   187,   240,   105,   112,   112,   196,   114,   196,   196,   190,
+   196,   196,    41,   196,   191,   196,   192,   196,   193,   196,
+   190,   114,   196,    76,   121,   114,   114,    27,   241,   114,
+   190,   202,   190,   190,   204,   190,   190,   205,   190,   241,
+   190,   206,   190,   207,   190,   115,   115,   190,   209,   241,
+    26,   241,   241,    77,   241,   241,   217,   241,    92,   241,
+   115,   241,    22,   241,    80,   139,   241,   214,    88,   214,
+   214,    20,   231,   237,    79,   115,   139,    84,    82,   115,
+   115,     1,   184,   115,   146,   nil,   139,   nil,   139,   139,
+   nil,   139,   139,   nil,   139,   146,   139,   nil,   139,   nil,
+   139,   153,   153,   139,   nil,   146,   nil,   146,   146,   nil,
+   146,   146,   nil,   146,   nil,   146,   153,   146,   nil,   146,
+   nil,   251,   146,   172,   172,   nil,   nil,   nil,   nil,   nil,
+   nil,   153,   251,   nil,   nil,   153,   153,   nil,   172,   153,
+   nil,   nil,   251,   nil,   251,   251,   nil,   251,   251,   161,
+   251,   nil,   251,   172,   251,   nil,   251,   172,   172,   251,
+   161,   172,   154,   154,   176,   176,   nil,   nil,   176,   nil,
+   161,   nil,   161,   161,   nil,   161,   161,   154,   161,   176,
+   161,   nil,   161,   nil,   161,   nil,   nil,   161,   nil,    13,
+    13,    13,   154,    13,   176,   nil,   154,   154,   176,   176,
+   154,   nil,   176,   nil,   nil,    13,   248,   nil,   nil,    13,
+   nil,   nil,   nil,   nil,   nil,   nil,   248,   nil,   248,   248,
+    13,   248,   248,   nil,   248,    13,   248,   109,   248,   nil,
+   248,   nil,   nil,   248,   nil,   nil,   nil,   109,   nil,   109,
+   109,   nil,   109,   109,   nil,   109,    24,   109,   nil,   109,
+   nil,   109,   nil,   nil,   109,   nil,    24,   nil,    24,    24,
+   nil,    24,    24,   nil,    24,     0,    24,   nil,    24,   nil,
+    24,   nil,   nil,    24,   nil,     0,   nil,     0,     0,   nil,
+     0,     0,   nil,     0,   nil,     0,   nil,     0,   nil,     0,
+   nil,   nil,     0 ]
 
 racc_action_pointer = [
-   489,   345,   nil,   nil,   113,   nil,    84,   nil,   156,    13,
-   nil,   nil,   256,   nil,    74,   nil,    80,     9,   nil,   345,
-   279,   328,   nil,   455,    94,   282,   nil,   nil,   nil,   nil,
-    68,   nil,   nil,   -18,   nil,   263,   257,    -5,   nil,   nil,
-   nil,   nil,   nil,   246,   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,
-    65,    29,    23,    25,   nil,   nil,   250,    64,   228,     4,
-   293,   339,   nil,   310,   nil,   334,   nil,   nil,   345,   168,
-   nil,   105,   335,   nil,   162,   284,   nil,   nil,    26,   nil,
-   nil,   nil,   101,   nil,   256,   305,   256,     0,    -9,   nil,
-   218,   205,   199,   nil,   nil,   105,     1,   nil,   341,    58,
-   nil,   nil,   -18,   nil,   472,   nil,   nil,   302,   208,    58,
-   239,    47,    48,    60,   nil,    63,   160,   nil,    75,   404,
-   nil,   nil,   nil,   nil,   nil,   nil,   421,   nil,    45,   nil,
-   nil,   232,   nil,   144,   198,   nil,   nil,   nil,   nil,   153,
-   nil,   154,   134,   136,    62,    16,   177,   285,   nil,    10,
-   nil,   nil,   nil,   nil,   190,   193,   nil,   192,   nil,   nil,
-   nil,   110,   214,   nil,   128,   nil,   nil,   231,   233,   231,
-   227,   243,    87,   nil,   319,   nil,   336,   nil,   353,   nil,
-   nil,   252,   nil,   265,   277,   281,   287,   nil,   nil,   nil,
-   nil,   300,   nil,   nil,   nil,   285,   nil,    86,   nil,   198,
-   nil,   nil,   nil,   323,   150,   nil,   nil,   138,   nil,   132,
-   nil,   119,   nil,   370,   nil,   nil,   nil,   nil,   340,   nil,
-   nil,   186,   387,   nil,   nil,   nil,   nil,   nil,   438,   nil,
-   nil,   302,   257,   nil,   nil ]
+   517,   338,   nil,   nil,   nil,   153,   nil,   nil,   148,    49,
+   nil,    13,   nil,   457,   nil,    74,   nil,    80,     9,   nil,
+   341,   232,   326,   nil,   498,    94,   278,   291,   nil,   nil,
+   nil,   nil,    86,   nil,   -18,    -5,   nil,   nil,   nil,   nil,
+   nil,   276,   nil,   152,   199,   nil,   192,   nil,    16,   230,
+   nil,   228,   nil,   nil,   178,   nil,   nil,   170,   nil,   nil,
+   145,   131,     4,    87,   nil,   nil,   nil,    81,    71,    99,
+   nil,   161,   222,   250,   nil,   nil,   272,   317,    -2,   306,
+   334,   nil,   310,   nil,   325,   nil,   138,   nil,   332,   164,
+   nil,   162,   322,   nil,   143,   175,   nil,   nil,   nil,    26,
+   nil,   nil,   nil,   101,   211,   249,   252,    58,   120,   479,
+   nil,   nil,   264,     0,   258,   312,   109,    48,    12,   nil,
+   nil,   284,   168,   nil,    21,   nil,   nil,    19,    27,    29,
+   nil,   nil,    31,     1,    48,    58,   nil,   nil,    46,   328,
+   nil,   nil,   nil,   nil,   nil,   nil,   347,   nil,   139,   nil,
+   nil,   161,   nil,   368,   429,   nil,   nil,   nil,   nil,   166,
+   nil,   412,   nil,   nil,    10,   nil,    87,   nil,   nil,   201,
+   nil,   218,   390,   nil,   nil,   nil,   431,   nil,   144,   nil,
+   nil,   239,   212,    22,   345,   245,   243,   257,    58,   nil,
+   272,   277,   248,   281,    68,   nil,   247,   nil,   211,   nil,
+   nil,   nil,   280,   nil,   283,   286,   290,   292,   nil,   289,
+   nil,   nil,   126,   nil,   330,   nil,   nil,   320,   174,   nil,
+   nil,   nil,   nil,    62,   nil,   132,   nil,    93,   nil,   186,
+   nil,   332,   nil,   nil,   nil,   nil,   nil,   337,   nil,   nil,
+   230,   291,   nil,   nil,   nil,   nil,   nil,   nil,   458,   nil,
+   nil,   384,   115,   nil,   nil ]
 
 racc_action_default = [
-  -130,  -156,   -16,    -5,  -156,    -6,  -156,    -7,  -156,  -156,
-    -8,    -9,   -37,   -10,  -156,   -11,  -156,   -36,   -12,  -156,
-  -156,  -156,   -13,    -1,  -156,   -33,   -14,    -2,   -15,    -3,
-  -156,  -124,  -123,  -130,   -32,  -156,  -156,  -130,  -125,  -128,
-  -127,  -129,   -35,  -130,  -130,  -149,  -156,   -18,  -156,   -19,
-   -87,   -20,   -88,   -21,   -56,   -23,   -65,   -24,  -156,   -25,
-   -26,  -156,  -156,   -79,   -81,   -89,   -83,  -156,   -95,   -78,
-   -56,   -82,   -77,   -57,  -115,   -84,   -80,   -85,  -156,  -156,
-   -65,  -156,  -116,   -65,    -4,  -130,   -34,   -64,  -156,  -156,
-  -143,  -156,  -156,  -141,  -156,  -130,   -56,   -50,  -156,   -49,
-   -41,   -43,  -156,   -40,  -156,  -156,  -156,  -156,  -156,   -52,
-  -154,  -156,   -60,   -61,   -63,   -59,   -56,   -66,   -62,   -58,
-   -57,  -114,   -54,  -113,  -156,  -151,   -69,  -156,  -156,  -156,
-  -156,  -156,  -154,  -156,   255,  -154,  -131,  -132,  -156,  -156,
+  -130,  -156,   -16,    -5,  -124,  -156,    -6,    -7,  -156,  -156,
+    -8,  -156,    -9,   -37,   -10,  -156,   -11,  -156,   -36,   -12,
+  -156,  -156,  -156,   -13,    -1,  -156,   -33,  -156,   -14,    -2,
+   -15,    -3,  -156,  -123,  -130,  -130,  -125,  -128,  -127,  -129,
+   -32,  -156,   -35,  -130,  -130,  -149,  -156,   -18,  -156,   -19,
+   -87,   -20,   -88,   -21,   -56,   -23,   -24,  -156,   -25,   -26,
+   -85,  -156,  -156,   -79,   -89,   -81,   -83,   -78,   -56,  -156,
+   -95,   -82,   -77,   -57,  -115,   -84,   -80,  -156,  -156,   -65,
+  -156,  -116,   -65,    -4,  -130,   -34,   -65,   -64,  -156,  -156,
+  -143,  -156,  -156,  -141,  -156,  -130,   -56,   -50,   -49,  -156,
+   -41,   -43,   -40,  -156,  -156,  -156,  -156,  -156,  -156,  -156,
+  -151,   -69,  -156,  -156,  -156,  -156,  -156,  -154,  -156,   -66,
+   255,  -154,  -131,  -132,  -156,  -113,   -52,  -154,  -156,   -60,
+   -61,   -63,   -59,   -56,   -62,   -58,   -57,  -114,   -54,  -156,
   -148,  -144,  -147,  -145,  -142,  -146,  -156,  -126,  -156,   -46,
    -45,  -156,   -39,  -156,  -156,   -38,   -17,   -90,   -22,  -156,
-   -27,  -156,  -155,   -65,  -156,   -55,  -156,  -156,  -150,  -156,
-  -152,  -153,  -110,  -109,  -156,   -56,  -112,  -156,  -103,  -111,
-  -104,  -156,  -156,   -97,  -156,  -101,   -91,  -156,  -156,  -140,
-  -156,  -138,  -156,  -135,  -156,  -120,  -156,  -122,  -156,   -44,
-   -42,   -73,   -75,   -72,   -76,   -71,   -74,   -47,   -48,   -29,
-   -67,  -154,   -68,   -53,   -28,   -93,   -70,  -156,  -106,  -156,
-   -86,   -98,   -96,  -156,  -156,   -30,   -31,  -156,  -133,  -156,
-  -134,  -156,  -118,  -156,  -119,  -121,   -51,   -92,  -156,  -108,
-  -105,  -156,  -156,  -102,  -139,  -137,  -136,  -117,  -156,  -107,
+   -27,  -156,  -150,  -152,  -156,  -153,  -156,  -110,  -109,   -56,
+  -112,  -156,  -156,  -111,  -103,  -104,  -156,   -97,  -156,  -101,
+   -91,  -156,  -155,  -156,  -156,  -140,  -156,  -138,  -156,  -135,
+  -156,  -156,   -65,  -156,   -55,  -120,  -156,  -122,  -156,   -44,
+   -42,   -47,   -73,   -75,   -72,   -76,   -71,   -74,   -48,   -93,
+   -70,   -86,  -156,  -106,  -156,   -98,   -96,  -156,  -156,   -30,
+   -67,   -68,   -31,  -156,  -133,  -156,  -134,  -156,  -118,  -156,
+   -29,  -154,   -28,   -53,  -119,  -121,   -92,  -156,  -108,  -105,
+  -156,  -156,  -102,  -139,  -137,  -136,  -117,   -51,  -156,  -107,
   -100,  -156,  -156,   -99,   -94 ]
 
 racc_goto_table = [
-    23,    57,   110,   109,   113,    84,   114,    38,   180,    59,
-   174,   169,   185,   193,    19,   183,    55,    82,   210,   161,
-    60,    47,    75,   127,    75,   200,   132,    98,   104,   135,
-   207,   208,    99,    99,    61,    57,   237,   182,    75,    42,
-   166,   187,   178,    59,   188,   118,    33,    97,    97,    68,
-    55,    78,    27,   119,    60,   105,    75,   218,   122,   174,
-   115,   219,   158,   138,   185,    87,    85,   221,    88,    37,
-    75,    92,   181,   190,   192,    34,   144,   141,   nil,   148,
-   nil,   nil,   nil,   106,    99,    90,   nil,    75,   nil,    93,
-   nil,   123,   nil,   147,   nil,   nil,    57,   126,   nil,    97,
-   nil,   202,   202,   241,    59,   nil,   243,   nil,   246,   211,
-   112,    55,   213,   113,   131,   114,   160,   176,    57,   176,
-   236,   249,   nil,   174,   167,   179,    59,   179,   nil,   nil,
-   nil,   142,   173,    55,   173,   nil,   nil,   137,   nil,   196,
-    99,   nil,   204,   204,   nil,   nil,   198,   nil,   nil,    84,
-   205,   205,   nil,   nil,   118,    97,   nil,   203,   203,   nil,
-   nil,   nil,   119,   123,   nil,   123,   176,   nil,   nil,   115,
-   nil,   176,    75,   nil,   179,   121,   nil,    75,    84,   179,
-    84,   173,   172,   nil,   172,   nil,   173,   nil,   123,   123,
-   nil,   nil,   nil,   nil,   233,   nil,   nil,   nil,   nil,   212,
-   123,   nil,   nil,   nil,   216,   nil,   nil,   201,   201,   nil,
-   nil,   nil,   123,   176,   nil,    84,   nil,   123,   nil,   112,
-   nil,   179,   nil,   nil,   nil,    75,   nil,   nil,   173,   nil,
-   176,   172,   nil,    84,    84,    75,   172,    75,   179,   nil,
-   nil,   nil,   251,   nil,   nil,   173,   nil,   121,   252,   121,
-   nil,   nil,   239,   nil,   nil,   nil,   nil,   nil,   nil,   123,
-   nil,   nil,   244,   nil,   245,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   206,   206,   nil,   nil,   123,   nil,   172,   nil,
-   nil,   nil,   nil,   nil,   121,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   172,   121,   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,
+    24,    83,   175,    58,    59,   189,    75,    36,    75,   126,
+   177,    81,    70,    56,    77,    20,   130,   131,    55,   171,
+   179,   181,    34,    75,   164,   184,   112,   117,    47,    87,
+   121,   191,    29,   220,   127,   200,    58,    59,    42,    75,
+    99,   104,    84,    98,    98,   106,    56,    61,    97,    97,
+   236,    55,   176,    75,   201,   208,   193,   138,   174,   111,
+   213,   105,   158,   214,   124,    88,    90,    93,    35,    75,
+    92,   215,   166,   186,   188,   116,   135,   171,    40,   144,
+   141,   179,   nil,   203,   203,   nil,   134,   nil,   nil,   nil,
+   nil,   132,   148,   147,   nil,    98,   nil,    58,   nil,   160,
+    97,   nil,   125,    58,   173,   173,   142,    56,   nil,   161,
+   245,   nil,    55,    56,   170,   170,   123,   233,    55,   168,
+   168,   nil,   nil,   242,   130,   131,   240,   nil,   249,   nil,
+   125,   125,   nil,   nil,   nil,   247,   nil,   nil,    83,   196,
+   231,   nil,   nil,   206,   206,   171,   198,   nil,   nil,   nil,
+   nil,    98,   nil,   205,   205,    75,    97,   137,   204,   204,
+   nil,   210,   173,   nil,   nil,   nil,   173,   nil,   129,   125,
+   125,   nil,   170,    83,    75,    83,   170,   168,   nil,   nil,
+   221,   168,   nil,   nil,   135,   137,   137,   nil,   125,   nil,
+   229,   nil,   125,   nil,   134,   nil,   167,   167,   nil,   132,
+   nil,   nil,   nil,    75,   nil,   nil,    83,   nil,   173,   238,
+   125,   nil,   nil,   nil,    75,   nil,    75,   nil,   170,   nil,
+   243,   nil,   244,   168,   207,   207,   nil,   nil,    83,    83,
+   173,   nil,   nil,   nil,   125,   202,   202,   nil,   nil,   nil,
+   170,   251,   nil,   137,   nil,   168,   nil,   137,   252,   nil,
+   nil,   nil,   nil,   nil,   167,   nil,   125,   nil,   167,   nil,
+   nil,   nil,   nil,   nil,   nil,   137,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   129,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   137,
    nil,   nil,   nil,   nil,   nil,   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,
-   121 ]
+   167,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   137,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   167 ]
 
 racc_goto_check = [
-     2,    22,    27,    38,    41,     4,    42,    63,    56,    23,
-    54,    46,    54,    66,     1,    52,    21,    23,    44,    28,
-    24,    17,    24,    45,    24,    33,    27,    32,    32,    27,
-    37,    37,    22,    22,    49,    22,    50,    51,    24,    31,
-    26,    28,    55,    23,    28,    22,    58,    21,    21,    43,
-    21,    43,     3,    23,    24,    17,    24,    56,    25,    54,
-    21,    57,    20,    59,    54,    43,    58,    52,    60,    61,
-    24,    62,    18,    64,    65,     5,    67,    68,   nil,    32,
-   nil,   nil,   nil,    43,    22,     3,   nil,    24,   nil,     3,
-   nil,    48,   nil,    63,   nil,   nil,    22,    43,   nil,    21,
-   nil,    41,    41,    46,    23,   nil,    54,   nil,    66,    27,
-    40,    21,    38,    41,    43,    42,    24,    22,    22,    22,
-    28,    56,   nil,    54,     2,    23,    23,    23,   nil,   nil,
-   nil,    58,    21,    21,    21,   nil,   nil,     3,   nil,     2,
-    22,   nil,    22,    22,   nil,   nil,     2,   nil,   nil,     4,
-    23,    23,   nil,   nil,    22,    21,   nil,    21,    21,   nil,
-   nil,   nil,    23,    48,   nil,    48,    22,   nil,   nil,    21,
-   nil,    22,    24,   nil,    23,    47,   nil,    24,     4,    23,
-     4,    21,    40,   nil,    40,   nil,    21,   nil,    48,    48,
-   nil,   nil,   nil,   nil,     2,   nil,   nil,   nil,   nil,    43,
-    48,   nil,   nil,   nil,    43,   nil,   nil,    40,    40,   nil,
-   nil,   nil,    48,    22,   nil,     4,   nil,    48,   nil,    40,
-   nil,    23,   nil,   nil,   nil,    24,   nil,   nil,    21,   nil,
-    22,    40,   nil,     4,     4,    24,    40,    24,    23,   nil,
-   nil,   nil,     2,   nil,   nil,    21,   nil,    47,     2,    47,
-   nil,   nil,    43,   nil,   nil,   nil,   nil,   nil,   nil,    48,
-   nil,   nil,    43,   nil,    43,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    47,    47,   nil,   nil,    48,   nil,    40,   nil,
-   nil,   nil,   nil,   nil,    47,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    40,    47,   nil,   nil,   nil,
-   nil,    47,   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,
+     2,     4,    57,    23,    24,    66,    24,    63,    24,    39,
+    53,    23,    44,    22,    44,     1,    42,    43,    21,    55,
+    55,    29,    25,    24,    47,    29,    46,    28,    17,    44,
+    28,    29,     3,    45,    28,    34,    23,    24,    32,    24,
+    33,    33,    25,    22,    22,    44,    22,    50,    21,    21,
+    51,    21,    52,    24,    38,    38,    27,    26,    56,    44,
+    57,    17,    20,    58,    59,    60,     3,     3,    61,    24,
+    62,    53,    18,    64,    65,    44,    23,    55,     5,    67,
+    68,    55,   nil,    42,    42,   nil,    22,   nil,   nil,   nil,
+   nil,    21,    33,    63,   nil,    22,   nil,    23,   nil,    24,
+    21,   nil,    49,    23,    23,    23,    25,    22,   nil,     2,
+    66,   nil,    21,    22,    22,    22,     3,    39,    21,    21,
+    21,   nil,   nil,    55,    42,    43,    47,   nil,    57,   nil,
+    49,    49,   nil,   nil,   nil,    29,   nil,   nil,     4,     2,
+    28,   nil,   nil,    23,    23,    55,     2,   nil,   nil,   nil,
+   nil,    22,   nil,    22,    22,    24,    21,    48,    21,    21,
+   nil,    44,    23,   nil,   nil,   nil,    23,   nil,    41,    49,
+    49,   nil,    22,     4,    24,     4,    22,    21,   nil,   nil,
+    44,    21,   nil,   nil,    23,    48,    48,   nil,    49,   nil,
+     2,   nil,    49,   nil,    22,   nil,    41,    41,   nil,    21,
+   nil,   nil,   nil,    24,   nil,   nil,     4,   nil,    23,    44,
+    49,   nil,   nil,   nil,    24,   nil,    24,   nil,    22,   nil,
+    44,   nil,    44,    21,    48,    48,   nil,   nil,     4,     4,
+    23,   nil,   nil,   nil,    49,    41,    41,   nil,   nil,   nil,
+    22,     2,   nil,    48,   nil,    21,   nil,    48,     2,   nil,
+   nil,   nil,   nil,   nil,    41,   nil,    49,   nil,    41,   nil,
+   nil,   nil,   nil,   nil,   nil,    48,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    41,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    48,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    47,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    47 ]
+    41,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    48,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    41 ]
 
 racc_goto_pointer = [
-   nil,    14,     0,    52,   -18,    69,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,     9,   -57,   nil,
-   -45,     4,   -11,    -3,     8,     2,   -82,   -54,   -91,   nil,
-   nil,    30,   -16,  -126,   nil,   nil,   nil,  -123,   -53,   nil,
-    54,   -52,   -50,    35,  -144,   -39,  -116,   119,    35,    20,
-  -179,   -93,  -115,   nil,  -118,   -86,  -120,  -116,    42,   -22,
-    35,    61,    34,    -1,   -63,   -62,  -123,   -15,   -12 ]
+   nil,    15,     0,    32,   -23,    69,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    15,   -41,   nil,
+   -45,     5,     0,   -10,    -9,    17,   -29,   -82,   -52,   -96,
+   nil,   nil,    27,    -3,  -116,   nil,   nil,   nil,   -99,   -77,
+   nil,    82,   -70,   -69,    -3,  -149,   -36,   -88,    71,    16,
+    32,  -159,   -63,  -105,   nil,   -95,   -56,  -112,  -109,   -20,
+    31,    60,    35,    -1,   -49,   -48,  -117,   -12,    -9 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   103,    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,   100,   151,   101,   102,   nil,   nil,   111,
-    63,    64,    66,   nil,   117,   nil,   nil,    76,    77,   nil,
-   nil,   nil,   nil,   184,    67,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   102,    31,     3,     6,     7,    10,    12,
+    14,    16,    19,    23,    28,    30,     2,   nil,    49,    51,
+    53,    67,    71,    72,    22,    27,   nil,   nil,   nil,   nil,
+     9,    11,   nil,   nil,   100,   151,   101,   103,   nil,   nil,
+   128,    63,    65,    66,   nil,   119,   nil,   nil,    76,    60,
+   nil,   nil,   nil,   nil,   178,    69,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
 
 racc_token_table = {
@@ -777,6 +775,7 @@ Racc_token_to_s_table = [
 'variable',
 'quotedtext',
 'resourceref',
+'fqname',
 'resourceinstances',
 'endsemi',
 'params',
@@ -810,7 +809,6 @@ Racc_token_to_s_table = [
 'svalues',
 'selectval',
 'sintvalues',
-'fqname',
 'argumentlist',
 'classparent',
 'hostnames',
@@ -951,11 +949,8 @@ module_eval <<'.,.,', 'grammar.ra', 103
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 127
+module_eval <<'.,.,', 'grammar.ra', 124
   def _reduce_28( val, _values, result )
-    if val[0].instance_of?(AST::ASTArray)
-        error "Invalid name"
-    end
     array = val[2]
     if array.instance_of?(AST::ResourceInst)
         array = [array]
@@ -978,7 +973,7 @@ module_eval <<'.,.,', 'grammar.ra', 127
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 130
+module_eval <<'.,.,', 'grammar.ra', 127
   def _reduce_29( val, _values, result )
     # This is a deprecated syntax.
     error "All resource specifications require names"
@@ -986,25 +981,22 @@ module_eval <<'.,.,', 'grammar.ra', 130
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 136
+module_eval <<'.,.,', 'grammar.ra', 130
   def _reduce_30( val, _values, result )
-    # a template setting for a type
-    if val[0].instance_of?(AST::ASTArray)
-        error "Invalid type"
-    end
+    # a defaults setting for a type
     result = ast(AST::ResourceDefaults, :type => val[0], :params => val[2])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 141
+module_eval <<'.,.,', 'grammar.ra', 135
   def _reduce_31( val, _values, result )
     result = ast AST::ResourceOverride, :object => val[0], :params => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 168
+module_eval <<'.,.,', 'grammar.ra', 162
   def _reduce_32( val, _values, result )
     type = val[0]
 
@@ -1032,21 +1024,21 @@ module_eval <<'.,.,', 'grammar.ra', 168
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 169
+module_eval <<'.,.,', 'grammar.ra', 163
   def _reduce_33( val, _values, result )
  result = :virtual
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 170
+module_eval <<'.,.,', 'grammar.ra', 164
   def _reduce_34( val, _values, result )
  result = :exported
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 193
+module_eval <<'.,.,', 'grammar.ra', 187
   def _reduce_35( val, _values, result )
     if val[0] =~ /^[a-z]/
         Puppet.warning addcontext("Collection names must now be capitalized")
@@ -1073,7 +1065,7 @@ module_eval <<'.,.,', 'grammar.ra', 193
 
  # reduce 37 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 204
+module_eval <<'.,.,', 'grammar.ra', 198
   def _reduce_38( val, _values, result )
     if val[1]
         result = val[1]
@@ -1085,7 +1077,7 @@ module_eval <<'.,.,', 'grammar.ra', 204
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 212
+module_eval <<'.,.,', 'grammar.ra', 206
   def _reduce_39( val, _values, result )
     if val[1]
         result = val[1]
@@ -1101,7 +1093,7 @@ module_eval <<'.,.,', 'grammar.ra', 212
 
  # reduce 41 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 220
+module_eval <<'.,.,', 'grammar.ra', 214
   def _reduce_42( val, _values, result )
     result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2]
    result
@@ -1110,7 +1102,7 @@ module_eval <<'.,.,', 'grammar.ra', 220
 
  # reduce 43 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 226
+module_eval <<'.,.,', 'grammar.ra', 220
   def _reduce_44( val, _values, result )
     result = val[1]
     result.parens = true
@@ -1122,7 +1114,7 @@ module_eval <<'.,.,', 'grammar.ra', 226
 
  # reduce 46 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 234
+module_eval <<'.,.,', 'grammar.ra', 228
   def _reduce_47( val, _values, result )
     result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2]
     #result = ast AST::CollExpr
@@ -1131,7 +1123,7 @@ module_eval <<'.,.,', 'grammar.ra', 234
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 239
+module_eval <<'.,.,', 'grammar.ra', 233
   def _reduce_48( val, _values, result )
     result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2]
     #result = ast AST::CollExpr
@@ -1144,7 +1136,7 @@ module_eval <<'.,.,', 'grammar.ra', 239
 
  # reduce 50 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 246
+module_eval <<'.,.,', 'grammar.ra', 240
   def _reduce_51( val, _values, result )
     result = ast AST::ResourceInst, :children => [val[0],val[2]]
    result
@@ -1153,7 +1145,7 @@ module_eval <<'.,.,', 'grammar.ra', 246
 
  # reduce 52 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 256
+module_eval <<'.,.,', 'grammar.ra', 250
   def _reduce_53( val, _values, result )
     if val[0].instance_of?(AST::ResourceInst)
         result = ast AST::ASTArray, :children => [val[0],val[2]]
@@ -1169,14 +1161,14 @@ module_eval <<'.,.,', 'grammar.ra', 256
 
  # reduce 55 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 263
+module_eval <<'.,.,', 'grammar.ra', 257
   def _reduce_56( val, _values, result )
     result = ast AST::Name, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 267
+module_eval <<'.,.,', 'grammar.ra', 261
   def _reduce_57( val, _values, result )
     result = ast AST::Type, :value => val[0]
    result
@@ -1195,7 +1187,7 @@ module_eval <<'.,.,', 'grammar.ra', 267
 
  # reduce 63 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 280
+module_eval <<'.,.,', 'grammar.ra', 274
   def _reduce_64( val, _values, result )
     # this is distinct from referencing a variable
     variable = ast AST::Name, :value => val[0]
@@ -1204,21 +1196,21 @@ module_eval <<'.,.,', 'grammar.ra', 280
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 285
+module_eval <<'.,.,', 'grammar.ra', 279
   def _reduce_65( val, _values, result )
     result = ast AST::ASTArray
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 285
+module_eval <<'.,.,', 'grammar.ra', 279
   def _reduce_66( val, _values, result )
  result = val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 294
+module_eval <<'.,.,', 'grammar.ra', 288
   def _reduce_67( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
@@ -1230,7 +1222,7 @@ module_eval <<'.,.,', 'grammar.ra', 294
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 298
+module_eval <<'.,.,', 'grammar.ra', 292
   def _reduce_68( val, _values, result )
     result = ast AST::ResourceParam, :param => val[0], :value => val[2]
    result
@@ -1239,7 +1231,7 @@ module_eval <<'.,.,', 'grammar.ra', 298
 
  # reduce 69 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 307
+module_eval <<'.,.,', 'grammar.ra', 301
   def _reduce_70( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         result = val[0].push(val[2])
@@ -1280,7 +1272,7 @@ module_eval <<'.,.,', 'grammar.ra', 307
 
  # reduce 85 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 333
+module_eval <<'.,.,', 'grammar.ra', 327
   def _reduce_86( val, _values, result )
     args = aryfy(val[2])
     result = ast AST::Function,
@@ -1291,28 +1283,28 @@ module_eval <<'.,.,', 'grammar.ra', 333
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 337
+module_eval <<'.,.,', 'grammar.ra', 331
   def _reduce_87( val, _values, result )
     result = ast AST::String, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 339
+module_eval <<'.,.,', 'grammar.ra', 333
   def _reduce_88( val, _values, result )
     result = ast AST::FlatString, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 343
+module_eval <<'.,.,', 'grammar.ra', 337
   def _reduce_89( val, _values, result )
     result = ast AST::Boolean, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 348
+module_eval <<'.,.,', 'grammar.ra', 342
   def _reduce_90( val, _values, result )
     Puppet.warning addcontext("Deprecation notice:  Resource references should now be capitalized")
     result = ast AST::ResourceRef, :type => val[0], :title => val[2]
@@ -1320,14 +1312,14 @@ module_eval <<'.,.,', 'grammar.ra', 348
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 350
+module_eval <<'.,.,', 'grammar.ra', 344
   def _reduce_91( val, _values, result )
     result = ast AST::ResourceRef, :type => val[0], :title => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 363
+module_eval <<'.,.,', 'grammar.ra', 357
   def _reduce_92( val, _values, result )
     args = {
         :test => val[1],
@@ -1345,7 +1337,7 @@ module_eval <<'.,.,', 'grammar.ra', 363
 
  # reduce 93 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 368
+module_eval <<'.,.,', 'grammar.ra', 362
   def _reduce_94( val, _values, result )
     result = ast AST::Else, :statements => val[2]
    result
@@ -1354,7 +1346,7 @@ module_eval <<'.,.,', 'grammar.ra', 368
 
  # reduce 95 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 380
+module_eval <<'.,.,', 'grammar.ra', 374
   def _reduce_96( val, _values, result )
     options = val[3]
     unless options.instance_of?(AST::ASTArray)
@@ -1367,7 +1359,7 @@ module_eval <<'.,.,', 'grammar.ra', 380
 
  # reduce 97 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 390
+module_eval <<'.,.,', 'grammar.ra', 384
   def _reduce_98( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push val[1]
@@ -1379,14 +1371,14 @@ module_eval <<'.,.,', 'grammar.ra', 390
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 394
+module_eval <<'.,.,', 'grammar.ra', 388
   def _reduce_99( val, _values, result )
     result = ast AST::CaseOpt, :value => val[0], :statements => val[3]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 399
+module_eval <<'.,.,', 'grammar.ra', 393
   def _reduce_100( val, _values, result )
     result = ast(AST::CaseOpt,
         :value => val[0],
@@ -1398,7 +1390,7 @@ module_eval <<'.,.,', 'grammar.ra', 399
 
  # reduce 101 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 409
+module_eval <<'.,.,', 'grammar.ra', 403
   def _reduce_102( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
@@ -1410,7 +1402,7 @@ module_eval <<'.,.,', 'grammar.ra', 409
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 413
+module_eval <<'.,.,', 'grammar.ra', 407
   def _reduce_103( val, _values, result )
     result = ast AST::Selector, :param => val[0], :values => val[2]
    result
@@ -1419,7 +1411,7 @@ module_eval <<'.,.,', 'grammar.ra', 413
 
  # reduce 104 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 415
+module_eval <<'.,.,', 'grammar.ra', 409
   def _reduce_105( val, _values, result )
  result = val[1]
    result
@@ -1428,7 +1420,7 @@ module_eval <<'.,.,', 'grammar.ra', 415
 
  # reduce 106 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 426
+module_eval <<'.,.,', 'grammar.ra', 420
   def _reduce_107( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
@@ -1440,7 +1432,7 @@ module_eval <<'.,.,', 'grammar.ra', 426
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 430
+module_eval <<'.,.,', 'grammar.ra', 424
   def _reduce_108( val, _values, result )
     result = ast AST::ResourceParam, :param => val[0], :value => val[2]
    result
@@ -1459,14 +1451,14 @@ module_eval <<'.,.,', 'grammar.ra', 430
 
  # reduce 114 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 440
+module_eval <<'.,.,', 'grammar.ra', 434
   def _reduce_115( val, _values, result )
     result = ast AST::Default, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 495
+module_eval <<'.,.,', 'grammar.ra', 489
   def _reduce_116( val, _values, result )
     # importing files
     # yuk, i hate keywords
@@ -1524,7 +1516,7 @@ module_eval <<'.,.,', 'grammar.ra', 495
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 505
+module_eval <<'.,.,', 'grammar.ra', 499
   def _reduce_117( val, _values, result )
     interp.newdefine fqname(val[1]), :arguments => val[2], :code => val[4]
     @lexer.indefine = false
@@ -1535,7 +1527,7 @@ module_eval <<'.,.,', 'grammar.ra', 505
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 509
+module_eval <<'.,.,', 'grammar.ra', 503
   def _reduce_118( val, _values, result )
     interp.newdefine fqname(val[1]), :arguments => val[2]
     @lexer.indefine = false
@@ -1544,7 +1536,7 @@ module_eval <<'.,.,', 'grammar.ra', 509
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 517
+module_eval <<'.,.,', 'grammar.ra', 511
   def _reduce_119( val, _values, result )
     # Our class gets defined in the parent namespace, not our own.
     @lexer.namepop
@@ -1554,7 +1546,7 @@ module_eval <<'.,.,', 'grammar.ra', 517
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 522
+module_eval <<'.,.,', 'grammar.ra', 516
   def _reduce_120( val, _values, result )
     # Our class gets defined in the parent namespace, not our own.
     @lexer.namepop
@@ -1564,7 +1556,7 @@ module_eval <<'.,.,', 'grammar.ra', 522
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 527
+module_eval <<'.,.,', 'grammar.ra', 521
   def _reduce_121( val, _values, result )
     interp.newnode val[1], :parent => val[2], :code => val[4]
     result = nil
@@ -1572,7 +1564,7 @@ module_eval <<'.,.,', 'grammar.ra', 527
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 530
+module_eval <<'.,.,', 'grammar.ra', 524
   def _reduce_122( val, _values, result )
     interp.newnode val[1], :parent => val[2]
     result = nil
@@ -1586,7 +1578,7 @@ module_eval <<'.,.,', 'grammar.ra', 530
 
  # reduce 125 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 542
+module_eval <<'.,.,', 'grammar.ra', 536
   def _reduce_126( val, _values, result )
     result = val[0]
     result = [result] unless result.is_a?(Array)
@@ -1601,14 +1593,14 @@ module_eval <<'.,.,', 'grammar.ra', 542
 
  # reduce 129 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 550
+module_eval <<'.,.,', 'grammar.ra', 544
   def _reduce_130( val, _values, result )
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 554
+module_eval <<'.,.,', 'grammar.ra', 548
   def _reduce_131( val, _values, result )
     result = ast AST::ASTArray, :children => []
    result
@@ -1617,14 +1609,14 @@ module_eval <<'.,.,', 'grammar.ra', 554
 
  # reduce 132 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 559
+module_eval <<'.,.,', 'grammar.ra', 553
   def _reduce_133( val, _values, result )
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 563
+module_eval <<'.,.,', 'grammar.ra', 557
   def _reduce_134( val, _values, result )
     result = val[1]
     result = [result] unless result[0].is_a?(Array)
@@ -1634,7 +1626,7 @@ module_eval <<'.,.,', 'grammar.ra', 563
 
  # reduce 135 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 570
+module_eval <<'.,.,', 'grammar.ra', 564
   def _reduce_136( val, _values, result )
     result = val[0]
     result = [result] unless result[0].is_a?(Array)
@@ -1643,7 +1635,7 @@ module_eval <<'.,.,', 'grammar.ra', 570
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 575
+module_eval <<'.,.,', 'grammar.ra', 569
   def _reduce_137( val, _values, result )
     Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
     result = [val[0], val[2]]
@@ -1651,7 +1643,7 @@ module_eval <<'.,.,', 'grammar.ra', 575
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 579
+module_eval <<'.,.,', 'grammar.ra', 573
   def _reduce_138( val, _values, result )
     Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
     result = [val[0]]
@@ -1659,14 +1651,14 @@ module_eval <<'.,.,', 'grammar.ra', 579
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 581
+module_eval <<'.,.,', 'grammar.ra', 575
   def _reduce_139( val, _values, result )
     result = [val[0], val[2]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 583
+module_eval <<'.,.,', 'grammar.ra', 577
   def _reduce_140( val, _values, result )
     result = [val[0]]
    result
@@ -1675,7 +1667,7 @@ module_eval <<'.,.,', 'grammar.ra', 583
 
  # reduce 141 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 588
+module_eval <<'.,.,', 'grammar.ra', 582
   def _reduce_142( val, _values, result )
     result = val[1]
    result
@@ -1684,7 +1676,7 @@ module_eval <<'.,.,', 'grammar.ra', 588
 
  # reduce 143 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 593
+module_eval <<'.,.,', 'grammar.ra', 587
   def _reduce_144( val, _values, result )
     result = val[1]
    result
@@ -1699,14 +1691,14 @@ module_eval <<'.,.,', 'grammar.ra', 593
 
  # reduce 148 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 600
+module_eval <<'.,.,', 'grammar.ra', 594
   def _reduce_149( val, _values, result )
     result = ast AST::Variable, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 608
+module_eval <<'.,.,', 'grammar.ra', 602
   def _reduce_150( val, _values, result )
     if val[1].instance_of?(AST::ASTArray)
         result = val[1]
@@ -1717,7 +1709,7 @@ module_eval <<'.,.,', 'grammar.ra', 608
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 610
+module_eval <<'.,.,', 'grammar.ra', 604
   def _reduce_151( val, _values, result )
     result = ast AST::ASTArray
    result
@@ -1730,7 +1722,7 @@ module_eval <<'.,.,', 'grammar.ra', 610
 
  # reduce 154 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 615
+module_eval <<'.,.,', 'grammar.ra', 609
   def _reduce_155( val, _values, result )
  result = nil
    result
diff --git a/test/data/snippets/fqdefinition.pp b/test/data/snippets/fqdefinition.pp
new file mode 100644
index 000000000..ddb0675a9
--- /dev/null
+++ b/test/data/snippets/fqdefinition.pp
@@ -0,0 +1,5 @@
+define one::two($ensure) {
+    file { "/tmp/fqdefinition": ensure => $ensure }
+}
+
+one::two { "/tmp/fqdefinition": ensure => file }
diff --git a/test/data/snippets/fqparents.pp b/test/data/snippets/fqparents.pp
new file mode 100644
index 000000000..ae588d9cf
--- /dev/null
+++ b/test/data/snippets/fqparents.pp
@@ -0,0 +1,11 @@
+class base {
+    class one {
+        file { "/tmp/fqparent1": ensure => file }
+    }   
+}   
+
+class two inherits base::one {
+    file { "/tmp/fqparent2": ensure => file }
+}
+
+include two
diff --git a/test/language/parser.rb b/test/language/parser.rb
index 2386a205b..3f117e050 100755
--- a/test/language/parser.rb
+++ b/test/language/parser.rb
@@ -626,6 +626,22 @@ file { "/tmp/yayness":
         assert(code.length == 1, "Did not get the file")
         assert_instance_of(Puppet::TransObject, code[0])
     end
+    
+    def test_fully_qualified_definitions
+        parser = mkparser
+        interp = parser.interp
+
+        assert_nothing_raised("Could not parse fully-qualified definition") {
+            parser.parse %{define one::two { }}
+        }
+        assert(interp.finddefine("", "one::two"), "Could not find one::two with no namespace")
+        assert(interp.finddefine("one", "two"), "Could not find two in namespace one")
+        
+        # Now try using the definition
+        assert_nothing_raised("Could not parse fully-qualified definition usage") {
+            parser.parse %{one::two { yayness: }}
+        }
+    end
 end
 
 # $Id$
diff --git a/test/language/snippets.rb b/test/language/snippets.rb
index 1ed533fec..c82a124bd 100755
--- a/test/language/snippets.rb
+++ b/test/language/snippets.rb
@@ -454,6 +454,18 @@ class TestSnippets < Test::Unit::TestCase
             "Did not make file from realized file inside defined type")
     end
 
+    def snippet_fqparents
+        assert(FileTest.exists?("/tmp/fqparent1"),
+            "Did not make file from parent class")
+        assert(FileTest.exists?("/tmp/fqparent2"),
+            "Did not make file from subclass")
+    end
+
+    def snippet_fqdefinition
+        assert(FileTest.exists?("/tmp/fqdefinition"),
+            "Did not make file from fully-qualified definition")
+    end
+
     def snippet_dirchmod
         dirs = %w{a b}.collect { |letter|
             "/tmp/dirchmodtest%s" % letter