RubyGems - puppet - Versions diffs - 3.8.7 → 4.0.0.rc1 - Mend

puppet 3.8.7 → 4.0.0.rc1

Potentially problematic release.

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

Files changed (1586) hide show

data/CONTRIBUTING.md +26 -11
data/Gemfile +13 -25
data/LICENSE +1 -1
data/Rakefile +9 -0
data/bin/puppet +7 -6
data/conf/auth.conf +30 -26
data/conf/environment.conf +16 -0
data/conf/fileserver.conf +2 -2
data/conf/puppet.conf +6 -0
data/ext/README.environment +1 -1
data/ext/build_defaults.yaml +16 -7
data/ext/debian/control +5 -5
data/ext/debian/puppet-common.manpages +0 -5
data/ext/debian/puppet-common.postinst +3 -3
data/ext/debian/puppet.init +23 -12
data/ext/debian/puppet.logrotate +1 -2
data/ext/debian/puppetmaster-common.postinst +6 -0
data/ext/debian/puppetmaster.init +5 -5
data/ext/debian/rules +4 -1
data/ext/debian/vim-puppet.dirs +2 -0
data/ext/debian/vim-puppet.yaml +2 -0
data/ext/emacs/puppet-mode.el +0 -1
data/ext/gentoo/conf.d/puppet +1 -1
data/ext/gentoo/conf.d/puppetmaster +1 -1
data/ext/nagios/check_puppet.rb +1 -1
data/ext/project_data.yaml +6 -7
data/ext/puppet-nm-dispatcher +13 -0
data/ext/puppet-test +0 -66
data/ext/puppetlisten/puppetlisten.rb +7 -5
data/ext/rack/config.ru +12 -5
data/ext/redhat/client.init +3 -3
data/ext/redhat/logrotate +1 -2
data/ext/redhat/puppet.spec.erb +12 -8
data/ext/redhat/server.init +1 -1
data/ext/regexp_nodes/regexp_nodes.rb +1 -1
data/ext/solaris/smf/svc-puppetd +1 -1
data/ext/solaris/smf/svc-puppetmasterd +1 -1
data/ext/suse/client.init +1 -1
data/ext/suse/server.init +1 -1
data/ext/systemd/puppet.service +1 -3
data/ext/vim/syntax/puppet.vim +1 -1
data/ext/windows/service/daemon.rb +19 -2
data/install.rb +63 -7
data/lib/hiera/puppet_function.rb +7 -18
data/lib/hiera/scope.rb +4 -1
data/lib/puppet.rb +19 -51
data/lib/puppet/agent.rb +2 -6
data/lib/puppet/application.rb +14 -65
data/lib/puppet/application/agent.rb +7 -56
data/lib/puppet/application/apply.rb +1 -6
data/lib/puppet/application/ca.rb +5 -0
data/lib/puppet/application/cert.rb +7 -3
data/lib/puppet/application/certificate.rb +2 -0
data/lib/puppet/application/device.rb +10 -36
data/lib/puppet/application/doc.rb +16 -63
data/lib/puppet/application/epp.rb +5 -0
data/lib/puppet/application/face_base.rb +24 -5
data/lib/puppet/application/master.rb +2 -5
data/lib/puppet/application/resource.rb +17 -17
data/lib/puppet/application_support.rb +57 -0
data/lib/puppet/configurer.rb +3 -7
data/lib/puppet/configurer/downloader.rb +1 -0
data/lib/puppet/configurer/fact_handler.rb +1 -1
data/lib/puppet/daemon.rb +6 -15
data/lib/puppet/data_providers.rb +28 -0
data/lib/puppet/data_providers/data_adapter.rb +86 -0
data/lib/puppet/data_providers/data_function_support.rb +32 -0
data/lib/puppet/data_providers/function_env_data_provider.rb +28 -0
data/lib/puppet/data_providers/function_module_data_provider.rb +44 -0
data/lib/puppet/defaults.rb +135 -530
data/lib/puppet/environments.rb +10 -156
data/lib/puppet/error.rb +4 -30
data/lib/puppet/external/nagios/base.rb +2 -2
data/lib/puppet/external/pson/common.rb +2 -17
data/lib/puppet/external/pson/pure/generator.rb +1 -0
data/lib/puppet/external/pson/pure/parser.rb +0 -11
data/lib/puppet/face/catalog.rb +4 -4
data/lib/puppet/face/certificate.rb +2 -3
data/lib/puppet/face/certificate_request.rb +4 -3
data/lib/puppet/face/certificate_revocation_list.rb +5 -9
data/lib/puppet/face/config.rb +2 -2
data/lib/puppet/face/epp.rb +479 -0
data/lib/puppet/face/facts.rb +6 -49
data/lib/puppet/face/file.rb +2 -2
data/lib/puppet/face/file/download.rb +1 -2
data/lib/puppet/face/help.rb +2 -3
data/lib/puppet/face/module/build.rb +5 -5
data/lib/puppet/face/module/changes.rb +1 -1
data/lib/puppet/face/module/generate.rb +6 -6
data/lib/puppet/face/module/install.rb +16 -16
data/lib/puppet/face/module/list.rb +9 -9
data/lib/puppet/face/module/uninstall.rb +5 -5
data/lib/puppet/face/module/upgrade.rb +3 -3
data/lib/puppet/face/node.rb +3 -4
data/lib/puppet/face/node/clean.rb +5 -68
data/lib/puppet/face/parser.rb +6 -8
data/lib/puppet/face/report.rb +4 -4
data/lib/puppet/face/resource.rb +1 -1
data/lib/puppet/face/resource_type.rb +7 -4
data/lib/puppet/face/status.rb +6 -12
data/lib/puppet/feature/base.rb +0 -7
data/lib/puppet/file_bucket/dipper.rb +1 -2
data/lib/puppet/file_bucket/file.rb +12 -25
data/lib/puppet/file_serving/base.rb +1 -11
data/lib/puppet/file_serving/content.rb +5 -7
data/lib/puppet/file_serving/metadata.rb +4 -61
data/lib/puppet/file_serving/mount/pluginfacts.rb +1 -1
data/lib/puppet/file_serving/mount/plugins.rb +1 -1
data/lib/puppet/file_serving/terminus_helper.rb +16 -5
data/lib/puppet/file_system.rb +6 -22
data/lib/puppet/file_system/file_impl.rb +0 -4
data/lib/puppet/file_system/memory_file.rb +0 -5
data/lib/puppet/file_system/memory_impl.rb +0 -4
data/lib/puppet/file_system/{file19.rb → posix.rb} +1 -1
data/lib/puppet/file_system/{file19windows.rb → windows.rb} +2 -10
data/lib/puppet/forge/repository.rb +12 -8
data/lib/puppet/functions.rb +17 -51
data/lib/puppet/functions/assert_type.rb +7 -7
data/lib/puppet/functions/each.rb +1 -3
data/lib/puppet/functions/epp.rb +3 -3
data/lib/puppet/functions/filter.rb +3 -5
data/lib/puppet/functions/hiera.rb +2 -23
data/lib/puppet/functions/hiera_array.rb +3 -25
data/lib/puppet/functions/hiera_hash.rb +2 -26
data/lib/puppet/functions/hiera_include.rb +4 -37
data/lib/puppet/functions/inline_epp.rb +1 -2
data/lib/puppet/functions/lookup.rb +234 -0
data/lib/puppet/functions/map.rb +1 -3
data/lib/puppet/functions/match.rb +5 -5
data/lib/puppet/functions/reduce.rb +1 -3
data/lib/puppet/functions/regsubst.rb +79 -0
data/lib/puppet/functions/scanf.rb +4 -3
data/lib/puppet/functions/slice.rb +1 -3
data/lib/puppet/functions/split.rb +47 -0
data/lib/puppet/functions/with.rb +1 -1
data/lib/puppet/graph/relationship_graph.rb +41 -13
data/lib/puppet/graph/simple_graph.rb +6 -10
data/lib/puppet/indirector/catalog/compiler.rb +0 -2
data/lib/puppet/indirector/catalog/static_compiler.rb +4 -5
data/lib/puppet/indirector/direct_file_server.rb +1 -3
data/lib/puppet/indirector/face.rb +11 -2
data/lib/puppet/indirector/facts/facter.rb +5 -1
data/lib/puppet/indirector/facts/network_device.rb +5 -2
data/lib/puppet/indirector/facts/store_configs.rb +3 -0
data/lib/puppet/indirector/facts/yaml.rb +4 -0
data/lib/puppet/indirector/file_metadata/file.rb +0 -15
data/lib/puppet/indirector/file_server.rb +2 -16
data/lib/puppet/indirector/hiera.rb +39 -1
data/lib/puppet/indirector/indirection.rb +2 -9
data/lib/puppet/indirector/node/ldap.rb +1 -1
data/lib/puppet/indirector/request.rb +21 -81
data/lib/puppet/indirector/resource/ral.rb +1 -2
data/lib/puppet/indirector/resource/store_configs.rb +1 -2
data/lib/puppet/indirector/resource_type/parser.rb +1 -1
data/lib/puppet/indirector/rest.rb +21 -33
data/lib/puppet/interface.rb +0 -7
data/lib/puppet/interface/action_builder.rb +1 -1
data/lib/puppet/interface/action_manager.rb +9 -13
data/lib/puppet/interface/face_collection.rb +2 -2
data/lib/puppet/interface/option_builder.rb +1 -3
data/lib/puppet/metatype/manager.rb +1 -7
data/lib/puppet/module.rb +42 -35
data/lib/puppet/module_tool.rb +5 -7
data/lib/puppet/module_tool/applications/application.rb +3 -10
data/lib/puppet/module_tool/applications/installer.rb +13 -15
data/lib/puppet/module_tool/applications/unpacker.rb +1 -1
data/lib/puppet/module_tool/applications/upgrader.rb +9 -11
data/lib/puppet/module_tool/contents_description.rb +17 -13
data/lib/puppet/module_tool/installed_modules.rb +4 -6
data/lib/puppet/module_tool/metadata.rb +3 -14
data/lib/puppet/module_tool/skeleton/templates/generator/Gemfile +3 -3
data/lib/puppet/module_tool/skeleton/templates/generator/Rakefile +0 -1
data/lib/puppet/module_tool/skeleton/templates/generator/manifests/init.pp.erb +1 -1
data/lib/puppet/module_tool/tar/gnu.rb +1 -1
data/lib/puppet/module_tool/tar/mini.rb +2 -2
data/lib/puppet/network/auth_config_parser.rb +2 -2
data/lib/puppet/network/authconfig.rb +32 -16
data/lib/puppet/network/format_handler.rb +7 -7
data/lib/puppet/network/format_support.rb +4 -0
data/lib/puppet/network/formats.rb +6 -62
data/lib/puppet/network/http.rb +12 -2
data/lib/puppet/network/http/api.rb +42 -0
data/lib/puppet/network/http/api/ca.rb +2 -0
data/lib/puppet/network/http/api/ca/v1.rb +11 -0
data/lib/puppet/network/http/api/{v1.rb → indirected_routes.rb} +57 -29
data/lib/puppet/network/http/api/indirection_type.rb +32 -0
data/lib/puppet/network/http/api/master.rb +2 -0
data/lib/puppet/network/http/api/master/v3.rb +22 -0
data/lib/puppet/network/http/api/master/v3/authorization.rb +18 -0
data/lib/puppet/network/http/api/{v2 → master/v3}/environments.rb +2 -2
data/lib/puppet/network/http/compression.rb +3 -5
data/lib/puppet/network/http/connection.rb +1 -8
data/lib/puppet/network/http/factory.rb +2 -3
data/lib/puppet/network/http/handler.rb +3 -11
data/lib/puppet/network/http/rack/rest.rb +4 -4
data/lib/puppet/network/http/request.rb +4 -4
data/lib/puppet/network/http/webrick.rb +1 -6
data/lib/puppet/network/http/webrick/rest.rb +15 -8
data/lib/puppet/network/resolver.rb +2 -2
data/lib/puppet/network/rights.rb +2 -2
data/lib/puppet/node.rb +2 -29
data/lib/puppet/node/environment.rb +92 -184
data/lib/puppet/node/facts.rb +22 -44
data/lib/puppet/parameter.rb +3 -16
data/lib/puppet/parameter/value.rb +1 -3
data/lib/puppet/parameter/value_collection.rb +12 -11
data/lib/puppet/parser.rb +12 -2
data/lib/puppet/parser/ast.rb +9 -78
data/lib/puppet/parser/ast/block_expression.rb +11 -36
data/lib/puppet/parser/ast/branch.rb +15 -18
data/lib/puppet/parser/ast/hostclass.rb +1 -3
data/lib/puppet/parser/ast/leaf.rb +55 -212
data/lib/puppet/parser/ast/node.rb +3 -11
data/lib/puppet/parser/ast/pops_bridge.rb +2 -7
data/lib/puppet/parser/ast/resource.rb +14 -20
data/lib/puppet/parser/ast/resource_instance.rb +4 -7
data/lib/puppet/parser/ast/resourceparam.rb +21 -22
data/lib/puppet/parser/compiler.rb +41 -70
data/lib/puppet/parser/e4_parser_adapter.rb +2 -23
data/lib/puppet/parser/files.rb +22 -67
data/lib/puppet/parser/functions.rb +1 -3
data/lib/puppet/parser/functions/assert_type.rb +1 -2
data/lib/puppet/parser/functions/contain.rb +5 -3
data/lib/puppet/parser/functions/create_resources.rb +9 -1
data/lib/puppet/parser/functions/defined.rb +33 -61
data/lib/puppet/parser/functions/each.rb +1 -3
data/lib/puppet/parser/functions/epp.rb +1 -2
data/lib/puppet/parser/functions/file.rb +1 -3
data/lib/puppet/parser/functions/filter.rb +1 -3
data/lib/puppet/parser/functions/hiera.rb +4 -6
data/lib/puppet/parser/functions/hiera_array.rb +4 -6
data/lib/puppet/parser/functions/hiera_hash.rb +6 -8
data/lib/puppet/parser/functions/hiera_include.rb +2 -10
data/lib/puppet/parser/functions/include.rb +4 -2
data/lib/puppet/parser/functions/lookup.rb +115 -105
data/lib/puppet/parser/functions/map.rb +1 -3
data/lib/puppet/parser/functions/match.rb +1 -2
data/lib/puppet/parser/functions/realize.rb +1 -6
data/lib/puppet/parser/functions/reduce.rb +1 -3
data/lib/puppet/parser/functions/regsubst.rb +1 -57
data/lib/puppet/parser/functions/require.rb +6 -4
data/lib/puppet/parser/functions/scanf.rb +1 -1
data/lib/puppet/parser/functions/slice.rb +1 -3
data/lib/puppet/parser/functions/split.rb +1 -1
data/lib/puppet/parser/functions/with.rb +1 -2
data/lib/puppet/parser/parser_factory.rb +5 -21
data/lib/puppet/parser/relationship.rb +14 -37
data/lib/puppet/parser/resource.rb +11 -22
data/lib/puppet/parser/scope.rb +45 -135
data/lib/puppet/parser/templatewrapper.rb +1 -29
data/lib/puppet/parser/type_loader.rb +12 -15
data/lib/puppet/plugins.rb +9 -0
data/lib/{puppetx/puppet/bindings_scheme_handler.rb → puppet/plugins/binding_schemes.rb} +14 -4
data/lib/puppet/plugins/configuration.rb +68 -0
data/lib/puppet/plugins/data_providers.rb +90 -0
data/lib/{puppetx/puppet/syntax_checker.rb → puppet/plugins/syntax_checkers.rb} +14 -2
data/lib/puppet/pops.rb +6 -7
data/lib/puppet/pops/adaptable.rb +16 -5
data/lib/puppet/pops/binder/binder.rb +5 -4
data/lib/puppet/pops/binder/bindings_composer.rb +6 -4
data/lib/puppet/pops/binder/bindings_factory.rb +4 -0
data/lib/puppet/pops/binder/bindings_label_provider.rb +1 -1
data/lib/puppet/pops/binder/bindings_loader.rb +3 -8
data/lib/puppet/pops/binder/bindings_model_dumper.rb +36 -8
data/lib/puppet/pops/binder/config/binder_config.rb +2 -2
data/lib/puppet/pops/binder/config/binder_config_checker.rb +1 -1
data/lib/puppet/pops/binder/config/issues.rb +4 -0
data/lib/puppet/pops/binder/injector.rb +0 -1
data/lib/puppet/pops/binder/scheme_handler/symbolic_scheme.rb +1 -1
data/lib/puppet/pops/evaluator/access_operator.rb +18 -50
data/lib/puppet/pops/evaluator/callable_mismatch_describer.rb +5 -5
data/lib/puppet/pops/evaluator/callable_signature.rb +2 -2
data/lib/puppet/pops/evaluator/closure.rb +16 -21
data/lib/puppet/pops/evaluator/collector_transformer.rb +11 -1
data/lib/puppet/pops/evaluator/compare_operator.rb +0 -43
data/lib/puppet/pops/evaluator/epp_evaluator.rb +1 -1
data/lib/puppet/pops/evaluator/evaluator_impl.rb +36 -152
data/lib/puppet/pops/evaluator/external_syntax_support.rb +6 -3
data/lib/puppet/pops/evaluator/relationship_operator.rb +1 -1
data/lib/puppet/pops/evaluator/runtime3_converter.rb +1 -1
data/lib/puppet/pops/evaluator/runtime3_support.rb +9 -57
data/lib/puppet/pops/functions/dispatch.rb +1 -6
data/lib/puppet/pops/issue_reporter.rb +16 -42
data/lib/puppet/pops/issues.rb +13 -128
data/lib/puppet/pops/loader/dependency_loader.rb +3 -3
data/lib/puppet/pops/loader/loader.rb +21 -20
data/lib/puppet/pops/loaders.rb +13 -8
data/lib/puppet/pops/lookup.rb +96 -0
data/lib/puppet/pops/merge_strategy.rb +283 -0
data/lib/puppet/pops/model/ast_transformer.rb +4 -522
data/lib/puppet/pops/model/factory.rb +20 -21
data/lib/puppet/pops/model/model.rb +1 -1
data/lib/puppet/pops/model/model_label_provider.rb +1 -1
data/lib/puppet/pops/model/model_meta.rb +10 -7
data/lib/puppet/pops/model/tree_dumper.rb +1 -1
data/lib/puppet/pops/parser/egrammar.ra +1 -13
data/lib/puppet/pops/parser/eparser.rb +1132 -1272
data/lib/puppet/pops/parser/epp_support.rb +11 -22
data/lib/puppet/pops/parser/evaluating_parser.rb +11 -10
data/lib/puppet/pops/parser/heredoc_support.rb +12 -13
data/lib/puppet/pops/parser/interpolation_support.rb +1 -7
data/lib/puppet/pops/parser/lexer2.rb +33 -36
data/lib/puppet/pops/parser/lexer_support.rb +20 -46
data/lib/puppet/pops/parser/locator.rb +6 -30
data/lib/puppet/pops/parser/parser_support.rb +14 -11
data/lib/puppet/pops/parser/slurp_support.rb +6 -22
data/lib/puppet/pops/patterns.rb +0 -3
data/lib/puppet/pops/types/class_loader.rb +8 -8
data/lib/puppet/pops/types/enumeration.rb +1 -1
data/lib/puppet/pops/types/type_asserter.rb +45 -0
data/lib/puppet/pops/types/type_assertion_error.rb +26 -0
data/lib/puppet/pops/types/type_calculator.rb +110 -212
data/lib/puppet/pops/types/type_factory.rb +15 -74
data/lib/puppet/pops/types/type_parser.rb +15 -24
data/lib/puppet/pops/types/types.rb +25 -35
data/lib/puppet/pops/types/types_meta.rb +2 -13
data/lib/puppet/pops/utils.rb +1 -1
data/lib/puppet/pops/validation.rb +3 -26
data/lib/puppet/pops/validation/checker4_0.rb +6 -56
data/lib/puppet/pops/validation/validator_factory_4_0.rb +1 -3
data/lib/puppet/pops/visitor.rb +10 -7
data/lib/puppet/property.rb +44 -124
data/lib/puppet/provider.rb +0 -52
data/lib/puppet/provider/aixobject.rb +2 -2
data/lib/puppet/provider/augeas/augeas.rb +9 -6
data/lib/puppet/provider/command.rb +1 -1
data/lib/puppet/provider/cron/crontab.rb +37 -0
data/lib/puppet/provider/exec.rb +2 -16
data/lib/puppet/provider/file/posix.rb +1 -1
data/lib/puppet/provider/file/windows.rb +1 -1
data/lib/puppet/provider/group/aix.rb +1 -1
data/lib/puppet/provider/group/pw.rb +0 -1
data/lib/puppet/provider/group/windows_adsi.rb +4 -18
data/lib/puppet/provider/host/parsed.rb +4 -2
data/lib/puppet/provider/macauthorization/macauthorization.rb +0 -12
data/lib/puppet/provider/mailalias/aliases.rb +23 -12
data/lib/puppet/provider/mount/parsed.rb +2 -145
data/lib/puppet/provider/nameservice/directoryservice.rb +57 -131
data/lib/puppet/provider/network_device.rb +3 -0
data/lib/puppet/provider/package/appdmg.rb +5 -2
data/lib/puppet/provider/package/apt.rb +1 -1
data/lib/puppet/provider/package/fink.rb +1 -1
data/lib/puppet/provider/package/openbsd.rb +26 -12
data/lib/puppet/provider/package/opkg.rb +6 -1
data/lib/puppet/provider/package/pacman.rb +159 -127
data/lib/puppet/provider/package/pip.rb +1 -11
data/lib/puppet/provider/package/pkg.rb +73 -29
data/lib/puppet/provider/package/pkgdmg.rb +2 -2
data/lib/puppet/provider/package/pkgin.rb +1 -1
data/lib/puppet/provider/package/portage.rb +5 -1
data/lib/puppet/provider/package/portupgrade.rb +0 -2
data/lib/puppet/provider/package/rpm.rb +109 -0
data/lib/puppet/provider/package/rug.rb +0 -1
data/lib/puppet/provider/package/windows/package.rb +1 -1
data/lib/puppet/provider/package/yum.rb +121 -30
data/lib/puppet/provider/package/zypper.rb +8 -17
data/lib/puppet/provider/scheduled_task/win32_taskscheduler.rb +7 -32
data/lib/puppet/provider/service/base.rb +17 -3
data/lib/puppet/provider/service/bsd.rb +1 -1
data/lib/puppet/provider/service/daemontools.rb +1 -1
data/lib/puppet/provider/service/init.rb +0 -7
data/lib/puppet/provider/service/launchd.rb +11 -89
data/lib/puppet/provider/service/openbsd.rb +56 -298
data/lib/puppet/provider/service/runit.rb +1 -1
data/lib/puppet/provider/service/systemd.rb +1 -0
data/lib/puppet/provider/service/upstart.rb +4 -2
data/lib/puppet/provider/ssh_authorized_key/parsed.rb +1 -1
data/lib/puppet/provider/user/aix.rb +1 -1
data/lib/puppet/provider/user/directoryservice.rb +40 -70
data/lib/puppet/provider/user/hpux.rb +31 -2
data/lib/puppet/provider/user/openbsd.rb +74 -0
data/lib/puppet/provider/user/pw.rb +0 -1
data/lib/puppet/provider/user/user_role_add.rb +1 -3
data/lib/puppet/provider/user/windows_adsi.rb +2 -9
data/lib/puppet/provider/yumrepo/inifile.rb +1 -3
data/lib/puppet/provider/zfs/zfs.rb +3 -2
data/lib/puppet/provider/zone/solaris.rb +3 -3
data/lib/puppet/reference/configuration.rb +4 -3
data/lib/puppet/reference/metaparameter.rb +0 -9
data/lib/puppet/reference/providers.rb +1 -1
data/lib/puppet/reference/type.rb +8 -10
data/lib/puppet/relationship.rb +4 -17
data/lib/puppet/resource.rb +132 -114
data/lib/puppet/resource/catalog.rb +23 -30
data/lib/puppet/resource/status.rb +74 -22
data/lib/puppet/resource/type.rb +12 -52
data/lib/puppet/resource/type_collection.rb +26 -73
data/lib/puppet/settings.rb +94 -153
data/lib/puppet/settings/base_setting.rb +6 -30
data/lib/puppet/settings/config_file.rb +14 -11
data/lib/puppet/settings/duration_setting.rb +1 -1
data/lib/puppet/settings/environment_conf.rb +14 -12
data/lib/puppet/settings/file_setting.rb +9 -10
data/lib/puppet/settings/ttl_setting.rb +1 -3
data/lib/puppet/ssl/certificate.rb +38 -8
data/lib/puppet/ssl/certificate_authority/interface.rb +7 -1
data/lib/puppet/ssl/certificate_factory.rb +3 -3
data/lib/puppet/ssl/certificate_request.rb +36 -8
data/lib/puppet/ssl/configuration.rb +2 -8
data/lib/puppet/ssl/host.rb +1 -8
data/lib/puppet/ssl/inventory.rb +0 -7
data/lib/puppet/ssl/oids.rb +72 -3
data/lib/puppet/ssl/validator/default_validator.rb +0 -1
data/lib/puppet/status.rb +0 -5
data/lib/puppet/syntax_checkers.rb +3 -0
data/lib/{puppetx/puppetlabs → puppet}/syntax_checkers/json.rb +2 -2
data/lib/puppet/test/test_helper.rb +11 -12
data/lib/puppet/transaction.rb +12 -9
data/lib/puppet/transaction/event.rb +4 -5
data/lib/puppet/transaction/event_manager.rb +50 -5
data/lib/puppet/transaction/report.rb +5 -10
data/lib/puppet/transaction/resource_harness.rb +7 -2
data/lib/puppet/type.rb +113 -29
data/lib/puppet/type/augeas.rb +1 -0
data/lib/puppet/type/exec.rb +2 -2
data/lib/puppet/type/file.rb +8 -9
data/lib/puppet/type/file/content.rb +19 -15
data/lib/puppet/type/file/mode.rb +16 -11
data/lib/puppet/type/file/selcontext.rb +1 -1
data/lib/puppet/type/file/source.rb +15 -15
data/lib/puppet/type/filebucket.rb +2 -2
data/lib/puppet/type/group.rb +5 -17
data/lib/puppet/type/host.rb +12 -3
data/lib/puppet/type/k5login.rb +1 -1
data/lib/puppet/type/mailalias.rb +20 -6
data/lib/puppet/type/maillist.rb +1 -1
data/lib/puppet/type/mount.rb +6 -16
data/lib/puppet/type/notify.rb +1 -1
data/lib/puppet/type/package.rb +91 -16
data/lib/puppet/type/resources.rb +0 -7
data/lib/puppet/type/router.rb +1 -1
data/lib/puppet/type/schedule.rb +1 -1
data/lib/puppet/type/scheduled_task.rb +0 -13
data/lib/puppet/type/selboolean.rb +2 -2
data/lib/puppet/type/service.rb +1 -1
data/lib/puppet/type/ssh_authorized_key.rb +1 -1
data/lib/puppet/type/sshkey.rb +1 -1
data/lib/puppet/type/tidy.rb +4 -1
data/lib/puppet/type/user.rb +16 -3
data/lib/puppet/type/yumrepo.rb +26 -0
data/lib/puppet/type/zfs.rb +1 -1
data/lib/puppet/type/zpool.rb +1 -1
data/lib/puppet/util.rb +2 -85
data/lib/puppet/util/autoload.rb +3 -13
data/lib/puppet/util/checksums.rb +59 -22
data/lib/puppet/util/classgen.rb +1 -9
data/lib/puppet/util/colors.rb +0 -117
data/lib/puppet/util/command_line.rb +1 -23
data/lib/puppet/util/errors.rb +2 -4
data/lib/puppet/util/execution.rb +19 -22
data/lib/puppet/util/feature.rb +2 -4
data/lib/puppet/util/fileparsing.rb +3 -2
data/lib/puppet/util/log.rb +13 -56
data/lib/puppet/util/log/destinations.rb +17 -36
data/lib/puppet/util/logging.rb +52 -37
data/lib/puppet/util/metric.rb +0 -149
data/lib/puppet/util/monkey_patches.rb +1 -94
data/lib/puppet/util/network_device/base.rb +1 -5
data/lib/puppet/util/network_device/cisco/interface.rb +2 -2
data/lib/puppet/util/network_device/config.rb +0 -5
data/lib/puppet/util/network_device/transport/ssh.rb +2 -2
data/lib/puppet/util/profiler.rb +1 -1
data/lib/puppet/util/profiler/aggregate.rb +1 -1
data/lib/puppet/util/profiler/around_profiler.rb +1 -1
data/lib/puppet/util/psych_support.rb +38 -0
data/lib/puppet/util/rdoc.rb +6 -42
data/lib/puppet/util/rdoc/code_objects.rb +5 -45
data/lib/puppet/util/rdoc/generators/puppet_generator.rb +1 -1
data/lib/puppet/util/rdoc/parser.rb +5 -15
data/lib/puppet/util/rdoc/parser/puppet_parser_core.rb +8 -227
data/lib/puppet/util/retry_action.rb +46 -0
data/lib/puppet/util/run_mode.rb +31 -7
data/lib/puppet/util/selinux.rb +2 -2
data/lib/puppet/util/ssl.rb +11 -11
data/lib/puppet/util/suidmanager.rb +4 -31
data/lib/puppet/util/tag_set.rb +0 -11
data/lib/puppet/util/tagging.rb +50 -19
data/lib/puppet/util/warnings.rb +1 -0
data/lib/puppet/util/windows/adsi.rb +13 -60
data/lib/puppet/util/windows/api_types.rb +16 -2
data/lib/puppet/util/windows/file.rb +2 -8
data/lib/puppet/util/windows/process.rb +58 -0
data/lib/puppet/util/windows/registry.rb +319 -31
data/lib/puppet/util/windows/security.rb +1 -68
data/lib/puppet/util/windows/taskscheduler.rb +0 -21
data/lib/puppet/util/windows/user.rb +2 -3
data/lib/puppet/vendor/deep_merge/CHANGELOG +45 -0
data/lib/puppet/vendor/deep_merge/Gemfile +3 -0
data/lib/puppet/vendor/deep_merge/LICENSE +21 -0
data/lib/puppet/vendor/deep_merge/README.md +113 -0
data/lib/puppet/vendor/deep_merge/Rakefile +19 -0
data/lib/puppet/vendor/deep_merge/deep_merge.gemspec +35 -0
data/lib/puppet/vendor/deep_merge/lib/deep_merge.rb +2 -0
data/lib/puppet/vendor/deep_merge/lib/deep_merge/core.rb +210 -0
data/lib/puppet/vendor/deep_merge/lib/deep_merge/deep_merge_hash.rb +28 -0
data/lib/puppet/vendor/deep_merge/lib/deep_merge/rails_compat.rb +27 -0
data/lib/puppet/vendor/deep_merge/test/test_deep_merge.rb +608 -0
data/lib/puppet/vendor/load_deep_merge.rb +1 -0
data/lib/puppet/vendor/load_rgen.rb +1 -0
data/lib/puppet/vendor/require_vendored.rb +1 -3
data/lib/puppet/vendor/rgen_patch.rb +132 -0
data/lib/puppet/version.rb +1 -1
data/lib/puppet_x.rb +8 -0
data/lib/semver.rb +0 -1
data/man/man5/puppet.conf.5 +432 -287
data/man/man8/extlookup2hiera.8 +2 -15
data/man/man8/puppet-agent.8 +14 -14
data/man/man8/puppet-apply.8 +29 -30
data/man/man8/puppet-ca.8 +29 -17
data/man/man8/puppet-catalog.8 +5 -34
data/man/man8/puppet-cert.8 +8 -4
data/man/man8/puppet-certificate.8 +15 -29
data/man/man8/puppet-certificate_request.8 +9 -16
data/man/man8/puppet-certificate_revocation_list.8 +5 -31
data/man/man8/puppet-config.8 +52 -11
data/man/man8/puppet-describe.8 +1 -1
data/man/man8/puppet-device.8 +5 -16
data/man/man8/puppet-doc.8 +7 -80
data/man/man8/puppet-epp.8 +349 -0
data/man/man8/puppet-facts.8 +5 -95
data/man/man8/puppet-file.8 +2 -28
data/man/man8/puppet-filebucket.8 +2 -2
data/man/man8/puppet-help.8 +2 -2
data/man/man8/puppet-inspect.8 +1 -1
data/man/man8/puppet-key.8 +6 -3
data/man/man8/puppet-man.8 +2 -2
data/man/man8/puppet-master.8 +11 -7
data/man/man8/puppet-module.8 +75 -49
data/man/man8/puppet-node.8 +8 -56
data/man/man8/puppet-parser.8 +38 -4
data/man/man8/puppet-plugin.8 +2 -2
data/man/man8/puppet-report.8 +8 -70
data/man/man8/puppet-resource.8 +7 -3
data/man/man8/puppet-resource_type.8 +2 -28
data/man/man8/puppet-status.8 +5 -47
data/man/man8/puppet.8 +2 -2
data/spec/fixtures/integration/provider/mailalias/aliases/test1 +3 -0
data/spec/fixtures/integration/provider/sshkey/sample +21 -0
data/spec/fixtures/unit/data_providers/environments/production/environment.conf +2 -0
data/spec/fixtures/unit/data_providers/environments/production/lib/puppet/functions/environment/data.rb +7 -0
data/spec/fixtures/unit/data_providers/environments/production/modules/abc/lib/puppet/bindings/abc/default.rb +9 -0
data/spec/fixtures/unit/data_providers/environments/production/modules/abc/lib/puppet/functions/abc/data.rb +8 -0
data/spec/fixtures/unit/data_providers/environments/production/modules/abc/manifests/init.pp +9 -0
data/spec/fixtures/unit/data_providers/environments/sample/environment.conf +2 -0
data/spec/fixtures/unit/data_providers/environments/sample/manifests/site.pp +6 -0
data/spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/lib/puppet/bindings/dataprovider/default.rb +54 -0
data/spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/lib/puppet_x/helindbe/sample_env_data.rb +31 -0
data/spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/lib/puppet_x/helindbe/sample_module_data.rb +32 -0
data/spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/manifests/init.pp +5 -0
data/spec/fixtures/unit/functions/lookup/environments/production/environment.conf +2 -0
data/spec/fixtures/unit/functions/lookup/environments/production/lib/puppet/functions/environment/data.rb +11 -0
data/spec/fixtures/unit/functions/lookup/environments/production/modules/abc/lib/puppet/bindings/abc/default.rb +9 -0
data/spec/fixtures/unit/functions/lookup/environments/production/modules/abc/lib/puppet/functions/abc/data.rb +9 -0
data/spec/fixtures/unit/functions/lookup/environments/production/modules/abc/manifests/init.pp +8 -0
data/spec/fixtures/unit/parser/lexer/subclass_name_duplication.pp +0 -0
data/spec/fixtures/unit/pops/binder/bindings_composer/ok/binder_config.yaml +1 -1
data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/awesome2/lib/{puppetx → puppet_x}/awesome2/echo_scheme_handler.rb +3 -3
data/spec/fixtures/unit/pops/binder/config/binder_config/nolayer/binder_config.yaml +6 -0
data/spec/fixtures/unit/pops/parser/lexer/subclass_name_duplication.pp +0 -0
data/spec/fixtures/unit/provider/mount/parsed/aix.filesystems +85 -93
data/spec/fixtures/unit/provider/mount/parsed/aix.mount +7 -11
data/spec/fixtures/unit/provider/package/pkg/dummy_implicit_version +3 -0
data/spec/fixtures/unit/provider/package/pkg/dummy_solaris10 +1 -1
data/spec/fixtures/unit/provider/package/pkg/dummy_solaris11.certificate_warning +1 -1
data/spec/fixtures/unit/provider/package/pkg/dummy_solaris11.ifo.installed +1 -1
data/spec/fixtures/unit/provider/package/pkg/dummy_solaris11.ifo.known +1 -1
data/spec/fixtures/unit/provider/package/pkg/dummy_solaris11.installed +1 -1
data/spec/fixtures/unit/provider/package/pkg/dummy_solaris11.known +1 -1
data/spec/fixtures/unit/provider/package/pkg/incomplete +1 -1
data/spec/fixtures/unit/provider/package/pkg/solaris11 +2 -2
data/spec/fixtures/unit/provider/package/pkg/unknown_status +12 -12
data/spec/fixtures/unit/provider/package/yum/yum-check-update-multiline.txt +201 -0
data/spec/fixtures/unit/provider/package/yum/yum-check-update-simple.txt +12 -0
data/spec/fixtures/unit/provider/parsedfile/simple.txt +3 -0
data/spec/fixtures/unit/provider/service/openbsd/rcctl_getall +6 -0
data/spec/fixtures/unit/ssl/certificate/old-style-cert-exts.pem +33 -0
data/spec/fixtures/unit/ssl/certificate_request/old-style-cert-request.pem +28 -0
data/spec/integration/agent/logging_spec.rb +1 -5
data/spec/integration/application/apply_spec.rb +1 -1
data/spec/integration/application/doc_spec.rb +1 -43
data/spec/integration/configurer_spec.rb +5 -5
data/spec/integration/data_binding.rb +4 -0
data/spec/integration/defaults_spec.rb +42 -143
data/spec/integration/directory_environments_spec.rb +3 -3
data/spec/integration/environments/default_manifest_spec.rb +3 -51
data/spec/integration/environments/setting_hooks_spec.rb +1 -1
data/spec/integration/environments/settings_interpolation_spec.rb +50 -105
data/spec/integration/environments/settings_spec.rb +100 -0
data/spec/integration/faces/ca_spec.rb +51 -51
data/spec/integration/faces/documentation_spec.rb +6 -6
data/spec/integration/file_bucket/file_spec.rb +5 -16
data/spec/integration/file_serving/fileset_spec.rb +1 -1
data/spec/integration/file_serving/terminus_helper_spec.rb +1 -1
data/spec/integration/indirector/catalog/compiler_spec.rb +6 -6
data/spec/integration/indirector/direct_file_server_spec.rb +40 -12
data/spec/integration/indirector/facts/facter_spec.rb +1 -1
data/spec/integration/indirector/file_content/file_server_spec.rb +23 -21
data/spec/integration/indirector/file_metadata/file_server_spec.rb +53 -0
data/spec/integration/indirector/node/ldap_spec.rb +0 -0
data/spec/integration/network/authconfig_spec.rb +26 -26
data/spec/integration/network/formats_spec.rb +12 -12
data/spec/integration/network/http/api/indirected_routes_spec.rb +56 -0
data/spec/integration/node/environment_spec.rb +12 -15
data/spec/integration/node/facts_spec.rb +3 -3
data/spec/integration/node_spec.rb +8 -8
data/spec/integration/parser/catalog_spec.rb +1 -32
data/spec/integration/parser/class_spec.rb +0 -4
data/spec/integration/parser/{collector_spec.rb → collection_spec.rb} +3 -27
data/spec/integration/parser/compiler_spec.rb +769 -385
data/spec/integration/parser/conditionals_spec.rb +2 -27
data/spec/integration/parser/functions/require_spec.rb +8 -8
data/spec/integration/parser/node_spec.rb +29 -42
data/spec/integration/parser/resource_expressions_spec.rb +125 -210
data/spec/integration/parser/scope_spec.rb +168 -319
data/spec/integration/parser/undef_param_spec.rb +5 -5
data/spec/integration/provider/cron/crontab_spec.rb +3 -3
data/spec/integration/provider/mailalias/aliases_spec.rb +0 -0
data/spec/integration/provider/mount_spec.rb +33 -28
data/spec/integration/provider/package_spec.rb +3 -14
data/spec/integration/provider/service/init_spec.rb +4 -4
data/spec/integration/provider/service/systemd_spec.rb +3 -3
data/spec/integration/provider/ssh_authorized_key_spec.rb +12 -12
data/spec/integration/provider/sshkey_spec.rb +159 -0
data/spec/integration/reference/providers_spec.rb +1 -1
data/spec/integration/reports_spec.rb +1 -1
data/spec/integration/resource/catalog_spec.rb +3 -3
data/spec/integration/resource/type_collection_spec.rb +10 -25
data/spec/integration/ssl/autosign_spec.rb +1 -1
data/spec/integration/ssl/certificate_authority_spec.rb +8 -8
data/spec/integration/ssl/certificate_request_spec.rb +2 -2
data/spec/integration/ssl/certificate_revocation_list_spec.rb +0 -0
data/spec/integration/ssl/host_spec.rb +7 -7
data/spec/integration/transaction/report_spec.rb +0 -0
data/spec/integration/transaction_spec.rb +86 -50
data/spec/integration/type/exec_spec.rb +5 -5
data/spec/integration/type/file_spec.rb +277 -280
data/spec/integration/type/package_spec.rb +105 -6
data/spec/integration/type/tidy_spec.rb +1 -1
data/spec/integration/type/user_spec.rb +4 -4
data/spec/integration/type_spec.rb +2 -2
data/spec/integration/util/autoload_spec.rb +7 -12
data/spec/integration/util/rdoc/parser_spec.rb +13 -99
data/spec/integration/util/settings_spec.rb +1 -1
data/spec/integration/util/windows/process_spec.rb +6 -6
data/spec/integration/util/windows/security_spec.rb +79 -105
data/spec/integration/util/windows/user_spec.rb +12 -12
data/spec/integration/util_spec.rb +8 -8
data/spec/lib/matchers/containment_matchers.rb +1 -1
data/spec/lib/matchers/include.rb +3 -3
data/spec/lib/matchers/include_in_order.rb +2 -2
data/spec/lib/matchers/json.rb +5 -35
data/spec/lib/matchers/match_tokens2.rb +1 -1
data/spec/lib/matchers/relationship_graph_matchers.rb +1 -1
data/spec/lib/matchers/resource.rb +8 -23
data/spec/lib/puppet/face/1.0.0/huzzah.rb +2 -2
data/spec/lib/puppet/face/basetest.rb +0 -0
data/spec/lib/puppet/face/huzzah.rb +2 -2
data/spec/lib/puppet/face/version_matching.rb +1 -1
data/spec/lib/puppet/indirector_proxy.rb +34 -0
data/spec/lib/puppet/indirector_testing.rb +1 -11
data/spec/lib/puppet_spec/files.rb +1 -1
data/spec/lib/puppet_spec/fixtures.rb +0 -0
data/spec/lib/puppet_spec/handler.rb +53 -0
data/spec/lib/puppet_spec/matchers.rb +12 -5
data/spec/lib/puppet_spec/module_tool/shared_functions.rb +3 -3
data/spec/lib/puppet_spec/modules.rb +11 -0
data/spec/lib/puppet_spec/network.rb +101 -0
data/spec/lib/puppet_spec/pops.rb +2 -2
data/spec/lib/puppet_spec/settings.rb +17 -0
data/spec/lib/puppet_spec/verbose.rb +0 -0
data/spec/shared_behaviours/all_parsedfile_providers.rb +1 -1
data/spec/shared_behaviours/an_indirector_face.rb +2 -2
data/spec/shared_behaviours/documentation_on_faces.rb +46 -46
data/spec/shared_behaviours/file_server_terminus.rb +1 -1
data/spec/shared_behaviours/file_serving.rb +0 -0
data/spec/shared_behaviours/hiera_indirections.rb +10 -10
data/spec/shared_behaviours/iterative_functions.rb +1 -1
data/spec/shared_behaviours/memory_terminus.rb +5 -5
data/spec/shared_behaviours/path_parameters.rb +8 -8
data/spec/shared_behaviours/store_configs_terminus.rb +3 -3
data/spec/shared_behaviours/things_that_declare_options.rb +25 -25
data/spec/shared_contexts/checksum.rb +62 -0
data/spec/shared_contexts/{checksums.rb → digests.rb} +2 -2
data/spec/spec_helper.rb +14 -5
data/spec/unit/agent/disabler_spec.rb +3 -3
data/spec/unit/agent/locker_spec.rb +9 -9
data/spec/unit/agent_spec.rb +18 -18
data/spec/unit/application/agent_spec.rb +25 -92
data/spec/unit/application/apply_spec.rb +16 -16
data/spec/unit/application/cert_spec.rb +15 -15
data/spec/unit/application/certificate_spec.rb +2 -2
data/spec/unit/application/config_spec.rb +1 -1
data/spec/unit/application/describe_spec.rb +6 -6
data/spec/unit/application/device_spec.rb +25 -63
data/spec/unit/application/doc_spec.rb +22 -31
data/spec/unit/application/face_base_spec.rb +88 -59
data/spec/unit/application/facts_spec.rb +2 -11
data/spec/unit/application/filebucket_spec.rb +7 -7
data/spec/unit/application/indirection_base_spec.rb +0 -4
data/spec/unit/application/inspect_spec.rb +21 -21
data/spec/unit/application/master_spec.rb +8 -9
data/spec/unit/application/resource_spec.rb +27 -79
data/spec/unit/application_spec.rb +54 -58
data/spec/unit/configurer/downloader_factory_spec.rb +0 -0
data/spec/unit/configurer/downloader_spec.rb +26 -20
data/spec/unit/configurer/fact_handler_spec.rb +19 -12
data/spec/unit/configurer/plugin_handler_spec.rb +0 -0
data/spec/unit/configurer_spec.rb +44 -44
data/spec/unit/confine/exists_spec.rb +10 -10
data/spec/unit/confine/false_spec.rb +7 -7
data/spec/unit/confine/feature_spec.rb +7 -7
data/spec/unit/confine/true_spec.rb +7 -7
data/spec/unit/confine/variable_spec.rb +13 -13
data/spec/unit/confine_collection_spec.rb +12 -12
data/spec/unit/confine_spec.rb +10 -10
data/spec/unit/confiner_spec.rb +8 -8
data/spec/unit/context/trusted_information_spec.rb +9 -2
data/spec/unit/daemon_spec.rb +10 -21
data/spec/unit/data_binding_spec.rb +1 -1
data/spec/unit/data_providers/function_data_provider_spec.rb +96 -0
data/spec/unit/data_providers/sample_data_provider_spec.rb +52 -0
data/spec/unit/defaults_spec.rb +6 -6
data/spec/unit/environments_spec.rb +4 -6
data/spec/unit/{util → external}/pson_spec.rb +15 -25
data/spec/unit/face/catalog_spec.rb +0 -0
data/spec/unit/face/certificate_spec.rb +19 -19
data/spec/unit/face/config_spec.rb +2 -7
data/spec/unit/face/epp_face_spec.rb +303 -0
data/spec/unit/face/facts_spec.rb +1 -15
data/spec/unit/face/file_spec.rb +3 -5
data/spec/unit/face/help_spec.rb +17 -16
data/spec/unit/face/module/build_spec.rb +2 -2
data/spec/unit/face/module/list_spec.rb +11 -11
data/spec/unit/face/module/search_spec.rb +17 -17
data/spec/unit/face/node_spec.rb +4 -122
data/spec/unit/face/parser_spec.rb +1 -1
data/spec/unit/face/plugin_spec.rb +2 -2
data/spec/unit/face_spec.rb +0 -0
data/spec/unit/file_bucket/dipper_spec.rb +23 -23
data/spec/unit/file_bucket/file_spec.rb +12 -28
data/spec/unit/file_serving/base_spec.rb +26 -26
data/spec/unit/file_serving/configuration/parser_spec.rb +10 -10
data/spec/unit/file_serving/configuration_spec.rb +17 -17
data/spec/unit/file_serving/content_spec.rb +19 -31
data/spec/unit/file_serving/fileset_spec.rb +32 -33
data/spec/unit/file_serving/metadata_spec.rb +115 -71
data/spec/unit/file_serving/mount/file_spec.rb +15 -15
data/spec/unit/file_serving/mount/modules_spec.rb +2 -2
data/spec/unit/file_serving/mount/pluginfacts_spec.rb +5 -5
data/spec/unit/file_serving/mount/plugins_spec.rb +5 -5
data/spec/unit/file_serving/mount_spec.rb +5 -5
data/spec/unit/file_serving/terminus_helper_spec.rb +19 -0
data/spec/unit/file_serving/terminus_selector_spec.rb +6 -6
data/spec/unit/file_system/uniquefile_spec.rb +2 -2
data/spec/unit/file_system_spec.rb +79 -117
data/spec/unit/forge/errors_spec.rb +8 -8
data/spec/unit/forge/module_release_spec.rb +2 -4
data/spec/unit/forge/repository_spec.rb +38 -44
data/spec/unit/forge_spec.rb +1 -1
data/spec/unit/functions/assert_type_spec.rb +1 -1
data/spec/unit/functions/each_spec.rb +19 -23
data/spec/unit/functions/epp_spec.rb +9 -17
data/spec/unit/functions/filter_spec.rb +0 -22
data/spec/unit/functions/hiera_spec.rb +18 -24
data/spec/unit/functions/inline_epp_spec.rb +8 -16
data/spec/unit/functions/lookup_spec.rb +324 -0
data/spec/unit/functions/map_spec.rb +1 -7
data/spec/unit/functions/reduce_spec.rb +0 -11
data/spec/unit/functions/regsubst_spec.rb +94 -0
data/spec/unit/functions/scanf_spec.rb +0 -4
data/spec/unit/functions/slice_spec.rb +0 -12
data/spec/unit/functions/split_spec.rb +46 -0
data/spec/unit/functions/with_spec.rb +4 -13
data/spec/unit/functions4_spec.rb +57 -162
data/spec/unit/graph/rb_tree_map_spec.rb +78 -78
data/spec/unit/graph/relationship_graph_spec.rb +17 -17
data/spec/unit/graph/{simple_graph.rb → simple_graph_spec.rb} +122 -126
data/spec/unit/hiera/scope_spec.rb +13 -12
data/spec/unit/hiera_puppet_spec.rb +12 -12
data/spec/unit/indirector/catalog/compiler_spec.rb +10 -15
data/spec/unit/indirector/catalog/json_spec.rb +2 -2
data/spec/unit/indirector/catalog/msgpack_spec.rb +2 -2
data/spec/unit/indirector/catalog/rest_spec.rb +1 -1
data/spec/unit/indirector/catalog/static_compiler_spec.rb +14 -14
data/spec/unit/indirector/catalog/store_configs_spec.rb +0 -0
data/spec/unit/indirector/catalog/yaml_spec.rb +4 -4
data/spec/unit/indirector/certificate/ca_spec.rb +3 -3
data/spec/unit/indirector/certificate/disabled_ca_spec.rb +0 -0
data/spec/unit/indirector/certificate/file_spec.rb +3 -3
data/spec/unit/indirector/certificate/rest_spec.rb +6 -6
data/spec/unit/indirector/certificate_request/ca_spec.rb +8 -8
data/spec/unit/indirector/certificate_request/disabled_ca_spec.rb +0 -0
data/spec/unit/indirector/certificate_request/file_spec.rb +2 -2
data/spec/unit/indirector/certificate_request/rest_spec.rb +4 -4
data/spec/unit/indirector/certificate_revocation_list/ca_spec.rb +2 -2
data/spec/unit/indirector/certificate_revocation_list/disabled_ca_spec.rb +0 -0
data/spec/unit/indirector/certificate_revocation_list/file_spec.rb +2 -2
data/spec/unit/indirector/certificate_revocation_list/rest_spec.rb +4 -4
data/spec/unit/indirector/certificate_status/file_spec.rb +18 -18
data/spec/unit/indirector/certificate_status/rest_spec.rb +2 -2
data/spec/unit/indirector/code_spec.rb +3 -3
data/spec/unit/indirector/data_binding/hiera_spec.rb +3 -3
data/spec/unit/indirector/data_binding/none_spec.rb +5 -5
data/spec/unit/indirector/direct_file_server_spec.rb +14 -4
data/spec/unit/indirector/envelope_spec.rb +4 -4
data/spec/unit/indirector/exec_spec.rb +4 -4
data/spec/unit/indirector/face_spec.rb +13 -8
data/spec/unit/indirector/facts/facter_spec.rb +10 -20
data/spec/unit/indirector/facts/network_device_spec.rb +10 -20
data/spec/unit/indirector/facts/store_configs_spec.rb +0 -0
data/spec/unit/indirector/facts/yaml_spec.rb +6 -6
data/spec/unit/indirector/file_bucket_file/file_spec.rb +34 -34
data/spec/unit/indirector/file_bucket_file/rest_spec.rb +1 -1
data/spec/unit/indirector/file_content/file_server_spec.rb +2 -2
data/spec/unit/indirector/file_content/file_spec.rb +2 -2
data/spec/unit/indirector/file_content/rest_spec.rb +1 -1
data/spec/unit/indirector/file_metadata/file_server_spec.rb +2 -2
data/spec/unit/indirector/file_metadata/file_spec.rb +13 -5
data/spec/unit/indirector/file_metadata/rest_spec.rb +1 -1
data/spec/unit/indirector/file_server_spec.rb +35 -17
data/spec/unit/indirector/indirection_spec.rb +56 -56
data/spec/unit/indirector/json_spec.rb +15 -16
data/spec/unit/indirector/key/ca_spec.rb +3 -3
data/spec/unit/indirector/key/disabled_ca_spec.rb +0 -0
data/spec/unit/indirector/key/file_spec.rb +5 -5
data/spec/unit/indirector/ldap_spec.rb +13 -13
data/spec/unit/indirector/memory_spec.rb +0 -0
data/spec/unit/indirector/msgpack_spec.rb +15 -15
data/spec/unit/indirector/node/exec_spec.rb +20 -9
data/spec/unit/indirector/node/ldap_spec.rb +48 -48
data/spec/unit/indirector/node/memory_spec.rb +0 -0
data/spec/unit/indirector/node/msgpack_spec.rb +4 -4
data/spec/unit/indirector/node/plain_spec.rb +2 -2
data/spec/unit/indirector/node/rest_spec.rb +0 -0
data/spec/unit/indirector/node/store_configs_spec.rb +0 -0
data/spec/unit/indirector/node/yaml_spec.rb +4 -4
data/spec/unit/indirector/none_spec.rb +2 -2
data/spec/unit/indirector/plain_spec.rb +1 -1
data/spec/unit/indirector/report/msgpack_spec.rb +5 -5
data/spec/unit/indirector/report/processor_spec.rb +4 -4
data/spec/unit/indirector/report/rest_spec.rb +8 -8
data/spec/unit/indirector/report/yaml_spec.rb +5 -5
data/spec/unit/indirector/request_spec.rb +103 -206
data/spec/unit/indirector/resource/ral_spec.rb +8 -10
data/spec/unit/indirector/resource/store_configs_spec.rb +2 -4
data/spec/unit/indirector/resource_type/parser_spec.rb +37 -37
data/spec/unit/indirector/resource_type/rest_spec.rb +2 -2
data/spec/unit/indirector/rest_spec.rb +70 -55
data/spec/unit/indirector/ssl_file_spec.rb +13 -13
data/spec/unit/indirector/status/rest_spec.rb +1 -1
data/spec/unit/indirector/store_configs_spec.rb +0 -0
data/spec/unit/indirector/terminus_spec.rb +17 -17
data/spec/unit/indirector/yaml_spec.rb +12 -12
data/spec/unit/indirector_spec.rb +7 -7
data/spec/unit/interface/action_builder_spec.rb +15 -15
data/spec/unit/interface/action_manager_spec.rb +31 -56
data/spec/unit/interface/action_spec.rb +62 -65
data/spec/unit/interface/documentation_spec.rb +2 -2
data/spec/unit/interface/face_collection_spec.rb +33 -33
data/spec/unit/interface/option_builder_spec.rb +8 -8
data/spec/unit/interface/option_spec.rb +23 -23
data/spec/unit/interface_spec.rb +19 -24
data/spec/unit/man_spec.rb +0 -0
data/spec/unit/module_spec.rb +163 -115
data/spec/unit/module_tool/applications/builder_spec.rb +0 -19
data/spec/unit/module_tool/applications/installer_spec.rb +29 -29
data/spec/unit/module_tool/applications/searcher_spec.rb +4 -4
data/spec/unit/module_tool/applications/uninstaller_spec.rb +15 -15
data/spec/unit/module_tool/applications/unpacker_spec.rb +3 -3
data/spec/unit/module_tool/applications/upgrader_spec.rb +28 -28
data/spec/unit/module_tool/install_directory_spec.rb +3 -3
data/spec/unit/module_tool/metadata_spec.rb +26 -26
data/spec/unit/module_tool/tar/gnu_spec.rb +1 -1
data/spec/unit/module_tool/tar/mini_spec.rb +2 -2
data/spec/unit/module_tool/tar_spec.rb +2 -2
data/spec/unit/module_tool_spec.rb +13 -34
data/spec/unit/network/auth_config_parser_spec.rb +7 -7
data/spec/unit/network/authconfig_spec.rb +9 -9
data/spec/unit/network/authstore_spec.rb +38 -39
data/spec/unit/network/format_handler_spec.rb +14 -14
data/spec/unit/network/format_spec.rb +34 -34
data/spec/unit/network/format_support_spec.rb +10 -10
data/spec/unit/network/formats_spec.rb +50 -136
data/spec/unit/network/http/api/ca/v1_spec.rb +26 -0
data/spec/unit/network/http/api/{v1_spec.rb → indirected_routes_spec.rb} +128 -184
data/spec/unit/network/http/api/{v2 → master/v3}/authorization_spec.rb +23 -21
data/spec/unit/network/http/api/{v2 → master/v3}/environments_spec.rb +5 -5
data/spec/unit/network/http/api/master/v3_spec.rb +39 -0
data/spec/unit/network/http/api_spec.rb +127 -0
data/spec/unit/network/http/compression_spec.rb +20 -26
data/spec/unit/network/http/connection_spec.rb +2 -5
data/spec/unit/network/http/factory_spec.rb +6 -8
data/spec/unit/network/http/handler_spec.rb +31 -84
data/spec/unit/network/http/nocache_pool_spec.rb +0 -0
data/spec/unit/network/http/pool_spec.rb +0 -0
data/spec/unit/network/http/rack/rest_spec.rb +38 -39
data/spec/unit/network/http/rack_spec.rb +1 -1
data/spec/unit/network/http/route_spec.rb +3 -3
data/spec/unit/network/http/session_spec.rb +4 -4
data/spec/unit/network/http/site_spec.rb +1 -1
data/spec/unit/network/http/webrick/rest_spec.rb +36 -55
data/spec/unit/network/http/webrick_spec.rb +16 -27
data/spec/unit/network/http_pool_spec.rb +11 -11
data/spec/unit/network/http_spec.rb +0 -0
data/spec/unit/network/resolver_spec.rb +10 -10
data/spec/unit/network/rights_spec.rb +67 -67
data/spec/unit/network/server_spec.rb +3 -3
data/spec/unit/node/environment_spec.rb +177 -273
data/spec/unit/node/facts_spec.rb +71 -33
data/spec/unit/node_spec.rb +150 -158
data/spec/unit/other/selinux_spec.rb +6 -6
data/spec/unit/parameter/boolean_spec.rb +4 -3
data/spec/unit/parameter/package_options_spec.rb +5 -5
data/spec/unit/parameter/path_spec.rb +1 -1
data/spec/unit/parameter/value_collection_spec.rb +23 -28
data/spec/unit/parameter/value_spec.rb +20 -24
data/spec/unit/parameter_spec.rb +26 -26
data/spec/unit/parser/ast/block_expression_spec.rb +3 -2
data/spec/unit/parser/ast/leaf_spec.rb +5 -378
data/spec/unit/parser/compiler_spec.rb +84 -74
data/spec/unit/parser/files_spec.rb +55 -121
data/spec/unit/parser/functions/contain_spec.rb +8 -11
data/spec/unit/parser/functions/create_resources_spec.rb +29 -29
data/spec/unit/parser/functions/defined_spec.rb +52 -51
data/spec/unit/parser/functions/digest_spec.rb +2 -2
data/spec/unit/parser/functions/fail_spec.rb +1 -1
data/spec/unit/parser/functions/file_spec.rb +7 -13
data/spec/unit/parser/functions/fqdn_rand_spec.rb +5 -5
data/spec/unit/parser/functions/generate_spec.rb +20 -20
data/spec/unit/parser/functions/hiera_array_spec.rb +2 -16
data/spec/unit/parser/functions/hiera_hash_spec.rb +2 -12
data/spec/unit/parser/functions/hiera_include_spec.rb +2 -29
data/spec/unit/parser/functions/hiera_spec.rb +2 -12
data/spec/unit/parser/functions/include_spec.rb +9 -19
data/spec/unit/parser/functions/inline_template_spec.rb +3 -3
data/spec/unit/parser/functions/lookup_spec.rb +3 -140
data/spec/unit/parser/functions/realize_spec.rb +0 -0
data/spec/unit/parser/functions/regsubst_spec.rb +7 -179
data/spec/unit/parser/functions/require_spec.rb +14 -21
data/spec/unit/parser/functions/scanf_spec.rb +0 -0
data/spec/unit/parser/functions/shellquote_spec.rb +20 -20
data/spec/unit/parser/functions/split_spec.rb +2 -37
data/spec/unit/parser/functions/sprintf_spec.rb +7 -11
data/spec/unit/parser/functions/tag_spec.rb +3 -3
data/spec/unit/parser/functions/template_spec.rb +10 -10
data/spec/unit/parser/functions/versioncmp_spec.rb +3 -3
data/spec/unit/parser/functions_spec.rb +8 -8
data/spec/unit/parser/relationship_spec.rb +14 -32
data/spec/unit/parser/resource/param_spec.rb +0 -0
data/spec/unit/parser/resource_spec.rb +57 -57
data/spec/unit/parser/scope_spec.rb +89 -101
data/spec/unit/parser/templatewrapper_spec.rb +15 -32
data/spec/unit/parser/type_loader_spec.rb +53 -73
data/spec/unit/pops/adaptable_spec.rb +22 -22
data/spec/unit/pops/binder/bindings_checker_spec.rb +14 -14
data/spec/unit/pops/binder/bindings_composer_spec.rb +4 -6
data/spec/unit/pops/binder/bindings_validator_factory_spec.rb +3 -3
data/spec/unit/pops/binder/config/binder_config_spec.rb +8 -1
data/spec/unit/pops/binder/injector_spec.rb +92 -92
data/spec/unit/pops/containment_spec.rb +4 -4
data/spec/unit/pops/evaluator/access_ops_spec.rb +5 -24
data/spec/unit/pops/evaluator/arithmetic_ops_spec.rb +23 -23
data/spec/unit/pops/evaluator/basic_expressions_spec.rb +22 -22
data/spec/unit/pops/evaluator/collections_ops_spec.rb +1 -3
data/spec/unit/pops/evaluator/comparison_ops_spec.rb +104 -107
data/spec/unit/pops/evaluator/conditionals_spec.rb +39 -39
data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +75 -143
data/spec/unit/pops/evaluator/evaluator_rspec_helper.rb +1 -5
data/spec/unit/pops/evaluator/logical_ops_spec.rb +15 -15
data/spec/unit/pops/evaluator/string_interpolation_spec.rb +5 -5
data/spec/unit/pops/evaluator/variables_spec.rb +18 -18
data/spec/unit/pops/factory_rspec_helper.rb +0 -8
data/spec/unit/pops/factory_spec.rb +104 -104
data/spec/unit/pops/issues_spec.rb +21 -21
data/spec/unit/pops/label_provider_spec.rb +6 -6
data/spec/unit/pops/loaders/loaders_spec.rb +3 -3
data/spec/unit/pops/model/model_spec.rb +10 -10
data/spec/unit/pops/parser/epp_parser_spec.rb +20 -20
data/spec/unit/pops/parser/evaluating_parser_spec.rb +2 -2
data/spec/unit/pops/parser/lexer2_spec.rb +65 -276
data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +91 -91
data/spec/unit/pops/parser/parse_calls_spec.rb +19 -19
data/spec/unit/pops/parser/parse_conditionals_spec.rb +38 -22
data/spec/unit/pops/parser/parse_containers_spec.rb +47 -47
data/spec/unit/pops/parser/parse_heredoc_spec.rb +15 -62
data/spec/unit/pops/parser/parse_resource_spec.rb +75 -70
data/spec/unit/pops/parser/parser_rspec_helper.rb +0 -5
data/spec/unit/pops/parser/parser_spec.rb +7 -7
data/spec/unit/pops/parser/parsing_typed_parameters_spec.rb +0 -7
data/spec/unit/pops/parser/rgen_sanitycheck_spec.rb +2 -2
data/spec/unit/pops/types/class_loader_spec.rb +10 -0
data/spec/unit/pops/types/type_calculator_spec.rb +456 -651
data/spec/unit/pops/types/type_factory_spec.rb +59 -59
data/spec/unit/pops/types/type_parser_spec.rb +2 -10
data/spec/unit/pops/validator/validator_spec.rb +3 -57
data/spec/unit/pops/visitor_spec.rb +4 -4
data/spec/unit/property/boolean_spec.rb +2 -2
data/spec/unit/property/ensure_spec.rb +1 -1
data/spec/unit/property/keyvalue_spec.rb +16 -16
data/spec/unit/property/list_spec.rb +18 -18
data/spec/unit/property/ordered_list_spec.rb +7 -7
data/spec/unit/property_spec.rb +72 -96
data/spec/unit/provider/aixobject_spec.rb +12 -12
data/spec/unit/provider/augeas/augeas_spec.rb +171 -149
data/spec/unit/provider/cisco_spec.rb +2 -2
data/spec/unit/provider/command_spec.rb +1 -1
data/spec/unit/provider/cron/crontab_spec.rb +9 -9
data/spec/unit/provider/cron/parsed_spec.rb +59 -38
data/spec/unit/provider/exec/posix_spec.rb +9 -19
data/spec/unit/provider/exec/shell_spec.rb +13 -13
data/spec/unit/provider/exec/windows_spec.rb +10 -10
data/spec/unit/provider/exec_spec.rb +2 -2
data/spec/unit/provider/file/posix_spec.rb +27 -27
data/spec/unit/provider/file/windows_spec.rb +15 -15
data/spec/unit/provider/group/groupadd_spec.rb +1 -1
data/spec/unit/provider/group/ldap_spec.rb +11 -11
data/spec/unit/provider/group/pw_spec.rb +3 -3
data/spec/unit/provider/group/windows_adsi_spec.rb +48 -62
data/spec/unit/provider/host/parsed_spec.rb +58 -22
data/spec/unit/provider/interface/cisco_spec.rb +3 -3
data/spec/unit/provider/ldap_spec.rb +23 -23
data/spec/unit/provider/macauthorization_spec.rb +6 -6
data/spec/unit/provider/mcx/mcxcontent_spec.rb +6 -6
data/spec/unit/provider/mount/parsed_spec.rb +101 -119
data/spec/unit/provider/mount_spec.rb +0 -0
data/spec/unit/provider/naginator_spec.rb +8 -8
data/spec/unit/provider/nameservice/directoryservice_spec.rb +5 -27
data/spec/unit/provider/nameservice_spec.rb +26 -26
data/spec/unit/provider/network_device_spec.rb +11 -11
data/spec/unit/provider/package/aix_spec.rb +3 -3
data/spec/unit/provider/package/appdmg_spec.rb +1 -1
data/spec/unit/provider/package/apt_spec.rb +4 -4
data/spec/unit/provider/package/aptitude_spec.rb +1 -1
data/spec/unit/provider/package/aptrpm_spec.rb +3 -3
data/spec/unit/provider/package/dpkg_spec.rb +0 -0
data/spec/unit/provider/package/freebsd_spec.rb +1 -1
data/spec/unit/provider/package/gem_spec.rb +12 -12
data/spec/unit/provider/package/hpux_spec.rb +3 -3
data/spec/unit/provider/package/macports_spec.rb +15 -15
data/spec/unit/provider/package/nim_spec.rb +11 -11
data/spec/unit/provider/package/openbsd_spec.rb +72 -37
data/spec/unit/provider/package/opkg_spec.rb +14 -11
data/spec/unit/provider/package/pacman_spec.rb +185 -86
data/spec/unit/provider/package/pip_spec.rb +25 -54
data/spec/unit/provider/package/pkg_spec.rb +145 -71
data/spec/unit/provider/package/pkgdmg_spec.rb +9 -9
data/spec/unit/provider/package/pkgin_spec.rb +18 -18
data/spec/unit/provider/package/pkgutil_spec.rb +19 -19
data/spec/unit/provider/package/portage_spec.rb +8 -4
data/spec/unit/provider/package/rpm_spec.rb +103 -9
data/spec/unit/provider/package/sun_spec.rb +14 -14
data/spec/unit/provider/package/up2date_spec.rb +1 -1
data/spec/unit/provider/package/{urpmi.rb → urpmi_spec.rb} +3 -3
data/spec/unit/provider/package/windows/exe_package_spec.rb +15 -13
data/spec/unit/provider/package/windows/msi_package_spec.rb +16 -16
data/spec/unit/provider/package/windows/package_spec.rb +14 -14
data/spec/unit/provider/package/windows_spec.rb +26 -26
data/spec/unit/provider/package/yum_spec.rb +292 -98
data/spec/unit/provider/package/zypper_spec.rb +20 -31
data/spec/unit/provider/parsedfile_spec.rb +9 -9
data/spec/unit/provider/scheduled_task/win32_taskscheduler_spec.rb +192 -434
data/spec/unit/provider/selboolean_spec.rb +2 -2
data/spec/unit/provider/selmodule_spec.rb +8 -8
data/spec/unit/provider/service/base_spec.rb +27 -38
data/spec/unit/provider/service/daemontools_spec.rb +11 -11
data/spec/unit/provider/service/debian_spec.rb +8 -8
data/spec/unit/provider/service/freebsd_spec.rb +7 -8
data/spec/unit/provider/service/gentoo_spec.rb +12 -13
data/spec/unit/provider/service/init_spec.rb +25 -38
data/spec/unit/provider/service/launchd_spec.rb +19 -125
data/spec/unit/provider/service/openbsd_spec.rb +90 -144
data/spec/unit/provider/service/openrc_spec.rb +14 -14
data/spec/unit/provider/service/openwrt_spec.rb +9 -9
data/spec/unit/provider/service/redhat_spec.rb +14 -15
data/spec/unit/provider/service/runit_spec.rb +11 -11
data/spec/unit/provider/service/smf_spec.rb +19 -19
data/spec/unit/provider/service/src_spec.rb +9 -9
data/spec/unit/provider/service/systemd_spec.rb +33 -15
data/spec/unit/provider/service/upstart_spec.rb +59 -59
data/spec/unit/provider/service/windows_spec.rb +6 -6
data/spec/unit/provider/ssh_authorized_key/parsed_spec.rb +18 -18
data/spec/unit/provider/sshkey/parsed_spec.rb +11 -11
data/spec/unit/provider/user/aix_spec.rb +19 -19
data/spec/unit/provider/user/directoryservice_spec.rb +51 -95
data/spec/unit/provider/user/hpux_spec.rb +24 -3
data/spec/unit/provider/user/ldap_spec.rb +12 -12
data/spec/unit/provider/user/openbsd_spec.rb +77 -0
data/spec/unit/provider/user/pw_spec.rb +5 -5
data/spec/unit/provider/user/user_role_add_spec.rb +20 -20
data/spec/unit/provider/user/useradd_spec.rb +48 -32
data/spec/unit/provider/user/windows_adsi_spec.rb +9 -31
data/spec/unit/provider/vlan/cisco_spec.rb +3 -3
data/spec/unit/provider/yumrepo/inifile_spec.rb +3 -3
data/spec/unit/provider/zfs/zfs_spec.rb +11 -11
data/spec/unit/provider/zone/solaris_spec.rb +22 -55
data/spec/unit/provider/zpool/zpool_spec.rb +22 -22
data/spec/unit/provider_spec.rb +110 -102
data/spec/unit/puppet_spec.rb +15 -8
data/spec/unit/relationship_spec.rb +37 -41
data/spec/unit/reports/http_spec.rb +0 -0
data/spec/unit/reports/store_spec.rb +3 -3
data/spec/unit/reports_spec.rb +5 -5
data/spec/unit/resource/catalog_spec.rb +93 -111
data/spec/unit/resource/status_spec.rb +49 -75
data/spec/unit/resource/type_collection_helper_spec.rb +1 -1
data/spec/unit/resource/type_collection_spec.rb +59 -164
data/spec/unit/resource/type_spec.rb +115 -120
data/spec/unit/resource_spec.rb +176 -159
data/spec/unit/scheduler/job_spec.rb +12 -12
data/spec/unit/scheduler/scheduler_spec.rb +8 -8
data/spec/unit/scheduler/splay_job_spec.rb +4 -4
data/spec/unit/semver_spec.rb +66 -64
data/spec/unit/settings/autosign_setting_spec.rb +1 -0
data/spec/unit/settings/config_file_spec.rb +13 -40
data/spec/unit/settings/directory_setting_spec.rb +1 -1
data/spec/unit/settings/duration_setting_spec.rb +9 -5
data/spec/unit/settings/environment_conf_spec.rb +0 -11
data/spec/unit/settings/file_setting_spec.rb +38 -69
data/spec/unit/settings/ini_file_spec.rb +2 -2
data/spec/unit/settings/path_setting_spec.rb +5 -5
data/spec/unit/settings/priority_setting_spec.rb +7 -7
data/spec/unit/settings/string_setting_spec.rb +7 -7
data/spec/unit/settings/terminus_setting_spec.rb +4 -4
data/spec/unit/settings/value_translator_spec.rb +22 -22
data/spec/unit/settings_spec.rb +189 -338
data/spec/unit/ssl/base_spec.rb +5 -5
data/spec/unit/ssl/certificate_authority/autosign_command_spec.rb +2 -2
data/spec/unit/ssl/certificate_authority/interface_spec.rb +40 -13
data/spec/unit/ssl/certificate_authority_spec.rb +23 -23
data/spec/unit/ssl/certificate_factory_spec.rb +39 -26
data/spec/unit/ssl/certificate_request_attributes_spec.rb +2 -2
data/spec/unit/ssl/certificate_request_spec.rb +52 -40
data/spec/unit/ssl/certificate_revocation_list_spec.rb +10 -10
data/spec/unit/ssl/certificate_spec.rb +35 -38
data/spec/unit/ssl/configuration_spec.rb +12 -14
data/spec/unit/ssl/digest_spec.rb +5 -5
data/spec/unit/ssl/host_spec.rb +91 -91
data/spec/unit/ssl/inventory_spec.rb +11 -34
data/spec/unit/ssl/key_spec.rb +23 -23
data/spec/unit/ssl/oids_spec.rb +28 -15
data/spec/unit/ssl/validator_spec.rb +16 -17
data/spec/unit/status_spec.rb +6 -12
data/spec/unit/transaction/additional_resource_generator_spec.rb +2 -2
data/spec/unit/transaction/event_manager_spec.rb +38 -8
data/spec/unit/transaction/event_spec.rb +29 -29
data/spec/unit/transaction/report_spec.rb +76 -90
data/spec/unit/transaction/resource_harness_spec.rb +42 -42
data/spec/unit/transaction_spec.rb +66 -59
data/spec/unit/type/augeas_spec.rb +20 -20
data/spec/unit/type/component_spec.rb +10 -10
data/spec/unit/type/computer_spec.rb +10 -10
data/spec/unit/type/cron_spec.rb +21 -21
data/spec/unit/type/exec_spec.rb +65 -73
data/spec/unit/type/file/checksum_spec.rb +8 -8
data/spec/unit/type/file/content_spec.rb +144 -85
data/spec/unit/type/file/ctime_spec.rb +4 -4
data/spec/unit/type/file/ensure_spec.rb +11 -11
data/spec/unit/type/file/group_spec.rb +5 -5
data/spec/unit/type/file/mode_spec.rb +30 -28
data/spec/unit/type/file/mtime_spec.rb +4 -4
data/spec/unit/type/file/owner_spec.rb +5 -5
data/spec/unit/type/file/selinux_spec.rb +8 -8
data/spec/unit/type/file/source_spec.rb +118 -135
data/spec/unit/type/file/type_spec.rb +2 -2
data/spec/unit/type/file_spec.rb +161 -160
data/spec/unit/type/filebucket_spec.rb +8 -8
data/spec/unit/type/group_spec.rb +12 -12
data/spec/unit/type/host_spec.rb +41 -25
data/spec/unit/type/interface_spec.rb +6 -6
data/spec/unit/type/k5login_spec.rb +18 -18
data/spec/unit/type/macauthorization_spec.rb +17 -17
data/spec/unit/type/mailalias_spec.rb +34 -6
data/spec/unit/type/maillist_spec.rb +2 -2
data/spec/unit/type/mcx_spec.rb +13 -13
data/spec/unit/type/mount_spec.rb +40 -40
data/spec/unit/type/nagios_spec.rb +23 -23
data/spec/unit/type/noop_metaparam_spec.rb +5 -5
data/spec/unit/type/package/package_settings_spec.rb +9 -9
data/spec/unit/type/package_spec.rb +87 -18
data/spec/unit/type/resources_spec.rb +46 -46
data/spec/unit/type/schedule_spec.rb +83 -83
data/spec/unit/type/scheduled_task_spec.rb +15 -15
data/spec/unit/type/selboolean_spec.rb +2 -2
data/spec/unit/type/selmodule_spec.rb +2 -2
data/spec/unit/type/service_spec.rb +24 -24
data/spec/unit/type/ssh_authorized_key_spec.rb +2 -2
data/spec/unit/type/sshkey_spec.rb +0 -0
data/spec/unit/type/stage_spec.rb +1 -1
data/spec/unit/type/tidy_spec.rb +58 -39
data/spec/unit/type/user_spec.rb +56 -56
data/spec/unit/type/vlan_spec.rb +6 -6
data/spec/unit/type/whit_spec.rb +1 -1
data/spec/unit/type/yumrepo_spec.rb +15 -0
data/spec/unit/type/zfs_spec.rb +3 -3
data/spec/unit/type/zone_spec.rb +19 -19
data/spec/unit/type/zpool_spec.rb +15 -15
data/spec/unit/type_spec.rb +236 -163
data/spec/unit/util/autoload_spec.rb +31 -25
data/spec/unit/util/backups_spec.rb +4 -4
data/spec/unit/util/checksums_spec.rb +55 -27
data/spec/unit/util/colors_spec.rb +6 -50
data/spec/unit/util/command_line_spec.rb +13 -41
data/spec/unit/util/command_line_utils/puppet_option_parser_spec.rb +2 -2
data/spec/unit/util/constant_inflector_spec.rb +12 -12
data/spec/unit/util/diff_spec.rb +4 -4
data/spec/unit/util/errors_spec.rb +5 -5
data/spec/unit/util/execution_spec.rb +74 -29
data/spec/unit/util/execution_stub_spec.rb +10 -10
data/spec/unit/util/feature_spec.rb +15 -19
data/spec/unit/util/filetype_spec.rb +9 -9
data/spec/unit/util/http_proxy_spec.rb +18 -18
data/spec/unit/util/inifile_spec.rb +2 -2
data/spec/unit/util/json_lockfile_spec.rb +1 -1
data/spec/unit/util/ldap/connection_spec.rb +6 -6
data/spec/unit/util/ldap/generator_spec.rb +8 -8
data/spec/unit/util/ldap/manager_spec.rb +40 -40
data/spec/unit/util/lockfile_spec.rb +13 -13
data/spec/unit/util/log/destinations_spec.rb +52 -49
data/spec/unit/util/log_spec.rb +48 -173
data/spec/unit/util/logging_spec.rb +120 -3
data/spec/unit/util/metric_spec.rb +18 -33
data/spec/unit/util/monkey_patches_spec.rb +18 -139
data/spec/unit/util/nagios_maker_spec.rb +2 -2
data/spec/unit/util/network_device/cisco/device_spec.rb +23 -23
data/spec/unit/util/network_device/cisco/facts_spec.rb +3 -3
data/spec/unit/util/network_device/cisco/interface_spec.rb +0 -0
data/spec/unit/util/network_device/config_spec.rb +10 -16
data/spec/unit/util/network_device/ipcalc_spec.rb +10 -10
data/spec/unit/util/network_device/transport/base_spec.rb +2 -2
data/spec/unit/util/network_device/transport/ssh_spec.rb +10 -10
data/spec/unit/util/network_device/transport/telnet_spec.rb +3 -3
data/spec/unit/util/network_device_spec.rb +2 -2
data/spec/unit/util/package_spec.rb +2 -2
data/spec/unit/util/pidlock_spec.rb +38 -38
data/spec/unit/util/posix_spec.rb +25 -25
data/spec/unit/util/profiler/aggregate_spec.rb +14 -18
data/spec/unit/util/profiler/around_profiler_spec.rb +6 -6
data/spec/unit/util/profiler/logging_spec.rb +8 -8
data/spec/unit/util/profiler/object_counts_spec.rb +3 -5
data/spec/unit/util/profiler/wall_clock_spec.rb +1 -1
data/spec/unit/util/profiler_spec.rb +6 -14
data/spec/unit/util/rdoc_spec.rb +0 -85
data/spec/unit/util/reference_spec.rb +1 -1
data/spec/unit/util/resource_template_spec.rb +2 -2
data/spec/unit/util/{retryaction_spec.rb → retry_action_spec.rb} +25 -2
data/spec/unit/util/rubygems_spec.rb +8 -8
data/spec/unit/util/run_mode_spec.rb +159 -17
data/spec/unit/util/selinux_spec.rb +61 -39
data/spec/unit/util/ssl_spec.rb +13 -13
data/spec/unit/util/storage_spec.rb +27 -27
data/spec/unit/util/suidmanager_spec.rb +56 -67
data/spec/unit/util/symbolic_file_mode_spec.rb +15 -16
data/spec/unit/util/tag_set_spec.rb +5 -5
data/spec/unit/util/tagging_spec.rb +0 -0
data/spec/unit/util/terminal_spec.rb +5 -5
data/spec/unit/util/user_attr_spec.rb +6 -6
data/spec/unit/util/warnings_spec.rb +9 -1
data/spec/unit/util/watcher_spec.rb +1 -1
data/spec/unit/util/windows/access_control_entry_spec.rb +9 -9
data/spec/unit/util/windows/access_control_list_spec.rb +21 -21
data/spec/unit/util/windows/adsi_spec.rb +71 -209
data/spec/unit/util/windows/api_types_spec.rb +3 -3
data/spec/unit/util/windows/registry_spec.rb +71 -46
data/spec/unit/util/windows/root_certs_spec.rb +1 -1
data/spec/unit/util/windows/security_descriptor_spec.rb +18 -18
data/spec/unit/util/windows/sid_spec.rb +40 -20
data/spec/unit/util/windows/string_spec.rb +4 -4
data/spec/unit/util/yaml_spec.rb +1 -1
data/spec/unit/util_spec.rb +73 -124
data/spec/unit/version_spec.rb +4 -4
data/spec/watchr.rb +1 -5
data/tasks/benchmark.rake +1 -6
data/tasks/ci.rake +1 -1
data/tasks/manpages.rake +0 -9
data/tasks/parallel.rake +4 -7
data/tasks/parser.rake +0 -5
metadata +175 -461
data/conf/tagmail.conf +0 -16
data/ext/debian/puppet.conf +0 -14
data/ext/debian/puppetmaster-common.puppetqd.default +0 -27
data/ext/debian/puppetmaster-common.puppetqd.init +0 -84
data/ext/gentoo/puppet/puppet.conf +0 -25
data/ext/ips/puppet.conf +0 -29
data/ext/nagios/naggen +0 -309
data/ext/puppet-load.rb +0 -393
data/ext/redhat/puppet.conf +0 -25
data/ext/redhat/queue.init +0 -105
data/lib/hiera/backend/puppet_backend.rb +0 -103
data/lib/puppet/application/instrumentation_data.rb +0 -7
data/lib/puppet/application/instrumentation_listener.rb +0 -7
data/lib/puppet/application/instrumentation_probe.rb +0 -7
data/lib/puppet/application/kick.rb +0 -351
data/lib/puppet/application/queue.rb +0 -161
data/lib/puppet/application/secret_agent.rb +0 -9
data/lib/puppet/dsl.rb +0 -7
data/lib/puppet/dsl/resource_api.rb +0 -120
data/lib/puppet/dsl/resource_type_api.rb +0 -34
data/lib/puppet/face/instrumentation_data.rb +0 -30
data/lib/puppet/face/instrumentation_listener.rb +0 -98
data/lib/puppet/face/instrumentation_probe.rb +0 -79
data/lib/puppet/face/secret_agent.rb +0 -54
data/lib/puppet/feature/pson.rb +0 -4
data/lib/puppet/feature/rails.rb +0 -47
data/lib/puppet/feature/rdoc1.rb +0 -16
data/lib/puppet/feature/rubygems.rb +0 -7
data/lib/puppet/feature/stomp.rb +0 -5
data/lib/puppet/file_collection.rb +0 -19
data/lib/puppet/file_collection/lookup.rb +0 -10
data/lib/puppet/file_system/file18.rb +0 -5
data/lib/puppet/functions/defined.rb +0 -130
data/lib/puppet/indirector/active_record.rb +0 -29
data/lib/puppet/indirector/catalog/active_record.rb +0 -39
data/lib/puppet/indirector/catalog/queue.rb +0 -9
data/lib/puppet/indirector/couch.rb +0 -78
data/lib/puppet/indirector/facts/active_record.rb +0 -44
data/lib/puppet/indirector/facts/couch.rb +0 -36
data/lib/puppet/indirector/facts/inventory_active_record.rb +0 -110
data/lib/puppet/indirector/facts/inventory_service.rb +0 -20
data/lib/puppet/indirector/facts/rest.rb +0 -8
data/lib/puppet/indirector/instrumentation_data.rb +0 -3
data/lib/puppet/indirector/instrumentation_data/local.rb +0 -22
data/lib/puppet/indirector/instrumentation_data/rest.rb +0 -8
data/lib/puppet/indirector/instrumentation_listener.rb +0 -3
data/lib/puppet/indirector/instrumentation_listener/local.rb +0 -26
data/lib/puppet/indirector/instrumentation_listener/rest.rb +0 -8
data/lib/puppet/indirector/instrumentation_probe.rb +0 -3
data/lib/puppet/indirector/instrumentation_probe/local.rb +0 -27
data/lib/puppet/indirector/instrumentation_probe/rest.rb +0 -8
data/lib/puppet/indirector/node/active_record.rb +0 -22
data/lib/puppet/indirector/queue.rb +0 -80
data/lib/puppet/indirector/resource/active_record.rb +0 -104
data/lib/puppet/indirector/resource/rest.rb +0 -17
data/lib/puppet/indirector/run/local.rb +0 -15
data/lib/puppet/indirector/run/rest.rb +0 -12
data/lib/puppet/module_tool/modulefile.rb +0 -78
data/lib/puppet/network/authentication.rb +0 -35
data/lib/puppet/network/http/api/v2.rb +0 -32
data/lib/puppet/network/http/api/v2/authorization.rb +0 -15
data/lib/puppet/parser/ast/arithmetic_operator.rb +0 -91
data/lib/puppet/parser/ast/astarray.rb +0 -50
data/lib/puppet/parser/ast/asthash.rb +0 -37
data/lib/puppet/parser/ast/boolean_operator.rb +0 -46
data/lib/puppet/parser/ast/caseopt.rb +0 -52
data/lib/puppet/parser/ast/casestatement.rb +0 -41
data/lib/puppet/parser/ast/collection.rb +0 -53
data/lib/puppet/parser/ast/collexpr.rb +0 -109
data/lib/puppet/parser/ast/comparison_operator.rb +0 -38
data/lib/puppet/parser/ast/definition.rb +0 -17
data/lib/puppet/parser/ast/else.rb +0 -22
data/lib/puppet/parser/ast/function.rb +0 -59
data/lib/puppet/parser/ast/ifstatement.rb +0 -34
data/lib/puppet/parser/ast/in_operator.rb +0 -24
data/lib/puppet/parser/ast/lambda.rb +0 -135
data/lib/puppet/parser/ast/match_operator.rb +0 -28
data/lib/puppet/parser/ast/method_call.rb +0 -77
data/lib/puppet/parser/ast/minus.rb +0 -23
data/lib/puppet/parser/ast/nop.rb +0 -11
data/lib/puppet/parser/ast/not.rb +0 -19
data/lib/puppet/parser/ast/relationship.rb +0 -47
data/lib/puppet/parser/ast/resource_defaults.rb +0 -24
data/lib/puppet/parser/ast/resource_override.rb +0 -62
data/lib/puppet/parser/ast/resource_reference.rb +0 -28
data/lib/puppet/parser/ast/selector.rb +0 -50
data/lib/puppet/parser/ast/vardef.rb +0 -38
data/lib/puppet/parser/code_merger.rb +0 -13
data/lib/puppet/parser/collector.rb +0 -177
data/lib/puppet/parser/functions/extlookup.rb +0 -153
data/lib/puppet/parser/functions/search.rb +0 -12
data/lib/puppet/parser/grammar.ra +0 -806
data/lib/puppet/parser/lexer.rb +0 -608
data/lib/puppet/parser/makefile +0 -8
data/lib/puppet/parser/methods.rb +0 -69
data/lib/puppet/parser/parser.rb +0 -2559
data/lib/puppet/parser/parser_support.rb +0 -195
data/lib/puppet/pops/binder/lookup.rb +0 -216
data/lib/puppet/pops/migration/migration_checker.rb +0 -45
data/lib/puppet/pops/model/ast_tree_dumper.rb +0 -386
data/lib/puppet/provider/package/msi.rb +0 -125
data/lib/puppet/provider/package/yumhelper.py +0 -159
data/lib/puppet/rails.rb +0 -139
data/lib/puppet/rails/benchmark.rb +0 -63
data/lib/puppet/rails/database/001_add_created_at_to_all_tables.rb +0 -13
data/lib/puppet/rails/database/002_remove_duplicated_index_on_all_tables.rb +0 -13
data/lib/puppet/rails/database/003_add_environment_to_host.rb +0 -9
data/lib/puppet/rails/database/004_add_inventory_service_tables.rb +0 -36
data/lib/puppet/rails/database/schema.rb +0 -136
data/lib/puppet/rails/fact_name.rb +0 -7
data/lib/puppet/rails/fact_value.rb +0 -10
data/lib/puppet/rails/host.rb +0 -258
data/lib/puppet/rails/inventory_fact.rb +0 -5
data/lib/puppet/rails/inventory_node.rb +0 -43
data/lib/puppet/rails/param_name.rb +0 -25
data/lib/puppet/rails/param_value.rb +0 -74
data/lib/puppet/rails/puppet_tag.rb +0 -10
data/lib/puppet/rails/resource.rb +0 -235
data/lib/puppet/rails/resource_tag.rb +0 -26
data/lib/puppet/rails/source_file.rb +0 -8
data/lib/puppet/reports/rrdgraph.rb +0 -128
data/lib/puppet/reports/tagmail.rb +0 -179
data/lib/puppet/run.rb +0 -109
data/lib/puppet/util/cacher.rb +0 -74
data/lib/puppet/util/inline_docs.rb +0 -26
data/lib/puppet/util/instrumentation.rb +0 -152
data/lib/puppet/util/instrumentation/data.rb +0 -46
data/lib/puppet/util/instrumentation/indirection_probe.rb +0 -41
data/lib/puppet/util/instrumentation/instrumentable.rb +0 -136
data/lib/puppet/util/instrumentation/listener.rb +0 -72
data/lib/puppet/util/instrumentation/listeners/log.rb +0 -23
data/lib/puppet/util/instrumentation/listeners/performance.rb +0 -24
data/lib/puppet/util/log/rate_limited_logger.rb +0 -40
data/lib/puppet/util/monkey_patches/lines.rb +0 -13
data/lib/puppet/util/plugins.rb +0 -82
data/lib/puppet/util/pson.rb +0 -13
data/lib/puppet/util/queue.rb +0 -96
data/lib/puppet/util/queue/stomp.rb +0 -60
data/lib/puppet/util/rails/cache_accumulator.rb +0 -65
data/lib/puppet/util/rails/collection_merger.rb +0 -17
data/lib/puppet/util/rails/reference_serializer.rb +0 -32
data/lib/puppet/util/rdoc/parser/puppet_parser_rdoc1.rb +0 -19
data/lib/puppet/util/retryaction.rb +0 -47
data/lib/puppet/util/zaml.rb +0 -419
data/lib/puppet/vendor/load_safe_yaml.rb +0 -1
data/lib/puppet/vendor/safe_yaml/CHANGES.md +0 -104
data/lib/puppet/vendor/safe_yaml/Gemfile +0 -11
data/lib/puppet/vendor/safe_yaml/LICENSE.txt +0 -22
data/lib/puppet/vendor/safe_yaml/PUPPET_README.md +0 -6
data/lib/puppet/vendor/safe_yaml/README.md +0 -179
data/lib/puppet/vendor/safe_yaml/Rakefile +0 -6
data/lib/puppet/vendor/safe_yaml/lib/safe_yaml.rb +0 -253
data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/deep.rb +0 -34
data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/parse/date.rb +0 -27
data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/parse/hexadecimal.rb +0 -12
data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/parse/sexagesimal.rb +0 -26
data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/psych_handler.rb +0 -92
data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/psych_resolver.rb +0 -52
data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/resolver.rb +0 -94
data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/safe_to_ruby_visitor.rb +0 -17
data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/syck_hack.rb +0 -36
data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/syck_node_monkeypatch.rb +0 -43
data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/syck_resolver.rb +0 -38
data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform.rb +0 -41
data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_boolean.rb +0 -21
data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_date.rb +0 -11
data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_float.rb +0 -33
data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_integer.rb +0 -25
data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_nil.rb +0 -18
data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_symbol.rb +0 -13
data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/transformation_map.rb +0 -47
data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/version.rb +0 -3
data/lib/puppet/vendor/safe_yaml/run_specs_all_ruby_versions.sh +0 -21
data/lib/puppet/vendor/safe_yaml/safe_yaml.gemspec +0 -18
data/lib/puppet/vendor/safe_yaml/spec/exploit.1.9.2.yaml +0 -2
data/lib/puppet/vendor/safe_yaml/spec/exploit.1.9.3.yaml +0 -2
data/lib/puppet/vendor/safe_yaml/spec/psych_resolver_spec.rb +0 -10
data/lib/puppet/vendor/safe_yaml/spec/resolver_specs.rb +0 -250
data/lib/puppet/vendor/safe_yaml/spec/safe_yaml_spec.rb +0 -702
data/lib/puppet/vendor/safe_yaml/spec/spec_helper.rb +0 -18
data/lib/puppet/vendor/safe_yaml/spec/support/exploitable_back_door.rb +0 -29
data/lib/puppet/vendor/safe_yaml/spec/syck_resolver_spec.rb +0 -10
data/lib/puppet/vendor/safe_yaml/spec/transform/base64_spec.rb +0 -11
data/lib/puppet/vendor/safe_yaml/spec/transform/to_date_spec.rb +0 -34
data/lib/puppet/vendor/safe_yaml/spec/transform/to_float_spec.rb +0 -42
data/lib/puppet/vendor/safe_yaml/spec/transform/to_integer_spec.rb +0 -59
data/lib/puppet/vendor/safe_yaml/spec/transform/to_symbol_spec.rb +0 -49
data/lib/puppet/vendor/safe_yaml_patches.rb +0 -9
data/lib/puppetx.rb +0 -89
data/man/man8/puppet-instrumentation_data.8 +0 -141
data/man/man8/puppet-instrumentation_listener.8 +0 -218
data/man/man8/puppet-instrumentation_probe.8 +0 -203
data/man/man8/puppet-kick.8 +0 -131
data/man/man8/puppet-queue.8 +0 -55
data/man/man8/puppet-secret_agent.8 +0 -70
data/spec/fixtures/module.tar.gz +0 -0
data/spec/fixtures/unit/provider/package/pkg/publisher +0 -2
data/spec/fixtures/unit/provider/package/pkg/simple +0 -2
data/spec/fixtures/yaml/report0.25.x.yaml +0 -64
data/spec/integration/indirector/catalog/queue_spec.rb +0 -55
data/spec/integration/module_tool/tar/mini_spec.rb +0 -28
data/spec/integration/parser/dynamic_scoping_spec.rb +0 -131
data/spec/integration/parser/future_compiler_spec.rb +0 -822
data/spec/integration/parser/parser_spec.rb +0 -207
data/spec/integration/parser/ruby_manifest_spec.rb +0 -119
data/spec/integration/type/sshkey_spec.rb +0 -22
data/spec/integration/util/feature_spec.rb +0 -53
data/spec/lib/puppet_spec/database.rb +0 -29
data/spec/monkey_patches/alias_should_to_must.rb +0 -21
data/spec/shared_contexts/platform.rb +0 -52
data/spec/unit/application/kick_spec.rb +0 -296
data/spec/unit/application/queue_spec.rb +0 -168
data/spec/unit/application/secret_agent_spec.rb +0 -34
data/spec/unit/dsl/resource_api_spec.rb +0 -180
data/spec/unit/dsl/resource_type_api_spec.rb +0 -53
data/spec/unit/face/instrumentation_data_spec.rb +0 -7
data/spec/unit/face/instrumentation_listener_spec.rb +0 -38
data/spec/unit/face/instrumentation_probe_spec.rb +0 -21
data/spec/unit/face/secret_agent_spec.rb +0 -27
data/spec/unit/functions/defined_spec.rb +0 -291
data/spec/unit/hiera/backend/puppet_backend_spec.rb +0 -148
data/spec/unit/indirector/active_record_spec.rb +0 -75
data/spec/unit/indirector/catalog/active_record_spec.rb +0 -107
data/spec/unit/indirector/catalog/queue_spec.rb +0 -19
data/spec/unit/indirector/facts/active_record_spec.rb +0 -113
data/spec/unit/indirector/facts/couch_spec.rb +0 -102
data/spec/unit/indirector/facts/inventory_active_record_spec.rb +0 -175
data/spec/unit/indirector/facts/inventory_service_spec.rb +0 -21
data/spec/unit/indirector/facts/rest_spec.rb +0 -10
data/spec/unit/indirector/instrumentation_data/local_spec.rb +0 -52
data/spec/unit/indirector/instrumentation_data/rest_spec.rb +0 -11
data/spec/unit/indirector/instrumentation_listener/local_spec.rb +0 -65
data/spec/unit/indirector/instrumentation_listener/rest_spec.rb +0 -11
data/spec/unit/indirector/instrumentation_probe/local_spec.rb +0 -65
data/spec/unit/indirector/instrumentation_probe/rest_spec.rb +0 -11
data/spec/unit/indirector/node/active_record_spec.rb +0 -48
data/spec/unit/indirector/queue_spec.rb +0 -115
data/spec/unit/indirector/resource/active_record_spec.rb +0 -166
data/spec/unit/indirector/resource/rest_spec.rb +0 -10
data/spec/unit/indirector/run/local_spec.rb +0 -21
data/spec/unit/indirector/run/rest_spec.rb +0 -10
data/spec/unit/network/authentication_spec.rb +0 -104
data/spec/unit/network/http/api/v2_spec.rb +0 -14
data/spec/unit/parser/ast/arithmetic_operator_spec.rb +0 -160
data/spec/unit/parser/ast/astarray_spec.rb +0 -56
data/spec/unit/parser/ast/asthash_spec.rb +0 -98
data/spec/unit/parser/ast/boolean_operator_spec.rb +0 -54
data/spec/unit/parser/ast/casestatement_spec.rb +0 -168
data/spec/unit/parser/ast/collection_spec.rb +0 -70
data/spec/unit/parser/ast/collexpr_spec.rb +0 -120
data/spec/unit/parser/ast/comparison_operator_spec.rb +0 -118
data/spec/unit/parser/ast/definition_spec.rb +0 -21
data/spec/unit/parser/ast/function_spec.rb +0 -92
data/spec/unit/parser/ast/hostclass_spec.rb +0 -72
data/spec/unit/parser/ast/ifstatement_spec.rb +0 -77
data/spec/unit/parser/ast/in_operator_spec.rb +0 -61
data/spec/unit/parser/ast/match_operator_spec.rb +0 -51
data/spec/unit/parser/ast/minus_spec.rb +0 -37
data/spec/unit/parser/ast/node_spec.rb +0 -30
data/spec/unit/parser/ast/nop_spec.rb +0 -19
data/spec/unit/parser/ast/not_spec.rb +0 -31
data/spec/unit/parser/ast/relationship_spec.rb +0 -87
data/spec/unit/parser/ast/resource_defaults_spec.rb +0 -21
data/spec/unit/parser/ast/resource_override_spec.rb +0 -50
data/spec/unit/parser/ast/resource_reference_spec.rb +0 -56
data/spec/unit/parser/ast/resource_spec.rb +0 -183
data/spec/unit/parser/ast/resourceparam_spec.rb +0 -51
data/spec/unit/parser/ast/selector_spec.rb +0 -88
data/spec/unit/parser/ast/vardef_spec.rb +0 -68
data/spec/unit/parser/ast_spec.rb +0 -76
data/spec/unit/parser/collector_spec.rb +0 -438
data/spec/unit/parser/functions/extlookup_spec.rb +0 -102
data/spec/unit/parser/functions/search_spec.rb +0 -28
data/spec/unit/parser/lexer_spec.rb +0 -877
data/spec/unit/parser/parser_spec.rb +0 -535
data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +0 -19
data/spec/unit/pops/migration_spec.rb +0 -180
data/spec/unit/pops/model/ast_transformer_spec.rb +0 -76
data/spec/unit/pops/transformer/transform_basic_expressions_spec.rb +0 -243
data/spec/unit/pops/transformer/transform_calls_spec.rb +0 -115
data/spec/unit/pops/transformer/transform_conditionals_spec.rb +0 -123
data/spec/unit/pops/transformer/transform_containers_spec.rb +0 -190
data/spec/unit/pops/transformer/transformer_rspec_helper.rb +0 -27
data/spec/unit/pops/validation_spec.rb +0 -66
data/spec/unit/provider/package/msi_spec.rb +0 -229
data/spec/unit/rails/host_spec.rb +0 -162
data/spec/unit/rails/param_value_spec.rb +0 -46
data/spec/unit/rails/resource_spec.rb +0 -115
data/spec/unit/rails_spec.rb +0 -244
data/spec/unit/reports/rrdgraph_spec.rb +0 -29
data/spec/unit/reports/tagmail_spec.rb +0 -218
data/spec/unit/run_spec.rb +0 -175
data/spec/unit/util/cache_accumulator_spec.rb +0 -74
data/spec/unit/util/cacher_spec.rb +0 -107
data/spec/unit/util/inline_docs_spec.rb +0 -31
data/spec/unit/util/instrumentation/data_spec.rb +0 -46
data/spec/unit/util/instrumentation/indirection_probe_spec.rb +0 -21
data/spec/unit/util/instrumentation/instrumentable_spec.rb +0 -186
data/spec/unit/util/instrumentation/listener_spec.rb +0 -101
data/spec/unit/util/instrumentation/listeners/log_spec.rb +0 -34
data/spec/unit/util/instrumentation/listeners/performance_spec.rb +0 -36
data/spec/unit/util/instrumentation_spec.rb +0 -181
data/spec/unit/util/log/rate_limited_logger_spec.rb +0 -51
data/spec/unit/util/monkey_patches/lines_spec.rb +0 -83
data/spec/unit/util/queue/stomp_spec.rb +0 -137
data/spec/unit/util/queue_spec.rb +0 -94
data/spec/unit/util/rdoc/parser_spec.rb +0 -608
data/spec/unit/util/reference_serializer_spec.rb +0 -51
data/spec/unit/util/zaml_spec.rb +0 -308

