mirror of
https://github.com/github/semantic.git
synced 2024-12-24 23:42:31 +03:00
Merge remote-tracking branch 'origin/master' into semantic-scope-graph
This commit is contained in:
commit
2cbc52804b
14
.github/workflows/haskell.yml
vendored
14
.github/workflows/haskell.yml
vendored
@ -11,14 +11,14 @@ on:
|
||||
jobs:
|
||||
build:
|
||||
name: ghc ${{ matrix.ghc }}
|
||||
runs-on: ubuntu-16.04
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
ghc: ["8.8.1"]
|
||||
cabal: ["3.0"]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@master
|
||||
- uses: actions/checkout@v2
|
||||
if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master'
|
||||
|
||||
- uses: actions/setup-haskell@v1
|
||||
@ -27,12 +27,6 @@ jobs:
|
||||
ghc-version: ${{ matrix.ghc }}
|
||||
cabal-version: ${{ matrix.cabal }}
|
||||
|
||||
- uses: actions/cache@v1
|
||||
name: Cache ~/.cabal/packages
|
||||
with:
|
||||
path: ~/.cabal/packages
|
||||
key: ${{ runner.os }}-${{ matrix.ghc }}-v1-cabal-packages
|
||||
|
||||
- uses: actions/cache@v1
|
||||
name: Cache ~/.cabal/store
|
||||
with:
|
||||
@ -43,13 +37,13 @@ jobs:
|
||||
name: Cache dist-newstyle
|
||||
with:
|
||||
path: dist-newstyle
|
||||
key: ${{ runner.os }}-${{ matrix.ghc }}-semantic-dist
|
||||
key: ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.cabal }}-semantic-dist
|
||||
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
cabal v2-update
|
||||
cabal v2-configure --disable-optimization --enable-benchmarks --enable-tests --write-ghc-environment-files=always -j2
|
||||
cabal v2-build --only-dependencies
|
||||
cabal v2-build all --only-dependencies
|
||||
|
||||
- name: hlint
|
||||
run: |
|
||||
|
@ -2,8 +2,10 @@ module Main (main) where
|
||||
|
||||
import Gauge
|
||||
import qualified Evaluation
|
||||
import qualified Tagging
|
||||
|
||||
main :: IO ()
|
||||
main = defaultMain
|
||||
[ Evaluation.benchmarks
|
||||
[ Tagging.benchmarks
|
||||
, Evaluation.benchmarks
|
||||
]
|
||||
|
97
bench/Tagging.hs
Normal file
97
bench/Tagging.hs
Normal file
@ -0,0 +1,97 @@
|
||||
{-# LANGUAGE FlexibleContexts #-}
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
{-# LANGUAGE TypeApplications #-}
|
||||
|
||||
module Tagging (benchmarks) where
|
||||
|
||||
import Control.Carrier.Parse.Measured
|
||||
import Control.Carrier.Reader
|
||||
import Control.Exception (throwIO)
|
||||
import Control.Monad
|
||||
import Data.Blob
|
||||
import Data.Foldable
|
||||
import Data.Language (LanguageMode (..), PerLanguageModes (..))
|
||||
import Gauge
|
||||
import System.FilePath.Glob
|
||||
import qualified System.Path as Path
|
||||
|
||||
import Data.Flag
|
||||
import Proto.Semantic as P hiding (Blob, BlobPair)
|
||||
import Semantic.Api.Symbols (parseSymbols)
|
||||
import Semantic.Config as Config
|
||||
import Semantic.Task
|
||||
import Semantic.Task.Files
|
||||
|
||||
benchmarks :: Benchmark
|
||||
benchmarks = bgroup "tagging"
|
||||
[ pythonBenchmarks
|
||||
, goBenchmarks
|
||||
, rubyBenchmarks
|
||||
]
|
||||
|
||||
pythonBenchmarks :: Benchmark
|
||||
pythonBenchmarks = bgroup "python"
|
||||
[ bench "precise" $ runTagging preciseLanguageModes pyDir "*.py"
|
||||
, bench "a la carte" $ runTagging aLaCarteLanguageModes pyDir "*.py"
|
||||
]
|
||||
where pyDir = Path.relDir "tmp/python-examples/keras/keras"
|
||||
|
||||
goBenchmarks :: Benchmark
|
||||
goBenchmarks = bgroup "go"
|
||||
[ bench "precise" $ runTagging preciseLanguageModes dir "*.go"
|
||||
, bench "a la carte" $ runTagging aLaCarteLanguageModes dir "*.go"
|
||||
]
|
||||
where dir = Path.relDir "tmp/go-examples/go/src/database/sql"
|
||||
|
||||
rubyBenchmarks :: Benchmark
|
||||
rubyBenchmarks = bgroup "ruby"
|
||||
[ bench "precise" $ runTagging preciseLanguageModes dir "*.rb"
|
||||
, bench "a la carte" $ runTagging aLaCarteLanguageModes dir "*.rb"
|
||||
]
|
||||
where dir = Path.relDir "tmp/ruby-examples/ruby_spec/command_line"
|
||||
|
||||
runTagging :: PerLanguageModes -> Path.RelDir -> String -> Benchmarkable
|
||||
runTagging mode dir glob = nfIO . withOptions testOptions $ \ config logger statter -> do
|
||||
let session = TaskSession config "-" False logger statter
|
||||
files <- globDir1 (compile glob) (Path.toString dir)
|
||||
let paths = Path.relFile <$> files
|
||||
for_ paths (runTask session . runParse . parseSymbolsFilePath mode >=> either throwIO pure)
|
||||
|
||||
parseSymbolsFilePath ::
|
||||
( Has (Error SomeException) sig m
|
||||
, Has Distribute sig m
|
||||
, Has Parse sig m
|
||||
, Has Files sig m
|
||||
)
|
||||
=> PerLanguageModes
|
||||
-> Path.RelFile
|
||||
-> m ParseTreeSymbolResponse
|
||||
parseSymbolsFilePath languageModes path = readBlob (fileForTypedPath path) >>= runReader languageModes . parseSymbols . pure @[]
|
||||
|
||||
aLaCarteLanguageModes :: PerLanguageModes
|
||||
aLaCarteLanguageModes = PerLanguageModes
|
||||
{ pythonMode = ALaCarte
|
||||
, rubyMode = ALaCarte
|
||||
, goMode = ALaCarte
|
||||
, typescriptMode = ALaCarte
|
||||
, tsxMode = ALaCarte
|
||||
, javascriptMode = ALaCarte
|
||||
, jsxMode = ALaCarte
|
||||
}
|
||||
|
||||
preciseLanguageModes :: PerLanguageModes
|
||||
preciseLanguageModes = PerLanguageModes
|
||||
{ pythonMode = Precise
|
||||
, rubyMode = Precise
|
||||
, goMode = Precise
|
||||
, typescriptMode = Precise
|
||||
, tsxMode = Precise
|
||||
, javascriptMode = Precise
|
||||
, jsxMode = Precise
|
||||
}
|
||||
|
||||
testOptions :: Config.Options
|
||||
testOptions = defaultOptions
|
||||
{ optionsFailOnWarning = flag FailOnWarning True
|
||||
, optionsLogLevel = Nothing
|
||||
}
|
@ -41,9 +41,9 @@ library
|
||||
-- other-modules:
|
||||
-- other-extensions:
|
||||
build-depends: base ^>= 4.13
|
||||
, tree-sitter ^>= 0.7.2
|
||||
, tree-sitter ^>= 0.8
|
||||
, semantic-source ^>= 0.0
|
||||
, tree-sitter-python ^>= 0.8
|
||||
, tree-sitter-python ^>= 0.8.1
|
||||
, bytestring ^>= 0.10.8.2
|
||||
, optparse-applicative >= 0.14.3 && < 0.16
|
||||
, pretty-simple ^>= 3.1.0.0
|
||||
|
@ -28,8 +28,8 @@ common haskell
|
||||
, semantic-source ^>= 0.0
|
||||
, semantic-tags ^>= 0.0
|
||||
, text ^>= 1.2.3
|
||||
, tree-sitter ^>= 0.7.2
|
||||
, tree-sitter-go ^>= 0.4
|
||||
, tree-sitter ^>= 0.8
|
||||
, tree-sitter-go ^>= 0.4.1
|
||||
|
||||
ghc-options:
|
||||
-Weverything
|
||||
|
@ -5,6 +5,7 @@ module Language.Go
|
||||
) where
|
||||
|
||||
|
||||
import Data.Proxy
|
||||
import qualified Language.Go.Tags as GoTags
|
||||
import qualified Tags.Tagging.Precise as Tags
|
||||
import qualified TreeSitter.Go (tree_sitter_go)
|
||||
@ -13,8 +14,12 @@ import qualified TreeSitter.Unmarshal as TS
|
||||
|
||||
newtype Term a = Term { getTerm :: Go.SourceFile a }
|
||||
|
||||
instance TS.SymbolMatching Term where
|
||||
matchedSymbols _ = TS.matchedSymbols (Proxy :: Proxy Go.SourceFile)
|
||||
showFailure _ = TS.showFailure (Proxy :: Proxy Go.SourceFile)
|
||||
|
||||
instance TS.Unmarshal Term where
|
||||
unmarshalNode node = Term <$> TS.unmarshalNode node
|
||||
matchers = fmap (fmap (TS.hoist Term)) TS.matchers
|
||||
|
||||
instance Tags.ToTags Term where
|
||||
tags src = Tags.runTagging src . GoTags.tags . getTerm
|
||||
|
@ -27,8 +27,8 @@ library
|
||||
, fused-effects ^>= 1.0
|
||||
, semantic-source ^>= 0.0
|
||||
, semantic-tags ^>= 0.0
|
||||
, tree-sitter ^>= 0.7.2
|
||||
, tree-sitter-java ^>= 0.6
|
||||
, tree-sitter ^>= 0.8
|
||||
, tree-sitter-java ^>= 0.6.1
|
||||
hs-source-dirs: src
|
||||
default-language: Haskell2010
|
||||
ghc-options:
|
||||
|
@ -4,6 +4,7 @@ module Language.Java
|
||||
, TreeSitter.Java.tree_sitter_java
|
||||
) where
|
||||
|
||||
import Data.Proxy
|
||||
import qualified Language.Java.Tags as JavaTags
|
||||
import qualified Tags.Tagging.Precise as Tags
|
||||
import qualified TreeSitter.Java (tree_sitter_java)
|
||||
@ -12,8 +13,12 @@ import qualified TreeSitter.Unmarshal as TS
|
||||
|
||||
newtype Term a = Term { getTerm :: Java.Program a }
|
||||
|
||||
instance TS.SymbolMatching Term where
|
||||
matchedSymbols _ = TS.matchedSymbols (Proxy :: Proxy Java.Program)
|
||||
showFailure _ = TS.showFailure (Proxy :: Proxy Java.Program)
|
||||
|
||||
instance TS.Unmarshal Term where
|
||||
unmarshalNode node = Term <$> TS.unmarshalNode node
|
||||
matchers = fmap (fmap (TS.hoist Term)) TS.matchers
|
||||
|
||||
instance Tags.ToTags Term where
|
||||
tags src = Tags.runTagging src . JavaTags.tags . getTerm
|
||||
|
@ -24,8 +24,8 @@ library
|
||||
build-depends:
|
||||
base >= 4.13 && < 5
|
||||
, semantic-tags ^>= 0.0
|
||||
, tree-sitter ^>= 0.7.2
|
||||
, tree-sitter-json ^>= 0.5
|
||||
, tree-sitter ^>= 0.8
|
||||
, tree-sitter-json ^>= 0.6
|
||||
hs-source-dirs: src
|
||||
default-language: Haskell2010
|
||||
ghc-options:
|
||||
|
@ -4,6 +4,7 @@ module Language.JSON
|
||||
, TreeSitter.JSON.tree_sitter_json
|
||||
) where
|
||||
|
||||
import Data.Proxy
|
||||
import qualified Tags.Tagging.Precise as Tags
|
||||
import qualified TreeSitter.JSON (tree_sitter_json)
|
||||
import qualified TreeSitter.JSON.AST as JSON
|
||||
@ -11,8 +12,12 @@ import qualified TreeSitter.Unmarshal as TS
|
||||
|
||||
newtype Term a = Term { getTerm :: JSON.Document a }
|
||||
|
||||
instance TS.SymbolMatching Term where
|
||||
matchedSymbols _ = TS.matchedSymbols (Proxy :: Proxy JSON.Document)
|
||||
showFailure _ = TS.showFailure (Proxy :: Proxy JSON.Document)
|
||||
|
||||
instance TS.Unmarshal Term where
|
||||
unmarshalNode node = Term <$> TS.unmarshalNode node
|
||||
matchers = fmap (fmap (TS.hoist Term)) TS.matchers
|
||||
|
||||
-- | Tags aren’t really meaningful for JSON, but by implementing this we can avoid having to customize the set of parsers used for computing tags.
|
||||
instance Tags.ToTags Term where
|
||||
|
@ -30,8 +30,9 @@ common haskell
|
||||
, semantic-scope-graph ^>= 0.0
|
||||
, semilattices ^>= 0
|
||||
, text ^>= 1.2.3
|
||||
, tree-sitter ^>= 0.7.2
|
||||
, tree-sitter-python ^>= 0.8
|
||||
, tree-sitter ^>= 0.8
|
||||
, tree-sitter-python ^>= 0.8.1
|
||||
|
||||
ghc-options:
|
||||
-Weverything
|
||||
-Wno-missing-local-signatures
|
||||
|
@ -4,7 +4,7 @@ module Language.Python
|
||||
, TreeSitter.Python.tree_sitter_python
|
||||
) where
|
||||
|
||||
import Language.Python.ScopeGraph
|
||||
import Data.Proxy
|
||||
import qualified Language.Python.Tags as PyTags
|
||||
import ScopeGraph.Convert
|
||||
import qualified Tags.Tagging.Precise as Tags
|
||||
@ -14,8 +14,12 @@ import qualified TreeSitter.Unmarshal as TS
|
||||
|
||||
newtype Term a = Term { getTerm :: Py.Module a }
|
||||
|
||||
instance TS.SymbolMatching Term where
|
||||
matchedSymbols _ = TS.matchedSymbols (Proxy :: Proxy Py.Module)
|
||||
showFailure _ = TS.showFailure (Proxy :: Proxy Py.Module)
|
||||
|
||||
instance TS.Unmarshal Term where
|
||||
unmarshalNode node = Term <$> TS.unmarshalNode node
|
||||
matchers = fmap (fmap (TS.hoist Term)) TS.matchers
|
||||
|
||||
instance Tags.ToTags Term where
|
||||
tags src = Tags.runTagging src . PyTags.tags . getTerm
|
||||
|
@ -49,6 +49,9 @@ newtype Bindings = Bindings { unBindings :: Stack Name }
|
||||
def :: Name -> Bindings -> Bindings
|
||||
def n = coerce (Stack.:> n)
|
||||
|
||||
prelude :: Has Core sig t => [Name] -> t Name
|
||||
prelude = foldl' (\a b -> a ... b) (pure "__semantic_prelude")
|
||||
|
||||
-- We leave the representation of Core syntax abstract so that it's not
|
||||
-- possible for us to 'cheat' by pattern-matching on or eliminating a
|
||||
-- compiled term.
|
||||
@ -199,8 +202,8 @@ instance Compile Py.ClassDefinition where
|
||||
bindings <- asks @Bindings (toList . unBindings)
|
||||
let buildName n = (n, pure n)
|
||||
contents = record . fmap buildName $ bindings
|
||||
typefn = pure "__semantic_prelude" ... "type"
|
||||
object = pure "__semantic_prelude" ... "object"
|
||||
typefn = prelude ["type"]
|
||||
object = prelude ["object"]
|
||||
|
||||
pure (typefn $$ Core.string (coerce n) $$ object $$ contents)
|
||||
|
||||
@ -346,11 +349,15 @@ instance Compile Py.Module where
|
||||
instance Compile Py.NamedExpression
|
||||
|
||||
instance Compile Py.None where
|
||||
-- None is not overridable, and thus always points to the prelude's None.
|
||||
compile _it cc _ = cc (pure "__semantic_prelude" ... "None")
|
||||
-- None is not an lvalue, and thus always points to the prelude's None.
|
||||
compile _it cc _ = cc (prelude ["None"])
|
||||
|
||||
instance Compile Py.NonlocalStatement
|
||||
instance Compile Py.NotOperator
|
||||
|
||||
instance Compile Py.NotOperator where
|
||||
compile _it@Py.NotOperator{ argument } cc next = do
|
||||
val <- compile argument pure next
|
||||
cc (prelude ["not"] $$ val)
|
||||
|
||||
instance Compile Py.ParenthesizedExpression where
|
||||
compile it@Py.ParenthesizedExpression { extraChildren } cc
|
||||
@ -387,7 +394,7 @@ instance Compile Py.String where
|
||||
|
||||
if any isNothing contents
|
||||
then pure . invariantViolated $ "Couldn't string-desugar " <> show it
|
||||
else let new = pure "__semantic_prelude" ... "str" ... "__slots" ... "__new__"
|
||||
else let new = prelude ["str", "__slots", "__new__"]
|
||||
in cc $ locate it (new $$ Core.string (mconcat (catMaybes contents)))
|
||||
|
||||
instance Compile Py.Subscript
|
||||
|
@ -10,6 +10,10 @@
|
||||
|
||||
str <- type "str" object #record { __new__: \prim -> instance #unit prim #record{} };
|
||||
|
||||
// We will fill in the actual definition of these operators
|
||||
// pending the presence of more eliminators.
|
||||
not <- \val -> if val then #false else #true;
|
||||
|
||||
NoneType <- type "None" object #record { __new__: \prim -> instance #unit prim #record{} };
|
||||
None <- NoneType.__slots.__new__ #unit;
|
||||
|
||||
@ -19,6 +23,7 @@
|
||||
#record { type: type
|
||||
, object: object
|
||||
, str: str
|
||||
, not: not
|
||||
, NoneType: NoneType
|
||||
, None: None
|
||||
, getitem: getitem}
|
||||
|
2
semantic-python/test/fixtures/4-03-not-expression.py
vendored
Normal file
2
semantic-python/test/fixtures/4-03-not-expression.py
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
# CHECK-TREE: { x <- __semantic_prelude.not #true; #record { x: x }}
|
||||
x = not True
|
@ -28,8 +28,8 @@ common haskell
|
||||
, semantic-source ^>= 0.0
|
||||
, semantic-tags ^>= 0.0
|
||||
, text ^>= 1.2.3
|
||||
, tree-sitter ^>= 0.7.2
|
||||
, tree-sitter-ruby ^>= 0.4
|
||||
, tree-sitter ^>= 0.8
|
||||
, tree-sitter-ruby ^>= 0.4.1
|
||||
|
||||
ghc-options:
|
||||
-Weverything
|
||||
|
@ -6,10 +6,10 @@ module Language.Ruby
|
||||
, TreeSitter.Ruby.tree_sitter_ruby
|
||||
) where
|
||||
|
||||
|
||||
import Control.Carrier.State.Strict
|
||||
import Data.Text (Text)
|
||||
import qualified Language.Ruby.Tags as PyTags
|
||||
import Control.Carrier.State.Strict
|
||||
import Data.Proxy
|
||||
import Data.Text (Text)
|
||||
import qualified Language.Ruby.Tags as RbTags
|
||||
import qualified Tags.Tagging.Precise as Tags
|
||||
import qualified TreeSitter.Ruby (tree_sitter_ruby)
|
||||
import qualified TreeSitter.Ruby.AST as Rb
|
||||
@ -17,8 +17,12 @@ import qualified TreeSitter.Unmarshal as TS
|
||||
|
||||
newtype Term a = Term { getTerm :: Rb.Program a }
|
||||
|
||||
instance TS.SymbolMatching Term where
|
||||
matchedSymbols _ = TS.matchedSymbols (Proxy :: Proxy Rb.Program)
|
||||
showFailure _ = TS.showFailure (Proxy :: Proxy Rb.Program)
|
||||
|
||||
instance TS.Unmarshal Term where
|
||||
unmarshalNode node = Term <$> TS.unmarshalNode node
|
||||
matchers = fmap (fmap (TS.hoist Term)) TS.matchers
|
||||
|
||||
instance Tags.ToTags Term where
|
||||
tags src = Tags.runTagging src . evalState @[Text] [] . PyTags.tags . getTerm
|
||||
tags src = Tags.runTagging src . evalState @[Text] [] . RbTags.tags . getTerm
|
||||
|
@ -28,8 +28,8 @@ common haskell
|
||||
, semantic-source ^>= 0.0
|
||||
, semantic-tags ^>= 0.0
|
||||
, text ^>= 1.2.3
|
||||
, tree-sitter ^>= 0.7.2
|
||||
, tree-sitter-tsx ^>= 0.4
|
||||
, tree-sitter ^>= 0.8
|
||||
, tree-sitter-tsx ^>= 0.4.1
|
||||
|
||||
ghc-options:
|
||||
-Weverything
|
||||
|
@ -5,7 +5,7 @@ module Language.TSX
|
||||
, TreeSitter.TSX.tree_sitter_tsx
|
||||
) where
|
||||
|
||||
|
||||
import Data.Proxy
|
||||
import qualified Language.TSX.Tags as TsxTags
|
||||
import qualified Tags.Tagging.Precise as Tags
|
||||
import qualified TreeSitter.TSX (tree_sitter_tsx)
|
||||
@ -14,8 +14,12 @@ import qualified TreeSitter.Unmarshal as TS
|
||||
|
||||
newtype Term a = Term { getTerm :: TSX.Program a }
|
||||
|
||||
instance TS.SymbolMatching Term where
|
||||
matchedSymbols _ = TS.matchedSymbols (Proxy :: Proxy TSX.Program)
|
||||
showFailure _ = TS.showFailure (Proxy :: Proxy TSX.Program)
|
||||
|
||||
instance TS.Unmarshal Term where
|
||||
unmarshalNode node = Term <$> TS.unmarshalNode node
|
||||
matchers = fmap (fmap (TS.hoist Term)) TS.matchers
|
||||
|
||||
instance Tags.ToTags Term where
|
||||
tags src = Tags.runTagging src . TsxTags.tags . getTerm
|
||||
|
@ -28,8 +28,8 @@ common haskell
|
||||
, semantic-source ^>= 0.0
|
||||
, semantic-tags ^>= 0.0
|
||||
, text ^>= 1.2.3
|
||||
, tree-sitter ^>= 0.7.2
|
||||
, tree-sitter-typescript ^>= 0.4
|
||||
, tree-sitter ^>= 0.8
|
||||
, tree-sitter-typescript ^>= 0.4.1
|
||||
|
||||
ghc-options:
|
||||
-Weverything
|
||||
|
@ -5,7 +5,7 @@ module Language.TypeScript
|
||||
, TreeSitter.TypeScript.tree_sitter_typescript
|
||||
) where
|
||||
|
||||
|
||||
import Data.Proxy
|
||||
import qualified Language.TypeScript.Tags as TsTags
|
||||
import qualified Tags.Tagging.Precise as Tags
|
||||
import qualified TreeSitter.TypeScript (tree_sitter_typescript)
|
||||
@ -14,8 +14,12 @@ import qualified TreeSitter.Unmarshal as TS
|
||||
|
||||
newtype Term a = Term { getTerm :: TypeScript.Program a }
|
||||
|
||||
instance TS.SymbolMatching Term where
|
||||
matchedSymbols _ = TS.matchedSymbols (Proxy :: Proxy TypeScript.Program)
|
||||
showFailure _ = TS.showFailure (Proxy :: Proxy TypeScript.Program)
|
||||
|
||||
instance TS.Unmarshal Term where
|
||||
unmarshalNode node = Term <$> TS.unmarshalNode node
|
||||
matchers = fmap (fmap (TS.hoist Term)) TS.matchers
|
||||
|
||||
instance Tags.ToTags Term where
|
||||
tags src = Tags.runTagging src . TsTags.tags . getTerm
|
||||
|
@ -59,7 +59,7 @@ common dependencies
|
||||
, fused-effects-exceptions ^>= 1
|
||||
, fused-effects-resumable ^>= 0.1
|
||||
, hashable >= 1.2.7 && < 1.4
|
||||
, tree-sitter ^>= 0.7.2
|
||||
, tree-sitter ^>= 0.8
|
||||
, mtl ^>= 2.2.2
|
||||
, network ^>= 2.8.0.0
|
||||
, pathtype ^>= 0.8.1
|
||||
@ -303,12 +303,12 @@ library
|
||||
, unliftio-core ^>= 0.1.2.0
|
||||
, unordered-containers ^>= 0.2.9.0
|
||||
, vector ^>= 0.12.0.2
|
||||
, tree-sitter-go ^>= 0.4
|
||||
, tree-sitter-go ^>= 0.4.1
|
||||
, tree-sitter-php ^>= 0.2
|
||||
, tree-sitter-python ^>= 0.8
|
||||
, tree-sitter-ruby ^>= 0.4
|
||||
, tree-sitter-typescript ^>= 0.4
|
||||
, tree-sitter-tsx ^>= 0.4
|
||||
, tree-sitter-python ^>= 0.8.1
|
||||
, tree-sitter-ruby ^>= 0.4.1
|
||||
, tree-sitter-typescript ^>= 0.4.1
|
||||
, tree-sitter-tsx ^>= 0.4.1
|
||||
|
||||
executable semantic
|
||||
import: haskell, dependencies, executable-flags
|
||||
@ -358,7 +358,7 @@ test-suite test
|
||||
, Generators
|
||||
, Properties
|
||||
build-depends: semantic
|
||||
, tree-sitter-json ^>= 0.5
|
||||
, tree-sitter-json ^>= 0.6
|
||||
, Glob ^>= 0.10.0
|
||||
, hedgehog ^>= 1
|
||||
, hspec >= 2.6 && <3
|
||||
@ -388,16 +388,19 @@ test-suite parse-examples
|
||||
, tasty
|
||||
, tasty-hunit
|
||||
|
||||
benchmark evaluation
|
||||
benchmark benchmarks
|
||||
import: haskell, dependencies, executable-flags
|
||||
hs-source-dirs: bench
|
||||
type: exitcode-stdio-1.0
|
||||
main-is: Main.hs
|
||||
other-modules: Evaluation
|
||||
, Tagging
|
||||
ghc-options: -static
|
||||
build-depends: base
|
||||
, algebraic-graphs
|
||||
, gauge ^>= 0.2.5
|
||||
, Glob
|
||||
, lens >= 4.17 && < 4.19
|
||||
, semantic
|
||||
, semantic-source
|
||||
|
||||
|
@ -9,7 +9,6 @@ module Parsing.TreeSitter
|
||||
|
||||
import Prologue
|
||||
|
||||
import Control.Carrier.Fail.Either
|
||||
import Control.Carrier.Reader
|
||||
import qualified Control.Exception as Exc
|
||||
import Foreign
|
||||
@ -58,8 +57,8 @@ parseToPreciseAST
|
||||
-> m (Either TSParseException (t Loc))
|
||||
parseToPreciseAST parseTimeout language blob = runParse parseTimeout language blob $ \ rootPtr ->
|
||||
TS.withCursor (castPtr rootPtr) $ \ cursor ->
|
||||
runFail (runReader cursor (runReader (Source.bytes (blobSource blob)) (TS.peekNode >>= TS.unmarshalNode)))
|
||||
>>= either (Exc.throw . UnmarshalFailure) pure
|
||||
runReader (TS.UnmarshalState (Source.bytes (blobSource blob)) cursor) (liftIO (peek rootPtr) >>= TS.unmarshalNode)
|
||||
`Exc.catch` (Exc.throw . UnmarshalFailure . TS.getUnmarshalError)
|
||||
|
||||
instance Exception TSParseException where
|
||||
displayException = \case
|
||||
@ -102,8 +101,8 @@ anaM g = a where a = pure . embed <=< traverse a <=< g
|
||||
|
||||
|
||||
nodeRange :: TS.Node -> Range
|
||||
nodeRange TS.Node{..} = Range (fromIntegral nodeStartByte) (fromIntegral nodeEndByte)
|
||||
nodeRange node = Range (fromIntegral (TS.nodeStartByte node)) (fromIntegral (TS.nodeEndByte node))
|
||||
|
||||
nodeSpan :: TS.Node -> Span
|
||||
nodeSpan TS.Node{..} = nodeStartPoint `seq` nodeEndPoint `seq` Span (pointPos nodeStartPoint) (pointPos nodeEndPoint)
|
||||
nodeSpan node = TS.nodeStartPoint node `seq` TS.nodeEndPoint node `seq` Span (pointPos (TS.nodeStartPoint node)) (pointPos (TS.nodeEndPoint node))
|
||||
where pointPos TS.TSPoint{..} = pointRow `seq` pointColumn `seq` Pos (1 + fromIntegral pointRow) (1 + fromIntegral pointColumn)
|
||||
|
12
test/fixtures/json/corpus/hash.parseA.txt
vendored
12
test/fixtures/json/corpus/hash.parseA.txt
vendored
@ -7,22 +7,26 @@
|
||||
(Number "1"))
|
||||
(String
|
||||
[
|
||||
(StringContent "a") ]))
|
||||
(StringContent
|
||||
[]) ]))
|
||||
(Pair
|
||||
(Value
|
||||
(Number "2"))
|
||||
(String
|
||||
[
|
||||
(StringContent "b") ]))
|
||||
(StringContent
|
||||
[]) ]))
|
||||
(Pair
|
||||
(Value
|
||||
(Number "3"))
|
||||
(String
|
||||
[
|
||||
(StringContent "c") ]))
|
||||
(StringContent
|
||||
[]) ]))
|
||||
(Pair
|
||||
(Value
|
||||
(Number "4"))
|
||||
(String
|
||||
[
|
||||
(StringContent "d") ])) ])))
|
||||
(StringContent
|
||||
[]) ])) ])))
|
||||
|
12
test/fixtures/json/corpus/hash.parseB.txt
vendored
12
test/fixtures/json/corpus/hash.parseB.txt
vendored
@ -7,22 +7,26 @@
|
||||
(Number "2"))
|
||||
(String
|
||||
[
|
||||
(StringContent "b") ]))
|
||||
(StringContent
|
||||
[]) ]))
|
||||
(Pair
|
||||
(Value
|
||||
(Number "3"))
|
||||
(String
|
||||
[
|
||||
(StringContent "c'") ]))
|
||||
(StringContent
|
||||
[]) ]))
|
||||
(Pair
|
||||
(Value
|
||||
(Number "5"))
|
||||
(String
|
||||
[
|
||||
(StringContent "d") ]))
|
||||
(StringContent
|
||||
[]) ]))
|
||||
(Pair
|
||||
(Value
|
||||
(Number "5"))
|
||||
(String
|
||||
[
|
||||
(StringContent "e") ])) ])))
|
||||
(StringContent
|
||||
[]) ])) ])))
|
||||
|
3
test/fixtures/json/corpus/string.parseA.txt
vendored
3
test/fixtures/json/corpus/string.parseA.txt
vendored
@ -5,4 +5,5 @@
|
||||
(Value
|
||||
(String
|
||||
[
|
||||
(StringContent "hello") ])) ])))
|
||||
(StringContent
|
||||
[]) ])) ])))
|
||||
|
3
test/fixtures/json/corpus/string.parseB.txt
vendored
3
test/fixtures/json/corpus/string.parseB.txt
vendored
@ -5,4 +5,5 @@
|
||||
(Value
|
||||
(String
|
||||
[
|
||||
(StringContent "world") ])) ])))
|
||||
(StringContent
|
||||
[]) ])) ])))
|
||||
|
Loading…
Reference in New Issue
Block a user