dhscanner-kbgen 1.0.13 → 1.0.14

raw patch · 2 files changed

+10/−10 lines, 2 filesdep ~dhscanner-astdep ~dhscanner-bitcodePVP ok

version bump matches the API change (PVP)

Dependency ranges changed: dhscanner-ast, dhscanner-bitcode

API changes (from Hackage documentation)

Files

• dhscanner-kbgen.cabal +3/−3
• src/Kbgen.hs +7/−7

@@ -33,7 +33,7 @@         * explain in plain English your query's purpose
         * et voilà !
 
-version:            1.0.13
+version:            1.0.14
 license:            GPL-3.0-only
 license-file:       LICENSE
 author:             OrenGitHub
@@ -59,8 +59,8 @@         aeson < 2.3,
         base >= 4.18 && < 4.19,
         containers < 0.7,
-        dhscanner-ast >= 1.1.2,
-        dhscanner-bitcode >= 1.0.10
+        dhscanner-ast >= 1.1.4,
+        dhscanner-bitcode >= 1.0.12
 
     hs-source-dirs:
         src

@@ -95,7 +95,7 @@ -- project imports
 import Location
 import qualified Token
-import Fqn hiding ( content )
+import qualified Fqn
 
 -- |
 --
@@ -483,7 +483,7 @@ data ConstBoolTrue = ConstBoolTrue Location deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
 
 data Keyword = Keyword String deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
-data Resolved = Resolved Fqn deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
+data Resolved = Resolved Fqn.Fqn deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
 data ArgIndex = ArgIndex Word deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
 data ParamIndex = ParamIndex Word deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
 data MethodName = MethodName String deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
@@ -491,10 +491,10 @@ 
 -- |
 data ResolvedType = ResolvedType
-    Fqn -- ^
+    Fqn.Fqn -- ^
     deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
 
-data ResolvedSuper = ResolvedSuper Fqn deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
+data ResolvedSuper = ResolvedSuper Fqn.Fqn deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
 
 -- |
 -- * each fact is derived from a /single/ bitcode 'Bitcode.Instruction'
@@ -551,7 +551,7 @@ prologify_ParamResolvedType' l fqn = printf "kb_param_has_type( %s, \'%s\' )." (locationify l) fqn
 
 prologify_ParamResolvedType :: ParamResolvedType -> String
-prologify_ParamResolvedType (ParamResolvedType (Param loc) (ResolvedType (Fqn content))) = prologify_ParamResolvedType' loc content
+prologify_ParamResolvedType (ParamResolvedType (Param loc) (ResolvedType fqn)) = prologify_ParamResolvedType' loc (show fqn)
 
 prologify_CallMethodOfClass' :: Location -> String -> Location -> String
 prologify_CallMethodOfClass' call method klass = printf "kb_call_method_of_class( %s, \'%s\', %s )." (locationify call) method (locationify klass)
@@ -584,7 +584,7 @@ prologify_CallResolved' call resolved = printf "kb_call_resolved( %s, \'%s\' )." (locationify call) resolved
 
 prologify_CallResolved :: CallResolved -> String
-prologify_CallResolved (CallResolved (Call call) (Resolved (Fqn content))) = prologify_CallResolved' call content
+prologify_CallResolved (CallResolved (Call call) (Resolved fqn)) = prologify_CallResolved' call (show fqn)
 
 prologify_ConstBoolTrue' :: Location -> String
 prologify_ConstBoolTrue' trueValue = printf "kb_class_name( %s, \'%s\' )." (locationify trueValue)
@@ -608,7 +608,7 @@ prologifyClassResolvedSuper' l s = printf "kb_class_has_resolved_super( %s, \'%s\' )." (locationify l) s
  
 prologifyClassResolvedSuper :: ClassResolvedSuper -> String
-prologifyClassResolvedSuper (ClassResolvedSuper (Class c) (ResolvedSuper (Fqn fqn))) = prologifyClassResolvedSuper' c fqn
+prologifyClassResolvedSuper (ClassResolvedSuper (Class c) (ResolvedSuper fqn)) = prologifyClassResolvedSuper' c (show fqn)
 
 prologifyClassNamedSuper' :: Location -> String -> String
 prologifyClassNamedSuper' l s = printf "kb_class_has_named_super( %s, \'%s\' )." (locationify l) s