data/lib/puppet/pops/model/factory.rb CHANGED

@@ -34,7 +34,7 @@ class Puppet::Pops::Model::Factory
   # Polymorphic build
   def build(o, *args)
     begin
-      @@build_visitor.visit_this(self, o, *args)
+      @@build_visitor.visit_this(self, o, args)
     rescue =>e
       # debug here when in trouble...
       raise e
@@ -77,7 +77,7 @@ class Puppet::Pops::Model::Factory
   def build_AccessExpression(o, left, *keys)
     o.left_expr = to_ops(left)
-    keys.each {|expr| o.addKeys(to_ops(expr)) }
+    o.keys = keys.map {|expr| to_ops(expr) }
     o
   end
@@ -88,14 +88,14 @@ class Puppet::Pops::Model::Factory
   end
   def build_BlockExpression(o, *args)
-    args.each {|expr| o.addStatements(to_ops(expr)) }
+    o.statements = args.map {|expr| to_ops(expr) }
     o
   end
   def build_CollectExpression(o, type_expr, query_expr, attribute_operations)
     o.type_expr = to_ops(type_expr)
     o.query = build(query_expr)
-    attribute_operations.each {|op| o.addOperations(build(op)) }
+    o.operations = attribute_operations.map {|op| build(op) }
     o
   end
