From fb46beb8bd784ba92949bf2c535dc13c2f003ef0 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sat, 25 Jun 2022 20:24:43 -0400 Subject: De-sigil-ification: suffix : [Part 15] --- licentia/source/program/licentia/document.lux | 2 +- licentia/source/program/licentia/license.lux | 24 +++++++++++----------- .../source/program/licentia/license/copyright.lux | 2 +- .../source/program/licentia/license/definition.lux | 2 +- licentia/source/program/licentia/license/time.lux | 8 ++++---- licentia/source/test/licentia.lux | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) (limited to 'licentia/source') diff --git a/licentia/source/program/licentia/document.lux b/licentia/source/program/licentia/document.lux index 9272cbf6a..12cb89ac5 100644 --- a/licentia/source/program/licentia/document.lux +++ b/licentia/source/program/licentia/document.lux @@ -39,7 +39,7 @@ [and/or "and/or"] ) -(type: .public Section +(type .public Section (Record [#title Text #content Text])) diff --git a/licentia/source/program/licentia/license.lux b/licentia/source/program/licentia/license.lux index b9280bd5f..6541bf103 100644 --- a/licentia/source/program/licentia/license.lux +++ b/licentia/source/program/licentia/license.lux @@ -5,63 +5,63 @@ [time (.only Days Months Period)] ["[1][0]" copyright]]) -(type: .public Identification +(type .public Identification (Record [#name Text #version Text])) -(type: .public Termination +(type .public Termination (Record [#patent_retaliation? Bit #termination_period Days #grace_period Days])) -(type: .public Liability +(type .public Liability (Record [#can_accept? Bit #disclaim_high_risk? Bit])) -(type: .public Distribution +(type .public Distribution (Record [#can_re_license? Bit #can_multi_license? Bit])) -(type: .public Commercial +(type .public Commercial (Record [#can_sell? Bit #require_contributor_credit? Bit #allow_contributor_endorsement? Bit])) -(type: .public Extension +(type .public Extension (Record [#same_license? Bit #must_be_distinguishable? Bit #notification_period (Maybe (Period Months)) #must_describe_modifications? Bit])) -(type: .public Entity +(type .public Entity Text) -(type: .public Black_List +(type .public Black_List (Record [#justification (Maybe Text) #entities (List Entity)])) -(type: .public URL +(type .public URL Text) -(type: .public Attribution +(type .public Attribution (Record [#copyright_notice Text #phrase (Maybe Text) #url URL #image (Maybe URL)])) -(type: .public Addendum +(type .public Addendum (Record [#commons_clause? Bit])) -(type: .public License +(type .public License (Record [#copyright_holders (List /copyright.Holder) #identification (Maybe Identification) diff --git a/licentia/source/program/licentia/license/copyright.lux b/licentia/source/program/licentia/license/copyright.lux index b3bbcfa9b..97eefea46 100644 --- a/licentia/source/program/licentia/license/copyright.lux +++ b/licentia/source/program/licentia/license/copyright.lux @@ -4,7 +4,7 @@ [// [time (.only Year Period)]]) -(type: .public Holder +(type .public Holder (Record [#name Text #period (Period Year)])) diff --git a/licentia/source/program/licentia/license/definition.lux b/licentia/source/program/licentia/license/definition.lux index d43906feb..ae0da31c3 100644 --- a/licentia/source/program/licentia/license/definition.lux +++ b/licentia/source/program/licentia/license/definition.lux @@ -7,7 +7,7 @@ [/// ["$" document]]) -(type: .public Definition +(type .public Definition (Record [#term Text #meaning Text])) diff --git a/licentia/source/program/licentia/license/time.lux b/licentia/source/program/licentia/license/time.lux index 9efebaf10..a7befd906 100644 --- a/licentia/source/program/licentia/license/time.lux +++ b/licentia/source/program/licentia/license/time.lux @@ -2,16 +2,16 @@ [library [lux (.except)]]) -(type: .public Days +(type .public Days Nat) -(type: .public Months +(type .public Months Nat) -(type: .public Year +(type .public Year Nat) -(type: .public (Period a) +(type .public (Period a) (Record [#start a #end a])) diff --git a/licentia/source/test/licentia.lux b/licentia/source/test/licentia.lux index d00497877..8d7bdc120 100644 --- a/licentia/source/test/licentia.lux +++ b/licentia/source/test/licentia.lux @@ -152,7 +152,7 @@ ..addendum )) -(type: (Concern a) +(type (Concern a) (-> (-> Text Bit) a Test)) (def (about_grant present? termination) -- cgit v1.2.3