RubyGems - puppet - Versions diffs - 0.25.5 → 2.6.0 - Mend

puppet 0.25.5 → 2.6.0

Potentially problematic release.

This version of puppet might be problematic. Click here for more details.

Files changed (1474) hide show

data/CHANGELOG +667 -0
data/LICENSE +2 -2
data/README +5 -1
data/README.queueing +1 -1
data/README.rst +7 -4
data/Rakefile +6 -18
data/bin/filebucket +0 -94
data/bin/pi +2 -47
data/bin/puppet +2 -69
data/bin/puppetca +2 -100
data/bin/puppetd +2 -158
data/bin/puppetdoc +2 -63
data/bin/puppetmasterd +2 -64
data/bin/puppetqd +2 -51
data/bin/puppetrun +2 -127
data/bin/ralsh +2 -87
data/conf/epm.list +2 -2
data/conf/osx/PackageInfo.plist +1 -1
data/conf/redhat/client.init +11 -8
data/conf/redhat/puppet.conf +1 -1
data/conf/redhat/puppet.spec +1 -1
data/conf/redhat/rundir-perms.patch +13 -13
data/conf/redhat/server.init +11 -5
data/conf/solaris/pkginfo +2 -2
data/conf/solaris/smf/puppetd.xml +3 -3
data/conf/solaris/smf/puppetmasterd.xml +3 -3
data/conf/suse/client.init +3 -2
data/conf/suse/puppet.spec +22 -18
data/conf/suse/server.init +12 -11
data/examples/modules/sample-module/README.txt +3 -3
data/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb +4 -4
data/ext/extlookup.rb +94 -96
data/ext/nagios/check_puppet.rb +94 -88
data/ext/nagios/naggen +3 -3
data/ext/puppet-test +27 -3
data/ext/puppetlisten/puppetlisten.rb +39 -39
data/ext/puppetlisten/puppetrun.rb +6 -6
data/ext/puppetstoredconfigclean.rb +49 -43
data/ext/pure_ruby_dsl/dsl_test.rb +7 -0
data/ext/regexp_nodes/regexp_nodes.rb +133 -133
data/ext/yaml_nodes.rb +99 -0
data/install.rb +109 -118
data/lib/puppet.rb +118 -131
data/lib/puppet/agent.rb +86 -119
data/lib/puppet/agent/locker.rb +28 -30
data/lib/puppet/application.rb +276 -184
data/lib/puppet/application/agent.rb +266 -0
data/lib/puppet/application/apply.rb +165 -0
data/lib/puppet/application/cert.rb +85 -0
data/lib/puppet/application/describe.rb +203 -0
data/lib/puppet/application/doc.rb +215 -0
data/lib/puppet/application/filebucket.rb +73 -73
data/lib/puppet/application/kick.rb +212 -0
data/lib/puppet/application/master.rb +156 -0
data/lib/puppet/application/queue.rb +91 -0
data/lib/puppet/application/resource.rb +118 -0
data/lib/puppet/configurer.rb +214 -197
data/lib/puppet/configurer/downloader.rb +63 -63
data/lib/puppet/configurer/fact_handler.rb +51 -51
data/lib/puppet/configurer/plugin_handler.rb +19 -19
data/lib/puppet/daemon.rb +100 -103
data/lib/puppet/defaults.rb +793 -796
data/lib/puppet/dsl.rb +5 -269
data/lib/puppet/dsl/resource_api.rb +120 -0
data/lib/puppet/dsl/resource_type_api.rb +40 -0
data/lib/puppet/error.rb +34 -36
data/lib/puppet/external/base64.rb +8 -8
data/lib/puppet/external/dot.rb +262 -262
data/lib/puppet/external/event-loop/better-definers.rb +297 -297
data/lib/puppet/external/event-loop/event-loop.rb +264 -272
data/lib/puppet/external/event-loop/signal-system.rb +161 -163
data/lib/puppet/external/lock.rb +41 -41
data/lib/puppet/external/nagios.rb +32 -32
data/lib/puppet/external/nagios/base.rb +453 -458
data/lib/puppet/external/nagios/parser.rb +264 -287
data/lib/puppet/external/pson/common.rb +8 -5
data/lib/puppet/external/pson/pure/generator.rb +26 -26
data/lib/puppet/external/pson/pure/parser.rb +43 -48
data/lib/puppet/feature/base.rb +21 -1
data/lib/puppet/feature/pson.rb +4 -4
data/lib/puppet/feature/rack.rb +14 -14
data/lib/puppet/feature/rails.rb +23 -25
data/lib/puppet/file_bucket.rb +4 -0
data/lib/puppet/file_bucket/dipper.rb +99 -0
data/lib/puppet/file_bucket/file.rb +136 -0
data/lib/puppet/file_bucket/file/indirection_hooks.rb +9 -0
data/lib/puppet/file_collection.rb +20 -20
data/lib/puppet/file_collection/lookup.rb +11 -11
data/lib/puppet/file_serving/base.rb +67 -71
data/lib/puppet/file_serving/configuration.rb +84 -86
data/lib/puppet/file_serving/configuration/parser.rb +103 -102
data/lib/puppet/file_serving/content.rb +34 -33
data/lib/puppet/file_serving/fileset.rb +131 -133
data/lib/puppet/file_serving/indirection_hooks.rb +17 -17
data/lib/puppet/file_serving/metadata.rb +98 -95
data/lib/puppet/file_serving/mount.rb +22 -22
data/lib/puppet/file_serving/mount/file.rb +101 -106
data/lib/puppet/file_serving/mount/modules.rb +15 -15
data/lib/puppet/file_serving/mount/plugins.rb +15 -16
data/lib/puppet/file_serving/terminus_helper.rb +13 -13
data/lib/puppet/indirector.rb +48 -49
data/lib/puppet/indirector/active_record.rb +19 -19
data/lib/puppet/indirector/catalog/active_record.rb +25 -25
data/lib/puppet/indirector/catalog/compiler.rb +134 -145
data/lib/puppet/indirector/catalog/rest.rb +1 -1
data/lib/puppet/indirector/catalog/yaml.rb +13 -13
data/lib/puppet/indirector/certificate/ca.rb +3 -3
data/lib/puppet/indirector/certificate/file.rb +3 -3
data/lib/puppet/indirector/certificate/rest.rb +8 -8
data/lib/puppet/indirector/certificate_request/ca.rb +7 -7
data/lib/puppet/indirector/certificate_request/file.rb +2 -2
data/lib/puppet/indirector/certificate_request/rest.rb +3 -3
data/lib/puppet/indirector/certificate_revocation_list/ca.rb +2 -2
data/lib/puppet/indirector/certificate_revocation_list/file.rb +2 -2
data/lib/puppet/indirector/certificate_revocation_list/rest.rb +3 -3
data/lib/puppet/indirector/couch.rb +76 -0
data/lib/puppet/indirector/direct_file_server.rb +11 -11
data/lib/puppet/indirector/envelope.rb +4 -4
data/lib/puppet/indirector/exec.rb +38 -42
data/lib/puppet/indirector/facts/active_record.rb +24 -24
data/lib/puppet/indirector/facts/couch.rb +31 -0
data/lib/puppet/indirector/facts/facter.rb +63 -61
data/lib/puppet/indirector/facts/memory.rb +4 -4
data/lib/puppet/indirector/facts/rest.rb +1 -1
data/lib/puppet/indirector/facts/yaml.rb +2 -2
data/lib/puppet/indirector/file.rb +67 -46
data/lib/puppet/indirector/file_bucket_file/file.rb +146 -0
data/lib/puppet/indirector/file_bucket_file/rest.rb +8 -0
data/lib/puppet/indirector/file_content/file.rb +1 -1
data/lib/puppet/indirector/file_content/file_server.rb +1 -1
data/lib/puppet/indirector/file_content/rest.rb +1 -1
data/lib/puppet/indirector/file_metadata/file.rb +11 -11
data/lib/puppet/indirector/file_metadata/file_server.rb +1 -1
data/lib/puppet/indirector/file_metadata/rest.rb +1 -1
data/lib/puppet/indirector/file_server.rb +44 -44
data/lib/puppet/indirector/indirection.rb +249 -260
data/lib/puppet/indirector/key/ca.rb +5 -5
data/lib/puppet/indirector/key/file.rb +29 -29
data/lib/puppet/indirector/ldap.rb +62 -64
data/lib/puppet/indirector/memory.rb +13 -13
data/lib/puppet/indirector/node/active_record.rb +6 -6
data/lib/puppet/indirector/node/exec.rb +40 -44
data/lib/puppet/indirector/node/ldap.rb +246 -212
data/lib/puppet/indirector/node/memory.rb +5 -5
data/lib/puppet/indirector/node/plain.rb +12 -12
data/lib/puppet/indirector/node/rest.rb +2 -2
data/lib/puppet/indirector/node/yaml.rb +2 -2
data/lib/puppet/indirector/plain.rb +4 -4
data/lib/puppet/indirector/queue.rb +49 -51
data/lib/puppet/indirector/report/processor.rb +34 -37
data/lib/puppet/indirector/report/rest.rb +3 -3
data/lib/puppet/indirector/request.rb +171 -157
data/lib/puppet/indirector/resource/ral.rb +48 -0
data/lib/puppet/indirector/resource/rest.rb +5 -0
data/lib/puppet/indirector/resource_type.rb +5 -0
data/lib/puppet/indirector/resource_type/parser.rb +27 -0
data/lib/puppet/indirector/resource_type/rest.rb +7 -0
data/lib/puppet/indirector/rest.rb +83 -79
data/lib/puppet/indirector/run/local.rb +8 -0
data/lib/puppet/indirector/run/rest.rb +6 -0
data/lib/puppet/indirector/ssl_file.rb +165 -165
data/lib/puppet/indirector/status.rb +3 -0
data/lib/puppet/indirector/status/local.rb +7 -0
data/lib/puppet/indirector/status/rest.rb +5 -0
data/lib/puppet/indirector/terminus.rb +129 -133
data/lib/puppet/indirector/yaml.rb +47 -49
data/lib/puppet/metatype/manager.rb +120 -114
data/lib/puppet/module.rb +182 -124
data/lib/puppet/network/authconfig.rb +146 -156
data/lib/puppet/network/authorization.rb +63 -70
data/lib/puppet/network/authstore.rb +226 -232
data/lib/puppet/network/client.rb +141 -152
data/lib/puppet/network/client/ca.rb +47 -49
data/lib/puppet/network/client/file.rb +3 -3
data/lib/puppet/network/client/proxy.rb +19 -19
data/lib/puppet/network/client/report.rb +17 -21
data/lib/puppet/network/client/runner.rb +5 -7
data/lib/puppet/network/client/status.rb +1 -1
data/lib/puppet/network/client_request.rb +20 -22
data/lib/puppet/network/format.rb +79 -81
data/lib/puppet/network/format_handler.rb +135 -130
data/lib/puppet/network/formats.rb +128 -154
data/lib/puppet/network/handler.rb +43 -46
data/lib/puppet/network/handler/ca.rb +129 -135
data/lib/puppet/network/handler/filebucket.rb +39 -170
data/lib/puppet/network/handler/fileserver.rb +624 -656
data/lib/puppet/network/handler/master.rb +62 -75
data/lib/puppet/network/handler/report.rb +60 -67
data/lib/puppet/network/handler/runner.rb +20 -20
data/lib/puppet/network/handler/status.rb +9 -9
data/lib/puppet/network/http.rb +12 -12
data/lib/puppet/network/http/api/v1.rb +49 -44
data/lib/puppet/network/http/compression.rb +111 -0
data/lib/puppet/network/http/handler.rb +183 -183
data/lib/puppet/network/http/mongrel.rb +46 -48
data/lib/puppet/network/http/mongrel/rest.rb +73 -66
data/lib/puppet/network/http/rack.rb +45 -45
data/lib/puppet/network/http/rack/httphandler.rb +7 -7
data/lib/puppet/network/http/rack/rest.rb +84 -61
data/lib/puppet/network/http/rack/xmlrpc.rb +49 -49
data/lib/puppet/network/http/webrick.rb +108 -112
data/lib/puppet/network/http/webrick/rest.rb +60 -57
data/lib/puppet/network/http_pool.rb +95 -83
data/lib/puppet/network/http_server/mongrel.rb +90 -90
data/lib/puppet/network/http_server/webrick.rb +139 -148
data/lib/puppet/network/rest_authconfig.rb +76 -71
data/lib/puppet/network/rest_authorization.rb +11 -13
data/lib/puppet/network/rights.rb +217 -226
data/lib/puppet/network/server.rb +147 -151
data/lib/puppet/network/xmlrpc/client.rb +197 -205
data/lib/puppet/network/xmlrpc/processor.rb +68 -72
data/lib/puppet/network/xmlrpc/server.rb +10 -10
data/lib/puppet/network/xmlrpc/webrick_servlet.rb +94 -100
data/lib/puppet/node.rb +99 -107
data/lib/puppet/node/environment.rb +109 -62
data/lib/puppet/node/facts.rb +48 -43
data/lib/puppet/parameter.rb +246 -498
data/lib/puppet/parameter/value.rb +63 -0
data/lib/puppet/parameter/value_collection.rb +143 -0
data/lib/puppet/parser.rb +4 -0
data/lib/puppet/parser/ast.rb +81 -67
data/lib/puppet/parser/ast/arithmetic_operator.rb +27 -29
data/lib/puppet/parser/ast/astarray.rb +50 -50
data/lib/puppet/parser/ast/asthash.rb +37 -0
data/lib/puppet/parser/ast/boolean_operator.rb +33 -35
data/lib/puppet/parser/ast/branch.rb +29 -31
data/lib/puppet/parser/ast/caseopt.rb +50 -56
data/lib/puppet/parser/ast/casestatement.rb +30 -30
data/lib/puppet/parser/ast/collection.rb +43 -37
data/lib/puppet/parser/ast/collexpr.rb +66 -69
data/lib/puppet/parser/ast/comparison_operator.rb +32 -35
data/lib/puppet/parser/ast/else.rb +13 -13
data/lib/puppet/parser/ast/function.rb +34 -43
data/lib/puppet/parser/ast/ifstatement.rb +23 -27
data/lib/puppet/parser/ast/in_operator.rb +24 -0
data/lib/puppet/parser/ast/leaf.rb +173 -156
data/lib/puppet/parser/ast/match_operator.rb +16 -19
data/lib/puppet/parser/ast/minus.rb +13 -13
data/lib/puppet/parser/ast/nop.rb +6 -6
data/lib/puppet/parser/ast/not.rb +9 -9
data/lib/puppet/parser/ast/relationship.rb +60 -0
data/lib/puppet/parser/ast/resource.rb +58 -57
data/lib/puppet/parser/ast/resource_defaults.rb +16 -16
data/lib/puppet/parser/ast/resource_override.rb +51 -51
data/lib/puppet/parser/ast/resource_reference.rb +17 -72
data/lib/puppet/parser/ast/resourceparam.rb +20 -17
data/lib/puppet/parser/ast/selector.rb +30 -34
data/lib/puppet/parser/ast/tag.rb +16 -16
data/lib/puppet/parser/ast/vardef.rb +20 -16
data/lib/puppet/parser/collector.rb +181 -189
data/lib/puppet/parser/compiler.rb +395 -364
data/lib/puppet/parser/files.rb +65 -69
data/lib/puppet/parser/functions.rb +85 -97
data/lib/puppet/parser/functions/defined.rb +23 -23
data/lib/puppet/parser/functions/fail.rb +2 -2
data/lib/puppet/parser/functions/file.rb +21 -19
data/lib/puppet/parser/functions/fqdn_rand.rb +7 -7
data/lib/puppet/parser/functions/generate.rb +24 -26
data/lib/puppet/parser/functions/include.rb +16 -18
data/lib/puppet/parser/functions/inline_template.rb +16 -17
data/lib/puppet/parser/functions/realize.rb +8 -8
data/lib/puppet/parser/functions/regsubst.rb +74 -59
data/lib/puppet/parser/functions/require.rb +35 -33
data/lib/puppet/parser/functions/search.rb +5 -5
data/lib/puppet/parser/functions/sha1.rb +3 -4
data/lib/puppet/parser/functions/shellquote.rb +31 -33
data/lib/puppet/parser/functions/split.rb +8 -8
data/lib/puppet/parser/functions/sprintf.rb +10 -9
data/lib/puppet/parser/functions/tag.rb +3 -3
data/lib/puppet/parser/functions/tagged.rb +13 -13
data/lib/puppet/parser/functions/template.rb +18 -19
data/lib/puppet/parser/functions/versioncmp.rb +17 -14
data/lib/puppet/parser/grammar.ra +485 -422
data/lib/puppet/parser/lexer.rb +500 -442
data/lib/puppet/parser/parser.rb +1438 -1084
data/lib/puppet/parser/parser_support.rb +227 -502
data/lib/puppet/parser/relationship.rb +43 -0
data/lib/puppet/parser/resource.rb +280 -375
data/lib/puppet/parser/resource/param.rb +18 -18
data/lib/puppet/parser/scope.rb +450 -447
data/lib/puppet/parser/templatewrapper.rb +92 -94
data/lib/puppet/parser/type_loader.rb +146 -0
data/lib/puppet/parser/yaml_trimmer.rb +6 -8
data/lib/puppet/property.rb +290 -453
data/lib/puppet/property/ensure.rb +92 -0
data/lib/puppet/property/keyvalue.rb +74 -82
data/lib/puppet/property/list.rb +71 -81
data/lib/puppet/property/ordered_list.rb +15 -15
data/lib/puppet/provider.rb +229 -241
data/lib/puppet/provider/augeas/augeas.rb +318 -320
data/lib/puppet/provider/computer/computer.rb +13 -13
data/lib/puppet/provider/confine.rb +63 -63
data/lib/puppet/provider/confine/exists.rb +14 -14
data/lib/puppet/provider/confine/false.rb +12 -12
data/lib/puppet/provider/confine/feature.rb +10 -10
data/lib/puppet/provider/confine/true.rb +13 -13
data/lib/puppet/provider/confine/variable.rb +51 -54
data/lib/puppet/provider/confine_collection.rb +38 -38
data/lib/puppet/provider/confiner.rb +10 -14
data/lib/puppet/provider/cron/crontab.rb +172 -173
data/lib/puppet/provider/file/posix.rb +99 -0
data/lib/puppet/provider/file/win32.rb +74 -0
data/lib/puppet/provider/group/directoryservice.rb +6 -6
data/lib/puppet/provider/group/groupadd.rb +18 -20
data/lib/puppet/provider/group/ldap.rb +40 -43
data/lib/puppet/provider/group/pw.rb +23 -23
data/lib/puppet/provider/host/parsed.rb +51 -50
data/lib/puppet/provider/ldap.rb +121 -123
data/lib/puppet/provider/macauthorization/macauthorization.rb +263 -272
data/lib/puppet/provider/mailalias/aliases.rb +34 -31
data/lib/puppet/provider/maillist/mailman.rb +87 -93
data/lib/puppet/provider/mcx/mcxcontent.rb +155 -151
data/lib/puppet/provider/mount.rb +36 -40
data/lib/puppet/provider/mount/parsed.rb +28 -26
data/lib/puppet/provider/naginator.rb +46 -48
data/lib/puppet/provider/nameservice.rb +215 -257
data/lib/puppet/provider/nameservice/directoryservice.rb +455 -471
data/lib/puppet/provider/nameservice/objectadd.rb +21 -21
data/lib/puppet/provider/nameservice/pw.rb +13 -13
data/lib/puppet/provider/package.rb +18 -20
data/lib/puppet/provider/package/aix.rb +128 -0
data/lib/puppet/provider/package/appdmg.rb +78 -82
data/lib/puppet/provider/package/apple.rb +39 -40
data/lib/puppet/provider/package/apt.rb +95 -104
data/lib/puppet/provider/package/aptitude.rb +19 -21
data/lib/puppet/provider/package/aptrpm.rb +70 -72
data/lib/puppet/provider/package/blastwave.rb +88 -94
data/lib/puppet/provider/package/darwinport.rb +67 -69
data/lib/puppet/provider/package/dpkg.rb +123 -97
data/lib/puppet/provider/package/fink.rb +66 -68
data/lib/puppet/provider/package/freebsd.rb +38 -40
data/lib/puppet/provider/package/gem.rb +98 -102
data/lib/puppet/provider/package/hpux.rb +37 -39
data/lib/puppet/provider/package/nim.rb +35 -0
data/lib/puppet/provider/package/openbsd.rb +100 -75
data/lib/puppet/provider/package/pkg.rb +108 -0
data/lib/puppet/provider/package/pkgdmg.rb +95 -87
data/lib/puppet/provider/package/portage.rb +101 -104
data/lib/puppet/provider/package/ports.rb +71 -73
data/lib/puppet/provider/package/portupgrade.rb +251 -0
data/lib/puppet/provider/package/rpm.rb +113 -115
data/lib/puppet/provider/package/rug.rb +46 -46
data/lib/puppet/provider/package/sun.rb +135 -151
data/lib/puppet/provider/package/sunfreeware.rb +5 -5
data/lib/puppet/provider/package/up2date.rb +31 -31
data/lib/puppet/provider/package/urpmi.rb +51 -51
data/lib/puppet/provider/package/yum.rb +90 -98
data/lib/puppet/provider/package/zypper.rb +52 -0
data/lib/puppet/provider/parsedfile.rb +306 -329
data/lib/puppet/provider/port/parsed.rb +5 -5
data/lib/puppet/provider/selboolean/getsetsebool.rb +34 -34
data/lib/puppet/provider/selmodule/semodule.rb +103 -111
data/lib/puppet/provider/service/base.rb +134 -139
data/lib/puppet/provider/service/bsd.rb +48 -0
data/lib/puppet/provider/service/daemontools.rb +158 -162
data/lib/puppet/provider/service/debian.rb +36 -36
data/lib/puppet/provider/service/freebsd.rb +118 -38
data/lib/puppet/provider/service/gentoo.rb +33 -39
data/lib/puppet/provider/service/init.rb +125 -125
data/lib/puppet/provider/service/launchd.rb +234 -254
data/lib/puppet/provider/service/redhat.rb +58 -58
data/lib/puppet/provider/service/runit.rb +74 -74
data/lib/puppet/provider/service/smf.rb +81 -85
data/lib/puppet/provider/service/src.rb +87 -0
data/lib/puppet/provider/ssh_authorized_key/parsed.rb +73 -81
data/lib/puppet/provider/sshkey/parsed.rb +24 -21
data/lib/puppet/provider/user/directoryservice.rb +71 -71
data/lib/puppet/provider/user/hpux.rb +20 -20
data/lib/puppet/provider/user/ldap.rb +106 -110
data/lib/puppet/provider/user/pw.rb +33 -37
data/lib/puppet/provider/user/user_role_add.rb +168 -183
data/lib/puppet/provider/user/useradd.rb +50 -51
data/lib/puppet/provider/zfs/solaris.rb +35 -35
data/lib/puppet/provider/zone/solaris.rb +206 -205
data/lib/puppet/provider/zpool/solaris.rb +95 -97
data/lib/puppet/rails.rb +115 -122
data/lib/puppet/rails/benchmark.rb +43 -49
data/lib/puppet/rails/database/001_add_created_at_to_all_tables.rb +8 -12
data/lib/puppet/rails/database/002_remove_duplicated_index_on_all_tables.rb +8 -12
data/lib/puppet/rails/database/003_add_environment_to_host.rb +6 -10
data/lib/puppet/rails/database/schema.rb +100 -97
data/lib/puppet/rails/fact_name.rb +1 -1
data/lib/puppet/rails/fact_value.rb +5 -5
data/lib/puppet/rails/host.rb +252 -249
data/lib/puppet/rails/param_name.rb +15 -15
data/lib/puppet/rails/param_value.rb +55 -55
data/lib/puppet/rails/puppet_tag.rb +4 -4
data/lib/puppet/rails/resource.rb +189 -203
data/lib/puppet/rails/resource_tag.rb +19 -19
data/lib/puppet/rails/source_file.rb +5 -5
data/lib/puppet/reference/configuration.rb +53 -56
data/lib/puppet/reference/function.rb +1 -1
data/lib/puppet/reference/indirection.rb +13 -13
data/lib/puppet/reference/metaparameter.rb +40 -40
data/lib/puppet/reference/network.rb +16 -16
data/lib/puppet/reference/providers.rb +97 -98
data/lib/puppet/reference/report.rb +1 -1
data/lib/puppet/reference/type.rb +67 -70
data/lib/puppet/relationship.rb +65 -67
data/lib/puppet/reports.rb +32 -34
data/lib/puppet/reports/http.rb +22 -0
data/lib/puppet/reports/log.rb +7 -6
data/lib/puppet/reports/rrdgraph.rb +105 -114
data/lib/puppet/reports/store.rb +53 -56
data/lib/puppet/reports/tagmail.rb +149 -157
data/lib/puppet/resource.rb +428 -194
data/lib/puppet/resource/catalog.rb +496 -512
data/lib/puppet/resource/status.rb +58 -0
data/lib/puppet/resource/type.rb +311 -0
data/lib/puppet/resource/type_collection.rb +217 -0
data/lib/puppet/resource/type_collection_helper.rb +7 -0
data/lib/puppet/run.rb +77 -0
data/lib/puppet/simple_graph.rb +381 -413
data/lib/puppet/ssl.rb +2 -1
data/lib/puppet/ssl/base.rb +60 -43
data/lib/puppet/ssl/certificate.rb +21 -21
data/lib/puppet/ssl/certificate_authority.rb +215 -229
data/lib/puppet/ssl/certificate_authority/interface.rb +84 -68
data/lib/puppet/ssl/certificate_factory.rb +119 -119
data/lib/puppet/ssl/certificate_request.rb +52 -45
data/lib/puppet/ssl/certificate_revocation_list.rb +78 -78
data/lib/puppet/ssl/host.rb +230 -228
data/lib/puppet/ssl/inventory.rb +33 -33
data/lib/puppet/ssl/key.rb +37 -37
data/lib/puppet/sslcertificates.rb +124 -123
data/lib/puppet/sslcertificates/ca.rb +327 -344
data/lib/puppet/sslcertificates/certificate.rb +197 -224
data/lib/puppet/sslcertificates/inventory.rb +27 -29
data/lib/puppet/sslcertificates/support.rb +113 -119
data/lib/puppet/status.rb +28 -0
data/lib/puppet/transaction.rb +349 -696
data/lib/puppet/transaction/change.rb +80 -85
data/lib/puppet/transaction/event.rb +54 -14
data/lib/puppet/transaction/event_manager.rb +99 -0
data/lib/puppet/transaction/report.rb +121 -59
data/lib/puppet/transaction/resource_harness.rb +150 -0
data/lib/puppet/transportable.rb +215 -226
data/lib/puppet/type.rb +1644 -1849
data/lib/puppet/type/augeas.rb +153 -134
data/lib/puppet/type/component.rb +63 -65
data/lib/puppet/type/computer.rb +44 -44
data/lib/puppet/type/cron.rb +364 -384
data/lib/puppet/type/exec.rb +583 -521
data/lib/puppet/type/file.rb +786 -823
data/lib/puppet/type/file/checksum.rb +23 -240
data/lib/puppet/type/file/content.rb +193 -129
data/lib/puppet/type/file/ensure.rb +149 -153
data/lib/puppet/type/file/group.rb +94 -104
data/lib/puppet/type/file/mode.rb +109 -122
data/lib/puppet/type/file/owner.rb +39 -131
data/lib/puppet/type/file/selcontext.rb +69 -73
data/lib/puppet/type/file/source.rb +165 -153
data/lib/puppet/type/file/target.rb +56 -60
data/lib/puppet/type/file/type.rb +18 -18
data/lib/puppet/type/filebucket.rb +91 -92
data/lib/puppet/type/group.rb +77 -82
data/lib/puppet/type/host.rb +85 -85
data/lib/puppet/type/k5login.rb +65 -65
data/lib/puppet/type/macauthorization.rb +141 -143
data/lib/puppet/type/mailalias.rb +37 -37
data/lib/puppet/type/maillist.rb +51 -51
data/lib/puppet/type/mcx.rb +62 -62
data/lib/puppet/type/mount.rb +199 -193
data/lib/puppet/type/notify.rb +33 -33
data/lib/puppet/type/package.rb +301 -298
data/lib/puppet/type/port.rb +4 -4
data/lib/puppet/type/resources.rb +107 -123
data/lib/puppet/type/schedule.rb +317 -326
data/lib/puppet/type/selboolean.rb +19 -19
data/lib/puppet/type/selmodule.rb +34 -34
data/lib/puppet/type/service.rb +152 -152
data/lib/puppet/type/ssh_authorized_key.rb +74 -78
data/lib/puppet/type/sshkey.rb +52 -56
data/lib/puppet/type/stage.rb +18 -0
data/lib/puppet/type/tidy.rb +289 -300
data/lib/puppet/type/user.rb +300 -312
data/lib/puppet/type/yumrepo.rb +300 -335
data/lib/puppet/type/zfs.rb +36 -36
data/lib/puppet/type/zone.rb +376 -347
data/lib/puppet/type/zpool.rb +71 -77
data/lib/puppet/util.rb +383 -387
data/lib/puppet/util/autoload.rb +125 -143
data/lib/puppet/util/autoload/file_cache.rb +78 -101
data/lib/puppet/util/backups.rb +66 -66
data/lib/puppet/util/cacher.rb +112 -120
data/lib/puppet/util/checksums.rb +119 -84
data/lib/puppet/util/classgen.rb +157 -167
data/lib/puppet/util/command_line.rb +95 -0
data/lib/puppet/util/command_line/filebucket +97 -0
data/lib/puppet/util/command_line/pi +48 -0
data/lib/puppet/util/command_line/puppet +69 -0
data/lib/puppet/util/command_line/puppetca +110 -0
data/lib/puppet/util/command_line/puppetd +186 -0
data/lib/puppet/util/command_line/puppetdoc +67 -0
data/lib/puppet/util/command_line/puppetmasterd +65 -0
data/lib/puppet/util/command_line/puppetqd +53 -0
data/lib/puppet/util/command_line/puppetrun +128 -0
data/lib/puppet/util/command_line/ralsh +89 -0
data/lib/puppet/util/constant_inflector.rb +7 -7
data/lib/puppet/util/diff.rb +59 -56
data/lib/puppet/util/docs.rb +97 -99
data/lib/puppet/util/errors.rb +53 -44
data/lib/puppet/util/execution.rb +15 -15
data/lib/puppet/util/feature.rb +62 -72
data/lib/puppet/util/file_locking.rb +33 -33
data/lib/puppet/util/fileparsing.rb +292 -318
data/lib/puppet/util/filetype.rb +246 -263
data/lib/puppet/util/graph.rb +16 -18
data/lib/puppet/util/inifile.rb +170 -184
data/lib/puppet/util/inline_docs.rb +26 -0
data/lib/puppet/util/instance_loader.rb +58 -58
data/lib/puppet/util/ldap/connection.rb +57 -59
data/lib/puppet/util/ldap/generator.rb +31 -31
data/lib/puppet/util/ldap/manager.rb +233 -235
data/lib/puppet/util/loadedfile.rb +49 -51
data/lib/puppet/util/log.rb +210 -494
data/lib/puppet/util/log/destination.rb +49 -0
data/lib/puppet/util/log/destinations.rb +217 -0
data/lib/puppet/util/log_paths.rb +15 -17
data/lib/puppet/util/logging.rb +34 -13
data/lib/puppet/util/metaid.rb +15 -15
data/lib/puppet/util/methodhelper.rb +24 -26
data/lib/puppet/util/metric.rb +123 -125
data/lib/puppet/util/monkey_patches.rb +21 -20
data/lib/puppet/util/nagios_maker.rb +41 -41
data/lib/puppet/util/package.rb +24 -26
data/lib/puppet/util/pidlock.rb +49 -49
data/lib/puppet/util/posix.rb +115 -115
data/lib/puppet/util/provider_features.rb +147 -155
data/lib/puppet/util/pson.rb +5 -5
data/lib/puppet/util/queue.rb +55 -55
data/lib/puppet/util/queue/stomp.rb +27 -27
data/lib/puppet/util/rails/cache_accumulator.rb +49 -49
data/lib/puppet/util/rails/collection_merger.rb +13 -13
data/lib/puppet/util/rails/reference_serializer.rb +26 -26
data/lib/puppet/util/rdoc.rb +77 -74
data/lib/puppet/util/rdoc/code_objects.rb +235 -217
data/lib/puppet/util/rdoc/generators/puppet_generator.rb +732 -676
data/lib/puppet/util/rdoc/generators/template/puppet/puppet.rb +38 -12
data/lib/puppet/util/rdoc/parser.rb +418 -392
data/lib/puppet/util/reference.rb +168 -174
data/lib/puppet/util/resource_template.rb +17 -17
data/lib/puppet/util/run_mode.rb +81 -0
data/lib/puppet/util/selinux.rb +184 -200
data/lib/puppet/util/settings.rb +886 -919
data/lib/puppet/util/settings/boolean_setting.rb +20 -23
data/lib/puppet/util/settings/file_setting.rb +98 -99
data/lib/puppet/util/settings/setting.rb +71 -87
data/lib/puppet/util/storage.rb +73 -84
data/lib/puppet/util/subclass_loader.rb +59 -66
data/lib/puppet/util/suidmanager.rb +87 -84
data/lib/puppet/util/tagging.rb +37 -39
data/lib/puppet/util/user_attr.rb +14 -14
data/lib/puppet/util/warnings.rb +20 -20
data/lib/puppet/util/zaml.rb +242 -241
data/man/man5/puppet.conf.5 +148 -76
data/man/man8/filebucket.8 +6 -6
data/man/man8/pi.8 +5 -5
data/man/man8/puppet.8 +2 -73
data/man/man8/puppetca.8 +47 -32
data/man/man8/puppetd.8 +118 -76
data/man/man8/puppetdoc.8 +16 -12
data/man/man8/puppetmasterd.8 +4 -4
data/man/man8/puppetqd.8 +4 -4
data/man/man8/puppetrun.8 +23 -22
data/man/man8/ralsh.8 +16 -17
data/spec/fixtures/yaml/test.local.yaml +16 -0
data/spec/integration/application/apply_spec.rb +33 -0
data/spec/integration/configurer_spec.rb +35 -0
data/spec/integration/defaults_spec.rb +258 -0
data/spec/integration/file_serving/content_spec.rb +20 -0
data/spec/integration/file_serving/fileset_spec.rb +14 -0
data/spec/integration/file_serving/metadata_spec.rb +21 -0
data/spec/integration/file_serving/terminus_helper_spec.rb +22 -0
data/spec/integration/indirector/bucket_file/rest_spec.rb +68 -0
data/spec/integration/indirector/catalog/compiler_spec.rb +68 -0
data/spec/integration/indirector/catalog/queue_spec.rb +61 -0
data/spec/integration/indirector/certificate/rest_spec.rb +68 -0
data/spec/integration/indirector/certificate_request/rest_spec.rb +88 -0
data/spec/integration/indirector/certificate_revocation_list/rest_spec.rb +76 -0
data/spec/integration/indirector/direct_file_server_spec.rb +73 -0
data/spec/integration/indirector/file_content/file_server_spec.rb +94 -0
data/spec/integration/indirector/file_metadata/file_server_spec.rb +18 -0
data/spec/integration/indirector/node/ldap_spec.rb +15 -0
data/spec/integration/indirector/report/rest_spec.rb +96 -0
data/spec/integration/indirector/rest_spec.rb +524 -0
data/spec/integration/network/client_spec.rb +19 -0
data/spec/integration/network/formats_spec.rb +110 -0
data/spec/integration/network/handler_spec.rb +25 -0
data/spec/integration/network/server/mongrel_spec.rb +66 -0
data/spec/integration/network/server/webrick_spec.rb +85 -0
data/spec/integration/node/environment_spec.rb +58 -0
data/spec/integration/node/facts_spec.rb +47 -0
data/spec/integration/node_spec.rb +93 -0
data/spec/integration/parser/collector_spec.rb +38 -0
data/spec/integration/parser/compiler_spec.rb +29 -0
data/spec/integration/parser/functions/require_spec.rb +44 -0
data/spec/integration/parser/parser_spec.rb +113 -0
data/spec/integration/provider/mailalias/aliases_spec.rb +25 -0
data/spec/integration/provider/package_spec.rb +26 -0
data/spec/integration/provider/service/init_spec.rb +32 -0
data/spec/integration/reference/providers_spec.rb +17 -0
data/spec/integration/reports_spec.rb +18 -0
data/spec/integration/resource/catalog_spec.rb +61 -0
data/spec/integration/resource/type_collection_spec.rb +96 -0
data/spec/integration/ssl/certificate_authority_spec.rb +135 -0
data/spec/integration/ssl/certificate_request_spec.rb +61 -0
data/spec/integration/ssl/certificate_revocation_list_spec.rb +42 -0
data/spec/integration/ssl/host_spec.rb +90 -0
data/spec/integration/transaction/report_spec.rb +29 -0
data/spec/integration/transaction_spec.rb +284 -0
data/spec/integration/type/file_spec.rb +506 -0
data/spec/integration/type/package_spec.rb +25 -0
data/spec/integration/type/tidy_spec.rb +32 -0
data/spec/integration/type_spec.rb +22 -0
data/spec/integration/util/autoload_spec.rb +114 -0
data/spec/integration/util/feature_spec.rb +54 -0
data/spec/integration/util/file_locking_spec.rb +37 -0
data/spec/integration/util/rdoc/parser_spec.rb +59 -0
data/spec/integration/util/settings_spec.rb +30 -0
data/spec/lib/puppet_spec/files.rb +16 -6
data/spec/monkey_patches/add_confine_and_runnable_to_rspec_dsl.rb +27 -27
data/spec/monkey_patches/alias_should_to_must.rb +4 -4
data/spec/shared_behaviours/file_server_terminus.rb +28 -28
data/spec/shared_behaviours/file_serving.rb +53 -53
data/spec/shared_behaviours/memory_terminus.rb +22 -22
data/spec/spec.opts +1 -0
data/spec/spec_helper.rb +61 -18
data/spec/spec_specs/runnable_spec.rb +95 -0
data/spec/unit/agent/locker_spec.rb +100 -0
data/spec/unit/agent_spec.rb +281 -0
data/spec/unit/application/agent_spec.rb +588 -0
data/spec/unit/application/apply_spec.rb +387 -0
data/spec/unit/application/cert_spec.rb +194 -0
data/spec/unit/application/describe_spec.rb +84 -0
data/spec/unit/application/doc_spec.rb +368 -0
data/spec/unit/application/filebucket_spec.rb +223 -0
data/spec/unit/application/kick_spec.rb +313 -0
data/spec/unit/application/master_spec.rb +453 -0
data/spec/unit/application/queue_spec.rb +186 -0
data/spec/unit/application/resource_spec.rb +233 -0
data/spec/unit/application_spec.rb +531 -0
data/spec/unit/configurer/downloader_spec.rb +188 -0
data/spec/unit/configurer/fact_handler_spec.rb +164 -0
data/spec/unit/configurer/plugin_handler_spec.rb +112 -0
data/spec/unit/configurer_spec.rb +494 -0
data/spec/unit/daemon_spec.rb +306 -0
data/spec/unit/dsl/resource_api_spec.rb +181 -0
data/spec/unit/dsl/resource_type_api_spec.rb +46 -0
data/spec/unit/file_bucket/dipper_spec.rb +122 -0
data/spec/unit/file_bucket/file_spec.rb +230 -0
data/spec/unit/file_collection/lookup_spec.rb +46 -0
data/spec/unit/file_collection_spec.rb +53 -0
data/spec/unit/file_serving/base_spec.rb +132 -0
data/spec/unit/file_serving/configuration/parser_spec.rb +181 -0
data/spec/unit/file_serving/configuration_spec.rb +249 -0
data/spec/unit/file_serving/content_spec.rb +118 -0
data/spec/unit/file_serving/fileset_spec.rb +347 -0
data/spec/unit/file_serving/indirection_hooks_spec.rb +63 -0
data/spec/unit/file_serving/metadata_spec.rb +286 -0
data/spec/unit/file_serving/mount/file_spec.rb +196 -0
data/spec/unit/file_serving/mount/modules_spec.rb +63 -0
data/spec/unit/file_serving/mount/plugins_spec.rb +61 -0
data/spec/unit/file_serving/mount_spec.rb +32 -0
data/spec/unit/file_serving/terminus_helper_spec.rb +98 -0
data/spec/unit/indirector/active_record_spec.rb +76 -0
data/spec/unit/indirector/catalog/active_record_spec.rb +141 -0
data/spec/unit/indirector/catalog/compiler_spec.rb +275 -0
data/spec/unit/indirector/catalog/queue_spec.rb +20 -0
data/spec/unit/indirector/catalog/rest_spec.rb +11 -0
data/spec/unit/indirector/catalog/yaml_spec.rb +25 -0
data/spec/unit/indirector/certificate/ca_spec.rb +28 -0
data/spec/unit/indirector/certificate/file_spec.rb +28 -0
data/spec/unit/indirector/certificate/rest_spec.rb +58 -0
data/spec/unit/indirector/certificate_request/ca_spec.rb +19 -0
data/spec/unit/indirector/certificate_request/file_spec.rb +19 -0
data/spec/unit/indirector/certificate_request/rest_spec.rb +23 -0
data/spec/unit/indirector/certificate_revocation_list/ca_spec.rb +21 -0
data/spec/unit/indirector/certificate_revocation_list/file_spec.rb +20 -0
data/spec/unit/indirector/certificate_revocation_list/rest_spec.rb +23 -0
data/spec/unit/indirector/code_spec.rb +33 -0
data/spec/unit/indirector/direct_file_server_spec.rb +84 -0
data/spec/unit/indirector/envelope_spec.rb +47 -0
data/spec/unit/indirector/exec_spec.rb +56 -0
data/spec/unit/indirector/facts/active_record_spec.rb +104 -0
data/spec/unit/indirector/facts/couch_spec.rb +98 -0
data/spec/unit/indirector/facts/facter_spec.rb +143 -0
data/spec/unit/indirector/facts/rest_spec.rb +11 -0
data/spec/unit/indirector/facts/yaml_spec.rb +26 -0
data/spec/unit/indirector/file_bucket_file/file_spec.rb +290 -0
data/spec/unit/indirector/file_bucket_file/rest_spec.rb +11 -0
data/spec/unit/indirector/file_content/file_server_spec.rb +18 -0
data/spec/unit/indirector/file_content/file_spec.rb +18 -0
data/spec/unit/indirector/file_content/rest_spec.rb +11 -0
data/spec/unit/indirector/file_metadata/file_server_spec.rb +18 -0
data/spec/unit/indirector/file_metadata/file_spec.rb +52 -0
data/spec/unit/indirector/file_metadata/rest_spec.rb +9 -0
data/spec/unit/indirector/file_server_spec.rb +267 -0
data/spec/unit/indirector/file_spec.rb +181 -0
data/spec/unit/indirector/indirection_spec.rb +795 -0
data/spec/unit/indirector/key/ca_spec.rb +28 -0
data/spec/unit/indirector/key/file_spec.rb +104 -0
data/spec/unit/indirector/ldap_spec.rb +143 -0
data/spec/unit/indirector/memory_spec.rb +29 -0
data/spec/unit/indirector/node/active_record_spec.rb +41 -0
data/spec/unit/indirector/node/exec_spec.rb +70 -0
data/spec/unit/indirector/node/ldap_spec.rb +456 -0
data/spec/unit/indirector/node/memory_spec.rb +19 -0
data/spec/unit/indirector/node/plain_spec.rb +19 -0
data/spec/unit/indirector/node/rest_spec.rb +13 -0
data/spec/unit/indirector/node/yaml_spec.rb +25 -0
data/spec/unit/indirector/plain_spec.rb +29 -0
data/spec/unit/indirector/queue_spec.rb +123 -0
data/spec/unit/indirector/report/processor_spec.rb +81 -0
data/spec/unit/indirector/report/rest_spec.rb +28 -0
data/spec/unit/indirector/request_spec.rb +304 -0
data/spec/unit/indirector/resource/ral_spec.rb +129 -0
data/spec/unit/indirector/resource/rest_spec.rb +11 -0
data/spec/unit/indirector/resource_type/parser_spec.rb +75 -0
data/spec/unit/indirector/resource_type/rest_spec.rb +15 -0
data/spec/unit/indirector/rest_spec.rb +455 -0
data/spec/unit/indirector/run/local_spec.rb +20 -0
data/spec/unit/indirector/run/rest_spec.rb +11 -0
data/spec/unit/indirector/ssl_file_spec.rb +281 -0
data/spec/unit/indirector/status/rest_spec.rb +11 -0
data/spec/unit/indirector/terminus_spec.rb +245 -0
data/spec/unit/indirector/yaml_spec.rb +146 -0
data/spec/unit/indirector_spec.rb +157 -0
data/spec/unit/module_spec.rb +547 -0
data/spec/unit/network/authconfig_spec.rb +292 -0
data/spec/unit/network/authstore_spec.rb +370 -0
data/spec/unit/network/client_spec.rb +45 -0
data/spec/unit/network/format_handler_spec.rb +336 -0
data/spec/unit/network/format_spec.rb +198 -0
data/spec/unit/network/formats_spec.rb +337 -0
data/spec/unit/network/handler/fileserver_spec.rb +172 -0
data/spec/unit/network/http/api/v1_spec.rb +122 -0
data/spec/unit/network/http/compression_spec.rb +199 -0
data/spec/unit/network/http/handler_spec.rb +455 -0
data/spec/unit/network/http/mongrel/rest_spec.rb +249 -0
data/spec/unit/network/http/mongrel/{xmlrpc.rb → xmlrpc_spec.rb} +0 -0
data/spec/unit/network/http/mongrel_spec.rb +131 -0
data/spec/unit/network/http/rack/rest_spec.rb +249 -0
data/spec/unit/network/http/rack/xmlrpc_spec.rb +157 -0
data/spec/unit/network/http/rack_spec.rb +102 -0
data/spec/unit/network/http/webrick/rest_spec.rb +180 -0
data/spec/unit/network/http/webrick/{xmlrpc.rb → xmlrpc_spec.rb} +0 -0
data/spec/unit/network/http/webrick_spec.rb +339 -0
data/spec/unit/network/http_pool_spec.rb +206 -0
data/spec/unit/network/http_spec.rb +35 -0
data/spec/unit/network/rest_authconfig_spec.rb +148 -0
data/spec/unit/network/rest_authorization_spec.rb +43 -0
data/spec/unit/network/rights_spec.rb +519 -0
data/spec/unit/network/server_spec.rb +534 -0
data/spec/unit/network/xmlrpc/client_spec.rb +171 -0
data/spec/unit/node/environment_spec.rb +248 -0
data/spec/unit/node/facts_spec.rb +102 -0
data/spec/unit/node_spec.rb +210 -0
data/spec/unit/other/selinux_spec.rb +94 -0
data/spec/unit/other/transbucket_spec.rb +188 -0
data/spec/unit/other/transobject_spec.rb +112 -0
data/spec/unit/parameter/value_collection_spec.rb +167 -0
data/spec/unit/parameter/value_spec.rb +88 -0
data/spec/unit/parameter_spec.rb +172 -0
data/spec/unit/parser/ast/arithmetic_operator_spec.rb +73 -0
data/spec/unit/parser/ast/astarray_spec.rb +72 -0
data/spec/unit/parser/ast/asthash_spec.rb +98 -0
data/spec/unit/parser/ast/boolean_operator_spec.rb +53 -0
data/spec/unit/parser/ast/casestatement_spec.rb +161 -0
data/spec/unit/parser/ast/collection_spec.rb +63 -0
data/spec/unit/parser/ast/collexpr_spec.rb +115 -0
data/spec/unit/parser/ast/comparison_operator_spec.rb +116 -0
data/spec/unit/parser/ast/function_spec.rb +83 -0
data/spec/unit/parser/ast/ifstatement_spec.rb +76 -0
data/spec/unit/parser/ast/in_operator_spec.rb +60 -0
data/spec/unit/parser/ast/leaf_spec.rb +362 -0
data/spec/unit/parser/ast/match_operator_spec.rb +50 -0
data/spec/unit/parser/ast/minus_spec.rb +36 -0
data/spec/unit/parser/ast/nop_spec.rb +20 -0
data/spec/unit/parser/ast/not_spec.rb +30 -0
data/spec/unit/parser/ast/relationship_spec.rb +88 -0
data/spec/unit/parser/ast/resource_defaults_spec.rb +22 -0
data/spec/unit/parser/ast/resource_override_spec.rb +51 -0
data/spec/unit/parser/ast/resource_reference_spec.rb +46 -0
data/spec/unit/parser/ast/resource_spec.rb +120 -0
data/spec/unit/parser/ast/selector_spec.rb +139 -0
data/spec/unit/parser/ast/vardef_spec.rb +60 -0
data/spec/unit/parser/ast_spec.rb +111 -0
data/spec/unit/parser/collector_spec.rb +559 -0
data/spec/unit/parser/compiler_spec.rb +754 -0
data/spec/unit/parser/files_spec.rb +201 -0
data/spec/unit/parser/functions/defined_spec.rb +50 -0
data/spec/unit/parser/functions/fqdn_rand_spec.rb +62 -0
data/spec/unit/parser/functions/generate_spec.rb +41 -0
data/spec/unit/parser/functions/inline_template_spec.rb +59 -0
data/spec/unit/parser/functions/realize_spec.rb +51 -0
data/spec/unit/parser/functions/regsubst_spec.rb +192 -0
data/spec/unit/parser/functions/require_spec.rb +74 -0
data/spec/unit/parser/functions/shellquote_spec.rb +81 -0
data/spec/unit/parser/functions/split_spec.rb +49 -0
data/spec/unit/parser/functions/sprintf_spec.rb +41 -0
data/spec/unit/parser/functions/tag_spec.rb +24 -0
data/spec/unit/parser/functions/template_spec.rb +62 -0
data/spec/unit/parser/functions/versioncmp_spec.rb +29 -0
data/spec/unit/parser/functions_spec.rb +102 -0
data/spec/unit/parser/lexer_spec.rb +646 -0
data/spec/unit/parser/parser_spec.rb +412 -0
data/spec/unit/parser/relationship_spec.rb +70 -0
data/spec/unit/parser/resource_spec.rb +564 -0
data/spec/unit/parser/scope_spec.rb +629 -0
data/spec/unit/parser/templatewrapper_spec.rb +144 -0
data/spec/unit/parser/type_loader_spec.rb +201 -0
data/spec/unit/property/ensure_spec.rb +13 -0
data/spec/unit/property/keyvalue_spec.rb +168 -0
data/spec/unit/property/list_spec.rb +166 -0
data/spec/unit/property/ordered_list_spec.rb +64 -0
data/spec/unit/property_spec.rb +410 -0
data/spec/unit/provider/augeas/augeas_spec.rb +413 -0
data/spec/unit/provider/confine/exists_spec.rb +81 -0
data/spec/unit/provider/confine/false_spec.rb +53 -0
data/spec/unit/provider/confine/feature_spec.rb +60 -0
data/spec/unit/provider/confine/true_spec.rb +53 -0
data/spec/unit/provider/confine/variable_spec.rb +107 -0
data/spec/unit/provider/confine_collection_spec.rb +134 -0
data/spec/unit/provider/confine_spec.rb +78 -0
data/spec/unit/provider/confiner_spec.rb +63 -0
data/spec/unit/provider/group/groupadd_spec.rb +31 -0
data/spec/unit/provider/group/ldap_spec.rb +105 -0
data/spec/unit/provider/ldap_spec.rb +248 -0
data/spec/unit/provider/macauthorization_spec.rb +147 -0
data/spec/unit/provider/mcx/mcxcontent_spec.rb +175 -0
data/spec/unit/provider/mount/parsed_spec.rb +193 -0
data/spec/unit/provider/mount_spec.rb +130 -0
data/spec/unit/provider/naginator_spec.rb +58 -0
data/spec/unit/provider/package/aix_spec.rb +66 -0
data/spec/unit/provider/package/apt_spec.rb +145 -0
data/spec/unit/provider/package/dpkg_spec.rb +225 -0
data/spec/unit/provider/package/gem_spec.rb +87 -0
data/spec/unit/provider/package/hpux_spec.rb +52 -0
data/spec/unit/provider/package/nim_spec.rb +42 -0
data/spec/unit/provider/package/pkg_spec.rb +63 -0
data/spec/unit/provider/package/pkgdmg_spec.rb +84 -0
data/spec/unit/provider/package/zypper_spec.rb +81 -0
data/spec/unit/provider/parsedfile_spec.rb +95 -0
data/spec/unit/provider/selboolean_spec.rb +37 -0
data/spec/unit/provider/selmodule_spec.rb +66 -0
data/spec/unit/provider/service/daemontools_spec.rb +166 -0
data/spec/unit/provider/service/debian_spec.rb +89 -0
data/spec/unit/provider/service/init_spec.rb +168 -0
data/spec/unit/provider/service/launchd_spec.rb +200 -0
data/spec/unit/provider/service/redhat_spec.rb +121 -0
data/spec/unit/provider/service/runit_spec.rb +140 -0
data/spec/unit/provider/service/src_spec.rb +97 -0
data/spec/unit/provider/ssh_authorized_key/parsed_spec.rb +228 -0
data/spec/unit/provider/sshkey/parsed_spec.rb +38 -0
data/spec/unit/provider/user/hpux_spec.rb +25 -0
data/spec/unit/provider/user/ldap_spec.rb +279 -0
data/spec/unit/provider/user/user_role_add_spec.rb +249 -0
data/spec/unit/provider/user/useradd_spec.rb +115 -0
data/spec/unit/provider/zfs/solaris_spec.rb +99 -0
data/spec/unit/provider/zone/solaris_spec.rb +55 -0
data/spec/unit/provider/zpool/solaris_spec.rb +179 -0
data/spec/unit/provider_spec.rb +31 -0
data/spec/unit/puppet_spec.rb +12 -0
data/spec/unit/rails/host_spec.rb +163 -0
data/spec/unit/rails/param_value_spec.rb +49 -0
data/spec/unit/rails/resource_spec.rb +123 -0
data/spec/unit/rails_spec.rb +258 -0
data/spec/unit/relationship_spec.rb +236 -0
data/spec/unit/reports/http_spec.rb +56 -0
data/spec/unit/reports/tagmail_spec.rb +94 -0
data/spec/unit/reports_spec.rb +61 -0
data/spec/unit/resource/catalog_spec.rb +1078 -0
data/spec/unit/resource/status_spec.rb +103 -0
data/spec/unit/resource/type_collection_helper_spec.rb +25 -0
data/spec/unit/resource/type_collection_spec.rb +432 -0
data/spec/unit/resource/type_spec.rb +722 -0
data/spec/unit/resource_spec.rb +818 -0
data/spec/unit/run_spec.rb +137 -0
data/spec/unit/simple_graph_spec.rb +544 -0
data/spec/unit/ssl/base_spec.rb +43 -0
data/spec/unit/ssl/certificate_authority/interface_spec.rb +333 -0
data/spec/unit/ssl/certificate_authority_spec.rb +772 -0
data/spec/unit/ssl/certificate_factory_spec.rb +107 -0
data/spec/unit/ssl/certificate_request_spec.rb +220 -0
data/spec/unit/ssl/certificate_revocation_list_spec.rb +168 -0
data/spec/unit/ssl/certificate_spec.rb +124 -0
data/spec/unit/ssl/host_spec.rb +707 -0
data/spec/unit/ssl/inventory_spec.rb +180 -0
data/spec/unit/ssl/key_spec.rb +198 -0
data/spec/unit/status_spec.rb +31 -0
data/spec/unit/transaction/change_spec.rb +193 -0
data/spec/unit/transaction/event_manager_spec.rb +260 -0
data/spec/unit/transaction/event_spec.rb +108 -0
data/spec/unit/transaction/report_spec.rb +234 -0
data/spec/unit/transaction/resource_harness_spec.rb +401 -0
data/spec/unit/transaction_spec.rb +452 -0
data/spec/unit/transportable_spec.rb +0 -0
data/spec/unit/type/augeas_spec.rb +122 -0
data/spec/unit/type/component_spec.rb +63 -0
data/spec/unit/type/computer_spec.rb +81 -0
data/spec/unit/type/cron_spec.rb +33 -0
data/spec/unit/type/exec_spec.rb +162 -0
data/spec/unit/type/file/checksum_spec.rb +73 -0
data/spec/unit/type/file/content_spec.rb +460 -0
data/spec/unit/type/file/ensure_spec.rb +84 -0
data/spec/unit/type/file/group_spec.rb +123 -0
data/spec/unit/type/file/owner_spec.rb +150 -0
data/spec/unit/type/file/selinux_spec.rb +83 -0
data/spec/unit/type/file/source_spec.rb +272 -0
data/spec/unit/type/file_spec.rb +1070 -0
data/spec/unit/type/filebucket_spec.rb +74 -0
data/spec/unit/type/group_spec.rb +57 -0
data/spec/unit/type/macauthorization_spec.rb +111 -0
data/spec/unit/type/maillist_spec.rb +42 -0
data/spec/unit/type/mcx_spec.rb +100 -0
data/spec/unit/type/mount_spec.rb +261 -0
data/spec/unit/type/nagios_spec.rb +63 -0
data/spec/unit/type/noop_metaparam_spec.rb +37 -0
data/spec/unit/type/package_spec.rb +240 -0
data/spec/unit/type/resources_spec.rb +102 -0
data/spec/unit/type/schedule_spec.rb +333 -0
data/spec/unit/type/selboolean_spec.rb +45 -0
data/spec/unit/type/selmodule_spec.rb +18 -0
data/spec/unit/type/service_spec.rb +222 -0
data/spec/unit/type/ssh_authorized_key_spec.rb +152 -0
data/spec/unit/type/stage_spec.rb +9 -0
data/spec/unit/type/tidy_spec.rb +424 -0
data/spec/unit/type/user_spec.rb +281 -0
data/spec/unit/type/zfs_spec.rb +45 -0
data/spec/unit/type/zone_spec.rb +60 -0
data/spec/unit/type/zpool_spec.rb +110 -0
data/spec/unit/type_spec.rb +566 -0
data/spec/unit/util/autoload/file_cache_spec.rb +159 -0
data/spec/unit/util/autoload_spec.rb +120 -0
data/spec/unit/util/backups_spec.rb +159 -0
data/spec/unit/util/cache_accumulator_spec.rb +75 -0
data/spec/unit/util/cacher_spec.rb +185 -0
data/spec/unit/util/checksums_spec.rb +153 -0
data/spec/unit/util/command_line_spec.rb +108 -0
data/spec/unit/util/constant_inflector_spec.rb +70 -0
data/spec/unit/util/errors_spec.rb +38 -0
data/spec/unit/util/feature_spec.rb +72 -0
data/spec/unit/util/file_locking_spec.rb +156 -0
data/spec/unit/util/filetype_spec.rb +100 -0
data/spec/unit/util/inline_docs_spec.rb +32 -0
data/spec/unit/util/json_spec.rb +21 -0
data/spec/unit/util/ldap/connection_spec.rb +169 -0
data/spec/unit/util/ldap/generator_spec.rb +54 -0
data/spec/unit/util/ldap/manager_spec.rb +654 -0
data/spec/unit/util/loadedfile_spec.rb +65 -0
data/spec/unit/util/log/destinations_spec.rb +24 -0
data/spec/unit/util/log_spec.rb +215 -0
data/spec/unit/util/logging_spec.rb +95 -0
data/spec/unit/util/metric_spec.rb +95 -0
data/spec/unit/util/monkey_patches_spec.rb +7 -0
data/spec/unit/util/nagios_maker_spec.rb +126 -0
data/spec/unit/util/package_spec.rb +21 -0
data/spec/unit/util/posix_spec.rb +256 -0
data/spec/unit/util/queue/stomp_spec.rb +140 -0
data/spec/unit/util/queue_spec.rb +96 -0
data/spec/unit/util/rdoc/parser_spec.rb +540 -0
data/spec/unit/util/rdoc_spec.rb +165 -0
data/spec/unit/util/reference_serializer_spec.rb +52 -0
data/spec/unit/util/resource_template_spec.rb +58 -0
data/spec/unit/util/run_mode_spec.rb +51 -0
data/spec/unit/util/selinux_spec.rb +278 -0
data/spec/unit/util/settings/file_setting_spec.rb +256 -0
data/spec/unit/util/settings_spec.rb +1099 -0
data/spec/unit/util/storage_spec.rb +235 -0
data/spec/unit/util/tagging_spec.rb +102 -0
data/spec/unit/util/user_attr_spec.rb +47 -0
data/spec/unit/util/warnings_spec.rb +39 -0
data/spec/unit/util/zaml_spec.rb +38 -0
data/tasks/rake/git_workflow.rake +1 -1
data/tasks/rake/sign.rake +2 -2
data/test/certmgr/ca.rb +61 -61
data/test/certmgr/certmgr.rb +292 -283
data/test/certmgr/inventory.rb +44 -42
data/test/certmgr/support.rb +78 -77
data/test/data/providers/ssh_authorized_key/parsed/authorized_keys +1 -1
data/test/data/snippets/hash.pp +33 -0
data/test/language/ast.rb +68 -117
data/test/language/ast/variable.rb +14 -15
data/test/language/functions.rb +404 -463
data/test/language/parser.rb +670 -1135
data/test/language/scope.rb +198 -402
data/test/language/snippets.rb +439 -447
data/test/language/transportable.rb +67 -66
data/test/lib/puppettest.rb +260 -268
data/test/lib/puppettest/certificates.rb +51 -53
data/test/lib/puppettest/exetest.rb +107 -111
data/test/lib/puppettest/fakes.rb +153 -158
data/test/lib/puppettest/fileparsing.rb +17 -17
data/test/lib/puppettest/filetesting.rb +204 -213
data/test/lib/puppettest/parsertesting.rb +382 -365
data/test/lib/puppettest/railstesting.rb +49 -50
data/test/lib/puppettest/reporttesting.rb +10 -10
data/test/lib/puppettest/resourcetesting.rb +45 -36
data/test/lib/puppettest/runnable_test.rb +36 -28
data/test/lib/puppettest/servertest.rb +54 -51
data/test/lib/puppettest/support/assertions.rb +48 -55
data/test/lib/puppettest/support/helpers.rb +12 -16
data/test/lib/puppettest/support/resources.rb +23 -25
data/test/lib/puppettest/support/utils.rb +138 -148
data/test/lib/puppettest/testcase.rb +15 -17
data/test/lib/rake/puppet_test_loader.rb +1 -3
data/test/lib/rake/puppet_testtask.rb +10 -10
data/test/network/authconfig.rb +48 -50
data/test/network/authorization.rb +114 -113
data/test/network/authstore.rb +454 -406
data/test/network/client/ca.rb +46 -48
data/test/network/client/dipper.rb +22 -22
data/test/network/client_request.rb +20 -20
data/test/network/handler/ca.rb +251 -252
data/test/network/handler/fileserver.rb +1071 -1001
data/test/network/handler/master.rb +58 -58
data/test/network/handler/report.rb +64 -64
data/test/network/handler/runner.rb +8 -8
data/test/network/rights.rb +22 -19
data/test/network/server/mongrel_test.rb +87 -87
data/test/network/server/webrick.rb +99 -87
data/test/network/xmlrpc/client.rb +30 -30
data/test/network/xmlrpc/processor.rb +52 -53
data/test/network/xmlrpc/server.rb +10 -11
data/test/network/xmlrpc/webrick_servlet.rb +21 -18
data/test/other/provider.rb +69 -84
data/test/other/puppet.rb +61 -76
data/test/other/relationships.rb +73 -65
data/test/other/report.rb +88 -187
data/test/other/transactions.rb +363 -885
data/test/puppet/defaults.rb +51 -54
data/test/puppet/errortest.rb +8 -8
data/test/puppet/tc_suidmanager.rb +106 -103
data/test/rails/rails.rb +8 -9
data/test/rails/railsparameter.rb +60 -54
data/test/ral/manager/attributes.rb +262 -260
data/test/ral/manager/instances.rb +77 -78
data/test/ral/manager/manager.rb +36 -36
data/test/ral/manager/provider.rb +56 -79
data/test/ral/manager/type.rb +308 -449
data/test/ral/providers/cron/crontab.rb +561 -545
data/test/ral/providers/group.rb +203 -212
data/test/ral/providers/host/parsed.rb +189 -180
data/test/ral/providers/mailalias/aliases.rb +40 -40
data/test/ral/providers/nameservice.rb +21 -21
data/test/ral/providers/package.rb +207 -214
data/test/ral/providers/package/aptitude.rb +75 -63
data/test/ral/providers/package/aptrpm.rb +84 -72
data/test/ral/providers/parsedfile.rb +510 -509
data/test/ral/providers/port/parsed.rb +5 -5
data/test/ral/providers/provider.rb +421 -421
data/test/ral/providers/service/base.rb +59 -53
data/test/ral/providers/sshkey/parsed.rb +86 -83
data/test/ral/providers/user.rb +471 -451
data/test/ral/providers/user/useradd.rb +168 -177
data/test/ral/type/cron.rb +406 -393
data/test/ral/type/exec.rb +721 -641
data/test/ral/type/file.rb +827 -896
data/test/ral/type/file/target.rb +295 -251
data/test/ral/type/fileignoresource.rb +232 -205
data/test/ral/type/filesources.rb +446 -485
data/test/ral/type/host.rb +124 -153
data/test/ral/type/mailalias.rb +28 -31
data/test/ral/type/port.rb +7 -7
data/test/ral/type/resources.rb +88 -93
data/test/ral/type/service.rb +19 -19
data/test/ral/type/sshkey.rb +120 -160
data/test/ral/type/user.rb +132 -414
data/test/ral/type/yumrepo.rb +95 -92
data/test/ral/type/zone.rb +316 -287
data/test/test +1 -1
data/test/util/classgen.rb +182 -167
data/test/util/execution.rb +18 -18
data/test/util/fileparsing.rb +580 -540
data/test/util/inifile.rb +117 -106
data/test/util/instance_loader.rb +29 -29
data/test/util/log.rb +202 -198
data/test/util/metrics.rb +51 -51
data/test/util/package.rb +11 -12
data/test/util/pidlock.rb +115 -115
data/test/util/settings.rb +613 -557
data/test/util/storage.rb +71 -88
data/test/util/subclass_loader.rb +69 -72
data/test/util/utiltest.rb +204 -203
metadata +493 -395
data/lib/puppet/agent/runner.rb +0 -65
data/lib/puppet/application/pi.rb +0 -214
data/lib/puppet/application/puppet.rb +0 -181
data/lib/puppet/application/puppetca.rb +0 -71
data/lib/puppet/application/puppetd.rb +0 -250
data/lib/puppet/application/puppetdoc.rb +0 -224
data/lib/puppet/application/puppetmasterd.rb +0 -168
data/lib/puppet/application/puppetqd.rb +0 -96
data/lib/puppet/application/puppetrun.rb +0 -210
data/lib/puppet/application/ralsh.rb +0 -152
data/lib/puppet/checksum.rb +0 -57
data/lib/puppet/indirector/checksum/file.rb +0 -33
data/lib/puppet/indirector/runner/rest.rb +0 -7
data/lib/puppet/network/client/dipper.rb +0 -85
data/lib/puppet/network/client/resource.rb +0 -38
data/lib/puppet/network/handler/resource.rb +0 -190
data/lib/puppet/parser/ast/definition.rb +0 -207
data/lib/puppet/parser/ast/hostclass.rb +0 -95
data/lib/puppet/parser/ast/node.rb +0 -42
data/lib/puppet/parser/interpreter.rb +0 -84
data/lib/puppet/parser/loaded_code.rb +0 -119
data/lib/puppet/parser/resource/reference.rb +0 -99
data/lib/puppet/resource/reference.rb +0 -90
data/lib/puppet/util/config_store.rb +0 -61
data/spec/integration/application/puppet.rb +0 -33
data/spec/integration/bin/puppetmasterd.rb +0 -122
data/spec/integration/checksum.rb +0 -48
data/spec/integration/configurer.rb +0 -18
data/spec/integration/defaults.rb +0 -230
data/spec/integration/file_serving/content.rb +0 -20
data/spec/integration/file_serving/fileset.rb +0 -14
data/spec/integration/file_serving/metadata.rb +0 -21
data/spec/integration/file_serving/terminus_helper.rb +0 -22
data/spec/integration/indirector/catalog/compiler.rb +0 -67
data/spec/integration/indirector/catalog/queue.rb +0 -61
data/spec/integration/indirector/certificate/rest.rb +0 -70
data/spec/integration/indirector/certificate_request/rest.rb +0 -88
data/spec/integration/indirector/certificate_revocation_list/rest.rb +0 -76
data/spec/integration/indirector/direct_file_server.rb +0 -73
data/spec/integration/indirector/file_content/file_server.rb +0 -94
data/spec/integration/indirector/file_metadata/file_server.rb +0 -18
data/spec/integration/indirector/node/ldap.rb +0 -15
data/spec/integration/indirector/report/rest.rb +0 -94
data/spec/integration/indirector/rest.rb +0 -523
data/spec/integration/network/client.rb +0 -19
data/spec/integration/network/formats.rb +0 -110
data/spec/integration/network/handler.rb +0 -25
data/spec/integration/network/server/mongrel.rb +0 -66
data/spec/integration/network/server/webrick.rb +0 -86
data/spec/integration/node.rb +0 -93
data/spec/integration/node/environment.rb +0 -58
data/spec/integration/node/facts.rb +0 -47
data/spec/integration/parser/compiler.rb +0 -29
data/spec/integration/parser/functions/require.rb +0 -86
data/spec/integration/provider/mailalias/aliases.rb +0 -25
data/spec/integration/provider/package.rb +0 -26
data/spec/integration/provider/service/init.rb +0 -32
data/spec/integration/reference/providers.rb +0 -17
data/spec/integration/reports.rb +0 -18
data/spec/integration/resource/catalog.rb +0 -61
data/spec/integration/ssl/certificate_authority.rb +0 -135
data/spec/integration/ssl/certificate_request.rb +0 -61
data/spec/integration/ssl/certificate_revocation_list.rb +0 -42
data/spec/integration/ssl/host.rb +0 -90
data/spec/integration/transaction.rb +0 -66
data/spec/integration/transaction/report.rb +0 -29
data/spec/integration/type.rb +0 -22
data/spec/integration/type/file.rb +0 -477
data/spec/integration/type/package.rb +0 -25
data/spec/integration/type/tidy.rb +0 -27
data/spec/integration/util/autoload.rb +0 -114
data/spec/integration/util/feature.rb +0 -54
data/spec/integration/util/file_locking.rb +0 -37
data/spec/integration/util/settings.rb +0 -27
data/spec/unit/agent.rb +0 -259
data/spec/unit/agent/locker.rb +0 -100
data/spec/unit/agent/runner.rb +0 -118
data/spec/unit/application.rb +0 -420
data/spec/unit/application/filebucket.rb +0 -220
data/spec/unit/application/pi.rb +0 -84
data/spec/unit/application/puppet.rb +0 -399
data/spec/unit/application/puppetca.rb +0 -142
data/spec/unit/application/puppetd.rb +0 -502
data/spec/unit/application/puppetdoc.rb +0 -360
data/spec/unit/application/puppetmasterd.rb +0 -457
data/spec/unit/application/puppetqd.rb +0 -186
data/spec/unit/application/puppetrun.rb +0 -289
data/spec/unit/application/ralsh.rb +0 -254
data/spec/unit/configurer.rb +0 -339
data/spec/unit/configurer/downloader.rb +0 -188
data/spec/unit/configurer/fact_handler.rb +0 -164
data/spec/unit/configurer/plugin_handler.rb +0 -112
data/spec/unit/daemon.rb +0 -287
data/spec/unit/file_collection.rb +0 -53
data/spec/unit/file_collection/lookup.rb +0 -46
data/spec/unit/file_serving/base.rb +0 -132
data/spec/unit/file_serving/configuration.rb +0 -249
data/spec/unit/file_serving/configuration/parser.rb +0 -181
data/spec/unit/file_serving/content.rb +0 -110
data/spec/unit/file_serving/fileset.rb +0 -347
data/spec/unit/file_serving/indirection_hooks.rb +0 -63
data/spec/unit/file_serving/metadata.rb +0 -286
data/spec/unit/file_serving/mount.rb +0 -32
data/spec/unit/file_serving/mount/file.rb +0 -196
data/spec/unit/file_serving/mount/modules.rb +0 -63
data/spec/unit/file_serving/mount/plugins.rb +0 -61
data/spec/unit/file_serving/terminus_helper.rb +0 -98
data/spec/unit/indirector.rb +0 -157
data/spec/unit/indirector/active_record.rb +0 -76
data/spec/unit/indirector/catalog/active_record.rb +0 -141
data/spec/unit/indirector/catalog/compiler.rb +0 -261
data/spec/unit/indirector/catalog/queue.rb +0 -20
data/spec/unit/indirector/catalog/rest.rb +0 -11
data/spec/unit/indirector/catalog/yaml.rb +0 -25
data/spec/unit/indirector/certificate/ca.rb +0 -28
data/spec/unit/indirector/certificate/file.rb +0 -28
data/spec/unit/indirector/certificate/rest.rb +0 -57
data/spec/unit/indirector/certificate_request/ca.rb +0 -19
data/spec/unit/indirector/certificate_request/file.rb +0 -19
data/spec/unit/indirector/certificate_request/rest.rb +0 -23
data/spec/unit/indirector/certificate_revocation_list/ca.rb +0 -21
data/spec/unit/indirector/certificate_revocation_list/file.rb +0 -20
data/spec/unit/indirector/certificate_revocation_list/rest.rb +0 -23
data/spec/unit/indirector/checksum/file.rb +0 -139
data/spec/unit/indirector/code.rb +0 -33
data/spec/unit/indirector/direct_file_server.rb +0 -84
data/spec/unit/indirector/envelope.rb +0 -47
data/spec/unit/indirector/exec.rb +0 -56
data/spec/unit/indirector/facts/active_record.rb +0 -104
data/spec/unit/indirector/facts/facter.rb +0 -142
data/spec/unit/indirector/facts/rest.rb +0 -11
data/spec/unit/indirector/facts/yaml.rb +0 -26
data/spec/unit/indirector/file.rb +0 -161
data/spec/unit/indirector/file_content/file.rb +0 -18
data/spec/unit/indirector/file_content/file_server.rb +0 -18
data/spec/unit/indirector/file_content/rest.rb +0 -11
data/spec/unit/indirector/file_metadata/file.rb +0 -52
data/spec/unit/indirector/file_metadata/file_server.rb +0 -18
data/spec/unit/indirector/file_metadata/rest.rb +0 -9
data/spec/unit/indirector/file_server.rb +0 -267
data/spec/unit/indirector/indirection.rb +0 -795
data/spec/unit/indirector/key/ca.rb +0 -28
data/spec/unit/indirector/key/file.rb +0 -104
data/spec/unit/indirector/ldap.rb +0 -143
data/spec/unit/indirector/memory.rb +0 -29
data/spec/unit/indirector/node/active_record.rb +0 -34
data/spec/unit/indirector/node/exec.rb +0 -69
data/spec/unit/indirector/node/ldap.rb +0 -458
data/spec/unit/indirector/node/memory.rb +0 -19
data/spec/unit/indirector/node/plain.rb +0 -19
data/spec/unit/indirector/node/rest.rb +0 -13
data/spec/unit/indirector/node/yaml.rb +0 -25
data/spec/unit/indirector/plain.rb +0 -29
data/spec/unit/indirector/queue.rb +0 -123
data/spec/unit/indirector/report/processor.rb +0 -81
data/spec/unit/indirector/report/rest.rb +0 -28
data/spec/unit/indirector/request.rb +0 -308
data/spec/unit/indirector/rest.rb +0 -403
data/spec/unit/indirector/runner/rest.rb +0 -11
data/spec/unit/indirector/ssl_file.rb +0 -280
data/spec/unit/indirector/terminus.rb +0 -245
data/spec/unit/indirector/yaml.rb +0 -145
data/spec/unit/module.rb +0 -247
data/spec/unit/network/authconfig.rb +0 -292
data/spec/unit/network/authstore.rb +0 -370
data/spec/unit/network/client.rb +0 -45
data/spec/unit/network/client/dipper.rb +0 -16
data/spec/unit/network/format.rb +0 -191
data/spec/unit/network/format_handler.rb +0 -327
data/spec/unit/network/formats.rb +0 -365
data/spec/unit/network/handler/fileserver.rb +0 -176
data/spec/unit/network/http.rb +0 -35
data/spec/unit/network/http/api/v1.rb +0 -122
data/spec/unit/network/http/handler.rb +0 -458
data/spec/unit/network/http/mongrel.rb +0 -131
data/spec/unit/network/http/mongrel/rest.rb +0 -232
data/spec/unit/network/http/rack.rb +0 -102
data/spec/unit/network/http/rack/rest.rb +0 -199
data/spec/unit/network/http/rack/xmlrpc.rb +0 -157
data/spec/unit/network/http/webrick.rb +0 -339
data/spec/unit/network/http/webrick/rest.rb +0 -157
data/spec/unit/network/http_pool.rb +0 -206
data/spec/unit/network/rest_authconfig.rb +0 -146
data/spec/unit/network/rest_authorization.rb +0 -43
data/spec/unit/network/rights.rb +0 -519
data/spec/unit/network/server.rb +0 -534
data/spec/unit/network/xmlrpc/client.rb +0 -171
data/spec/unit/node.rb +0 -200
data/spec/unit/node/environment.rb +0 -187
data/spec/unit/node/facts.rb +0 -97
data/spec/unit/other/checksum.rb +0 -92
data/spec/unit/other/selinux.rb +0 -85
data/spec/unit/other/transbucket.rb +0 -188
data/spec/unit/other/transobject.rb +0 -112
data/spec/unit/parameter.rb +0 -405
data/spec/unit/parser/ast.rb +0 -41
data/spec/unit/parser/ast/arithmetic_operator.rb +0 -73
data/spec/unit/parser/ast/astarray.rb +0 -72
data/spec/unit/parser/ast/boolean_operator.rb +0 -53
data/spec/unit/parser/ast/casestatement.rb +0 -135
data/spec/unit/parser/ast/collection.rb +0 -63
data/spec/unit/parser/ast/collexpr.rb +0 -115
data/spec/unit/parser/ast/comparison_operator.rb +0 -92
data/spec/unit/parser/ast/definition.rb +0 -213
data/spec/unit/parser/ast/function.rb +0 -83
data/spec/unit/parser/ast/hostclass.rb +0 -148
data/spec/unit/parser/ast/ifstatement.rb +0 -76
data/spec/unit/parser/ast/leaf.rb +0 -298
data/spec/unit/parser/ast/match_operator.rb +0 -50
data/spec/unit/parser/ast/minus.rb +0 -36
data/spec/unit/parser/ast/node.rb +0 -145
data/spec/unit/parser/ast/nop.rb +0 -20
data/spec/unit/parser/ast/not.rb +0 -30
data/spec/unit/parser/ast/resource.rb +0 -103
data/spec/unit/parser/ast/resource_override.rb +0 -51
data/spec/unit/parser/ast/resource_reference.rb +0 -69
data/spec/unit/parser/ast/selector.rb +0 -155
data/spec/unit/parser/ast/vardef.rb +0 -47
data/spec/unit/parser/collector.rb +0 -556
data/spec/unit/parser/compiler.rb +0 -604
data/spec/unit/parser/files.rb +0 -190
data/spec/unit/parser/functions.rb +0 -83
data/spec/unit/parser/functions/fqdn_rand.rb +0 -62
data/spec/unit/parser/functions/generate.rb +0 -41
data/spec/unit/parser/functions/inline_template.rb +0 -59
data/spec/unit/parser/functions/realize.rb +0 -51
data/spec/unit/parser/functions/regsubst.rb +0 -168
data/spec/unit/parser/functions/require.rb +0 -69
data/spec/unit/parser/functions/shellquote.rb +0 -92
data/spec/unit/parser/functions/split.rb +0 -51
data/spec/unit/parser/functions/sprintf.rb +0 -42
data/spec/unit/parser/functions/template.rb +0 -62
data/spec/unit/parser/functions/versioncmp.rb +0 -29
data/spec/unit/parser/interpreter.rb +0 -147
data/spec/unit/parser/lexer.rb +0 -731
data/spec/unit/parser/loaded_code.rb +0 -215
data/spec/unit/parser/parser.rb +0 -423
data/spec/unit/parser/resource.rb +0 -529
data/spec/unit/parser/resource/reference.rb +0 -111
data/spec/unit/parser/scope.rb +0 -387
data/spec/unit/parser/templatewrapper.rb +0 -134
data/spec/unit/property.rb +0 -305
data/spec/unit/property/keyvalue.rb +0 -168
data/spec/unit/property/list.rb +0 -166
data/spec/unit/property/ordered_list.rb +0 -64
data/spec/unit/provider.rb +0 -31
data/spec/unit/provider/augeas/augeas.rb +0 -413
data/spec/unit/provider/confine.rb +0 -78
data/spec/unit/provider/confine/exists.rb +0 -81
data/spec/unit/provider/confine/false.rb +0 -53
data/spec/unit/provider/confine/feature.rb +0 -60
data/spec/unit/provider/confine/true.rb +0 -53
data/spec/unit/provider/confine/variable.rb +0 -107
data/spec/unit/provider/confine_collection.rb +0 -134
data/spec/unit/provider/confiner.rb +0 -63
data/spec/unit/provider/group/groupadd.rb +0 -31
data/spec/unit/provider/group/ldap.rb +0 -105
data/spec/unit/provider/ldap.rb +0 -248
data/spec/unit/provider/macauthorization.rb +0 -147
data/spec/unit/provider/mcx/mcxcontent.rb +0 -175
data/spec/unit/provider/mount.rb +0 -130
data/spec/unit/provider/mount/parsed.rb +0 -194
data/spec/unit/provider/naginator.rb +0 -58
data/spec/unit/provider/package/apt.rb +0 -138
data/spec/unit/provider/package/dpkg.rb +0 -170
data/spec/unit/provider/package/gem.rb +0 -87
data/spec/unit/provider/package/hpux.rb +0 -52
data/spec/unit/provider/package/pkgdmg.rb +0 -73
data/spec/unit/provider/parsedfile.rb +0 -95
data/spec/unit/provider/selboolean.rb +0 -37
data/spec/unit/provider/selmodule.rb +0 -66
data/spec/unit/provider/service/daemontools.rb +0 -166
data/spec/unit/provider/service/debian.rb +0 -89
data/spec/unit/provider/service/init.rb +0 -121
data/spec/unit/provider/service/launchd.rb +0 -200
data/spec/unit/provider/service/redhat.rb +0 -96
data/spec/unit/provider/service/runit.rb +0 -140
data/spec/unit/provider/ssh_authorized_key/parsed.rb +0 -206
data/spec/unit/provider/sshkey/parsed.rb +0 -38
data/spec/unit/provider/user/hpux.rb +0 -25
data/spec/unit/provider/user/ldap.rb +0 -279
data/spec/unit/provider/user/user_role_add.rb +0 -249
data/spec/unit/provider/user/useradd.rb +0 -115
data/spec/unit/provider/zfs/solaris.rb +0 -99
data/spec/unit/provider/zone/solaris.rb +0 -42
data/spec/unit/provider/zpool/solaris.rb +0 -179
data/spec/unit/rails.rb +0 -133
data/spec/unit/rails/host.rb +0 -163
data/spec/unit/rails/param_value.rb +0 -49
data/spec/unit/rails/resource.rb +0 -107
data/spec/unit/relationship.rb +0 -236
data/spec/unit/reports.rb +0 -61
data/spec/unit/resource.rb +0 -495
data/spec/unit/resource/catalog.rb +0 -1053
data/spec/unit/resource/reference.rb +0 -111
data/spec/unit/simple_graph.rb +0 -551
data/spec/unit/ssl/certificate.rb +0 -124
data/spec/unit/ssl/certificate_authority.rb +0 -741
data/spec/unit/ssl/certificate_authority/interface.rb +0 -269
data/spec/unit/ssl/certificate_factory.rb +0 -107
data/spec/unit/ssl/certificate_request.rb +0 -193
data/spec/unit/ssl/certificate_revocation_list.rb +0 -168
data/spec/unit/ssl/host.rb +0 -704
data/spec/unit/ssl/inventory.rb +0 -180
data/spec/unit/ssl/key.rb +0 -198
data/spec/unit/transaction.rb +0 -146
data/spec/unit/transaction/change.rb +0 -187
data/spec/unit/transaction/event.rb +0 -25
data/spec/unit/transaction/report.rb +0 -40
data/spec/unit/type.rb +0 -426
data/spec/unit/type/augeas.rb +0 -106
data/spec/unit/type/component.rb +0 -63
data/spec/unit/type/computer.rb +0 -78
data/spec/unit/type/cron.rb +0 -33
data/spec/unit/type/exec.rb +0 -116
data/spec/unit/type/file.rb +0 -810
data/spec/unit/type/file/checksum.rb +0 -28
data/spec/unit/type/file/content.rb +0 -297
data/spec/unit/type/file/ensure.rb +0 -84
data/spec/unit/type/file/group.rb +0 -123
data/spec/unit/type/file/owner.rb +0 -143
data/spec/unit/type/file/selinux.rb +0 -84
data/spec/unit/type/file/source.rb +0 -264
data/spec/unit/type/filebucket.rb +0 -74
data/spec/unit/type/group.rb +0 -39
data/spec/unit/type/macauthorization.rb +0 -111
data/spec/unit/type/maillist.rb +0 -42
data/spec/unit/type/mcx.rb +0 -100
data/spec/unit/type/mount.rb +0 -211
data/spec/unit/type/nagios.rb +0 -63
data/spec/unit/type/noop_metaparam.rb +0 -37
data/spec/unit/type/package.rb +0 -236
data/spec/unit/type/resources.rb +0 -89
data/spec/unit/type/schedule.rb +0 -333
data/spec/unit/type/selboolean.rb +0 -45
data/spec/unit/type/selmodule.rb +0 -18
data/spec/unit/type/service.rb +0 -230
data/spec/unit/type/ssh_authorized_key.rb +0 -140
data/spec/unit/type/tidy.rb +0 -422
data/spec/unit/type/user.rb +0 -285
data/spec/unit/type/zfs.rb +0 -45
data/spec/unit/type/zone.rb +0 -20
data/spec/unit/type/zpool.rb +0 -110
data/spec/unit/util/autoload.rb +0 -133
data/spec/unit/util/autoload/file_cache.rb +0 -183
data/spec/unit/util/backups.rb +0 -159
data/spec/unit/util/cache_accumulator.rb +0 -69
data/spec/unit/util/cacher.rb +0 -185
data/spec/unit/util/checksums.rb +0 -113
data/spec/unit/util/constant_inflector.rb +0 -70
data/spec/unit/util/feature.rb +0 -72
data/spec/unit/util/file_locking.rb +0 -115
data/spec/unit/util/filetype.rb +0 -100
data/spec/unit/util/json.rb +0 -21
data/spec/unit/util/ldap/connection.rb +0 -169
data/spec/unit/util/ldap/generator.rb +0 -54
data/spec/unit/util/ldap/manager.rb +0 -654
data/spec/unit/util/loadedfile.rb +0 -65
data/spec/unit/util/log.rb +0 -202
data/spec/unit/util/metric.rb +0 -95
data/spec/unit/util/monkey_patches.rb +0 -103
data/spec/unit/util/nagios_maker.rb +0 -126
data/spec/unit/util/package.rb +0 -21
data/spec/unit/util/posix.rb +0 -256
data/spec/unit/util/queue.rb +0 -96
data/spec/unit/util/queue/stomp.rb +0 -140
data/spec/unit/util/reference_serializer.rb +0 -52
data/spec/unit/util/resource_template.rb +0 -58
data/spec/unit/util/selinux.rb +0 -280
data/spec/unit/util/settings.rb +0 -1058
data/spec/unit/util/settings/file_setting.rb +0 -248
data/spec/unit/util/storage.rb +0 -248
data/spec/unit/util/tagging.rb +0 -102
data/spec/unit/util/user_attr.rb +0 -47
data/spec/unit/util/warnings.rb +0 -39
data/spec/unit/util/zaml.rb +0 -38
data/test/language/ast/casestatement.rb +0 -103
data/test/language/ast/resource.rb +0 -58
data/test/language/ast/resource_reference.rb +0 -77
data/test/language/ast/selector.rb +0 -61
data/test/language/resource.rb +0 -172
data/test/lib/puppettest/support/collection.rb +0 -29
data/test/network/client/resource.rb +0 -52
data/test/network/handler/bucket.rb +0 -313
data/test/network/handler/resource.rb +0 -250
data/test/other/dsl.rb +0 -215
data/test/other/events.rb +0 -124
data/test/ral/type/group.rb +0 -170