@@ -105,7 +105,7 @@ class Puppet::Pops::Model::Factory
   end
   def build_ConcatenatedString(o, *args)
-    args.each {|expr| o.addSegments(build(expr)) }
+    o.segments = args.map {|expr| build(expr) }
     o
   end
@@ -147,13 +147,12 @@ class Puppet::Pops::Model::Factory
   def build_ResourceOverrideExpression(o, resources, attribute_operations)
     o.resources = build(resources)
-    attribute_operations.each {|ao| o.addOperations(build(ao)) }
+    o.operations = attribute_operations.map {|ao| build(ao) }
     o
   end
-  def build_ReservedWord(o, name, future)
+  def build_ReservedWord(o, name)
     o.word = name
-    o.future = future
     o
   end
@@ -164,12 +163,12 @@ class Puppet::Pops::Model::Factory
   end
   def build_LiteralHash(o, *keyed_entries)
-    keyed_entries.each {|entry| o.addEntries build(entry) }
+    o.entries = keyed_entries.map {|entry| build(entry) }
     o
   end
   def build_LiteralList(o, *values)
-    values.each {|v| o.addValues build(v) }
+    o.values = values.map {|v| build(v) }
     o
   end
@@ -217,14 +216,14 @@ class Puppet::Pops::Model::Factory
   end
   def build_LambdaExpression(o, parameters, body)
-    parameters.each {|p| o.addParameters(build(p)) }
+    o.parameters = parameters.map {|p| build(p) }
     b = f_build_body(body)
     o.body = to_ops(b) if b
     o
   end
   def build_NamedDefinition(o, name, parameters, body)
-    parameters.each {|p| o.addParameters(build(p)) }
+    o.parameters = parameters.map {|p| build(p) }
     b = f_build_body(body)
     o.body = b.current if b
     o.name = name
