diff --git a/Setup.hs b/Setup.hs --- a/Setup.hs +++ b/Setup.hs @@ -1,6 +1,6 @@ -- This file is part of Hoppy. -- --- Copyright 2016 Bryan Gardiner +-- Copyright 2015-2018 Bryan Gardiner -- -- Licensed under the Apache License, Version 2.0 (the "License"); -- you may not use this file except in compliance with the License. diff --git a/hoppy-std.cabal b/hoppy-std.cabal --- a/hoppy-std.cabal +++ b/hoppy-std.cabal @@ -1,12 +1,12 @@ name: hoppy-std -version: 0.3.0 +version: 0.4.0 synopsis: C++ FFI generator - Standard library bindings homepage: http://khumba.net/projects/hoppy license: Apache-2.0 license-file: LICENSE author: Bryan Gardiner maintainer: Bryan Gardiner -copyright: Copyright 2015-2016 Bryan Gardiner +copyright: Copyright 2015-2018 Bryan Gardiner category: Foreign build-type: Simple cabal-version: >=1.10 @@ -38,7 +38,7 @@ base >=4.7 && <5 , filepath >=1.0 && <1.5 , haskell-src >=1.0 && <1.1 - , hoppy-generator >=0.3 && <0.4 + , hoppy-generator >=0.4 && <0.5 hs-source-dirs: src ghc-options: -W -fwarn-incomplete-patterns -fwarn-unused-do-bind default-language: Haskell2010 diff --git a/include/hoppy/std/iterator.hpp b/include/hoppy/std/iterator.hpp --- a/include/hoppy/std/iterator.hpp +++ b/include/hoppy/std/iterator.hpp @@ -3,7 +3,7 @@ // This file is part of Hoppy. // -// Copyright 2015-2016 Bryan Gardiner +// Copyright 2015-2018 Bryan Gardiner // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/hoppy/std/map.hpp b/include/hoppy/std/map.hpp --- a/include/hoppy/std/map.hpp +++ b/include/hoppy/std/map.hpp @@ -3,7 +3,7 @@ // This file is part of Hoppy. // -// Copyright 2015-2016 Bryan Gardiner +// Copyright 2015-2018 Bryan Gardiner // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/hoppy/std/set.hpp b/include/hoppy/std/set.hpp --- a/include/hoppy/std/set.hpp +++ b/include/hoppy/std/set.hpp @@ -3,7 +3,7 @@ // This file is part of Hoppy. // -// Copyright 2015-2016 Bryan Gardiner +// Copyright 2015-2018 Bryan Gardiner // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/include/hoppy/std/utility.hpp b/include/hoppy/std/utility.hpp --- a/include/hoppy/std/utility.hpp +++ b/include/hoppy/std/utility.hpp @@ -3,7 +3,7 @@ // This file is part of Hoppy. // -// Copyright 2015-2016 Bryan Gardiner +// Copyright 2015-2018 Bryan Gardiner // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/Foreign/Hoppy/Generator/Std.hs b/src/Foreign/Hoppy/Generator/Std.hs --- a/src/Foreign/Hoppy/Generator/Std.hs +++ b/src/Foreign/Hoppy/Generator/Std.hs @@ -1,6 +1,6 @@ -- This file is part of Hoppy. -- --- Copyright 2015-2016 Bryan Gardiner +-- Copyright 2015-2018 Bryan Gardiner -- -- Licensed under the Apache License, Version 2.0 (the "License"); -- you may not use this file except in compliance with the License. diff --git a/src/Foreign/Hoppy/Generator/Std/Internal.hs b/src/Foreign/Hoppy/Generator/Std/Internal.hs --- a/src/Foreign/Hoppy/Generator/Std/Internal.hs +++ b/src/Foreign/Hoppy/Generator/Std/Internal.hs @@ -1,6 +1,6 @@ -- This file is part of Hoppy. -- --- Copyright 2015-2016 Bryan Gardiner +-- Copyright 2015-2018 Bryan Gardiner -- -- Licensed under the Apache License, Version 2.0 (the "License"); -- you may not use this file except in compliance with the License. diff --git a/src/Foreign/Hoppy/Generator/Std/Iterator.hs b/src/Foreign/Hoppy/Generator/Std/Iterator.hs --- a/src/Foreign/Hoppy/Generator/Std/Iterator.hs +++ b/src/Foreign/Hoppy/Generator/Std/Iterator.hs @@ -1,6 +1,6 @@ -- This file is part of Hoppy. -- --- Copyright 2015-2016 Bryan Gardiner +-- Copyright 2015-2018 Bryan Gardiner -- -- Licensed under the Apache License, Version 2.0 (the "License"); -- you may not use this file except in compliance with the License. diff --git a/src/Foreign/Hoppy/Generator/Std/List.hs b/src/Foreign/Hoppy/Generator/Std/List.hs --- a/src/Foreign/Hoppy/Generator/Std/List.hs +++ b/src/Foreign/Hoppy/Generator/Std/List.hs @@ -1,6 +1,6 @@ -- This file is part of Hoppy. -- --- Copyright 2015-2016 Bryan Gardiner +-- Copyright 2015-2018 Bryan Gardiner -- -- Licensed under the Apache License, Version 2.0 (the "License"); -- you may not use this file except in compliance with the License. diff --git a/src/Foreign/Hoppy/Generator/Std/Map.hs b/src/Foreign/Hoppy/Generator/Std/Map.hs --- a/src/Foreign/Hoppy/Generator/Std/Map.hs +++ b/src/Foreign/Hoppy/Generator/Std/Map.hs @@ -1,6 +1,6 @@ -- This file is part of Hoppy. -- --- Copyright 2015-2016 Bryan Gardiner +-- Copyright 2015-2018 Bryan Gardiner -- -- Licensed under the Apache License, Version 2.0 (the "License"); -- you may not use this file except in compliance with the License. diff --git a/src/Foreign/Hoppy/Generator/Std/Pair.hs b/src/Foreign/Hoppy/Generator/Std/Pair.hs --- a/src/Foreign/Hoppy/Generator/Std/Pair.hs +++ b/src/Foreign/Hoppy/Generator/Std/Pair.hs @@ -1,6 +1,6 @@ -- This file is part of Hoppy. -- --- Copyright 2015-2016 Bryan Gardiner +-- Copyright 2015-2018 Bryan Gardiner -- -- Licensed under the Apache License, Version 2.0 (the "License"); -- you may not use this file except in compliance with the License. diff --git a/src/Foreign/Hoppy/Generator/Std/Set.hs b/src/Foreign/Hoppy/Generator/Std/Set.hs --- a/src/Foreign/Hoppy/Generator/Std/Set.hs +++ b/src/Foreign/Hoppy/Generator/Std/Set.hs @@ -1,6 +1,6 @@ -- This file is part of Hoppy. -- --- Copyright 2015-2016 Bryan Gardiner +-- Copyright 2015-2018 Bryan Gardiner -- -- Licensed under the Apache License, Version 2.0 (the "License"); -- you may not use this file except in compliance with the License. diff --git a/src/Foreign/Hoppy/Generator/Std/String.hs b/src/Foreign/Hoppy/Generator/Std/String.hs --- a/src/Foreign/Hoppy/Generator/Std/String.hs +++ b/src/Foreign/Hoppy/Generator/Std/String.hs @@ -1,6 +1,6 @@ -- This file is part of Hoppy. -- --- Copyright 2015-2016 Bryan Gardiner +-- Copyright 2015-2018 Bryan Gardiner -- -- Licensed under the Apache License, Version 2.0 (the "License"); -- you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ makeClass (ident1 "std" "string") (Just $ toExtName "StdString") [] [ mkCtor "new" [] , mkCtor "newFromCString" [ptrT $ constT charT] - , mkConstMethod' "at" "at" [intT] $ refT charT + , mkMethod' "at" "at" [intT] $ refT charT , mkConstMethod' "at" "get" [intT] charT , mkConstMethod "c_str" [] $ ptrT $ constT charT , mkConstMethod "size" [] sizeT diff --git a/src/Foreign/Hoppy/Generator/Std/Vector.hs b/src/Foreign/Hoppy/Generator/Std/Vector.hs --- a/src/Foreign/Hoppy/Generator/Std/Vector.hs +++ b/src/Foreign/Hoppy/Generator/Std/Vector.hs @@ -1,6 +1,6 @@ -- This file is part of Hoppy. -- --- Copyright 2015-2016 Bryan Gardiner +-- Copyright 2015-2018 Bryan Gardiner -- -- Licensed under the Apache License, Version 2.0 (the "License"); -- you may not use this file except in compliance with the License.