From: Kim Nguyễn Date: Wed, 30 Jan 2013 18:10:34 +0000 (+0100) Subject: Sanitize header files and add a timestamp mark in each source file. X-Git-Tag: v0.1~190 X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=commitdiff_plain;h=6b66008811639324be623a42037b60e02056772c Sanitize header files and add a timestamp mark in each source file. --- diff --git a/myocamlbuild.ml b/myocamlbuild.ml index 3410d1b..1bb2410 100644 --- a/myocamlbuild.ml +++ b/myocamlbuild.ml @@ -1,3 +1,22 @@ +(***********************************************************************) +(* *) +(* TAToo *) +(* *) +(* Kim Nguyen, LRI UMR8623 *) +(* Université Paris-Sud & CNRS *) +(* *) +(* Copyright 2010-2013 Université Paris-Sud and Centre National de la *) +(* Recherche Scientifique. All rights reserved. This file is *) +(* distributed under the terms of the GNU Lesser General Public *) +(* License, with the special exception on linking described in file *) +(* ../LICENSE. *) +(* *) +(***********************************************************************) + +(* + Time-stamp: +*) + open Ocamlbuild_plugin open Command open Myocamlbuild_config diff --git a/myocamlbuild_config.ml b/myocamlbuild_config.ml index 7ef1631..ef9d2e6 100644 --- a/myocamlbuild_config.ml +++ b/myocamlbuild_config.ml @@ -1,3 +1,22 @@ +(***********************************************************************) +(* *) +(* TAToo *) +(* *) +(* Kim Nguyen, LRI UMR8623 *) +(* Université Paris-Sud & CNRS *) +(* *) +(* Copyright 2010-2013 Université Paris-Sud and Centre National de la *) +(* Recherche Scientifique. All rights reserved. This file is *) +(* distributed under the terms of the GNU Lesser General Public *) +(* License, with the special exception on linking described in file *) +(* ../LICENSE. *) +(* *) +(***********************************************************************) + +(* + Time-stamp: +*) + let ocaml_inline = "1000";; let include_path = "include";; let src_path = "src";; diff --git a/src/ata.ml b/src/ata.ml index 681ce69..cad28e1 100644 --- a/src/ata.ml +++ b/src/ata.ml @@ -1,3 +1,22 @@ +(***********************************************************************) +(* *) +(* TAToo *) +(* *) +(* Kim Nguyen, LRI UMR8623 *) +(* Université Paris-Sud & CNRS *) +(* *) +(* Copyright 2010-2013 Université Paris-Sud and Centre National de la *) +(* Recherche Scientifique. All rights reserved. This file is *) +(* distributed under the terms of the GNU Lesser General Public *) +(* License, with the special exception on linking described in file *) +(* ../LICENSE. *) +(* *) +(***********************************************************************) + +(* + Time-stamp: +*) + open Format type t = { diff --git a/src/finiteCofinite.ml b/src/finiteCofinite.ml index d3d0f13..8d3c3ee 100644 --- a/src/finiteCofinite.ml +++ b/src/finiteCofinite.ml @@ -12,6 +12,11 @@ (* ../LICENSE. *) (* *) (***********************************************************************) + +(* + Time-stamp: +*) + INCLUDE "utils.ml" include Sigs.FINITECOFINITE diff --git a/src/finiteCofinite.mli b/src/finiteCofinite.mli index 9b036c4..44ec882 100644 --- a/src/finiteCofinite.mli +++ b/src/finiteCofinite.mli @@ -13,6 +13,10 @@ (* *) (***********************************************************************) +(* + Time-stamp: +*) + (** Implementation of hashconsed finite or cofinite sets. *) diff --git a/src/formula.ml b/src/formula.ml index 14fd76f..f4022f9 100644 --- a/src/formula.ml +++ b/src/formula.ml @@ -5,23 +5,30 @@ (* Kim Nguyen, LRI UMR8623 *) (* Université Paris-Sud & CNRS *) (* *) -(* Copyright 2010-2012 Université Paris-Sud and Centre National de la *) +(* Copyright 2010-2013 Université Paris-Sud and Centre National de la *) (* Recherche Scientifique. All rights reserved. This file is *) (* distributed under the terms of the GNU Lesser General Public *) (* License, with the special exception on linking described in file *) (* ../LICENSE. *) (* *) (***********************************************************************) + +(* + Time-stamp: +*) + INCLUDE "utils.ml" open Format + + type move = [ `Left | `Right | `Epsilon | `Up1 | `Up2 ] type 'formula expr = | False | True | Or of 'formula * 'formula | And of 'formula * 'formula - | Move of move * bool * State.t + | Atom of move * bool * State.t type 'hcons node = { pos : 'hcons expr; @@ -36,7 +43,7 @@ module rec Node : Hcons.S and Data : Hashtbl.HashedType with type t = Node.t node = struct type t = Node.t node - let equal x y = (*x.size == y.size &&*) + let equal x y = match x.pos, y.pos with | a,b when a == b -> true | Or(xf1, xf2), Or(yf1, yf2) diff --git a/src/formula.mli b/src/formula.mli index 04b3662..867d616 100644 --- a/src/formula.mli +++ b/src/formula.mli @@ -13,6 +13,10 @@ (* *) (***********************************************************************) +(* + Time-stamp: +*) + (** Implementation of hashconsed Boolean formulae *) type move = [ `Left | `Right | `Epsilon | `Up1 | `Up2 ] diff --git a/src/hcons.ml b/src/hcons.ml index a820e08..6a40b06 100644 --- a/src/hcons.ml +++ b/src/hcons.ml @@ -13,6 +13,10 @@ (* *) (***********************************************************************) +(* + Time-stamp: +*) + include Sigs.HCONS module type TableBuilder = diff --git a/src/hcons.mli b/src/hcons.mli index 6b11bce..c1e8c00 100644 --- a/src/hcons.mli +++ b/src/hcons.mli @@ -13,6 +13,10 @@ (* *) (***********************************************************************) +(* + Time-stamp: +*) + (** Implementation of generic hashconsing. *) include module type of Sigs.HCONS diff --git a/src/parser.mly b/src/parser.mly index 39b2187..4d100ef 100644 --- a/src/parser.mly +++ b/src/parser.mly @@ -1,4 +1,22 @@ %{ +(***********************************************************************) +(* *) +(* TAToo *) +(* *) +(* Kim Nguyen, LRI UMR8623 *) +(* Université Paris-Sud & CNRS *) +(* *) +(* Copyright 2010-2012 Université Paris-Sud and Centre National de la *) +(* Recherche Scientifique. All rights reserved. This file is *) +(* distributed under the terms of the GNU Lesser General Public *) +(* License, with the special exception on linking described in file *) +(* ../LICENSE. *) +(* *) +(***********************************************************************) + +(* + Time-stamp: +*) open XPath.Ast let f () = () diff --git a/src/pretty.ml b/src/pretty.ml index bd9d410..c54d0ed 100644 --- a/src/pretty.ml +++ b/src/pretty.ml @@ -13,6 +13,10 @@ (* *) (***********************************************************************) +(* + Time-stamp: +*) + open Format exception InvalidUtf8Codepoint of int diff --git a/src/pretty.mli b/src/pretty.mli index fb7e309..42ec6cb 100644 --- a/src/pretty.mli +++ b/src/pretty.mli @@ -13,6 +13,10 @@ (* *) (***********************************************************************) +(* + Time-stamp: +*) + exception InvalidUtf8Codepoint of int val subscript : int -> string diff --git a/src/ptset.ml b/src/ptset.ml index c4a1b33..ee0370a 100644 --- a/src/ptset.ml +++ b/src/ptset.ml @@ -14,6 +14,10 @@ (* *) (***********************************************************************) +(* + Time-stamp: +*) + (* Modified by Kim Nguyen *) (* The Patricia trees are themselves deeply hash-consed. The module provides a Make (and Weak) functor to build hash-consed patricia diff --git a/src/ptset.mli b/src/ptset.mli index 28e00d1..dc80b4a 100644 --- a/src/ptset.mli +++ b/src/ptset.mli @@ -13,6 +13,9 @@ (* *) (***********************************************************************) +(* + Time-stamp: +*) include module type of Sigs.PTSET diff --git a/src/qName.ml b/src/qName.ml index 5d41943..ca4a5a3 100644 --- a/src/qName.ml +++ b/src/qName.ml @@ -13,6 +13,10 @@ (* *) (***********************************************************************) +(* + Time-stamp: +*) + include Hcons.Make (struct include String let hash s = Hashtbl.hash s diff --git a/src/qName.mli b/src/qName.mli index fa448bc..081c24d 100644 --- a/src/qName.mli +++ b/src/qName.mli @@ -13,6 +13,10 @@ (* *) (***********************************************************************) +(* + Time-stamp: +*) + (** Implementation of qualified names as hashconsed strings *) include Sigs.HCONS.S with type data = string diff --git a/src/qNameSet.ml b/src/qNameSet.ml index 87c750e..e1fa8a1 100644 --- a/src/qNameSet.ml +++ b/src/qNameSet.ml @@ -13,6 +13,10 @@ (* *) (***********************************************************************) +(* + Time-stamp: +*) + include FiniteCofinite.Make(Ptset.Make(QName)) let print_finite fmt e conv = diff --git a/src/qNameSet.mli b/src/qNameSet.mli index 10c3be3..ae182b6 100644 --- a/src/qNameSet.mli +++ b/src/qNameSet.mli @@ -13,6 +13,9 @@ (* *) (***********************************************************************) +(* + Time-stamp: +*) (** Implementation of sets of Qualified Names that can be finite or cofinite *) diff --git a/src/sigs.ml b/src/sigs.ml index 9fc3e86..a3cf635 100644 --- a/src/sigs.ml +++ b/src/sigs.ml @@ -13,6 +13,10 @@ (* *) (***********************************************************************) +(* + Time-stamp: +*) + (** This module contains all the signatures of the project, to avoid code duplication. Each toplevel module (HCONS, PTSET, ...) corresponds to an existing module in the project. The AUX modules @@ -199,3 +203,31 @@ struct val inj_negative : set -> t end end + +module FORMULA = +struct + module type ATOM = + sig + type t + type ctx + val eval : ctx -> t -> bool + val neg : t -> t + include HCONS.S with type t := t + include AUX.Printable with type t := t + end + module type S = + sig + module Atom : ATOM + include HCONS.S + include AUX.Printable with type t := t + val of_bool : bool -> t + val true_ : t + val false_ : t + val or_ : t -> t -> t + val and_ : t -> t -> t + val not_ : t -> t + val diff_ : t -> t -> t + val eval : Atom.ctx -> t -> bool + end + +end diff --git a/src/state.ml b/src/state.ml index 4fbfc1c..bd1c72c 100644 --- a/src/state.ml +++ b/src/state.ml @@ -13,6 +13,10 @@ (* *) (***********************************************************************) +(* + Time-stamp: +*) + open Format type t = int diff --git a/src/state.mli b/src/state.mli index 8c126be..f86ddcd 100644 --- a/src/state.mli +++ b/src/state.mli @@ -13,6 +13,10 @@ (* *) (***********************************************************************) +(* + Time-stamp: +*) + (** Implementation of states *) include Sigs.AUX.Type with type t = int diff --git a/src/stateSet.ml b/src/stateSet.ml index 47ad460..5871c7e 100644 --- a/src/stateSet.ml +++ b/src/stateSet.ml @@ -13,6 +13,10 @@ (* *) (***********************************************************************) +(* + Time-stamp: +*) + open Format include Ptset.Make (Hcons.PosInt) diff --git a/src/stateSet.mli b/src/stateSet.mli index 1a628a4..1de4dee 100644 --- a/src/stateSet.mli +++ b/src/stateSet.mli @@ -13,6 +13,10 @@ (* *) (***********************************************************************) +(* + Time-stamp: +*) + (** Implementation of sets of states *) include Ptset.S with type elt = int diff --git a/src/test.ml b/src/test.ml index daabd09..0aaea6b 100644 --- a/src/test.ml +++ b/src/test.ml @@ -13,6 +13,9 @@ (* *) (***********************************************************************) +(* + Time-stamp: +*) (** use: xml_file "XPath querie" or : xml_file -f XPath_querie_file diff --git a/src/tree.ml b/src/tree.ml index 1cfc77a..f502c7e 100644 --- a/src/tree.ml +++ b/src/tree.ml @@ -13,6 +13,10 @@ (* *) (***********************************************************************) +(* + Time-stamp: +*) + type node = { tag : QName.t; preorder : int; diff --git a/src/tree.mli b/src/tree.mli index 1d5d77b..72cd077 100644 --- a/src/tree.mli +++ b/src/tree.mli @@ -13,6 +13,10 @@ (* *) (***********************************************************************) +(* + Time-stamp: +*) + (** Implementation of documents as binary trees *) type node diff --git a/src/uid.ml b/src/uid.ml index 46b8658..0cb9688 100644 --- a/src/uid.ml +++ b/src/uid.ml @@ -13,6 +13,10 @@ (* *) (***********************************************************************) +(* + Time-stamp: +*) + type t = int exception Overflow diff --git a/src/uid.mli b/src/uid.mli index 3c05d19..286cacc 100644 --- a/src/uid.mli +++ b/src/uid.mli @@ -13,6 +13,10 @@ (* *) (***********************************************************************) +(* + Time-stamp: +*) + (** This modules implements unique identifiers represented by integers *) type t = private int diff --git a/src/ulexer.ml b/src/ulexer.ml index a27d55d..4951023 100644 --- a/src/ulexer.ml +++ b/src/ulexer.ml @@ -1,9 +1,22 @@ -(******************************************************************************) -(* SXSI : XPath evaluator *) -(* Kim Nguyen (Kim.Nguyen@nicta.com.au) *) -(* Copyright NICTA 2008 *) -(* Distributed under the terms of the LGPL (see LICENCE) *) -(******************************************************************************) +(***********************************************************************) +(* *) +(* TAToo *) +(* *) +(* Kim Nguyen, LRI UMR8623 *) +(* Université Paris-Sud & CNRS *) +(* *) +(* Copyright 2010-2013 Université Paris-Sud and Centre National de la *) +(* Recherche Scientifique. All rights reserved. This file is *) +(* distributed under the terms of the GNU Lesser General Public *) +(* License, with the special exception on linking described in file *) +(* ../LICENSE. *) +(* *) +(***********************************************************************) + +(* + Time-stamp: +*) + open Parser module L = Ulexing diff --git a/src/uparser.ml b/src/uparser.ml index 74fef9d..c5aeb1a 100644 --- a/src/uparser.ml +++ b/src/uparser.ml @@ -1,3 +1,21 @@ +(***********************************************************************) +(* *) +(* TAToo *) +(* *) +(* Kim Nguyen, LRI UMR8623 *) +(* Université Paris-Sud & CNRS *) +(* *) +(* Copyright 2010-2013 Université Paris-Sud and Centre National de la *) +(* Recherche Scientifique. All rights reserved. This file is *) +(* distributed under the terms of the GNU Lesser General Public *) +(* License, with the special exception on linking described in file *) +(* ../LICENSE. *) +(* *) +(***********************************************************************) + +(* + Time-stamp: +*) let xpath (f : Ulexing.lexbuf -> Parser.token) (l: Ulexing.lexbuf) = Parser.xpath (fun _ -> f l) (Lexing.from_string "!!dummy!!") diff --git a/src/utils.ml b/src/utils.ml index 1224f2a..960ec46 100644 --- a/src/utils.ml +++ b/src/utils.ml @@ -13,6 +13,10 @@ (* *) (***********************************************************************) +(* + Time-stamp: +*) + (** Various generic signatures and generic module and functor definitions *) INCLUDE "utils.ml" diff --git a/src/xPath.ml b/src/xPath.ml index aab6422..a825d84 100644 --- a/src/xPath.ml +++ b/src/xPath.ml @@ -12,6 +12,11 @@ (* ../LICENSE. *) (* *) (***********************************************************************) + +(* + Time-stamp: +*) + module Ast = struct diff --git a/src/xPath.mli b/src/xPath.mli index 1e4d26d..76a6ab3 100644 --- a/src/xPath.mli +++ b/src/xPath.mli @@ -5,13 +5,20 @@ (* Kim Nguyen, LRI UMR8623 *) (* Université Paris-Sud & CNRS *) (* *) -(* Copyright 2010-2012 Université Paris-Sud and Centre National de la *) +(* Copyright 2010-2013 Université Paris-Sud and Centre National de la *) (* Recherche Scientifique. All rights reserved. This file is *) (* distributed under the terms of the GNU Lesser General Public *) (* License, with the special exception on linking described in file *) (* ../LICENSE. *) (* *) (***********************************************************************) + +(* + Time-stamp: +*) + + + module Ast : sig type path = single_path list