Skip to content

Commit

Permalink
Merge branch 'master' into document-adding-new-langs
Browse files Browse the repository at this point in the history
  • Loading branch information
patrickt authored Jun 14, 2019
2 parents 01ec755 + 1afb36c commit 3ab02f2
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 14 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ cache:
directories:
- $HOME/.cabal/packages
- $HOME/.cabal/store
- $TRAVIS_BUILD_DIR/dist-newstyle

before_cache:
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ cabal new-test
cabal new-run semantic -- --help
```

`semantic` requires at least GHC 8.6.4. We recommend using [`ghcup`][ghcup] to sandbox GHC versions. Our version bounds are based on [Stackage][stackage] LTS versions. The current LTS version is 13.13. `stack` as a build tool is not officially supported; there is an unofficial [`stack.yaml`](https://gist.github.com/jkachmar/f200caee83280f1f25e9cfa2dd2b16bb) available, though we cannot make guarantees as to its stability.
`semantic` requires at least GHC 8.6.4 and Cabal 2.4. We recommend using [`ghcup`][ghcup] to sandbox GHC versions. `stack` as a build tool is not officially supported; there is an unofficial [`stack.yaml`](https://gist.github.com/jkachmar/f200caee83280f1f25e9cfa2dd2b16bb) available, though we cannot make guarantees as to its stability.

[nix]: https://www.haskell.org/cabal/users-guide/nix-local-build-overview.html
[stackage]: https://stackage.org
Expand Down
9 changes: 5 additions & 4 deletions semantic.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,11 @@ common dependencies
common executable-flags
ghc-options: -threaded -rtsopts "-with-rtsopts=-N -A4m -n2m"

common ghc-warnings
ghc-options: -Wall -Wmissing-export-lists -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints -Wno-name-shadowing

library
import: haskell, dependencies
import: haskell, dependencies, ghc-warnings
hs-source-dirs: src
exposed-modules:
-- Analyses & term annotations
Expand Down Expand Up @@ -321,7 +324,6 @@ library
, tree-sitter-typescript ^>= 0.1.0.0
, tree-sitter-tsx ^>= 0.1.0.0
, tree-sitter-java ^>= 0.1.0.0
ghc-options: -Wall -Wmissing-export-lists -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints -fno-warn-name-shadowing
if flag(release)
cpp-options: -DCOMPUTE_GIT_SHA
else
Expand All @@ -337,10 +339,9 @@ executable semantic
, semantic

test-suite test
import: haskell, dependencies, executable-flags
import: haskell, dependencies, executable-flags, ghc-warnings
type: exitcode-stdio-1.0
hs-source-dirs: test
ghc-options: -Wunused-imports
main-is: Spec.hs
other-modules: Analysis.Go.Spec
, Analysis.PHP.Spec
Expand Down
2 changes: 0 additions & 2 deletions src/Data/Language.hs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ module Data.Language
) where

import Data.Aeson
import Data.Char (toUpper)
import Data.String
import qualified Data.Text as T
import Prologue
import System.FilePath.Posix
Expand Down
2 changes: 0 additions & 2 deletions test/Rendering/TOC/Spec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -225,15 +225,13 @@ blankDiff = merge (Nothing, Nothing) (inject [ inserting (termIn Nothing (inject

-- Diff helpers
diffWithParser :: ( Eq1 syntax
, Show1 syntax
, Traversable syntax
, Diffable syntax
, HasDeclaration syntax
, Hashable1 syntax
, Member Distribute sig
, Member Task sig
, Carrier sig m
, Monad m
)
=> Parser (Term syntax Location)
-> BlobPair
Expand Down
4 changes: 2 additions & 2 deletions test/Reprinting/Spec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

module Reprinting.Spec where

import SpecHelpers hiding (inject, project)
import SpecHelpers

import Data.Foldable
import qualified Data.Machine as Machine

import Control.Rewriting hiding (context)
import Control.Rewriting
import qualified Data.Language as Language
import Data.Reprinting.Scope
import Data.Reprinting.Token
Expand Down
6 changes: 3 additions & 3 deletions test/SpecHelpers.hs
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ module SpecHelpers
, EdgeLabel(..)
) where

import Control.Abstract hiding (lookupDeclaration)
import Control.Abstract
import Data.Abstract.ScopeGraph (EdgeLabel(..))
import qualified Data.Abstract.ScopeGraph as ScopeGraph
import qualified Data.Abstract.Heap as Heap
import Control.Effect.Trace as X (runTraceByIgnoring, runTraceByReturning)
import Control.Monad ((>=>))
import Data.Traversable as X (for)
import Data.Abstract.Address.Precise as X
import Data.Abstract.Evaluatable hiding (lookupDeclaration)
import Data.Abstract.Evaluatable
import Data.Abstract.FreeVariables as X
import Data.Abstract.Module as X
import Data.Abstract.ModuleTable as X hiding (lookup)
Expand All @@ -51,7 +51,7 @@ import Data.String
import Data.Sum
import Data.Term as X
import Parsing.Parser as X
import Semantic.Task as X hiding (parsePackage)
import Semantic.Task as X
import Semantic.Util as X
import Semantic.Graph (runHeap, runScopeGraph)
import System.FilePath as X
Expand Down

0 comments on commit 3ab02f2

Please sign in to comment.