From af53c8b3a57b22c96562d82a36f2f45906c7469c Mon Sep 17 00:00:00 2001 From: gfngfn Date: Wed, 2 Nov 2022 20:52:12 +0900 Subject: [PATCH] lessen contents of package config files --- .../packages/annot/annot.0.0.1/satysfi.yaml | 4 --- .../packages/code/code.0.0.1/satysfi.yaml | 4 --- .../footnote-scheme.0.0.1/satysfi.yaml | 4 --- .../itemize/itemize.0.0.1/satysfi.yaml | 4 --- .../packages/math/math.0.0.1/satysfi.yaml | 4 --- .../packages/md-ja/md-ja.0.0.1/satysfi.yaml | 9 ------ .../src/{mdja.satyh => md-ja.satyh} | 0 .../packages/proof/proof.0.0.1/satysfi.yaml | 4 --- .../std-ja-book.0.0.1/satysfi.yaml | 8 ----- .../{stdjabook.satyh => std-ja-book.satyh} | 0 .../std-ja-report.0.0.1/satysfi.yaml | 8 ----- ...{stdjareport.satyh => std-ja-report.satyh} | 0 .../packages/std-ja/std-ja.0.0.1/satysfi.yaml | 7 ----- .../src/{stdja.satyh => std-ja.satyh} | 0 .../packages/stdlib/stdlib.0.0.1/satysfi.yaml | 2 -- .../tabular/tabular.0.0.1/satysfi.yaml | 4 --- src/frontend/packageConfig.ml | 30 ++----------------- 17 files changed, 2 insertions(+), 90 deletions(-) rename lib-satysfi/dist/packages/md-ja/md-ja.0.0.1/src/{mdja.satyh => md-ja.satyh} (100%) rename lib-satysfi/dist/packages/std-ja-book/std-ja-book.0.0.1/src/{stdjabook.satyh => std-ja-book.satyh} (100%) rename lib-satysfi/dist/packages/std-ja-report/std-ja-report.0.0.1/src/{stdjareport.satyh => std-ja-report.satyh} (100%) rename lib-satysfi/dist/packages/std-ja/std-ja.0.0.1/src/{stdja.satyh => std-ja.satyh} (100%) diff --git a/lib-satysfi/dist/packages/annot/annot.0.0.1/satysfi.yaml b/lib-satysfi/dist/packages/annot/annot.0.0.1/satysfi.yaml index 578e1ff25..4be0243a4 100644 --- a/lib-satysfi/dist/packages/annot/annot.0.0.1/satysfi.yaml +++ b/lib-satysfi/dist/packages/annot/annot.0.0.1/satysfi.yaml @@ -1,10 +1,6 @@ language: "0.1.0" -package_name: "annot" -version: "0.0.1" contents: type: "library" main_module: "Annot" source_directories: - "./src" - dependencies: - - package_name: "stdlib" diff --git a/lib-satysfi/dist/packages/code/code.0.0.1/satysfi.yaml b/lib-satysfi/dist/packages/code/code.0.0.1/satysfi.yaml index 436b834dc..6cccc025f 100644 --- a/lib-satysfi/dist/packages/code/code.0.0.1/satysfi.yaml +++ b/lib-satysfi/dist/packages/code/code.0.0.1/satysfi.yaml @@ -1,10 +1,6 @@ language: "0.1.0" -package_name: "code" -version: "0.0.1" contents: type: "library" main_module: "Code" source_directories: - "./src" - dependencies: - - package_name: "stdlib" diff --git a/lib-satysfi/dist/packages/footnote-scheme/footnote-scheme.0.0.1/satysfi.yaml b/lib-satysfi/dist/packages/footnote-scheme/footnote-scheme.0.0.1/satysfi.yaml index 823c25804..6372e0305 100644 --- a/lib-satysfi/dist/packages/footnote-scheme/footnote-scheme.0.0.1/satysfi.yaml +++ b/lib-satysfi/dist/packages/footnote-scheme/footnote-scheme.0.0.1/satysfi.yaml @@ -1,10 +1,6 @@ language: "0.1.0" -package_name: "footnote-scheme" -version: "0.0.1" contents: type: "library" main_module: "FootnoteScheme" source_directories: - "./src" - dependencies: - - package_name: "stdlib" diff --git a/lib-satysfi/dist/packages/itemize/itemize.0.0.1/satysfi.yaml b/lib-satysfi/dist/packages/itemize/itemize.0.0.1/satysfi.yaml index fb8bc9775..d0a919e4e 100644 --- a/lib-satysfi/dist/packages/itemize/itemize.0.0.1/satysfi.yaml +++ b/lib-satysfi/dist/packages/itemize/itemize.0.0.1/satysfi.yaml @@ -1,10 +1,6 @@ language: "0.1.0" -package_name: "itemize" -version: "0.0.1" contents: type: "library" main_module: "Itemize" source_directories: - "./src" - dependencies: - - package_name: "stdlib" diff --git a/lib-satysfi/dist/packages/math/math.0.0.1/satysfi.yaml b/lib-satysfi/dist/packages/math/math.0.0.1/satysfi.yaml index a1bab440f..7235d379b 100644 --- a/lib-satysfi/dist/packages/math/math.0.0.1/satysfi.yaml +++ b/lib-satysfi/dist/packages/math/math.0.0.1/satysfi.yaml @@ -1,10 +1,6 @@ language: "0.1.0" -package_name: "math" -version: "0.0.1" contents: type: "library" main_module: "Math" source_directories: - "./src" - dependencies: - - package_name: "stdlib" diff --git a/lib-satysfi/dist/packages/md-ja/md-ja.0.0.1/satysfi.yaml b/lib-satysfi/dist/packages/md-ja/md-ja.0.0.1/satysfi.yaml index c895c0f02..b1579ccf7 100644 --- a/lib-satysfi/dist/packages/md-ja/md-ja.0.0.1/satysfi.yaml +++ b/lib-satysfi/dist/packages/md-ja/md-ja.0.0.1/satysfi.yaml @@ -1,15 +1,6 @@ language: "0.1.0" -package_name: "md-ja" -version: "0.0.1" contents: type: "library" main_module: "MDJa" source_directories: - "./src" - dependencies: - - package_name: "stdlib" - - package_name: "math" - - package_name: "code" - - package_name: "itemize" - - package_name: "annot" - - package_name: "footnote-scheme" diff --git a/lib-satysfi/dist/packages/md-ja/md-ja.0.0.1/src/mdja.satyh b/lib-satysfi/dist/packages/md-ja/md-ja.0.0.1/src/md-ja.satyh similarity index 100% rename from lib-satysfi/dist/packages/md-ja/md-ja.0.0.1/src/mdja.satyh rename to lib-satysfi/dist/packages/md-ja/md-ja.0.0.1/src/md-ja.satyh diff --git a/lib-satysfi/dist/packages/proof/proof.0.0.1/satysfi.yaml b/lib-satysfi/dist/packages/proof/proof.0.0.1/satysfi.yaml index fccb64edc..ea4b4c776 100644 --- a/lib-satysfi/dist/packages/proof/proof.0.0.1/satysfi.yaml +++ b/lib-satysfi/dist/packages/proof/proof.0.0.1/satysfi.yaml @@ -1,10 +1,6 @@ language: "0.1.0" -package_name: "proof" -version: "0.0.1" contents: type: "library" main_module: "Proof" source_directories: - "./src" - dependencies: - - package_name: "stdlib" diff --git a/lib-satysfi/dist/packages/std-ja-book/std-ja-book.0.0.1/satysfi.yaml b/lib-satysfi/dist/packages/std-ja-book/std-ja-book.0.0.1/satysfi.yaml index 1166d3e38..5729ac46f 100644 --- a/lib-satysfi/dist/packages/std-ja-book/std-ja-book.0.0.1/satysfi.yaml +++ b/lib-satysfi/dist/packages/std-ja-book/std-ja-book.0.0.1/satysfi.yaml @@ -1,14 +1,6 @@ language: "0.1.0" -package_name: "std-ja-book" -version: "0.0.1" contents: type: "library" main_module: "StdJaBook" source_directories: - "./src" - dependencies: - - package_name: "stdlib" - - package_name: "math" - - package_name: "annot" - - package_name: "code" - - package_name: "footnote-scheme" diff --git a/lib-satysfi/dist/packages/std-ja-book/std-ja-book.0.0.1/src/stdjabook.satyh b/lib-satysfi/dist/packages/std-ja-book/std-ja-book.0.0.1/src/std-ja-book.satyh similarity index 100% rename from lib-satysfi/dist/packages/std-ja-book/std-ja-book.0.0.1/src/stdjabook.satyh rename to lib-satysfi/dist/packages/std-ja-book/std-ja-book.0.0.1/src/std-ja-book.satyh diff --git a/lib-satysfi/dist/packages/std-ja-report/std-ja-report.0.0.1/satysfi.yaml b/lib-satysfi/dist/packages/std-ja-report/std-ja-report.0.0.1/satysfi.yaml index a572c1b67..a0e56c3ca 100644 --- a/lib-satysfi/dist/packages/std-ja-report/std-ja-report.0.0.1/satysfi.yaml +++ b/lib-satysfi/dist/packages/std-ja-report/std-ja-report.0.0.1/satysfi.yaml @@ -1,14 +1,6 @@ language: "0.1.0" -package_name: "std-ja-report" -version: "0.0.1" contents: type: "library" main_module: "StdJaReport" source_directories: - "./src" - dependencies: - - package_name: "stdlib" - - package_name: "math" - - package_name: "code" - - package_name: "annot" - - package_name: "footnote-scheme" diff --git a/lib-satysfi/dist/packages/std-ja-report/std-ja-report.0.0.1/src/stdjareport.satyh b/lib-satysfi/dist/packages/std-ja-report/std-ja-report.0.0.1/src/std-ja-report.satyh similarity index 100% rename from lib-satysfi/dist/packages/std-ja-report/std-ja-report.0.0.1/src/stdjareport.satyh rename to lib-satysfi/dist/packages/std-ja-report/std-ja-report.0.0.1/src/std-ja-report.satyh diff --git a/lib-satysfi/dist/packages/std-ja/std-ja.0.0.1/satysfi.yaml b/lib-satysfi/dist/packages/std-ja/std-ja.0.0.1/satysfi.yaml index d2bf70338..d42ef783f 100644 --- a/lib-satysfi/dist/packages/std-ja/std-ja.0.0.1/satysfi.yaml +++ b/lib-satysfi/dist/packages/std-ja/std-ja.0.0.1/satysfi.yaml @@ -1,13 +1,6 @@ language: "0.1.0" -package_name: "std-ja" -version: "0.0.1" contents: type: "library" main_module: "StdJa" source_directories: - "./src" - dependencies: - - package_name: "stdlib" - - package_name: "math" - - package_name: "annot" - - package_name: "code" diff --git a/lib-satysfi/dist/packages/std-ja/std-ja.0.0.1/src/stdja.satyh b/lib-satysfi/dist/packages/std-ja/std-ja.0.0.1/src/std-ja.satyh similarity index 100% rename from lib-satysfi/dist/packages/std-ja/std-ja.0.0.1/src/stdja.satyh rename to lib-satysfi/dist/packages/std-ja/std-ja.0.0.1/src/std-ja.satyh diff --git a/lib-satysfi/dist/packages/stdlib/stdlib.0.0.1/satysfi.yaml b/lib-satysfi/dist/packages/stdlib/stdlib.0.0.1/satysfi.yaml index 638ea0852..3532c99df 100644 --- a/lib-satysfi/dist/packages/stdlib/stdlib.0.0.1/satysfi.yaml +++ b/lib-satysfi/dist/packages/stdlib/stdlib.0.0.1/satysfi.yaml @@ -1,6 +1,4 @@ language: "0.1.0" -package_name: "stdlib" -version: "0.0.1" contents: type: "library" main_module: "Stdlib" diff --git a/lib-satysfi/dist/packages/tabular/tabular.0.0.1/satysfi.yaml b/lib-satysfi/dist/packages/tabular/tabular.0.0.1/satysfi.yaml index 28133f8c9..d2c003af2 100644 --- a/lib-satysfi/dist/packages/tabular/tabular.0.0.1/satysfi.yaml +++ b/lib-satysfi/dist/packages/tabular/tabular.0.0.1/satysfi.yaml @@ -1,10 +1,6 @@ language: "0.1.0" -package_name: "tabular" -version: "0.0.1" contents: type: "library" main_module: "Tabular" source_directories: - "./src" - dependencies: - - package_name: "stdlib" diff --git a/src/frontend/packageConfig.ml b/src/frontend/packageConfig.ml index 4d0e4f327..63cefda6a 100644 --- a/src/frontend/packageConfig.ml +++ b/src/frontend/packageConfig.ml @@ -8,25 +8,16 @@ type 'a ok = ('a, config_error) result type relative_path = string -type dependency_spec = { - depended_package_name : string; - version_constraints : unit; (* TODO: define this *) -} - type package_contents = | Library of { main_module_name : module_name; source_directories : relative_path list; - dependencies : dependency_spec list; } | Document of { document_file : relative_path; - dependencies : dependency_spec list; } type t = { - package_name : string; - package_version : string; package_contents : package_contents; } @@ -34,34 +25,21 @@ type t = { module PackageConfigDecoder = YamlDecoder.Make(YamlError) -let dependency_decoder : dependency_spec PackageConfigDecoder.t = - let open PackageConfigDecoder in - get "package_name" string >>= fun depended_package_name -> - succeed { - depended_package_name; - version_constraints = (); - } - - let contents_decoder : package_contents PackageConfigDecoder.t = let open PackageConfigDecoder in branch "type" [ "library" ==> begin get "main_module" string >>= fun main_module_name -> get "source_directories" (list string) >>= fun source_directories -> - get_or_else "dependencies" (list dependency_decoder) [] >>= fun dependencies -> succeed @@ Library { main_module_name; source_directories; - dependencies; } end; "document" ==> begin get "file" string >>= fun document_file -> - get_or_else "dependencies" (list dependency_decoder) [] >>= fun dependencies -> succeed @@ Document { document_file; - dependencies; } end; ] @@ -70,14 +48,10 @@ let contents_decoder : package_contents PackageConfigDecoder.t = ) -let config_decoder : t PackageConfigDecoder.t = +let version_0_1_config_decoder : t PackageConfigDecoder.t = let open PackageConfigDecoder in - get "package_name" string >>= fun package_name -> - get "version" string >>= fun package_version -> get "contents" contents_decoder >>= fun package_contents -> succeed @@ { - package_name; - package_version; package_contents; } @@ -86,7 +60,7 @@ let config_decoder = let open PackageConfigDecoder in get "language" string >>= fun language -> match language with - | "0.1.0" -> config_decoder + | "0.1.0" -> version_0_1_config_decoder | _ -> failure (fun _context -> UnexpectedLanguage(language))