data/lib/puppet/parser/parser.rb CHANGED

@@ -11,7 +11,6 @@ require 'puppet'
 require 'puppet/util/loadedfile'
 require 'puppet/parser/lexer'
 require 'puppet/parser/ast'
-#require 'puppet/parser/interpreter'
 module Puppet
     class ParseError < Puppet::Error; end
@@ -19,9 +18,6 @@ module Puppet
     class AlreadyImportedError < ImportError; end
 end
-Puppet[:typecheck] = true
-Puppet[:paramcheck] = true
 module Puppet
@@ -29,7 +25,7 @@ module Puppet
     class Parser < Racc::Parser
-module_eval <<'..end grammar.ra modeval..ide7bdbd4a34', 'grammar.ra', 802
+module_eval <<'..end grammar.ra modeval..id7145220b1b', 'grammar.ra', 876
 # It got too annoying having code in a file that needs to be compiled.
 require 'puppet/parser/parser_support'
@@ -41,797 +37,963 @@ require 'puppet/parser/parser_support'
 # $Id$
-..end grammar.ra modeval..ide7bdbd4a34
+..end grammar.ra modeval..id7145220b1b
 ##### racc 1.4.5 generates ###
 racc_reduce_table = [
  0, 0, :racc_error,
- 1, 63, :_reduce_1,
- 1, 63, :_reduce_none,
- 1, 64, :_reduce_none,
- 2, 64, :_reduce_4,
- 1, 66, :_reduce_none,
- 1, 66, :_reduce_none,
- 1, 66, :_reduce_none,
- 1, 66, :_reduce_none,
- 1, 66, :_reduce_none,
- 1, 66, :_reduce_none,
- 1, 66, :_reduce_none,
- 1, 66, :_reduce_none,
- 1, 66, :_reduce_none,
- 1, 66, :_reduce_none,
- 1, 66, :_reduce_none,
- 1, 66, :_reduce_none,
- 1, 66, :_reduce_none,
- 4, 74, :_reduce_18,
- 5, 74, :_reduce_19,
- 3, 74, :_reduce_20,
- 2, 74, :_reduce_21,
- 1, 80, :_reduce_none,
- 1, 80, :_reduce_none,
- 3, 80, :_reduce_24,
- 3, 80, :_reduce_25,
- 1, 81, :_reduce_none,
- 1, 81, :_reduce_none,
- 1, 81, :_reduce_none,
- 1, 81, :_reduce_none,
- 1, 81, :_reduce_none,
- 1, 81, :_reduce_none,
- 1, 81, :_reduce_none,
- 1, 81, :_reduce_33,
- 5, 67, :_reduce_34,
- 5, 67, :_reduce_35,
- 5, 67, :_reduce_36,
- 5, 78, :_reduce_37,
- 2, 68, :_reduce_38,
- 1, 97, :_reduce_39,
- 2, 97, :_reduce_40,
- 6, 69, :_reduce_41,
- 2, 69, :_reduce_42,
- 3, 98, :_reduce_43,
- 3, 98, :_reduce_44,
- 1, 99, :_reduce_none,
- 1, 99, :_reduce_none,
- 3, 99, :_reduce_47,
- 1, 100, :_reduce_none,
- 3, 100, :_reduce_49,
- 1, 101, :_reduce_50,
- 1, 101, :_reduce_51,
- 3, 102, :_reduce_52,
- 3, 102, :_reduce_53,
- 1, 103, :_reduce_none,
- 1, 103, :_reduce_none,
- 4, 105, :_reduce_56,
+ 1, 70, :_reduce_1,
+ 1, 70, :_reduce_none,
+ 1, 71, :_reduce_none,
+ 2, 71, :_reduce_4,
+ 1, 73, :_reduce_none,
+ 1, 73, :_reduce_none,
+ 1, 73, :_reduce_none,
+ 1, 73, :_reduce_none,
+ 1, 73, :_reduce_none,
+ 1, 73, :_reduce_none,
+ 1, 73, :_reduce_none,
+ 1, 73, :_reduce_none,
+ 1, 73, :_reduce_none,
+ 1, 73, :_reduce_none,
+ 1, 73, :_reduce_none,
+ 1, 73, :_reduce_none,
+ 1, 73, :_reduce_none,
+ 1, 73, :_reduce_none,
+ 3, 87, :_reduce_19,
+ 3, 87, :_reduce_20,
+ 1, 88, :_reduce_none,
+ 1, 88, :_reduce_none,
+ 1, 88, :_reduce_none,
+ 1, 89, :_reduce_none,
+ 1, 89, :_reduce_none,
+ 1, 89, :_reduce_none,
+ 1, 89, :_reduce_none,
+ 4, 81, :_reduce_28,
+ 5, 81, :_reduce_29,
+ 3, 81, :_reduce_30,
+ 2, 81, :_reduce_31,
  1, 91, :_reduce_none,
- 3, 91, :_reduce_58,
- 0, 92, :_reduce_none,
+ 1, 91, :_reduce_none,
+ 3, 91, :_reduce_34,
+ 3, 91, :_reduce_35,
  1, 92, :_reduce_none,
- 1, 107, :_reduce_61,
- 1, 83, :_reduce_62,
- 1, 85, :_reduce_63,
- 1, 106, :_reduce_none,
- 1, 106, :_reduce_none,
- 1, 106, :_reduce_none,
- 1, 106, :_reduce_none,
- 1, 106, :_reduce_none,
- 1, 106, :_reduce_none,
- 3, 70, :_reduce_70,
- 3, 79, :_reduce_71,
- 0, 93, :_reduce_72,
- 1, 93, :_reduce_73,
- 3, 93, :_reduce_74,
- 3, 110, :_reduce_75,
- 3, 112, :_reduce_76,
- 1, 113, :_reduce_none,
- 1, 113, :_reduce_none,
- 0, 96, :_reduce_79,
- 1, 96, :_reduce_80,
- 3, 96, :_reduce_81,
- 1, 114, :_reduce_none,
- 3, 114, :_reduce_83,
- 1, 104, :_reduce_none,
- 1, 104, :_reduce_none,
- 1, 104, :_reduce_none,
- 1, 104, :_reduce_none,
- 1, 104, :_reduce_none,
- 1, 104, :_reduce_none,
- 1, 111, :_reduce_none,
- 1, 111, :_reduce_none,
- 1, 111, :_reduce_none,
- 1, 111, :_reduce_none,
- 1, 111, :_reduce_none,
- 1, 111, :_reduce_none,
- 1, 111, :_reduce_none,
- 1, 111, :_reduce_none,
- 1, 111, :_reduce_none,
+ 1, 92, :_reduce_none,
+ 1, 92, :_reduce_none,
+ 1, 92, :_reduce_none,
+ 1, 92, :_reduce_none,
+ 1, 92, :_reduce_none,
+ 1, 92, :_reduce_none,
+ 1, 92, :_reduce_none,
+ 1, 92, :_reduce_44,
+ 5, 74, :_reduce_45,
+ 5, 74, :_reduce_46,
+ 5, 74, :_reduce_47,
+ 5, 85, :_reduce_48,
+ 2, 75, :_reduce_49,
+ 1, 108, :_reduce_50,
+ 2, 108, :_reduce_51,
+ 6, 76, :_reduce_52,
+ 2, 76, :_reduce_53,
+ 3, 109, :_reduce_54,
+ 3, 109, :_reduce_55,
+ 1, 110, :_reduce_none,
+ 1, 110, :_reduce_none,
+ 3, 110, :_reduce_58,
  1, 111, :_reduce_none,
- 4, 87, :_reduce_100,
- 3, 87, :_reduce_101,
- 1, 89, :_reduce_102,
- 1, 89, :_reduce_103,
- 1, 86, :_reduce_104,
- 4, 82, :_reduce_105,
- 4, 82, :_reduce_106,
- 6, 72, :_reduce_107,
- 5, 72, :_reduce_108,
- 0, 116, :_reduce_none,
- 4, 116, :_reduce_110,
- 3, 116, :_reduce_111,
- 1, 109, :_reduce_none,
- 3, 109, :_reduce_113,
- 3, 109, :_reduce_114,
- 3, 109, :_reduce_115,
- 3, 109, :_reduce_116,
- 3, 109, :_reduce_117,
- 3, 109, :_reduce_118,
- 3, 109, :_reduce_119,
- 3, 109, :_reduce_120,
- 2, 109, :_reduce_121,
- 3, 109, :_reduce_122,
- 3, 109, :_reduce_123,
- 3, 109, :_reduce_124,
- 3, 109, :_reduce_125,
- 3, 109, :_reduce_126,
- 3, 109, :_reduce_127,
- 2, 109, :_reduce_128,
- 3, 109, :_reduce_129,
- 3, 109, :_reduce_130,
- 3, 109, :_reduce_131,
- 5, 71, :_reduce_132,
- 1, 118, :_reduce_none,
- 2, 118, :_reduce_134,
- 5, 119, :_reduce_135,
- 4, 119, :_reduce_136,
- 1, 120, :_reduce_none,
- 3, 120, :_reduce_138,
- 3, 88, :_reduce_139,
- 1, 122, :_reduce_none,
- 4, 122, :_reduce_141,
- 1, 124, :_reduce_none,
- 3, 124, :_reduce_143,
- 3, 123, :_reduce_144,
- 1, 121, :_reduce_none,
- 1, 121, :_reduce_none,
- 1, 121, :_reduce_none,
- 1, 121, :_reduce_none,
- 1, 121, :_reduce_none,
- 1, 121, :_reduce_none,
- 1, 121, :_reduce_none,
- 1, 121, :_reduce_152,
- 1, 121, :_reduce_none,
- 1, 125, :_reduce_154,
- 3, 125, :_reduce_155,
- 2, 73, :_reduce_156,
- 6, 75, :_reduce_157,
- 5, 75, :_reduce_158,
- 6, 76, :_reduce_159,
- 5, 76, :_reduce_160,
- 6, 77, :_reduce_161,
- 5, 77, :_reduce_162,
- 1, 95, :_reduce_163,
- 1, 90, :_reduce_164,
- 1, 90, :_reduce_165,
- 1, 128, :_reduce_none,
- 3, 128, :_reduce_167,
- 1, 130, :_reduce_168,
- 1, 131, :_reduce_169,
- 1, 131, :_reduce_170,
- 1, 131, :_reduce_171,
- 1, 131, :_reduce_172,
- 1, 131, :_reduce_none,
- 0, 65, :_reduce_174,
- 0, 132, :_reduce_175,
+ 3, 111, :_reduce_60,
+ 1, 112, :_reduce_61,
+ 1, 112, :_reduce_62,
+ 3, 113, :_reduce_63,
+ 3, 113, :_reduce_64,
+ 1, 114, :_reduce_none,
+ 1, 114, :_reduce_none,
+ 4, 116, :_reduce_67,
+ 1, 102, :_reduce_none,
+ 3, 102, :_reduce_69,
+ 0, 103, :_reduce_none,
+ 1, 103, :_reduce_none,
+ 1, 118, :_reduce_72,
+ 1, 93, :_reduce_73,
+ 1, 95, :_reduce_74,
+ 1, 117, :_reduce_none,
+ 1, 117, :_reduce_none,
+ 1, 117, :_reduce_none,
+ 1, 117, :_reduce_none,
+ 1, 117, :_reduce_none,
+ 1, 117, :_reduce_none,
+ 1, 117, :_reduce_none,
+ 3, 77, :_reduce_82,
+ 3, 77, :_reduce_83,
+ 3, 86, :_reduce_84,
+ 0, 104, :_reduce_85,
+ 1, 104, :_reduce_86,
+ 3, 104, :_reduce_87,
+ 3, 122, :_reduce_88,
+ 3, 124, :_reduce_89,
+ 1, 125, :_reduce_none,
+ 1, 125, :_reduce_none,
+ 0, 107, :_reduce_92,
+ 1, 107, :_reduce_93,
+ 3, 107, :_reduce_94,
  1, 126, :_reduce_none,
- 3, 126, :_reduce_177,
- 3, 126, :_reduce_178,
- 1, 133, :_reduce_none,
- 3, 133, :_reduce_180,
- 3, 134, :_reduce_181,
- 1, 134, :_reduce_182,
- 3, 134, :_reduce_183,
- 1, 134, :_reduce_184,
- 1, 129, :_reduce_none,
- 2, 129, :_reduce_186,
- 1, 127, :_reduce_none,
- 2, 127, :_reduce_188,
- 1, 135, :_reduce_none,
- 1, 135, :_reduce_none,
- 1, 84, :_reduce_191,
- 3, 108, :_reduce_192,
- 4, 108, :_reduce_193,
- 2, 108, :_reduce_194,
+ 3, 126, :_reduce_96,
+ 1, 115, :_reduce_none,
+ 1, 115, :_reduce_none,
  1, 115, :_reduce_none,
  1, 115, :_reduce_none,
- 0, 94, :_reduce_none,
- 1, 94, :_reduce_198,
- 1, 117, :_reduce_199 ]
+ 1, 115, :_reduce_none,
+ 1, 115, :_reduce_none,
+ 1, 123, :_reduce_none,
+ 1, 123, :_reduce_none,
+ 1, 123, :_reduce_none,
+ 1, 123, :_reduce_none,
+ 1, 123, :_reduce_none,
+ 1, 123, :_reduce_none,
+ 1, 123, :_reduce_none,
+ 1, 123, :_reduce_none,
+ 1, 123, :_reduce_none,
+ 1, 123, :_reduce_none,
+ 1, 123, :_reduce_none,
+ 1, 123, :_reduce_none,
+ 4, 97, :_reduce_115,
+ 3, 97, :_reduce_116,
+ 1, 99, :_reduce_117,
+ 2, 99, :_reduce_118,
+ 2, 129, :_reduce_119,
+ 1, 130, :_reduce_120,
+ 2, 130, :_reduce_121,
+ 1, 96, :_reduce_122,
+ 4, 90, :_reduce_123,
+ 4, 90, :_reduce_124,
+ 2, 79, :_reduce_125,
+ 5, 131, :_reduce_126,
+ 4, 131, :_reduce_127,
+ 0, 132, :_reduce_none,
+ 2, 132, :_reduce_129,
+ 4, 132, :_reduce_130,
+ 3, 132, :_reduce_131,
+ 1, 120, :_reduce_none,
+ 3, 120, :_reduce_133,
+ 3, 120, :_reduce_134,
+ 3, 120, :_reduce_135,
+ 3, 120, :_reduce_136,
+ 3, 120, :_reduce_137,
+ 3, 120, :_reduce_138,
+ 3, 120, :_reduce_139,
+ 3, 120, :_reduce_140,
+ 3, 120, :_reduce_141,
+ 2, 120, :_reduce_142,
+ 3, 120, :_reduce_143,
+ 3, 120, :_reduce_144,
+ 3, 120, :_reduce_145,
+ 3, 120, :_reduce_146,
+ 3, 120, :_reduce_147,
+ 3, 120, :_reduce_148,
+ 2, 120, :_reduce_149,
+ 3, 120, :_reduce_150,
+ 3, 120, :_reduce_151,
+ 3, 120, :_reduce_152,
+ 5, 78, :_reduce_153,
+ 1, 134, :_reduce_none,
+ 2, 134, :_reduce_155,
+ 5, 135, :_reduce_156,
+ 4, 135, :_reduce_157,
+ 1, 136, :_reduce_none,
+ 3, 136, :_reduce_159,
+ 3, 98, :_reduce_160,
+ 1, 138, :_reduce_none,
+ 4, 138, :_reduce_162,
+ 1, 140, :_reduce_none,
+ 3, 140, :_reduce_164,
+ 3, 139, :_reduce_165,
+ 1, 137, :_reduce_none,
+ 1, 137, :_reduce_none,
+ 1, 137, :_reduce_none,
+ 1, 137, :_reduce_none,
+ 1, 137, :_reduce_none,
+ 1, 137, :_reduce_none,
+ 1, 137, :_reduce_none,
+ 1, 137, :_reduce_173,
+ 1, 137, :_reduce_none,
+ 1, 141, :_reduce_175,
+ 1, 142, :_reduce_none,
+ 3, 142, :_reduce_177,
+ 2, 80, :_reduce_178,
+ 6, 82, :_reduce_179,
+ 5, 82, :_reduce_180,
+ 7, 83, :_reduce_181,
+ 6, 83, :_reduce_182,
+ 6, 84, :_reduce_183,
+ 5, 84, :_reduce_184,
+ 1, 106, :_reduce_185,
+ 1, 101, :_reduce_186,
+ 1, 101, :_reduce_187,
+ 1, 101, :_reduce_188,
+ 1, 145, :_reduce_none,
+ 3, 145, :_reduce_190,
+ 1, 147, :_reduce_191,
+ 1, 148, :_reduce_192,
+ 1, 148, :_reduce_193,
+ 1, 148, :_reduce_194,
+ 1, 148, :_reduce_none,
+ 0, 72, :_reduce_196,
+ 0, 149, :_reduce_197,
+ 1, 143, :_reduce_none,
+ 3, 143, :_reduce_199,
+ 3, 143, :_reduce_200,
+ 1, 150, :_reduce_none,
+ 3, 150, :_reduce_202,
+ 3, 151, :_reduce_203,
+ 1, 151, :_reduce_204,
+ 3, 151, :_reduce_205,
+ 1, 151, :_reduce_206,
+ 1, 146, :_reduce_none,
+ 2, 146, :_reduce_208,
+ 1, 144, :_reduce_none,
+ 2, 144, :_reduce_210,
+ 1, 152, :_reduce_none,
+ 1, 152, :_reduce_none,
+ 1, 94, :_reduce_213,
+ 3, 119, :_reduce_214,
+ 4, 119, :_reduce_215,
+ 2, 119, :_reduce_216,
+ 1, 127, :_reduce_none,
+ 1, 127, :_reduce_none,
+ 0, 105, :_reduce_none,
+ 1, 105, :_reduce_220,
+ 1, 133, :_reduce_221,
+ 3, 128, :_reduce_222,
+ 4, 128, :_reduce_223,
+ 2, 128, :_reduce_224,
+ 1, 153, :_reduce_none,
+ 3, 153, :_reduce_226,
+ 3, 154, :_reduce_227,
+ 1, 155, :_reduce_228,
+ 1, 155, :_reduce_229,
+ 4, 121, :_reduce_230,
+ 1, 100, :_reduce_none,
+ 4, 100, :_reduce_232 ]
-racc_reduce_n = 200
+racc_reduce_n = 233
-racc_shift_n = 329
+racc_shift_n = 384
 racc_action_table = [
-    77,    56,    59,    56,    59,    54,   285,   187,   165,   126,
-   158,   159,   160,   144,   284,    56,    59,   152,   156,    48,
-    73,    77,    56,    59,   170,   138,    90,    77,    56,    59,
-    91,    48,   249,    48,   123,    58,    61,    58,   201,    68,
-   248,    68,   312,    92,    55,    78,   111,    73,    63,   194,
-    63,    84,    48,    77,    56,    59,    58,    61,    48,    41,
-    68,    41,    58,    61,   187,    55,    68,    93,   261,    63,
-   247,    55,    78,    38,    39,    63,  -146,   138,    84,  -151,
-    41,   287,    38,    39,    48,   253,    41,   301,    58,   201,
-   257,   264,    68,    77,    56,    59,   137,   111,   245,   246,
-   300,    63,   165,    77,    56,    59,   245,   246,    40,   277,
-   253,    44,    41,    48,    36,   257,   163,    40,   170,   165,
-    44,     4,     8,    73,    48,    54,    56,    59,    58,    61,
-    48,    41,    68,   165,    48,   170,    36,    55,    58,    61,
-    41,    63,    68,     4,    48,    51,    36,    55,    78,   170,
-   207,    63,    41,     4,    84,   163,    48,    77,    56,    59,
-    58,    61,    41,   206,    68,    38,    39,    36,    52,    55,
-   183,   208,  -148,    63,     4,   210,   211,    73,    77,    56,
-    59,   160,   144,  -145,    41,   270,   152,   156,    48,   160,
-   144,   130,    58,    61,   152,   156,    68,    77,    56,    59,
-    40,    55,    78,    44,   272,    63,   250,   138,    84,    48,
-   245,   246,  -147,    58,    61,  -149,    41,    68,    77,    56,
-    59,  -150,    55,    41,   161,   217,    63,   278,    48,   210,
-   218,   258,    58,    61,   163,   241,    68,    41,    73,   210,
-   211,    55,    33,    34,    41,    63,    56,    59,   175,    48,
-    77,    56,    59,    58,    61,  -146,    41,    68,   210,   311,
-   152,   156,    55,    78,   152,   156,    63,  -148,    90,    84,
-  -145,    77,    56,    59,   176,   137,   177,    41,   280,  -163,
-    41,    48,   178,  -149,  -147,    58,    61,    91,   286,    68,
-   184,  -147,   132,   130,    55,   196,   298,   299,    63,   186,
-   302,   189,    48,    77,    56,    59,    58,    61,   105,    41,
-    68,   189,  -145,  -148,   189,    55,  -150,   280,   314,    63,
-    99,  -147,  -145,    73,    77,    56,    59,  -148,  -146,  -150,
-    41,   316,   190,  -146,    48,    97,   130,    47,    58,    61,
-   322,  -198,    68,    37,   196,   187,   192,    55,    78,   nil,
-   nil,    63,   nil,   nil,    84,    48,    77,    56,    59,    58,
-    61,   nil,    41,    68,   nil,   nil,   nil,   nil,    55,   nil,
-   nil,   nil,    63,   nil,   nil,   nil,    73,    77,    56,    59,
-   nil,   nil,   nil,    41,   nil,   nil,   nil,    48,   nil,   nil,
-   nil,    58,    61,   nil,   nil,    68,   nil,    73,   nil,   nil,
-    55,    78,   nil,   nil,    63,   nil,   nil,    84,    48,    77,
-    56,    59,    58,    61,   nil,    41,    68,   nil,   nil,   nil,
-   nil,    55,    78,   nil,   nil,    63,   nil,   nil,    84,    73,
-    77,    56,    59,   nil,   nil,   nil,    41,   nil,   nil,   nil,
-    48,   nil,   nil,   nil,    58,    61,   nil,   nil,    68,   nil,
-    73,   nil,   nil,    55,    78,   nil,   nil,    63,   nil,   nil,
-    84,    48,    77,    56,    59,    58,    61,   nil,    41,    68,
-   nil,   nil,   nil,   nil,    55,    78,   nil,   nil,    63,   nil,
-   nil,    84,   nil,    77,    56,    59,   nil,   nil,   nil,    41,
-   nil,   nil,   nil,    48,   nil,   nil,   nil,    58,   113,   nil,
-   nil,    68,   nil,    73,   nil,   nil,   111,   nil,   nil,   nil,
-    63,   nil,   155,   nil,    48,   nil,   nil,   nil,    58,    61,
-   146,    41,    68,    77,    56,    59,   141,    55,    78,   nil,
-   nil,    63,   nil,   nil,    84,   nil,   nil,    77,    56,    59,
-   nil,   nil,    41,   nil,    77,    56,    59,   nil,   158,   159,
-   160,   144,   145,   147,    48,   152,   156,   nil,    58,    61,
-   nil,   nil,    68,   nil,    73,   nil,   nil,    55,    48,   155,
-   nil,    63,    58,    61,   nil,    48,    68,   146,   nil,    58,
-    61,    55,    41,    68,   nil,    63,   nil,   nil,    55,    78,
-   nil,   nil,    63,   nil,   nil,    84,    41,    77,    56,    59,
-    56,    59,   nil,    41,   nil,   158,   159,   160,   144,   145,
-   147,   nil,   152,   156,   nil,   nil,   nil,    73,    77,    56,
-    59,   nil,   nil,   nil,    77,    56,    59,   nil,    48,   nil,
-    48,   nil,    58,    61,    58,   201,    68,   nil,    68,   nil,
-   nil,    55,    78,   111,    73,    63,   nil,    63,    84,    48,
-    77,    56,    59,    58,    61,    48,    41,    68,    41,    58,
-    61,   nil,    55,    68,   nil,   nil,    63,   nil,    55,    78,
-    73,   nil,    63,   nil,   nil,    84,   nil,    41,   nil,   155,
-   nil,    48,   nil,    41,   nil,    58,    61,   146,   nil,    68,
-    77,    56,    59,   nil,    55,    78,   nil,   nil,    63,   nil,
-   nil,    84,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    41,
-    73,    77,    56,    59,   nil,   158,   159,   160,   144,   145,
-   147,    48,   152,   156,   nil,    58,    61,   nil,   nil,    68,
-   nil,    73,   nil,   nil,    55,    78,   nil,   nil,    63,   nil,
-   nil,    84,    48,    77,    56,    59,    58,    61,   nil,    41,
-    68,   nil,   nil,   nil,   nil,    55,    78,   nil,   nil,    63,
-   nil,   nil,    84,    73,    77,    56,    59,   nil,   nil,   nil,
-    41,   nil,   nil,   nil,    48,   nil,   nil,   nil,    58,    61,
-   nil,   nil,    68,   nil,    73,   nil,   nil,    55,    78,   nil,
-   nil,    63,   nil,   nil,    84,    48,    77,    56,    59,    58,
-    61,   nil,    41,    68,   nil,   nil,   nil,   nil,    55,    78,
-   nil,   nil,    63,   nil,   nil,    84,    73,   nil,    56,    59,
-   nil,   nil,   nil,    41,    56,    59,   nil,    48,   nil,   nil,
-   nil,    58,    61,   nil,   nil,    68,   nil,   nil,   133,   nil,
-    55,    78,   nil,   nil,    63,   nil,   nil,    84,    48,    56,
-    59,   nil,    58,    61,    48,    41,    68,   nil,    58,   201,
-    52,    55,    68,    56,    59,    63,   nil,   111,   nil,   275,
-   nil,    63,   nil,   nil,   nil,   nil,    41,   nil,   nil,    48,
-   nil,   nil,    41,    58,    61,    56,    59,    68,   nil,   nil,
-   nil,    52,    55,    48,   nil,   nil,    63,    58,   201,    56,
-    59,    68,   nil,   nil,   nil,   214,   111,    41,   nil,   nil,
-    63,   nil,   nil,   nil,   nil,    48,   nil,    56,    59,    58,
-    61,    41,   nil,    68,   nil,   nil,   nil,    52,    55,    48,
-   nil,   nil,    63,    58,   201,    56,    59,    68,   203,   nil,
-   nil,   nil,   111,    41,   nil,   nil,    63,    48,   nil,    56,
-    59,    58,    61,   nil,   nil,    68,   nil,    41,   nil,    52,
-    55,   nil,   nil,   nil,    63,    48,   nil,    56,    59,    58,
-   201,   282,   nil,    68,   nil,    41,   nil,   nil,   111,    48,
-   nil,   nil,    63,    58,   201,   nil,   nil,    68,   nil,   nil,
-   nil,   nil,   111,    41,   nil,   nil,    63,    48,   nil,   157,
-   nil,    58,   201,   nil,   nil,    68,   nil,    41,   150,   155,
-   111,   nil,   nil,   nil,    63,   nil,   nil,   146,   148,   151,
-   154,   150,   155,   nil,   nil,    41,   nil,   nil,   nil,   nil,
-   146,   148,   151,   154,   nil,   nil,   158,   159,   160,   144,
-   nil,   149,   153,   152,   156,   158,   159,   160,   144,   145,
-   147,   nil,   152,   156,   nil,   nil,   nil,   nil,   158,   159,
-   160,   144,   145,   147,   nil,   152,   156,   150,   155,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   146,   148,   151,   154,
-   150,   155,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   146,
-   148,   151,   154,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   149,   153,   nil,   nil,   158,   159,   160,   144,   145,   147,
-   nil,   152,   156,   149,   153,   nil,   nil,   158,   159,   160,
-   144,   145,   147,   nil,   152,   156,   150,   155,   nil,   nil,
-   nil,   nil,   nil,   nil,   216,   146,   148,   151,   154,   150,
-   155,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   146,   148,
-   151,   154,   nil,   155,   nil,   nil,   nil,   nil,   nil,   149,
-   153,   146,   nil,   158,   159,   160,   144,   145,   147,   nil,
-   152,   156,   nil,   153,   nil,   nil,   158,   159,   160,   144,
-   145,   147,   281,   152,   156,   nil,   nil,   nil,   nil,   158,
-   159,   160,   144,   145,   147,   nil,   152,   156,   nil,   nil,
-   nil,   303,   nil,    18,   nil,    23,    26,   nil,     1,     5,
-   nil,    12,   nil,    16,   nil,    20,   nil,    27,   nil,   nil,
-     4,     8,    18,   305,    23,    26,   nil,     1,     5,   nil,
-    12,   nil,    16,   nil,    20,   nil,    27,   nil,   nil,     4,
-     8,   nil,   307,   nil,    18,   nil,    23,    26,   nil,     1,
-     5,   nil,    12,   nil,    16,   nil,    20,   nil,    27,   nil,
-   nil,     4,     8,    18,   320,    23,    26,   nil,     1,     5,
-   nil,    12,   nil,    16,   nil,    20,   nil,    27,   nil,   nil,
-     4,     8,   nil,   259,   nil,    18,   nil,    23,    26,   nil,
-     1,     5,   nil,    12,   nil,    16,   nil,    20,   nil,    27,
-   nil,   nil,     4,     8,    18,   232,    23,    26,   nil,     1,
-     5,   nil,    12,   nil,    16,   nil,    20,   nil,    27,   nil,
-   nil,     4,     8,   nil,   323,   nil,    18,   nil,    23,    26,
-   nil,     1,     5,   nil,    12,   nil,    16,   nil,    20,   nil,
-    27,   nil,   nil,     4,     8,    18,   325,    23,    26,   nil,
-     1,     5,   nil,    12,   nil,    16,   nil,    20,   nil,    27,
-   nil,   nil,     4,     8,   nil,   327,   nil,    18,   nil,    23,
-    26,   nil,     1,     5,   nil,    12,   nil,    16,   nil,    20,
-   nil,    27,   nil,   nil,     4,     8,    18,   267,    23,    26,
-   nil,     1,     5,   nil,    12,   nil,    16,   nil,    20,   nil,
-    27,   nil,   nil,     4,     8,   nil,   328,   nil,    18,   nil,
-    23,    26,   nil,     1,     5,   nil,    12,   nil,    16,   nil,
-    20,   nil,    27,   nil,   nil,     4,     8,    18,   nil,    23,
-    26,   nil,     1,     5,   nil,    12,   nil,    16,   nil,    20,
-   nil,    27,   nil,   nil,     4,     8,    18,   nil,    23,    26,
-   nil,     1,     5,   nil,    12,   nil,    16,   nil,    20,   nil,
-    27,   nil,   nil,     4,     8,    18,   nil,    23,    26,   nil,
-     1,     5,   nil,    12,   nil,    16,   nil,    20,   nil,    27,
-   nil,   nil,     4,     8,   158,   159,   160,   144,   145,   147,
-   nil,   152,   156,   158,   159,   160,   144,   145,   147,   nil,
-   152,   156 ]
+   256,   257,   228,    82,    54,    72,    75,   181,   251,    48,
+    72,    75,   194,   205,   210,   163,   156,   348,    46,    47,
+   344,   184,   201,   203,   206,   209,   162,   352,    54,   182,
+   351,   169,    54,  -168,    72,    75,   241,   242,   102,   305,
+   106,   158,    58,   193,   230,    60,   204,   208,   193,   306,
+   213,   196,   197,   198,   200,   202,    97,   207,   211,    72,
+    75,    72,    75,   163,   199,    59,    58,    71,   245,    60,
+    58,    83,    86,    60,   162,    92,   244,    72,    75,   169,
+    78,   100,   352,   269,    89,   351,    63,    94,    64,    59,
+   228,   326,    71,    59,   162,    59,    83,    86,    83,   268,
+    92,    65,    92,   184,    76,    78,   307,   137,   163,    89,
+   162,    89,    72,    75,    83,   268,   241,   242,    92,   162,
+    59,   163,    59,   137,   169,    62,   254,    89,   207,   211,
+    72,    75,   162,   308,   102,   199,   106,   169,    59,   255,
+   213,   196,   197,   198,  -166,   162,   309,   207,   211,    83,
+   268,   310,    97,    92,   199,    72,    75,   355,   137,   102,
+  -170,   106,    89,    71,   218,   356,   173,    83,    86,   220,
+   313,    92,  -171,    59,    72,    75,    78,   100,    37,   218,
+    89,   249,    38,    94,   220,   246,   247,   173,    71,    11,
+   210,    59,    83,    86,   246,   367,    92,   271,   201,    37,
+  -167,    78,    37,    38,   270,    89,    38,    71,   246,   247,
+    11,    83,    86,    11,    14,    92,    59,    72,    75,    76,
+    78,   102,   278,   106,    89,   277,   213,   196,   197,   198,
+   200,   202,   275,   207,   211,    59,   246,   274,   152,    97,
+   199,    37,   318,    72,    75,   127,   319,   102,  -169,   106,
+    71,    63,    11,    14,    83,    86,  -167,    37,    92,   207,
+   211,   127,  -169,    78,   100,    97,   199,    89,    11,    14,
+    94,  -166,   117,    72,    75,  -185,    71,    82,    59,   336,
+    83,    86,   197,   198,    92,   231,   338,   207,   211,    78,
+   100,   181,    48,    89,   199,    74,    94,   240,  -168,    72,
+    75,   241,   242,   102,    59,   106,    71,   184,   176,    37,
+    83,    86,    59,    38,    92,   345,   322,   175,    76,    78,
+    11,    97,  -172,    89,  -171,    72,    75,  -170,    59,   102,
+   214,   106,    71,    64,    59,   215,    83,    86,   173,   217,
+    92,   -23,   -23,   -23,   -23,    78,   100,    97,   155,    89,
+    72,    75,    94,   122,   102,   152,   106,    82,    71,   223,
+    59,   122,    83,    86,    72,    75,    92,  -168,   102,   225,
+   106,    78,   100,  -166,   276,    89,   226,   117,    94,    44,
+    45,    41,    42,    71,  -169,  -167,    59,    83,    86,    72,
+    75,    92,   226,   102,   229,   106,    78,    71,    52,  -168,
+    89,    83,    86,    72,    75,    92,  -166,   102,  -169,   106,
+    78,    59,   197,   198,    89,  -167,  -171,   207,   211,   365,
+   231,   152,    71,   234,   199,    59,    83,    86,    50,   210,
+    92,   -21,   -21,   -21,   -21,    78,    71,   201,   372,    89,
+    83,    86,    49,   374,    92,    72,    75,   228,  -220,    78,
+    59,   226,   354,    89,   377,    72,    75,    40,    39,   102,
+   237,   106,   341,   nil,    59,   213,   196,   197,   198,   200,
+   202,   nil,   207,   211,   nil,   nil,   nil,    97,   162,   199,
+   nil,   nil,    83,   268,   nil,   nil,    92,   nil,    71,   nil,
+   nil,   137,    83,    86,   nil,    89,    92,    44,    45,    41,
+    42,    78,   100,    72,    75,    89,    59,   102,    94,   106,
+   213,   196,   197,   198,   200,   202,    59,   207,   211,   nil,
+   213,   196,   197,   198,   199,    97,   nil,   207,   211,    72,
+    75,   nil,   nil,   102,   199,   106,    71,   nil,   nil,   nil,
+    83,    86,   nil,   nil,    92,   nil,   nil,   nil,   nil,    78,
+   100,    97,   nil,    89,   nil,   nil,    94,   nil,   nil,    72,
+    75,   nil,    71,   102,    59,   106,    83,    86,   nil,   nil,
+    92,   nil,   nil,   nil,   nil,    78,   100,   nil,   nil,    89,
+   nil,    97,    94,   nil,   nil,    72,    75,   nil,   nil,   102,
+    59,   106,    71,   nil,   nil,   nil,    83,    86,   nil,   nil,
+    92,   nil,   nil,   nil,   nil,    78,   100,    97,   nil,    89,
+    72,    75,    94,   nil,   102,   nil,   106,   nil,    71,   nil,
+    59,   nil,    83,    86,    72,    75,    92,   nil,   102,   nil,
+   nil,    78,   100,   nil,   nil,    89,   nil,   nil,    94,   nil,
+   nil,   nil,   nil,    71,   nil,   nil,    59,    83,    86,    72,
+    75,    92,   nil,   102,   nil,   106,    78,    71,   nil,   nil,
+    89,    83,   143,   nil,   nil,    92,   nil,   nil,   nil,   nil,
+   137,    59,   nil,   nil,    89,    72,    75,   nil,   nil,   102,
+   nil,   106,    71,   nil,   nil,    59,    83,    86,   nil,   nil,
+    92,   nil,   nil,   nil,   nil,    78,   nil,    97,   nil,    89,
+   nil,    72,    75,   nil,   nil,   102,   nil,   106,    71,   nil,
+    59,   nil,    83,    86,   nil,   nil,    92,   nil,   nil,   nil,
+   nil,    78,   100,    97,   nil,    89,   nil,   nil,    94,   nil,
+   nil,    72,    75,   nil,    71,   102,    59,   106,    83,    86,
+   nil,   nil,    92,   nil,   nil,   nil,   nil,    78,   100,   nil,
+   nil,    89,   nil,    97,    94,   nil,   nil,    72,    75,   nil,
+   nil,   102,    59,   106,    71,   nil,   nil,   nil,    83,    86,
+   nil,   nil,    92,   nil,   nil,   nil,   nil,    78,   100,    97,
+   nil,    89,    72,    75,    94,   nil,   102,   nil,   106,   nil,
+    71,   nil,    59,   nil,    83,    86,   nil,   nil,    92,   nil,
+   nil,   nil,   nil,    78,   100,   nil,   nil,    89,    72,    75,
+    94,   nil,   102,   nil,   106,    71,   nil,   nil,    59,    83,
+    86,   nil,   nil,    92,   nil,   nil,   nil,   nil,    78,   nil,
+    97,   nil,    89,   nil,    72,    75,   nil,   nil,   102,   nil,
+   106,    71,   nil,    59,   nil,    83,    86,   nil,   nil,    92,
+   nil,   nil,    72,    75,    78,   100,    97,   nil,    89,    72,
+    75,    94,   nil,   102,   nil,   106,   nil,    71,   nil,    59,
+   nil,    83,    86,   nil,   nil,    92,   nil,   nil,   nil,   nil,
+    78,   100,   nil,   nil,    89,   162,   nil,    94,   nil,    83,
+   268,   nil,    71,    92,   nil,    59,    83,    86,   137,   nil,
+    92,   nil,    89,   nil,   nil,    78,    72,    75,   nil,    89,
+   102,   nil,   106,    59,   nil,   nil,   nil,   nil,   nil,   nil,
+    59,   nil,   nil,   nil,   nil,    72,    75,   nil,    97,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    71,
+   nil,   nil,   nil,    83,    86,   nil,   nil,    92,   177,   nil,
+    72,    75,    78,   100,   nil,   nil,    89,   nil,    71,    94,
+   nil,   nil,    83,    86,   nil,   nil,    92,    59,    72,    75,
+    76,    78,   102,   339,   106,    89,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    71,   nil,   nil,    59,    83,    86,   nil,
+    97,    92,   nil,    72,    75,    76,    78,   102,   nil,   106,
+    89,    71,   nil,    72,    75,    83,    86,   nil,   nil,    92,
+   nil,    59,   nil,   nil,    78,   100,   nil,   nil,    89,    72,
+    75,    94,   nil,   nil,   nil,   nil,    71,   nil,   nil,    59,
+    83,    86,   nil,   nil,    92,   nil,   162,   nil,   nil,    78,
+    83,   268,   nil,    89,    92,   nil,    72,    75,   nil,   137,
+   102,   nil,   162,    89,    59,   nil,    83,   268,   nil,   nil,
+    92,   nil,    72,    75,    59,   137,   102,   nil,   106,    89,
+   nil,   nil,    72,    75,   nil,   nil,   102,   nil,   106,    71,
+    59,   nil,   nil,    83,   268,   nil,   nil,    92,   nil,   nil,
+   nil,   nil,   137,   nil,    97,    71,    89,   nil,   nil,    83,
+    86,   nil,   nil,    92,   nil,    71,   nil,    59,    78,    83,
+    86,   nil,    89,    92,   nil,   nil,   nil,   nil,    78,   100,
+    72,    75,    89,    59,   102,    94,   106,   213,   196,   197,
+   198,   200,   202,    59,   207,   211,   nil,   nil,   nil,    72,
+    75,   199,    97,   102,   189,   106,    72,    75,   nil,   nil,
+   102,   nil,   106,    71,   nil,   nil,   nil,    83,    86,   nil,
+   nil,    92,   nil,   nil,   nil,   nil,    78,   100,    72,    75,
+    89,   nil,    71,    94,   nil,   nil,    83,    86,   nil,    71,
+    92,    59,   nil,    83,    86,    78,   nil,    92,   nil,    89,
+   nil,   nil,    78,    72,    75,   nil,    89,   102,   nil,   106,
+    59,   162,   nil,   nil,   nil,    83,   268,    59,   nil,    92,
+   nil,    72,    75,   nil,   137,   102,   nil,   106,    89,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    71,   nil,   nil,    59,
+    83,    86,   nil,    97,    92,   nil,   nil,   nil,   nil,    78,
+   nil,    72,    75,    89,    71,   102,   nil,   106,    83,    86,
+   nil,   nil,    92,   nil,    59,   nil,   nil,    78,   100,   nil,
+   nil,    89,   nil,    97,    94,   nil,   nil,    72,    75,   nil,
+   nil,   102,    59,   106,    71,   nil,   nil,   nil,    83,    86,
+   nil,   nil,    92,   nil,   nil,   nil,   nil,    78,   100,    97,
+   nil,    89,   nil,   nil,    94,   nil,   nil,   nil,   nil,   nil,
+    71,   nil,    59,   nil,    83,    86,   212,   nil,    92,   nil,
+   nil,   nil,   nil,    78,   100,   205,   210,    89,   nil,   nil,
+    94,   nil,   nil,   nil,   201,   203,   206,   209,    59,   nil,
+   205,   210,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   201,
+   203,   206,   209,   nil,   nil,   nil,   nil,   nil,   204,   208,
+   nil,   nil,   213,   196,   197,   198,   200,   202,   nil,   207,
+   211,   nil,   nil,   204,   208,   nil,   199,   213,   196,   197,
+   198,   200,   202,   nil,   207,   211,   205,   210,   nil,   nil,
+   nil,   199,   nil,   nil,   nil,   201,   203,   206,   209,   nil,
+   nil,   205,   210,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   201,   203,   206,   209,   nil,   nil,   nil,   nil,   nil,   204,
+   208,   nil,   nil,   213,   196,   197,   198,   200,   202,   nil,
+   207,   211,   nil,   nil,   204,   208,   nil,   199,   213,   196,
+   197,   198,   200,   202,   nil,   207,   211,   205,   210,   nil,
+   nil,   nil,   199,   nil,   nil,   nil,   201,   203,   206,   209,
+   nil,   nil,   205,   210,   nil,   nil,   nil,   nil,   nil,   nil,
+   273,   201,   203,   206,   209,   nil,   nil,   nil,   nil,   nil,
+   nil,   208,   nil,   nil,   213,   196,   197,   198,   200,   202,
+   nil,   207,   211,   nil,   nil,   204,   208,   nil,   199,   213,
+   196,   197,   198,   200,   202,   nil,   207,   211,   205,   210,
+   nil,   nil,   nil,   199,   nil,   nil,   nil,   201,   203,   206,
+   209,   nil,   nil,    26,   210,    33,     1,   nil,     7,    12,
+   nil,    17,   201,    23,   nil,    29,   nil,     3,   nil,   nil,
+    11,    14,   nil,   210,   nil,   213,   196,   197,   198,   200,
+   202,   201,   207,   211,   nil,   nil,   nil,   nil,   nil,   199,
+   213,   196,   197,   198,   200,   202,   nil,   207,   211,   nil,
+   nil,   324,   nil,   nil,   199,   nil,   nil,   nil,   nil,   213,
+   196,   197,   198,   200,   202,   nil,   207,   211,   nil,   nil,
+   379,   nil,    26,   199,    33,     1,   nil,     7,    12,   nil,
+    17,   nil,    23,   nil,    29,   nil,     3,   nil,   nil,    11,
+    14,    26,   382,    33,     1,   nil,     7,    12,   nil,    17,
+   nil,    23,   nil,    29,   nil,     3,   nil,   nil,    11,    14,
+   nil,   296,   nil,    26,   nil,    33,     1,   nil,     7,    12,
+   nil,    17,   nil,    23,   nil,    29,   nil,     3,   nil,   nil,
+    11,    14,    26,   364,    33,     1,   nil,     7,    12,   nil,
+    17,   nil,    23,   nil,    29,   nil,     3,   nil,   nil,    11,
+    14,   nil,   381,   nil,    26,   nil,    33,     1,   nil,     7,
+    12,   nil,    17,   nil,    23,   nil,    29,   nil,     3,   nil,
+   nil,    11,    14,    26,   383,    33,     1,   nil,     7,    12,
+   nil,    17,   nil,    23,   nil,    29,   nil,     3,   nil,   nil,
+    11,    14,   nil,   357,   nil,    26,   nil,    33,     1,   nil,
+     7,    12,   nil,    17,   nil,    23,   nil,    29,   nil,     3,
+   nil,   nil,    11,    14,    26,   363,    33,     1,   nil,     7,
+    12,   nil,    17,   nil,    23,   nil,    29,   nil,     3,   nil,
+   nil,    11,    14,   nil,   375,   nil,    26,   nil,    33,     1,
+   nil,     7,    12,   nil,    17,   nil,    23,   nil,    29,   nil,
+     3,   nil,   nil,    11,    14,    26,   304,    33,     1,   nil,
+     7,    12,   nil,    17,   nil,    23,   nil,    29,   nil,     3,
+   nil,   nil,    11,    14,   nil,   349,   nil,    26,   nil,    33,
+     1,   nil,     7,    12,   nil,    17,   nil,    23,   nil,    29,
+   nil,     3,   nil,   nil,    11,    14,    26,   nil,    33,     1,
+   nil,     7,    12,   nil,    17,   nil,    23,   nil,    29,   nil,
+     3,   nil,   nil,    11,    14,    26,   nil,    33,     1,   nil,
+     7,    12,   nil,    17,   nil,    23,   nil,    29,   nil,     3,
+   nil,   nil,    11,    14 ]
 racc_action_check = [
-   155,   155,   155,   248,   248,    61,   240,   130,    93,    43,
-   222,   222,   222,   222,   240,   176,   176,   222,   222,    93,
-   155,    90,    90,    90,    93,    61,    21,    84,    84,    84,
-    21,   155,   169,   248,    43,   155,   155,   248,   248,   155,
-   169,   248,   280,    21,   155,   155,   248,    84,   155,   130,
-   248,   155,    90,   186,   186,   186,    90,    90,    84,   155,
-    90,   248,    84,    84,   113,    90,    84,    21,   185,    90,
-   166,    84,    84,    12,    12,    84,    83,   113,    84,    82,
-    90,   243,   123,   123,   186,   178,    84,   255,   186,   186,
-   178,   188,   186,   187,   187,   187,   215,   186,   166,   166,
-   255,   186,    92,   159,   159,   159,   243,   243,    12,   215,
-   301,    12,   186,    92,    28,   301,   189,   123,    92,   244,
-   123,    28,    28,   159,   187,    16,    16,    16,   187,   187,
-   244,    12,   187,   165,   159,   244,     5,   187,   159,   159,
-   123,   187,   159,     5,   165,    16,    26,   159,   159,   165,
-   134,   159,   187,    26,   159,   190,    16,    18,    18,    18,
-    16,    16,   159,   134,    16,   126,   126,   105,    16,    16,
-   105,   136,    81,    16,   105,   136,   136,    18,    20,    20,
-    20,   234,   234,    80,    16,   195,   234,   234,    18,   235,
-   235,   196,    18,    18,   235,   235,    18,   194,   194,   194,
-   126,    18,    18,   126,   197,    18,   174,   201,    18,    20,
-   174,   174,    76,    20,    20,    72,    18,    20,   144,   144,
-   144,    71,    20,   126,    89,   140,    20,   218,   194,   140,
-   140,   179,   194,   194,    91,   162,   194,    20,   144,   162,
-   162,   194,     1,     1,   156,   194,    23,    23,    94,   144,
-   302,   302,   302,   144,   144,    70,   194,   144,   274,   274,
-   236,   236,   144,   144,   219,   219,   144,    67,    66,   144,
-    64,   298,   298,   298,    96,    57,    97,   144,   232,    55,
-   152,   302,    98,    88,    53,   302,   302,   101,   242,   302,
-   106,   110,    49,    47,   302,   251,   253,   254,   302,   112,
-   257,   114,   298,    78,    78,    78,   298,   298,    35,   302,
-   298,   266,   115,   117,   164,   298,    86,   281,   284,   298,
-    27,   290,   292,    78,   272,   272,   272,   293,   294,   295,
-   298,   297,   118,   119,    78,    25,   175,    15,    78,    78,
-   310,   311,    78,     9,   131,   163,   124,    78,    78,   nil,
-   nil,    78,   nil,   nil,    78,   272,   145,   145,   145,   272,
-   272,   nil,    78,   272,   nil,   nil,   nil,   nil,   272,   nil,
-   nil,   nil,   272,   nil,   nil,   nil,   145,    33,    33,    33,
-   nil,   nil,   nil,   272,   nil,   nil,   nil,   145,   nil,   nil,
-   nil,   145,   145,   nil,   nil,   145,   nil,    33,   nil,   nil,
-   145,   145,   nil,   nil,   145,   nil,   nil,   145,    33,    34,
-    34,    34,    33,    33,   nil,   145,    33,   nil,   nil,   nil,
-   nil,    33,    33,   nil,   nil,    33,   nil,   nil,    33,    34,
-   146,   146,   146,   nil,   nil,   nil,    33,   nil,   nil,   nil,
-    34,   nil,   nil,   nil,    34,    34,   nil,   nil,    34,   nil,
-   146,   nil,   nil,    34,    34,   nil,   nil,    34,   nil,   nil,
-    34,   146,    37,    37,    37,   146,   146,   nil,    34,   146,
-   nil,   nil,   nil,   nil,   146,   146,   nil,   nil,   146,   nil,
-   nil,   146,   nil,   147,   147,   147,   nil,   nil,   nil,   146,
-   nil,   nil,   nil,    37,   nil,   nil,   nil,    37,    37,   nil,
-   nil,    37,   nil,   147,   nil,   nil,    37,   nil,   nil,   nil,
-    37,   nil,   223,   nil,   147,   nil,   nil,   nil,   147,   147,
-   223,    37,   147,    77,    77,    77,    77,   147,   147,   nil,
-   nil,   147,   nil,   nil,   147,   nil,   nil,   209,   209,   209,
-   nil,   nil,   147,   nil,    73,    73,    73,   nil,   223,   223,
-   223,   223,   223,   223,    77,   223,   223,   nil,    77,    77,
-   nil,   nil,    77,   nil,    73,   nil,   nil,    77,   209,   226,
-   nil,    77,   209,   209,   nil,    73,   209,   226,   nil,    73,
-    73,   209,    77,    73,   nil,   209,   nil,   nil,    73,    73,
-   nil,   nil,    73,   nil,   nil,    73,   209,   158,   158,   158,
-   203,   203,   nil,    73,   nil,   226,   226,   226,   226,   226,
-   226,   nil,   226,   226,   nil,   nil,   nil,   158,    54,    54,
-    54,   nil,   nil,   nil,   148,   148,   148,   nil,   158,   nil,
-   203,   nil,   158,   158,   203,   203,   158,   nil,   203,   nil,
-   nil,   158,   158,   203,   148,   158,   nil,   203,   158,    54,
-   149,   149,   149,    54,    54,   148,   158,    54,   203,   148,
-   148,   nil,    54,   148,   nil,   nil,    54,   nil,   148,   148,
-   149,   nil,   148,   nil,   nil,   148,   nil,    54,   nil,   229,
-   nil,   149,   nil,   148,   nil,   149,   149,   229,   nil,   149,
-   150,   150,   150,   nil,   149,   149,   nil,   nil,   149,   nil,
-   nil,   149,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   149,
-   150,   151,   151,   151,   nil,   229,   229,   229,   229,   229,
-   229,   150,   229,   229,   nil,   150,   150,   nil,   nil,   150,
-   nil,   151,   nil,   nil,   150,   150,   nil,   nil,   150,   nil,
-   nil,   150,   151,   153,   153,   153,   151,   151,   nil,   150,
-   151,   nil,   nil,   nil,   nil,   151,   151,   nil,   nil,   151,
-   nil,   nil,   151,   153,   154,   154,   154,   nil,   nil,   nil,
-   151,   nil,   nil,   nil,   153,   nil,   nil,   nil,   153,   153,
-   nil,   nil,   153,   nil,   154,   nil,   nil,   153,   153,   nil,
-   nil,   153,   nil,   nil,   153,   154,   160,   160,   160,   154,
-   154,   nil,   153,   154,   nil,   nil,   nil,   nil,   154,   154,
-   nil,   nil,   154,   nil,   nil,   154,   160,   nil,    51,    51,
-   nil,   nil,   nil,   154,   249,   249,   nil,   160,   nil,   nil,
-   nil,   160,   160,   nil,   nil,   160,   nil,   nil,    51,   nil,
-   160,   160,   nil,   nil,   160,   nil,   nil,   160,    51,   207,
-   207,   nil,    51,    51,   249,   160,    51,   nil,   249,   249,
-    51,    51,   249,   285,   285,    51,   nil,   249,   nil,   207,
-   nil,   249,   nil,   nil,   nil,   nil,    51,   nil,   nil,   207,
-   nil,   nil,   249,   207,   207,   138,   138,   207,   nil,   nil,
-   nil,   207,   207,   285,   nil,   nil,   207,   285,   285,   309,
-   309,   285,   nil,   nil,   nil,   138,   285,   207,   nil,   nil,
-   285,   nil,   nil,   nil,   nil,   138,   nil,   137,   137,   138,
-   138,   285,   nil,   138,   nil,   nil,   nil,   138,   138,   309,
-   nil,   nil,   138,   309,   309,   132,   132,   309,   132,   nil,
-   nil,   nil,   309,   138,   nil,   nil,   309,   137,   nil,   161,
-   161,   137,   137,   nil,   nil,   137,   nil,   309,   nil,   137,
-   137,   nil,   nil,   nil,   137,   132,   nil,   238,   238,   132,
-   132,   238,   nil,   132,   nil,   137,   nil,   nil,   132,   161,
-   nil,   nil,   132,   161,   161,   nil,   nil,   161,   nil,   nil,
-   nil,   nil,   161,   132,   nil,   nil,   161,   238,   nil,    87,
-   nil,   238,   238,   nil,   nil,   238,   nil,   161,    87,    87,
-   238,   nil,   nil,   nil,   238,   nil,   nil,    87,    87,    87,
-    87,   228,   228,   nil,   nil,   238,   nil,   nil,   nil,   nil,
-   228,   228,   228,   228,   nil,   nil,   220,   220,   220,   220,
-   nil,    87,    87,   220,   220,    87,    87,    87,    87,    87,
-    87,   nil,    87,    87,   nil,   nil,   nil,   nil,   228,   228,
-   228,   228,   228,   228,   nil,   228,   228,   103,   103,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   103,   103,   103,   103,
-   104,   104,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   104,
-   104,   104,   104,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   103,   103,   nil,   nil,   103,   103,   103,   103,   103,   103,
-   nil,   103,   103,   104,   104,   nil,   nil,   104,   104,   104,
-   104,   104,   104,   nil,   104,   104,   139,   139,   nil,   nil,
-   nil,   nil,   nil,   nil,   139,   139,   139,   139,   139,   224,
-   224,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   224,   224,
-   224,   224,   nil,   225,   nil,   nil,   nil,   nil,   nil,   139,
-   139,   225,   nil,   139,   139,   139,   139,   139,   139,   nil,
-   139,   139,   nil,   224,   nil,   nil,   224,   224,   224,   224,
-   224,   224,   233,   224,   224,   nil,   nil,   nil,   nil,   225,
-   225,   225,   225,   225,   225,   nil,   225,   225,   nil,   nil,
-   nil,   258,   nil,   233,   nil,   233,   233,   nil,   233,   233,
-   nil,   233,   nil,   233,   nil,   233,   nil,   233,   nil,   nil,
-   233,   233,   258,   260,   258,   258,   nil,   258,   258,   nil,
-   258,   nil,   258,   nil,   258,   nil,   258,   nil,   nil,   258,
-   258,   nil,   268,   nil,   260,   nil,   260,   260,   nil,   260,
-   260,   nil,   260,   nil,   260,   nil,   260,   nil,   260,   nil,
-   nil,   260,   260,   268,   304,   268,   268,   nil,   268,   268,
-   nil,   268,   nil,   268,   nil,   268,   nil,   268,   nil,   nil,
-   268,   268,   nil,   184,   nil,   304,   nil,   304,   304,   nil,
-   304,   304,   nil,   304,   nil,   304,   nil,   304,   nil,   304,
-   nil,   nil,   304,   304,   184,   157,   184,   184,   nil,   184,
-   184,   nil,   184,   nil,   184,   nil,   184,   nil,   184,   nil,
-   nil,   184,   184,   nil,   312,   nil,   157,   nil,   157,   157,
-   nil,   157,   157,   nil,   157,   nil,   157,   nil,   157,   nil,
-   157,   nil,   nil,   157,   157,   312,   314,   312,   312,   nil,
-   312,   312,   nil,   312,   nil,   312,   nil,   312,   nil,   312,
-   nil,   nil,   312,   312,   nil,   324,   nil,   314,   nil,   314,
-   314,   nil,   314,   314,   nil,   314,   nil,   314,   nil,   314,
-   nil,   314,   nil,   nil,   314,   314,   324,   192,   324,   324,
-   nil,   324,   324,   nil,   324,   nil,   324,   nil,   324,   nil,
-   324,   nil,   nil,   324,   324,   nil,   326,   nil,   192,   nil,
-   192,   192,   nil,   192,   192,   nil,   192,   nil,   192,   nil,
-   192,   nil,   192,   nil,   nil,   192,   192,   326,   nil,   326,
-   326,   nil,   326,   326,   nil,   326,   nil,   326,   nil,   326,
-   nil,   326,   nil,   nil,   326,   326,     0,   nil,     0,     0,
-   nil,     0,     0,   nil,     0,   nil,     0,   nil,     0,   nil,
-     0,   nil,   nil,     0,     0,    30,   nil,    30,    30,   nil,
-    30,    30,   nil,    30,   nil,    30,   nil,    30,   nil,    30,
-   nil,   nil,    30,    30,   230,   230,   230,   230,   230,   230,
-   nil,   230,   230,   221,   221,   221,   221,   221,   221,   nil,
-   221,   221 ]
+   180,   180,   152,    86,   156,   106,   106,   272,   174,     7,
+   277,   277,   106,   180,   180,    65,    55,   277,     7,     7,
+   272,    86,   180,   180,   180,   180,    65,   296,    17,    80,
+   296,    65,   158,    95,   202,   202,   174,   174,   202,   218,
+   202,    55,   156,   106,   152,   156,   180,   180,   277,   219,
+   180,   180,   180,   180,   180,   180,   202,   180,   180,   181,
+   181,   368,   368,   239,   180,   156,    17,   202,   165,    17,
+   158,   202,   202,   158,   239,   202,   165,   182,   182,   239,
+   202,   202,   349,   182,   202,   349,    22,   202,    22,    17,
+   143,   243,   181,   158,   368,   202,   181,   181,   368,   368,
+   181,    22,   368,   143,   181,   181,   220,   368,   163,   181,
+   182,   368,   355,   355,   182,   182,   243,   243,   182,   163,
+   181,    62,   368,   182,   163,    22,   178,   182,   281,   281,
+   351,   351,    62,   221,   351,   281,   351,    62,   182,   178,
+   285,   285,   285,   285,   101,   355,   221,   285,   285,   355,
+   355,   224,   351,   355,   285,   341,   341,   300,   355,   341,
+    91,   341,   355,   351,   308,   300,   226,   351,   351,   308,
+   227,   351,    90,   355,   184,   184,   351,   351,    12,   122,
+   351,   171,    12,   351,   122,   171,   171,   229,   341,    12,
+   286,   351,   341,   341,   343,   343,   341,   184,   286,     1,
+    87,   341,    30,     1,   183,   341,    30,   184,   183,   183,
+     1,   184,   184,    30,    30,   184,   341,   196,   196,   184,
+   184,   196,   195,   196,   184,   195,   286,   286,   286,   286,
+   286,   286,   188,   286,   286,   184,   188,   188,   231,   196,
+   286,   120,   232,   197,   197,   120,   233,   197,   103,   197,
+   196,    85,   120,   120,   196,   196,   105,    43,   196,   280,
+   280,    43,    84,   196,   196,   197,   280,   196,    43,    43,
+   196,    81,   215,    23,    23,    78,   197,    23,   196,   250,
+   197,   197,   279,   279,   197,   252,   253,   279,   279,   197,
+   197,    77,    71,   197,   279,    23,   197,   160,    68,    26,
+    26,   160,   160,    26,   197,    26,    23,   268,    67,   234,
+    23,    23,   211,   234,    23,   274,   234,    66,    23,    23,
+   234,    26,   107,    23,   108,   198,   198,   109,   207,   198,
+   114,   198,    26,   115,    23,   119,    26,    26,    64,   121,
+    26,    35,    35,    35,    35,    26,    26,   198,    52,    26,
+    29,    29,    26,    51,    29,    50,    29,   127,   198,   132,
+    26,    36,   198,   198,   307,   307,   198,   133,   307,   136,
+   307,   198,   198,   138,   192,   198,   139,    33,   198,    34,
+    34,    34,    34,    29,   140,   142,   198,    29,    29,   305,
+   305,    29,   315,   305,   144,   305,    29,   307,    16,   327,
+    29,   307,   307,   199,   199,   307,   328,   199,   330,   199,
+   307,    29,   297,   297,   307,   331,   332,   297,   297,   337,
+   153,   175,   305,   154,   297,   307,   305,   305,     9,   288,
+   305,    28,    28,    28,    28,   305,   199,   288,   352,   305,
+   199,   199,     8,   356,   199,   298,   298,   173,   367,   199,
+   305,   172,   298,   199,   369,   200,   200,     3,     2,   200,
+   157,   200,   263,   nil,   199,   288,   288,   288,   288,   288,
+   288,   nil,   288,   288,   nil,   nil,   nil,   200,   298,   288,
+   nil,   nil,   298,   298,   nil,   nil,   298,   nil,   200,   nil,
+   nil,   298,   200,   200,   nil,   298,   200,     4,     4,     4,
+     4,   200,   200,    39,    39,   200,   298,    39,   200,    39,
+   293,   293,   293,   293,   293,   293,   200,   293,   293,   nil,
+   283,   283,   283,   283,   293,    39,   nil,   283,   283,   201,
+   201,   nil,   nil,   201,   283,   201,    39,   nil,   nil,   nil,
+    39,    39,   nil,   nil,    39,   nil,   nil,   nil,   nil,    39,
+    39,   201,   nil,    39,   nil,   nil,    39,   nil,   nil,    46,
+    46,   nil,   201,    46,    39,    46,   201,   201,   nil,   nil,
+   201,   nil,   nil,   nil,   nil,   201,   201,   nil,   nil,   201,
+   nil,    46,   201,   nil,   nil,    47,    47,   nil,   nil,    47,
+   201,    47,    46,   nil,   nil,   nil,    46,    46,   nil,   nil,
+    46,   nil,   nil,   nil,   nil,    46,    46,    47,   nil,    46,
+    48,    48,    46,   nil,    48,   nil,    48,   nil,    47,   nil,
+    46,   nil,    47,    47,    49,    49,    47,   nil,    49,   nil,
+   nil,    47,    47,   nil,   nil,    47,   nil,   nil,    47,   nil,
+   nil,   nil,   nil,    48,   nil,   nil,    47,    48,    48,   176,
+   176,    48,   nil,   176,   nil,   176,    48,    49,   nil,   nil,
+    48,    49,    49,   nil,   nil,    49,   nil,   nil,   nil,   nil,
+    49,    48,   nil,   nil,    49,   203,   203,   nil,   nil,   203,
+   nil,   203,   176,   nil,   nil,    49,   176,   176,   nil,   nil,
+   176,   nil,   nil,   nil,   nil,   176,   nil,   203,   nil,   176,
+   nil,   204,   204,   nil,   nil,   204,   nil,   204,   203,   nil,
+   176,   nil,   203,   203,   nil,   nil,   203,   nil,   nil,   nil,
+   nil,   203,   203,   204,   nil,   203,   nil,   nil,   203,   nil,
+   nil,   205,   205,   nil,   204,   205,   203,   205,   204,   204,
+   nil,   nil,   204,   nil,   nil,   nil,   nil,   204,   204,   nil,
+   nil,   204,   nil,   205,   204,   nil,   nil,   100,   100,   nil,
+   nil,   100,   204,   100,   205,   nil,   nil,   nil,   205,   205,
+   nil,   nil,   205,   nil,   nil,   nil,   nil,   205,   205,   100,
+   nil,   205,    63,    63,   205,   nil,    63,   nil,    63,   nil,
+   100,   nil,   205,   nil,   100,   100,   nil,   nil,   100,   nil,
+   nil,   nil,   nil,   100,   100,   nil,   nil,   100,   208,   208,
+   100,   nil,   208,   nil,   208,    63,   nil,   nil,   100,    63,
+    63,   nil,   nil,    63,   nil,   nil,   nil,   nil,    63,   nil,
+   208,   nil,    63,   nil,   209,   209,   nil,   nil,   209,   nil,
+   209,   208,   nil,    63,   nil,   208,   208,   nil,   nil,   208,
+   nil,   nil,   269,   269,   208,   208,   209,   nil,   208,   276,
+   276,   208,   nil,   276,   nil,   276,   nil,   209,   nil,   208,
+   nil,   209,   209,   nil,   nil,   209,   nil,   nil,   nil,   nil,
+   209,   209,   nil,   nil,   209,   269,   nil,   209,   nil,   269,
+   269,   nil,   276,   269,   nil,   209,   276,   276,   269,   nil,
+   276,   nil,   269,   nil,   nil,   276,   256,   256,   nil,   276,
+   256,   nil,   256,   269,   nil,   nil,   nil,   nil,   nil,   nil,
+   276,   nil,   nil,   nil,   nil,    74,    74,   nil,   256,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   256,
+   nil,   nil,   nil,   256,   256,   nil,   nil,   256,    74,   nil,
+   254,   254,   256,   256,   nil,   nil,   256,   nil,    74,   256,
+   nil,   nil,    74,    74,   nil,   nil,    74,   256,    75,    75,
+    74,    74,    75,   254,    75,    74,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   254,   nil,   nil,    74,   254,   254,   nil,
+    75,   254,   nil,   248,   248,   254,   254,   248,   nil,   248,
+   254,    75,   nil,   245,   245,    75,    75,   nil,   nil,    75,
+   nil,   254,   nil,   nil,    75,    75,   nil,   nil,    75,   244,
+   244,    75,   nil,   nil,   nil,   nil,   248,   nil,   nil,    75,
+   248,   248,   nil,   nil,   248,   nil,   245,   nil,   nil,   248,
+   245,   245,   nil,   248,   245,   nil,   225,   225,   nil,   245,
+   225,   nil,   244,   245,   248,   nil,   244,   244,   nil,   nil,
+   244,   nil,    82,    82,   245,   244,    82,   nil,    82,   244,
+   nil,   nil,   210,   210,   nil,   nil,   210,   nil,   210,   225,
+   244,   nil,   nil,   225,   225,   nil,   nil,   225,   nil,   nil,
+   nil,   nil,   225,   nil,   210,    82,   225,   nil,   nil,    82,
+    82,   nil,   nil,    82,   nil,   210,   nil,   225,    82,   210,
+   210,   nil,    82,   210,   nil,   nil,   nil,   nil,   210,   210,
+   213,   213,   210,    82,   213,   210,   213,   284,   284,   284,
+   284,   284,   284,   210,   284,   284,   nil,   nil,   nil,   102,
+   102,   284,   213,   102,   102,   102,   230,   230,   nil,   nil,
+   230,   nil,   230,   213,   nil,   nil,   nil,   213,   213,   nil,
+   nil,   213,   nil,   nil,   nil,   nil,   213,   213,   214,   214,
+   213,   nil,   102,   213,   nil,   nil,   102,   102,   nil,   230,
+   102,   213,   nil,   230,   230,   102,   nil,   230,   nil,   102,
+   nil,   nil,   230,   228,   228,   nil,   230,   228,   nil,   228,
+   102,   214,   nil,   nil,   nil,   214,   214,   230,   nil,   214,
+   nil,    94,    94,   nil,   214,    94,   nil,    94,   214,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   228,   nil,   nil,   214,
+   228,   228,   nil,    94,   228,   nil,   nil,   nil,   nil,   228,
+   nil,    97,    97,   228,    94,    97,   nil,    97,    94,    94,
+   nil,   nil,    94,   nil,   228,   nil,   nil,    94,    94,   nil,
+   nil,    94,   nil,    97,    94,   nil,   nil,   206,   206,   nil,
+   nil,   206,    94,   206,    97,   nil,   nil,   nil,    97,    97,
+   nil,   nil,    97,   nil,   nil,   nil,   nil,    97,    97,   206,
+   nil,    97,   nil,   nil,    97,   nil,   nil,   nil,   nil,   nil,
+   206,   nil,    97,   nil,   206,   206,   111,   nil,   206,   nil,
+   nil,   nil,   nil,   206,   206,   111,   111,   206,   nil,   nil,
+   206,   nil,   nil,   nil,   111,   111,   111,   111,   206,   nil,
+   124,   124,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   124,
+   124,   124,   124,   nil,   nil,   nil,   nil,   nil,   111,   111,
+   nil,   nil,   111,   111,   111,   111,   111,   111,   nil,   111,
+   111,   nil,   nil,   124,   124,   nil,   111,   124,   124,   124,
+   124,   124,   124,   nil,   124,   124,   130,   130,   nil,   nil,
+   nil,   124,   nil,   nil,   nil,   130,   130,   130,   130,   nil,
+   nil,   131,   131,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   131,   131,   131,   131,   nil,   nil,   nil,   nil,   nil,   130,
+   130,   nil,   nil,   130,   130,   130,   130,   130,   130,   nil,
+   130,   130,   nil,   nil,   131,   131,   nil,   130,   131,   131,
+   131,   131,   131,   131,   nil,   131,   131,   287,   287,   nil,
+   nil,   nil,   131,   nil,   nil,   nil,   287,   287,   287,   287,
+   nil,   nil,   186,   186,   nil,   nil,   nil,   nil,   nil,   nil,
+   186,   186,   186,   186,   186,   nil,   nil,   nil,   nil,   nil,
+   nil,   287,   nil,   nil,   287,   287,   287,   287,   287,   287,
+   nil,   287,   287,   nil,   nil,   186,   186,   nil,   287,   186,
+   186,   186,   186,   186,   186,   nil,   186,   186,   291,   291,
+   nil,   nil,   nil,   186,   nil,   nil,   nil,   291,   291,   291,
+   291,   nil,   nil,    19,   292,    19,    19,   nil,    19,    19,
+   nil,    19,   292,    19,   nil,    19,   nil,    19,   nil,   nil,
+    19,    19,   nil,   289,   nil,   291,   291,   291,   291,   291,
+   291,   289,   291,   291,   nil,   nil,   nil,   nil,   nil,   291,
+   292,   292,   292,   292,   292,   292,   nil,   292,   292,   nil,
+   nil,   237,   nil,   nil,   292,   nil,   nil,   nil,   nil,   289,
+   289,   289,   289,   289,   289,   nil,   289,   289,   nil,   nil,
+   372,   nil,   237,   289,   237,   237,   nil,   237,   237,   nil,
+   237,   nil,   237,   nil,   237,   nil,   237,   nil,   nil,   237,
+   237,   372,   378,   372,   372,   nil,   372,   372,   nil,   372,
+   nil,   372,   nil,   372,   nil,   372,   nil,   nil,   372,   372,
+   nil,   212,   nil,   378,   nil,   378,   378,   nil,   378,   378,
+   nil,   378,   nil,   378,   nil,   378,   nil,   378,   nil,   nil,
+   378,   378,   212,   323,   212,   212,   nil,   212,   212,   nil,
+   212,   nil,   212,   nil,   212,   nil,   212,   nil,   nil,   212,
+   212,   nil,   374,   nil,   323,   nil,   323,   323,   nil,   323,
+   323,   nil,   323,   nil,   323,   nil,   323,   nil,   323,   nil,
+   nil,   323,   323,   374,   380,   374,   374,   nil,   374,   374,
+   nil,   374,   nil,   374,   nil,   374,   nil,   374,   nil,   nil,
+   374,   374,   nil,   303,   nil,   380,   nil,   380,   380,   nil,
+   380,   380,   nil,   380,   nil,   380,   nil,   380,   nil,   380,
+   nil,   nil,   380,   380,   303,   319,   303,   303,   nil,   303,
+   303,   nil,   303,   nil,   303,   nil,   303,   nil,   303,   nil,
+   nil,   303,   303,   nil,   362,   nil,   319,   nil,   319,   319,
+   nil,   319,   319,   nil,   319,   nil,   319,   nil,   319,   nil,
+   319,   nil,   nil,   319,   319,   362,   217,   362,   362,   nil,
+   362,   362,   nil,   362,   nil,   362,   nil,   362,   nil,   362,
+   nil,   nil,   362,   362,   nil,   295,   nil,   217,   nil,   217,
+   217,   nil,   217,   217,   nil,   217,   nil,   217,   nil,   217,
+   nil,   217,   nil,   nil,   217,   217,   295,   nil,   295,   295,
+   nil,   295,   295,   nil,   295,   nil,   295,   nil,   295,   nil,
+   295,   nil,   nil,   295,   295,     0,   nil,     0,     0,   nil,
+     0,     0,   nil,     0,   nil,     0,   nil,     0,   nil,     0,
+   nil,   nil,     0,     0 ]
 racc_action_pointer = [
-  1418,   229,   nil,   nil,   nil,    98,   nil,   nil,   nil,   337,
-   nil,   nil,    70,   nil,   nil,   331,   123,   nil,   155,   nil,
-   176,    24,   nil,   243,   nil,   335,   108,   278,    76,   nil,
-  1437,   nil,   nil,   375,   407,   273,   nil,   460,   nil,   nil,
-   nil,   nil,   nil,    -1,   nil,   nil,   nil,   255,   nil,   271,
-   nil,   815,   nil,   263,   616,   277,   nil,   265,   nil,   nil,
-   nil,     3,   nil,   nil,   249,   nil,   266,   246,   nil,   nil,
-   234,   200,   194,   542,   nil,   nil,   191,   521,   301,   nil,
-   162,   151,    58,    55,    25,   nil,   295,   993,   262,   218,
-    19,   196,    80,   -14,   242,   nil,   264,   276,   260,   nil,
-   nil,   281,   nil,  1052,  1065,   129,   284,   nil,   nil,   nil,
-   270,   nil,   260,    55,   291,   291,   nil,   292,   314,   312,
-   nil,   nil,   nil,    79,   340,   nil,   162,   nil,   nil,   nil,
-    -2,   334,   932,   nil,   140,   nil,   166,   914,   882,  1111,
-   220,   nil,   nil,   nil,   216,   354,   428,   481,   622,   648,
-   688,   709,   219,   741,   762,    -2,   183,  1298,   595,   101,
-   794,   946,   230,   336,   304,   111,    50,   nil,   nil,    16,
-   nil,   nil,   nil,   nil,   162,   298,    12,   nil,    52,   225,
-   nil,   nil,   nil,   nil,  1276,    61,    51,    91,    84,    78,
-   117,   nil,  1380,   nil,   195,   178,   153,   195,   nil,   nil,
-   nil,   185,   nil,   597,   nil,   nil,   nil,   846,   nil,   535,
-   nil,   nil,   nil,   nil,   nil,    86,   nil,   nil,   222,   205,
-   984,  1441,   -42,   496,  1124,  1137,   553,   nil,  1006,   663,
-  1432,   nil,   249,  1175,   127,   135,   201,   nil,   964,   nil,
-    -4,   nil,   281,    58,    97,   nil,   nil,   nil,     0,   821,
-   nil,   285,   nil,   283,   274,    77,   nil,   287,  1194,   nil,
-  1216,   nil,   nil,   nil,   nil,   nil,   301,   nil,  1235,   nil,
-   nil,   nil,   322,   nil,   249,   nil,   nil,   nil,   nil,   nil,
-    36,   288,   nil,   nil,   312,   860,   nil,   nil,   nil,   nil,
-   300,   nil,   301,   306,   307,   308,   nil,   324,   269,   nil,
-   nil,    77,   248,   nil,  1257,   nil,   nil,   nil,   nil,   896,
-   333,   334,  1317,   nil,  1339,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,  1358,   nil,  1399,   nil,   nil ]
+  1795,   163,   443,   413,   433,   nil,   nil,     3,   434,   420,
+   nil,   nil,   142,   nil,   nil,   nil,   398,    26,   nil,  1483,
+   nil,   nil,    80,   271,   nil,   nil,   297,   nil,   367,   348,
+   166,   nil,   nil,   375,   315,   277,   337,   nil,   nil,   501,
+   nil,   nil,   nil,   221,   nil,   nil,   557,   583,   608,   622,
+   315,   329,   348,   nil,   nil,     4,   nil,   nil,   nil,   nil,
+   nil,   nil,    97,   780,   298,    -9,   309,   302,   275,   nil,
+   nil,   286,   nil,   nil,   923,   966,   nil,   279,   269,   nil,
+     6,   248,  1060,   nil,   239,   245,    -3,   177,   nil,   nil,
+   149,   137,   nil,   nil,  1209,    10,   nil,  1239,   nil,   nil,
+   755,   121,  1137,   225,   nil,   233,     3,   299,   301,   304,
+   nil,  1298,   nil,   nil,   322,   325,   nil,   nil,   nil,   323,
+   205,   331,   144,   nil,  1313,   nil,   nil,   351,   nil,   nil,
+  1359,  1374,   352,   344,   nil,   nil,   328,   nil,   350,   364,
+   361,   nil,   362,    79,   374,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    -9,   408,   386,   nil,     2,   452,    30,   nil,
+   251,   nil,   nil,    84,   nil,    50,   nil,   nil,   nil,   nil,
+   nil,   174,   439,   436,   -14,   381,   647,   nil,   114,   nil,
+    -4,    57,    75,   197,   172,   nil,  1435,   nil,   225,   nil,
+   nil,   nil,   363,   nil,   nil,   213,   215,   241,   323,   401,
+   453,   527,    32,   673,   699,   729,  1265,   265,   806,   832,
+  1070,   249,  1612,  1118,  1166,   270,   nil,  1757,    24,    24,
+    91,   121,   nil,   nil,   142,  1044,   126,   161,  1191,   147,
+  1144,   198,   233,   238,   273,   nil,   nil,  1552,   nil,    39,
+   nil,   nil,   nil,    66,  1017,  1001,   nil,   nil,   991,   nil,
+   270,   nil,   273,   279,   948,   nil,   904,   nil,   nil,   nil,
+   nil,   nil,   nil,   451,   nil,   nil,   nil,   nil,   283,   850,
+   nil,   nil,    -5,   nil,   308,   nil,   857,     8,   nil,   226,
+   198,    67,   nil,   466,  1073,    86,   172,  1420,   411,  1515,
+   nil,  1481,  1496,   456,   nil,  1776,    -4,   356,   443,   nil,
+   145,   nil,   nil,  1694,   nil,   387,   nil,   362,   129,   nil,
+   nil,   nil,   nil,   nil,   nil,   380,   nil,   nil,   nil,  1716,
+   nil,   nil,   nil,  1634,   nil,   nil,   nil,   376,   383,   nil,
+   385,   392,   393,   nil,   nil,   nil,   nil,   410,   nil,   nil,
+   nil,   153,   nil,   183,   nil,   nil,   nil,   nil,   nil,    51,
+   nil,   128,   430,   nil,   nil,   110,   435,   nil,   nil,   nil,
+   nil,   nil,  1735,   nil,   nil,   nil,   nil,   439,    59,   445,
+   nil,   nil,  1571,   nil,  1653,   nil,   nil,   nil,  1593,   nil,
+  1675,   nil,   nil,   nil ]
 racc_action_default = [
-  -174,  -200,   -15,    -3,  -165,  -200,   -16,    -5,  -163,  -200,
-   -17,    -6,  -200,    -7,    -8,  -200,  -164,    -9,  -200,   -10,
-  -200,  -200,   -11,  -200,   -12,  -200,  -200,   -39,  -200,   -13,
-    -1,   -14,    -2,  -200,  -200,  -174,  -164,   -72,  -171,  -170,
-  -169,  -199,  -173,  -174,  -172,  -166,  -168,   -79,  -191,  -200,
-   -31,  -200,   -33,   -32,  -200,   -63,  -102,   -21,  -104,  -103,
-   -22,   -62,   -23,   -61,   -26,  -153,  -200,   -27,  -152,  -151,
-   -28,   -29,   -30,  -200,   -94,  -112,   -90,  -200,  -200,   -97,
-   -91,   -95,   -99,   -92,  -200,   -96,   -93,  -200,   -98,  -200,
-  -200,   -72,  -174,  -174,   -42,  -154,  -156,  -200,  -174,   -40,
-   -38,  -200,    -4,   -70,   -71,  -200,  -200,  -187,   -73,   -67,
-   -64,   -63,   -59,   -62,  -197,   -65,   -57,   -68,  -200,   -66,
-  -150,   -69,  -149,  -200,  -200,  -185,  -200,   -77,   -78,   -80,
-  -200,  -197,  -200,   -20,  -200,   -82,  -200,  -200,  -200,  -200,
-  -200,  -194,  -128,  -121,  -200,  -200,  -200,  -200,  -200,  -200,
-  -200,  -200,  -200,  -200,  -200,  -200,  -200,  -200,  -200,  -200,
-  -200,  -200,  -200,  -200,  -197,  -174,  -200,   -46,   -48,  -200,
-   -62,   -55,   -54,   -45,  -200,   -79,  -200,   329,  -175,  -200,
-  -176,  -189,  -188,  -190,  -200,  -200,   -60,  -200,  -200,  -198,
-   -72,  -186,  -200,  -167,  -200,  -200,  -198,  -200,  -147,  -139,
-  -140,   -62,  -145,  -200,  -148,  -146,   -18,  -200,  -105,  -200,
-  -195,  -196,   -24,   -25,  -101,  -200,  -131,  -192,  -196,  -117,
-  -119,  -123,  -120,  -125,  -130,  -127,  -124,  -113,  -129,  -126,
-  -122,  -114,  -109,  -200,  -115,  -116,  -118,  -137,  -200,  -133,
-  -200,  -106,  -200,  -200,  -200,   -51,   -50,   -44,  -200,  -200,
-   -43,  -197,  -155,  -184,  -200,  -200,  -179,  -182,  -200,  -160,
-  -200,   -34,   -58,   -75,   -35,   -74,  -197,  -162,  -200,   -76,
-   -37,   -81,  -200,  -142,  -197,   -19,   -83,  -100,  -193,  -108,
-  -200,  -109,  -132,  -134,  -200,  -200,   -36,   -49,   -47,   -88,
-   -84,   -52,   -85,   -89,   -86,   -87,   -53,  -200,  -200,  -177,
-  -178,  -200,  -200,  -158,  -200,  -159,   -56,  -161,  -144,  -200,
-  -200,  -196,  -200,  -107,  -200,  -138,   -41,  -183,  -180,  -181,
-  -157,  -143,  -141,  -111,  -200,  -136,  -200,  -110,  -135 ]
+  -196,  -233,  -233,   -50,  -233,    -8,    -9,  -233,  -233,   -22,
+   -10,  -187,  -188,   -11,  -185,   -12,  -233,  -233,   -13,    -1,
+   -14,    -2,  -233,  -186,   -15,    -3,  -233,   -16,    -5,  -233,
+  -233,   -17,    -6,  -233,   -18,    -7,  -196,  -188,  -186,  -233,
+   -51,   -26,   -27,  -233,   -24,   -25,  -233,  -233,  -233,   -85,
+   -92,  -196,  -233,  -195,  -193,  -196,  -189,  -191,  -192,  -221,
+  -194,    -4,  -196,  -233,   -85,  -196,   -53,  -231,   -42,  -174,
+   -43,  -213,  -117,   -33,  -233,  -233,   -44,   -31,   -74,   -32,
+  -233,   -36,  -233,  -122,   -37,  -233,   -73,   -38,  -172,   -72,
+   -39,   -40,  -173,   -41,  -233,  -103,  -111,  -233,  -132,  -112,
+  -233,  -104,  -233,  -108,  -110,  -105,  -233,  -114,  -106,  -113,
+  -109,  -233,  -125,  -107,  -233,  -233,   -49,  -175,  -176,  -178,
+  -233,  -233,  -197,  -198,   -83,   -19,   -22,  -186,   -21,   -23,
+   -82,   -84,  -233,   -75,   -86,   -81,   -70,   -74,   -76,  -219,
+   -79,   -68,   -77,   -73,  -233,  -171,  -170,   -80,   -78,   -90,
+   -91,   -93,  -233,  -219,  -196,   384,  -233,  -233,  -233,  -207,
+  -233,   -57,  -213,  -196,   -59,  -233,   -66,   -65,   -56,   -73,
+   -95,  -233,  -219,  -233,  -233,   -92,  -233,   -30,  -233,  -118,
+  -233,  -233,  -233,  -233,  -233,  -142,  -233,  -149,  -233,  -216,
+  -229,  -225,  -233,  -228,  -224,  -233,  -233,  -233,  -233,  -233,
+  -233,  -233,  -233,  -233,  -233,  -233,  -233,  -233,  -233,  -233,
+  -233,  -233,  -233,  -233,  -233,  -233,   -20,  -233,  -206,  -233,
+  -204,  -233,  -201,  -230,  -233,   -71,  -220,  -233,  -233,   -85,
+  -233,  -220,  -233,  -233,  -233,  -209,  -190,  -233,  -208,  -233,
+   -54,   -62,   -61,  -233,  -233,  -233,  -217,  -218,  -233,  -124,
+  -233,   -55,  -219,  -233,  -233,   -28,  -233,  -120,  -119,   -35,
+   -34,  -168,  -166,  -233,  -169,  -160,  -167,  -161,   -73,  -233,
+  -123,  -116,  -233,  -152,  -218,  -214,  -233,  -233,  -222,  -137,
+  -139,  -138,  -133,  -140,  -144,  -141,  -146,  -151,  -148,  -145,
+  -134,  -150,  -147,  -143,  -135,  -233,  -128,  -136,  -233,  -154,
+  -233,  -158,  -177,  -233,  -180,  -233,  -199,  -233,  -233,  -200,
+   -45,   -69,   -87,   -46,   -88,  -219,   -89,   -94,   -48,  -233,
+  -211,  -210,  -212,  -233,  -184,   -58,   -60,   -97,   -98,   -63,
+  -102,   -99,  -100,  -101,   -64,   -96,   -47,  -233,  -232,   -29,
+  -121,  -233,  -163,  -219,  -115,  -215,  -227,  -226,  -223,  -128,
+  -127,  -233,  -233,  -155,  -153,  -233,  -233,  -179,  -205,  -203,
+  -202,   -67,  -233,  -182,  -183,   -52,  -165,  -218,  -233,  -233,
+  -126,  -129,  -233,  -159,  -233,  -181,  -164,  -162,  -233,  -131,
+  -233,  -157,  -130,  -156 ]
 racc_goto_table = [
-    15,    21,   102,   197,    30,   116,   200,   114,    42,   256,
-   188,   131,    50,    57,   121,    45,    62,    35,   239,   212,
-    32,   166,   174,   279,    69,    25,   136,   195,   271,   101,
-    15,    21,   237,   109,   291,   296,   309,   127,    98,   238,
-   288,    94,   199,   185,   274,    69,    96,    50,   134,   140,
-    67,    62,    72,   179,   106,   107,    43,   124,   112,    69,
-   242,   164,   162,   125,   191,   254,   255,   100,   182,   nil,
-   nil,   117,   313,   122,   197,   nil,   nil,   273,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    67,   nil,    72,   nil,   212,
-   nil,   nil,   nil,   nil,   243,   283,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   237,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   181,   180,    42,
-   nil,    89,    42,   nil,   nil,   nil,   172,   172,   nil,   193,
-   nil,   nil,   318,    50,    50,   215,   nil,   213,    62,   251,
-    69,   nil,   nil,   nil,   nil,    69,    69,   297,   227,   nil,
-   nil,   nil,   231,   nil,   262,   135,   315,    15,    21,   nil,
-   266,   233,   306,   121,   nil,   127,   204,   nil,   122,    69,
-   310,    67,    67,    72,    72,   nil,   nil,   nil,   135,   265,
-   197,   nil,   109,   321,    15,    21,   127,   nil,   260,   nil,
-   nil,   135,    15,    21,    69,   204,   268,   122,   nil,   172,
-   nil,   nil,   nil,    50,   nil,   102,   nil,   213,   nil,   nil,
-   nil,    69,   nil,   nil,    53,    69,   nil,    71,   nil,   nil,
-   117,    95,   122,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    64,   nil,   102,    15,    21,   110,   nil,   204,   120,   122,
-   102,    67,   nil,    72,   289,   289,    69,   nil,   nil,    53,
-   nil,   115,    71,   nil,   nil,   nil,    69,    69,    15,    21,
-    15,    21,   304,   nil,   nil,    64,   nil,   nil,    15,    21,
-   nil,   nil,   204,    70,   122,   nil,   102,   nil,   172,   nil,
-   nil,   nil,   293,   293,   122,   122,   nil,   nil,   263,   nil,
-   nil,   nil,   nil,    69,   119,   269,   102,   nil,   102,   nil,
-   nil,   nil,   nil,   nil,    15,    21,   171,   171,    70,   nil,
-   276,   nil,    15,    21,    15,    21,   324,    69,   326,   204,
-   nil,   122,   nil,   nil,    15,    21,    15,    21,   nil,   nil,
-   198,   nil,   nil,   120,   nil,    53,    53,   nil,    71,    71,
-   nil,   nil,   nil,   204,   nil,   122,   202,   nil,   nil,   nil,
-   nil,    64,    64,   nil,   nil,   nil,   nil,   nil,   nil,   198,
-   nil,   nil,   120,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   308,   252,   202,   nil,   nil,   nil,   171,
-   nil,   nil,   nil,   nil,   110,   nil,   nil,   120,   nil,   205,
-   nil,   nil,   nil,   nil,    70,    70,   nil,   nil,   nil,   317,
-   115,   198,   nil,   319,   120,    53,   nil,   nil,    71,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   202,   205,    87,
-   nil,    64,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   103,   104,   198,   nil,   nil,   120,
-   nil,   nil,   nil,   119,   nil,   nil,   290,   290,   nil,   295,
-   295,   nil,   202,   nil,   nil,   nil,   nil,   nil,   171,   nil,
-   205,   nil,   292,   292,    70,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   139,   nil,   nil,   nil,   nil,   142,
-   nil,   nil,   nil,   198,   nil,   143,   120,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   205,   nil,   nil,   nil,   202,
-   nil,   nil,   nil,   nil,   nil,   294,   294,   198,   nil,   nil,
-   120,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   202,   nil,   nil,   nil,   nil,   nil,   nil,
+    22,     9,    68,   112,    53,   118,    61,    36,    91,   222,
+    19,   267,    70,    93,     2,   227,   139,   191,    51,    22,
+     9,   179,    77,    56,    73,   149,    21,   141,   133,   232,
+   115,   172,   153,     2,   146,   263,   125,   116,   135,   148,
+   147,   299,   129,    22,   126,   260,   160,   350,   250,   174,
+   128,   171,    43,    68,   121,   329,   334,   298,   368,    91,
+   258,   265,   123,    70,    93,   317,   343,   301,   136,   154,
+   183,   119,   224,   178,   233,    73,    55,   123,   157,    66,
+   238,   159,   120,   219,   221,   190,   325,   321,   195,    16,
+   188,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   342,   nil,
+   370,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   216,   nil,   nil,   nil,   nil,   260,   129,
+    22,   126,   263,   nil,   nil,   353,   nil,   128,   337,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    81,
+   nil,   nil,   nil,    53,   nil,    53,   nil,   243,   nil,   nil,
+   149,   301,   nil,   nil,   nil,   nil,   nil,   252,   nil,   nil,
+    68,   261,   236,    68,   nil,   138,    91,   146,   nil,    91,
+    70,    93,   nil,    70,    93,   nil,   nil,   nil,   166,   nil,
+   235,   166,   259,   272,   nil,    73,   nil,   302,   347,   nil,
+    81,   361,   nil,   261,   290,   360,   315,   376,   294,   146,
+   nil,   312,   340,   311,   133,   nil,   149,   nil,   373,   nil,
+   146,   nil,    22,     9,   135,   148,   147,    22,     9,   369,
+   nil,   263,   295,   327,   327,   nil,     2,   303,   nil,   146,
+   146,     2,   nil,    68,   333,   333,   nil,    22,     9,    91,
+   320,    88,   nil,    70,    93,   nil,   nil,   323,   261,   nil,
+   nil,     2,   nil,   nil,   146,   259,   190,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    88,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    87,   nil,   261,   nil,   166,
+   nil,   nil,    61,   146,   nil,   nil,   nil,   nil,   nil,   nil,
+    61,   nil,    88,   nil,   nil,    22,     9,    81,   262,   nil,
+    81,   142,   nil,    22,     9,   nil,   nil,   nil,   nil,     2,
+    61,   nil,   nil,   nil,   nil,   nil,   nil,     2,   nil,    22,
+     9,   nil,   nil,    22,     9,   nil,    87,   nil,   371,   362,
+   262,   nil,   nil,     2,   261,   nil,   nil,     2,   nil,   nil,
+   146,   138,   nil,   nil,   nil,   nil,   nil,   261,   nil,    61,
+   nil,   nil,   nil,   146,   nil,   166,   nil,   nil,   nil,   nil,
+   328,   328,    22,     9,   114,    61,   nil,    61,   nil,    84,
+    81,   nil,    22,     9,    22,     9,     2,    90,    22,     9,
+    22,     9,   378,   132,   380,   262,     2,   nil,     2,   nil,
+   nil,   nil,     2,   nil,     2,   140,   nil,   nil,   170,    88,
+    88,   nil,    88,   145,   nil,   nil,   nil,   nil,   167,   nil,
+   nil,   167,   nil,   nil,   262,   nil,   nil,   170,   nil,   nil,
+    84,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    90,   nil,
+   nil,   nil,    88,    87,   266,   nil,    87,   170,   nil,   nil,
+   nil,   nil,   nil,    88,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    88,    88,   nil,   nil,   266,   nil,   nil,   nil,
+   nil,   262,    88,   nil,   nil,   nil,   nil,   142,   nil,   nil,
+   nil,   nil,   nil,   nil,   262,   nil,   nil,    88,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   331,   331,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    87,   nil,   nil,   167,
+   nil,   253,   nil,   nil,   nil,   nil,    88,   nil,   nil,   nil,
+   nil,   266,   nil,   nil,   nil,   nil,   nil,    84,   264,   nil,
+    84,   nil,   nil,   nil,   282,    90,   145,   nil,    90,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   266,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   264,   nil,   nil,   314,   nil,   316,   nil,   124,   145,   nil,
+   nil,   140,   nil,    88,   130,   131,   nil,   nil,   nil,   145,
+   nil,   nil,   nil,   335,   nil,   167,    88,   nil,   nil,   nil,
+   330,   330,   nil,   nil,   nil,   nil,   nil,   nil,   332,   332,
+    84,   nil,   nil,   180,   nil,   nil,   nil,   266,    90,   nil,
+   nil,   346,   nil,   nil,   nil,   264,   nil,   nil,   nil,   nil,
+   266,   nil,   185,   145,   nil,   186,   nil,   nil,   187,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   358,   nil,   359,   nil,   264,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   145,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   366,   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,   205,   nil,   nil,   219,   220,   221,   222,   223,
-   224,   225,   226,   nil,   228,   229,   230,   nil,   nil,   234,
-   235,   236,   nil,   nil,   nil,   nil,   205 ]
+   nil,   264,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   145,
+   nil,   nil,   nil,   nil,   264,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   145,   nil,   279,   280,   281,   nil,   283,   284,
+   285,   286,   287,   288,   289,   nil,   291,   292,   293,   nil,
+   nil,   297,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   180 ]
 racc_goto_check = [
-    20,    33,     4,    59,     2,    43,    61,    31,    55,    72,
-    32,    34,    26,    18,    46,    68,    20,    28,    57,    19,
-     3,    37,    37,    54,    45,     1,    52,    32,    51,    33,
-    20,    33,    59,    26,    42,    42,    53,    48,    28,    56,
-    38,    36,    60,    30,    62,    45,    63,    26,    18,    52,
-    22,    20,    25,    64,    65,     3,    66,    67,    29,    45,
-    32,    31,    52,     3,    69,    70,    71,     5,    73,   nil,
-   nil,    22,    54,    25,    59,   nil,   nil,    61,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    22,   nil,    25,   nil,    19,
-   nil,   nil,   nil,   nil,    37,    57,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    59,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    28,     3,    55,
-   nil,    49,    55,   nil,   nil,   nil,    22,    22,   nil,    68,
-   nil,   nil,    72,    26,    26,    18,   nil,    20,    20,    34,
-    45,   nil,   nil,   nil,   nil,    45,    45,    32,    55,   nil,
-   nil,   nil,    55,   nil,    43,    49,    59,    20,    33,   nil,
-    31,     2,    32,    46,   nil,    48,    22,   nil,    25,    45,
-    32,    22,    22,    25,    25,   nil,   nil,   nil,    49,    48,
-    59,   nil,    26,    61,    20,    33,    48,   nil,     2,   nil,
-   nil,    49,    20,    33,    45,    22,     2,    25,   nil,    22,
-   nil,   nil,   nil,    26,   nil,     4,   nil,    20,   nil,   nil,
-   nil,    45,   nil,   nil,    27,    45,   nil,    24,   nil,   nil,
-    22,    27,    25,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    21,   nil,     4,    20,    33,    27,   nil,    22,    24,    25,
-     4,    22,   nil,    25,    26,    26,    45,   nil,   nil,    27,
-   nil,    21,    24,   nil,   nil,   nil,    45,    45,    20,    33,
-    20,    33,     2,   nil,   nil,    21,   nil,   nil,    20,    33,
-   nil,   nil,    22,    23,    25,   nil,     4,   nil,    22,   nil,
-   nil,   nil,    22,    22,    25,    25,   nil,   nil,    49,   nil,
-   nil,   nil,   nil,    45,    23,    49,     4,   nil,     4,   nil,
-   nil,   nil,   nil,   nil,    20,    33,    21,    21,    23,   nil,
-    49,   nil,    20,    33,    20,    33,     2,    45,     2,    22,
-   nil,    25,   nil,   nil,    20,    33,    20,    33,   nil,   nil,
-    27,   nil,   nil,    24,   nil,    27,    27,   nil,    24,    24,
-   nil,   nil,   nil,    22,   nil,    25,    21,   nil,   nil,   nil,
-   nil,    21,    21,   nil,   nil,   nil,   nil,   nil,   nil,    27,
-   nil,   nil,    24,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    49,    27,    21,   nil,   nil,   nil,    21,
-   nil,   nil,   nil,   nil,    27,   nil,   nil,    24,   nil,    23,
-   nil,   nil,   nil,   nil,    23,    23,   nil,   nil,   nil,    49,
-    21,    27,   nil,    49,    24,    27,   nil,   nil,    24,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    21,    23,    47,
-   nil,    21,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    47,    47,    27,   nil,   nil,    24,
-   nil,   nil,   nil,    23,   nil,   nil,    27,    27,   nil,    24,
-    24,   nil,    21,   nil,   nil,   nil,   nil,   nil,    21,   nil,
-    23,   nil,    21,    21,    23,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    47,   nil,   nil,   nil,   nil,    47,
-   nil,   nil,   nil,    27,   nil,    47,    24,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    23,   nil,   nil,   nil,    21,
-   nil,   nil,   nil,   nil,   nil,    23,    23,    27,   nil,   nil,
-    24,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    21,   nil,   nil,   nil,   nil,   nil,   nil,
+    37,    21,    30,    62,    64,    72,     4,    32,    28,    82,
+     2,    70,    31,    29,    52,    36,    35,    85,    32,    37,
+    21,    60,    22,    78,    21,    53,     3,    47,    30,    36,
+    37,    35,    38,    52,    28,    68,    19,     5,    31,    29,
+    50,    66,     7,    37,    21,    23,    41,    63,    36,    41,
+     5,    57,    20,    30,    74,    46,    46,    65,    58,    28,
+    61,    69,     3,    31,    29,    56,    71,    68,    33,    74,
+    57,    73,    34,    22,    75,    21,    76,     3,    77,    40,
+    79,     3,    20,    80,    81,    30,    42,    83,    84,     1,
+    57,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    70,   nil,
+    63,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    19,   nil,   nil,   nil,   nil,    23,     7,
+    37,    21,    68,   nil,   nil,    66,   nil,     5,    36,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    24,
+   nil,   nil,   nil,    64,   nil,    64,   nil,    41,   nil,   nil,
+    53,    68,   nil,   nil,   nil,   nil,   nil,    38,   nil,   nil,
+    30,    30,    78,    30,   nil,    24,    28,    28,   nil,    28,
+    31,    29,   nil,    31,    29,   nil,   nil,   nil,    24,   nil,
+     3,    24,    21,    22,   nil,    21,   nil,    72,    85,   nil,
+    24,    36,   nil,    30,    64,    82,    35,    70,    64,    28,
+   nil,    53,    60,    47,    30,   nil,    53,   nil,    68,   nil,
+    28,   nil,    37,    21,    31,    29,    50,    37,    21,    36,
+   nil,    68,     2,    30,    30,   nil,    52,     2,   nil,    28,
+    28,    52,   nil,    30,    29,    29,   nil,    37,    21,    28,
+    32,    49,   nil,    31,    29,   nil,   nil,     2,    30,   nil,
+   nil,    52,   nil,   nil,    28,    21,    30,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    49,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    26,   nil,    30,   nil,    24,
+   nil,   nil,     4,    28,   nil,   nil,   nil,   nil,   nil,   nil,
+     4,   nil,    49,   nil,   nil,    37,    21,    24,    24,   nil,
+    24,    26,   nil,    37,    21,   nil,   nil,   nil,   nil,    52,
+     4,   nil,   nil,   nil,   nil,   nil,   nil,    52,   nil,    37,
+    21,   nil,   nil,    37,    21,   nil,    26,   nil,    62,     2,
+    24,   nil,   nil,    52,    30,   nil,   nil,    52,   nil,   nil,
+    28,    24,   nil,   nil,   nil,   nil,   nil,    30,   nil,     4,
+   nil,   nil,   nil,    28,   nil,    24,   nil,   nil,   nil,   nil,
+    24,    24,    37,    21,    54,     4,   nil,     4,   nil,    25,
+    24,   nil,    37,    21,    37,    21,    52,    27,    37,    21,
+    37,    21,     2,    54,     2,    24,    52,   nil,    52,   nil,
+   nil,   nil,    52,   nil,    52,    25,   nil,   nil,    54,    49,
+    49,   nil,    49,    27,   nil,   nil,   nil,   nil,    25,   nil,
+   nil,    25,   nil,   nil,    24,   nil,   nil,    54,   nil,   nil,
+    25,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    27,   nil,
+   nil,   nil,    49,    26,    26,   nil,    26,    54,   nil,   nil,
+   nil,   nil,   nil,    49,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    49,    49,   nil,   nil,    26,   nil,   nil,   nil,
+   nil,    24,    49,   nil,   nil,   nil,   nil,    26,   nil,   nil,
+   nil,   nil,   nil,   nil,    24,   nil,   nil,    49,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    26,    26,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    26,   nil,   nil,    25,
+   nil,    54,   nil,   nil,   nil,   nil,    49,   nil,   nil,   nil,
+   nil,    26,   nil,   nil,   nil,   nil,   nil,    25,    25,   nil,
+    25,   nil,   nil,   nil,    54,    27,    27,   nil,    27,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    26,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    25,   nil,   nil,    54,   nil,    54,   nil,    51,    27,   nil,
+   nil,    25,   nil,    49,    51,    51,   nil,   nil,   nil,    27,
+   nil,   nil,   nil,    54,   nil,    25,    49,   nil,   nil,   nil,
+    25,    25,   nil,   nil,   nil,   nil,   nil,   nil,    27,    27,
+    25,   nil,   nil,    51,   nil,   nil,   nil,    26,    27,   nil,
+   nil,    54,   nil,   nil,   nil,    25,   nil,   nil,   nil,   nil,
+    26,   nil,    51,    27,   nil,    51,   nil,   nil,    51,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    54,   nil,    54,   nil,    25,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    27,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    23,   nil,   nil,    47,    47,    47,    47,    47,
-    47,    47,    47,   nil,    47,    47,    47,   nil,   nil,    47,
-    47,    47,   nil,   nil,   nil,   nil,    23 ]
+   nil,   nil,   nil,   nil,   nil,   nil,    54,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    25,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    27,
+   nil,   nil,   nil,   nil,    25,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    27,   nil,    51,    51,    51,   nil,    51,    51,
+    51,    51,    51,    51,    51,   nil,    51,    51,    51,   nil,
+   nil,    51,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    51 ]
 racc_goto_pointer = [
-   nil,    25,     4,    20,   -28,    39,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    -3,  -118,
-     0,   214,    34,   257,   201,    36,    -4,   198,    12,    21,
-   -69,   -30,  -104,     1,   -36,   nil,    20,   -71,  -204,   nil,
-   nil,   nil,  -214,   -32,   nil,     8,   -23,   401,   -10,   101,
-   nil,  -168,   -28,  -238,  -209,    -4,  -122,  -143,   nil,  -129,
-   -90,  -126,  -159,    23,   -45,    19,    44,    14,     3,   -59,
-  -113,  -112,  -169,   -37 ]
+   nil,    89,    10,    26,   -13,     7,   nil,    -1,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    -7,
+    48,     1,    -1,  -136,   116,   346,   252,   354,   -15,   -10,
+   -21,   -11,     6,    19,   -64,   -33,  -124,     0,   -18,   nil,
+    57,   -16,  -153,   nil,   nil,   nil,  -189,   -22,   nil,   218,
+    -9,   528,    14,   -25,   335,   nil,  -166,   -12,  -285,   nil,
+   -54,  -120,   -23,  -249,   -13,  -157,  -173,   nil,  -147,  -121,
+  -171,  -203,   -28,    38,    18,   -80,    59,    23,     6,   -78,
+   -39,   -38,  -113,  -147,   -18,   -89,   nil ]
 racc_goto_default = [
-   nil,   nil,   nil,   173,     3,     7,    11,    13,    14,    17,
-    19,    22,    24,    29,    31,     2,     6,    10,   nil,    60,
-    79,    80,    81,    83,    86,    88,    74,    76,     9,   nil,
-   nil,   nil,   nil,    66,   nil,    28,   nil,   nil,   167,   244,
-   168,   169,   nil,   nil,   118,    82,    85,   nil,   108,    75,
-   128,   129,   nil,   209,   nil,    65,   nil,   nil,   240,    49,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    46,
-   nil,   nil,   nil,   nil ]
+   nil,   nil,   nil,   168,    25,    28,    32,    35,     5,     6,
+    10,    13,    15,    18,    20,    24,    27,    31,    34,     4,
+   nil,    99,   nil,    79,   101,   103,   105,   108,   109,   113,
+    95,    96,     8,   nil,   nil,   nil,   nil,    85,   nil,    30,
+   nil,   nil,   161,   239,   164,   165,   nil,   nil,   144,   107,
+   110,   111,    67,   134,    98,   150,   151,   nil,   248,   104,
+   nil,   nil,   nil,   nil,    69,   nil,   nil,   300,    80,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    57,
+   nil,   nil,   nil,   nil,   nil,   nil,   192 ]
 racc_token_table = {
  false => 0,
  Object.new => 1,
- :LBRACK => 2,
- :DQTEXT => 3,
- :SQTEXT => 4,
- :RBRACK => 5,
- :LBRACE => 6,
- :RBRACE => 7,
- :SYMBOL => 8,
- :FARROW => 9,
- :COMMA => 10,
- :TRUE => 11,
- :FALSE => 12,
- :EQUALS => 13,
- :APPENDS => 14,
- :LESSEQUAL => 15,
- :NOTEQUAL => 16,
- :DOT => 17,
- :COLON => 18,
- :LLCOLLECT => 19,
- :RRCOLLECT => 20,
- :QMARK => 21,
- :LPAREN => 22,
- :RPAREN => 23,
- :ISEQUAL => 24,
- :GREATEREQUAL => 25,
- :GREATERTHAN => 26,
- :LESSTHAN => 27,
- :IF => 28,
- :ELSE => 29,
- :IMPORT => 30,
- :DEFINE => 31,
- :ELSIF => 32,
- :VARIABLE => 33,
- :CLASS => 34,
- :INHERITS => 35,
- :NODE => 36,
- :BOOLEAN => 37,
- :NAME => 38,
- :SEMIC => 39,
- :CASE => 40,
- :DEFAULT => 41,
- :AT => 42,
- :LCOLLECT => 43,
- :RCOLLECT => 44,
- :CLASSNAME => 45,
- :CLASSREF => 46,
- :NOT => 47,
- :OR => 48,
- :AND => 49,
- :UNDEF => 50,
- :PARROW => 51,
- :PLUS => 52,
- :MINUS => 53,
- :TIMES => 54,
- :DIV => 55,
- :LSHIFT => 56,
- :RSHIFT => 57,
- :UMINUS => 58,
- :MATCH => 59,
- :NOMATCH => 60,
- :REGEX => 61 }
+ :STRING => 2,
+ :DQPRE => 3,
+ :DQMID => 4,
+ :DQPOST => 5,
+ :LBRACK => 6,
+ :RBRACK => 7,
+ :LBRACE => 8,
+ :RBRACE => 9,
+ :SYMBOL => 10,
+ :FARROW => 11,
+ :COMMA => 12,
+ :TRUE => 13,
+ :FALSE => 14,
+ :EQUALS => 15,
+ :APPENDS => 16,
+ :LESSEQUAL => 17,
+ :NOTEQUAL => 18,
+ :DOT => 19,
+ :COLON => 20,
+ :LLCOLLECT => 21,
+ :RRCOLLECT => 22,
+ :QMARK => 23,
+ :LPAREN => 24,
+ :RPAREN => 25,
+ :ISEQUAL => 26,
+ :GREATEREQUAL => 27,
+ :GREATERTHAN => 28,
+ :LESSTHAN => 29,
+ :IF => 30,
+ :ELSE => 31,
+ :IMPORT => 32,
+ :DEFINE => 33,
+ :ELSIF => 34,
+ :VARIABLE => 35,
+ :CLASS => 36,
+ :INHERITS => 37,
+ :NODE => 38,
+ :BOOLEAN => 39,
+ :NAME => 40,
+ :SEMIC => 41,
+ :CASE => 42,
+ :DEFAULT => 43,
+ :AT => 44,
+ :LCOLLECT => 45,
+ :RCOLLECT => 46,
+ :CLASSNAME => 47,
+ :CLASSREF => 48,
+ :NOT => 49,
+ :OR => 50,
+ :AND => 51,
+ :UNDEF => 52,
+ :PARROW => 53,
+ :PLUS => 54,
+ :MINUS => 55,
+ :TIMES => 56,
+ :DIV => 57,
+ :LSHIFT => 58,
+ :RSHIFT => 59,
+ :UMINUS => 60,
+ :MATCH => 61,
+ :NOMATCH => 62,
+ :REGEX => 63,
+ :IN_EDGE => 64,
+ :OUT_EDGE => 65,
+ :IN_EDGE_SUB => 66,
+ :OUT_EDGE_SUB => 67,
+ :IN => 68 }
 racc_use_result_var = true