@@ -236,7 +235,7 @@ class Puppet::Pops::Model::Factory
   # @param parent [Expression] parent node matcher
   # @param body [Object] see {#f_build_body}
   def build_NodeDefinition(o, hosts, parent, body)
-    hosts.each {|h| o.addHost_matches(build(h)) }
+    o.host_matches = hosts.map {|h| build(h) }
     o.parent = build(parent) if parent # no nop here
     b = f_build_body(body)
     o.body = b.current if b
@@ -261,7 +260,7 @@ class Puppet::Pops::Model::Factory
   def build_ResourceExpression(o, type_name, bodies)
     o.type_name = build(type_name)
-    bodies.each {|b| o.addBodies(build(b)) }
+    o.bodies = bodies.map {|b| build(b) }
     o
   end
@@ -272,19 +271,19 @@ class Puppet::Pops::Model::Factory
   def build_ResourceBody(o, title_expression, attribute_operations)
     o.title = build(title_expression)
-    attribute_operations.each {|ao| o.addOperations(build(ao)) }
+    o.operations = attribute_operations.map {|ao| build(ao) }
     o
   end
   def build_ResourceDefaultsExpression(o, type_ref, attribute_operations)
     o.type_ref = build(type_ref)
-    attribute_operations.each {|ao| o.addOperations(build(ao)) }
+    o.operations = attribute_operations.map {|ao| build(ao) }
     o
   end
   def build_SelectorExpression(o, left, *selectors)
     o.left_expr = to_ops(left)
-    selectors.each {|s| o.addSelectors(build(s)) }
+    o.selectors = selectors.map {|s| build(s) }
     o
   end
@@ -327,7 +326,7 @@ class Puppet::Pops::Model::Factory
   def build_Program(o, body, definitions, locator)
     o.body = to_ops(body)
     # non containment
-    definitions.each { |d| o.addDefinitions(d) }
+    o.definitions = definitions
     o.source_ref = locator.file
     o.source_text = locator.string
     o.line_offsets = locator.line_index
@@ -639,8 +638,8 @@ class Puppet::Pops::Model::Factory
     LAMBDA(params, new(Model::EppExpression, parameters_specified, body))
   end
-  def self.RESERVED(name, future=false)
-    new(Model::ReservedWord, name, future)
+  def self.RESERVED(name)
+    new(Model::ReservedWord, name)
   end
   # TODO: This is the same a fqn factory method, don't know if callers to fqn and QNAME can live with the
@@ -774,7 +773,7 @@ class Puppet::Pops::Model::Factory
     'info'    => true,
     'notice'  => true,
     'warning' => true,
-    'err'     => true,
+    'error'   => true,
     'fail'    => true,
     'import'  => true  # discontinued, but transform it to make it call error reporting function

data/lib/puppet/pops/model/model.rb CHANGED

@@ -102,7 +102,7 @@ module Puppet::Pops
       module ClassModule
         def locator
           unless result = getLocator
-            setLocator(result = Puppet::Pops::Parser::Locator.locator(source_text, source_ref(), line_offsets))
+            setLocator(result = Puppet::Pops::Parser::Locator.locator(source_text, source_ref(), line_offsets, char_offsets))
           end
           result
         end

data/lib/puppet/pops/model/model_label_provider.rb CHANGED

@@ -11,7 +11,7 @@ class Puppet::Pops::Model::ModelLabelProvider < Puppet::Pops::LabelProvider
   # If a Class is given, its name is used as label
   #
   def label o
-    @@label_visitor.visit(o)
+    @@label_visitor.visit_this_0(self, o)
   end
   def label_Factory o                     ; label(o.current)                    end

data/lib/puppet/pops/model/model_meta.rb CHANGED

@@ -258,7 +258,7 @@ module Puppet::Pops::Model
   class CollectExpression < Expression
     contains_one_uni 'type_expr', Expression, :lowerBound => 1
     contains_one_uni 'query', QueryExpression, :lowerBound => 1
-    contains_many_uni 'operations', AbstractAttributeOperation
+    contains_many_uni 'operations', AttributeOperation
   end
   class Parameter < Positioned
@@ -463,12 +463,9 @@ module Puppet::Pops::Model
     has_attr 'value', String, :lowerBound => 1
   end
-  # Represents a parsed reserved word. If the 'future' attribute is true
-  # the ReserwedWord functions as a deprecation warning + string value
-  #
+  # Represents a parsed reserved word
   class ReservedWord < LiteralValue
     has_attr 'word', String, :lowerBound => 1
-    has_attr 'future', Boolean
   end
   # A DSL CLASSREF (one or multiple parts separated by '::' where (at least) the first part starts with an upper case letter).
@@ -486,7 +483,7 @@ module Puppet::Pops::Model
   class EppExpression < Expression
     # EPP can be specified without giving any parameter specification.
     # However, the parameters of the lambda in that case are the empty
-    # array, which is the same as when the parameters are explicity
+    # array, which is the same as when the parameters are explicitly
     # specified as empty. This attribute tracks that difference.
     has_attr 'parameters_specified', Boolean
     contains_one_uni 'body', Expression
@@ -566,14 +563,20 @@ module Puppet::Pops::Model
   # A Program is the top level construct returned by the parser
   # it contains the parsed result in the body, and has a reference to the full source text,
-  # and its origin. The line_offset's is an array with the start offset of each line.
+  # and its origin. The line_offset's is an array with the start offset of each line measured
+  # in bytes or characters (as given by the attribute char_offsets). The `char_offsets` setting
+  # applies to all offsets recorded in the mode (not just the line_offsets).
   #
+  # A model that will be shared across different platforms should use char_offsets true as the byte
+  # offsets are platform and encoding dependent.
+  #
   class Program < PopsObject
     contains_one_uni 'body', Expression
     has_many 'definitions', Definition
     has_attr 'source_text', String
     has_attr 'source_ref', String
     has_many_attr 'line_offsets', Integer
+    has_attr 'char_offsets', Boolean, :defaultValueLiteral => 'false'
     has_attr 'locator', Object, :lowerBound => 1, :transient => true
   end
 end

data/lib/puppet/pops/model/tree_dumper.rb CHANGED

@@ -12,7 +12,7 @@ class Puppet::Pops::Model::TreeDumper
   end
   def do_dump(o)
-    @@dump_visitor.visit_this(self, o)
+    @@dump_visitor.visit_this_0(self, o)
   end
   def indent

data/lib/puppet/pops/parser/egrammar.ra CHANGED

@@ -21,7 +21,6 @@ token HEREDOC SUBLOCATE
 token RENDER_STRING RENDER_EXPR EPP_START EPP_END EPP_END_TRIM
 token FUNCTION
 token PRIVATE ATTR TYPE
-token APPLICATION_R CONSUMES_R PRODUCES_R
 token LOW
 prechigh
@@ -355,7 +354,7 @@ unless_expression
       loc result, val[0], val[4]
     }
   | UNLESS expression LBRACE RBRACE unless_else {
-      result = Factory.UNLESS(val[1], nil, val[4])
+      result = Factory.UNLESS(val[1], nil, nil)
       loc result, val[0], val[4]
     }
@@ -454,9 +453,6 @@ attribute_operations
   attribute_name
     : NAME
     | keyword
-    | APPLICATION_R
-    | CONSUMES_R
-    | PRODUCES_R
 #    | BOOLEAN
   # In this version, illegal combinations are validated instead of producing syntax errors
@@ -585,11 +581,6 @@ node_definition_expression
 #   TODO: The error that "class" is not a valid classname is bad - classname rule is also used for other things
 classname
   : NAME
-  | WORD
-  | CLASSREF
-  | APPLICATION_R
-  | CONSUMES_R
-  | PRODUCES_R
   | CLASS { error val[0], "'class' is not a valid classname" }
 # Produces Array<Model::Parameter>
@@ -638,9 +629,6 @@ reserved_word
   | PRIVATE   { result = Factory.RESERVED(val[0][:value]) ; loc result, val[0] }
   | TYPE      { result = Factory.RESERVED(val[0][:value]) ; loc result, val[0] }
   | ATTR      { result = Factory.RESERVED(val[0][:value]) ; loc result, val[0] }
-  | APPLICATION_R { result = Factory.RESERVED(val[0][:value], true) ; loc result, val[0] }
-  | CONSUMES_R    { result = Factory.RESERVED(val[0][:value], true) ; loc result, val[0] }
-  | PRODUCES_R    { result = Factory.RESERVED(val[0][:value], true) ; loc result, val[0] }
 #---LITERALS (dynamic and static)
 #

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

@@ -20,7 +20,7 @@ module Puppet
     module Parser
       class Parser < Racc::Parser
-module_eval(<<'...end egrammar.ra/module_eval...', 'egrammar.ra', 765)
+module_eval(<<'...end egrammar.ra/module_eval...', 'egrammar.ra', 753)
 # Make emacs happy
 # Local Variables:
