~singpolyma/dhall-ruby

dfb47e5691a566f234c03843b0cea6bd39926d65 — Stephen Paul Weber 1 year, 2 months ago 5ff8205
Support mixed-kind records
2 files changed, 26 insertions(+), 13 deletions(-)

M dhall-lang
M lib/dhall/typecheck.rb
M dhall-lang => dhall-lang +1 -1
@@ 1,1 1,1 @@
Subproject commit fb5b9b7e7919bd77dbfc9719258640c98b85c537
Subproject commit 0c335d3aa23de43e55a8d1ee3e2038f145f58f55

M lib/dhall/typecheck.rb => lib/dhall/typecheck.rb +25 -12
@@ 340,10 340,6 @@ module Dhall
				                                        "RecursiveRecordMerge got",
				                                        context: context

				TypeChecker.assert_types_match annotated_lhs.type, annotated_rhs.type,
				                               "RecursiveRecordMerge got mixed kinds",
				                               context: context

				[annotated_lhs, annotated_rhs]
			end



@@ 367,12 363,6 @@ module Dhall
			end

			def annotate(context)
				kind = TypeChecker.assert_types_match(
					@expr.lhs, @expr.rhs,
					"RecursiveRecordTypeMerge mixed kinds",
					context: context
				)

				type = @expr.lhs.deep_merge_type(@expr.rhs)

				TypeChecker.assert type, Dhall::RecordType,


@@ 381,7 371,13 @@ module Dhall
				# Annotate to sanity check
				TypeChecker.for(type).annotate(context)

				Dhall::TypeAnnotation.new(value: @expr, type: kind)
				Dhall::TypeAnnotation.new(value: @expr, type: kind(context))
			end

			def kind(context)
				lhs_kind = KINDS.index(TypeChecker.for(@expr.lhs).annotate(context).type)
				rhs_kind = KINDS.index(TypeChecker.for(@expr.rhs).annotate(context).type)
				KINDS[[lhs_kind, rhs_kind].max]
			end
		end



@@ 505,13 501,20 @@ module Dhall

		class AnonymousType
			TypeChecker.register self, Dhall::RecordType
			TypeChecker.register self, Dhall::UnionType

			def initialize(type)
				@type = type
			end

			def annotate(context)
				kinds = check(context)
				type = kinds.max_by { |k| KINDS.index(k) } || KINDS.first
				Dhall::TypeAnnotation.new(value: @type, type: type)
			end

			protected

			def check(context)
				kinds = @type.record.values.compact.map do |mtype|
					TypeChecker.for(mtype).annotate(context).type
				end


@@ 519,6 522,16 @@ module Dhall
				TypeChecker.assert (kinds - KINDS), [],
				                   "AnonymousType field kind not one of #{KINDS}"

				kinds
			end
		end

		class UnionType < AnonymousType
			TypeChecker.register self, Dhall::UnionType

			def annotate(context)
				kinds = check(context)

				TypeChecker.assert kinds, Util::ArrayAllTheSame,
				                   "AnonymousType field kinds not all the same"