From 709414239e573a1c1d95d4a72b9f96c521ab6d66 Mon Sep 17 00:00:00 2001 From: Kimiyuki Onaka Date: Wed, 28 Jul 2021 14:12:01 +0900 Subject: [PATCH 1/3] build: Specify version bounds --- package.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package.yaml b/package.yaml index 7ae4c59e..3a8ad5fe 100644 --- a/package.yaml +++ b/package.yaml @@ -20,15 +20,15 @@ category: "Compilers/Interpreters" description: Please see the README on GitHub at dependencies: -- base >= 4.7 && < 5 -- text -- containers -- array -- deepseq -- mtl -- vector -- transformers -- ansi-terminal +- base >= 4.14 && < 4.15 +- ansi-terminal >= 0.11 && < 0.12 +- array >= 0.5.3 && < 0.6 +- containers >= 0.6.0 && < 0.7 +- deepseq >= 1.4.4 && < 1.5 +- mtl >= 2.2.2 && < 2.3 +- transformers >= 0.5.6 && < 0.6 +- text >= 1.2.3 && < 1.3 +- vector >= 0.12.0 && < 0.13 library: source-dirs: src From 712112a2cf32438b573d470cbc66ebbd35f583d7 Mon Sep 17 00:00:00 2001 From: Kimiyuki Onaka Date: Wed, 28 Jul 2021 14:14:23 +0900 Subject: [PATCH 2/3] build: Include .cabal file --- .gitignore | 4 +- Jikka.cabal | 259 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 262 insertions(+), 1 deletion(-) create mode 100644 Jikka.cabal diff --git a/.gitignore b/.gitignore index 773d8d40..bdd6e6e2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ -*.cabal .stack-work/ + +# Include .cabal file because FP Complete recommends to do so. See https://www.fpcomplete.com/blog/storing-generated-cabal-files/ +# *.cabal diff --git a/Jikka.cabal b/Jikka.cabal new file mode 100644 index 00000000..870122a2 --- /dev/null +++ b/Jikka.cabal @@ -0,0 +1,259 @@ +cabal-version: 1.12 + +-- This file has been generated from package.yaml by hpack version 0.34.4. +-- +-- see: https://github.com/sol/hpack + +name: Jikka +version: 5.0.11.0 +synopsis: A transpiler from Python to C++ for competitive programming +description: Please see the README on GitHub at +category: Compilers/Interpreters +homepage: https://github.com/kmyk/Jikka#readme +bug-reports: https://github.com/kmyk/Jikka/issues +author: Kimiyuki Onaka +maintainer: kimiyuk95@gmail.com +copyright: 2021 Kimiyuki Onaka +license: Apache +license-file: LICENSE +build-type: Simple +extra-source-files: + README.md + CHANGELOG.md + +source-repository head + type: git + location: https://github.com/kmyk/Jikka + +library + exposed-modules: + Jikka.Common.Alpha + Jikka.Common.Combinatorics + Jikka.Common.Error + Jikka.Common.Format.AutoIndent + Jikka.Common.Format.Color + Jikka.Common.Format.Error + Jikka.Common.Format.Location + Jikka.Common.Format.Show + Jikka.Common.Graph + Jikka.Common.IO + Jikka.Common.IOFormat + Jikka.Common.Location + Jikka.Common.Matrix + Jikka.Common.ModInt + Jikka.Common.Parse.JoinLines + Jikka.Common.Parse.OffsideRule + Jikka.Common.Parse.Read + Jikka.Common.Parse.ShuntingYard + Jikka.Core.Convert + Jikka.Core.Convert.Alpha + Jikka.Core.Convert.ANormal + Jikka.Core.Convert.ArithmeticalExpr + Jikka.Core.Convert.Beta + Jikka.Core.Convert.BubbleLet + Jikka.Core.Convert.CloseAll + Jikka.Core.Convert.CloseMin + Jikka.Core.Convert.CloseSum + Jikka.Core.Convert.ConstantFolding + Jikka.Core.Convert.ConstantPropagation + Jikka.Core.Convert.ConvexHullTrick + Jikka.Core.Convert.CumulativeSum + Jikka.Core.Convert.Eta + Jikka.Core.Convert.MakeScanl + Jikka.Core.Convert.MatrixExponentiation + Jikka.Core.Convert.PropagateMod + Jikka.Core.Convert.RemoveUnusedVars + Jikka.Core.Convert.SegmentTree + Jikka.Core.Convert.ShortCutFusion + Jikka.Core.Convert.SpecializeFoldl + Jikka.Core.Convert.StrengthReduction + Jikka.Core.Convert.TrivialLetElimination + Jikka.Core.Convert.TypeInfer + Jikka.Core.Convert.UnpackTuple + Jikka.Core.Evaluate + Jikka.Core.Format + Jikka.Core.Language.ArithmeticalExpr + Jikka.Core.Language.Beta + Jikka.Core.Language.BuiltinPatterns + Jikka.Core.Language.Expr + Jikka.Core.Language.FreeVars + Jikka.Core.Language.Lint + Jikka.Core.Language.RewriteRules + Jikka.Core.Language.Runtime + Jikka.Core.Language.TypeCheck + Jikka.Core.Language.Util + Jikka.Core.Language.Value + Jikka.CPlusPlus.Convert + Jikka.CPlusPlus.Convert.AddMain + Jikka.CPlusPlus.Convert.FromCore + Jikka.CPlusPlus.Convert.MoveSemantics + Jikka.CPlusPlus.Convert.OptimizeRange + Jikka.CPlusPlus.Convert.UnpackTuples + Jikka.CPlusPlus.Convert.UseInitialization + Jikka.CPlusPlus.Format + Jikka.CPlusPlus.Language.Expr + Jikka.CPlusPlus.Language.Util + Jikka.CPlusPlus.Language.VariableAnalysis + Jikka.Main + Jikka.Main.Subcommand.Convert + Jikka.Main.Subcommand.Debug + Jikka.Main.Subcommand.Execute + Jikka.Main.Target + Jikka.Python.Convert.ToRestrictedPython + Jikka.Python.Language.Expr + Jikka.Python.Language.Util + Jikka.Python.Parse + Jikka.Python.Parse.Alex + Jikka.Python.Parse.Happy + Jikka.Python.Parse.Token + Jikka.RestrictedPython.Convert + Jikka.RestrictedPython.Convert.Alpha + Jikka.RestrictedPython.Convert.DefaultMain + Jikka.RestrictedPython.Convert.ParseMain + Jikka.RestrictedPython.Convert.RemoveUnbalancedIf + Jikka.RestrictedPython.Convert.RemoveUnreachable + Jikka.RestrictedPython.Convert.ResolveBuiltin + Jikka.RestrictedPython.Convert.SplitLoops + Jikka.RestrictedPython.Convert.ToCore + Jikka.RestrictedPython.Convert.TypeInfer + Jikka.RestrictedPython.Convert.UseAppend + Jikka.RestrictedPython.Evaluate + Jikka.RestrictedPython.Format + Jikka.RestrictedPython.Language.Builtin + Jikka.RestrictedPython.Language.Expr + Jikka.RestrictedPython.Language.Lint + Jikka.RestrictedPython.Language.Util + Jikka.RestrictedPython.Language.Value + Jikka.RestrictedPython.Language.VariableAnalysis + Jikka.RestrictedPython.Language.WithoutLoc + other-modules: + Paths_Jikka + hs-source-dirs: + src + ghc-options: -W -optP-Wno-nonportable-include-path + build-tools: + alex + , happy + build-depends: + ansi-terminal ==0.11.* + , array >=0.5.3 && <0.6 + , base ==4.14.* + , containers >=0.6.0 && <0.7 + , deepseq >=1.4.4 && <1.5 + , mtl >=2.2.2 && <2.3 + , text >=1.2.3 && <1.3 + , transformers >=0.5.6 && <0.6 + , vector >=0.12.0 && <0.13 + default-language: Haskell2010 + +executable jikka + main-is: Main.hs + other-modules: + Paths_Jikka + hs-source-dirs: + app + ghc-options: -W -threaded -rtsopts -with-rtsopts=-N -optP-Wno-nonportable-include-path + build-depends: + Jikka + , ansi-terminal ==0.11.* + , array >=0.5.3 && <0.6 + , base ==4.14.* + , containers >=0.6.0 && <0.7 + , deepseq >=1.4.4 && <1.5 + , mtl >=2.2.2 && <2.3 + , text >=1.2.3 && <1.3 + , transformers >=0.5.6 && <0.6 + , vector >=0.12.0 && <0.13 + default-language: Haskell2010 + +test-suite jikka-doctest + type: exitcode-stdio-1.0 + main-is: doctests.hs + other-modules: + Paths_Jikka + hs-source-dirs: + ./ + ghc-options: -W -threaded -rtsopts -with-rtsopts=-N -optP-Wno-nonportable-include-path + build-depends: + Jikka + , ansi-terminal ==0.11.* + , array >=0.5.3 && <0.6 + , base ==4.14.* + , containers >=0.6.0 && <0.7 + , deepseq >=1.4.4 && <1.5 + , doctest + , mtl >=2.2.2 && <2.3 + , text >=1.2.3 && <1.3 + , transformers >=0.5.6 && <0.6 + , vector >=0.12.0 && <0.13 + default-language: Haskell2010 + +test-suite jikka-test + type: exitcode-stdio-1.0 + main-is: Spec.hs + other-modules: + Jikka.Common.MatrixSpec + Jikka.Common.Parse.JoinLinesSpec + Jikka.Common.Parse.OffsideRuleSpec + Jikka.Common.Parse.ShuntingYardSpec + Jikka.Core.Convert.AlphaSpec + Jikka.Core.Convert.ANormalSpec + Jikka.Core.Convert.BetaSpec + Jikka.Core.Convert.CloseSumSpec + Jikka.Core.Convert.ConstantFoldingSpec + Jikka.Core.Convert.ConstantPropagationSpec + Jikka.Core.Convert.EtaSpec + Jikka.Core.Convert.MakeScanlSpec + Jikka.Core.Convert.MatrixExponentiationSpec + Jikka.Core.Convert.PropagateModSpec + Jikka.Core.Convert.RemoveUnusedVarsSpec + Jikka.Core.Convert.ShortCutFusionSpec + Jikka.Core.Convert.SpecializeFoldlSpec + Jikka.Core.Convert.TrivialLetEliminationSpec + Jikka.Core.Convert.TypeInferSpec + Jikka.Core.Convert.UnpackTupleSpec + Jikka.Core.EvaluateSpec + Jikka.Core.FormatSpec + Jikka.Core.Language.ArithmeticalExprSpec + Jikka.Core.Language.BetaSpec + Jikka.CPlusPlus.Convert.FromCoreSpec + Jikka.CPlusPlus.FormatSpec + Jikka.Python.Convert.ToRestrictedPythonSpec + Jikka.Python.Parse.AlexSpec + Jikka.Python.Parse.HappySpec + Jikka.Python.ParseSpec + Jikka.RestrictedPython.Convert.AlphaSpec + Jikka.RestrictedPython.Convert.RemoveUnbalancedIfSpec + Jikka.RestrictedPython.Convert.RemoveUnreachableSpec + Jikka.RestrictedPython.Convert.ResolveBuiltinSpec + Jikka.RestrictedPython.Convert.SplitLoopsSpec + Jikka.RestrictedPython.Convert.ToCoreSpec + Jikka.RestrictedPython.Convert.TypeInferSpec + Jikka.RestrictedPython.EvaluateSpec + Jikka.RestrictedPython.FormatSpec + Jikka.RestrictedPython.Language.BuiltinSpec + Jikka.RestrictedPython.Language.LintSpec + Jikka.RestrictedPython.Language.TypeInferSpec + Jikka.RestrictedPython.Language.UtilSpec + Jikka.RestrictedPython.Language.VariableAnalysisSpec + Paths_Jikka + hs-source-dirs: + test + ghc-options: -W -threaded -rtsopts -with-rtsopts=-N -optP-Wno-nonportable-include-path + build-tool-depends: + hspec-discover:hspec-discover + build-depends: + Jikka + , ansi-terminal ==0.11.* + , array >=0.5.3 && <0.6 + , base ==4.14.* + , containers >=0.6.0 && <0.7 + , deepseq >=1.4.4 && <1.5 + , hlint + , hspec + , mtl >=2.2.2 && <2.3 + , ormolu + , text >=1.2.3 && <1.3 + , transformers >=0.5.6 && <0.6 + , vector >=0.12.0 && <0.13 + default-language: Haskell2010 From 1c8a762688443f90b39215f1cdce03fdf7b7dbb3 Mon Sep 17 00:00:00 2001 From: Kimiyuki Onaka Date: Wed, 28 Jul 2021 14:39:15 +0900 Subject: [PATCH 3/3] chore: v5.0.11.1 --- CHANGELOG.md | 4 ++++ Jikka.cabal | 2 +- package.yaml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ebe29d8..b77b9915 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog for Jikka +## 2021-07-28: v5.0.11.1 + +Uploaded to Hackage + ## 2021-07-21: v5.0.11.0 Convex Hull Trick and Segment Trees are implemented. diff --git a/Jikka.cabal b/Jikka.cabal index 870122a2..8e0eed60 100644 --- a/Jikka.cabal +++ b/Jikka.cabal @@ -5,7 +5,7 @@ cabal-version: 1.12 -- see: https://github.com/sol/hpack name: Jikka -version: 5.0.11.0 +version: 5.0.11.1 synopsis: A transpiler from Python to C++ for competitive programming description: Please see the README on GitHub at category: Compilers/Interpreters diff --git a/package.yaml b/package.yaml index 3a8ad5fe..22e3be41 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: Jikka -version: 5.0.11.0 +version: 5.0.11.1 github: "kmyk/Jikka" license: Apache author: "Kimiyuki Onaka"