-racc_nt_base = 62
+racc_nt_base = 69
 Racc_arg = [
  racc_action_table,
@@ -852,9 +1014,11 @@ Racc_arg = [
 Racc_token_to_s_table = [
 '$end',
 'error',
+'STRING',
+'DQPRE',
+'DQMID',
+'DQPOST',
 'LBRACK',
-'DQTEXT',
-'SQTEXT',
 'RBRACK',
 'LBRACE',
 'RBRACE',
@@ -912,6 +1076,11 @@ Racc_token_to_s_table = [
 'MATCH',
 'NOMATCH',
 'REGEX',
+'IN_EDGE',
+'OUT_EDGE',
+'IN_EDGE_SUB',
+'OUT_EDGE_SUB',
+'IN',
 '$start',
 'program',
 'statements',
@@ -922,7 +1091,7 @@ Racc_token_to_s_table = [
 'collection',
 'assignment',
 'casestatement',
-'ifstatement',
+'ifstatement_begin',
 'import',
 'fstatement',
 'definition',
@@ -930,9 +1099,12 @@ Racc_token_to_s_table = [
 'nodedef',
 'resourceoverride',
 'append',
+'relationship',
+'relationship_side',
+'edge',
+'resourceref',
 'funcvalues',
 'namestring',
-'resourceref',
 'name',
 'variable',
 'type',
@@ -940,6 +1112,7 @@ Racc_token_to_s_table = [
 'funcrvalue',
 'selector',
 'quotedtext',
+'hasharrayaccesses',
 'classname',
 'resourceinstances',
 'endsemi',
@@ -960,12 +1133,17 @@ Racc_token_to_s_table = [
 'undef',
 'array',
 'expression',
+'hasharrayaccess',
 'param',
 'rvalue',
 'addparam',
 'anyparam',
 'rvalues',
 'comma',
+'hash',
+'dqrval',
+'dqtail',
+'ifstatement',
 'else',
 'regex',
 'caseopts',
@@ -975,7 +1153,8 @@ Racc_token_to_s_table = [
 'svalues',
 'selectval',
 'sintvalues',
-'qtexts',
+'string',
+'strings',
 'argumentlist',
 'classparent',
 'hostnames',
@@ -985,7 +1164,10 @@ Racc_token_to_s_table = [
 'nothing',
 'arguments',
 'argument',
-'classnameordefault']
+'classnameordefault',
+'hashpairs',
+'hashpair',
+'key']
 Racc_debug_parser = false
@@ -993,7 +1175,7 @@ Racc_debug_parser = false
  # reduce 0 omitted
-module_eval <<'.,.,', 'grammar.ra', 44
+module_eval <<'.,.,', 'grammar.ra', 46
   def _reduce_1( val, _values, result )
     if val[0]
         # Make sure we always return an array.
@@ -1017,7 +1199,7 @@ module_eval <<'.,.,', 'grammar.ra', 44
  # reduce 3 omitted
-module_eval <<'.,.,', 'grammar.ra', 60
+module_eval <<'.,.,', 'grammar.ra', 62
   def _reduce_4( val, _values, result )
     if val[0] and val[1]
         if val[0].instance_of?(AST::ASTArray)
@@ -1060,8 +1242,38 @@ module_eval <<'.,.,', 'grammar.ra', 60
  # reduce 17 omitted
-module_eval <<'.,.,', 'grammar.ra', 84
-  def _reduce_18( val, _values, result )
+ # reduce 18 omitted
+module_eval <<'.,.,', 'grammar.ra', 82
+  def _reduce_19( val, _values, result )
+    result = AST::Relationship.new(val[0], val[2], val[1][:value], ast_context)
+   result
+  end
+.,.,
+module_eval <<'.,.,', 'grammar.ra', 85
+  def _reduce_20( val, _values, result )
+    result = AST::Relationship.new(val[0], val[2], val[1][:value], ast_context)
+   result
+  end
+.,.,
+ # reduce 21 omitted
+ # reduce 22 omitted
+ # reduce 23 omitted
+ # reduce 24 omitted
+ # reduce 25 omitted
+ # reduce 26 omitted
+ # reduce 27 omitted
+module_eval <<'.,.,', 'grammar.ra', 98
+  def _reduce_28( val, _values, result )
     args = aryfy(val[2])
     result = ast AST::Function,
         :name => val[0][:value],
@@ -1072,8 +1284,8 @@ module_eval <<'.,.,', 'grammar.ra', 84
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 92
-  def _reduce_19( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 106
+  def _reduce_29( val, _values, result )
     args = aryfy(val[2])
     result = ast AST::Function,
         :name => val[0][:value],
@@ -1084,8 +1296,8 @@ module_eval <<'.,.,', 'grammar.ra', 92
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 98
-  def _reduce_20( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 112
+  def _reduce_30( val, _values, result )
     result = ast AST::Function,
         :name => val[0][:value],
         :line => val[0][:line],
@@ -1095,8 +1307,8 @@ module_eval <<'.,.,', 'grammar.ra', 98
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 106
-  def _reduce_21( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 120
+  def _reduce_31( val, _values, result )
     args = aryfy(val[1])
     result = ast AST::Function,
         :name => val[0][:value],
@@ -1107,12 +1319,12 @@ module_eval <<'.,.,', 'grammar.ra', 106
   end
 .,.,
- # reduce 22 omitted
+ # reduce 32 omitted
- # reduce 23 omitted
+ # reduce 33 omitted
-module_eval <<'.,.,', 'grammar.ra', 114
-  def _reduce_24( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 128
+  def _reduce_34( val, _values, result )
     result = aryfy(val[0], val[2])
     result.line = @lexer.line
     result.file = @lexer.file
@@ -1120,8 +1332,8 @@ module_eval <<'.,.,', 'grammar.ra', 114
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 123
-  def _reduce_25( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 137
+  def _reduce_35( val, _values, result )
     unless val[0].is_a?(AST::ASTArray)
         val[0] = aryfy(val[0])
     end
@@ -1133,29 +1345,31 @@ module_eval <<'.,.,', 'grammar.ra', 123
   end
 .,.,
- # reduce 26 omitted
+ # reduce 36 omitted
- # reduce 27 omitted
+ # reduce 37 omitted
- # reduce 28 omitted
+ # reduce 38 omitted
- # reduce 29 omitted
+ # reduce 39 omitted
- # reduce 30 omitted
+ # reduce 40 omitted
- # reduce 31 omitted
+ # reduce 41 omitted
- # reduce 32 omitted
+ # reduce 42 omitted
+ # reduce 43 omitted
-module_eval <<'.,.,', 'grammar.ra', 136
-  def _reduce_33( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 151
+  def _reduce_44( val, _values, result )
                     result = ast AST::Name, :value => val[0][:value]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 158
-  def _reduce_34( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 173
+  def _reduce_45( val, _values, result )
     @lexer.commentpop
     array = val[2]
     if array.instance_of?(AST::ResourceInstance)
@@ -1173,38 +1387,39 @@ module_eval <<'.,.,', 'grammar.ra', 158
         result.push ast(AST::Resource,
             :type => val[0],
             :title => instance[0],
-            :params => instance[1])
+            :parameters => instance[1])
     }
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 161
-  def _reduce_35( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 176
+  def _reduce_46( val, _values, result )
     # This is a deprecated syntax.
     error "All resource specifications require names"
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 164
-  def _reduce_36( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 180
+  def _reduce_47( val, _values, result )
     # a defaults setting for a type
-    result = ast(AST::ResourceDefaults, :type => val[0], :params => val[2])
+    @lexer.commentpop
+    result = ast(AST::ResourceDefaults, :type => val[0], :parameters => val[2])
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 170
-  def _reduce_37( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 186
+  def _reduce_48( val, _values, result )
     @lexer.commentpop
-    result = ast AST::ResourceOverride, :object => val[0], :params => val[2]
+    result = ast AST::ResourceOverride, :object => val[0], :parameters => val[2]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 197
-  def _reduce_38( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 213
+  def _reduce_49( val, _values, result )
     type = val[0]
     if (type == :exported and ! Puppet[:storeconfigs]) and ! Puppet[:parseonly]
@@ -1231,22 +1446,23 @@ module_eval <<'.,.,', 'grammar.ra', 197
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 198
-  def _reduce_39( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 214
+  def _reduce_50( val, _values, result )
  result = :virtual
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 199
-  def _reduce_40( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 215
+  def _reduce_51( val, _values, result )
  result = :exported
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 223
-  def _reduce_41( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 240
+  def _reduce_52( val, _values, result )
+    @lexer.commentpop
     if val[0] =~ /^[a-z]/
         Puppet.warning addcontext("Collection names must now be capitalized")
     end
@@ -1269,8 +1485,8 @@ module_eval <<'.,.,', 'grammar.ra', 223
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 242
-  def _reduce_42( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 259
+  def _reduce_53( val, _values, result )
     if val[0] =~ /^[a-z]/
         Puppet.warning addcontext("Collection names must now be capitalized")
     end
@@ -1292,8 +1508,8 @@ module_eval <<'.,.,', 'grammar.ra', 242
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 252
-  def _reduce_43( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 269
+  def _reduce_54( val, _values, result )
     if val[1]
         result = val[1]
         result.form = :virtual
@@ -1304,8 +1520,8 @@ module_eval <<'.,.,', 'grammar.ra', 252
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 260
-  def _reduce_44( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 277
+  def _reduce_55( val, _values, result )
     if val[1]
         result = val[1]
         result.form = :exported
@@ -1316,43 +1532,43 @@ module_eval <<'.,.,', 'grammar.ra', 260
   end
 .,.,
- # reduce 45 omitted
+ # reduce 56 omitted
- # reduce 46 omitted
+ # reduce 57 omitted
-module_eval <<'.,.,', 'grammar.ra', 268
-  def _reduce_47( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 285
+  def _reduce_58( val, _values, result )
     result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2]
    result
   end
 .,.,
- # reduce 48 omitted
+ # reduce 59 omitted
-module_eval <<'.,.,', 'grammar.ra', 274
-  def _reduce_49( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 291
+  def _reduce_60( val, _values, result )
     result = val[1]
     result.parens = true
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 275
-  def _reduce_50( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 292
+  def _reduce_61( val, _values, result )
  result=val[0][:value]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 276
-  def _reduce_51( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 293
+  def _reduce_62( val, _values, result )
  result=val[0][:value]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 283
-  def _reduce_52( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 300
+  def _reduce_63( val, _values, result )
     result = ast AST::CollExpr, :test1 => val[0], :oper => val[1][:value], :test2 => val[2]
     #result = ast AST::CollExpr
     #result.push *val
@@ -1360,8 +1576,8 @@ module_eval <<'.,.,', 'grammar.ra', 283
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 288
-  def _reduce_53( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 305
+  def _reduce_64( val, _values, result )
     result = ast AST::CollExpr, :test1 => val[0], :oper => val[1][:value], :test2 => val[2]
     #result = ast AST::CollExpr
     #result.push *val
@@ -1369,21 +1585,21 @@ module_eval <<'.,.,', 'grammar.ra', 288
   end
 .,.,
- # reduce 54 omitted
+ # reduce 65 omitted
- # reduce 55 omitted
+ # reduce 66 omitted
-module_eval <<'.,.,', 'grammar.ra', 295
-  def _reduce_56( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 312
+  def _reduce_67( val, _values, result )
     result = ast AST::ResourceInstance, :children => [val[0],val[2]]
    result
   end
 .,.,
- # reduce 57 omitted
+ # reduce 68 omitted
-module_eval <<'.,.,', 'grammar.ra', 305
-  def _reduce_58( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 322
+  def _reduce_69( val, _values, result )
     if val[0].instance_of?(AST::ResourceInstance)
         result = ast AST::ASTArray, :children => [val[0],val[2]]
     else
@@ -1394,45 +1610,47 @@ module_eval <<'.,.,', 'grammar.ra', 305
   end
 .,.,
- # reduce 59 omitted
+ # reduce 70 omitted
- # reduce 60 omitted
+ # reduce 71 omitted
-module_eval <<'.,.,', 'grammar.ra', 312
-  def _reduce_61( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 329
+  def _reduce_72( val, _values, result )
     result = ast AST::Undef, :value => :undef
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 316
-  def _reduce_62( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 333
+  def _reduce_73( val, _values, result )
     result = ast AST::Name, :value => val[0][:value], :line => val[0][:line]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 320
-  def _reduce_63( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 337
+  def _reduce_74( val, _values, result )
     result = ast AST::Type, :value => val[0][:value], :line => val[0][:line]
    result
   end
 .,.,
- # reduce 64 omitted
+ # reduce 75 omitted
- # reduce 65 omitted
+ # reduce 76 omitted
- # reduce 66 omitted
+ # reduce 77 omitted
+ # reduce 78 omitted
- # reduce 67 omitted
+ # reduce 79 omitted
- # reduce 68 omitted
+ # reduce 80 omitted
- # reduce 69 omitted
+ # reduce 81 omitted
-module_eval <<'.,.,', 'grammar.ra', 336
-  def _reduce_70( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 354
+  def _reduce_82( val, _values, result )
     if val[0][:value] =~ /::/
         raise Puppet::ParseError, "Cannot assign to variables in other namespaces"
     end
@@ -1443,30 +1661,37 @@ module_eval <<'.,.,', 'grammar.ra', 336
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 341
-  def _reduce_71( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 357
+  def _reduce_83( val, _values, result )
+    result = ast AST::VarDef, :name => val[0], :value => val[2]
+   result
+  end
+.,.,
+module_eval <<'.,.,', 'grammar.ra', 362
+  def _reduce_84( val, _values, result )
     variable = ast AST::Name, :value => val[0][:value], :line => val[0][:line]
     result = ast AST::VarDef, :name => variable, :value => val[2], :append => true, :line => val[0][:line]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 346
-  def _reduce_72( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 367
+  def _reduce_85( val, _values, result )
     result = ast AST::ASTArray
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 346
-  def _reduce_73( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 367
+  def _reduce_86( val, _values, result )
  result = val[0]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 355
-  def _reduce_74( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 376
+  def _reduce_87( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1477,41 +1702,41 @@ module_eval <<'.,.,', 'grammar.ra', 355
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 359
-  def _reduce_75( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 380
+  def _reduce_88( val, _values, result )
     result = ast AST::ResourceParam, :param => val[0][:value], :line => val[0][:line], :value => val[2]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 364
-  def _reduce_76( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 385
+  def _reduce_89( val, _values, result )
     result = ast AST::ResourceParam, :param => val[0][:value], :line => val[0][:line], :value => val[2],
                                      :add => true
    result
   end
 .,.,
- # reduce 77 omitted
+ # reduce 90 omitted
- # reduce 78 omitted
+ # reduce 91 omitted
-module_eval <<'.,.,', 'grammar.ra', 372
-  def _reduce_79( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 393
+  def _reduce_92( val, _values, result )
     result = ast AST::ASTArray
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 372
-  def _reduce_80( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 393
+  def _reduce_93( val, _values, result )
  result = val[0]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 381
-  def _reduce_81( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 402
+  def _reduce_94( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1522,10 +1747,10 @@ module_eval <<'.,.,', 'grammar.ra', 381
   end
 .,.,
- # reduce 82 omitted
+ # reduce 95 omitted
-module_eval <<'.,.,', 'grammar.ra', 390
-  def _reduce_83( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 411
+  def _reduce_96( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         result = val[0].push(val[2])
     else
@@ -1535,40 +1760,44 @@ module_eval <<'.,.,', 'grammar.ra', 390
   end
 .,.,
- # reduce 84 omitted
+ # reduce 97 omitted
- # reduce 85 omitted
+ # reduce 98 omitted
- # reduce 86 omitted
+ # reduce 99 omitted
- # reduce 87 omitted
+ # reduce 100 omitted
- # reduce 88 omitted
+ # reduce 101 omitted
- # reduce 89 omitted
+ # reduce 102 omitted
- # reduce 90 omitted
+ # reduce 103 omitted
- # reduce 91 omitted
+ # reduce 104 omitted
- # reduce 92 omitted
+ # reduce 105 omitted
- # reduce 93 omitted
+ # reduce 106 omitted
- # reduce 94 omitted
+ # reduce 107 omitted
- # reduce 95 omitted
+ # reduce 108 omitted
- # reduce 96 omitted
+ # reduce 109 omitted
- # reduce 97 omitted
+ # reduce 110 omitted
- # reduce 98 omitted
+ # reduce 111 omitted
- # reduce 99 omitted
+ # reduce 112 omitted
+ # reduce 113 omitted
-module_eval <<'.,.,', 'grammar.ra', 417
-  def _reduce_100( val, _values, result )
+ # reduce 114 omitted
+module_eval <<'.,.,', 'grammar.ra', 440
+  def _reduce_115( val, _values, result )
     args = aryfy(val[2])
     result = ast AST::Function,
         :name => val[0][:value], :line => val[0][:line],
@@ -1578,8 +1807,8 @@ module_eval <<'.,.,', 'grammar.ra', 417
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 422
-  def _reduce_101( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 445
+  def _reduce_116( val, _values, result )
     result = ast AST::Function,
         :name => val[0][:value], :line => val[0][:line],
         :arguments => AST::ASTArray.new({}),
@@ -1588,52 +1817,80 @@ module_eval <<'.,.,', 'grammar.ra', 422
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 426
-  def _reduce_102( val, _values, result )
-    result = ast AST::String, :value => val[0][:value], :line => val[0][:line]
+module_eval <<'.,.,', 'grammar.ra', 446
+  def _reduce_117( val, _values, result )
+ result = ast AST::String, :value => val[0][:value],                  :line => val[0][:line]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 428
-  def _reduce_103( val, _values, result )
-    result = ast AST::FlatString, :value => val[0][:value], :line => val[0][:line]
+module_eval <<'.,.,', 'grammar.ra', 447
+  def _reduce_118( val, _values, result )
+ result = ast AST::Concat, :value => [ast(AST::String,val[0])]+val[1], :line => val[0][:line]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 432
-  def _reduce_104( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 449
+  def _reduce_119( val, _values, result )
+ result = [val[0]] + val[1]
+   result
+  end
+.,.,
+module_eval <<'.,.,', 'grammar.ra', 451
+  def _reduce_120( val, _values, result )
+ result = [ast(AST::String,val[0])]
+   result
+  end
+.,.,
+module_eval <<'.,.,', 'grammar.ra', 452
+  def _reduce_121( val, _values, result )
+ result = [ast(AST::String,val[0])] + val[1]
+   result
+  end
+.,.,
+module_eval <<'.,.,', 'grammar.ra', 457
+  def _reduce_122( val, _values, result )
     result = ast AST::Boolean, :value => val[0][:value], :line => val[0][:line]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 437
-  def _reduce_105( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 462
+  def _reduce_123( val, _values, result )
     Puppet.warning addcontext("Deprecation notice:  Resource references should now be capitalized")
     result = ast AST::ResourceReference, :type => val[0][:value], :line => val[0][:line], :title => val[2]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 439
-  def _reduce_106( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 464
+  def _reduce_124( val, _values, result )
     result = ast AST::ResourceReference, :type => val[0], :title => val[2]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 453
-  def _reduce_107( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 468
+  def _reduce_125( val, _values, result )
+    result = val[1]
+   result
+  end
+.,.,
+module_eval <<'.,.,', 'grammar.ra', 482
+  def _reduce_126( val, _values, result )
     @lexer.commentpop
     args = {
-        :test => val[1],
-        :statements => val[3]
+        :test => val[0],
+        :statements => val[2]
     }
-    if val[5]
-        args[:else] = val[5]
+    if val[4]
+        args[:else] = val[4]
     end
     result = ast AST::IfStatement, args
@@ -1641,16 +1898,16 @@ module_eval <<'.,.,', 'grammar.ra', 453
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 466
-  def _reduce_108( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 495
+  def _reduce_127( val, _values, result )
     @lexer.commentpop
     args = {
-        :test => val[1],
+        :test => val[0],
         :statements => ast(AST::Nop)
     }
-    if val[4]
-        args[:else] = val[4]
+    if val[3]
+        args[:else] = val[3]
     end
     result = ast AST::IfStatement, args
@@ -1658,161 +1915,176 @@ module_eval <<'.,.,', 'grammar.ra', 466
   end
 .,.,
- # reduce 109 omitted
+ # reduce 128 omitted
-module_eval <<'.,.,', 'grammar.ra', 472
-  def _reduce_110( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 501
+  def _reduce_129( val, _values, result )
+                #@lexer.commentpop
+    result = ast AST::Else, :statements => val[1]
+   result
+  end
+.,.,
+module_eval <<'.,.,', 'grammar.ra', 505
+  def _reduce_130( val, _values, result )
     @lexer.commentpop
     result = ast AST::Else, :statements => val[2]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 476
-  def _reduce_111( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 509
+  def _reduce_131( val, _values, result )
     @lexer.commentpop
     result = ast AST::Else, :statements => ast(AST::Nop)
    result
   end
 .,.,
- # reduce 112 omitted
+ # reduce 132 omitted
+module_eval <<'.,.,', 'grammar.ra', 526
+  def _reduce_133( val, _values, result )
+    result = ast AST::InOperator, :lval => val[0], :rval => val[2]
+   result
+  end
+.,.,
-module_eval <<'.,.,', 'grammar.ra', 493
-  def _reduce_113( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 529
+  def _reduce_134( val, _values, result )
     result = ast AST::MatchOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 496
-  def _reduce_114( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 532
+  def _reduce_135( val, _values, result )
     result = ast AST::MatchOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 499
-  def _reduce_115( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 535
+  def _reduce_136( val, _values, result )
     result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 502
-  def _reduce_116( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 538
+  def _reduce_137( val, _values, result )
     result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 505
-  def _reduce_117( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 541
+  def _reduce_138( val, _values, result )
     result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 508
-  def _reduce_118( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 544
+  def _reduce_139( val, _values, result )
     result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 511
-  def _reduce_119( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 547
+  def _reduce_140( val, _values, result )
     result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 514
-  def _reduce_120( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 550
+  def _reduce_141( val, _values, result )
     result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 517
-  def _reduce_121( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 553
+  def _reduce_142( val, _values, result )
     result = ast AST::Minus, :value => val[1]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 520
-  def _reduce_122( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 556
+  def _reduce_143( val, _values, result )
     result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 523
-  def _reduce_123( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 559
+  def _reduce_144( val, _values, result )
     result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 526
-  def _reduce_124( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 562
+  def _reduce_145( val, _values, result )
     result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 529
-  def _reduce_125( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 565
+  def _reduce_146( val, _values, result )
     result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 532
-  def _reduce_126( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 568
+  def _reduce_147( val, _values, result )
     result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 535
-  def _reduce_127( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 571
+  def _reduce_148( val, _values, result )
     result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 538
-  def _reduce_128( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 574
+  def _reduce_149( val, _values, result )
     result = ast AST::Not, :value => val[1]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 541
-  def _reduce_129( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 577
+  def _reduce_150( val, _values, result )
     result = ast AST::BooleanOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 544
-  def _reduce_130( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 580
+  def _reduce_151( val, _values, result )
     result = ast AST::BooleanOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 547
-  def _reduce_131( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 583
+  def _reduce_152( val, _values, result )
     result = val[1]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 556
-  def _reduce_132( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 592
+  def _reduce_153( val, _values, result )
     @lexer.commentpop
     options = val[3]
     unless options.instance_of?(AST::ASTArray)
@@ -1823,10 +2095,10 @@ module_eval <<'.,.,', 'grammar.ra', 556
   end
 .,.,
- # reduce 133 omitted
+ # reduce 154 omitted
-module_eval <<'.,.,', 'grammar.ra', 566
-  def _reduce_134( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 602
+  def _reduce_155( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push val[1]
         result = val[0]
@@ -1837,16 +2109,16 @@ module_eval <<'.,.,', 'grammar.ra', 566
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 571
-  def _reduce_135( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 607
+  def _reduce_156( val, _values, result )
     @lexer.commentpop
     result = ast AST::CaseOpt, :value => val[0], :statements => val[3]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 577
-  def _reduce_136( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 613
+  def _reduce_157( val, _values, result )
     @lexer.commentpop
     result = ast(AST::CaseOpt,
         :value => val[0],
@@ -1856,10 +2128,10 @@ module_eval <<'.,.,', 'grammar.ra', 577
   end
 .,.,
- # reduce 137 omitted
+ # reduce 158 omitted
-module_eval <<'.,.,', 'grammar.ra', 587
-  def _reduce_138( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 623
+  def _reduce_159( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1870,27 +2142,27 @@ module_eval <<'.,.,', 'grammar.ra', 587
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 591
-  def _reduce_139( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 627
+  def _reduce_160( val, _values, result )
     result = ast AST::Selector, :param => val[0], :values => val[2]
    result
   end
 .,.,
- # reduce 140 omitted
+ # reduce 161 omitted
-module_eval <<'.,.,', 'grammar.ra', 597
-  def _reduce_141( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 633
+  def _reduce_162( val, _values, result )
     @lexer.commentpop
     result = val[1]
    result
   end
 .,.,
- # reduce 142 omitted
+ # reduce 163 omitted
-module_eval <<'.,.,', 'grammar.ra', 607
-  def _reduce_143( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 643
+  def _reduce_164( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1901,52 +2173,54 @@ module_eval <<'.,.,', 'grammar.ra', 607
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 611
-  def _reduce_144( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 647
+  def _reduce_165( val, _values, result )
     result = ast AST::ResourceParam, :param => val[0], :value => val[2]
    result
   end
 .,.,
- # reduce 145 omitted
+ # reduce 166 omitted
- # reduce 146 omitted
+ # reduce 167 omitted
- # reduce 147 omitted
+ # reduce 168 omitted
- # reduce 148 omitted
+ # reduce 169 omitted
- # reduce 149 omitted
+ # reduce 170 omitted
- # reduce 150 omitted
+ # reduce 171 omitted
- # reduce 151 omitted
+ # reduce 172 omitted
-module_eval <<'.,.,', 'grammar.ra', 622
-  def _reduce_152( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 658
+  def _reduce_173( val, _values, result )
     result = ast AST::Default, :value => val[0][:value], :line => val[0][:line]
    result
   end
 .,.,
- # reduce 153 omitted
+ # reduce 174 omitted
-module_eval <<'.,.,', 'grammar.ra', 625
-  def _reduce_154( val, _values, result )
- result = [val[0].value]
+module_eval <<'.,.,', 'grammar.ra', 661
+  def _reduce_175( val, _values, result )
+ result = [val[0][:value]]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 629
-  def _reduce_155( val, _values, result )
-    results = val[0] << val[2].value
+ # reduce 176 omitted
+module_eval <<'.,.,', 'grammar.ra', 663
+  def _reduce_177( val, _values, result )
+ result = val[0] += val[2]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 637
-  def _reduce_156( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 672
+  def _reduce_178( val, _values, result )
     val[1].each do |file|
         import(file)
     end
@@ -1956,8 +2230,8 @@ module_eval <<'.,.,', 'grammar.ra', 637
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 648
-  def _reduce_157( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 683
+  def _reduce_179( val, _values, result )
     @lexer.commentpop
     newdefine classname(val[1]), :arguments => val[2], :code => val[4], :line => val[0][:line]
     @lexer.indefine = false
@@ -1968,8 +2242,8 @@ module_eval <<'.,.,', 'grammar.ra', 648
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 653
-  def _reduce_158( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 688
+  def _reduce_180( val, _values, result )
     @lexer.commentpop
     newdefine classname(val[1]), :arguments => val[2], :line => val[0][:line]
     @lexer.indefine = false
@@ -1978,30 +2252,30 @@ module_eval <<'.,.,', 'grammar.ra', 653
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 662
-  def _reduce_159( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 697
+  def _reduce_181( val, _values, result )
     @lexer.commentpop
     # Our class gets defined in the parent namespace, not our own.
     @lexer.namepop
-    newclass classname(val[1]), :code => val[4], :parent => val[2], :line => val[0][:line]
+    newclass classname(val[1]), :arguments => val[2], :parent => val[3], :code => val[5], :line => val[0][:line]
     result = nil
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 668
-  def _reduce_160( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 703
+  def _reduce_182( val, _values, result )
     @lexer.commentpop
     # Our class gets defined in the parent namespace, not our own.
     @lexer.namepop
-    newclass classname(val[1]), :parent => val[2], :line => val[0][:line]
+    newclass classname(val[1]), :arguments => val[2], :parent => val[3], :line => val[0][:line]
     result = nil
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 674
-  def _reduce_161( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 709
+  def _reduce_183( val, _values, result )
     @lexer.commentpop
     newnode val[1], :parent => val[2], :code => val[4], :line => val[0][:line]
     result = nil
@@ -2009,8 +2283,8 @@ module_eval <<'.,.,', 'grammar.ra', 674
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 678
-  def _reduce_162( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 713
+  def _reduce_184( val, _values, result )
     @lexer.commentpop
     newnode val[1], :parent => val[2], :line => val[0][:line]
     result = nil
@@ -2018,31 +2292,38 @@ module_eval <<'.,.,', 'grammar.ra', 678
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 679
-  def _reduce_163( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 714
+  def _reduce_185( val, _values, result )
  result = val[0][:value]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 681
-  def _reduce_164( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 716
+  def _reduce_186( val, _values, result )
  result = val[0][:value]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 682
-  def _reduce_165( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 717
+  def _reduce_187( val, _values, result )
  result = val[0][:value]
    result
   end
 .,.,
- # reduce 166 omitted
+module_eval <<'.,.,', 'grammar.ra', 718
+  def _reduce_188( val, _values, result )
+ result = "class"
+   result
+  end
+.,.,
-module_eval <<'.,.,', 'grammar.ra', 692
-  def _reduce_167( val, _values, result )
+ # reduce 189 omitted
+module_eval <<'.,.,', 'grammar.ra', 728
+  def _reduce_190( val, _values, result )
     result = val[0]
     result = [result] unless result.is_a?(Array)
     result << val[2]
@@ -2050,78 +2331,71 @@ module_eval <<'.,.,', 'grammar.ra', 692
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 696
-  def _reduce_168( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 732
+  def _reduce_191( val, _values, result )
     result = ast AST::HostName, :value => val[0]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 697
-  def _reduce_169( val, _values, result )
- result = val[0][:value]
-   result
-  end
-.,.,
-module_eval <<'.,.,', 'grammar.ra', 698
-  def _reduce_170( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 733
+  def _reduce_192( val, _values, result )
  result = val[0][:value]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 699
-  def _reduce_171( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 734
+  def _reduce_193( val, _values, result )
  result = val[0][:value]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 700
-  def _reduce_172( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 735
+  def _reduce_194( val, _values, result )
  result = val[0][:value]
    result
   end
 .,.,
- # reduce 173 omitted
+ # reduce 195 omitted
-module_eval <<'.,.,', 'grammar.ra', 706
-  def _reduce_174( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 741
+  def _reduce_196( val, _values, result )
     result = nil
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 710
-  def _reduce_175( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 745
+  def _reduce_197( val, _values, result )
     result = ast AST::ASTArray, :children => []
    result
   end
 .,.,
- # reduce 176 omitted
+ # reduce 198 omitted
-module_eval <<'.,.,', 'grammar.ra', 715
-  def _reduce_177( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 750
+  def _reduce_199( val, _values, result )
     result = nil
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 719
-  def _reduce_178( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 754
+  def _reduce_200( val, _values, result )
     result = val[1]
     result = [result] unless result[0].is_a?(Array)
    result
   end
 .,.,
- # reduce 179 omitted
+ # reduce 201 omitted
-module_eval <<'.,.,', 'grammar.ra', 726
-  def _reduce_180( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 761
+  def _reduce_202( val, _values, result )
     result = val[0]
     result = [result] unless result[0].is_a?(Array)
     result << val[2]
@@ -2129,67 +2403,67 @@ module_eval <<'.,.,', 'grammar.ra', 726
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 731
-  def _reduce_181( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 766
+  def _reduce_203( val, _values, result )
     Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
     result = [val[0][:value], val[2]]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 735
-  def _reduce_182( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 770
+  def _reduce_204( val, _values, result )
     Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
     result = [val[0][:value]]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 737
-  def _reduce_183( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 772
+  def _reduce_205( val, _values, result )
     result = [val[0][:value], val[2]]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 739
-  def _reduce_184( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 774
+  def _reduce_206( val, _values, result )
     result = [val[0][:value]]
    result
   end
 .,.,
- # reduce 185 omitted
+ # reduce 207 omitted
-module_eval <<'.,.,', 'grammar.ra', 744
-  def _reduce_186( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 779
+  def _reduce_208( val, _values, result )
     result = val[1]
    result
   end
 .,.,
- # reduce 187 omitted
+ # reduce 209 omitted
-module_eval <<'.,.,', 'grammar.ra', 749
-  def _reduce_188( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 784
+  def _reduce_210( val, _values, result )
     result = val[1]
    result
   end
 .,.,
- # reduce 189 omitted
+ # reduce 211 omitted
- # reduce 190 omitted
+ # reduce 212 omitted
-module_eval <<'.,.,', 'grammar.ra', 755
-  def _reduce_191( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 790
+  def _reduce_213( val, _values, result )
     result = ast AST::Variable, :value => val[0][:value], :line => val[0][:line]
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 763
-  def _reduce_192( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 798
+  def _reduce_214( val, _values, result )
     if val[1].instance_of?(AST::ASTArray)
         result = val[1]
     else
@@ -2199,8 +2473,8 @@ module_eval <<'.,.,', 'grammar.ra', 763
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 770
-  def _reduce_193( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 805
+  def _reduce_215( val, _values, result )
     if val[1].instance_of?(AST::ASTArray)
         result = val[1]
     else
@@ -2210,33 +2484,113 @@ module_eval <<'.,.,', 'grammar.ra', 770
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 772
-  def _reduce_194( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 807
+  def _reduce_216( val, _values, result )
     result = ast AST::ASTArray
    result
   end
 .,.,
- # reduce 195 omitted
+ # reduce 217 omitted
- # reduce 196 omitted
+ # reduce 218 omitted
- # reduce 197 omitted
+ # reduce 219 omitted
-module_eval <<'.,.,', 'grammar.ra', 777
-  def _reduce_198( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 812
+  def _reduce_220( val, _values, result )
  result = nil
    result
   end
 .,.,
-module_eval <<'.,.,', 'grammar.ra', 782
-  def _reduce_199( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 817
+  def _reduce_221( val, _values, result )
     result = ast AST::Regex, :value => val[0][:value]
    result
   end
 .,.,
+module_eval <<'.,.,', 'grammar.ra', 825
+  def _reduce_222( val, _values, result )
+    if val[1].instance_of?(AST::ASTHash)
+        result = val[1]
+    else
+        result = ast AST::ASTHash, { :value => val[1] }
+    end
+   result
+  end
+.,.,
+module_eval <<'.,.,', 'grammar.ra', 832
+  def _reduce_223( val, _values, result )
+    if val[1].instance_of?(AST::ASTHash)
+        result = val[1]
+    else
+        result = ast AST::ASTHash, { :value => val[1] }
+    end
+   result
+  end
+.,.,
+module_eval <<'.,.,', 'grammar.ra', 834
+  def _reduce_224( val, _values, result )
+    result = ast AST::ASTHash
+   result
+  end
+.,.,
+ # reduce 225 omitted
+module_eval <<'.,.,', 'grammar.ra', 844
+  def _reduce_226( val, _values, result )
+    if val[0].instance_of?(AST::ASTHash)
+        result = val[0].merge(val[2])
+    else
+        result = ast AST::ASTHash, :value => val[0]
+        result.merge(val[2])
+    end
+   result
+  end
+.,.,
+module_eval <<'.,.,', 'grammar.ra', 848
+  def _reduce_227( val, _values, result )
+    result = ast AST::ASTHash, { :value => { val[0] => val[2] } }
+   result
+  end
+.,.,
+module_eval <<'.,.,', 'grammar.ra', 849
+  def _reduce_228( val, _values, result )
+ result = val[0][:value]
+   result
+  end
+.,.,
+module_eval <<'.,.,', 'grammar.ra', 850
+  def _reduce_229( val, _values, result )
+ result = val[0]
+   result
+  end
+.,.,
+module_eval <<'.,.,', 'grammar.ra', 855
+  def _reduce_230( val, _values, result )
+    result = ast AST::HashOrArrayAccess, :variable => val[0][:value], :key => val[2]
+   result
+  end
+.,.,
+ # reduce 231 omitted
+module_eval <<'.,.,', 'grammar.ra', 860
+  def _reduce_232( val, _values, result )
+    result = ast AST::HashOrArrayAccess, :variable => val[0], :key => val[2]
+   result
+  end
+.,.,
  def _reduce_none( val, _values, result )
   result
  end