From 9c39c4e0a481fbace95ee4012b50aa6b1319f46e Mon Sep 17 00:00:00 2001 From: Ayman Nadeem Date: Tue, 28 Jan 2020 12:09:29 -0500 Subject: [PATCH] Updata Java dependencies to reference AST.* instead of TreeSitter.* --- semantic-java/src/Language/Java.hs | 2 +- semantic-java/src/Language/Java/AST.hs | 4 ++-- semantic-java/src/Language/Java/Tags.hs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/semantic-java/src/Language/Java.hs b/semantic-java/src/Language/Java.hs index c1f1e5742..a37798d53 100644 --- a/semantic-java/src/Language/Java.hs +++ b/semantic-java/src/Language/Java.hs @@ -9,7 +9,7 @@ import qualified Language.Java.AST as Java import qualified Language.Java.Tags as JavaTags import qualified Tags.Tagging.Precise as Tags import qualified TreeSitter.Java (tree_sitter_java) -import qualified TreeSitter.Unmarshal as TS +import qualified AST.Unmarshal as TS newtype Term a = Term { getTerm :: Java.Program a } diff --git a/semantic-java/src/Language/Java/AST.hs b/semantic-java/src/Language/Java/AST.hs index b81c6eba1..90f2fe90b 100644 --- a/semantic-java/src/Language/Java/AST.hs +++ b/semantic-java/src/Language/Java/AST.hs @@ -14,8 +14,8 @@ module Language.Java.AST ( module Language.Java.AST ) where -import TreeSitter.GenerateSyntax +import AST.GenerateSyntax import qualified TreeSitter.Java as Grammar -import TreeSitter.Token +import AST.Token astDeclarationsForLanguage Grammar.tree_sitter_java "../../../vendor/tree-sitter-java/src/node-types.json" \ No newline at end of file diff --git a/semantic-java/src/Language/Java/Tags.hs b/semantic-java/src/Language/Java/Tags.hs index 215a4632b..6d7b5c005 100644 --- a/semantic-java/src/Language/Java/Tags.hs +++ b/semantic-java/src/Language/Java/Tags.hs @@ -17,7 +17,7 @@ import Source.Range import Source.Source as Source import Tags.Tag import qualified Tags.Tagging.Precise as Tags -import TreeSitter.Token +import AST.Token class ToTags t where tags