diff --git a/CHANGES b/CHANGES new file mode 100644 --- /dev/null +++ b/CHANGES @@ -0,0 +1,60 @@ +# Changelog for HROOT + +## 0.10.0.1 +- Use hackage-version of fficxx (#18) +- Generate docs in CI (#17) +- Update flake.nix with recent fficxx and ormolu format (#16) +- Update fficxx to support GHC 9.4 (#15) +- Add TMutex and test multithreading with GUI (#12) +- HROOT now uses common stdcxx (#11) +- idealized gas simulation (#10) +- Add TMarker and Range. Test 2D graphics using gas example (#9) +- HROOT generation and packing via nix (#8) +- Revive umbrella package generation (#7) +- Static files (Config.hs, Setup.lhs) and custom-setup dependency (#6) +- Modernize HROOT with fficxx 0.5.1 (#5) + +## 0.9.0.1 + +## 0.9 +- HROOT-tree +- HROOT only support ROOT > 6 + +## 0.8 +- separate packages into HROOT-core, HROOT-hist, HROOT-io, HROOT-math, HROOT-graf and HROOT is now an umbrella package + +## 0.7 +- separate all class interfaces and implementation in different modules +- overhaul Existential + +## 0.7.1 +- support for static methods +- add TROOT + +## 0.6.9 +- implement almost all class methods of TLine, TAttLine, TAttMarker, TAttText and TAttPad + +## 0.6.8 +- implement almost all class methods of TH2, TH3, TFormula, TF1 and TGraph + +## 0.6.7 +- implement almost all TH1 class methods + +## 0.6.6 +- do not need OverlappingInstances, IncoherentInstances, UndecidableInstances + +## 0.6.4 +- add many TH2 class methods + +## 0.6.3 +- Implement Existential Types + +## 0.6 +- implement Deletable. delete method for every object +- refactor HROOT generated file names (Interface.hs, Implementation.hs, FFI.hs) + +## 0.5.1 +- support for delete + +## 0.5.0 +- initial preview release diff --git a/Config.hs b/Config.hs deleted file mode 100644 --- a/Config.hs +++ /dev/null @@ -1,85 +0,0 @@ -{-# LANGUAGE ScopedTypeVariables #-} - -module Config where - -import Distribution.Simple -import Distribution.Simple.Setup -import Distribution.PackageDescription -import Distribution.Simple.LocalBuildInfo - -import System.Exit -import System.Process - -config :: LocalBuildInfo -> IO (Maybe HookedBuildInfo) -config bInfo = do - (excode, out, err) <- readProcessWithExitCode "root-config" ["--glibs"] "" - liboptset' <- case excode of - ExitSuccess -> do - return . Just . mkLibraryOptionSet . words $ out - _ -> do - putStrLn $ "root-config failure but I am installing HROOT without ROOT. It will not work. This is only for documentation." - return Nothing - (excode2,out2,err2) <- readProcessWithExitCode "root-config" ["--incdir"] "" - incdir' <- case excode2 of - ExitSuccess -> do - return . Just . head . words $ out2 - _ -> do - putStrLn $ "root-config failure but I am installing HROOT without ROOT. It will not work. This is only for documentation." - return Nothing - let Just lib = library . localPkgDescr $ bInfo - buildinfo = libBuildInfo lib - let (r :: Maybe HookedBuildInfo) = case liboptset' of - Nothing -> Nothing - Just liboptset -> - case incdir' of - Nothing -> Nothing - Just incdir -> - let hbi = emptyBuildInfo { extraLibs = extraLibs buildinfo - ++ libs liboptset - , extraLibDirs = libdirs liboptset - , includeDirs = incdir : includeDirs buildinfo - } - in Just (Just hbi, []) - return r - - -data LibraryOptionSet = LibraryOptionSet { - libs :: [String], - libdirs :: [String], - libopts :: [String] -} deriving Show - -data LibraryOption = Lib String - | Dir String - | Opt String - deriving Show - -mkLibraryOptionSet :: [String] -> LibraryOptionSet -mkLibraryOptionSet strs = let opts = libraryOptions strs - in foldr f (LibraryOptionSet [] [] []) opts - where f x (LibraryOptionSet l d o) = case x of - Lib st -> LibraryOptionSet (st:l) d o - Dir st -> LibraryOptionSet l (st:d) o - Opt st -> LibraryOptionSet l d (st:o) - -libraryOptions :: [String] -> [LibraryOption] -- LibraryOptionSet -libraryOptions = map f - where f x = let r = parseLibraryOptionClassifier x - in case r of - Left msg -> error (show msg) - Right result -> result - - -parseLibraryOptionClassifier :: String -> Either String LibraryOption -parseLibraryOptionClassifier [] = Left "empty option" -parseLibraryOptionClassifier str@(x:xs) = - case x of - '-' -> if null xs - then Left "parse error" - else let (y:ys) = xs - in case y of - 'L' -> Right (Dir ys) - 'l' -> Right (Lib ys) - _ -> Right (Opt str) - _ -> Right (Opt str) - diff --git a/HROOT-tree.cabal b/HROOT-tree.cabal --- a/HROOT-tree.cabal +++ b/HROOT-tree.cabal @@ -1,37 +1,45 @@ -Name: HROOT-tree -Version: 0.9.0.1 -Synopsis: Haskell binding to ROOT Tree modules -Description: HROOT is a haskell Foreign Function Interface (FFI) binding to ROOT. ROOT(http://root.cern.ch) is an object-oriented program and library developed by CERN for physics data analysis. -Homepage: http://ianwookim.org/HROOT -license: LGPL-2.1 -license-file: LICENSE -Author: Ian-Woo Kim -Maintainer: Ian-Woo Kim -Category: Graphics, Statistics, Math, Numerical -Tested-with: GHC >= 7.6 -Build-Type: Custom -cabal-version: >=1.10 +Cabal-version: 3.0 +Name: HROOT-tree +Version: 0.10.0.1 +Synopsis: Haskell binding to ROOT Tree modules +Description: + HROOT is a haskell Foreign Function Interface (FFI) binding to ROOT. + ROOT(http://root.cern.ch) is an object-oriented program and library + developed by CERN for physics data analysis. +Homepage: https://wavewave.github.io/HROOT +license: LGPL-2.1-or-later +license-file: LICENSE +Author: Ian-Woo Kim +Maintainer: Ian-Woo Kim +Category: Graphics, Statistics, Math, Numerical +Tested-with: GHC == 9.0.2 || == 9.2.4 || == 9.4.2 +Build-Type: Custom Extra-source-files: - Config.hs - csrc/HROOTTreeTBranch.h - csrc/HROOTTreeTChain.h - csrc/HROOTTreeTTree.h - csrc/HROOTTreeTBranch.cpp - csrc/HROOTTreeTChain.cpp - csrc/HROOTTreeTTree.cpp - - + CHANGES + csrc/HROOTTreeTBranch.h + csrc/HROOTTreeTChain.h + csrc/HROOTTreeTTree.h + csrc/HROOTTreeTBranch.cpp + csrc/HROOTTreeTChain.cpp + csrc/HROOTTreeTTree.cpp +custom-setup + setup-depends: Cabal < 4, base > 4 && < 5, process +Source-repository head + type: git + location: https://github.com/wavewave/HROOT Library default-language: Haskell2010 hs-source-dirs: src ghc-options: -Wall -funbox-strict-fields -fno-warn-unused-do-bind -fno-warn-orphans -fno-warn-unused-imports - ghc-prof-options: -caf-all -auto-all - cc-options: -std=c++14 - Build-Depends: base>4 && < 5, fficxx >= 0.3, fficxx-runtime >= 0.3, template-haskell,HROOT-core + cxx-options: -std=c++17 + Build-Depends: base > 4 && < 5, fficxx >= 0.7, fficxx-runtime >= 0.7, template-haskell, stdcxx, HROOT-core == 0.10.0.1 Exposed-Modules: HROOT.Tree + HROOT.Tree.Ordinary + HROOT.Tree.Template + HROOT.Tree.TH HROOT.Tree.TBranch HROOT.Tree.TChain HROOT.Tree.TTree @@ -50,21 +58,18 @@ HROOT.Tree.TBranch.Implementation HROOT.Tree.TChain.Implementation HROOT.Tree.TTree.Implementation - Other-Modules: - extra-lib-dirs: - extra-libraries: stdc++ + extra-libraries: Include-dirs: csrc + pkgconfig-depends: Install-includes: HROOT-treeType.h HROOTTreeTBranch.h HROOTTreeTChain.h HROOTTreeTTree.h - - C-sources: + Cxx-sources: csrc/HROOTTreeTBranch.cpp csrc/HROOTTreeTChain.cpp csrc/HROOTTreeTTree.cpp - diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,502 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! diff --git a/Setup.hs b/Setup.hs new file mode 100644 --- /dev/null +++ b/Setup.hs @@ -0,0 +1,27 @@ +import Distribution.Simple +import Distribution.Simple.Setup +import Distribution.PackageDescription +import Distribution.Simple.LocalBuildInfo +import Config + +myconfigHook = simpleUserHooks { confHook = hookfunction } + +hookfunction x y = do + binfo <- confHook simpleUserHooks x y + r_pbi <- config binfo + let pkg_descr = localPkgDescr binfo + + let newbinfo = case r_pbi of + Just pbi -> binfo { localPkgDescr = updatePackageDescription pbi pkg_descr } + Nothing -> do + let r_lib = library pkg_descr + case r_lib of + Just lib -> + let binfo2 = libBuildInfo lib + newlib = lib { libBuildInfo = binfo2 { cSources = [] }} + in binfo { localPkgDescr = pkg_descr { library = Just newlib }} + Nothing -> error "some library setting is wrong." +-- putStrLn (show (localPkgDescr newbinfo)) + return newbinfo + +main = defaultMainWithHooks myconfigHook diff --git a/Setup.lhs b/Setup.lhs deleted file mode 100644 --- a/Setup.lhs +++ /dev/null @@ -1,33 +0,0 @@ -#! /usr/bin/env runhaskell - -> import Distribution.Simple -> import Distribution.Simple.Setup -> import Distribution.PackageDescription -> import Distribution.Simple.LocalBuildInfo -> -> import Config -> -> myconfigHook = simpleUserHooks { confHook = hookfunction } -> -> hookfunction x y = do -> binfo <- confHook simpleUserHooks x y -> r_pbi <- config binfo -> let pkg_descr = localPkgDescr binfo -> -> let newbinfo = case r_pbi of -> Just pbi -> binfo { localPkgDescr = updatePackageDescription pbi pkg_descr } -> Nothing -> do -> let r_lib = library pkg_descr -> case r_lib of -> Just lib -> -> let binfo2 = libBuildInfo lib -> newlib = lib { libBuildInfo = binfo2 { cSources = [] }} -> in binfo { localPkgDescr = pkg_descr { library = Just newlib }} -> Nothing -> error "some library setting is wrong." -> -- putStrLn (show (localPkgDescr newbinfo)) -> return newbinfo -> -> -> main = defaultMainWithHooks myconfigHook -> - diff --git a/csrc/HROOT-treeType.h b/csrc/HROOT-treeType.h --- a/csrc/HROOT-treeType.h +++ b/csrc/HROOT-treeType.h @@ -1,30 +1,16 @@ + #ifdef __cplusplus -extern "C" { +extern "C" { #endif -#ifndef __HROOT_TREE__ -#define __HROOT_TREE__ - -// Opaque type definition for TBranch -typedef struct TBranch_tag TBranch_t; -typedef TBranch_t * TBranch_p; -typedef TBranch_t const* const_TBranch_p; - - -// Opaque type definition for TChain -typedef struct TChain_tag TChain_t; -typedef TChain_t * TChain_p; -typedef TChain_t const* const_TChain_p; - - -// Opaque type definition for TTree -typedef struct TTree_tag TTree_t; -typedef TTree_t * TTree_p; -typedef TTree_t const* const_TTree_p; - - -#endif // __HROOT_TREE__ +#pragma once +// Opaque type definition for $classname +typedef struct TBranch_tag TBranch_t;typedef TBranch_t * TBranch_p;typedef TBranch_t const* const_TBranch_p; +// Opaque type definition for $classname +typedef struct TChain_tag TChain_t;typedef TChain_t * TChain_p;typedef TChain_t const* const_TChain_p; +// Opaque type definition for $classname +typedef struct TTree_tag TTree_t;typedef TTree_t * TTree_p;typedef TTree_t const* const_TTree_p; #ifdef __cplusplus } #endif diff --git a/csrc/HROOTTreeTBranch.cpp b/csrc/HROOTTreeTBranch.cpp --- a/csrc/HROOTTreeTBranch.cpp +++ b/csrc/HROOTTreeTBranch.cpp @@ -1,25 +1,28 @@ -#include + +#include "MacroPatternMatch.h" + #include "HROOTCoreTNamed.h" + #include "HROOTCoreTAttFill.h" + #include "TBranch.h" -#include "HROOTTreeTBranch.h" +#include "HROOTTreeTBranch.h" +using namespace ROOT; -#define CHECKPROTECT(x,y) IS_PAREN(IS_ ## x ## _ ## y ## _PROTECTED) +#define CHECKPROTECT(x,y) FXIS_PAREN(IS_ ## x ## _ ## y ## _PROTECTED) #define TYPECASTMETHOD(cname,mname,oname) \ - IIF( CHECKPROTECT(cname,mname) ) ( \ - (to_nonconst), \ - (to_nonconst) ) - + FXIIF( CHECKPROTECT(cname,mname) ) ( \ + (from_nonconst_to_nonconst), \ + (from_nonconst_to_nonconst) ) TNAMED_DEF_VIRT(TBranch) TATTFILL_DEF_VIRT(TBranch) TOBJECT_DEF_VIRT(TBranch) DELETABLE_DEF_VIRT(TBranch) - TBRANCH_DEF_VIRT(TBranch) - TBRANCH_DEF_NONVIRT(TBranch) +TBRANCH_DEF_ACCESSOR(TBranch) diff --git a/csrc/HROOTTreeTBranch.h b/csrc/HROOTTreeTBranch.h --- a/csrc/HROOTTreeTBranch.h +++ b/csrc/HROOTTreeTBranch.h @@ -1,46 +1,55 @@ + #ifdef __cplusplus -extern "C" { +extern "C" { #endif -#ifndef __HROOT_TREE__TBranch__ -#define __HROOT_TREE__TBranch__ +#pragma once + #include "HROOT-treeType.h" + #include "HROOTCoreTNamed.h" + #include "HROOTCoreTAttFill.h" + #include "HROOTCoreTObject.h" -#include "HROOTCoreDeletable.h" + +#include "STDDeletable.h" + #include "HROOT-coreType.h" -#undef TBRANCH_DECL_VIRT + #define TBRANCH_DECL_VIRT(Type) \ -#undef TBRANCH_DECL_NONVIRT + #define TBRANCH_DECL_NONVIRT(Type) \ -#undef TBRANCH_DEF_VIRT -#define TBRANCH_DEF_VIRT(Type)\ +#define TBRANCH_DECL_ACCESSOR(Type) \ -#undef TBRANCH_DEF_NONVIRT -#define TBRANCH_DEF_NONVIRT(Type)\ -TNAMED_DECL_VIRT(TBranch); -TATTFILL_DECL_VIRT(TBranch); -TOBJECT_DECL_VIRT(TBranch); -DELETABLE_DECL_VIRT(TBranch); +#define TBRANCH_DEF_VIRT(Type) \ -TBRANCH_DECL_VIRT(TBranch); +#define TBRANCH_DEF_NONVIRT(Type) \ -TBRANCH_DECL_NONVIRT(TBranch); -#endif // __HROOT_TREE__TBranch__ +#define TBRANCH_DEF_ACCESSOR(Type) \ + + + +TNAMED_DECL_VIRT(TBranch) +TATTFILL_DECL_VIRT(TBranch) +TOBJECT_DECL_VIRT(TBranch) +DELETABLE_DECL_VIRT(TBranch) +TBRANCH_DECL_VIRT(TBranch) +TBRANCH_DECL_NONVIRT(TBranch) +TBRANCH_DECL_ACCESSOR(TBranch) #ifdef __cplusplus } diff --git a/csrc/HROOTTreeTChain.cpp b/csrc/HROOTTreeTChain.cpp --- a/csrc/HROOTTreeTChain.cpp +++ b/csrc/HROOTTreeTChain.cpp @@ -1,17 +1,20 @@ -#include + +#include "MacroPatternMatch.h" + #include "HROOTTreeTTree.h" + #include "TChain.h" -#include "HROOTTreeTChain.h" +#include "HROOTTreeTChain.h" +using namespace ROOT; -#define CHECKPROTECT(x,y) IS_PAREN(IS_ ## x ## _ ## y ## _PROTECTED) +#define CHECKPROTECT(x,y) FXIS_PAREN(IS_ ## x ## _ ## y ## _PROTECTED) #define TYPECASTMETHOD(cname,mname,oname) \ - IIF( CHECKPROTECT(cname,mname) ) ( \ - (to_nonconst), \ - (to_nonconst) ) - + FXIIF( CHECKPROTECT(cname,mname) ) ( \ + (from_nonconst_to_nonconst), \ + (from_nonconst_to_nonconst) ) TTREE_DEF_VIRT(TChain) TNAMED_DEF_VIRT(TChain) @@ -20,8 +23,7 @@ TATTMARKER_DEF_VIRT(TChain) TOBJECT_DEF_VIRT(TChain) DELETABLE_DEF_VIRT(TChain) - TCHAIN_DEF_VIRT(TChain) - TCHAIN_DEF_NONVIRT(TChain) +TCHAIN_DEF_ACCESSOR(TChain) diff --git a/csrc/HROOTTreeTChain.h b/csrc/HROOTTreeTChain.h --- a/csrc/HROOTTreeTChain.h +++ b/csrc/HROOTTreeTChain.h @@ -1,63 +1,71 @@ + #ifdef __cplusplus -extern "C" { +extern "C" { #endif -#ifndef __HROOT_TREE__TChain__ -#define __HROOT_TREE__TChain__ +#pragma once + #include "HROOT-treeType.h" + #include "HROOTTreeTTree.h" + #include "HROOTCoreTNamed.h" + #include "HROOTCoreTAttLine.h" + #include "HROOTCoreTAttFill.h" + #include "HROOTCoreTAttMarker.h" + #include "HROOTCoreTObject.h" -#include "HROOTCoreDeletable.h" -#undef TCHAIN_DECL_VIRT +#include "STDDeletable.h" + + #define TCHAIN_DECL_VIRT(Type) \ -int Type ## _addChain ( Type ## _p p, TChain_p chain ); \ -int Type ## _addChain1 ( Type ## _p p, const char* name, signed long nentries ) +int Type##_addChain ( Type##_p p, TChain_p chain );\ +int Type##_addChain1 ( Type##_p p, const char* name, long nentries ); -#undef TCHAIN_DECL_NONVIRT + #define TCHAIN_DECL_NONVIRT(Type) \ -Type ## _p Type ## _newTChain ( const char* name, const char* title ) +Type##_p Type##_newTChain ( const char* name, const char* title ); -#undef TCHAIN_DEF_VIRT -#define TCHAIN_DEF_VIRT(Type)\ -int Type ## _addChain ( Type ## _p p, TChain_p chain )\ -{\ -return TYPECASTMETHOD(Type,addChain,TChain)(p)->Add(to_nonconst(chain));\ + +#define TCHAIN_DECL_ACCESSOR(Type) \ + + + +#define TCHAIN_DEF_VIRT(Type) \ +int Type##_addChain ( Type##_p p, TChain_p chain ) {\ +return ((TYPECASTMETHOD(Type, addChain, TChain))(p))->Add(from_nonconst_to_nonconst(chain));\ }\ -int Type ## _addChain1 ( Type ## _p p, const char* name, signed long nentries )\ -{\ -return TYPECASTMETHOD(Type,addChain1,TChain)(p)->Add(name, nentries);\ +\ +int Type##_addChain1 ( Type##_p p, const char* name, long nentries ) {\ +return ((TYPECASTMETHOD(Type, addChain1, TChain))(p))->Add(name, nentries);\ } -#undef TCHAIN_DEF_NONVIRT -#define TCHAIN_DEF_NONVIRT(Type)\ -Type ## _p Type ## _newTChain ( const char* name, const char* title )\ -{\ -Type * newp = new Type (name, title); \ -return to_nonconst(newp);\ + +#define TCHAIN_DEF_NONVIRT(Type) \ +Type##_p Type##_newTChain ( const char* name, const char* title ) {\ +Type* newp=new Type(name, title);return from_nonconst_to_nonconst(newp);\ } -TTREE_DECL_VIRT(TChain); -TNAMED_DECL_VIRT(TChain); -TATTLINE_DECL_VIRT(TChain); -TATTFILL_DECL_VIRT(TChain); -TATTMARKER_DECL_VIRT(TChain); -TOBJECT_DECL_VIRT(TChain); -DELETABLE_DECL_VIRT(TChain); +#define TCHAIN_DEF_ACCESSOR(Type) \ -TCHAIN_DECL_VIRT(TChain); -TCHAIN_DECL_NONVIRT(TChain); - - -#endif // __HROOT_TREE__TChain__ +TTREE_DECL_VIRT(TChain) +TNAMED_DECL_VIRT(TChain) +TATTLINE_DECL_VIRT(TChain) +TATTFILL_DECL_VIRT(TChain) +TATTMARKER_DECL_VIRT(TChain) +TOBJECT_DECL_VIRT(TChain) +DELETABLE_DECL_VIRT(TChain) +TCHAIN_DECL_VIRT(TChain) +TCHAIN_DECL_NONVIRT(TChain) +TCHAIN_DECL_ACCESSOR(TChain) #ifdef __cplusplus } diff --git a/csrc/HROOTTreeTTree.cpp b/csrc/HROOTTreeTTree.cpp --- a/csrc/HROOTTreeTTree.cpp +++ b/csrc/HROOTTreeTTree.cpp @@ -1,21 +1,28 @@ -#include + +#include "MacroPatternMatch.h" + #include "HROOTTreeTBranch.h" + #include "HROOTCoreTNamed.h" + #include "HROOTCoreTAttLine.h" + #include "HROOTCoreTAttFill.h" + #include "HROOTCoreTAttMarker.h" + #include "TTree.h" -#include "HROOTTreeTTree.h" +#include "HROOTTreeTTree.h" +using namespace ROOT; -#define CHECKPROTECT(x,y) IS_PAREN(IS_ ## x ## _ ## y ## _PROTECTED) +#define CHECKPROTECT(x,y) FXIS_PAREN(IS_ ## x ## _ ## y ## _PROTECTED) #define TYPECASTMETHOD(cname,mname,oname) \ - IIF( CHECKPROTECT(cname,mname) ) ( \ - (to_nonconst), \ - (to_nonconst) ) - + FXIIF( CHECKPROTECT(cname,mname) ) ( \ + (from_nonconst_to_nonconst), \ + (from_nonconst_to_nonconst) ) TNAMED_DEF_VIRT(TTree) TATTLINE_DEF_VIRT(TTree) @@ -23,8 +30,7 @@ TATTMARKER_DEF_VIRT(TTree) TOBJECT_DEF_VIRT(TTree) DELETABLE_DEF_VIRT(TTree) - TTREE_DEF_VIRT(TTree) - TTREE_DEF_NONVIRT(TTree) +TTREE_DEF_ACCESSOR(TTree) diff --git a/csrc/HROOTTreeTTree.h b/csrc/HROOTTreeTTree.h --- a/csrc/HROOTTreeTTree.h +++ b/csrc/HROOTTreeTTree.h @@ -1,67 +1,75 @@ + #ifdef __cplusplus -extern "C" { +extern "C" { #endif -#ifndef __HROOT_TREE__TTree__ -#define __HROOT_TREE__TTree__ +#pragma once + #include "HROOT-treeType.h" + #include "HROOTCoreTNamed.h" + #include "HROOTCoreTAttLine.h" + #include "HROOTCoreTAttFill.h" + #include "HROOTCoreTAttMarker.h" + #include "HROOTCoreTObject.h" -#include "HROOTCoreDeletable.h" + +#include "STDDeletable.h" + #include "HROOT-coreType.h" -#undef TTREE_DECL_VIRT + #define TTREE_DECL_VIRT(Type) \ -int Type ## _Branch ( Type ## _p p, const char* folder, int bufsize, int splitlevel ); \ -TBranch_p Type ## _branch1 ( Type ## _p p, const char* name, void* address, const char* leaflist, int bufsize ); \ -int Type ## _fillTree ( Type ## _p p ) +int Type##_Branch ( Type##_p p, const char* folder, int bufsize, int splitlevel );\ +TBranch_p Type##_branch1 ( Type##_p p, const char* name, void* address, const char* leaflist, int bufsize );\ +int Type##_fillTree ( Type##_p p ); -#undef TTREE_DECL_NONVIRT + #define TTREE_DECL_NONVIRT(Type) \ -Type ## _p Type ## _newTTree ( const char* name, const char* title, int splitlevel ) +Type##_p Type##_newTTree ( const char* name, const char* title, int splitlevel ); -#undef TTREE_DEF_VIRT -#define TTREE_DEF_VIRT(Type)\ -int Type ## _Branch ( Type ## _p p, const char* folder, int bufsize, int splitlevel )\ -{\ -return TYPECASTMETHOD(Type,Branch,TTree)(p)->Branch(folder, bufsize, splitlevel);\ + +#define TTREE_DECL_ACCESSOR(Type) \ + + + +#define TTREE_DEF_VIRT(Type) \ +int Type##_Branch ( Type##_p p, const char* folder, int bufsize, int splitlevel ) {\ +return ((TYPECASTMETHOD(Type, Branch, TTree))(p))->Branch(folder, bufsize, splitlevel);\ }\ -TBranch_p Type ## _branch1 ( Type ## _p p, const char* name, void* address, const char* leaflist, int bufsize )\ -{\ -return to_nonconst((TBranch*)TYPECASTMETHOD(Type,branch1,TTree)(p)->Branch(name, address, leaflist, bufsize));\ +\ +TBranch_p Type##_branch1 ( Type##_p p, const char* name, void* address, const char* leaflist, int bufsize ) {\ +return from_nonconst_to_nonconst((TBranch*)((TYPECASTMETHOD(Type, branch1, TTree))(p))->Branch(name, address, leaflist, bufsize));\ }\ -int Type ## _fillTree ( Type ## _p p )\ -{\ -return TYPECASTMETHOD(Type,fillTree,TTree)(p)->Fill();\ +\ +int Type##_fillTree ( Type##_p p ) {\ +return ((TYPECASTMETHOD(Type, fillTree, TTree))(p))->Fill();\ } -#undef TTREE_DEF_NONVIRT -#define TTREE_DEF_NONVIRT(Type)\ -Type ## _p Type ## _newTTree ( const char* name, const char* title, int splitlevel )\ -{\ -Type * newp = new Type (name, title, splitlevel); \ -return to_nonconst(newp);\ + +#define TTREE_DEF_NONVIRT(Type) \ +Type##_p Type##_newTTree ( const char* name, const char* title, int splitlevel ) {\ +Type* newp=new Type(name, title, splitlevel);return from_nonconst_to_nonconst(newp);\ } -TNAMED_DECL_VIRT(TTree); -TATTLINE_DECL_VIRT(TTree); -TATTFILL_DECL_VIRT(TTree); -TATTMARKER_DECL_VIRT(TTree); -TOBJECT_DECL_VIRT(TTree); -DELETABLE_DECL_VIRT(TTree); +#define TTREE_DEF_ACCESSOR(Type) \ -TTREE_DECL_VIRT(TTree); -TTREE_DECL_NONVIRT(TTree); - - -#endif // __HROOT_TREE__TTree__ +TNAMED_DECL_VIRT(TTree) +TATTLINE_DECL_VIRT(TTree) +TATTFILL_DECL_VIRT(TTree) +TATTMARKER_DECL_VIRT(TTree) +TOBJECT_DECL_VIRT(TTree) +DELETABLE_DECL_VIRT(TTree) +TTREE_DECL_VIRT(TTree) +TTREE_DECL_NONVIRT(TTree) +TTREE_DECL_ACCESSOR(TTree) #ifdef __cplusplus } diff --git a/src/HROOT/Tree.hs b/src/HROOT/Tree.hs --- a/src/HROOT/Tree.hs +++ b/src/HROOT/Tree.hs @@ -1,13 +1,13 @@ -module HROOT.Tree ( - module HROOT.Tree.TBranch -, module HROOT.Tree.TChain -, module HROOT.Tree.TTree -) where - +{-# LANGUAGE FlexibleContexts, FlexibleInstances, + ForeignFunctionInterface, InterruptibleFFI #-} +module HROOT.Tree + (module HROOT.Tree.TBranch, module HROOT.Tree.TChain, + module HROOT.Tree.TTree, module HROOT.Tree.Ordinary, + module HROOT.Tree.Template, module HROOT.Tree.TH) + where import HROOT.Tree.TBranch import HROOT.Tree.TChain import HROOT.Tree.TTree - - - - +import HROOT.Tree.Template +import HROOT.Tree.TH +import HROOT.Tree.Ordinary diff --git a/src/HROOT/Tree/Ordinary.hs b/src/HROOT/Tree/Ordinary.hs new file mode 100644 --- /dev/null +++ b/src/HROOT/Tree/Ordinary.hs @@ -0,0 +1,6 @@ +{-# LANGUAGE FlexibleContexts, FlexibleInstances, + ForeignFunctionInterface, InterruptibleFFI #-} +module HROOT.Tree.Ordinary () where +import Foreign.C +import Foreign.Ptr +import FFICXX.Runtime.Cast diff --git a/src/HROOT/Tree/TBranch/Cast.hs b/src/HROOT/Tree/TBranch/Cast.hs --- a/src/HROOT/Tree/TBranch/Cast.hs +++ b/src/HROOT/Tree/TBranch/Cast.hs @@ -8,10 +8,11 @@ import HROOT.Tree.TBranch.RawType import HROOT.Tree.TBranch.Interface -instance (ITBranch a, FPtr a) => Castable a (Ptr RawTBranch) where +instance (ITBranch a, FPtr a) => Castable (a) (Ptr RawTBranch) + where cast x f = f (castPtr (get_fptr x)) uncast x f = f (cast_fptr_to_obj (castPtr x)) -instance Castable TBranch (Ptr RawTBranch) where +instance () => Castable (TBranch) (Ptr RawTBranch) where cast x f = f (castPtr (get_fptr x)) uncast x f = f (cast_fptr_to_obj (castPtr x)) diff --git a/src/HROOT/Tree/TBranch/FFI.hsc b/src/HROOT/Tree/TBranch/FFI.hsc --- a/src/HROOT/Tree/TBranch/FFI.hsc +++ b/src/HROOT/Tree/TBranch/FFI.hsc @@ -1,52 +1,73 @@ -{-# LANGUAGE ForeignFunctionInterface #-} +{-# LANGUAGE ForeignFunctionInterface, InterruptibleFFI #-} module HROOT.Tree.TBranch.FFI where +import Data.Word +import Data.Int import Foreign.C import Foreign.Ptr import HROOT.Tree.TBranch.RawType +import HROOT.Tree.TBranch.RawType import HROOT.Core.TObject.RawType import HROOT.Core.TClass.RawType -foreign import ccall safe "HROOTTreeTBranch.h TBranch_SetName" - c_tbranch_setname :: Ptr RawTBranch -> CString -> IO () +foreign import ccall interruptible + "HROOTTreeTBranch.h TBranch_SetName" c_tbranch_setname :: + Ptr RawTBranch -> CString -> IO () -foreign import ccall safe "HROOTTreeTBranch.h TBranch_SetNameTitle" - c_tbranch_setnametitle :: +foreign import ccall interruptible + "HROOTTreeTBranch.h TBranch_SetNameTitle" c_tbranch_setnametitle :: Ptr RawTBranch -> CString -> CString -> IO () -foreign import ccall safe "HROOTTreeTBranch.h TBranch_SetTitle" - c_tbranch_settitle :: Ptr RawTBranch -> CString -> IO () +foreign import ccall interruptible + "HROOTTreeTBranch.h TBranch_SetTitle" c_tbranch_settitle :: + Ptr RawTBranch -> CString -> IO () -foreign import ccall safe "HROOTTreeTBranch.h TBranch_SetFillColor" - c_tbranch_setfillcolor :: Ptr RawTBranch -> CInt -> IO () +foreign import ccall interruptible + "HROOTTreeTBranch.h TBranch_SetFillColor" c_tbranch_setfillcolor :: + Ptr RawTBranch -> CInt -> IO () -foreign import ccall safe "HROOTTreeTBranch.h TBranch_SetFillStyle" - c_tbranch_setfillstyle :: Ptr RawTBranch -> CInt -> IO () +foreign import ccall interruptible + "HROOTTreeTBranch.h TBranch_SetFillStyle" c_tbranch_setfillstyle :: + Ptr RawTBranch -> CInt -> IO () -foreign import ccall safe "HROOTTreeTBranch.h TBranch_Draw" - c_tbranch_draw :: Ptr RawTBranch -> CString -> IO () +foreign import ccall interruptible + "HROOTTreeTBranch.h TBranch_Clear" c_tbranch_clear :: + Ptr RawTBranch -> CString -> IO () -foreign import ccall safe "HROOTTreeTBranch.h TBranch_FindObject" - c_tbranch_findobject :: +foreign import ccall interruptible + "HROOTTreeTBranch.h TBranch_Draw" c_tbranch_draw :: + Ptr RawTBranch -> CString -> IO () + +foreign import ccall interruptible + "HROOTTreeTBranch.h TBranch_FindObject" c_tbranch_findobject :: Ptr RawTBranch -> CString -> IO (Ptr RawTObject) -foreign import ccall safe "HROOTTreeTBranch.h TBranch_GetName" - c_tbranch_getname :: Ptr RawTBranch -> IO CString +foreign import ccall interruptible + "HROOTTreeTBranch.h TBranch_GetName" c_tbranch_getname :: + Ptr RawTBranch -> IO CString -foreign import ccall safe "HROOTTreeTBranch.h TBranch_IsA" +foreign import ccall interruptible "HROOTTreeTBranch.h TBranch_IsA" c_tbranch_isa :: Ptr RawTBranch -> IO (Ptr RawTClass) -foreign import ccall safe "HROOTTreeTBranch.h TBranch_Paint" - c_tbranch_paint :: Ptr RawTBranch -> CString -> IO () +foreign import ccall interruptible + "HROOTTreeTBranch.h TBranch_Paint" c_tbranch_paint :: + Ptr RawTBranch -> CString -> IO () -foreign import ccall safe "HROOTTreeTBranch.h TBranch_printObj" - c_tbranch_printobj :: Ptr RawTBranch -> CString -> IO () +foreign import ccall interruptible + "HROOTTreeTBranch.h TBranch_printObj" c_tbranch_printobj :: + Ptr RawTBranch -> CString -> IO () -foreign import ccall safe "HROOTTreeTBranch.h TBranch_SaveAs" - c_tbranch_saveas :: Ptr RawTBranch -> CString -> CString -> IO () +foreign import ccall interruptible + "HROOTTreeTBranch.h TBranch_SaveAs" c_tbranch_saveas :: + Ptr RawTBranch -> CString -> CString -> IO () -foreign import ccall safe "HROOTTreeTBranch.h TBranch_Write" - c_tbranch_write :: +foreign import ccall interruptible + "HROOTTreeTBranch.h TBranch_Write" c_tbranch_write :: Ptr RawTBranch -> CString -> CInt -> CInt -> IO CInt -foreign import ccall safe "HROOTTreeTBranch.h TBranch_delete" - c_tbranch_delete :: Ptr RawTBranch -> IO () +foreign import ccall interruptible + "HROOTTreeTBranch.h TBranch_Write_" c_tbranch_write_ :: + Ptr RawTBranch -> IO CInt + +foreign import ccall interruptible + "HROOTTreeTBranch.h TBranch_delete" c_tbranch_delete :: + Ptr RawTBranch -> IO () diff --git a/src/HROOT/Tree/TBranch/Implementation.hs b/src/HROOT/Tree/TBranch/Implementation.hs --- a/src/HROOT/Tree/TBranch/Implementation.hs +++ b/src/HROOT/Tree/TBranch/Implementation.hs @@ -1,17 +1,26 @@ {-# LANGUAGE EmptyDataDecls, FlexibleContexts, FlexibleInstances, ForeignFunctionInterface, IncoherentInstances, - MultiParamTypeClasses, OverlappingInstances, TypeFamilies, - TypeSynonymInstances #-} + MultiParamTypeClasses, OverlappingInstances, TemplateHaskell, + TypeFamilies, TypeSynonymInstances #-} module HROOT.Tree.TBranch.Implementation where -import FFICXX.Runtime.Cast +import Data.Monoid import Data.Word +import Data.Int import Foreign.C import Foreign.Ptr +import Language.Haskell.TH +import Language.Haskell.TH.Syntax import System.IO.Unsafe +import FFICXX.Runtime.Cast +import FFICXX.Runtime.CodeGen.Cxx +import FFICXX.Runtime.TH import HROOT.Tree.TBranch.RawType import HROOT.Tree.TBranch.FFI import HROOT.Tree.TBranch.Interface import HROOT.Tree.TBranch.Cast +import HROOT.Tree.TBranch.RawType +import HROOT.Tree.TBranch.Cast +import HROOT.Tree.TBranch.Interface import HROOT.Core.TClass.RawType import HROOT.Core.TClass.Cast import HROOT.Core.TClass.Interface @@ -24,22 +33,23 @@ import HROOT.Core.TObject.RawType import HROOT.Core.TObject.Cast import HROOT.Core.TObject.Interface -import HROOT.Core.Deletable.RawType -import HROOT.Core.Deletable.Cast -import HROOT.Core.Deletable.Interface +import STD.Deletable.RawType +import STD.Deletable.Cast +import STD.Deletable.Interface -instance ITBranch TBranch +instance () => ITBranch (TBranch) where -instance ITNamed TBranch where +instance () => ITNamed (TBranch) where setName = xform1 c_tbranch_setname setNameTitle = xform2 c_tbranch_setnametitle setTitle = xform1 c_tbranch_settitle -instance ITAttFill TBranch where +instance () => ITAttFill (TBranch) where setFillColor = xform1 c_tbranch_setfillcolor setFillStyle = xform1 c_tbranch_setfillstyle -instance ITObject TBranch where +instance () => ITObject (TBranch) where + clear = xform1 c_tbranch_clear draw = xform1 c_tbranch_draw findObject = xform1 c_tbranch_findobject getName = xform0 c_tbranch_getname @@ -48,6 +58,7 @@ printObj = xform1 c_tbranch_printobj saveAs = xform2 c_tbranch_saveas write = xform3 c_tbranch_write + write_ = xform0 c_tbranch_write_ -instance IDeletable TBranch where +instance () => IDeletable (TBranch) where delete = xform0 c_tbranch_delete diff --git a/src/HROOT/Tree/TBranch/Interface.hs b/src/HROOT/Tree/TBranch/Interface.hs --- a/src/HROOT/Tree/TBranch/Interface.hs +++ b/src/HROOT/Tree/TBranch/Interface.hs @@ -4,6 +4,7 @@ TypeSynonymInstances #-} module HROOT.Tree.TBranch.Interface where import Data.Word +import Data.Int import Foreign.C import Foreign.Ptr import FFICXX.Runtime.Cast @@ -11,7 +12,7 @@ import HROOT.Core.TNamed.Interface import HROOT.Core.TAttFill.Interface -class (ITNamed a, ITAttFill a) => ITBranch a +class (ITNamed a, ITAttFill a) => ITBranch a where upcastTBranch :: forall a . (FPtr a, ITBranch a) => a -> TBranch upcastTBranch h diff --git a/src/HROOT/Tree/TBranch/RawType.hs b/src/HROOT/Tree/TBranch/RawType.hs --- a/src/HROOT/Tree/TBranch/RawType.hs +++ b/src/HROOT/Tree/TBranch/RawType.hs @@ -8,9 +8,9 @@ data RawTBranch newtype TBranch = TBranch (Ptr RawTBranch) - deriving (Eq, Ord, Show) + deriving (Eq, Ord, Show) -instance FPtr TBranch where +instance () => FPtr (TBranch) where type Raw TBranch = RawTBranch get_fptr (TBranch ptr) = ptr cast_fptr_to_obj = TBranch diff --git a/src/HROOT/Tree/TChain/Cast.hs b/src/HROOT/Tree/TChain/Cast.hs --- a/src/HROOT/Tree/TChain/Cast.hs +++ b/src/HROOT/Tree/TChain/Cast.hs @@ -8,10 +8,10 @@ import HROOT.Tree.TChain.RawType import HROOT.Tree.TChain.Interface -instance (ITChain a, FPtr a) => Castable a (Ptr RawTChain) where +instance (ITChain a, FPtr a) => Castable (a) (Ptr RawTChain) where cast x f = f (castPtr (get_fptr x)) uncast x f = f (cast_fptr_to_obj (castPtr x)) -instance Castable TChain (Ptr RawTChain) where +instance () => Castable (TChain) (Ptr RawTChain) where cast x f = f (castPtr (get_fptr x)) uncast x f = f (cast_fptr_to_obj (castPtr x)) diff --git a/src/HROOT/Tree/TChain/FFI.hsc b/src/HROOT/Tree/TChain/FFI.hsc --- a/src/HROOT/Tree/TChain/FFI.hsc +++ b/src/HROOT/Tree/TChain/FFI.hsc @@ -1,124 +1,160 @@ -{-# LANGUAGE ForeignFunctionInterface #-} +{-# LANGUAGE ForeignFunctionInterface, InterruptibleFFI #-} module HROOT.Tree.TChain.FFI where +import Data.Word +import Data.Int import Foreign.C import Foreign.Ptr import HROOT.Tree.TChain.RawType +import HROOT.Tree.TChain.RawType import HROOT.Tree.TBranch.RawType import HROOT.Core.TObject.RawType import HROOT.Core.TClass.RawType -foreign import ccall safe "HROOTTreeTChain.h TChain_Branch" - c_tchain_branch :: +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_Branch" c_tchain_branch :: Ptr RawTChain -> CString -> CInt -> CInt -> IO CInt -foreign import ccall safe "HROOTTreeTChain.h TChain_branch1" - c_tchain_branch1 :: +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_branch1" c_tchain_branch1 :: Ptr RawTChain -> - CString -> (Ptr ()) -> CString -> CInt -> IO (Ptr RawTBranch) + CString -> Ptr () -> CString -> CInt -> IO (Ptr RawTBranch) -foreign import ccall safe "HROOTTreeTChain.h TChain_fillTree" - c_tchain_filltree :: Ptr RawTChain -> IO CInt +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_fillTree" c_tchain_filltree :: + Ptr RawTChain -> IO CInt -foreign import ccall safe "HROOTTreeTChain.h TChain_SetName" - c_tchain_setname :: Ptr RawTChain -> CString -> IO () +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_SetName" c_tchain_setname :: + Ptr RawTChain -> CString -> IO () -foreign import ccall safe "HROOTTreeTChain.h TChain_SetNameTitle" - c_tchain_setnametitle :: +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_SetNameTitle" c_tchain_setnametitle :: Ptr RawTChain -> CString -> CString -> IO () -foreign import ccall safe "HROOTTreeTChain.h TChain_SetTitle" - c_tchain_settitle :: Ptr RawTChain -> CString -> IO () +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_SetTitle" c_tchain_settitle :: + Ptr RawTChain -> CString -> IO () -foreign import ccall safe "HROOTTreeTChain.h TChain_GetLineColor" - c_tchain_getlinecolor :: Ptr RawTChain -> IO CInt +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_GetLineColor" c_tchain_getlinecolor :: + Ptr RawTChain -> IO CShort -foreign import ccall safe "HROOTTreeTChain.h TChain_GetLineStyle" - c_tchain_getlinestyle :: Ptr RawTChain -> IO CInt +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_GetLineStyle" c_tchain_getlinestyle :: + Ptr RawTChain -> IO CShort -foreign import ccall safe "HROOTTreeTChain.h TChain_GetLineWidth" - c_tchain_getlinewidth :: Ptr RawTChain -> IO CInt +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_GetLineWidth" c_tchain_getlinewidth :: + Ptr RawTChain -> IO CShort -foreign import ccall safe "HROOTTreeTChain.h TChain_ResetAttLine" - c_tchain_resetattline :: Ptr RawTChain -> CString -> IO () +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_ResetAttLine" c_tchain_resetattline :: + Ptr RawTChain -> CString -> IO () -foreign import ccall safe +foreign import ccall interruptible "HROOTTreeTChain.h TChain_SetLineAttributes" c_tchain_setlineattributes :: Ptr RawTChain -> IO () -foreign import ccall safe "HROOTTreeTChain.h TChain_SetLineColor" - c_tchain_setlinecolor :: Ptr RawTChain -> CInt -> IO () +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_SetLineColor" c_tchain_setlinecolor :: + Ptr RawTChain -> CShort -> IO () -foreign import ccall safe "HROOTTreeTChain.h TChain_SetLineStyle" - c_tchain_setlinestyle :: Ptr RawTChain -> CInt -> IO () +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_SetLineStyle" c_tchain_setlinestyle :: + Ptr RawTChain -> CShort -> IO () -foreign import ccall safe "HROOTTreeTChain.h TChain_SetLineWidth" - c_tchain_setlinewidth :: Ptr RawTChain -> CInt -> IO () +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_SetLineWidth" c_tchain_setlinewidth :: + Ptr RawTChain -> CShort -> IO () -foreign import ccall safe "HROOTTreeTChain.h TChain_SetFillColor" - c_tchain_setfillcolor :: Ptr RawTChain -> CInt -> IO () +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_SetFillColor" c_tchain_setfillcolor :: + Ptr RawTChain -> CInt -> IO () -foreign import ccall safe "HROOTTreeTChain.h TChain_SetFillStyle" - c_tchain_setfillstyle :: Ptr RawTChain -> CInt -> IO () +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_SetFillStyle" c_tchain_setfillstyle :: + Ptr RawTChain -> CInt -> IO () -foreign import ccall safe "HROOTTreeTChain.h TChain_GetMarkerColor" - c_tchain_getmarkercolor :: Ptr RawTChain -> IO CInt +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_GetMarkerColor" c_tchain_getmarkercolor + :: Ptr RawTChain -> IO CShort -foreign import ccall safe "HROOTTreeTChain.h TChain_GetMarkerStyle" - c_tchain_getmarkerstyle :: Ptr RawTChain -> IO CInt +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_GetMarkerStyle" c_tchain_getmarkerstyle + :: Ptr RawTChain -> IO CShort -foreign import ccall safe "HROOTTreeTChain.h TChain_GetMarkerSize" - c_tchain_getmarkersize :: Ptr RawTChain -> IO CDouble +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_GetMarkerSize" c_tchain_getmarkersize :: + Ptr RawTChain -> IO CFloat -foreign import ccall safe "HROOTTreeTChain.h TChain_ResetAttMarker" - c_tchain_resetattmarker :: Ptr RawTChain -> CString -> IO () +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_ResetAttMarker" c_tchain_resetattmarker + :: Ptr RawTChain -> CString -> IO () -foreign import ccall safe +foreign import ccall interruptible "HROOTTreeTChain.h TChain_SetMarkerAttributes" c_tchain_setmarkerattributes :: Ptr RawTChain -> IO () -foreign import ccall safe "HROOTTreeTChain.h TChain_SetMarkerColor" - c_tchain_setmarkercolor :: Ptr RawTChain -> CInt -> IO () +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_SetMarkerColor" c_tchain_setmarkercolor + :: Ptr RawTChain -> CShort -> IO () -foreign import ccall safe "HROOTTreeTChain.h TChain_SetMarkerStyle" - c_tchain_setmarkerstyle :: Ptr RawTChain -> CInt -> IO () +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_SetMarkerStyle" c_tchain_setmarkerstyle + :: Ptr RawTChain -> CShort -> IO () -foreign import ccall safe "HROOTTreeTChain.h TChain_SetMarkerSize" - c_tchain_setmarkersize :: Ptr RawTChain -> CInt -> IO () +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_SetMarkerSize" c_tchain_setmarkersize :: + Ptr RawTChain -> CShort -> IO () -foreign import ccall safe "HROOTTreeTChain.h TChain_Draw" +foreign import ccall interruptible "HROOTTreeTChain.h TChain_Clear" + c_tchain_clear :: Ptr RawTChain -> CString -> IO () + +foreign import ccall interruptible "HROOTTreeTChain.h TChain_Draw" c_tchain_draw :: Ptr RawTChain -> CString -> IO () -foreign import ccall safe "HROOTTreeTChain.h TChain_FindObject" - c_tchain_findobject :: +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_FindObject" c_tchain_findobject :: Ptr RawTChain -> CString -> IO (Ptr RawTObject) -foreign import ccall safe "HROOTTreeTChain.h TChain_GetName" - c_tchain_getname :: Ptr RawTChain -> IO CString +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_GetName" c_tchain_getname :: + Ptr RawTChain -> IO CString -foreign import ccall safe "HROOTTreeTChain.h TChain_IsA" +foreign import ccall interruptible "HROOTTreeTChain.h TChain_IsA" c_tchain_isa :: Ptr RawTChain -> IO (Ptr RawTClass) -foreign import ccall safe "HROOTTreeTChain.h TChain_Paint" +foreign import ccall interruptible "HROOTTreeTChain.h TChain_Paint" c_tchain_paint :: Ptr RawTChain -> CString -> IO () -foreign import ccall safe "HROOTTreeTChain.h TChain_printObj" - c_tchain_printobj :: Ptr RawTChain -> CString -> IO () +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_printObj" c_tchain_printobj :: + Ptr RawTChain -> CString -> IO () -foreign import ccall safe "HROOTTreeTChain.h TChain_SaveAs" - c_tchain_saveas :: Ptr RawTChain -> CString -> CString -> IO () +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_SaveAs" c_tchain_saveas :: + Ptr RawTChain -> CString -> CString -> IO () -foreign import ccall safe "HROOTTreeTChain.h TChain_Write" +foreign import ccall interruptible "HROOTTreeTChain.h TChain_Write" c_tchain_write :: Ptr RawTChain -> CString -> CInt -> CInt -> IO CInt -foreign import ccall safe "HROOTTreeTChain.h TChain_delete" - c_tchain_delete :: Ptr RawTChain -> IO () +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_Write_" c_tchain_write_ :: + Ptr RawTChain -> IO CInt -foreign import ccall safe "HROOTTreeTChain.h TChain_newTChain" - c_tchain_newtchain :: CString -> CString -> IO (Ptr RawTChain) +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_delete" c_tchain_delete :: + Ptr RawTChain -> IO () -foreign import ccall safe "HROOTTreeTChain.h TChain_addChain" - c_tchain_addchain :: Ptr RawTChain -> Ptr RawTChain -> IO CInt +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_newTChain" c_tchain_newtchain :: + CString -> CString -> IO (Ptr RawTChain) -foreign import ccall safe "HROOTTreeTChain.h TChain_addChain1" - c_tchain_addchain1 :: Ptr RawTChain -> CString -> CLong -> IO CInt +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_addChain" c_tchain_addchain :: + Ptr RawTChain -> Ptr RawTChain -> IO CInt + +foreign import ccall interruptible + "HROOTTreeTChain.h TChain_addChain1" c_tchain_addchain1 :: + Ptr RawTChain -> CString -> CLong -> IO CInt diff --git a/src/HROOT/Tree/TChain/Implementation.hs b/src/HROOT/Tree/TChain/Implementation.hs --- a/src/HROOT/Tree/TChain/Implementation.hs +++ b/src/HROOT/Tree/TChain/Implementation.hs @@ -1,17 +1,26 @@ {-# LANGUAGE EmptyDataDecls, FlexibleContexts, FlexibleInstances, ForeignFunctionInterface, IncoherentInstances, - MultiParamTypeClasses, OverlappingInstances, TypeFamilies, - TypeSynonymInstances #-} + MultiParamTypeClasses, OverlappingInstances, TemplateHaskell, + TypeFamilies, TypeSynonymInstances #-} module HROOT.Tree.TChain.Implementation where -import FFICXX.Runtime.Cast +import Data.Monoid import Data.Word +import Data.Int import Foreign.C import Foreign.Ptr +import Language.Haskell.TH +import Language.Haskell.TH.Syntax import System.IO.Unsafe +import FFICXX.Runtime.Cast +import FFICXX.Runtime.CodeGen.Cxx +import FFICXX.Runtime.TH import HROOT.Tree.TChain.RawType import HROOT.Tree.TChain.FFI import HROOT.Tree.TChain.Interface import HROOT.Tree.TChain.Cast +import HROOT.Tree.TChain.RawType +import HROOT.Tree.TChain.Cast +import HROOT.Tree.TChain.Interface import HROOT.Tree.TBranch.RawType import HROOT.Tree.TBranch.Cast import HROOT.Tree.TBranch.Interface @@ -36,25 +45,25 @@ import HROOT.Core.TObject.RawType import HROOT.Core.TObject.Cast import HROOT.Core.TObject.Interface -import HROOT.Core.Deletable.RawType -import HROOT.Core.Deletable.Cast -import HROOT.Core.Deletable.Interface +import STD.Deletable.RawType +import STD.Deletable.Cast +import STD.Deletable.Interface -instance ITChain TChain where +instance () => ITChain (TChain) where addChain = xform1 c_tchain_addchain addChain1 = xform2 c_tchain_addchain1 -instance ITTree TChain where +instance () => ITTree (TChain) where branch = xform3 c_tchain_branch branch1 = xform4 c_tchain_branch1 fillTree = xform0 c_tchain_filltree -instance ITNamed TChain where +instance () => ITNamed (TChain) where setName = xform1 c_tchain_setname setNameTitle = xform2 c_tchain_setnametitle setTitle = xform1 c_tchain_settitle -instance ITAttLine TChain where +instance () => ITAttLine (TChain) where getLineColor = xform0 c_tchain_getlinecolor getLineStyle = xform0 c_tchain_getlinestyle getLineWidth = xform0 c_tchain_getlinewidth @@ -64,11 +73,11 @@ setLineStyle = xform1 c_tchain_setlinestyle setLineWidth = xform1 c_tchain_setlinewidth -instance ITAttFill TChain where +instance () => ITAttFill (TChain) where setFillColor = xform1 c_tchain_setfillcolor setFillStyle = xform1 c_tchain_setfillstyle -instance ITAttMarker TChain where +instance () => ITAttMarker (TChain) where getMarkerColor = xform0 c_tchain_getmarkercolor getMarkerStyle = xform0 c_tchain_getmarkerstyle getMarkerSize = xform0 c_tchain_getmarkersize @@ -78,7 +87,8 @@ setMarkerStyle = xform1 c_tchain_setmarkerstyle setMarkerSize = xform1 c_tchain_setmarkersize -instance ITObject TChain where +instance () => ITObject (TChain) where + clear = xform1 c_tchain_clear draw = xform1 c_tchain_draw findObject = xform1 c_tchain_findobject getName = xform0 c_tchain_getname @@ -87,8 +97,9 @@ printObj = xform1 c_tchain_printobj saveAs = xform2 c_tchain_saveas write = xform3 c_tchain_write + write_ = xform0 c_tchain_write_ -instance IDeletable TChain where +instance () => IDeletable (TChain) where delete = xform0 c_tchain_delete newTChain :: diff --git a/src/HROOT/Tree/TChain/Interface.hs b/src/HROOT/Tree/TChain/Interface.hs --- a/src/HROOT/Tree/TChain/Interface.hs +++ b/src/HROOT/Tree/TChain/Interface.hs @@ -4,16 +4,17 @@ TypeSynonymInstances #-} module HROOT.Tree.TChain.Interface where import Data.Word +import Data.Int import Foreign.C import Foreign.Ptr import FFICXX.Runtime.Cast import HROOT.Tree.TChain.RawType import HROOT.Tree.TTree.Interface -class ITTree a => ITChain a where +class (ITTree a) => ITChain a where addChain :: (ITChain c0, FPtr c0) => a -> c0 -> IO CInt - addChain1 :: Castable c0 CString => a -> c0 -> CLong -> IO CInt + addChain1 :: (Castable c0 CString) => a -> c0 -> CLong -> IO CInt upcastTChain :: forall a . (FPtr a, ITChain a) => a -> TChain upcastTChain h diff --git a/src/HROOT/Tree/TChain/RawType.hs b/src/HROOT/Tree/TChain/RawType.hs --- a/src/HROOT/Tree/TChain/RawType.hs +++ b/src/HROOT/Tree/TChain/RawType.hs @@ -8,9 +8,9 @@ data RawTChain newtype TChain = TChain (Ptr RawTChain) - deriving (Eq, Ord, Show) + deriving (Eq, Ord, Show) -instance FPtr TChain where +instance () => FPtr (TChain) where type Raw TChain = RawTChain get_fptr (TChain ptr) = ptr cast_fptr_to_obj = TChain diff --git a/src/HROOT/Tree/TH.hs b/src/HROOT/Tree/TH.hs new file mode 100644 --- /dev/null +++ b/src/HROOT/Tree/TH.hs @@ -0,0 +1,12 @@ +{-# LANGUAGE FlexibleContexts, FlexibleInstances, + ForeignFunctionInterface, InterruptibleFFI, TemplateHaskell #-} +module HROOT.Tree.TH () where +import Data.Char +import Data.List +import Data.Monoid +import Foreign.C.Types +import Foreign.Ptr +import Language.Haskell.TH +import Language.Haskell.TH.Syntax +import FFICXX.Runtime.CodeGen.Cxx +import FFICXX.Runtime.TH diff --git a/src/HROOT/Tree/TTree/Cast.hs b/src/HROOT/Tree/TTree/Cast.hs --- a/src/HROOT/Tree/TTree/Cast.hs +++ b/src/HROOT/Tree/TTree/Cast.hs @@ -8,10 +8,10 @@ import HROOT.Tree.TTree.RawType import HROOT.Tree.TTree.Interface -instance (ITTree a, FPtr a) => Castable a (Ptr RawTTree) where +instance (ITTree a, FPtr a) => Castable (a) (Ptr RawTTree) where cast x f = f (castPtr (get_fptr x)) uncast x f = f (cast_fptr_to_obj (castPtr x)) -instance Castable TTree (Ptr RawTTree) where +instance () => Castable (TTree) (Ptr RawTTree) where cast x f = f (castPtr (get_fptr x)) uncast x f = f (cast_fptr_to_obj (castPtr x)) diff --git a/src/HROOT/Tree/TTree/FFI.hsc b/src/HROOT/Tree/TTree/FFI.hsc --- a/src/HROOT/Tree/TTree/FFI.hsc +++ b/src/HROOT/Tree/TTree/FFI.hsc @@ -1,116 +1,146 @@ -{-# LANGUAGE ForeignFunctionInterface #-} +{-# LANGUAGE ForeignFunctionInterface, InterruptibleFFI #-} module HROOT.Tree.TTree.FFI where +import Data.Word +import Data.Int import Foreign.C import Foreign.Ptr import HROOT.Tree.TTree.RawType +import HROOT.Tree.TTree.RawType import HROOT.Core.TObject.RawType import HROOT.Core.TClass.RawType import HROOT.Tree.TBranch.RawType -foreign import ccall safe "HROOTTreeTTree.h TTree_SetName" +foreign import ccall interruptible "HROOTTreeTTree.h TTree_SetName" c_ttree_setname :: Ptr RawTTree -> CString -> IO () -foreign import ccall safe "HROOTTreeTTree.h TTree_SetNameTitle" - c_ttree_setnametitle :: Ptr RawTTree -> CString -> CString -> IO () +foreign import ccall interruptible + "HROOTTreeTTree.h TTree_SetNameTitle" c_ttree_setnametitle :: + Ptr RawTTree -> CString -> CString -> IO () -foreign import ccall safe "HROOTTreeTTree.h TTree_SetTitle" - c_ttree_settitle :: Ptr RawTTree -> CString -> IO () +foreign import ccall interruptible + "HROOTTreeTTree.h TTree_SetTitle" c_ttree_settitle :: + Ptr RawTTree -> CString -> IO () -foreign import ccall safe "HROOTTreeTTree.h TTree_GetLineColor" - c_ttree_getlinecolor :: Ptr RawTTree -> IO CInt +foreign import ccall interruptible + "HROOTTreeTTree.h TTree_GetLineColor" c_ttree_getlinecolor :: + Ptr RawTTree -> IO CShort -foreign import ccall safe "HROOTTreeTTree.h TTree_GetLineStyle" - c_ttree_getlinestyle :: Ptr RawTTree -> IO CInt +foreign import ccall interruptible + "HROOTTreeTTree.h TTree_GetLineStyle" c_ttree_getlinestyle :: + Ptr RawTTree -> IO CShort -foreign import ccall safe "HROOTTreeTTree.h TTree_GetLineWidth" - c_ttree_getlinewidth :: Ptr RawTTree -> IO CInt +foreign import ccall interruptible + "HROOTTreeTTree.h TTree_GetLineWidth" c_ttree_getlinewidth :: + Ptr RawTTree -> IO CShort -foreign import ccall safe "HROOTTreeTTree.h TTree_ResetAttLine" - c_ttree_resetattline :: Ptr RawTTree -> CString -> IO () +foreign import ccall interruptible + "HROOTTreeTTree.h TTree_ResetAttLine" c_ttree_resetattline :: + Ptr RawTTree -> CString -> IO () -foreign import ccall safe +foreign import ccall interruptible "HROOTTreeTTree.h TTree_SetLineAttributes" c_ttree_setlineattributes :: Ptr RawTTree -> IO () -foreign import ccall safe "HROOTTreeTTree.h TTree_SetLineColor" - c_ttree_setlinecolor :: Ptr RawTTree -> CInt -> IO () +foreign import ccall interruptible + "HROOTTreeTTree.h TTree_SetLineColor" c_ttree_setlinecolor :: + Ptr RawTTree -> CShort -> IO () -foreign import ccall safe "HROOTTreeTTree.h TTree_SetLineStyle" - c_ttree_setlinestyle :: Ptr RawTTree -> CInt -> IO () +foreign import ccall interruptible + "HROOTTreeTTree.h TTree_SetLineStyle" c_ttree_setlinestyle :: + Ptr RawTTree -> CShort -> IO () -foreign import ccall safe "HROOTTreeTTree.h TTree_SetLineWidth" - c_ttree_setlinewidth :: Ptr RawTTree -> CInt -> IO () +foreign import ccall interruptible + "HROOTTreeTTree.h TTree_SetLineWidth" c_ttree_setlinewidth :: + Ptr RawTTree -> CShort -> IO () -foreign import ccall safe "HROOTTreeTTree.h TTree_SetFillColor" - c_ttree_setfillcolor :: Ptr RawTTree -> CInt -> IO () +foreign import ccall interruptible + "HROOTTreeTTree.h TTree_SetFillColor" c_ttree_setfillcolor :: + Ptr RawTTree -> CInt -> IO () -foreign import ccall safe "HROOTTreeTTree.h TTree_SetFillStyle" - c_ttree_setfillstyle :: Ptr RawTTree -> CInt -> IO () +foreign import ccall interruptible + "HROOTTreeTTree.h TTree_SetFillStyle" c_ttree_setfillstyle :: + Ptr RawTTree -> CInt -> IO () -foreign import ccall safe "HROOTTreeTTree.h TTree_GetMarkerColor" - c_ttree_getmarkercolor :: Ptr RawTTree -> IO CInt +foreign import ccall interruptible + "HROOTTreeTTree.h TTree_GetMarkerColor" c_ttree_getmarkercolor :: + Ptr RawTTree -> IO CShort -foreign import ccall safe "HROOTTreeTTree.h TTree_GetMarkerStyle" - c_ttree_getmarkerstyle :: Ptr RawTTree -> IO CInt +foreign import ccall interruptible + "HROOTTreeTTree.h TTree_GetMarkerStyle" c_ttree_getmarkerstyle :: + Ptr RawTTree -> IO CShort -foreign import ccall safe "HROOTTreeTTree.h TTree_GetMarkerSize" - c_ttree_getmarkersize :: Ptr RawTTree -> IO CDouble +foreign import ccall interruptible + "HROOTTreeTTree.h TTree_GetMarkerSize" c_ttree_getmarkersize :: + Ptr RawTTree -> IO CFloat -foreign import ccall safe "HROOTTreeTTree.h TTree_ResetAttMarker" - c_ttree_resetattmarker :: Ptr RawTTree -> CString -> IO () +foreign import ccall interruptible + "HROOTTreeTTree.h TTree_ResetAttMarker" c_ttree_resetattmarker :: + Ptr RawTTree -> CString -> IO () -foreign import ccall safe +foreign import ccall interruptible "HROOTTreeTTree.h TTree_SetMarkerAttributes" c_ttree_setmarkerattributes :: Ptr RawTTree -> IO () -foreign import ccall safe "HROOTTreeTTree.h TTree_SetMarkerColor" - c_ttree_setmarkercolor :: Ptr RawTTree -> CInt -> IO () +foreign import ccall interruptible + "HROOTTreeTTree.h TTree_SetMarkerColor" c_ttree_setmarkercolor :: + Ptr RawTTree -> CShort -> IO () -foreign import ccall safe "HROOTTreeTTree.h TTree_SetMarkerStyle" - c_ttree_setmarkerstyle :: Ptr RawTTree -> CInt -> IO () +foreign import ccall interruptible + "HROOTTreeTTree.h TTree_SetMarkerStyle" c_ttree_setmarkerstyle :: + Ptr RawTTree -> CShort -> IO () -foreign import ccall safe "HROOTTreeTTree.h TTree_SetMarkerSize" - c_ttree_setmarkersize :: Ptr RawTTree -> CInt -> IO () +foreign import ccall interruptible + "HROOTTreeTTree.h TTree_SetMarkerSize" c_ttree_setmarkersize :: + Ptr RawTTree -> CShort -> IO () -foreign import ccall safe "HROOTTreeTTree.h TTree_Draw" +foreign import ccall interruptible "HROOTTreeTTree.h TTree_Clear" + c_ttree_clear :: Ptr RawTTree -> CString -> IO () + +foreign import ccall interruptible "HROOTTreeTTree.h TTree_Draw" c_ttree_draw :: Ptr RawTTree -> CString -> IO () -foreign import ccall safe "HROOTTreeTTree.h TTree_FindObject" - c_ttree_findobject :: +foreign import ccall interruptible + "HROOTTreeTTree.h TTree_FindObject" c_ttree_findobject :: Ptr RawTTree -> CString -> IO (Ptr RawTObject) -foreign import ccall safe "HROOTTreeTTree.h TTree_GetName" +foreign import ccall interruptible "HROOTTreeTTree.h TTree_GetName" c_ttree_getname :: Ptr RawTTree -> IO CString -foreign import ccall safe "HROOTTreeTTree.h TTree_IsA" c_ttree_isa - :: Ptr RawTTree -> IO (Ptr RawTClass) +foreign import ccall interruptible "HROOTTreeTTree.h TTree_IsA" + c_ttree_isa :: Ptr RawTTree -> IO (Ptr RawTClass) -foreign import ccall safe "HROOTTreeTTree.h TTree_Paint" +foreign import ccall interruptible "HROOTTreeTTree.h TTree_Paint" c_ttree_paint :: Ptr RawTTree -> CString -> IO () -foreign import ccall safe "HROOTTreeTTree.h TTree_printObj" - c_ttree_printobj :: Ptr RawTTree -> CString -> IO () +foreign import ccall interruptible + "HROOTTreeTTree.h TTree_printObj" c_ttree_printobj :: + Ptr RawTTree -> CString -> IO () -foreign import ccall safe "HROOTTreeTTree.h TTree_SaveAs" +foreign import ccall interruptible "HROOTTreeTTree.h TTree_SaveAs" c_ttree_saveas :: Ptr RawTTree -> CString -> CString -> IO () -foreign import ccall safe "HROOTTreeTTree.h TTree_Write" +foreign import ccall interruptible "HROOTTreeTTree.h TTree_Write" c_ttree_write :: Ptr RawTTree -> CString -> CInt -> CInt -> IO CInt -foreign import ccall safe "HROOTTreeTTree.h TTree_delete" +foreign import ccall interruptible "HROOTTreeTTree.h TTree_Write_" + c_ttree_write_ :: Ptr RawTTree -> IO CInt + +foreign import ccall interruptible "HROOTTreeTTree.h TTree_delete" c_ttree_delete :: Ptr RawTTree -> IO () -foreign import ccall safe "HROOTTreeTTree.h TTree_newTTree" - c_ttree_newttree :: CString -> CString -> CInt -> IO (Ptr RawTTree) +foreign import ccall interruptible + "HROOTTreeTTree.h TTree_newTTree" c_ttree_newttree :: + CString -> CString -> CInt -> IO (Ptr RawTTree) -foreign import ccall safe "HROOTTreeTTree.h TTree_Branch" +foreign import ccall interruptible "HROOTTreeTTree.h TTree_Branch" c_ttree_branch :: Ptr RawTTree -> CString -> CInt -> CInt -> IO CInt -foreign import ccall safe "HROOTTreeTTree.h TTree_branch1" +foreign import ccall interruptible "HROOTTreeTTree.h TTree_branch1" c_ttree_branch1 :: Ptr RawTTree -> - CString -> (Ptr ()) -> CString -> CInt -> IO (Ptr RawTBranch) + CString -> Ptr () -> CString -> CInt -> IO (Ptr RawTBranch) -foreign import ccall safe "HROOTTreeTTree.h TTree_fillTree" - c_ttree_filltree :: Ptr RawTTree -> IO CInt +foreign import ccall interruptible + "HROOTTreeTTree.h TTree_fillTree" c_ttree_filltree :: + Ptr RawTTree -> IO CInt diff --git a/src/HROOT/Tree/TTree/Implementation.hs b/src/HROOT/Tree/TTree/Implementation.hs --- a/src/HROOT/Tree/TTree/Implementation.hs +++ b/src/HROOT/Tree/TTree/Implementation.hs @@ -1,17 +1,26 @@ {-# LANGUAGE EmptyDataDecls, FlexibleContexts, FlexibleInstances, ForeignFunctionInterface, IncoherentInstances, - MultiParamTypeClasses, OverlappingInstances, TypeFamilies, - TypeSynonymInstances #-} + MultiParamTypeClasses, OverlappingInstances, TemplateHaskell, + TypeFamilies, TypeSynonymInstances #-} module HROOT.Tree.TTree.Implementation where -import FFICXX.Runtime.Cast +import Data.Monoid import Data.Word +import Data.Int import Foreign.C import Foreign.Ptr +import Language.Haskell.TH +import Language.Haskell.TH.Syntax import System.IO.Unsafe +import FFICXX.Runtime.Cast +import FFICXX.Runtime.CodeGen.Cxx +import FFICXX.Runtime.TH import HROOT.Tree.TTree.RawType import HROOT.Tree.TTree.FFI import HROOT.Tree.TTree.Interface import HROOT.Tree.TTree.Cast +import HROOT.Tree.TTree.RawType +import HROOT.Tree.TTree.Cast +import HROOT.Tree.TTree.Interface import HROOT.Core.TClass.RawType import HROOT.Core.TClass.Cast import HROOT.Core.TClass.Interface @@ -33,21 +42,21 @@ import HROOT.Core.TObject.RawType import HROOT.Core.TObject.Cast import HROOT.Core.TObject.Interface -import HROOT.Core.Deletable.RawType -import HROOT.Core.Deletable.Cast -import HROOT.Core.Deletable.Interface +import STD.Deletable.RawType +import STD.Deletable.Cast +import STD.Deletable.Interface -instance ITTree TTree where +instance () => ITTree (TTree) where branch = xform3 c_ttree_branch branch1 = xform4 c_ttree_branch1 fillTree = xform0 c_ttree_filltree -instance ITNamed TTree where +instance () => ITNamed (TTree) where setName = xform1 c_ttree_setname setNameTitle = xform2 c_ttree_setnametitle setTitle = xform1 c_ttree_settitle -instance ITAttLine TTree where +instance () => ITAttLine (TTree) where getLineColor = xform0 c_ttree_getlinecolor getLineStyle = xform0 c_ttree_getlinestyle getLineWidth = xform0 c_ttree_getlinewidth @@ -57,11 +66,11 @@ setLineStyle = xform1 c_ttree_setlinestyle setLineWidth = xform1 c_ttree_setlinewidth -instance ITAttFill TTree where +instance () => ITAttFill (TTree) where setFillColor = xform1 c_ttree_setfillcolor setFillStyle = xform1 c_ttree_setfillstyle -instance ITAttMarker TTree where +instance () => ITAttMarker (TTree) where getMarkerColor = xform0 c_ttree_getmarkercolor getMarkerStyle = xform0 c_ttree_getmarkerstyle getMarkerSize = xform0 c_ttree_getmarkersize @@ -71,7 +80,8 @@ setMarkerStyle = xform1 c_ttree_setmarkerstyle setMarkerSize = xform1 c_ttree_setmarkersize -instance ITObject TTree where +instance () => ITObject (TTree) where + clear = xform1 c_ttree_clear draw = xform1 c_ttree_draw findObject = xform1 c_ttree_findobject getName = xform0 c_ttree_getname @@ -80,8 +90,9 @@ printObj = xform1 c_ttree_printobj saveAs = xform2 c_ttree_saveas write = xform3 c_ttree_write + write_ = xform0 c_ttree_write_ -instance IDeletable TTree where +instance () => IDeletable (TTree) where delete = xform0 c_ttree_delete newTTree :: diff --git a/src/HROOT/Tree/TTree/Interface.hs b/src/HROOT/Tree/TTree/Interface.hs --- a/src/HROOT/Tree/TTree/Interface.hs +++ b/src/HROOT/Tree/TTree/Interface.hs @@ -4,6 +4,7 @@ TypeSynonymInstances #-} module HROOT.Tree.TTree.Interface where import Data.Word +import Data.Int import Foreign.C import Foreign.Ptr import FFICXX.Runtime.Cast @@ -16,13 +17,14 @@ class (ITNamed a, ITAttLine a, ITAttFill a, ITAttMarker a) => ITTree a where - branch :: Castable c0 CString => a -> c0 -> CInt -> CInt -> IO CInt + branch :: + (Castable c0 CString) => a -> c0 -> CInt -> CInt -> IO CInt branch1 :: (Castable c1 CString, Castable c0 CString) => - a -> c0 -> (Ptr ()) -> c1 -> CInt -> IO TBranch + a -> c0 -> Ptr () -> c1 -> CInt -> IO TBranch - fillTree :: a -> IO CInt + fillTree :: () => a -> IO CInt upcastTTree :: forall a . (FPtr a, ITTree a) => a -> TTree upcastTTree h diff --git a/src/HROOT/Tree/TTree/RawType.hs b/src/HROOT/Tree/TTree/RawType.hs --- a/src/HROOT/Tree/TTree/RawType.hs +++ b/src/HROOT/Tree/TTree/RawType.hs @@ -8,9 +8,9 @@ data RawTTree newtype TTree = TTree (Ptr RawTTree) - deriving (Eq, Ord, Show) + deriving (Eq, Ord, Show) -instance FPtr TTree where +instance () => FPtr (TTree) where type Raw TTree = RawTTree get_fptr (TTree ptr) = ptr cast_fptr_to_obj = TTree diff --git a/src/HROOT/Tree/Template.hs b/src/HROOT/Tree/Template.hs new file mode 100644 --- /dev/null +++ b/src/HROOT/Tree/Template.hs @@ -0,0 +1,7 @@ +{-# LANGUAGE EmptyDataDecls, FlexibleInstances, + ForeignFunctionInterface, InterruptibleFFI, MultiParamTypeClasses, + TypeFamilies #-} +module HROOT.Tree.Template () where +import Foreign.C.Types +import Foreign.Ptr +import FFICXX.Runtime.Cast