This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository ocaml-csv.
commit 60d752b3a3bed4ad499f9de555e173bc8da9a103
Author: Stephane Glondu <st...@glondu.net>
Date: Sun Jan 26 14:56:52 2014 +0100
Imported Upstream version 1.3.1
---
_oasis | 2 +-
myocamlbuild.ml | 14 ++++----
setup.ml | 100 ++++++++++++++++++++++++++++----------------------------
src/META | 4 +--
src/csv.ml | 4 +--
src/csv.mli | 9 +++--
6 files changed, 68 insertions(+), 65 deletions(-)
diff --git a/_oasis b/_oasis
index 84763d2..688b6f0 100644
--- a/_oasis
+++ b/_oasis
@@ -1,7 +1,7 @@
# -*-conf-*-
OASISFormat: 0.3
Name: csv
-Version: 1.3.0
+Version: 1.3.1
Synopsis: A pure OCaml library to read and write CSV files.
Description: This is a pure OCaml library to read and write CSV files,
including all extensions used by Excel — e.g. quotes, newlines,
diff --git a/myocamlbuild.ml b/myocamlbuild.ml
index 13fe00f..1e3e565 100644
--- a/myocamlbuild.ml
+++ b/myocamlbuild.ml
@@ -1,7 +1,7 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: 31c8c4df35758650b60bb124f5085edc) *)
+(* DO NOT EDIT (digest: 36fec46b39d49f881fbb5b0db76af130) *)
module OASISGettext = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/OASISGettext.ml"
*)
+(* # 21 "src/oasis/OASISGettext.ml" *)
let ns_ str =
str
@@ -24,7 +24,7 @@ module OASISGettext = struct
end
module OASISExpr = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/OASISExpr.ml" *)
+(* # 21 "src/oasis/OASISExpr.ml" *)
@@ -116,7 +116,7 @@ end
# 117 "myocamlbuild.ml"
module BaseEnvLight = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/base/BaseEnvLight.ml" *)
+(* # 21 "src/base/BaseEnvLight.ml" *)
module MapString = Map.Make(String)
@@ -214,7 +214,7 @@ end
# 215 "myocamlbuild.ml"
module MyOCamlbuildFindlib = struct
-(* # 21
"/home/trch/.opam/system/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml"
*)
+(* # 21 "src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)
(** OCamlbuild extension, copied from
* http://brion.inria.fr/gallium/index.php/Using_ocamlfind_with_ocamlbuild
@@ -323,7 +323,7 @@ module MyOCamlbuildFindlib = struct
end
module MyOCamlbuildBase = struct
-(* # 21
"/home/trch/.opam/system/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml"
*)
+(* # 21 "src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
(** Base functions for writing myocamlbuild.ml
@author Sylvain Le Gall
@@ -339,7 +339,7 @@ module MyOCamlbuildBase = struct
type name = string
type tag = string
-(* # 56
"/home/trch/.opam/system/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml"
*)
+(* # 56 "src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
type t =
{
diff --git a/setup.ml b/setup.ml
index c39d1fb..00382f6 100644
--- a/setup.ml
+++ b/setup.ml
@@ -4,14 +4,14 @@ let () =
with Not_found -> ();;
(* OASIS_START *)
-(* DO NOT EDIT (digest: 77b3c143125acb5eb773e79ad5301ceb) *)
+(* DO NOT EDIT (digest: 7e9b0897d218cfb9341510fddd0e8e92) *)
(*
Regenerated by OASIS v0.3.0
Visit http://oasis.forge.ocamlcore.org for more information and
documentation about functions used in this file.
*)
module OASISGettext = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/OASISGettext.ml"
*)
+(* # 21 "src/oasis/OASISGettext.ml" *)
let ns_ str =
str
@@ -34,7 +34,7 @@ module OASISGettext = struct
end
module OASISContext = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/OASISContext.ml"
*)
+(* # 21 "src/oasis/OASISContext.ml" *)
open OASISGettext
@@ -95,7 +95,7 @@ module OASISContext = struct
end
module OASISString = struct
-(* # 1 "/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/OASISString.ml" *)
+(* # 1 "src/oasis/OASISString.ml" *)
@@ -220,7 +220,7 @@ module OASISString = struct
end
module OASISUtils = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/OASISUtils.ml" *)
+(* # 21 "src/oasis/OASISUtils.ml" *)
open OASISGettext
@@ -315,7 +315,7 @@ module OASISUtils = struct
end
module PropList = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/PropList.ml" *)
+(* # 21 "src/oasis/PropList.ml" *)
open OASISGettext
@@ -355,7 +355,7 @@ module PropList = struct
let clear t =
Hashtbl.clear t
-(* # 71 "/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/PropList.ml" *)
+(* # 71 "src/oasis/PropList.ml" *)
end
module Schema =
@@ -596,7 +596,7 @@ module PropList = struct
end
module OASISMessage = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/OASISMessage.ml"
*)
+(* # 21 "src/oasis/OASISMessage.ml" *)
open OASISGettext
@@ -635,7 +635,7 @@ module OASISMessage = struct
end
module OASISVersion = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/OASISVersion.ml"
*)
+(* # 21 "src/oasis/OASISVersion.ml" *)
open OASISGettext
@@ -814,7 +814,7 @@ module OASISVersion = struct
end
module OASISLicense = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/OASISLicense.ml"
*)
+(* # 21 "src/oasis/OASISLicense.ml" *)
(** License for _oasis fields
@author Sylvain Le Gall
@@ -854,7 +854,7 @@ module OASISLicense = struct
end
module OASISExpr = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/OASISExpr.ml" *)
+(* # 21 "src/oasis/OASISExpr.ml" *)
@@ -944,7 +944,7 @@ module OASISExpr = struct
end
module OASISTypes = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/OASISTypes.ml" *)
+(* # 21 "src/oasis/OASISTypes.ml" *)
@@ -1021,7 +1021,7 @@ module OASISTypes = struct
type plugin_data = (all_plugin * plugin_data_purpose * (unit -> unit)) list
-(* # 102 "/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/OASISTypes.ml" *)
+(* # 102 "src/oasis/OASISTypes.ml" *)
type 'a conditional = 'a OASISExpr.choices
@@ -1179,7 +1179,7 @@ module OASISTypes = struct
end
module OASISUnixPath = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/OASISUnixPath.ml"
*)
+(* # 21 "src/oasis/OASISUnixPath.ml" *)
type unix_filename = string
type unix_dirname = string
@@ -1263,7 +1263,7 @@ module OASISUnixPath = struct
end
module OASISHostPath = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/OASISHostPath.ml"
*)
+(* # 21 "src/oasis/OASISHostPath.ml" *)
open Filename
@@ -1296,7 +1296,7 @@ module OASISHostPath = struct
end
module OASISSection = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/OASISSection.ml"
*)
+(* # 21 "src/oasis/OASISSection.ml" *)
open OASISTypes
@@ -1375,12 +1375,12 @@ module OASISSection = struct
end
module OASISBuildSection = struct
-(* # 21
"/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/OASISBuildSection.ml" *)
+(* # 21 "src/oasis/OASISBuildSection.ml" *)
end
module OASISExecutable = struct
-(* # 21
"/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/OASISExecutable.ml" *)
+(* # 21 "src/oasis/OASISExecutable.ml" *)
open OASISTypes
@@ -1411,7 +1411,7 @@ module OASISExecutable = struct
end
module OASISLibrary = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/OASISLibrary.ml"
*)
+(* # 21 "src/oasis/OASISLibrary.ml" *)
open OASISTypes
open OASISUtils
@@ -1844,32 +1844,32 @@ module OASISLibrary = struct
end
module OASISFlag = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/OASISFlag.ml" *)
+(* # 21 "src/oasis/OASISFlag.ml" *)
end
module OASISPackage = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/OASISPackage.ml"
*)
+(* # 21 "src/oasis/OASISPackage.ml" *)
end
module OASISSourceRepository = struct
-(* # 21
"/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/OASISSourceRepository.ml"
*)
+(* # 21 "src/oasis/OASISSourceRepository.ml" *)
end
module OASISTest = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/OASISTest.ml" *)
+(* # 21 "src/oasis/OASISTest.ml" *)
end
module OASISDocument = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/OASISDocument.ml"
*)
+(* # 21 "src/oasis/OASISDocument.ml" *)
end
module OASISExec = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/OASISExec.ml" *)
+(* # 21 "src/oasis/OASISExec.ml" *)
open OASISGettext
open OASISUtils
@@ -1947,7 +1947,7 @@ module OASISExec = struct
end
module OASISFileUtil = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/oasis/OASISFileUtil.ml"
*)
+(* # 21 "src/oasis/OASISFileUtil.ml" *)
open OASISGettext
@@ -2144,7 +2144,7 @@ end
# 2142 "setup.ml"
module BaseEnvLight = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/base/BaseEnvLight.ml" *)
+(* # 21 "src/base/BaseEnvLight.ml" *)
module MapString = Map.Make(String)
@@ -2242,7 +2242,7 @@ end
# 2240 "setup.ml"
module BaseContext = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/base/BaseContext.ml" *)
+(* # 21 "src/base/BaseContext.ml" *)
open OASISContext
@@ -2253,7 +2253,7 @@ module BaseContext = struct
end
module BaseMessage = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/base/BaseMessage.ml" *)
+(* # 21 "src/base/BaseMessage.ml" *)
(** Message to user, overrid for Base
@author Sylvain Le Gall
@@ -2272,7 +2272,7 @@ module BaseMessage = struct
end
module BaseEnv = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/base/BaseEnv.ml" *)
+(* # 21 "src/base/BaseEnv.ml" *)
open OASISGettext
open OASISUtils
@@ -2732,7 +2732,7 @@ module BaseEnv = struct
end
module BaseArgExt = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/base/BaseArgExt.ml" *)
+(* # 21 "src/base/BaseArgExt.ml" *)
open OASISUtils
open OASISGettext
@@ -2760,7 +2760,7 @@ module BaseArgExt = struct
end
module BaseCheck = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/base/BaseCheck.ml" *)
+(* # 21 "src/base/BaseCheck.ml" *)
open BaseEnv
open BaseMessage
@@ -2886,7 +2886,7 @@ module BaseCheck = struct
end
module BaseOCamlcConfig = struct
-(* # 21
"/home/trch/.opam/system/build/oasis.0.3.0/src/base/BaseOCamlcConfig.ml" *)
+(* # 21 "src/base/BaseOCamlcConfig.ml" *)
open BaseEnv
@@ -3002,7 +3002,7 @@ module BaseOCamlcConfig = struct
end
module BaseStandardVar = struct
-(* # 21
"/home/trch/.opam/system/build/oasis.0.3.0/src/base/BaseStandardVar.ml" *)
+(* # 21 "src/base/BaseStandardVar.ml" *)
open OASISGettext
@@ -3366,7 +3366,7 @@ module BaseStandardVar = struct
end
module BaseFileAB = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/base/BaseFileAB.ml" *)
+(* # 21 "src/base/BaseFileAB.ml" *)
open BaseEnv
open OASISGettext
@@ -3414,7 +3414,7 @@ module BaseFileAB = struct
end
module BaseLog = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/base/BaseLog.ml" *)
+(* # 21 "src/base/BaseLog.ml" *)
open OASISUtils
@@ -3533,7 +3533,7 @@ module BaseLog = struct
end
module BaseBuilt = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/base/BaseBuilt.ml" *)
+(* # 21 "src/base/BaseBuilt.ml" *)
open OASISTypes
open OASISGettext
@@ -3680,7 +3680,7 @@ module BaseBuilt = struct
end
module BaseCustom = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/base/BaseCustom.ml" *)
+(* # 21 "src/base/BaseCustom.ml" *)
open BaseEnv
open BaseMessage
@@ -3730,7 +3730,7 @@ module BaseCustom = struct
end
module BaseDynVar = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/base/BaseDynVar.ml" *)
+(* # 21 "src/base/BaseDynVar.ml" *)
open OASISTypes
@@ -3777,7 +3777,7 @@ module BaseDynVar = struct
end
module BaseTest = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/base/BaseTest.ml" *)
+(* # 21 "src/base/BaseTest.ml" *)
open BaseEnv
open BaseMessage
@@ -3867,7 +3867,7 @@ module BaseTest = struct
end
module BaseDoc = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/base/BaseDoc.ml" *)
+(* # 21 "src/base/BaseDoc.ml" *)
open BaseEnv
open BaseMessage
@@ -3902,7 +3902,7 @@ module BaseDoc = struct
end
module BaseSetup = struct
-(* # 21 "/home/trch/.opam/system/build/oasis.0.3.0/src/base/BaseSetup.ml" *)
+(* # 21 "src/base/BaseSetup.ml" *)
open BaseEnv
open BaseMessage
@@ -4482,7 +4482,7 @@ end
# 4480 "setup.ml"
module InternalConfigurePlugin = struct
-(* # 21
"/home/trch/.opam/system/build/oasis.0.3.0/src/plugins/internal/InternalConfigurePlugin.ml"
*)
+(* # 21 "src/plugins/internal/InternalConfigurePlugin.ml" *)
(** Configure using internal scheme
@author Sylvain Le Gall
@@ -4724,7 +4724,7 @@ module InternalConfigurePlugin = struct
end
module InternalInstallPlugin = struct
-(* # 21
"/home/trch/.opam/system/build/oasis.0.3.0/src/plugins/internal/InternalInstallPlugin.ml"
*)
+(* # 21 "src/plugins/internal/InternalInstallPlugin.ml" *)
(** Install using internal scheme
@author Sylvain Le Gall
@@ -5235,7 +5235,7 @@ end
# 5233 "setup.ml"
module OCamlbuildCommon = struct
-(* # 21
"/home/trch/.opam/system/build/oasis.0.3.0/src/plugins/ocamlbuild/OCamlbuildCommon.ml"
*)
+(* # 21 "src/plugins/ocamlbuild/OCamlbuildCommon.ml" *)
(** Functions common to OCamlbuild build and doc plugin
*)
@@ -5337,7 +5337,7 @@ module OCamlbuildCommon = struct
end
module OCamlbuildPlugin = struct
-(* # 21
"/home/trch/.opam/system/build/oasis.0.3.0/src/plugins/ocamlbuild/OCamlbuildPlugin.ml"
*)
+(* # 21 "src/plugins/ocamlbuild/OCamlbuildPlugin.ml" *)
(** Build using ocamlbuild
@author Sylvain Le Gall
@@ -5510,7 +5510,7 @@ module OCamlbuildPlugin = struct
end
module OCamlbuildDocPlugin = struct
-(* # 21
"/home/trch/.opam/system/build/oasis.0.3.0/src/plugins/ocamlbuild/OCamlbuildDocPlugin.ml"
*)
+(* # 21 "src/plugins/ocamlbuild/OCamlbuildDocPlugin.ml" *)
(* Create documentation using ocamlbuild .odocl files
@author Sylvain Le Gall
@@ -5560,7 +5560,7 @@ end
# 5558 "setup.ml"
module CustomPlugin = struct
-(* # 21
"/home/trch/.opam/system/build/oasis.0.3.0/src/plugins/custom/CustomPlugin.ml"
*)
+(* # 21 "src/plugins/custom/CustomPlugin.ml" *)
(** Generate custom configure/build/doc/test/install system
@author
@@ -5747,7 +5747,7 @@ let setup_t =
ocaml_version = None;
findlib_version = None;
name = "csv";
- version = "1.3.0";
+ version = "1.3.1";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
@@ -5978,7 +5978,7 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.3.0";
- oasis_digest = Some "\168\222\173$\240Tb\185\132\207\211\164\13985@";
+ oasis_digest = Some "\176\200\189{W\210r\201\176R'\\\190sn\170";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false;
diff --git a/src/META b/src/META
index 52e6987..12d7807 100644
--- a/src/META
+++ b/src/META
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: e1980942a24391f22504f135281530f0)
-version = "1.3.0"
+# DO NOT EDIT (digest: 89bb1bc1c854dfa0d6d1f7365dca585c)
+version = "1.3.1"
description = "A pure OCaml library to read and write CSV files."
archive(byte) = "csv.cma"
archive(byte, plugin) = "csv.cma"
diff --git a/src/csv.ml b/src/csv.ml
index e11747d..53813f4 100644
--- a/src/csv.ml
+++ b/src/csv.ml
@@ -107,7 +107,7 @@ let of_in_obj ?(separator=',') ?(excel_tricks=true) in_chan
= {
end_of_file = false;
current_field = Buffer.create 0xFF;
record = [];
- record_n = 0;
+ record_n = 0; (* => first record numbered 1 *)
separator = separator;
excel_tricks = excel_tricks;
}
@@ -373,7 +373,7 @@ let next ic =
ic.record <- [];
ic.record_n <- ic.record_n + 1; (* the current line being read *)
let more_fields = ref true
- and field_no = ref 0 in
+ and field_no = ref 1 in (* the current field being read *)
while !more_fields do
more_fields := add_next_field ic !field_no;
incr field_no;
diff --git a/src/csv.mli b/src/csv.mli
index 36a117a..ec3d6a1 100644
--- a/src/csv.mli
+++ b/src/csv.mli
@@ -66,9 +66,12 @@ end
(** {2 Input} *)
exception Failure of int * int * string
- (** [Failure(nrecord, nfield, msg)] is raised to indicate a parsing
- error for the field number [nfield] on the record number
- [nrecord], the description [msg] says what is wrong. *)
+(** [Failure(nrecord, nfield, msg)] is raised to indicate a parsing
+ error for the field number [nfield] on the record number
+ [nrecord], the description [msg] says what is wrong. The first
+ record and the first field of a record are numbered [1] (to
+ correspond to the usual spreadsheet numbering but differing from
+ [List.nth] of the OCaml representation). *)
type in_channel
(** Stateful handle to input CSV files. *)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-csv.git
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