@@ -30,258 +30,220 @@ module_eval(<<'...end egrammar.ra/module_eval...', 'egrammar.ra', 765)
 ##### State transition tables begin ###
 clist = [
-'61,64,331,-248,62,56,289,57,-247,83,-250,-249,247,141,286,387,332,406',
-'383,-133,382,-132,289,104,18,107,288,102,103,161,42,289,45,248,47,12',
-'-131,46,36,39,347,44,37,10,11,-248,142,69,17,106,-247,38,-250,-249,15',
-'16,287,87,88,90,89,-133,70,-132,85,86,-236,-245,43,278,279,84,35,65',
-'-129,67,68,66,-131,348,48,49,51,50,52,53,54,61,64,55,263,62,56,264,57',
-'91,83,61,64,260,383,62,382,267,266,313,284,326,-236,-245,104,18,107',
-'265,102,103,-129,42,247,45,354,47,121,82,46,36,39,247,44,37,356,69,82',
-'82,69,17,106,82,38,248,69,15,16,74,87,88,90,89,248,70,343,85,86,240',
-'340,43,364,365,84,35,65,284,67,68,285,367,265,48,49,51,50,52,53,54,61',
-'64,55,314,62,56,370,57,91,83,260,326,375,376,316,260,259,258,380,320',
-'384,386,330,104,18,107,114,102,103,236,42,239,45,393,47,12,237,46,36',
-'39,72,44,37,10,11,395,247,69,17,106,284,38,236,82,15,16,82,119,226,90',
-'89,113,70,225,85,86,114,399,43,115,74,84,35,65,127,67,68,402,284,127',
-'48,49,51,50,52,53,54,61,64,55,405,62,56,158,57,91,83,119,327,326,156',
-'113,409,386,411,412,116,117,118,115,104,18,107,413,102,103,128,42,416',
-'45,417,47,12,321,46,36,39,418,44,37,10,11,247,127,69,17,106,82,38,74',
-'426,15,16,71,428,69,116,117,118,70,429,430,114,248,316,43,,,114,35,65',
-'110,67,68,247,,,48,49,51,50,52,53,54,61,64,55,69,62,56,,57,334,119,',
-'248,,113,,119,,,114,113,,115,,,18,276,,115,,,42,,45,,47,12,,46,36,39',
-',44,37,10,11,,,69,17,119,,38,,113,15,16,373,,116,117,118,115,70,,116',
-'117,118,,43,,114,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62',
-'56,,57,422,83,,116,117,118,119,,,,113,,,,,104,18,107,115,102,103,,42',
-',45,,47,12,,46,36,39,,44,37,10,11,,,69,17,106,,38,,,15,16,75,76,77,',
-',,70,116,117,118,,,43,,,84,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64',
-'55,,62,56,,57,336,83,,,,,,,,,78,80,79,81,,104,18,107,,102,103,,42,,45',
-',47,12,,46,36,39,,44,37,10,11,,,69,17,106,,38,,,15,16,,,,90,89,,70,',
-'85,86,,,43,,,84,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56',
-',57,91,83,,,,,,,,,,,,,,104,18,107,,102,103,,42,,45,,47,12,,46,36,39',
-',44,37,10,11,,,69,17,106,,38,,,15,16,,,,,,,70,,85,86,,,43,,,84,35,65',
-',67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,83,,,,,,,,,,,,,',
-'104,18,107,,102,103,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69,17,106',
-',38,,,15,16,,,,,,,70,,85,86,,,43,,,84,35,65,,67,68,,,,48,49,51,50,52',
-'53,54,61,64,55,83,62,56,,57,,83,,,,,,,,104,,107,,102,103,104,18,107',
-',102,103,,42,,45,,47,121,,46,36,39,,44,37,106,,,,69,17,106,,38,,,15',
-'16,,,85,86,,,70,,,84,,,43,,,84,35,65,,67,68,,,,48,49,51,50,52,53,54',
-'61,64,55,83,62,56,,57,,83,,,,,,,,104,,107,,102,103,104,18,107,,102,103',
-',42,,45,,47,121,,46,36,39,,44,37,106,,,,69,17,106,,38,,,15,16,,,,,,',
-'70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,83,62,56',
-',57,,,,,,,,,,104,,107,,102,103,,18,,,,,,42,,45,,47,121,,46,36,39,,44',
-'37,106,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48',
-'49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45',
-',47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,',
-'35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,',
-',,,,,18,,,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69,17,,,38,,,15',
-'16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55',
-',62,56,,57,420,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,,46,36,39,,44,37',
-'10,11,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49',
-'51,50,52,53,54,61,64,55,,62,56,,57,415,,,,,,,,,,,,,,,,18,,,,,,42,,45',
-',47,12,,46,36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43',
-',,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,',
-',,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15',
-'16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55',
-',62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,',
-',,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50',
-'52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121',
-',46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67',
-'68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,',
-',,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,,,70',
-',,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57',
-'349,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69',
-'17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53',
-'54,61,64,55,,62,56,145,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,,46',
-'36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67',
-'68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,147,57,,,,,,,,,,,,,,,,,18',
-',,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,',
-',70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56',
-',57,149,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,,46,36,39,,44,37,10,11',
-',,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50',
-'52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,',
-'46,36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65',
-',67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18',
-',,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70',
-',,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57',
-',,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,',
-'38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54',
-'61,64,55,,62,56,,160,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39',
-',44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48',
-'49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45',
-',47,12,,46,36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43',
-',,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,',
-',,,,,,,,18,,,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69,17,,,38,,',
-'15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64',
-'55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37',
-',,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51',
-'50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12',
-',46,36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65',
-',67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18',
-',,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,',
-',70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56',
-',57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69',
-'17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53',
-'54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,,46,36',
-'39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68',
-',,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,',
-'42,,45,,47,12,,46,36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,,,70,',
-',,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,',
-',,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69,17',
-',,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54',
-'61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39',
-',44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48',
-'49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45',
-',47,12,,46,36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43',
-',,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,',
-',,,,,,,,18,,,,,,177,194,186,195,47,187,197,188,36,176,,179,174,,,,,69',
-'17,198,193,175,,,15,173,,,,,,,70,,,,,196,178,,,,35,65,,67,68,,,,189',
-'190,192,191,182,183,184,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,',
-'42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,',
-',43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,',
-',,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,',
-',15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64',
-'55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37',
-',,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51',
-'50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121',
-',46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67',
-'68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,',
-',,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,',
-',,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,',
-',,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38',
-',,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61',
-'64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44',
-'37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49',
-'51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47',
-'121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65',
-',67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18',
-',,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70',
-',,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57',
-',,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,',
-'38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54',
-'61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39',
-',44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48',
-'49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45',
-',47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,',
-'35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,',
-',,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16',
-',,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62',
-'56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69',
-'17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53',
-'54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36',
-'39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,',
-',48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42',
-',45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43',
-',,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,',
-',,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15',
-'16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55',
-',62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,',
-',,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50',
-'52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121',
-',46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67',
-'68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,',
-',,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,',
-',,,,43,,,222,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57',
-',,,,,,,,,,,,,,,,18,224,,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69',
-'17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53',
-'54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,,46,36',
-'39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68',
-',,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,',
-'42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,',
-',43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,',
-',,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,',
-',15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64',
-'55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37',
-',,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51',
-'50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121',
-',46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67',
-'68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,',
-',,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,',
-',,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,',
-',,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38',
-',,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61',
-'64,55,,62,56,,57,,,285,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39',
-',44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48',
-'49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45',
-',47,12,,46,36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43',
-',,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,',
-',,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15',
-'16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55',
-',62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,',
-',,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50',
-'52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121',
-',46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67',
-'68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,149,,,,,,,,,,,,,,,,18',
-',,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,',
-',70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56',
-',57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69',
-'17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53',
-'54,61,64,55,,62,56,,57,324,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,,46',
-'36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67',
-'68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,252',
-',,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,,',
-'70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,',
-'57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69',
-'17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53',
-'54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36',
-'39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,',
-',48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42',
-',45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43',
-',,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,388,,,,',
-',,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,',
-'15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64',
-'55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,,46,36,39,,44,37',
-'10,11,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49',
-'51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47',
-'121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65',
-',67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18',
-',,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70',
-',,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57',
-',,,,,,,,,,,,,,,,18,61,64,,,62,42,,45,,47,12,,46,36,39,,44,37,10,11,',
-',69,17,,,38,,,15,16,,,,,,,70,,141,,,138,43,,,,35,65,83,67,68,,,,48,49',
-'51,50,52,53,54,70,104,55,107,83,102,103,,,,142,65,,,,,,,104,,107,,102',
-'103,,,,106,,,,,,,,87,88,90,89,92,93,,85,86,106,,,,,84,,,87,88,90,89',
-'92,93,,85,86,,83,,255,,84,,,,,,,91,99,94,104,,107,,102,103,,95,97,96',
-'98,,61,64,91,,62,,,,,,,,,,106,,,,101,100,,,87,88,90,89,92,93,,85,86',
-'83,,254,,,84,,,141,,,138,99,94,104,,107,,102,103,,95,97,96,98,,61,64',
-',91,62,70,,,,,,,,,106,142,65,,101,100,,,87,88,90,89,92,93,,85,86,83',
-',253,,,84,,,141,,,138,99,94,104,,107,,102,103,,95,97,96,98,,,,,91,,70',
-',,,,,,,,106,142,65,,101,100,,,87,88,90,89,92,93,83,85,86,,,,,,84,,,',
-'99,94,104,317,107,,102,103,,95,97,96,98,,,,,,,,91,,,,,,,,106,,,,101',
-'100,,83,87,88,90,89,92,93,,85,86,,,99,94,104,84,107,,102,103,,95,97',
-'96,98,,,,,,,,,,,,,,,91,106,,,,101,100,,83,87,88,90,89,92,93,,85,86,',
-',99,94,104,84,107,83,102,103,,95,97,96,98,,278,279,,,94,104,,107,,102',
-'103,,95,91,106,,,,101,100,,,87,88,90,89,92,93,,85,86,106,,,,,84,,,87',
-'88,90,89,92,93,,85,86,,83,,,,84,,,,,,,91,99,94,104,282,107,,102,103',
-',95,97,96,98,,,,91,,,,,,,,,,,,106,,,,101,100,,83,87,88,90,89,92,93,',
-'85,86,,,99,94,104,84,107,,102,103,,95,97,96,98,,,,,,,,,,,,,,,91,106',
-',,,101,100,,83,87,88,90,89,92,93,,85,86,,,99,94,104,84,107,,102,103',
-',95,97,96,98,,,,,,,,,,,,,,,91,106,,,,101,100,,83,87,88,90,89,92,93,',
-'85,86,,,99,94,104,84,107,,102,103,,95,97,96,98,,,,,,,,,,,,,,,91,106',
-',,,101,100,,83,87,88,90,89,92,93,,85,86,,,99,94,104,84,107,83,102,103',
-',95,97,96,98,,,,,,94,104,,107,,102,103,,95,91,106,,,,101,100,,,87,88',
-'90,89,92,93,,85,86,106,,,,,84,,,87,88,90,89,92,93,83,85,86,,,,,,84,',
-',,99,94,104,91,107,,102,103,,95,97,96,98,,,,,,,,91,,,,,,,,106,,,,101',
-'100,,83,87,88,90,89,92,93,,85,86,,,99,94,104,84,107,,102,103,,95,97',
-'96,98,,,,,,,,,,,,,,,91,106,,,,101,100,,83,87,88,90,89,92,93,,85,86,',
-',99,94,104,84,107,83,102,103,,95,97,96,98,,,,,,94,104,,107,,102,103',
-',95,91,106,,,,101,100,,,87,88,90,89,92,93,,85,86,106,,,,,84,,,87,88',
-'90,89,92,93,83,85,86,,,,,,84,,,,99,94,104,91,107,,102,103,,95,97,96',
-'98,,,,,,,,91,,,,,,,,106,,,,,,,,87,88,90,89,92,93,83,85,86,,,290,,,84',
-',,,99,94,104,,107,,102,103,,95,97,96,98,,,,,,,,91,,,,,,,,106,,,,101',
-'100,,83,87,88,90,89,92,93,,85,86,,,99,94,104,84,107,83,102,103,,95,97',
-'96,98,,,,,,94,104,,107,,102,103,,95,91,106,,,,,100,,,87,88,90,89,92',
-'93,,85,86,106,,,,,84,,,87,88,90,89,92,93,83,85,86,,,,,,84,,,,99,94,104',
-'91,107,,102,103,,95,97,96,98,61,64,,,62,,,91,,,,,,,,106,,,,101,100,',
-',87,88,90,89,92,93,,85,86,,,,,,84,,141,,,138,,305,194,304,195,,302,197',
-'306,,296,,301,303,,,,,91,70,198,193,307,,,,300,,,142,65,,,,,,,,196,308',
-',,,,,,,,,,,311,312,310,309,297,298,299,305,194,304,195,,302,197,306',
-',296,,301,303,,,,,,,198,193,307,,,,300,,,,,,,,,,,,196,308,,,,,,,,,,',
-',311,312,310,309,297,298,299,305,194,304,195,,302,197,306,,296,,301',
-'303,,,,,,,198,193,307,,,,300,,,,,,,,,,,,196,308,,,,,,,,,,,,311,312,310',
-'309,297,298,299,305,194,304,195,,302,197,306,,296,,301,303,,,,,,,198',
-'193,307,,,,300,,,,,,,,,,,,196,308,,,,,,,,,,,,311,312,310,309,297,298',
-'299' ]
-        racc_action_table = arr = ::Array.new(8687, nil)
+'58,61,388,275,59,53,317,54,-236,80,-238,-237,236,133,-129,-234,-239',
+'-225,256,255,318,392,278,101,18,104,278,99,100,333,42,373,45,237,47',
+'12,111,46,36,39,110,44,37,10,11,276,134,66,17,103,-236,38,-238,-237',
+'15,16,-129,-234,-239,-225,58,61,67,334,59,53,236,54,43,277,79,81,35',
+'62,278,64,65,63,107,66,48,49,51,50,18,111,52,237,79,110,42,236,45,79',
+'47,113,236,46,36,39,252,44,37,253,66,312,111,66,17,66,110,38,237,254',
+'15,16,369,237,368,111,58,61,67,110,59,53,229,54,43,340,111,265,35,62',
+'110,64,65,359,267,268,48,49,51,50,18,111,52,307,71,110,42,369,45,368',
+'47,12,236,46,36,39,69,44,37,10,11,342,273,66,17,66,329,38,58,61,15,16',
+'59,237,254,326,58,61,67,249,59,53,249,54,43,72,73,74,35,62,350,64,65',
+'351,273,274,48,49,51,50,18,353,52,248,247,356,42,316,45,312,47,12,361',
+'46,36,39,362,44,37,10,11,236,225,66,17,228,226,38,366,313,15,16,370',
+'372,75,77,76,78,67,312,249,225,379,79,43,381,299,273,35,62,79,64,65',
+'215,214,71,48,49,51,50,58,61,52,153,59,53,385,54,310,150,119,79,273',
+'148,391,306,119,302,120,395,372,397,398,399,18,58,61,119,402,59,42,403',
+'45,404,47,12,300,46,36,39,79,44,37,10,11,71,412,66,17,68,414,38,415',
+'416,15,16,302,,,,,,67,,133,,,130,43,,,,35,62,,64,65,,,,48,49,51,50,58',
+'61,52,67,59,53,,54,408,80,,,,134,62,,,,,,,,,101,18,104,,99,100,,42,',
+'45,,47,12,,46,36,39,,44,37,10,11,,,66,17,103,,38,,,15,16,,,,,58,61,67',
+',59,53,,54,43,,,81,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47',
+'113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54',
+'43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39',
+',44,37,10,11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62',
+',64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11',
+',,66,17,,,38,,,15,16,,,,,,,67,,,,,,43,,,,35,62,,64,65,,,,48,49,51,50',
+'58,61,52,,59,53,,54,406,80,,,,,,,,,,,,,,101,18,104,,99,100,,42,,45,',
+'47,12,,46,36,39,,44,37,10,11,,,66,17,103,,38,,,15,16,,,,,58,61,67,,59',
+'53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46',
+'36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35',
+'62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,',
+',,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,',
+'48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38',
+',,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18',
+',52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,',
+',,,67,,,,,,43,,,,35,62,,64,65,,,,48,49,51,50,58,61,52,,59,53,,54,401',
+'80,,,,,,,,,,,,,,101,18,104,,99,100,,42,,45,,47,12,,46,36,39,,44,37,10',
+'11,,,66,17,103,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65',
+',,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,',
+',38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50',
+'18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,',
+',58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42',
+',45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59',
+'53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46',
+'36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,,,67,,,,,,43,,,,35,62,,64,65',
+',,,48,49,51,50,58,61,52,,59,53,,54,320,,,,,,,,,,,,,,,,18,58,61,,,59',
+'42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,,,,,67,',
+'133,,,130,43,,,,35,62,,64,65,,,,48,49,51,50,58,61,52,67,59,53,,54,322',
+'80,,,,134,62,,,,,,,,,101,18,104,,99,100,,42,,45,,47,12,,46,36,39,,44',
+'37,10,11,,,66,17,103,,38,,,15,16,,,,,58,61,67,,59,53,137,54,43,,,,35',
+'62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10',
+'11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,139,54,43,,,,35,62,,64,65',
+',,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17',
+',,38,,,15,16,,,,,,,67,,,,,,43,,,,35,62,,64,65,,,,48,49,51,50,58,61,52',
+',59,53,,54,141,80,,,,,,,,,,,,,,101,18,104,,99,100,,42,,45,,47,12,,46',
+'36,39,,44,37,10,11,,,66,17,103,,38,,,15,16,,,,,58,61,67,,59,53,,54,43',
+',,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44',
+'37,10,11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64',
+'65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66',
+'17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49',
+'51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15',
+'16,,,,,58,61,67,,59,53,,152,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52',
+',,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61',
+'67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47',
+'113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54',
+'43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39',
+',44,37,10,11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62',
+',64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,',
+'66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48',
+'49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38',
+',,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18',
+',52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,',
+',58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42',
+',45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,,,58,61,67',
+',59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12',
+',46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54',
+'43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39',
+',44,37,10,11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62',
+',64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11',
+',,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48',
+'49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38',
+',,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18',
+',52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,',
+',58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,169',
+'183,175,184,47,176,186,177,36,168,,171,166,,,,,66,17,187,182,167,,,15',
+'165,,,,,,,67,,,,,185,170,,,,35,62,,64,65,,,,178,179,181,180,58,61,52',
+',59,53,,54,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,113,,46,36,39,,44,37,',
+',,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,',
+'48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38',
+',,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18',
+',52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58',
+'61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45',
+',47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53',
+',54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36',
+'39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62',
+',64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,',
+'66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48',
+'49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,',
+'15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,',
+'52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58',
+'61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45',
+',47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53',
+',54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36',
+'39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62',
+',64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,',
+'66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48',
+'49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,',
+'15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,',
+'52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58',
+'61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45',
+',47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53',
+',54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36',
+'39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62',
+',64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,',
+'66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48',
+'49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,',
+'15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,',
+'52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58',
+'61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45',
+',47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53',
+',54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36',
+'39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,211,35',
+'62,,64,65,,,,48,49,51,50,18,213,52,,,,42,,45,,47,12,,46,36,39,,44,37',
+'10,11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65',
+',,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,',
+',38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50',
+'18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,',
+',58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42',
+',45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59',
+'53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46',
+'36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,274',
+',35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44',
+'37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65',
+',,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17',
+',,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51',
+'50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16',
+',,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,',
+'42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,,,,,67,',
+',,,,43,,,,35,62,,64,65,,,,48,49,51,50,58,61,52,,59,53,,54,335,,,,,,',
+',,,,,,,,,18,58,61,,,59,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17',
+',,38,,,15,16,,,,,,,67,,133,,,130,43,,,,35,62,,64,65,,,,48,49,51,50,58',
+'61,52,67,59,53,,54,374,,,,,134,62,,,,,,,,,,18,,,,,,42,,45,,47,113,,46',
+'36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35',
+'62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10',
+'11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,',
+',,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17',
+',,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51',
+'50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15',
+'16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52',
+',,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,,,67,',
+',,,,43,,,,35,62,,64,65,,,,48,49,51,50,58,61,52,,59,53,,54,141,,,,,,',
+',,,,,,,,,18,,,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,',
+',15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18',
+'241,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16',
+',,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,',
+'42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,,,58,61',
+'67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47',
+'113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54',
+'43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39',
+',44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64',
+'65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17',
+',,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51',
+'50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16',
+',,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,',
+'42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67',
+',59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113',
+',46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,',
+',,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44',
+'37,,,,,66,17,,,38,,,15,16,,,,,,,67,,,,,,43,,,,35,62,,64,65,80,,,48,49',
+'51,50,,,52,,,96,91,101,,104,,99,100,,92,94,93,95,,58,61,,,59,,,,,,,',
+',,103,,,,98,97,,,84,85,87,86,89,90,,82,83,80,,244,,,81,,,133,,,130,96',
+'91,101,,104,,99,100,,92,94,93,95,,88,,,,,67,,,,,,,,,103,134,62,,98,97',
+',,84,85,87,86,89,90,,82,83,80,,243,,,81,,,,,,,96,91,101,,104,80,99,100',
+',92,94,93,95,,88,,,,,101,,104,,99,100,,,,103,,,,98,97,,,84,85,87,86',
+'89,90,,82,83,103,,,,,81,,,,,87,86,,,,82,83,80,,242,,,81,,,,88,,,96,91',
+'101,,104,80,99,100,,92,94,93,95,,88,,,,,101,,104,,99,100,,,,103,,,,98',
+'97,,80,84,85,87,86,89,90,,82,83,103,,96,91,101,81,104,,99,100,,92,94',
+'93,95,82,83,,,,,,81,,,,88,,,,103,,,,98,97,,80,84,85,87,86,89,90,,82',
+'83,,,96,91,101,81,104,,99,100,,92,94,93,95,,,,,,,,,,,,88,,,,103,,,,98',
+'97,,,84,85,87,86,89,90,,82,83,,,,,,81,80,,,,,,,,,,267,268,96,91,101',
+'303,104,80,99,100,88,92,94,93,95,,,,,,,101,,104,,99,100,,,,103,,,,98',
+'97,,,84,85,87,86,89,90,,82,83,103,,,,,81,,,84,85,87,86,,,,82,83,80,',
+',,,81,,,,88,,,96,91,101,,104,,99,100,,92,94,93,95,,88,,,,,,,,,,,,,,103',
+',,,98,97,,,84,85,87,86,89,90,80,82,83,,,279,,,81,,,,96,91,101,,104,80',
+'99,100,,92,94,93,95,,,,,88,,101,,104,,99,100,,,,103,,,,98,97,,80,84',
+'85,87,86,89,90,,82,83,103,,96,91,101,81,104,,99,100,,92,94,93,95,82',
+'83,,,,,,81,,,,88,,,,103,,,,,97,,80,84,85,87,86,89,90,,82,83,,,96,91',
+'101,81,104,,99,100,,92,94,93,95,,,,,,,,,,,,88,,,,103,,,,98,97,,,84,85',
+'87,86,89,90,80,82,83,,,,,,81,,,,96,91,101,271,104,80,99,100,,92,94,93',
+'95,,,,,88,,101,,104,,99,100,,,,103,,,,98,97,,80,84,85,87,86,89,90,,82',
+'83,103,,96,91,101,81,104,,99,100,,92,94,93,95,82,83,,,,,,81,,,,88,,',
+',103,,,,98,97,,80,84,85,87,86,89,90,,82,83,,,96,91,101,81,104,,99,100',
+',92,94,93,95,,,,,,,,,,,,88,,,,103,,,,98,97,,80,84,85,87,86,89,90,,82',
+'83,,,96,91,101,81,104,,99,100,,92,94,93,95,80,,,,,,,,,,,88,,91,101,103',
+'104,,99,100,80,92,,84,85,87,86,89,90,,82,83,,,101,,104,81,99,100,103',
+',,,,,,,84,85,87,86,89,90,,82,83,,88,,103,,81,,,,,,84,85,87,86,80,,,82',
+'83,,,,,,81,88,96,91,101,,104,,99,100,80,92,94,93,95,,,,,,,88,,,101,',
+'104,,99,100,103,,,,98,97,,,84,85,87,86,89,90,,82,83,,,,103,,81,,,,,',
+',,87,86,80,,,82,83,,,,,,81,88,96,91,101,,104,,99,100,80,92,94,93,95',
+',,,,,,88,,91,101,,104,,99,100,103,92,,,98,97,,,84,85,87,86,89,90,,82',
+'83,,,,103,,81,,,,,,84,85,87,86,89,90,80,82,83,,,,,,81,88,,,96,91,101',
+',104,80,99,100,,92,94,93,95,,,,,88,,101,,104,,99,100,,,,103,,,,98,97',
+',,84,85,87,86,89,90,,82,83,103,,,,,81,,,84,85,87,86,89,90,80,82,83,',
+',,,,81,,,,88,,101,,104,80,99,100,,,,,,,,,,88,91,101,,104,,99,100,,92',
+',103,,,,,,,,84,85,87,86,89,90,,82,83,103,,,,,81,,,84,85,87,86,89,90',
+'80,82,83,,,,,,81,,,,88,91,101,,104,,99,100,,92,,,,,,,,88,,,,,,,,,,,103',
+',,,,,,,84,85,87,86,89,90,,82,83,,,,,,81,,,291,183,290,184,,288,186,292',
+',285,,287,289,,,,,,88,187,182,293,,,,286,,,,,,,,,,,,185,294,,,,,,,,',
+',,,297,298,296,295,291,183,290,184,,288,186,292,,285,,287,289,,,,,,',
+'187,182,293,,,,286,,,,,,,,,,,,185,294,,,,,,,,,,,,297,298,296,295,291',
+'183,290,184,,288,186,292,,285,,287,289,,,,,,,187,182,293,,,,286,,,,',
+',,,,,,,185,294,,,,,,,,,,,,297,298,296,295,291,183,290,184,,288,186,292',
+',285,,287,289,,,,,,,187,182,293,,,,286,,,,,,,,,,,,185,294,,,,,,,,,,',
+',297,298,296,295' ]
+        racc_action_table = arr = ::Array.new(6809, nil)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|
@@ -291,281 +253,241 @@ clist = [
         end
 clist = [
-'0,0,251,192,0,0,337,0,191,210,190,189,249,259,185,337,251,379,380,184',
-'380,183,379,210,0,210,200,210,210,71,0,200,0,249,0,0,182,0,0,0,261,0',
-'0,0,0,192,259,0,0,210,191,0,190,189,0,0,185,210,210,210,210,184,0,183',
-'210,210,174,175,0,354,354,210,0,0,176,0,0,0,182,262,0,0,0,0,0,0,0,417',
-'417,0,148,417,417,148,417,210,209,156,156,223,334,156,334,153,153,228',
-'172,275,174,175,209,417,209,280,209,209,176,417,127,417,281,417,417',
-'170,417,417,417,326,417,417,283,127,169,168,417,417,209,167,417,127',
-'326,417,417,162,209,209,209,209,326,417,257,209,209,127,256,417,291',
-'293,209,417,417,295,417,417,300,315,151,417,417,417,417,417,417,417',
-'4,4,417,230,4,4,318,4,209,205,146,322,323,325,231,144,136,134,333,234',
-'335,336,250,205,4,205,121,205,205,133,4,126,4,341,4,4,124,4,4,4,4,4',
-'4,4,4,353,248,4,4,205,355,4,111,109,4,4,108,121,105,205,205,121,4,104',
-'205,205,187,363,4,121,73,205,4,4,365,4,4,366,369,224,4,4,4,4,4,4,4,412',
-'412,4,374,412,412,66,412,205,120,187,247,241,65,187,383,384,386,387',
-'121,121,121,187,120,412,120,390,120,120,41,412,397,412,398,412,412,236',
-'412,412,412,404,412,412,412,412,236,40,412,412,120,8,412,5,414,412,412',
-'1,419,236,187,187,187,412,421,423,186,236,427,412,,,12,412,412,12,412',
-'412,158,,,412,412,412,412,412,412,412,253,253,412,158,253,253,,253,253',
-'186,,158,,186,,12,,,320,12,,186,,,253,158,,12,,,253,,253,,253,253,,253',
-'253,253,,253,253,253,253,,,253,253,320,,253,,320,253,253,320,,186,186',
-'186,320,253,,12,12,12,,253,,45,,253,253,,253,253,,,,253,253,253,253',
-'253,253,253,411,411,253,,411,411,,411,411,202,,320,320,320,45,,,,45',
-',,,,202,411,202,45,202,202,,411,,411,,411,411,,411,411,411,,411,411',
-'411,411,,,411,411,202,,411,,,411,411,7,7,7,,,,411,45,45,45,,,411,,,202',
-'411,411,,411,411,,,,411,411,411,411,411,411,411,254,254,411,,254,254',
-',254,254,204,,,,,,,,,7,7,7,7,,204,254,204,,204,204,,254,,254,,254,254',
-',254,254,254,,254,254,254,254,,,254,254,204,,254,,,254,254,,,,204,204',
-',254,,204,204,,,254,,,204,254,254,,254,254,,,,254,254,254,254,254,254',
-'254,10,10,254,,10,10,,10,204,208,,,,,,,,,,,,,,208,10,208,,208,208,,10',
-',10,,10,10,,10,10,10,,10,10,10,10,,,10,10,208,,10,,,10,10,,,,,,,10,',
-'208,208,,,10,,,208,10,10,,10,10,,,,10,10,10,10,10,10,10,11,11,10,,11',
-'11,,11,,206,,,,,,,,,,,,,,206,11,206,,206,206,,11,,11,,11,11,,11,11,11',
-',11,11,11,11,,,11,11,206,,11,,,11,11,,,,,,,11,,206,206,,,11,,,206,11',
-'11,,11,11,,,,11,11,11,11,11,11,11,255,255,11,207,255,255,,255,,203,',
-',,,,,,207,,207,,207,207,203,255,203,,203,203,,255,,255,,255,255,,255',
-'255,255,,255,255,207,,,,255,255,203,,255,,,255,255,,,207,207,,,255,',
-',207,,,255,,,203,255,255,,255,255,,,,255,255,255,255,255,255,255,15',
-'15,255,122,15,15,,15,,201,,,,,,,,122,,122,,122,122,201,15,201,,201,201',
-',15,,15,,15,15,,15,15,15,,15,15,122,,,,15,15,201,,15,,,15,15,,,,,,,15',
-',,,,,15,,,,15,15,,15,15,,,,15,15,15,15,15,15,15,16,16,15,123,16,16,',
-'16,,,,,,,,,,123,,123,,123,123,,16,,,,,,16,,16,,16,16,,16,16,16,,16,16',
-'123,,,,16,16,,,16,,,16,16,,,,,,,16,,,,,,16,,,,16,16,,16,16,,,,16,16',
-'16,16,16,16,16,17,17,16,,17,17,,17,,,,,,,,,,,,,,,,,17,,,,,,17,,17,,17',
-'17,,17,17,17,,17,17,,,,,17,17,,,17,,,17,17,,,,,,,17,,,,,,17,,,,17,17',
-',17,17,,,,17,17,17,17,17,17,17,18,18,17,,18,18,,18,,,,,,,,,,,,,,,,,18',
-',,,,,18,,18,,18,18,,18,18,18,,18,18,18,18,,,18,18,,,18,,,18,18,,,,,',
-',18,,,,,,18,,,,18,18,,18,18,,,,18,18,18,18,18,18,18,409,409,18,,409',
-'409,,409,409,,,,,,,,,,,,,,,,409,,,,,,409,,409,,409,409,,409,409,409',
-',409,409,409,409,,,409,409,,,409,,,409,409,,,,,,,409,,,,,,409,,,,409',
-'409,,409,409,,,,409,409,409,409,409,409,409,393,393,409,,393,393,,393',
-'393,,,,,,,,,,,,,,,,393,,,,,,393,,393,,393,393,,393,393,393,,393,393',
-'393,393,,,393,393,,,393,,,393,393,,,,,,,393,,,,,,393,,,,393,393,,393',
-'393,,,,393,393,393,393,393,393,393,42,42,393,,42,42,,42,,,,,,,,,,,,',
-',,,,42,,,,,,42,,42,,42,42,,42,42,42,,42,42,,,,,42,42,,,42,,,42,42,,',
-',,,,42,,,,,,42,,,,42,42,,42,42,,,,42,42,42,42,42,42,42,43,43,42,,43',
-'43,,43,,,,,,,,,,,,,,,,,43,,,,,,43,,43,,43,43,,43,43,43,,43,43,,,,,43',
-'43,,,43,,,43,43,,,,,,,43,,,,,,43,,,,43,43,,43,43,,,,43,43,43,43,43,43',
-'43,44,44,43,,44,44,,44,,,,,,,,,,,,,,,,,44,,,,,,44,,44,,44,44,,44,44',
-'44,,44,44,,,,,44,44,,,44,,,44,44,,,,,,,44,,,,,,44,,,,44,44,,44,44,,',
-',44,44,44,44,44,44,44,260,260,44,,260,260,,260,,,,,,,,,,,,,,,,,260,',
-',,,,260,,260,,260,260,,260,260,260,,260,260,260,260,,,260,260,,,260',
-',,260,260,,,,,,,260,,,,,,260,,,,260,260,,260,260,,,,260,260,260,260',
-'260,260,260,264,264,260,,264,264,,264,264,,,,,,,,,,,,,,,,264,,,,,,264',
-',264,,264,264,,264,264,264,,264,264,264,264,,,264,264,,,264,,,264,264',
-',,,,,,264,,,,,,264,,,,264,264,,264,264,,,,264,264,264,264,264,264,264',
-'55,55,264,,55,55,55,55,,,,,,,,,,,,,,,,,55,,,,,,55,,55,,55,55,,55,55',
-'55,,55,55,55,55,,,55,55,,,55,,,55,55,,,,,,,55,,,,,,55,,,,55,55,,55,55',
-',,,55,55,55,55,55,55,55,56,56,55,,56,56,56,56,,,,,,,,,,,,,,,,,56,,,',
-',,56,,56,,56,56,,56,56,56,,56,56,56,56,,,56,56,,,56,,,56,56,,,,,,,56',
-',,,,,56,,,,56,56,,56,56,,,,56,56,56,56,56,56,56,57,57,56,,57,57,,57',
-'57,,,,,,,,,,,,,,,,57,,,,,,57,,57,,57,57,,57,57,57,,57,57,57,57,,,57',
-'57,,,57,,,57,57,,,,,,,57,,,,,,57,,,,57,57,,57,57,,,,57,57,57,57,57,57',
-'57,63,63,57,,63,63,,63,,,,,,,,,,,,,,,,,63,,,,,,63,,63,,63,63,,63,63',
-'63,,63,63,63,63,,,63,63,,,63,,,63,63,,,,,,,63,,,,,,63,,,,63,63,,63,63',
-',,,63,63,63,63,63,63,63,382,382,63,,382,382,,382,,,,,,,,,,,,,,,,,382',
-',,,,,382,,382,,382,382,,382,382,382,,382,382,,,,,382,382,,,382,,,382',
-'382,,,,,,,382,,,,,,382,,,,382,382,,382,382,,,,382,382,382,382,382,382',
-'382,222,222,382,,222,222,,222,,,,,,,,,,,,,,,,,222,,,,,,222,,222,,222',
-'222,,222,222,222,,222,222,,,,,222,222,,,222,,,222,222,,,,,,,222,,,,',
-',222,,,,222,222,,222,222,,,,222,222,222,222,222,222,222,68,68,222,,68',
-'68,,68,,,,,,,,,,,,,,,,,68,,,,,,68,,68,,68,68,,68,68,68,,68,68,,,,,68',
-'68,,,68,,,68,68,,,,,,,68,,,,,,68,,,,68,68,,68,68,,,,68,68,68,68,68,68',
-'68,370,370,68,,370,370,,370,,,,,,,,,,,,,,,,,370,,,,,,370,,370,,370,370',
-',370,370,370,,370,370,370,370,,,370,370,,,370,,,370,370,,,,,,,370,,',
-',,,370,,,,370,370,,370,370,,,,370,370,370,370,370,370,370,72,72,370',
-',72,72,,72,,,,,,,,,,,,,,,,,72,,,,,,72,,72,,72,72,,72,72,72,,72,72,72',
-'72,,,72,72,,,72,,,72,72,,,,,,,72,,,,,,72,,,,72,72,,72,72,,,,72,72,72',
-'72,72,72,72,364,364,72,,364,364,,364,,,,,,,,,,,,,,,,,364,,,,,,364,,364',
-',364,364,,364,364,364,,364,364,,,,,364,364,,,364,,,364,364,,,,,,,364',
-',,,,,364,,,,364,364,,364,364,,,,364,364,364,364,364,364,364,74,74,364',
-',74,74,,74,,,,,,,,,,,,,,,,,74,,,,,,74,,74,,74,74,,74,74,74,,74,74,74',
-'74,,,74,74,,,74,,,74,74,,,,,,,74,,,,,,74,,,,74,74,,74,74,,,,74,74,74',
-'74,74,74,74,75,75,74,,75,75,,75,,,,,,,,,,,,,,,,,75,,,,,,75,,75,,75,75',
-',75,75,75,,75,75,75,75,,,75,75,,,75,,,75,75,,,,,,,75,,,,,,75,,,,75,75',
-',75,75,,,,75,75,75,75,75,75,75,76,76,75,,76,76,,76,,,,,,,,,,,,,,,,,76',
-',,,,,76,,76,,76,76,,76,76,76,,76,76,76,76,,,76,76,,,76,,,76,76,,,,,',
-',76,,,,,,76,,,,76,76,,76,76,,,,76,76,76,76,76,76,76,77,77,76,,77,77',
-',77,,,,,,,,,,,,,,,,,77,,,,,,77,,77,,77,77,,77,77,77,,77,77,77,77,,,77',
-'77,,,77,,,77,77,,,,,,,77,,,,,,77,,,,77,77,,77,77,,,,77,77,77,77,77,77',
-'77,78,78,77,,78,78,,78,,,,,,,,,,,,,,,,,78,,,,,,78,,78,,78,78,,78,78',
-'78,,78,78,78,78,,,78,78,,,78,,,78,78,,,,,,,78,,,,,,78,,,,78,78,,78,78',
-',,,78,78,78,78,78,78,78,79,79,78,,79,79,,79,,,,,,,,,,,,,,,,,79,,,,,',
-'79,,79,,79,79,,79,79,79,,79,79,79,79,,,79,79,,,79,,,79,79,,,,,,,79,',
-',,,,79,,,,79,79,,79,79,,,,79,79,79,79,79,79,79,316,316,79,,316,316,',
-'316,,,,,,,,,,,,,,,,,316,,,,,,316,,316,,316,316,,316,316,316,,316,316',
-',,,,316,316,,,316,,,316,316,,,,,,,316,,,,,,316,,,,316,316,,316,316,',
-',,316,316,316,316,316,316,316,81,81,316,,81,81,,81,,,,,,,,,,,,,,,,,81',
-',,,,,81,,81,,81,81,,81,81,81,,81,81,81,81,,,81,81,,,81,,,81,81,,,,,',
-',81,,,,,,81,,,,81,81,,81,81,,,,81,81,81,81,81,81,81,82,82,81,,82,82',
-',82,,,,,,,,,,,,,,,,,82,,,,,,82,82,82,82,82,82,82,82,82,82,,82,82,,,',
-',82,82,82,82,82,,,82,82,,,,,,,82,,,,,82,82,,,,82,82,,82,82,,,,82,82',
-'82,82,82,82,82,83,83,82,,83,83,,83,,,,,,,,,,,,,,,,,83,,,,,,83,,83,,83',
-'83,,83,83,83,,83,83,,,,,83,83,,,83,,,83,83,,,,,,,83,,,,,,83,,,,83,83',
-',83,83,,,,83,83,83,83,83,83,83,84,84,83,,84,84,,84,,,,,,,,,,,,,,,,,84',
-',,,,,84,,84,,84,84,,84,84,84,,84,84,,,,,84,84,,,84,,,84,84,,,,,,,84',
-',,,,,84,,,,84,84,,84,84,,,,84,84,84,84,84,84,84,85,85,84,,85,85,,85',
-',,,,,,,,,,,,,,,,85,,,,,,85,,85,,85,85,,85,85,85,,85,85,,,,,85,85,,,85',
-',,85,85,,,,,,,85,,,,,,85,,,,85,85,,85,85,,,,85,85,85,85,85,85,85,86',
-'86,85,,86,86,,86,,,,,,,,,,,,,,,,,86,,,,,,86,,86,,86,86,,86,86,86,,86',
-'86,,,,,86,86,,,86,,,86,86,,,,,,,86,,,,,,86,,,,86,86,,86,86,,,,86,86',
-'86,86,86,86,86,87,87,86,,87,87,,87,,,,,,,,,,,,,,,,,87,,,,,,87,,87,,87',
-'87,,87,87,87,,87,87,,,,,87,87,,,87,,,87,87,,,,,,,87,,,,,,87,,,,87,87',
-',87,87,,,,87,87,87,87,87,87,87,88,88,87,,88,88,,88,,,,,,,,,,,,,,,,,88',
-',,,,,88,,88,,88,88,,88,88,88,,88,88,,,,,88,88,,,88,,,88,88,,,,,,,88',
-',,,,,88,,,,88,88,,88,88,,,,88,88,88,88,88,88,88,89,89,88,,89,89,,89',
-',,,,,,,,,,,,,,,,89,,,,,,89,,89,,89,89,,89,89,89,,89,89,,,,,89,89,,,89',
-',,89,89,,,,,,,89,,,,,,89,,,,89,89,,89,89,,,,89,89,89,89,89,89,89,90',
-'90,89,,90,90,,90,,,,,,,,,,,,,,,,,90,,,,,,90,,90,,90,90,,90,90,90,,90',
-'90,,,,,90,90,,,90,,,90,90,,,,,,,90,,,,,,90,,,,90,90,,90,90,,,,90,90',
-'90,90,90,90,90,91,91,90,,91,91,,91,,,,,,,,,,,,,,,,,91,,,,,,91,,91,,91',
-'91,,91,91,91,,91,91,,,,,91,91,,,91,,,91,91,,,,,,,91,,,,,,91,,,,91,91',
-',91,91,,,,91,91,91,91,91,91,91,92,92,91,,92,92,,92,,,,,,,,,,,,,,,,,92',
-',,,,,92,,92,,92,92,,92,92,92,,92,92,,,,,92,92,,,92,,,92,92,,,,,,,92',
-',,,,,92,,,,92,92,,92,92,,,,92,92,92,92,92,92,92,93,93,92,,93,93,,93',
-',,,,,,,,,,,,,,,,93,,,,,,93,,93,,93,93,,93,93,93,,93,93,,,,,93,93,,,93',
-',,93,93,,,,,,,93,,,,,,93,,,,93,93,,93,93,,,,93,93,93,93,93,93,93,94',
-'94,93,,94,94,,94,,,,,,,,,,,,,,,,,94,,,,,,94,,94,,94,94,,94,94,94,,94',
-'94,,,,,94,94,,,94,,,94,94,,,,,,,94,,,,,,94,,,,94,94,,94,94,,,,94,94',
-'94,94,94,94,94,95,95,94,,95,95,,95,,,,,,,,,,,,,,,,,95,,,,,,95,,95,,95',
-'95,,95,95,95,,95,95,,,,,95,95,,,95,,,95,95,,,,,,,95,,,,,,95,,,,95,95',
-',95,95,,,,95,95,95,95,95,95,95,96,96,95,,96,96,,96,,,,,,,,,,,,,,,,,96',
-',,,,,96,,96,,96,96,,96,96,96,,96,96,,,,,96,96,,,96,,,96,96,,,,,,,96',
-',,,,,96,,,,96,96,,96,96,,,,96,96,96,96,96,96,96,97,97,96,,97,97,,97',
-',,,,,,,,,,,,,,,,97,,,,,,97,,97,,97,97,,97,97,97,,97,97,,,,,97,97,,,97',
-',,97,97,,,,,,,97,,,,,,97,,,,97,97,,97,97,,,,97,97,97,97,97,97,97,98',
-'98,97,,98,98,,98,,,,,,,,,,,,,,,,,98,,,,,,98,,98,,98,98,,98,98,98,,98',
-'98,,,,,98,98,,,98,,,98,98,,,,,,,98,,,,,,98,,,,98,98,,98,98,,,,98,98',
-'98,98,98,98,98,99,99,98,,99,99,,99,,,,,,,,,,,,,,,,,99,,,,,,99,,99,,99',
-'99,,99,99,99,,99,99,,,,,99,99,,,99,,,99,99,,,,,,,99,,,,,,99,,,,99,99',
-',99,99,,,,99,99,99,99,99,99,99,100,100,99,,100,100,,100,,,,,,,,,,,,',
-',,,,100,,,,,,100,,100,,100,100,,100,100,100,,100,100,,,,,100,100,,,100',
-',,100,100,,,,,,,100,,,,,,100,,,,100,100,,100,100,,,,100,100,100,100',
-'100,100,100,101,101,100,,101,101,,101,,,,,,,,,,,,,,,,,101,,,,,,101,',
-'101,,101,101,,101,101,101,,101,101,,,,,101,101,,,101,,,101,101,,,,,',
-',101,,,,,,101,,,,101,101,,101,101,,,,101,101,101,101,101,101,101,102',
-'102,101,,102,102,,102,,,,,,,,,,,,,,,,,102,,,,,,102,,102,,102,102,,102',
-'102,102,,102,102,,,,,102,102,,,102,,,102,102,,,,,,,102,,,,,,102,,,102',
-'102,102,,102,102,,,,102,102,102,102,102,102,102,103,103,102,,103,103',
-',103,,,,,,,,,,,,,,,,,103,103,,,,,103,,103,,103,103,,103,103,103,,103',
-'103,103,103,,,103,103,,,103,,,103,103,,,,,,,103,,,,,,103,,,,103,103',
-',103,103,,,,103,103,103,103,103,103,103,265,265,103,,265,265,,265,,',
-',,,,,,,,,,,,,,265,,,,,,265,,265,,265,265,,265,265,265,,265,265,265,265',
-',,265,265,,,265,,,265,265,,,,,,,265,,,,,,265,,,,265,265,,265,265,,,',
-'265,265,265,265,265,265,265,179,179,265,,179,179,,179,,,,,,,,,,,,,,',
-',,179,,,,,,179,,179,,179,179,,179,179,179,,179,179,,,,,179,179,,,179',
-',,179,179,,,,,,,179,,,,,,179,,,,179,179,,179,179,,,,179,179,179,179',
-'179,179,179,106,106,179,,106,106,,106,,,,,,,,,,,,,,,,,106,,,,,,106,',
-'106,,106,106,,106,106,106,,106,106,,,,,106,106,,,106,,,106,106,,,,,',
-',106,,,,,,106,,,,106,106,,106,106,,,,106,106,106,106,106,106,106,107',
-'107,106,,107,107,,107,,,,,,,,,,,,,,,,,107,,,,,,107,,107,,107,107,,107',
-'107,107,,107,107,,,,,107,107,,,107,,,107,107,,,,,,,107,,,,,,107,,,,107',
-'107,,107,107,,,,107,107,107,107,107,107,107,178,178,107,,178,178,,178',
-',,,,,,,,,,,,,,,,178,,,,,,178,,178,,178,178,,178,178,178,,178,178,,,',
-',178,178,,,178,,,178,178,,,,,,,178,,,,,,178,,,,178,178,,178,178,,,,178',
-'178,178,178,178,178,178,177,177,178,,177,177,,177,,,,,,,,,,,,,,,,,177',
-',,,,,177,,177,,177,177,,177,177,177,,177,177,,,,,177,177,,,177,,,177',
-'177,,,,,,,177,,,,,,177,,,,177,177,,177,177,,,,177,177,177,177,177,177',
-'177,110,110,177,,110,110,,110,,,,,,,,,,,,,,,,,110,,,,,,110,,110,,110',
-'110,,110,110,110,,110,110,,,,,110,110,,,110,,,110,110,,,,,,,110,,,,',
-',110,,,,110,110,,110,110,,,,110,110,110,110,110,110,110,173,173,110',
-',173,173,,173,,,173,,,,,,,,,,,,,,173,,,,,,173,,173,,173,173,,173,173',
-'173,,173,173,,,,,173,173,,,173,,,173,173,,,,,,,173,,,,,,173,,,,173,173',
-',173,173,,,,173,173,173,173,173,173,173,270,270,173,,270,270,,270,,',
-',,,,,,,,,,,,,,270,,,,,,270,,270,,270,270,,270,270,270,,270,270,270,270',
-',,270,270,,,270,,,270,270,,,,,,,270,,,,,,270,,,,270,270,,270,270,,,',
-'270,270,270,270,270,270,270,285,285,270,,285,285,,285,,,,,,,,,,,,,,',
-',,285,,,,,,285,,285,,285,285,,285,285,285,,285,285,,,,,285,285,,,285',
-',,285,285,,,,,,,285,,,,,,285,,,,285,285,,285,285,,,,285,285,285,285',
-'285,285,285,286,286,285,,286,286,,286,,,,,,,,,,,,,,,,,286,,,,,,286,',
-'286,,286,286,,286,286,286,,286,286,,,,,286,286,,,286,,,286,286,,,,,',
-',286,,,,,,286,,,,286,286,,286,286,,,,286,286,286,286,286,286,286,287',
-'287,286,,287,287,,287,,,,,,,,,,,,,,,,,287,,,,,,287,,287,,287,287,,287',
-'287,287,,287,287,,,,,287,287,,,287,,,287,287,,,,,,,287,,,,,,287,,,,287',
-'287,,287,287,,,,287,287,287,287,287,287,287,160,160,287,,160,160,,160',
-'160,,,,,,,,,,,,,,,,160,,,,,,160,,160,,160,160,,160,160,160,,160,160',
-'160,160,,,160,160,,,160,,,160,160,,,,,,,160,,,,,,160,,,,160,160,,160',
-'160,,,,160,160,160,160,160,160,160,340,340,160,,340,340,,340,,,,,,,',
-',,,,,,,,,340,,,,,,340,,340,,340,340,,340,340,340,,340,340,340,340,,',
-'340,340,,,340,,,340,340,,,,,,,340,,,,,,340,,,,340,340,,340,340,,,,340',
-'340,340,340,340,340,340,239,239,340,,239,239,,239,239,,,,,,,,,,,,,,',
-',239,,,,,,239,,239,,239,239,,239,239,239,,239,239,239,239,,,239,239',
-',,239,,,239,239,,,,,,,239,,,,,,239,,,,239,239,,239,239,,,,239,239,239',
-'239,239,239,239,128,128,239,,128,128,,128,,,,,,,,,,,,,,,,,128,128,,',
-',,128,,128,,128,128,,128,128,128,,128,128,128,128,,,128,128,,,128,,',
-'128,128,,,,,,,128,,,,,,128,,,,128,128,,128,128,,,,128,128,128,128,128',
-'128,128,157,157,128,,157,157,,157,,,,,,,,,,,,,,,,,157,,,,,,157,,157',
-',157,157,,157,157,157,,157,157,157,157,,,157,157,,,157,,,157,157,,,',
-',,,157,,,,,,157,,,,157,157,,157,157,,,,157,157,157,157,157,157,157,289',
-'289,157,,289,289,,289,,,,,,,,,,,,,,,,,289,,,,,,289,,289,,289,289,,289',
-'289,289,,289,289,,,,,289,289,,,289,,,289,289,,,,,,,289,,,,,,289,,,,289',
-'289,,289,289,,,,289,289,289,289,289,289,289,290,290,289,,290,290,,290',
-',,,,,,,,,,,,,,,,290,,,,,,290,,290,,290,290,,290,290,290,,290,290,,,',
-',290,290,,,290,,,290,290,,,,,,,290,,,,,,290,,,,290,290,,290,290,,,,290',
-'290,290,290,290,290,290,338,338,290,,338,338,,338,338,,,,,,,,,,,,,,',
-',338,,,,,,338,,338,,338,338,,338,338,338,,338,338,,,,,338,338,,,338',
-',,338,338,,,,,,,338,,,,,,338,,,,338,338,,338,338,,,,338,338,338,338',
-'338,338,338,331,331,338,,331,331,,331,,,,,,,,,,,,,,,,,331,,,,,,331,',
-'331,,331,331,,331,331,331,,331,331,331,331,,,331,331,,,331,,,331,331',
-',,,,,,331,,,,,,331,,,,331,331,,331,331,,,,331,331,331,331,331,331,331',
-'330,330,331,,330,330,,330,,,,,,,,,,,,,,,,,330,,,,,,330,,330,,330,330',
-',330,330,330,,330,330,,,,,330,330,,,330,,,330,330,,,,,,,330,,,,,,330',
-',,,330,330,,330,330,,,,330,330,330,330,330,330,330,327,327,330,,327',
-'327,,327,,,,,,,,,,,,,,,,,327,,,,,,327,,327,,327,327,,327,327,327,,327',
-'327,,,,,327,327,,,327,,,327,327,,,,,,,327,,,,,,327,,,,327,327,,327,327',
-',,,327,327,327,327,327,327,327,80,80,327,,80,80,,80,,,,,,,,,,,,,,,,',
-'80,258,258,,,258,80,,80,,80,80,,80,80,80,,80,80,80,80,,,80,80,,,80,',
-',80,80,,,,,,,80,,258,,,258,80,,,,80,80,212,80,80,,,,80,80,80,80,80,80',
-'80,258,212,80,212,211,212,212,,,,258,258,,,,,,,211,,211,,211,211,,,',
-'212,,,,,,,,212,212,212,212,212,212,,212,212,211,,,,,212,,,211,211,211',
-'211,211,211,,211,211,,132,,132,,211,,,,,,,212,132,132,132,,132,,132',
-'132,,132,132,132,132,,46,46,211,,46,,,,,,,,,,132,,,,132,132,,,132,132',
-'132,132,132,132,,132,132,131,,131,,,132,,,46,,,46,131,131,131,,131,',
-'131,131,,131,131,131,131,,188,188,,132,188,46,,,,,,,,,131,46,46,,131',
-'131,,,131,131,131,131,131,131,,131,131,129,,129,,,131,,,188,,,188,129',
-'129,129,,129,,129,129,,129,129,129,129,,,,,131,,188,,,,,,,,,129,188',
-'188,,129,129,,,129,129,129,129,129,129,232,129,129,,,,,,129,,,,232,232',
-'232,232,232,,232,232,,232,232,232,232,,,,,,,,129,,,,,,,,232,,,,232,232',
-',159,232,232,232,232,232,232,,232,232,,,159,159,159,232,159,,159,159',
-',159,159,159,159,,,,,,,,,,,,,,,232,159,,,,159,159,,9,159,159,159,159',
-'159,159,,159,159,,,9,9,9,159,9,214,9,9,,9,9,9,9,,159,159,,,214,214,',
-'214,,214,214,,214,159,9,,,,9,9,,,9,9,9,9,9,9,,9,9,214,,,,,9,,,214,214',
-'214,214,214,214,,214,214,,171,,,,214,,,,,,,9,171,171,171,171,171,,171',
-'171,,171,171,171,171,,,,214,,,,,,,,,,,,171,,,,171,171,,362,171,171,171',
-'171,171,171,,171,171,,,362,362,362,171,362,,362,362,,362,362,362,362',
-',,,,,,,,,,,,,,171,362,,,,362,362,,358,362,362,362,362,362,362,,362,362',
-',,358,358,358,362,358,,358,358,,358,358,358,358,,,,,,,,,,,,,,,362,358',
-',,,358,358,,227,358,358,358,358,358,358,,358,358,,,227,227,227,358,227',
-',227,227,,227,227,227,227,,,,,,,,,,,,,,,358,227,,,,227,227,,199,227',
-'227,227,227,227,227,,227,227,,,199,199,199,227,199,213,199,199,,199',
-'199,199,199,,,,,,213,213,,213,,213,213,,213,227,199,,,,199,199,,,199',
-'199,199,199,199,199,,199,199,213,,,,,199,,,213,213,213,213,213,213,359',
-'213,213,,,,,,213,,,,359,359,359,199,359,,359,359,,359,359,359,359,,',
-',,,,,213,,,,,,,,359,,,,359,359,,360,359,359,359,359,359,359,,359,359',
-',,360,360,360,359,360,,360,360,,360,360,360,360,,,,,,,,,,,,,,,359,360',
-',,,360,360,,361,360,360,360,360,360,360,,360,360,,,361,361,361,360,361',
-'215,361,361,,361,361,361,361,,,,,,215,215,,215,,215,215,,215,360,361',
-',,,361,361,,,361,361,361,361,361,361,,361,361,215,,,,,361,,,215,215',
-'215,215,215,215,217,215,215,,,,,,215,,,,217,217,217,361,217,,217,217',
-',217,217,217,217,,,,,,,,215,,,,,,,,217,,,,,,,,217,217,217,217,217,217',
-'219,217,217,,,219,,,217,,,,219,219,219,,219,,219,219,,219,219,219,219',
-',,,,,,,217,,,,,,,,219,,,,219,219,,218,219,219,219,219,219,219,,219,219',
-',,218,218,218,219,218,216,218,218,,218,218,218,218,,,,,,216,216,,216',
-',216,216,,216,219,218,,,,,218,,,218,218,218,218,218,218,,218,218,216',
-',,,,218,,,216,216,216,216,216,216,378,216,216,,,,,,216,,,,378,378,378',
-'218,378,,378,378,,378,378,378,378,343,343,,,343,,,216,,,,,,,,378,,,',
-'378,378,,,378,378,378,378,378,378,,378,378,,,,,,378,,343,,,343,,284',
-'284,284,284,,284,284,284,,284,,284,284,,,,,378,343,284,284,284,,,,284',
-',,343,343,,,,,,,,284,284,,,,,,,,,,,,284,284,284,284,284,284,284,282',
-'282,282,282,,282,282,282,,282,,282,282,,,,,,,282,282,282,,,,282,,,,',
-',,,,,,,282,282,,,,,,,,,,,,282,282,282,282,282,282,282,226,226,226,226',
-',226,226,226,,226,,226,226,,,,,,,226,226,226,,,,226,,,,,,,,,,,,226,226',
-',,,,,,,,,,,226,226,226,226,226,226,226,317,317,317,317,,317,317,317',
-',317,,317,317,,,,,,,317,317,317,,,,317,,,,,,,,,,,,317,317,,,,,,,,,,',
-',317,317,317,317,317,317,317' ]
-        racc_action_check = arr = ::Array.new(8687, nil)
+'0,0,352,174,0,0,240,0,180,191,178,181,238,248,168,167,179,166,145,145',
+'240,365,323,191,0,191,365,191,191,250,0,323,0,238,0,0,113,0,0,0,113',
+'0,0,0,0,174,248,0,0,191,180,0,178,181,0,0,168,167,179,166,403,403,0',
+'251,403,403,312,403,0,189,161,191,0,0,189,0,0,0,12,312,0,0,0,0,403,45',
+'0,312,160,45,403,119,403,159,403,403,150,403,403,403,140,403,403,140',
+'119,264,12,403,403,150,12,403,119,269,403,403,320,150,320,175,4,4,403',
+'175,4,4,119,4,403,270,306,150,403,403,306,403,403,306,340,340,403,403',
+'403,403,4,176,403,225,154,176,4,366,4,366,4,4,225,4,4,4,4,4,4,4,4,272',
+'164,4,4,225,246,4,148,148,4,4,148,225,143,245,398,398,4,138,398,398',
+'136,398,4,7,7,7,4,4,280,4,4,282,284,286,4,4,4,4,398,301,4,128,126,304',
+'398,239,398,308,398,398,309,398,398,398,311,398,398,398,398,237,125',
+'398,398,118,116,398,319,236,398,398,321,322,7,7,7,7,398,230,212,108',
+'327,106,398,339,217,341,398,398,105,398,398,102,101,70,398,398,398,398',
+'228,228,398,68,228,228,349,228,228,63,351,162,355,62,360,223,213,220',
+'41,369,370,372,373,376,228,177,177,40,383,177,228,384,228,390,228,228',
+'219,228,228,228,8,228,228,228,228,5,400,228,228,1,405,228,407,409,228',
+'228,413,,,,,,228,,177,,,177,228,,,,228,228,,228,228,,,,228,228,228,228',
+'397,397,228,177,397,397,,397,397,192,,,,177,177,,,,,,,,,192,397,192',
+',192,192,,397,,397,,397,397,,397,397,397,,397,397,397,397,,,397,397',
+'192,,397,,,397,397,,,,,211,211,397,,211,211,,211,397,,,192,397,397,',
+'397,397,,,,397,397,397,397,211,,397,,,,211,,211,,211,211,,211,211,211',
+',211,211,,,,,211,211,,,211,,,211,211,,,,,10,10,211,,10,10,,10,211,,',
+',211,211,,211,211,,,,211,211,211,211,10,,211,,,,10,,10,,10,10,,10,10',
+'10,,10,10,10,10,,,10,10,,,10,,,10,10,,,,,11,11,10,,11,11,,11,10,,,,10',
+'10,,10,10,,,,10,10,10,10,11,,10,,,,11,,11,,11,11,,11,11,11,,11,11,11',
+'11,,,11,11,,,11,,,11,11,,,,,,,11,,,,,,11,,,,11,11,,11,11,,,,11,11,11',
+'11,395,395,11,,395,395,,395,395,114,,,,,,,,,,,,,,114,395,114,,114,114',
+',395,,395,,395,395,,395,395,395,,395,395,395,395,,,395,395,114,,395',
+',,395,395,,,,,15,15,395,,15,15,,15,395,,,,395,395,,395,395,,,,395,395',
+'395,395,15,,395,,,,15,,15,,15,15,,15,15,15,,15,15,,,,,15,15,,,15,,,15',
+'15,,,,,16,16,15,,16,16,,16,15,,,,15,15,,15,15,,,,15,15,15,15,16,,15',
+',,,16,,16,,16,16,,16,16,16,,16,16,,,,,16,16,,,16,,,16,16,,,,,17,17,16',
+',17,17,,17,16,,,,16,16,,16,16,,,,16,16,16,16,17,,16,,,,17,,17,,17,17',
+',17,17,17,,17,17,,,,,17,17,,,17,,,17,17,,,,,18,18,17,,18,18,,18,17,',
+',,17,17,,17,17,,,,17,17,17,17,18,,17,,,,18,,18,,18,18,,18,18,18,,18',
+'18,18,18,,,18,18,,,18,,,18,18,,,,,,,18,,,,,,18,,,,18,18,,18,18,,,,18',
+'18,18,18,379,379,18,,379,379,,379,379,115,,,,,,,,,,,,,,115,379,115,',
+'115,115,,379,,379,,379,379,,379,379,379,,379,379,379,379,,,379,379,115',
+',379,,,379,379,,,,,368,368,379,,368,368,,368,379,,,,379,379,,379,379',
+',,,379,379,379,379,368,,379,,,,368,,368,,368,368,,368,368,368,,368,368',
+',,,,368,368,,,368,,,368,368,,,,,42,42,368,,42,42,,42,368,,,,368,368',
+',368,368,,,,368,368,368,368,42,,368,,,,42,,42,,42,42,,42,42,42,,42,42',
+',,,,42,42,,,42,,,42,42,,,,,43,43,42,,43,43,,43,42,,,,42,42,,42,42,,',
+',42,42,42,42,43,,42,,,,43,,43,,43,43,,43,43,43,,43,43,,,,,43,43,,,43',
+',,43,43,,,,,44,44,43,,44,44,,44,43,,,,43,43,,43,43,,,,43,43,43,43,44',
+',43,,,,44,,44,,44,44,,44,44,44,,44,44,,,,,44,44,,,44,,,44,44,,,,,,,44',
+',,,,,44,,,,44,44,,44,44,,,,44,44,44,44,242,242,44,,242,242,,242,242',
+',,,,,,,,,,,,,,,242,46,46,,,46,242,,242,,242,242,,242,242,242,,242,242',
+'242,242,,,242,242,,,242,,,242,242,,,,,,,242,,46,,,46,242,,,,242,242',
+',242,242,,,,242,242,242,242,243,243,242,46,243,243,,243,243,190,,,,46',
+'46,,,,,,,,,190,243,190,,190,190,,243,,243,,243,243,,243,243,243,,243',
+'243,243,243,,,243,243,190,,243,,,243,243,,,,,52,52,243,,52,52,52,52',
+'243,,,,243,243,,243,243,,,,243,243,243,243,52,,243,,,,52,,52,,52,52',
+',52,52,52,,52,52,52,52,,,52,52,,,52,,,52,52,,,,,53,53,52,,53,53,53,53',
+'52,,,,52,52,,52,52,,,,52,52,52,52,53,,52,,,,53,,53,,53,53,,53,53,53',
+',53,53,53,53,,,53,53,,,53,,,53,53,,,,,,,53,,,,,,53,,,,53,53,,53,53,',
+',,53,53,53,53,54,54,53,,54,54,,54,54,112,,,,,,,,,,,,,,112,54,112,,112',
+'112,,54,,54,,54,54,,54,54,54,,54,54,54,54,,,54,54,112,,54,,,54,54,,',
+',,60,60,54,,60,60,,60,54,,,,54,54,,54,54,,,,54,54,54,54,60,,54,,,,60',
+',60,,60,60,,60,60,60,,60,60,60,60,,,60,60,,,60,,,60,60,,,,,356,356,60',
+',356,356,,356,60,,,,60,60,,60,60,,,,60,60,60,60,356,,60,,,,356,,356',
+',356,356,,356,356,356,,356,356,356,356,,,356,356,,,356,,,356,356,,,',
+',350,350,356,,350,350,,350,356,,,,356,356,,356,356,,,,356,356,356,356',
+'350,,356,,,,350,,350,,350,350,,350,350,350,,350,350,,,,,350,350,,,350',
+',,350,350,,,,,65,65,350,,65,65,,65,350,,,,350,350,,350,350,,,,350,350',
+'350,350,65,,350,,,,65,,65,,65,65,,65,65,65,,65,65,,,,,65,65,,,65,,,65',
+'65,,,,,244,244,65,,244,244,,244,65,,,,65,65,,65,65,,,,65,65,65,65,244',
+',65,,,,244,,244,,244,244,,244,244,244,,244,244,,,,,244,244,,,244,,,244',
+'244,,,,,69,69,244,,69,69,,69,244,,,,244,244,,244,244,,,,244,244,244',
+'244,69,,244,,,,69,,69,,69,69,,69,69,69,,69,69,69,69,,,69,69,,,69,,,69',
+'69,,,,,171,171,69,,171,171,,171,69,,,,69,69,,69,69,,,,69,69,69,69,171',
+',69,,,,171,,171,,171,171,,171,171,171,,171,171,,,,,171,171,,,171,,,171',
+'171,,,,,71,71,171,,71,71,,71,171,,,,171,171,,171,171,,,,171,171,171',
+'171,71,,171,,,,71,,71,,71,71,,71,71,71,,71,71,71,71,,,71,71,,,71,,,71',
+'71,,,,,72,72,71,,72,72,,72,71,,,,71,71,,71,71,,,,71,71,71,71,72,,71',
+',,,72,,72,,72,72,,72,72,72,,72,72,72,72,,,72,72,,,72,,,72,72,,,,,73',
+'73,72,,73,73,,73,72,,,,72,72,,72,72,,,,72,72,72,72,73,,72,,,,73,,73',
+',73,73,,73,73,73,,73,73,73,73,,,73,73,,,73,,,73,73,,,,,74,74,73,,74',
+'74,,74,73,,,,73,73,,73,73,,,,73,73,73,73,74,,73,,,,74,,74,,74,74,,74',
+'74,74,,74,74,74,74,,,74,74,,,74,,,74,74,,,,,75,75,74,,75,75,,75,74,',
+',,74,74,,74,74,,,,74,74,74,74,75,,74,,,,75,,75,,75,75,,75,75,75,,75',
+'75,75,75,,,75,75,,,75,,,75,75,,,,,76,76,75,,76,76,,76,75,,,,75,75,,75',
+'75,,,,75,75,75,75,76,,75,,,,76,,76,,76,76,,76,76,76,,76,76,76,76,,,76',
+'76,,,76,,,76,76,,,,,77,77,76,,77,77,,77,76,,,,76,76,,76,76,,,,76,76',
+'76,76,77,,76,,,,77,,77,,77,77,,77,77,77,,77,77,77,77,,,77,77,,,77,,',
+'77,77,,,,,78,78,77,,78,78,,78,77,,,,77,77,,77,77,,,,77,77,77,77,78,',
+'77,,,,78,,78,,78,78,,78,78,78,,78,78,78,78,,,78,78,,,78,,,78,78,,,,',
+'79,79,78,,79,79,,79,78,,,,78,78,,78,78,,,,78,78,78,78,79,,78,,,,79,79',
+'79,79,79,79,79,79,79,79,,79,79,,,,,79,79,79,79,79,,,79,79,,,,,,,79,',
+',,,79,79,,,,79,79,,79,79,,,,79,79,79,79,80,80,79,,80,80,,80,,,,,,,,',
+',,,,,,,,80,,,,,,80,,80,,80,80,,80,80,80,,80,80,,,,,80,80,,,80,,,80,80',
+',,,,81,81,80,,81,81,,81,80,,,,80,80,,80,80,,,,80,80,80,80,81,,80,,,',
+'81,,81,,81,81,,81,81,81,,81,81,,,,,81,81,,,81,,,81,81,,,,,82,82,81,',
+'82,82,,82,81,,,,81,81,,81,81,,,,81,81,81,81,82,,81,,,,82,,82,,82,82',
+',82,82,82,,82,82,,,,,82,82,,,82,,,82,82,,,,,83,83,82,,83,83,,83,82,',
+',,82,82,,82,82,,,,82,82,82,82,83,,82,,,,83,,83,,83,83,,83,83,83,,83',
+'83,,,,,83,83,,,83,,,83,83,,,,,84,84,83,,84,84,,84,83,,,,83,83,,83,83',
+',,,83,83,83,83,84,,83,,,,84,,84,,84,84,,84,84,84,,84,84,,,,,84,84,,',
+'84,,,84,84,,,,,85,85,84,,85,85,,85,84,,,,84,84,,84,84,,,,84,84,84,84',
+'85,,84,,,,85,,85,,85,85,,85,85,85,,85,85,,,,,85,85,,,85,,,85,85,,,,',
+'86,86,85,,86,86,,86,85,,,,85,85,,85,85,,,,85,85,85,85,86,,85,,,,86,',
+'86,,86,86,,86,86,86,,86,86,,,,,86,86,,,86,,,86,86,,,,,87,87,86,,87,87',
+',87,86,,,,86,86,,86,86,,,,86,86,86,86,87,,86,,,,87,,87,,87,87,,87,87',
+'87,,87,87,,,,,87,87,,,87,,,87,87,,,,,88,88,87,,88,88,,88,87,,,,87,87',
+',87,87,,,,87,87,87,87,88,,87,,,,88,,88,,88,88,,88,88,88,,88,88,,,,,88',
+'88,,,88,,,88,88,,,,,89,89,88,,89,89,,89,88,,,,88,88,,88,88,,,,88,88',
+'88,88,89,,88,,,,89,,89,,89,89,,89,89,89,,89,89,,,,,89,89,,,89,,,89,89',
+',,,,90,90,89,,90,90,,90,89,,,,89,89,,89,89,,,,89,89,89,89,90,,89,,,',
+'90,,90,,90,90,,90,90,90,,90,90,,,,,90,90,,,90,,,90,90,,,,,91,91,90,',
+'91,91,,91,90,,,,90,90,,90,90,,,,90,90,90,90,91,,90,,,,91,,91,,91,91',
+',91,91,91,,91,91,,,,,91,91,,,91,,,91,91,,,,,92,92,91,,92,92,,92,91,',
+',,91,91,,91,91,,,,91,91,91,91,92,,91,,,,92,,92,,92,92,,92,92,92,,92',
+'92,,,,,92,92,,,92,,,92,92,,,,,93,93,92,,93,93,,93,92,,,,92,92,,92,92',
+',,,92,92,92,92,93,,92,,,,93,,93,,93,93,,93,93,93,,93,93,,,,,93,93,,',
+'93,,,93,93,,,,,94,94,93,,94,94,,94,93,,,,93,93,,93,93,,,,93,93,93,93',
+'94,,93,,,,94,,94,,94,94,,94,94,94,,94,94,,,,,94,94,,,94,,,94,94,,,,',
+'95,95,94,,95,95,,95,94,,,,94,94,,94,94,,,,94,94,94,94,95,,94,,,,95,',
+'95,,95,95,,95,95,95,,95,95,,,,,95,95,,,95,,,95,95,,,,,96,96,95,,96,96',
+',96,95,,,,95,95,,95,95,,,,95,95,95,95,96,,95,,,,96,,96,,96,96,,96,96',
+'96,,96,96,,,,,96,96,,,96,,,96,96,,,,,97,97,96,,97,97,,97,96,,,,96,96',
+',96,96,,,,96,96,96,96,97,,96,,,,97,,97,,97,97,,97,97,97,,97,97,,,,,97',
+'97,,,97,,,97,97,,,,,98,98,97,,98,98,,98,97,,,,97,97,,97,97,,,,97,97',
+'97,97,98,,97,,,,98,,98,,98,98,,98,98,98,,98,98,,,,,98,98,,,98,,,98,98',
+',,,,99,99,98,,99,99,,99,98,,,,98,98,,98,98,,,,98,98,98,98,99,,98,,,',
+'99,,99,,99,99,,99,99,99,,99,99,,,,,99,99,,,99,,,99,99,,,,,100,100,99',
+',100,100,,100,99,,,99,99,99,,99,99,,,,99,99,99,99,100,100,99,,,,100',
+',100,,100,100,,100,100,100,,100,100,100,100,,,100,100,,,100,,,100,100',
+',,,,278,278,100,,278,278,,278,100,,,,100,100,,100,100,,,,100,100,100',
+'100,278,,100,,,,278,,278,,278,278,,278,278,278,,278,278,,,,,278,278',
+',,278,,,278,278,,,,,169,169,278,,169,169,,169,278,,,,278,278,,278,278',
+',,,278,278,278,278,169,,278,,,,169,,169,,169,169,,169,169,169,,169,169',
+',,,,169,169,,,169,,,169,169,,,,,103,103,169,,103,103,,103,169,,,,169',
+'169,,169,169,,,,169,169,169,169,103,,169,,,,103,,103,,103,103,,103,103',
+'103,,103,103,,,,,103,103,,,103,,,103,103,,,,,104,104,103,,104,104,,104',
+'103,,,,103,103,,103,103,,,,103,103,103,103,104,,103,,,,104,,104,,104',
+'104,,104,104,104,,104,104,,,,,104,104,,,104,,,104,104,,,,,165,165,104',
+',165,165,,165,104,,165,,104,104,,104,104,,,,104,104,104,104,165,,104',
+',,,165,,165,,165,165,,165,165,165,,165,165,,,,,165,165,,,165,,,165,165',
+',,,,249,249,165,,249,249,,249,165,,,,165,165,,165,165,,,,165,165,165',
+'165,249,,165,,,,249,,249,,249,249,,249,249,249,,249,249,249,249,,,249',
+'249,,,249,,,249,249,,,,,107,107,249,,107,107,,107,249,,,,249,249,,249',
+'249,,,,249,249,249,249,107,,249,,,,107,,107,,107,107,,107,107,107,,107',
+'107,,,,,107,107,,,107,,,107,107,,,,,326,326,107,,326,326,,326,107,,',
+',107,107,,107,107,,,,107,107,107,107,326,,107,,,,326,,326,,326,326,',
+'326,326,326,,326,326,326,326,,,326,326,,,326,,,326,326,,,,,,,326,,,',
+',,326,,,,326,326,,326,326,,,,326,326,326,326,253,253,326,,253,253,,253',
+'253,,,,,,,,,,,,,,,,253,247,247,,,247,253,,253,,253,253,,253,253,253',
+',253,253,253,253,,,253,253,,,253,,,253,253,,,,,,,253,,247,,,247,253',
+',,,253,253,,253,253,,,,253,253,253,253,324,324,253,247,324,324,,324',
+'324,,,,,247,247,,,,,,,,,,324,,,,,,324,,324,,324,324,,324,324,324,,324',
+'324,,,,,324,324,,,324,,,324,324,,,,,254,254,324,,254,254,,254,324,,',
+',324,324,,324,324,,,,324,324,324,324,254,,324,,,,254,,254,,254,254,',
+'254,254,254,,254,254,254,254,,,254,254,,,254,,,254,254,,,,,259,259,254',
+',259,259,,259,254,,,,254,254,,254,254,,,,254,254,254,254,259,,254,,',
+',259,,259,,259,259,,259,259,259,,259,259,259,259,,,259,259,,,259,,,259',
+'259,,,,,317,317,259,,317,317,,317,259,,,,259,259,,259,259,,,,259,259',
+'259,259,317,,259,,,,317,,317,,317,317,,317,317,317,,317,317,317,317',
+',,317,317,,,317,,,317,317,,,,,316,316,317,,316,316,,316,317,,,,317,317',
+',317,317,,,,317,317,317,317,316,,317,,,,316,,316,,316,316,,316,316,316',
+',316,316,,,,,316,316,,,316,,,316,316,,,,,,,316,,,,,,316,,,,316,316,',
+'316,316,,,,316,316,316,316,152,152,316,,152,152,,152,152,,,,,,,,,,,',
+',,,,152,,,,,,152,,152,,152,152,,152,152,152,,152,152,152,152,,,152,152',
+',,152,,,152,152,,,,,120,120,152,,120,120,,120,152,,,,152,152,,152,152',
+',,,152,152,152,152,120,120,152,,,,120,,120,,120,120,,120,120,120,,120',
+'120,120,120,,,120,120,,,120,,,120,120,,,,,149,149,120,,149,149,,149',
+'120,,,,120,120,,120,120,,,,120,120,120,120,149,,120,,,,149,,149,,149',
+'149,,149,149,149,,149,149,149,149,,,149,149,,,149,,,149,149,,,,,274',
+'274,149,,274,274,,274,149,,,,149,149,,149,149,,,,149,149,149,149,274',
+',149,,,,274,,274,,274,274,,274,274,274,,274,274,,,,,274,274,,,274,,',
+'274,274,,,,,275,275,274,,275,275,,275,274,,,,274,274,,274,274,,,,274',
+'274,274,274,275,,274,,,,275,,275,,275,275,,275,275,275,,275,275,,,,',
+'275,275,,,275,,,275,275,,,,,313,313,275,,313,313,,313,275,,,,275,275',
+',275,275,,,,275,275,275,275,313,,275,,,,313,,313,,313,313,,313,313,313',
+',313,313,,,,,313,313,,,313,,,313,313,,,,,276,276,313,,276,276,,276,313',
+',,,313,313,,313,313,,,,313,313,313,313,276,,313,,,,276,,276,,276,276',
+',276,276,276,,276,276,,,,,276,276,,,276,,,276,276,,,,,302,302,276,,302',
+'302,,302,276,,,,276,276,,276,276,,,,276,276,276,276,302,,276,,,,302',
+',302,,302,302,,302,302,302,,302,302,,,,,302,302,,,302,,,302,302,,,,',
+'279,279,302,,279,279,,279,302,,,,302,302,,302,302,,,,302,302,302,302',
+'279,,302,,,,279,,279,,279,279,,279,279,279,,279,279,,,,,279,279,,,279',
+',,279,279,,,,,170,170,279,,170,170,,170,279,,,,279,279,,279,279,,,,279',
+'279,279,279,170,,279,,,,170,,170,,170,170,,170,170,170,,170,170,,,,',
+'170,170,,,170,,,170,170,,,,,,,170,,,,,,170,,,,170,170,,170,170,346,',
+',170,170,170,170,,,170,,,346,346,346,,346,,346,346,,346,346,346,346',
+',329,329,,,329,,,,,,,,,,346,,,,346,346,,,346,346,346,346,346,346,,346',
+'346,124,,124,,,346,,,329,,,329,124,124,124,,124,,124,124,,124,124,124',
+'124,,346,,,,,329,,,,,,,,,124,329,329,,124,124,,,124,124,124,124,124',
+'124,,124,124,123,,123,,,124,,,,,,,123,123,123,,123,193,123,123,,123',
+'123,123,123,,124,,,,,193,,193,,193,193,,,,123,,,,123,123,,,123,123,123',
+'123,123,123,,123,123,193,,,,,123,,,,,193,193,,,,193,193,121,,121,,,193',
+',,,123,,,121,121,121,,121,195,121,121,,121,121,121,121,,193,,,,,195',
+',195,,195,195,,,,121,,,,121,121,,216,121,121,121,121,121,121,,121,121',
+'195,,216,216,216,121,216,,216,216,,216,216,216,216,195,195,,,,,,195',
+',,,121,,,,216,,,,216,216,,151,216,216,216,216,216,216,,216,216,,,151',
+'151,151,216,151,,151,151,,151,151,151,151,,,,,,,,,,,,216,,,,151,,,,151',
+'151,,,151,151,151,151,151,151,,151,151,,,,,,151,221,,,,,,,,,,151,151',
+'221,221,221,221,221,199,221,221,151,221,221,221,221,,,,,,,199,,199,',
+'199,199,,,,221,,,,221,221,,,221,221,221,221,221,221,,221,221,199,,,',
+',221,,,199,199,199,199,,,,199,199,9,,,,,199,,,,221,,,9,9,9,,9,,9,9,',
+'9,9,9,9,,199,,,,,,,,,,,,,,9,,,,9,9,,,9,9,9,9,9,9,208,9,9,,,208,,,9,',
+',,208,208,208,,208,196,208,208,,208,208,208,208,,,,,9,,196,,196,,196',
+'196,,,,208,,,,208,208,,207,208,208,208,208,208,208,,208,208,196,,207',
+'207,207,208,207,,207,207,,207,207,207,207,196,196,,,,,,196,,,,208,,',
+',207,,,,,207,,364,207,207,207,207,207,207,,207,207,,,364,364,364,207',
+'364,,364,364,,364,364,364,364,,,,,,,,,,,,207,,,,364,,,,364,364,,,364',
+'364,364,364,364,364,163,364,364,,,,,,364,,,,163,163,163,163,163,197',
+'163,163,,163,163,163,163,,,,,364,,197,,197,,197,197,,,,163,,,,163,163',
+',188,163,163,163,163,163,163,,163,163,197,,188,188,188,163,188,,188',
+'188,,188,188,188,188,197,197,,,,,,197,,,,163,,,,188,,,,188,188,,344',
+'188,188,188,188,188,188,,188,188,,,344,344,344,188,344,,344,344,,344',
+'344,344,344,,,,,,,,,,,,188,,,,344,,,,344,344,,206,344,344,344,344,344',
+'344,,344,344,,,206,206,206,344,206,,206,206,,206,206,206,206,205,,,',
+',,,,,,,344,,205,205,206,205,,205,205,198,205,,206,206,206,206,206,206',
+',206,206,,,198,,198,206,198,198,205,,,,,,,,205,205,205,205,205,205,',
+'205,205,,206,,198,,205,,,,,,198,198,198,198,345,,,198,198,,,,,,198,205',
+'345,345,345,,345,,345,345,194,345,345,345,345,,,,,,,198,,,194,,194,',
+'194,194,345,,,,345,345,,,345,345,345,345,345,345,,345,345,,,,194,,345',
+',,,,,,,194,194,347,,,194,194,,,,,,194,345,347,347,347,,347,,347,347',
+'203,347,347,347,347,,,,,,,194,,203,203,,203,,203,203,347,203,,,347,347',
+',,347,347,347,347,347,347,,347,347,,,,203,,347,,,,,,203,203,203,203',
+'203,203,348,203,203,,,,,,203,347,,,348,348,348,,348,200,348,348,,348',
+'348,348,348,,,,,203,,200,,200,,200,200,,,,348,,,,348,348,,,348,348,348',
+'348,348,348,,348,348,200,,,,,348,,,200,200,200,200,200,200,201,200,200',
+',,,,,200,,,,348,,201,,201,202,201,201,,,,,,,,,,200,202,202,,202,,202',
+'202,,202,,201,,,,,,,,201,201,201,201,201,201,,201,201,202,,,,,201,,',
+'202,202,202,202,202,202,204,202,202,,,,,,202,,,,201,204,204,,204,,204',
+'204,,204,,,,,,,,202,,,,,,,,,,,204,,,,,,,,204,204,204,204,204,204,,204',
+'204,,,,,,204,,,271,271,271,271,,271,271,271,,271,,271,271,,,,,,204,271',
+'271,271,,,,271,,,,,,,,,,,,271,271,,,,,,,,,,,,271,271,271,271,273,273',
+'273,273,,273,273,273,,273,,273,273,,,,,,,273,273,273,,,,273,,,,,,,,',
+',,,273,273,,,,,,,,,,,,273,273,273,273,303,303,303,303,,303,303,303,',
+'303,,303,303,,,,,,,303,303,303,,,,303,,,,,,,,,,,,303,303,,,,,,,,,,,',
+'303,303,303,303,215,215,215,215,,215,215,215,,215,,215,215,,,,,,,215',
+'215,215,,,,215,,,,,,,,,,,,215,215,,,,,,,,,,,,215,215,215,215' ]
+        racc_action_check = arr = ::Array.new(6809, nil)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|
@@ -575,464 +497,445 @@ clist = [
         end
 racc_action_pointer = [
-    -2,   317,   nil,   nil,   172,   300,   nil,   475,   302,  7712,
-   607,   694,   326,   nil,   nil,   868,   955,  1042,  1129,   nil,
+    -2,   313,   nil,   nil,   118,   296,   nil,   173,   295,  5793,
+   466,   526,    69,   nil,   nil,   670,   730,   790,   850,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   236,   264,  1390,  1477,  1564,   412,  7481,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,  1825,  1912,  1999,   nil,   nil,
-   nil,   nil,   nil,  2086,   nil,   198,   196,   nil,  2347,   nil,
-   nil,    29,  2521,   231,  2695,  2782,  2869,  2956,  3043,  3130,
-  7306,  3304,  3391,  3478,  3565,  3652,  3739,  3826,  3913,  4000,
-  4087,  4174,  4261,  4348,  4435,  4522,  4609,  4696,  4783,  4870,
-  4957,  5044,  5131,  5218,   196,   223,  5479,  5566,   221,   218,
-  5827,   200,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   263,   194,   866,   953,   183,   nil,   196,    82,  6610,  7564,
-   nil,  7507,  7450,   177,   178,   nil,   169,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   176,   nil,   171,   nil,    80,   nil,
-   nil,   154,   nil,    99,   nil,   nil,    95,  6697,   302,  7665,
-  6349,   nil,   130,   nil,   nil,   nil,   nil,   128,   124,   123,
-   114,  7787,    93,  5914,    54,    55,    62,  5740,  5653,  5392,
-   nil,   nil,    24,     9,     7,     2,   320,   234,  7538,    -1,
-    -2,    -4,    -9,   nil,   nil,   nil,   nil,   nil,   nil,  7975,
-    18,   872,   437,   785,   524,   176,   698,   779,   611,    89,
-     2,  7392,  7375,  7992,  7729,  8157,  8329,  8211,  8312,  8265,
-   nil,   nil,  2260,    86,   182,   nil,  8541,  7928,    57,   nil,
-   153,   146,  7618,   nil,   155,   nil,   270,   nil,   nil,  6523,
-   nil,   260,   nil,   nil,   nil,   nil,   nil,   256,   184,   -24,
-   189,   -11,   nil,   346,   520,   781,   145,   112,  7331,   -28,
-  1651,    32,    71,   nil,  1738,  5305,   nil,   nil,   nil,   nil,
-  6001,   nil,   nil,   nil,   nil,    94,   nil,   nil,   nil,   nil,
-   101,   110,  8484,   120,  8427,  6088,  6175,  6262,   nil,  6784,
-  6871,   143,   nil,   130,   nil,   148,   nil,   nil,   nil,   nil,
-   152,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   155,  3217,  8598,   171,   nil,
-   360,   nil,   172,   176,   nil,   116,    91,  7219,   nil,   nil,
-  7132,  7045,   nil,   182,    67,   184,   162,    -7,  6958,   nil,
-  6436,   198,   nil,  8413,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   148,   -11,   211,   nil,   nil,  7881,  8046,
-  8093,  8140,  7834,   231,  2608,   177,   241,   nil,   nil,   239,
-  2434,   nil,   nil,   nil,   237,   nil,   nil,   nil,  8383,     9,
-   -15,   nil,  2173,   267,   244,   nil,   269,   270,   nil,   nil,
-   277,   nil,   nil,  1303,   nil,   nil,   nil,   282,   252,   nil,
-   nil,   nil,   nil,   nil,   291,   nil,   nil,   nil,   nil,  1216,
-   nil,   433,   259,   nil,   304,   nil,   nil,    85,   nil,   308,
-   nil,   314,   nil,   315,   nil,   nil,   nil,   286,   nil,   nil,
-   nil,   nil ]
+   220,   256,  1054,  1114,  1174,    48,  1283,   nil,   nil,   nil,
+   nil,   nil,  1402,  1462,  1546,   nil,   nil,   nil,   nil,   nil,
+  1606,   nil,   201,   202,   nil,  1786,   nil,   nil,   267,  1906,
+   246,  2026,  2086,  2146,  2206,  2266,  2326,  2386,  2446,  2506,
+  2590,  2650,  2710,  2770,  2830,  2890,  2950,  3010,  3070,  3130,
+  3190,  3250,  3310,  3370,  3430,  3490,  3550,  3610,  3670,  3730,
+  3790,   217,   248,  3970,  4030,   245,   238,  4210,   219,   nil,
+   nil,   nil,  1550,    -1,   614,   938,   203,   nil,   220,    55,
+  4822,  5562,   nil,  5488,  5431,   200,   195,   nil,   186,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   173,   nil,   170,   nil,
+    90,   nil,   nil,   166,   nil,    14,   nil,   nil,   170,  4882,
+    60,  5656,  4762,   nil,   135,   nil,   nil,   nil,   nil,    84,
+    79,    61,   266,  5995,   153,  4090,     5,     3,     2,  3910,
+  5302,  1966,   nil,   nil,    -9,    82,   108,   287,    -2,     4,
+    -4,    -1,   nil,   nil,   nil,   nil,   nil,   nil,  6042,    61,
+  1346,     2,   350,  5505,  6253,  5579,  5864,  6012,  6181,  5736,
+  6396,  6450,  6467,  6325,  6521,  6161,  6136,  5894,  5847,   nil,
+   nil,   406,   231,   209,   nil,  6723,  5609,   202,   nil,   276,
+   239,  5719,   nil,   241,   nil,   120,   nil,   nil,   262,   nil,
+   230,   nil,   nil,   nil,   nil,   nil,   217,   189,   -24,   204,
+    -7,   nil,  1258,  1342,  1846,   170,   132,  4379,   -28,  4150,
+    21,    55,   nil,  4354,  4498,   nil,   nil,   nil,   nil,  4558,
+   nil,   nil,   nil,   nil,    92,   nil,   nil,   nil,   nil,   101,
+   119,  6561,   155,  6615,  4942,  5002,  5122,   nil,  3850,  5242,
+   181,   nil,   170,   nil,   185,   nil,   187,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   195,  5182,  6669,   200,   nil,    93,   nil,   200,   206,
+   nil,   149,    30,  5062,   nil,   nil,  4678,  4618,   nil,   222,
+    83,   226,   204,     9,  4438,   nil,  4270,   237,   nil,  5405,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   178,
+    58,   238,   nil,   nil,  6089,  6233,  5374,  6305,  6379,   260,
+  1726,   203,    -8,   nil,   nil,   263,  1666,   nil,   nil,   nil,
+   251,   nil,   nil,   nil,  5941,    13,   118,   nil,   994,   274,
+   251,   nil,   276,   277,   nil,   nil,   277,   nil,   nil,   934,
+   nil,   nil,   nil,   282,   253,   nil,   nil,   nil,   nil,   nil,
+   287,   nil,   nil,   nil,   nil,   610,   nil,   346,   178,   nil,
+   300,   nil,   nil,    58,   nil,   304,   nil,   306,   nil,   307,
+   nil,   nil,   nil,   278,   nil,   nil,   nil,   nil ]
 racc_action_default = [
-    -3,  -252,    -1,    -2,    -4,    -5,    -8,   -10,   -16,   -21,
-  -252,  -252,  -252,   -33,   -34,  -252,  -252,  -252,  -252,   -61,
+    -3,  -241,    -1,    -2,    -4,    -5,    -8,   -10,   -16,   -21,
+  -241,  -241,  -241,   -33,   -34,  -241,  -241,  -241,  -241,   -61,
    -62,   -63,   -64,   -65,   -66,   -67,   -68,   -69,   -70,   -71,
    -72,   -73,   -74,   -75,   -76,   -77,   -78,   -79,   -80,   -81,
-   -86,   -90,  -252,  -252,  -252,  -252,  -252,  -182,  -183,  -184,
-  -185,  -186,  -187,  -188,  -189,  -252,  -252,  -252,  -200,  -201,
-  -202,  -203,  -204,  -252,  -206,  -252,  -219,  -222,  -252,  -227,
-  -228,  -252,  -252,    -7,  -252,  -252,  -252,  -252,  -252,  -252,
-  -252,  -252,  -126,  -252,  -252,  -252,  -252,  -252,  -252,  -252,
-  -252,  -252,  -252,  -252,  -252,  -252,  -252,  -252,  -252,  -252,
-  -252,  -252,  -252,  -252,  -252,  -121,  -251,  -251,   -22,   -23,
-  -252,  -251,  -139,  -160,  -161,  -162,  -163,  -164,  -165,  -166,
-   -46,  -252,   -47,   -54,  -252,   -87,  -252,  -252,  -252,  -252,
-   -97,  -252,  -252,  -251,  -229,  -148,  -150,  -151,  -152,  -153,
-  -154,  -156,  -157,   -14,  -229,  -191,  -229,  -193,  -252,  -196,
-  -197,  -252,  -205,  -252,  -210,  -213,  -252,  -217,  -252,  -252,
-  -252,   432,    -6,    -9,   -11,   -12,   -13,   -17,   -18,   -19,
-   -20,  -252,  -229,  -252,   -79,   -80,   -81,  -240,  -246,  -234,
-  -127,  -130,  -187,  -188,  -189,  -252,  -237,  -235,  -243,  -183,
-  -184,  -185,  -186,  -233,  -238,  -239,  -241,  -242,  -244,   -59,
-  -252,   -36,   -37,   -38,   -39,   -40,   -41,   -42,   -43,   -44,
-   -45,   -48,   -49,   -50,   -51,   -52,   -53,   -55,   -56,  -252,
-   -57,  -115,  -252,  -229,   -83,   -91,  -126,  -125,  -252,  -124,
-  -252,  -231,  -252,   -28,  -251,  -167,  -252,   -58,   -92,  -252,
-   -95,  -229,  -170,  -172,  -173,  -174,  -175,  -177,  -252,  -252,
-  -180,  -252,   -89,  -252,  -252,  -252,  -252,  -251,  -230,  -252,
-  -230,  -252,  -252,  -194,  -252,  -252,  -207,  -208,  -209,  -211,
-  -252,  -214,  -215,  -216,  -218,  -229,  -220,  -223,  -225,  -226,
-    -8,  -252,  -126,  -252,  -230,  -252,  -252,  -252,   -35,  -252,
-  -252,  -229,  -117,  -252,   -85,  -229,  -129,  -131,  -132,  -133,
-  -252,  -234,  -235,  -236,  -237,  -240,  -243,  -245,  -246,  -247,
-  -248,  -249,  -250,  -122,  -123,  -252,  -232,  -126,  -252,  -142,
-  -252,  -168,  -229,  -252,   -94,  -252,  -230,  -252,  -178,  -179,
-  -252,  -252,   -88,  -252,  -100,  -252,  -106,  -252,  -252,  -110,
-  -251,  -252,  -158,  -252,  -149,  -155,   -15,  -190,  -192,  -195,
-  -198,  -199,  -212,  -252,  -252,  -229,   -26,  -128,  -136,  -134,
-  -135,   -60,  -119,  -252,  -230,   -82,  -252,   -25,   -29,  -229,
-  -251,  -143,  -144,  -145,  -252,   -93,   -96,  -171,  -176,  -252,
-  -100,   -99,  -252,  -252,  -106,  -105,  -252,  -252,  -109,  -111,
-  -252,  -140,  -141,  -252,  -159,  -221,  -224,  -252,   -30,  -116,
-  -118,   -84,  -120,   -27,  -252,  -169,  -181,   -98,  -101,  -252,
-  -104,  -252,  -251,  -137,  -252,  -147,   -24,   -31,  -138,  -252,
-  -103,  -252,  -108,  -252,  -113,  -114,  -146,  -231,  -102,  -107,
-  -112,   -32 ]
+   -86,   -90,  -241,  -241,  -241,  -241,  -241,  -174,  -175,  -176,
+  -177,  -178,  -241,  -241,  -241,  -189,  -190,  -191,  -192,  -193,
+  -241,  -195,  -241,  -208,  -211,  -241,  -216,  -217,  -241,  -241,
+    -7,  -241,  -241,  -241,  -241,  -241,  -241,  -241,  -241,  -126,
+  -241,  -241,  -241,  -241,  -241,  -241,  -241,  -241,  -241,  -241,
+  -241,  -241,  -241,  -241,  -241,  -241,  -241,  -241,  -241,  -241,
+  -241,  -241,  -121,  -240,  -240,   -22,   -23,  -241,  -240,  -136,
+  -157,  -158,   -46,  -241,   -47,   -54,  -241,   -87,  -241,  -241,
+  -241,  -241,   -97,  -241,  -241,  -240,  -218,  -145,  -147,  -148,
+  -149,  -150,  -151,  -153,  -154,   -14,  -218,  -180,  -218,  -182,
+  -241,  -185,  -186,  -241,  -194,  -241,  -199,  -202,  -241,  -206,
+  -241,  -241,  -241,   418,    -6,    -9,   -11,   -12,   -13,   -17,
+   -18,   -19,   -20,  -241,  -218,  -241,   -79,   -80,   -81,  -229,
+  -235,  -223,  -127,  -130,  -241,  -226,  -224,  -232,  -175,  -176,
+  -177,  -178,  -222,  -227,  -228,  -230,  -231,  -233,   -59,  -241,
+   -36,   -37,   -38,   -39,   -40,   -41,   -42,   -43,   -44,   -45,
+   -48,   -49,   -50,   -51,   -52,   -53,   -55,   -56,  -241,   -57,
+  -115,  -241,  -218,   -83,   -91,  -126,  -125,  -241,  -124,  -241,
+  -220,  -241,   -28,  -240,  -159,  -241,   -58,   -92,  -241,   -95,
+  -218,  -162,  -164,  -165,  -166,  -167,  -169,  -241,  -241,  -172,
+  -241,   -89,  -241,  -241,  -241,  -241,  -240,  -219,  -241,  -219,
+  -241,  -241,  -183,  -241,  -241,  -196,  -197,  -198,  -200,  -241,
+  -203,  -204,  -205,  -207,  -218,  -209,  -212,  -214,  -215,    -8,
+  -241,  -126,  -241,  -219,  -241,  -241,  -241,   -35,  -241,  -241,
+  -218,  -117,  -241,   -85,  -218,  -129,  -241,  -223,  -224,  -225,
+  -226,  -229,  -232,  -234,  -235,  -236,  -237,  -238,  -239,  -122,
+  -123,  -241,  -221,  -126,  -241,  -139,  -241,  -160,  -218,  -241,
+   -94,  -241,  -219,  -241,  -170,  -171,  -241,  -241,   -88,  -241,
+  -100,  -241,  -106,  -241,  -241,  -110,  -240,  -241,  -155,  -241,
+  -146,  -152,   -15,  -179,  -181,  -184,  -187,  -188,  -201,  -241,
+  -241,  -218,   -26,  -128,  -133,  -131,  -132,   -60,  -119,  -241,
+  -219,   -82,  -241,   -25,   -29,  -218,  -240,  -140,  -141,  -142,
+  -241,   -93,   -96,  -163,  -168,  -241,  -100,   -99,  -241,  -241,
+  -106,  -105,  -241,  -241,  -109,  -111,  -241,  -137,  -138,  -241,
+  -156,  -210,  -213,  -241,   -30,  -116,  -118,   -84,  -120,   -27,
+  -241,  -161,  -173,   -98,  -101,  -241,  -104,  -241,  -240,  -134,
+  -241,  -144,   -24,   -31,  -135,  -241,  -103,  -241,  -108,  -241,
+  -113,  -114,  -143,  -220,  -102,  -107,  -112,   -32 ]
 racc_goto_table = [
-     2,   120,   122,   123,   125,   124,   137,   231,   139,   235,
-   133,   200,   152,   257,   172,   221,   250,   315,   241,   344,
-   339,   277,   390,   261,   234,   262,    73,   423,   129,   131,
-   132,   235,   228,   230,   338,   291,   408,   357,   108,   109,
-   238,   385,   143,   143,   151,   381,   256,   250,   220,   275,
-   154,   283,   404,   368,   159,   318,   371,   144,   146,   341,
-   397,   163,   164,   165,   166,   345,   377,   329,   171,   199,
-   201,   202,   203,   204,   205,   206,   207,   208,   209,   210,
-   211,   212,   213,   214,   215,   216,   217,   218,   219,   410,
-   143,   407,   227,   227,   162,   328,   232,   350,   271,   272,
-     3,   269,   293,   389,   394,   223,   167,   168,   169,   170,
-   270,   268,   155,   157,   273,   143,     1,   nil,   nil,   nil,
-   325,   nil,   nil,   nil,   nil,   250,   nil,   322,   nil,   nil,
-   251,   nil,   319,   nil,   nil,   292,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   280,   137,   nil,
-   139,   133,   nil,   nil,   353,   342,   nil,   274,   295,   122,
-   281,   nil,   nil,   129,   131,   132,   nil,   nil,   nil,   nil,
-   363,   nil,   nil,   nil,   366,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   294,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   374,   nil,   nil,   nil,   nil,   nil,   nil,   219,   nil,
-   nil,   nil,   nil,   431,   355,   250,   396,   nil,   137,   352,
-   139,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   398,   nil,   nil,   nil,   392,   323,
-   nil,   199,   nil,   nil,   nil,   nil,   nil,   346,   403,   369,
-   nil,   151,   351,   333,   335,   nil,   nil,   154,   379,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   392,   nil,
-   nil,   358,   359,   360,   nil,   361,   362,   400,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   372,   nil,   nil,   nil,   nil,
+     2,   112,   114,   115,   117,   116,   224,   220,   125,   129,
+   131,   189,   210,   144,   301,   266,   330,   230,   367,   325,
+   376,   239,   409,   224,   246,   164,   324,    70,   121,   123,
+   124,   280,   223,   394,   250,   343,   251,   105,   106,   135,
+   135,   143,   227,   136,   138,   209,   371,   146,   264,   245,
+   390,   151,   239,   217,   219,   354,   304,   357,   155,   156,
+   157,   158,   272,   327,   393,   163,   188,   190,   191,   192,
+   193,   194,   195,   196,   197,   198,   199,   200,   201,   202,
+   203,   204,   205,   206,   207,   208,   383,   135,   331,   216,
+   216,   212,   154,   221,   396,   363,   315,   314,   380,   375,
+   336,   260,   159,   160,   161,   162,   261,   135,     3,   258,
+   282,   240,   259,   257,   147,   149,   262,     1,   nil,   nil,
+   nil,   305,   nil,   308,   281,   nil,   nil,   239,   311,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   125,   269,
+   129,   131,   nil,   nil,   328,   nil,   nil,   nil,   nil,   263,
+   nil,   114,   270,   nil,   nil,   121,   123,   124,   nil,   nil,
+   nil,   284,   339,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   283,   349,   nil,
+   nil,   nil,   352,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   208,   nil,   nil,
+   nil,   nil,   nil,   nil,   382,   nil,   360,   417,   nil,   nil,
+   129,   131,   338,   nil,   239,   nil,   nil,   341,   nil,   nil,
+   nil,   nil,   nil,   nil,   378,   nil,   nil,   nil,   309,   nil,
+   188,   nil,   nil,   nil,   nil,   nil,   332,   nil,   nil,   384,
+   143,   337,   319,   321,   nil,   nil,   146,   365,   nil,   355,
+   nil,   nil,   nil,   389,   378,   nil,   nil,   nil,   nil,   nil,
+   344,   345,   346,   386,   347,   348,   nil,   nil,   nil,   358,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   232,   137,   nil,   139,   nil,   nil,   nil,   nil,
-   424,   nil,   nil,   378,   427,   nil,   199,   nil,   346,   nil,
-   nil,   nil,   nil,   nil,   199,   nil,   nil,   nil,   nil,   401,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   221,   nil,
+   nil,   nil,   129,   131,   nil,   nil,   410,   nil,   nil,   364,
+   nil,   nil,   188,   413,   332,   nil,   nil,   nil,   nil,   nil,
+   188,   nil,   nil,   nil,   nil,   387,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   208,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   219,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   129,   nil,
+   nil,   nil,   nil,   nil,   121,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   414,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   232,   nil,   nil,   nil,   nil,   nil,   419,
-   nil,   421,   425 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   400,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   221,
+   nil,   nil,   nil,   nil,   nil,   405,   nil,   407,   411 ]
 racc_goto_check = [
-     2,    10,    10,    10,    37,     6,    35,    13,    34,    49,
-    57,    19,    80,    15,    11,    50,    36,    14,    42,    65,
-    47,    88,    59,    15,    58,    15,     5,    48,    10,    10,
-    10,    49,    53,    53,    46,    51,    43,    54,     9,     9,
-    41,    45,     6,     6,     6,    44,    58,    36,    20,    42,
-     6,    15,    59,    16,    10,    61,    62,     8,     8,    64,
-    12,     6,     6,     6,     6,    67,    68,    69,    10,    10,
+     2,    10,    10,    10,    37,     6,    49,    13,    57,    35,
+    34,    19,    50,    80,    14,    88,    65,    42,    44,    47,
+    59,    36,    48,    49,    15,    11,    46,     5,    10,    10,
+    10,    51,    58,    43,    15,    54,    15,     9,     9,     6,
+     6,     6,    41,     8,     8,    20,    45,     6,    42,    58,
+    59,    10,    36,    53,    53,    16,    61,    62,     6,     6,
+     6,     6,    15,    64,    44,    10,    10,    10,    10,    10,
     10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-    10,    10,    10,    10,    10,    10,    10,    10,    10,    45,
-     6,    44,    10,    10,     5,    71,    10,    75,    76,    77,
-     3,    81,    15,    47,    65,     8,     9,     9,     9,     9,
-    82,    84,    85,    86,    87,     6,     1,   nil,   nil,   nil,
-    15,   nil,   nil,   nil,   nil,    36,   nil,    42,   nil,   nil,
-     8,   nil,    49,   nil,   nil,    50,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,     6,    35,   nil,
-    34,    57,   nil,   nil,    15,    49,   nil,     2,    11,    10,
-     2,   nil,   nil,    10,    10,    10,   nil,   nil,   nil,   nil,
-    15,   nil,   nil,   nil,    15,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    37,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    15,   nil,   nil,   nil,   nil,   nil,   nil,    10,   nil,
-   nil,   nil,   nil,    14,    11,    36,    88,   nil,    35,    80,
-    34,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    15,   nil,   nil,   nil,    49,     2,
-   nil,    10,   nil,   nil,   nil,   nil,   nil,     6,    15,    11,
-   nil,     6,     6,     2,     2,   nil,   nil,     6,    19,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    49,   nil,
-   nil,    10,    10,    10,   nil,    10,    10,    50,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    57,   nil,   nil,   nil,   nil,
+    10,    10,    10,    10,    10,    10,    12,     6,    67,    10,
+    10,     8,     5,    10,    45,    68,    69,    71,    65,    47,
+    75,    76,     9,     9,     9,     9,    77,     6,     3,    81,
+    15,     8,    82,    84,    85,    86,    87,     1,   nil,   nil,
+   nil,    49,   nil,    42,    50,   nil,   nil,    36,    15,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    57,     6,
+    35,    34,   nil,   nil,    49,   nil,   nil,   nil,   nil,     2,
+   nil,    10,     2,   nil,   nil,    10,    10,    10,   nil,   nil,
+   nil,    11,    15,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    37,    15,   nil,
+   nil,   nil,    15,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    10,   nil,   nil,
+   nil,   nil,   nil,   nil,    88,   nil,    15,    14,   nil,   nil,
+    35,    34,    80,   nil,    36,   nil,   nil,    11,   nil,   nil,
+   nil,   nil,   nil,   nil,    49,   nil,   nil,   nil,     2,   nil,
+    10,   nil,   nil,   nil,   nil,   nil,     6,   nil,   nil,    15,
+     6,     6,     2,     2,   nil,   nil,     6,    19,   nil,    11,
+   nil,   nil,   nil,    15,    49,   nil,   nil,   nil,   nil,   nil,
+    10,    10,    10,    50,    10,    10,   nil,   nil,   nil,    57,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    10,    35,   nil,    34,   nil,   nil,   nil,   nil,
-    49,   nil,   nil,    10,    13,   nil,    10,   nil,     6,   nil,
-   nil,   nil,   nil,   nil,    10,   nil,   nil,   nil,   nil,    37,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    10,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    10,   nil,
+   nil,   nil,    35,    34,   nil,   nil,    49,   nil,   nil,    10,
+   nil,   nil,    10,    13,     6,   nil,   nil,   nil,   nil,   nil,
+    10,   nil,   nil,   nil,   nil,    37,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    10,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    10,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,     2,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    10,   nil,   nil,   nil,   nil,   nil,     2,
-   nil,     2,     2 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     2,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    10,
+   nil,   nil,   nil,   nil,   nil,     2,   nil,     2,     2 ]
 racc_goto_pointer = [
-   nil,   116,     0,   100,   nil,    22,   -13,   nil,     2,    28,
-   -14,   -68,  -295,  -103,  -214,  -121,  -263,   nil,   nil,   -72,
+   nil,   117,     0,   108,   nil,    23,   -13,   nil,    -9,    27,
+   -14,   -54,  -255,  -100,  -206,  -102,  -247,   nil,   nil,   -69,
    -54,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   -38,   -40,  -111,   -36,   nil,   nil,
-   nil,   -86,  -109,  -346,  -289,  -295,  -221,  -235,  -385,  -102,
-   -87,  -187,   nil,   -74,  -247,   nil,   nil,   -35,   -87,  -318,
-   nil,  -179,  -264,   nil,  -198,  -239,   nil,  -194,  -260,  -182,
-   nil,  -153,   nil,   nil,   nil,  -167,   -58,   -57,   nil,   nil,
-   -51,   -52,   -43,   nil,   -42,    47,    47,   -43,  -138 ]
+   nil,   nil,   nil,   nil,   -36,   -37,   -98,   -36,   nil,   nil,
+   nil,   -76,  -102,  -335,  -302,  -276,  -218,  -225,  -376,  -102,
+   -87,  -180,   nil,   -50,  -238,   nil,   nil,   -37,   -76,  -306,
+   nil,  -167,  -249,   nil,  -183,  -231,   nil,  -160,  -217,  -142,
+   nil,  -140,   nil,   nil,   nil,  -153,   -47,   -42,   nil,   nil,
+   -47,   -36,   -33,   nil,   -32,    52,    52,   -33,  -136 ]
 racc_goto_default = [
-   nil,   nil,   391,   nil,     4,     5,     6,     7,   nil,     8,
-     9,   nil,   nil,   nil,   nil,   nil,   233,    13,    14,   337,
+   nil,   nil,   377,   nil,     4,     5,     6,     7,   nil,     8,
+     9,   nil,   nil,   nil,   nil,   nil,   222,    13,    14,   323,
    nil,    19,    20,    21,    22,    23,    24,    25,    26,    27,
     28,    29,    30,    31,    32,    33,    34,   nil,    40,    41,
-   126,   nil,   nil,   130,   nil,   nil,   nil,   nil,   nil,   229,
-   nil,   nil,   105,   nil,   180,   185,   181,   112,   nil,   nil,
-   111,   nil,   nil,   134,   nil,   135,   136,   140,   242,   243,
-   244,   245,   246,   249,   148,   150,    58,    59,    60,    63,
-   nil,   nil,   nil,   153,   nil,   nil,   nil,   nil,   nil ]
+   118,   nil,   nil,   122,   nil,   nil,   nil,   nil,   nil,   218,
+   nil,   nil,   102,   nil,   172,   174,   173,   109,   nil,   nil,
+   108,   nil,   nil,   126,   nil,   127,   128,   132,   231,   232,
+   233,   234,   235,   238,   140,   142,    55,    56,    57,    60,
+   nil,   nil,   nil,   145,   nil,   nil,   nil,   nil,   nil ]
 racc_reduce_table = [
   0, 0, :racc_error,
-  1, 95, :_reduce_1,
-  1, 95, :_reduce_2,
-  0, 95, :_reduce_3,
-  1, 96, :_reduce_4,
-  1, 98, :_reduce_5,
-  3, 98, :_reduce_6,
-  2, 98, :_reduce_7,
-  1, 99, :_reduce_8,
-  3, 99, :_reduce_9,
+  1, 92, :_reduce_1,
+  1, 92, :_reduce_2,
+  0, 92, :_reduce_3,
+  1, 93, :_reduce_4,
+  1, 95, :_reduce_5,
+  3, 95, :_reduce_6,
+  2, 95, :_reduce_7,
+  1, 96, :_reduce_8,
+  3, 96, :_reduce_9,
+  1, 97, :_reduce_none,
+  3, 97, :_reduce_11,
+  3, 97, :_reduce_12,
+  3, 97, :_reduce_13,
+  1, 99, :_reduce_14,
+  3, 99, :_reduce_15,
+  1, 98, :_reduce_none,
+  3, 98, :_reduce_17,
+  3, 98, :_reduce_18,
+  3, 98, :_reduce_19,
+  3, 98, :_reduce_20,
   1, 100, :_reduce_none,
-  3, 100, :_reduce_11,
-  3, 100, :_reduce_12,
-  3, 100, :_reduce_13,
-  1, 102, :_reduce_14,
-  3, 102, :_reduce_15,
+  2, 100, :_reduce_22,
+  2, 100, :_reduce_23,
+  7, 100, :_reduce_24,
+  5, 100, :_reduce_25,
+  5, 100, :_reduce_26,
+  4, 107, :_reduce_27,
+  1, 104, :_reduce_28,
+  3, 104, :_reduce_29,
+  1, 103, :_reduce_30,
+  2, 103, :_reduce_31,
+  4, 103, :_reduce_32,
   1, 101, :_reduce_none,
-  3, 101, :_reduce_17,
-  3, 101, :_reduce_18,
-  3, 101, :_reduce_19,
-  3, 101, :_reduce_20,
-  1, 103, :_reduce_none,
-  2, 103, :_reduce_22,
-  2, 103, :_reduce_23,
-  7, 103, :_reduce_24,
-  5, 103, :_reduce_25,
-  5, 103, :_reduce_26,
-  4, 110, :_reduce_27,
-  1, 107, :_reduce_28,
-  3, 107, :_reduce_29,
-  1, 106, :_reduce_30,
-  2, 106, :_reduce_31,
-  4, 106, :_reduce_32,
-  1, 104, :_reduce_none,
-  1, 104, :_reduce_none,
-  4, 104, :_reduce_35,
-  3, 104, :_reduce_36,
-  3, 104, :_reduce_37,
-  3, 104, :_reduce_38,
-  3, 104, :_reduce_39,
-  3, 104, :_reduce_40,
-  3, 104, :_reduce_41,
-  3, 104, :_reduce_42,
-  3, 104, :_reduce_43,
-  3, 104, :_reduce_44,
-  3, 104, :_reduce_45,
-  2, 104, :_reduce_46,
-  2, 104, :_reduce_47,
-  3, 104, :_reduce_48,
-  3, 104, :_reduce_49,
-  3, 104, :_reduce_50,
-  3, 104, :_reduce_51,
-  3, 104, :_reduce_52,
-  3, 104, :_reduce_53,
-  2, 104, :_reduce_54,
-  3, 104, :_reduce_55,
-  3, 104, :_reduce_56,
-  3, 104, :_reduce_57,
-  3, 104, :_reduce_58,
-  1, 113, :_reduce_59,
-  3, 113, :_reduce_60,
-  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, 111, :_reduce_none,
-  1, 111, :_reduce_none,
-  1, 111, :_reduce_none,
-  1, 111, :_reduce_none,
-  1, 111, :_reduce_none,
-  1, 111, :_reduce_none,
+  1, 101, :_reduce_none,
+  4, 101, :_reduce_35,
+  3, 101, :_reduce_36,
+  3, 101, :_reduce_37,
+  3, 101, :_reduce_38,
+  3, 101, :_reduce_39,
+  3, 101, :_reduce_40,
+  3, 101, :_reduce_41,
+  3, 101, :_reduce_42,
+  3, 101, :_reduce_43,
+  3, 101, :_reduce_44,
+  3, 101, :_reduce_45,
+  2, 101, :_reduce_46,
+  2, 101, :_reduce_47,
+  3, 101, :_reduce_48,
+  3, 101, :_reduce_49,
+  3, 101, :_reduce_50,
+  3, 101, :_reduce_51,
+  3, 101, :_reduce_52,
+  3, 101, :_reduce_53,
+  2, 101, :_reduce_54,
+  3, 101, :_reduce_55,
+  3, 101, :_reduce_56,
+  3, 101, :_reduce_57,
+  3, 101, :_reduce_58,
+  1, 110, :_reduce_59,
+  3, 110, :_reduce_60,
+  1, 108, :_reduce_none,
+  1, 108, :_reduce_none,
+  1, 108, :_reduce_none,
+  1, 108, :_reduce_none,
+  1, 108, :_reduce_none,
+  1, 108, :_reduce_none,
+  1, 108, :_reduce_none,
+  1, 108, :_reduce_none,
+  1, 108, :_reduce_none,
+  1, 108, :_reduce_none,
+  1, 108, :_reduce_none,
+  1, 108, :_reduce_none,
+  1, 108, :_reduce_none,
+  1, 108, :_reduce_none,
+  1, 108, :_reduce_none,
+  1, 108, :_reduce_none,
+  1, 108, :_reduce_77,
+  1, 108, :_reduce_78,
+  1, 108, :_reduce_79,
+  1, 108, :_reduce_80,
+  1, 108, :_reduce_81,
+  5, 109, :_reduce_82,
+  3, 109, :_reduce_83,
+  6, 109, :_reduce_84,
+  4, 109, :_reduce_85,
+  1, 113, :_reduce_86,
+  2, 113, :_reduce_87,
+  4, 129, :_reduce_88,
+  3, 129, :_reduce_89,
+  1, 129, :_reduce_90,
+  3, 130, :_reduce_91,
+  2, 128, :_reduce_92,
+  3, 132, :_reduce_93,
+  2, 132, :_reduce_94,
+  2, 131, :_reduce_95,
+  4, 131, :_reduce_96,
+  2, 116, :_reduce_97,
+  5, 134, :_reduce_98,
+  4, 134, :_reduce_99,
+  0, 135, :_reduce_none,
+  2, 135, :_reduce_101,
+  4, 135, :_reduce_102,
+  3, 135, :_reduce_103,
+  6, 117, :_reduce_104,
+  5, 117, :_reduce_105,
+  0, 136, :_reduce_none,
+  4, 136, :_reduce_107,
+  3, 136, :_reduce_108,
+  5, 115, :_reduce_109,
+  1, 137, :_reduce_110,
+  2, 137, :_reduce_111,
+  5, 138, :_reduce_112,
+  1, 139, :_reduce_none,
+  1, 139, :_reduce_none,
   1, 111, :_reduce_none,
-  1, 111, :_reduce_77,
-  1, 111, :_reduce_78,
-  1, 111, :_reduce_79,
-  1, 111, :_reduce_80,
-  1, 111, :_reduce_81,
-  5, 112, :_reduce_82,
-  3, 112, :_reduce_83,
-  6, 112, :_reduce_84,
-  4, 112, :_reduce_85,
-  1, 116, :_reduce_86,
-  2, 116, :_reduce_87,
-  4, 132, :_reduce_88,
-  3, 132, :_reduce_89,
-  1, 132, :_reduce_90,
-  3, 133, :_reduce_91,
-  2, 131, :_reduce_92,
-  3, 135, :_reduce_93,
-  2, 135, :_reduce_94,
-  2, 134, :_reduce_95,
-  4, 134, :_reduce_96,
-  2, 119, :_reduce_97,
-  5, 137, :_reduce_98,
-  4, 137, :_reduce_99,
-  0, 138, :_reduce_none,
-  2, 138, :_reduce_101,
-  4, 138, :_reduce_102,
-  3, 138, :_reduce_103,
-  6, 120, :_reduce_104,
-  5, 120, :_reduce_105,
-  0, 139, :_reduce_none,
-  4, 139, :_reduce_107,
-  3, 139, :_reduce_108,
-  5, 118, :_reduce_109,
-  1, 140, :_reduce_110,
-  2, 140, :_reduce_111,
-  5, 141, :_reduce_112,
-  1, 142, :_reduce_none,
-  1, 142, :_reduce_none,
-  1, 114, :_reduce_none,
-  4, 114, :_reduce_116,
-  1, 145, :_reduce_117,
-  3, 145, :_reduce_118,
-  3, 144, :_reduce_119,
-  6, 117, :_reduce_120,
-  2, 117, :_reduce_121,
-  3, 146, :_reduce_122,
-  3, 146, :_reduce_123,
-  1, 147, :_reduce_none,
-  1, 147, :_reduce_none,
-  0, 105, :_reduce_126,
-  1, 105, :_reduce_127,
-  3, 105, :_reduce_128,
-  1, 149, :_reduce_none,
-  1, 149, :_reduce_none,
-  1, 149, :_reduce_none,
-  1, 149, :_reduce_none,
-  1, 149, :_reduce_none,
-  3, 148, :_reduce_134,
-  3, 148, :_reduce_135,
-  3, 148, :_reduce_136,
-  6, 121, :_reduce_137,
-  7, 122, :_reduce_138,
-  1, 154, :_reduce_139,
+  4, 111, :_reduce_116,
+  1, 142, :_reduce_117,
+  3, 142, :_reduce_118,
+  3, 141, :_reduce_119,
+  6, 114, :_reduce_120,
+  2, 114, :_reduce_121,
+  3, 143, :_reduce_122,
+  3, 143, :_reduce_123,
+  1, 144, :_reduce_none,
+  1, 144, :_reduce_none,
+  0, 102, :_reduce_126,
+  1, 102, :_reduce_127,
+  3, 102, :_reduce_128,
+  1, 146, :_reduce_none,
+  1, 146, :_reduce_none,
+  3, 145, :_reduce_131,
+  3, 145, :_reduce_132,
+  3, 145, :_reduce_133,
+  6, 118, :_reduce_134,
+  7, 119, :_reduce_135,
+  1, 151, :_reduce_136,
+  1, 150, :_reduce_none,
+  1, 150, :_reduce_none,
+  1, 152, :_reduce_none,
+  2, 152, :_reduce_140,
   1, 153, :_reduce_none,
   1, 153, :_reduce_none,
-  1, 155, :_reduce_none,
-  2, 155, :_reduce_143,
+  7, 120, :_reduce_143,
+  6, 120, :_reduce_144,
+  1, 154, :_reduce_145,
+  3, 154, :_reduce_146,
   1, 156, :_reduce_none,
   1, 156, :_reduce_none,
-  7, 123, :_reduce_146,
-  6, 123, :_reduce_147,
-  1, 157, :_reduce_148,
-  3, 157, :_reduce_149,
-  1, 159, :_reduce_none,
+  1, 156, :_reduce_149,
+  1, 156, :_reduce_none,
+  1, 157, :_reduce_151,
+  3, 157, :_reduce_152,
+  1, 158, :_reduce_none,
+  1, 158, :_reduce_none,
+  1, 155, :_reduce_none,
+  2, 155, :_reduce_156,
+  1, 148, :_reduce_none,
+  1, 148, :_reduce_158,
+  1, 149, :_reduce_159,
+  2, 149, :_reduce_160,
+  4, 149, :_reduce_161,
+  1, 133, :_reduce_162,
+  3, 133, :_reduce_163,
   1, 159, :_reduce_none,
-  1, 159, :_reduce_152,
   1, 159, :_reduce_none,
-  1, 160, :_reduce_154,
-  3, 160, :_reduce_155,
-  1, 161, :_reduce_none,
-  1, 161, :_reduce_none,
-  1, 158, :_reduce_none,
-  2, 158, :_reduce_159,
-  1, 151, :_reduce_none,
-  1, 151, :_reduce_none,
-  1, 151, :_reduce_none,
-  1, 151, :_reduce_none,
-  1, 151, :_reduce_none,
-  1, 151, :_reduce_none,
-  1, 151, :_reduce_166,
-  1, 152, :_reduce_167,
-  2, 152, :_reduce_168,
-  4, 152, :_reduce_169,
-  1, 136, :_reduce_170,
-  3, 136, :_reduce_171,
-  1, 162, :_reduce_none,
-  1, 162, :_reduce_none,
-  1, 163, :_reduce_none,
-  1, 163, :_reduce_none,
-  3, 165, :_reduce_176,
-  1, 165, :_reduce_177,
-  2, 166, :_reduce_178,
-  2, 164, :_reduce_179,
-  1, 167, :_reduce_180,
-  4, 167, :_reduce_181,
-  1, 115, :_reduce_182,
-  1, 125, :_reduce_183,
-  1, 125, :_reduce_184,
-  1, 125, :_reduce_185,
-  1, 125, :_reduce_186,
-  1, 125, :_reduce_187,
-  1, 125, :_reduce_188,
-  1, 125, :_reduce_189,
-  4, 126, :_reduce_190,
-  2, 126, :_reduce_191,
-  4, 126, :_reduce_192,
-  2, 126, :_reduce_193,
-  3, 127, :_reduce_194,
-  4, 127, :_reduce_195,
-  2, 127, :_reduce_196,
-  1, 168, :_reduce_197,
-  3, 168, :_reduce_198,
-  3, 169, :_reduce_199,
-  1, 129, :_reduce_none,
-  1, 129, :_reduce_none,
-  1, 129, :_reduce_none,
-  1, 170, :_reduce_203,
-  1, 170, :_reduce_204,
-  2, 171, :_reduce_205,
-  1, 173, :_reduce_206,
-  1, 175, :_reduce_207,
-  1, 176, :_reduce_208,
-  2, 174, :_reduce_209,
-  1, 177, :_reduce_210,
-  1, 178, :_reduce_211,
-  2, 178, :_reduce_212,
-  2, 172, :_reduce_213,
-  2, 179, :_reduce_214,
-  2, 179, :_reduce_215,
-  3, 97, :_reduce_216,
-  0, 181, :_reduce_none,
-  1, 181, :_reduce_none,
-  0, 180, :_reduce_219,
-  2, 180, :_reduce_220,
-  4, 180, :_reduce_221,
-  1, 124, :_reduce_222,
-  3, 124, :_reduce_223,
-  5, 124, :_reduce_224,
-  1, 182, :_reduce_none,
-  1, 182, :_reduce_none,
-  1, 130, :_reduce_227,
-  1, 128, :_reduce_228,
-  0, 109, :_reduce_none,
-  1, 109, :_reduce_230,
-  0, 108, :_reduce_none,
-  1, 108, :_reduce_none,
-  1, 150, :_reduce_none,
-  1, 150, :_reduce_none,
-  1, 150, :_reduce_none,
-  1, 150, :_reduce_none,
-  1, 150, :_reduce_none,
-  1, 150, :_reduce_none,
-  1, 150, :_reduce_none,
-  1, 150, :_reduce_none,
-  1, 150, :_reduce_none,
-  1, 150, :_reduce_none,
-  1, 150, :_reduce_none,
-  1, 150, :_reduce_none,
-  1, 150, :_reduce_none,
-  1, 150, :_reduce_none,
-  1, 150, :_reduce_none,
-  1, 150, :_reduce_none,
-  1, 150, :_reduce_none,
-  1, 150, :_reduce_none,
-  0, 143, :_reduce_251 ]
+  1, 160, :_reduce_none,
+  1, 160, :_reduce_none,
+  3, 162, :_reduce_168,
+  1, 162, :_reduce_169,
+  2, 163, :_reduce_170,
+  2, 161, :_reduce_171,
+  1, 164, :_reduce_172,
+  4, 164, :_reduce_173,
+  1, 112, :_reduce_174,
+  1, 122, :_reduce_175,
+  1, 122, :_reduce_176,
+  1, 122, :_reduce_177,
+  1, 122, :_reduce_178,
+  4, 123, :_reduce_179,
+  2, 123, :_reduce_180,
+  4, 123, :_reduce_181,
+  2, 123, :_reduce_182,
+  3, 124, :_reduce_183,
+  4, 124, :_reduce_184,
+  2, 124, :_reduce_185,
+  1, 165, :_reduce_186,
+  3, 165, :_reduce_187,
+  3, 166, :_reduce_188,
+  1, 126, :_reduce_none,
+  1, 126, :_reduce_none,
+  1, 126, :_reduce_none,
+  1, 167, :_reduce_192,
+  1, 167, :_reduce_193,
+  2, 168, :_reduce_194,
+  1, 170, :_reduce_195,
+  1, 172, :_reduce_196,
+  1, 173, :_reduce_197,
+  2, 171, :_reduce_198,
+  1, 174, :_reduce_199,
+  1, 175, :_reduce_200,
+  2, 175, :_reduce_201,
+  2, 169, :_reduce_202,
+  2, 176, :_reduce_203,
+  2, 176, :_reduce_204,
+  3, 94, :_reduce_205,
+  0, 178, :_reduce_none,
+  1, 178, :_reduce_none,
+  0, 177, :_reduce_208,
+  2, 177, :_reduce_209,
+  4, 177, :_reduce_210,
+  1, 121, :_reduce_211,
+  3, 121, :_reduce_212,
+  5, 121, :_reduce_213,
+  1, 179, :_reduce_none,
+  1, 179, :_reduce_none,
+  1, 127, :_reduce_216,
+  1, 125, :_reduce_217,
+  0, 106, :_reduce_none,
+  1, 106, :_reduce_219,
+  0, 105, :_reduce_none,
+  1, 105, :_reduce_none,
+  1, 147, :_reduce_none,
+  1, 147, :_reduce_none,
+  1, 147, :_reduce_none,
+  1, 147, :_reduce_none,
+  1, 147, :_reduce_none,
+  1, 147, :_reduce_none,
+  1, 147, :_reduce_none,
+  1, 147, :_reduce_none,
+  1, 147, :_reduce_none,
+  1, 147, :_reduce_none,
+  1, 147, :_reduce_none,
+  1, 147, :_reduce_none,
+  1, 147, :_reduce_none,
+  1, 147, :_reduce_none,
+  1, 147, :_reduce_none,
+  1, 147, :_reduce_none,
+  1, 147, :_reduce_none,
+  1, 147, :_reduce_none,
+  0, 140, :_reduce_240 ]
-racc_reduce_n = 252
+racc_reduce_n = 241
-racc_shift_n = 432
+racc_shift_n = 418
 racc_token_table = {
   false => 0,
@@ -1121,16 +1024,13 @@ racc_token_table = {
   :PRIVATE => 83,
   :ATTR => 84,
   :TYPE => 85,
-  :APPLICATION_R => 86,
-  :CONSUMES_R => 87,
-  :PRODUCES_R => 88,
-  :LOW => 89,
-  :HIGH => 90,
-  :LISTSTART => 91,
-  :SPLAT => 92,
-  :MODULO => 93 }
+  :LOW => 86,
+  :HIGH => 87,
+  :LISTSTART => 88,
+  :SPLAT => 89,
+  :MODULO => 90 }
-racc_nt_base = 94
+racc_nt_base = 91
 racc_use_result_var = true
