From 2ae6dfd11c0272b46373899531ce49ad8c4950c2 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Sun, 24 May 2015 17:07:53 +0200 Subject: [PATCH] remove packs for 'containers_string' and 'containers_advanced' --- _oasis | 6 ++-- src/advanced/containers_advanced.ml | 30 ++++++++++++++++++ src/string/{app_parse.ml => CCApp_parse.ml} | 0 src/string/{app_parse.mli => CCApp_parse.mli} | 0 src/string/{KMP.ml => CCKMP.ml} | 0 src/string/{KMP.mli => CCKMP.mli} | 0 .../{levenshtein.ml => CCLevenshtein.ml} | 0 .../{levenshtein.mli => CCLevenshtein.mli} | 0 src/string/{parse.ml => CCParse.ml} | 0 src/string/{parse.mli => CCParse.mli} | 0 src/string/containers_string.ml | 31 +++++++++++++++++++ 11 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 src/advanced/containers_advanced.ml rename src/string/{app_parse.ml => CCApp_parse.ml} (100%) rename src/string/{app_parse.mli => CCApp_parse.mli} (100%) rename src/string/{KMP.ml => CCKMP.ml} (100%) rename src/string/{KMP.mli => CCKMP.mli} (100%) rename src/string/{levenshtein.ml => CCLevenshtein.ml} (100%) rename src/string/{levenshtein.mli => CCLevenshtein.mli} (100%) rename src/string/{parse.ml => CCParse.ml} (100%) rename src/string/{parse.mli => CCParse.mli} (100%) create mode 100644 src/string/containers_string.ml diff --git a/_oasis b/_oasis index cea3fd13..66d1cc32 100644 --- a/_oasis +++ b/_oasis @@ -96,16 +96,14 @@ Library "containers_iter" Library "containers_string" Path: src/string - Pack: true - Modules: KMP, Levenshtein, App_parse, Parse + Modules: Containers_string, CCKMP, CCLevenshtein, CCApp_parse, CCParse BuildDepends: bytes FindlibName: string FindlibParent: containers Library "containers_advanced" Path: src/advanced - Pack: true - Modules: CCLinq, CCBatch, CCCat, CCMonadIO + Modules: Containers_advanced, CCLinq, CCBatch, CCCat, CCMonadIO Build$: flag(advanced) Install$: flag(advanced) FindlibName: advanced diff --git a/src/advanced/containers_advanced.ml b/src/advanced/containers_advanced.ml new file mode 100644 index 00000000..fc460343 --- /dev/null +++ b/src/advanced/containers_advanced.ml @@ -0,0 +1,30 @@ + +(* +copyright (c) 2013-2015, simon cruanes +all rights reserved. + +redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +redistributions of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. redistributions in binary +form must reproduce the above copyright notice, this list of conditions and the +following disclaimer in the documentation and/or other materials provided with +the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*) + +module Batch = CCBatch +module Cat = CCCat +module Linq = CCLinq +module MonadIO = CCMonadIO diff --git a/src/string/app_parse.ml b/src/string/CCApp_parse.ml similarity index 100% rename from src/string/app_parse.ml rename to src/string/CCApp_parse.ml diff --git a/src/string/app_parse.mli b/src/string/CCApp_parse.mli similarity index 100% rename from src/string/app_parse.mli rename to src/string/CCApp_parse.mli diff --git a/src/string/KMP.ml b/src/string/CCKMP.ml similarity index 100% rename from src/string/KMP.ml rename to src/string/CCKMP.ml diff --git a/src/string/KMP.mli b/src/string/CCKMP.mli similarity index 100% rename from src/string/KMP.mli rename to src/string/CCKMP.mli diff --git a/src/string/levenshtein.ml b/src/string/CCLevenshtein.ml similarity index 100% rename from src/string/levenshtein.ml rename to src/string/CCLevenshtein.ml diff --git a/src/string/levenshtein.mli b/src/string/CCLevenshtein.mli similarity index 100% rename from src/string/levenshtein.mli rename to src/string/CCLevenshtein.mli diff --git a/src/string/parse.ml b/src/string/CCParse.ml similarity index 100% rename from src/string/parse.ml rename to src/string/CCParse.ml diff --git a/src/string/parse.mli b/src/string/CCParse.mli similarity index 100% rename from src/string/parse.mli rename to src/string/CCParse.mli diff --git a/src/string/containers_string.ml b/src/string/containers_string.ml new file mode 100644 index 00000000..8f138db5 --- /dev/null +++ b/src/string/containers_string.ml @@ -0,0 +1,31 @@ + +(* +copyright (c) 2013-2015, simon cruanes +all rights reserved. + +redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +redistributions of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. redistributions in binary +form must reproduce the above copyright notice, this list of conditions and the +following disclaimer in the documentation and/or other materials provided with +the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*) + +module App_parse = CCApp_parse +module Parse = CCParse +module KMP = CCKMP +module Levenshtein = CCLevenshtein +