@@ -1237,9 +1137,6 @@ Racc_token_to_s_table = [
   "PRIVATE",
   "ATTR",
   "TYPE",
-  "APPLICATION_R",
-  "CONSUMES_R",
-  "PRODUCES_R",
   "LOW",
   "HIGH",
   "LISTSTART",
@@ -1341,63 +1238,63 @@ Racc_debug_parser = false
 # reduce 0 omitted
-module_eval(<<'.,.,', 'egrammar.ra', 66)
+module_eval(<<'.,.,', 'egrammar.ra', 65)
   def _reduce_1(val, _values, result)
      result = create_program(Factory.block_or_expression(*val[0]))
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 67)
+module_eval(<<'.,.,', 'egrammar.ra', 66)
   def _reduce_2(val, _values, result)
      result = create_program(Factory.block_or_expression(*val[0]))
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 68)
+module_eval(<<'.,.,', 'egrammar.ra', 67)
   def _reduce_3(val, _values, result)
      result = create_empty_program()
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 72)
+module_eval(<<'.,.,', 'egrammar.ra', 71)
   def _reduce_4(val, _values, result)
      result = transform_calls(val[0])
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 79)
+module_eval(<<'.,.,', 'egrammar.ra', 78)
   def _reduce_5(val, _values, result)
      result = [val[0]]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 80)
+module_eval(<<'.,.,', 'egrammar.ra', 79)
   def _reduce_6(val, _values, result)
      result = val[0].push val[2]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 81)
+module_eval(<<'.,.,', 'egrammar.ra', 80)
   def _reduce_7(val, _values, result)
      result = val[0].push val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 88)
+module_eval(<<'.,.,', 'egrammar.ra', 87)
   def _reduce_8(val, _values, result)
      result = val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 89)
+module_eval(<<'.,.,', 'egrammar.ra', 88)
   def _reduce_9(val, _values, result)
      result = aryfy(val[0]).push(val[1]).push(val[2])
     result
@@ -1406,35 +1303,35 @@ module_eval(<<'.,.,', 'egrammar.ra', 89)
 # reduce 10 omitted
-module_eval(<<'.,.,', 'egrammar.ra', 94)
+module_eval(<<'.,.,', 'egrammar.ra', 93)
   def _reduce_11(val, _values, result)
      result = val[0].set(val[2])      ; loc result, val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 95)
+module_eval(<<'.,.,', 'egrammar.ra', 94)
   def _reduce_12(val, _values, result)
      result = val[0].plus_set(val[2]) ; loc result, val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 96)
+module_eval(<<'.,.,', 'egrammar.ra', 95)
   def _reduce_13(val, _values, result)
      result = val[0].minus_set(val[2]); loc result, val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 99)
+module_eval(<<'.,.,', 'egrammar.ra', 98)
   def _reduce_14(val, _values, result)
      result = [val[0]]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 100)
+module_eval(<<'.,.,', 'egrammar.ra', 99)
   def _reduce_15(val, _values, result)
      result = val[0].push(val[2])
     result
@@ -1443,28 +1340,28 @@ module_eval(<<'.,.,', 'egrammar.ra', 100)
 # reduce 16 omitted
-module_eval(<<'.,.,', 'egrammar.ra', 104)
+module_eval(<<'.,.,', 'egrammar.ra', 103)
   def _reduce_17(val, _values, result)
      result = val[0].relop(val[1][:value], val[2]); loc result, val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 105)
+module_eval(<<'.,.,', 'egrammar.ra', 104)
   def _reduce_18(val, _values, result)
      result = val[0].relop(val[1][:value], val[2]); loc result, val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 106)
+module_eval(<<'.,.,', 'egrammar.ra', 105)
   def _reduce_19(val, _values, result)
      result = val[0].relop(val[1][:value], val[2]); loc result, val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 107)
+module_eval(<<'.,.,', 'egrammar.ra', 106)
   def _reduce_20(val, _values, result)
      result = val[0].relop(val[1][:value], val[2]); loc result, val[1]
     result
@@ -1473,7 +1370,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 107)
 # reduce 21 omitted
-module_eval(<<'.,.,', 'egrammar.ra', 116)
+module_eval(<<'.,.,', 'egrammar.ra', 115)
   def _reduce_22(val, _values, result)
           result = val[1]
       unless Factory.set_resource_form(result, :virtual)
@@ -1487,7 +1384,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 116)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 127)
+module_eval(<<'.,.,', 'egrammar.ra', 126)
   def _reduce_23(val, _values, result)
           result = val[1]
       unless Factory.set_resource_form(result, :exported)
@@ -1501,7 +1398,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 127)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 138)
+module_eval(<<'.,.,', 'egrammar.ra', 137)
   def _reduce_24(val, _values, result)
           bodies = [Factory.RESOURCE_BODY(val[2], val[4])] + val[5]
       result = Factory.RESOURCE(val[0], bodies)
@@ -1511,7 +1408,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 138)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 145)
+module_eval(<<'.,.,', 'egrammar.ra', 144)
   def _reduce_25(val, _values, result)
             result = Factory.RESOURCE(Factory.fqn(token_text(val[0])), val[2])
         loc result, val[0], val[4]
@@ -1520,7 +1417,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 145)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 154)
+module_eval(<<'.,.,', 'egrammar.ra', 153)
   def _reduce_26(val, _values, result)
            result = case Factory.resource_shape(val[0])
        when :resource, :class
@@ -1546,42 +1443,42 @@ module_eval(<<'.,.,', 'egrammar.ra', 154)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 176)
+module_eval(<<'.,.,', 'egrammar.ra', 175)
   def _reduce_27(val, _values, result)
      result = Factory.RESOURCE_BODY(val[0], val[2])
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 179)
+module_eval(<<'.,.,', 'egrammar.ra', 178)
   def _reduce_28(val, _values, result)
      result = [val[0]]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 180)
+module_eval(<<'.,.,', 'egrammar.ra', 179)
   def _reduce_29(val, _values, result)
      result = val[0].push val[2]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 186)
+module_eval(<<'.,.,', 'egrammar.ra', 185)
   def _reduce_30(val, _values, result)
      result = []
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 187)
+module_eval(<<'.,.,', 'egrammar.ra', 186)
   def _reduce_31(val, _values, result)
      result = []
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 188)
+module_eval(<<'.,.,', 'egrammar.ra', 187)
   def _reduce_32(val, _values, result)
      result = val[2]
     result
@@ -1592,182 +1489,182 @@ module_eval(<<'.,.,', 'egrammar.ra', 188)
 # reduce 34 omitted
-module_eval(<<'.,.,', 'egrammar.ra', 195)
+module_eval(<<'.,.,', 'egrammar.ra', 194)
   def _reduce_35(val, _values, result)
      result = val[0][*val[2]]         ; loc result, val[0], val[3]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 196)
+module_eval(<<'.,.,', 'egrammar.ra', 195)
   def _reduce_36(val, _values, result)
      result = val[0].in val[2]        ; loc result, val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 197)
+module_eval(<<'.,.,', 'egrammar.ra', 196)
   def _reduce_37(val, _values, result)
      result = val[0] =~  val[2]       ; loc result, val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 198)
+module_eval(<<'.,.,', 'egrammar.ra', 197)
   def _reduce_38(val, _values, result)
      result = val[0].mne val[2]       ; loc result, val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 199)
+module_eval(<<'.,.,', 'egrammar.ra', 198)
   def _reduce_39(val, _values, result)
      result = val[0] +   val[2]       ; loc result, val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 200)
+module_eval(<<'.,.,', 'egrammar.ra', 199)
   def _reduce_40(val, _values, result)
      result = val[0] -   val[2]       ; loc result, val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 201)
+module_eval(<<'.,.,', 'egrammar.ra', 200)
   def _reduce_41(val, _values, result)
      result = val[0] /   val[2]       ; loc result, val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 202)
+module_eval(<<'.,.,', 'egrammar.ra', 201)
   def _reduce_42(val, _values, result)
      result = val[0] *   val[2]       ; loc result, val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 203)
+module_eval(<<'.,.,', 'egrammar.ra', 202)
   def _reduce_43(val, _values, result)
      result = val[0] %   val[2]       ; loc result, val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 204)
+module_eval(<<'.,.,', 'egrammar.ra', 203)
   def _reduce_44(val, _values, result)
      result = val[0] <<  val[2]       ; loc result, val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 205)
+module_eval(<<'.,.,', 'egrammar.ra', 204)
   def _reduce_45(val, _values, result)
      result = val[0] >>  val[2]       ; loc result, val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 206)
+module_eval(<<'.,.,', 'egrammar.ra', 205)
   def _reduce_46(val, _values, result)
      result = val[1].minus()          ; loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 207)
+module_eval(<<'.,.,', 'egrammar.ra', 206)
   def _reduce_47(val, _values, result)
      result = val[1].unfold()         ; loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 208)
+module_eval(<<'.,.,', 'egrammar.ra', 207)
   def _reduce_48(val, _values, result)
      result = val[0].ne  val[2]       ; loc result, val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 209)
+module_eval(<<'.,.,', 'egrammar.ra', 208)
   def _reduce_49(val, _values, result)
      result = val[0] ==  val[2]       ; loc result, val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 210)
+module_eval(<<'.,.,', 'egrammar.ra', 209)
   def _reduce_50(val, _values, result)
      result = val[0] >   val[2]       ; loc result, val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 211)
+module_eval(<<'.,.,', 'egrammar.ra', 210)
   def _reduce_51(val, _values, result)
      result = val[0] >=  val[2]       ; loc result, val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 212)
+module_eval(<<'.,.,', 'egrammar.ra', 211)
   def _reduce_52(val, _values, result)
      result = val[0] <   val[2]       ; loc result, val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 213)
+module_eval(<<'.,.,', 'egrammar.ra', 212)
   def _reduce_53(val, _values, result)
      result = val[0] <=  val[2]       ; loc result, val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 214)
+module_eval(<<'.,.,', 'egrammar.ra', 213)
   def _reduce_54(val, _values, result)
      result = val[1].not              ; loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 215)
+module_eval(<<'.,.,', 'egrammar.ra', 214)
   def _reduce_55(val, _values, result)
      result = val[0].and val[2]       ; loc result, val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 216)
+module_eval(<<'.,.,', 'egrammar.ra', 215)
   def _reduce_56(val, _values, result)
      result = val[0].or  val[2]       ; loc result, val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 217)
+module_eval(<<'.,.,', 'egrammar.ra', 216)
   def _reduce_57(val, _values, result)
      result = val[0].select(*val[2])  ; loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 218)
+module_eval(<<'.,.,', 'egrammar.ra', 217)
   def _reduce_58(val, _values, result)
      result = val[1].paren()          ; loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 228)
+module_eval(<<'.,.,', 'egrammar.ra', 227)
   def _reduce_59(val, _values, result)
      result = [val[0]]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 229)
+module_eval(<<'.,.,', 'egrammar.ra', 228)
   def _reduce_60(val, _values, result)
      result = val[0].push(val[2])
     result
@@ -1806,42 +1703,42 @@ module_eval(<<'.,.,', 'egrammar.ra', 229)
 # reduce 76 omitted
-module_eval(<<'.,.,', 'egrammar.ra', 248)
+module_eval(<<'.,.,', 'egrammar.ra', 247)
   def _reduce_77(val, _values, result)
      result = Factory.NUMBER(val[0][:value])          ; loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 249)
+module_eval(<<'.,.,', 'egrammar.ra', 248)
   def _reduce_78(val, _values, result)
      result = Factory.literal(val[0][:value])         ; loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 250)
+module_eval(<<'.,.,', 'egrammar.ra', 249)
   def _reduce_79(val, _values, result)
      result = Factory.literal(:default)               ; loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 251)
+module_eval(<<'.,.,', 'egrammar.ra', 250)
   def _reduce_80(val, _values, result)
      result = Factory.literal(:undef)                 ; loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 252)
+module_eval(<<'.,.,', 'egrammar.ra', 251)
   def _reduce_81(val, _values, result)
      result = Factory.QNAME_OR_NUMBER(val[0][:value]) ; loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 261)
+module_eval(<<'.,.,', 'egrammar.ra', 260)
   def _reduce_82(val, _values, result)
           result = Factory.CALL_NAMED(val[0], true, val[2])
       loc result, val[0], val[4]
@@ -1850,7 +1747,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 261)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 265)
+module_eval(<<'.,.,', 'egrammar.ra', 264)
   def _reduce_83(val, _values, result)
           result = Factory.CALL_NAMED(val[0], true, [])
       loc result, val[0], val[2]
@@ -1859,7 +1756,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 265)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 269)
+module_eval(<<'.,.,', 'egrammar.ra', 268)
   def _reduce_84(val, _values, result)
           result = Factory.CALL_NAMED(val[0], true, val[2])
       loc result, val[0], val[4]
@@ -1869,7 +1766,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 269)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 274)
+module_eval(<<'.,.,', 'egrammar.ra', 273)
   def _reduce_85(val, _values, result)
           result = Factory.CALL_NAMED(val[0], true, [])
       loc result, val[0], val[2]
@@ -1879,42 +1776,42 @@ module_eval(<<'.,.,', 'egrammar.ra', 274)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 282)
+module_eval(<<'.,.,', 'egrammar.ra', 281)
   def _reduce_86(val, _values, result)
      result = val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 283)
+module_eval(<<'.,.,', 'egrammar.ra', 282)
   def _reduce_87(val, _values, result)
      result = val[0]; val[0].lambda = val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 286)
+module_eval(<<'.,.,', 'egrammar.ra', 285)
   def _reduce_88(val, _values, result)
      result = Factory.CALL_METHOD(val[0], val[2]); loc result, val[1], val[3]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 287)
+module_eval(<<'.,.,', 'egrammar.ra', 286)
   def _reduce_89(val, _values, result)
      result = Factory.CALL_METHOD(val[0], []); loc result, val[1], val[3]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 288)
+module_eval(<<'.,.,', 'egrammar.ra', 287)
   def _reduce_90(val, _values, result)
      result = Factory.CALL_METHOD(val[0], []); loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 292)
+module_eval(<<'.,.,', 'egrammar.ra', 291)
   def _reduce_91(val, _values, result)
             result = val[0].dot(Factory.fqn(val[2][:value]))
         loc result, val[1], val[2]
@@ -1923,7 +1820,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 292)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 300)
+module_eval(<<'.,.,', 'egrammar.ra', 299)
   def _reduce_92(val, _values, result)
           result = Factory.LAMBDA(val[0][:value], val[1][:value])
       loc result, val[0][:start], val[1][:end]
@@ -1932,35 +1829,35 @@ module_eval(<<'.,.,', 'egrammar.ra', 300)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 305)
+module_eval(<<'.,.,', 'egrammar.ra', 304)
   def _reduce_93(val, _values, result)
      result = {:end => val[2], :value =>val[1] }
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 306)
+module_eval(<<'.,.,', 'egrammar.ra', 305)
   def _reduce_94(val, _values, result)
      result = {:end => val[1], :value => nil }
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 310)
+module_eval(<<'.,.,', 'egrammar.ra', 309)
   def _reduce_95(val, _values, result)
      result = {:start => val[0], :value => [] }
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 311)
+module_eval(<<'.,.,', 'egrammar.ra', 310)
   def _reduce_96(val, _values, result)
      result = {:start => val[0], :value => val[1] }
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 319)
+module_eval(<<'.,.,', 'egrammar.ra', 318)
   def _reduce_97(val, _values, result)
           result = val[1]
       loc(result, val[0], val[1])
@@ -1969,7 +1866,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 319)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 326)
+module_eval(<<'.,.,', 'egrammar.ra', 325)
   def _reduce_98(val, _values, result)
             result = Factory.IF(val[0], Factory.block_or_expression(*val[2]), val[4])
         loc(result, val[0], (val[4] ? val[4] : val[3]))
@@ -1978,7 +1875,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 326)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 330)
+module_eval(<<'.,.,', 'egrammar.ra', 329)
   def _reduce_99(val, _values, result)
             result = Factory.IF(val[0], nil, val[3])
         loc(result, val[0], (val[3] ? val[3] : val[2]))
@@ -1989,7 +1886,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 330)
 # reduce 100 omitted
-module_eval(<<'.,.,', 'egrammar.ra', 338)
+module_eval(<<'.,.,', 'egrammar.ra', 337)
   def _reduce_101(val, _values, result)
             result = val[1]
         loc(result, val[0], val[1])
@@ -1998,7 +1895,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 338)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 342)
+module_eval(<<'.,.,', 'egrammar.ra', 341)
   def _reduce_102(val, _values, result)
             result = Factory.block_or_expression(*val[2])
         loc result, val[0], val[3]
@@ -2007,7 +1904,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 342)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 346)
+module_eval(<<'.,.,', 'egrammar.ra', 345)
   def _reduce_103(val, _values, result)
             result = nil # don't think a nop is needed here either
@@ -2015,7 +1912,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 346)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 353)
+module_eval(<<'.,.,', 'egrammar.ra', 352)
   def _reduce_104(val, _values, result)
           result = Factory.UNLESS(val[1], Factory.block_or_expression(*val[3]), val[5])
       loc result, val[0], val[4]
@@ -2024,9 +1921,9 @@ module_eval(<<'.,.,', 'egrammar.ra', 353)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 357)
+module_eval(<<'.,.,', 'egrammar.ra', 356)
   def _reduce_105(val, _values, result)
-          result = Factory.UNLESS(val[1], nil, val[4])
+          result = Factory.UNLESS(val[1], nil, nil)
       loc result, val[0], val[4]
     result
@@ -2035,7 +1932,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 357)
 # reduce 106 omitted
-module_eval(<<'.,.,', 'egrammar.ra', 367)
+module_eval(<<'.,.,', 'egrammar.ra', 366)
   def _reduce_107(val, _values, result)
             result = Factory.block_or_expression(*val[2])
         loc result, val[0], val[3]
@@ -2044,7 +1941,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 367)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 371)
+module_eval(<<'.,.,', 'egrammar.ra', 370)
   def _reduce_108(val, _values, result)
             result = nil # don't think a nop is needed here either
@@ -2052,7 +1949,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 371)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 378)
+module_eval(<<'.,.,', 'egrammar.ra', 377)
   def _reduce_109(val, _values, result)
           result = Factory.CASE(val[1], *val[3])
       loc result, val[0], val[4]
@@ -2061,21 +1958,21 @@ module_eval(<<'.,.,', 'egrammar.ra', 378)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 384)
+module_eval(<<'.,.,', 'egrammar.ra', 383)
   def _reduce_110(val, _values, result)
      result = [val[0]]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 385)
+module_eval(<<'.,.,', 'egrammar.ra', 384)
   def _reduce_111(val, _values, result)
      result = val[0].push val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 390)
+module_eval(<<'.,.,', 'egrammar.ra', 389)
   def _reduce_112(val, _values, result)
             result = Factory.WHEN(val[0], val[3]); loc result, val[1], val[4]
@@ -2089,7 +1986,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 390)
 # reduce 115 omitted
-module_eval(<<'.,.,', 'egrammar.ra', 406)
+module_eval(<<'.,.,', 'egrammar.ra', 405)
   def _reduce_116(val, _values, result)
             result = val[1]
@@ -2097,28 +1994,28 @@ module_eval(<<'.,.,', 'egrammar.ra', 406)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 411)
+module_eval(<<'.,.,', 'egrammar.ra', 410)
   def _reduce_117(val, _values, result)
      result = [val[0]]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 412)
+module_eval(<<'.,.,', 'egrammar.ra', 411)
   def _reduce_118(val, _values, result)
      result = val[0].push val[2]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 417)
+module_eval(<<'.,.,', 'egrammar.ra', 416)
   def _reduce_119(val, _values, result)
      result = Factory.MAP(val[0], val[2]) ; loc result, val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 427)
+module_eval(<<'.,.,', 'egrammar.ra', 426)
   def _reduce_120(val, _values, result)
           result = Factory.COLLECT(val[0], val[1], val[3])
       loc result, val[0], val[5]
@@ -2127,7 +2024,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 427)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 431)
+module_eval(<<'.,.,', 'egrammar.ra', 430)
   def _reduce_121(val, _values, result)
           result = Factory.COLLECT(val[0], val[1], [])
       loc result, val[0], val[1]
@@ -2136,14 +2033,14 @@ module_eval(<<'.,.,', 'egrammar.ra', 431)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 436)
+module_eval(<<'.,.,', 'egrammar.ra', 435)
   def _reduce_122(val, _values, result)
      result = Factory.VIRTUAL_QUERY(val[1])   ; loc result, val[0], val[2]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 437)
+module_eval(<<'.,.,', 'egrammar.ra', 436)
   def _reduce_123(val, _values, result)
      result = Factory.EXPORTED_QUERY(val[1])  ; loc result, val[0], val[2]
     result
@@ -2154,21 +2051,21 @@ module_eval(<<'.,.,', 'egrammar.ra', 437)
 # reduce 125 omitted
-module_eval(<<'.,.,', 'egrammar.ra', 446)
+module_eval(<<'.,.,', 'egrammar.ra', 445)
   def _reduce_126(val, _values, result)
      result = []
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 447)
+module_eval(<<'.,.,', 'egrammar.ra', 446)
   def _reduce_127(val, _values, result)
      result = [val[0]]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 448)
+module_eval(<<'.,.,', 'egrammar.ra', 447)
   def _reduce_128(val, _values, result)
      result = val[0].push(val[2])
     result
@@ -2179,14 +2076,8 @@ module_eval(<<'.,.,', 'egrammar.ra', 448)
 # reduce 130 omitted
-# reduce 131 omitted
-# reduce 132 omitted
-# reduce 133 omitted
-module_eval(<<'.,.,', 'egrammar.ra', 467)
-  def _reduce_134(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 463)
+  def _reduce_131(val, _values, result)
             result = Factory.ATTRIBUTE_OP(val[0][:value], :'=>', val[2])
         loc result, val[0], val[2]
@@ -2194,8 +2085,8 @@ module_eval(<<'.,.,', 'egrammar.ra', 467)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 471)
-  def _reduce_135(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 467)
+  def _reduce_132(val, _values, result)
             result = Factory.ATTRIBUTE_OP(val[0][:value], :'+>', val[2])
         loc result, val[0], val[2]
@@ -2203,16 +2094,16 @@ module_eval(<<'.,.,', 'egrammar.ra', 471)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 475)
-  def _reduce_136(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 471)
+  def _reduce_133(val, _values, result)
           result = Factory.ATTRIBUTES_OP(val[2]) ; loc result, val[0], val[2]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 484)
-  def _reduce_137(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 480)
+  def _reduce_134(val, _values, result)
           result = add_definition(Factory.DEFINITION(classname(val[1][:value]), val[2], val[4]))
       loc result, val[0], val[5]
       # New lexer does not keep track of this, this is done in validation
@@ -2224,8 +2115,8 @@ module_eval(<<'.,.,', 'egrammar.ra', 484)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 498)
-  def _reduce_138(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 494)
+  def _reduce_135(val, _values, result)
           # Remove this class' name from the namestack as all nested classes have been parsed
       namepop
       result = add_definition(Factory.HOSTCLASS(classname(val[1][:value]), val[2], token_text(val[3]), val[5]))
@@ -2235,32 +2126,32 @@ module_eval(<<'.,.,', 'egrammar.ra', 498)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 508)
-  def _reduce_139(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 504)
+  def _reduce_136(val, _values, result)
      namestack(val[0][:value]) ; result = val[0]
     result
   end
 .,.,
-# reduce 140 omitted
+# reduce 137 omitted
-# reduce 141 omitted
+# reduce 138 omitted
-# reduce 142 omitted
+# reduce 139 omitted
-module_eval(<<'.,.,', 'egrammar.ra', 517)
-  def _reduce_143(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 513)
+  def _reduce_140(val, _values, result)
      result = val[1]
     result
   end
 .,.,
-# reduce 144 omitted
+# reduce 141 omitted
-# reduce 145 omitted
+# reduce 142 omitted
-module_eval(<<'.,.,', 'egrammar.ra', 534)
-  def _reduce_146(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 530)
+  def _reduce_143(val, _values, result)
           result = add_definition(Factory.NODE(val[1], val[3], val[5]))
       loc result, val[0], val[6]
@@ -2268,8 +2159,8 @@ module_eval(<<'.,.,', 'egrammar.ra', 534)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 538)
-  def _reduce_147(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 534)
+  def _reduce_144(val, _values, result)
           result = add_definition(Factory.NODE(val[1], val[3], nil))
       loc result, val[0], val[5]
@@ -2277,509 +2168,478 @@ module_eval(<<'.,.,', 'egrammar.ra', 538)
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 548)
-  def _reduce_148(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 544)
+  def _reduce_145(val, _values, result)
      result = [result]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 549)
-  def _reduce_149(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 545)
+  def _reduce_146(val, _values, result)
      result = val[0].push(val[2])
     result
   end
 .,.,
-# reduce 150 omitted
+# reduce 147 omitted
-# reduce 151 omitted
+# reduce 148 omitted
-module_eval(<<'.,.,', 'egrammar.ra', 556)
-  def _reduce_152(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 552)
+  def _reduce_149(val, _values, result)
      result = Factory.literal(:default); loc result, val[0]
     result
   end
 .,.,
-# reduce 153 omitted
+# reduce 150 omitted
-module_eval(<<'.,.,', 'egrammar.ra', 560)
-  def _reduce_154(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 556)
+  def _reduce_151(val, _values, result)
      result = Factory.literal(val[0][:value]); loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 561)
-  def _reduce_155(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 557)
+  def _reduce_152(val, _values, result)
      result = Factory.concat(val[0], '.', val[2][:value]); loc result, val[0], val[2]
     result
   end
 .,.,
-# reduce 156 omitted
+# reduce 153 omitted
-# reduce 157 omitted
+# reduce 154 omitted
-# reduce 158 omitted
+# reduce 155 omitted
-module_eval(<<'.,.,', 'egrammar.ra', 570)
-  def _reduce_159(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 566)
+  def _reduce_156(val, _values, result)
      result = val[1]
     result
   end
 .,.,
-# reduce 160 omitted
-# reduce 161 omitted
-# reduce 162 omitted
-# reduce 163 omitted
-# reduce 164 omitted
-# reduce 165 omitted
+# reduce 157 omitted
-module_eval(<<'.,.,', 'egrammar.ra', 592)
-  def _reduce_166(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 583)
+  def _reduce_158(val, _values, result)
      error val[0], "'class' is not a valid classname"
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 596)
-  def _reduce_167(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 587)
+  def _reduce_159(val, _values, result)
      result = []
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 597)
-  def _reduce_168(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 588)
+  def _reduce_160(val, _values, result)
      result = []
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 598)
-  def _reduce_169(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 589)
+  def _reduce_161(val, _values, result)
      result = val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 602)
-  def _reduce_170(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 593)
+  def _reduce_162(val, _values, result)
      result = [val[0]]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 603)
-  def _reduce_171(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 594)
+  def _reduce_163(val, _values, result)
      result = val[0].push(val[2])
     result
   end
 .,.,
-# reduce 172 omitted
+# reduce 164 omitted
-# reduce 173 omitted
+# reduce 165 omitted
-# reduce 174 omitted
+# reduce 166 omitted
-# reduce 175 omitted
+# reduce 167 omitted
-module_eval(<<'.,.,', 'egrammar.ra', 615)
-  def _reduce_176(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 606)
+  def _reduce_168(val, _values, result)
      result = Factory.PARAM(val[0][:value], val[2]) ; loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 616)
-  def _reduce_177(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 607)
+  def _reduce_169(val, _values, result)
      result = Factory.PARAM(val[0][:value]); loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 619)
-  def _reduce_178(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 610)
+  def _reduce_170(val, _values, result)
      result = val[1]; val[1].captures_rest()
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 622)
-  def _reduce_179(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 613)
+  def _reduce_171(val, _values, result)
      val[1].type_expr(val[0]) ; result = val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 625)
-  def _reduce_180(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 616)
+  def _reduce_172(val, _values, result)
      result = val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 626)
-  def _reduce_181(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 617)
+  def _reduce_173(val, _values, result)
      result = val[0][*val[2]] ; loc result, val[0], val[3]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 631)
-  def _reduce_182(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 622)
+  def _reduce_174(val, _values, result)
      result = Factory.fqn(val[0][:value]).var ; loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 636)
-  def _reduce_183(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 627)
+  def _reduce_175(val, _values, result)
      result = Factory.RESERVED(val[0][:value]) ; loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 637)
-  def _reduce_184(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 628)
+  def _reduce_176(val, _values, result)
      result = Factory.RESERVED(val[0][:value]) ; loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 638)
-  def _reduce_185(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 629)
+  def _reduce_177(val, _values, result)
      result = Factory.RESERVED(val[0][:value]) ; loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 639)
-  def _reduce_186(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 630)
+  def _reduce_178(val, _values, result)
      result = Factory.RESERVED(val[0][:value]) ; loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 640)
-  def _reduce_187(val, _values, result)
-     result = Factory.RESERVED(val[0][:value], true) ; loc result, val[0]
-    result
-  end
-.,.,
-module_eval(<<'.,.,', 'egrammar.ra', 641)
-  def _reduce_188(val, _values, result)
-     result = Factory.RESERVED(val[0][:value], true) ; loc result, val[0]
-    result
-  end
-.,.,
-module_eval(<<'.,.,', 'egrammar.ra', 642)
-  def _reduce_189(val, _values, result)
-     result = Factory.RESERVED(val[0][:value], true) ; loc result, val[0]
-    result
-  end
-.,.,
-module_eval(<<'.,.,', 'egrammar.ra', 648)
-  def _reduce_190(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 636)
+  def _reduce_179(val, _values, result)
      result = Factory.LIST(val[1]); loc result, val[0], val[3]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 649)
-  def _reduce_191(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 637)
+  def _reduce_180(val, _values, result)
      result = Factory.literal([]) ; loc result, val[0], val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 650)
-  def _reduce_192(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 638)
+  def _reduce_181(val, _values, result)
      result = Factory.LIST(val[1]); loc result, val[0], val[3]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 651)
-  def _reduce_193(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 639)
+  def _reduce_182(val, _values, result)
      result = Factory.literal([]) ; loc result, val[0], val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 654)
-  def _reduce_194(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 642)
+  def _reduce_183(val, _values, result)
      result = Factory.HASH(val[1]); loc result, val[0], val[2]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 655)
-  def _reduce_195(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 643)
+  def _reduce_184(val, _values, result)
      result = Factory.HASH(val[1]); loc result, val[0], val[3]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 656)
-  def _reduce_196(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 644)
+  def _reduce_185(val, _values, result)
      result = Factory.literal({}) ; loc result, val[0], val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 659)
-  def _reduce_197(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 647)
+  def _reduce_186(val, _values, result)
      result = [val[0]]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 660)
-  def _reduce_198(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 648)
+  def _reduce_187(val, _values, result)
      result = val[0].push val[2]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 663)
-  def _reduce_199(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 651)
+  def _reduce_188(val, _values, result)
      result = Factory.KEY_ENTRY(val[0], val[2]); loc result, val[1]
     result
   end
 .,.,
-# reduce 200 omitted
+# reduce 189 omitted
-# reduce 201 omitted
+# reduce 190 omitted
-# reduce 202 omitted
+# reduce 191 omitted
-module_eval(<<'.,.,', 'egrammar.ra', 671)
-  def _reduce_203(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 659)
+  def _reduce_192(val, _values, result)
      result = Factory.literal(val[0][:value]) ; loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 672)
-  def _reduce_204(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 660)
+  def _reduce_193(val, _values, result)
      result = Factory.literal(val[0][:value]) ; loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 674)
-  def _reduce_205(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 662)
+  def _reduce_194(val, _values, result)
      result = Factory.string(val[0], *val[1]) ; loc result, val[0], val[1][-1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 675)
-  def _reduce_206(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 663)
+  def _reduce_195(val, _values, result)
      result = Factory.literal(val[0][:value]); loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 676)
-  def _reduce_207(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 664)
+  def _reduce_196(val, _values, result)
      result = Factory.literal(val[0][:value]); loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 677)
-  def _reduce_208(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 665)
+  def _reduce_197(val, _values, result)
      result = Factory.literal(val[0][:value]); loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 678)
-  def _reduce_209(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 666)
+  def _reduce_198(val, _values, result)
      result = [val[0]] + val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 679)
-  def _reduce_210(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 667)
+  def _reduce_199(val, _values, result)
      result = Factory.TEXT(val[0])
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 682)
-  def _reduce_211(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 670)
+  def _reduce_200(val, _values, result)
      result = [val[0]]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 683)
-  def _reduce_212(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 671)
+  def _reduce_201(val, _values, result)
      result = [val[0]] + val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 686)
-  def _reduce_213(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 674)
+  def _reduce_202(val, _values, result)
      result = Factory.HEREDOC(val[0][:value], val[1]); loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 689)
-  def _reduce_214(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 677)
+  def _reduce_203(val, _values, result)
      result = Factory.SUBLOCATE(val[0], val[1]); loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 690)
-  def _reduce_215(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 678)
+  def _reduce_204(val, _values, result)
      result = Factory.SUBLOCATE(val[0], val[1]); loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 693)
-  def _reduce_216(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 681)
+  def _reduce_205(val, _values, result)
      result = Factory.EPP(val[1], val[2]); loc result, val[0]
     result
   end
 .,.,
-# reduce 217 omitted
+# reduce 206 omitted
-# reduce 218 omitted
+# reduce 207 omitted
-module_eval(<<'.,.,', 'egrammar.ra', 700)
-  def _reduce_219(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 688)
+  def _reduce_208(val, _values, result)
      result = nil
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 701)
-  def _reduce_220(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 689)
+  def _reduce_209(val, _values, result)
      result = []
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 702)
-  def _reduce_221(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 690)
+  def _reduce_210(val, _values, result)
      result = val[1]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 705)
-  def _reduce_222(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 693)
+  def _reduce_211(val, _values, result)
      result = Factory.RENDER_STRING(val[0][:value]); loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 706)
-  def _reduce_223(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 694)
+  def _reduce_212(val, _values, result)
      result = Factory.RENDER_EXPR(val[1]); loc result, val[0], val[2]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 707)
-  def _reduce_224(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 695)
+  def _reduce_213(val, _values, result)
      result = Factory.RENDER_EXPR(Factory.block_or_expression(*val[2])); loc result, val[0], val[4]
     result
   end
 .,.,
-# reduce 225 omitted
+# reduce 214 omitted
-# reduce 226 omitted
+# reduce 215 omitted
-module_eval(<<'.,.,', 'egrammar.ra', 713)
-  def _reduce_227(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 701)
+  def _reduce_216(val, _values, result)
      result = Factory.QREF(val[0][:value])  ; loc result, val[0]
     result
   end
 .,.,
-module_eval(<<'.,.,', 'egrammar.ra', 716)
-  def _reduce_228(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 704)
+  def _reduce_217(val, _values, result)
      result = Factory.literal(val[0][:value]); loc result, val[0]
     result
   end
 .,.,
-# reduce 229 omitted
+# reduce 218 omitted
-module_eval(<<'.,.,', 'egrammar.ra', 722)
-  def _reduce_230(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 710)
+  def _reduce_219(val, _values, result)
      result = nil
     result
   end
 .,.,
-# reduce 231 omitted
+# reduce 220 omitted
-# reduce 232 omitted
+# reduce 221 omitted
-# reduce 233 omitted
+# reduce 222 omitted
-# reduce 234 omitted
+# reduce 223 omitted
-# reduce 235 omitted
+# reduce 224 omitted
-# reduce 236 omitted
+# reduce 225 omitted
-# reduce 237 omitted
+# reduce 226 omitted
-# reduce 238 omitted
+# reduce 227 omitted
-# reduce 239 omitted
+# reduce 228 omitted
-# reduce 240 omitted
+# reduce 229 omitted
-# reduce 241 omitted
+# reduce 230 omitted
-# reduce 242 omitted
+# reduce 231 omitted
-# reduce 243 omitted
+# reduce 232 omitted
-# reduce 244 omitted
+# reduce 233 omitted
-# reduce 245 omitted
+# reduce 234 omitted
-# reduce 246 omitted
+# reduce 235 omitted
-# reduce 247 omitted
+# reduce 236 omitted
-# reduce 248 omitted
+# reduce 237 omitted
-# reduce 249 omitted
+# reduce 238 omitted
-# reduce 250 omitted
+# reduce 239 omitted
-module_eval(<<'.,.,', 'egrammar.ra', 749)
-  def _reduce_251(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 737)
+  def _reduce_240(val, _values, result)
      result = nil
     result
   end