dhscanner-kbgen 1.0.12 → 1.0.13
raw patch · 2 files changed
+15/−14 lines, 2 filesPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
API changes (from Hackage documentation)
- Kbgen: CallMethodOfSuper :: Call -> MethodName -> ResolvedSuper -> CallMethodOfSuper
- Kbgen: CallMethodOfSuperCtor :: CallMethodOfSuper -> Fact
- Kbgen: data CallMethodOfSuper
- Kbgen: instance Data.Aeson.Types.FromJSON.FromJSON Kbgen.CallMethodOfSuper
- Kbgen: instance Data.Aeson.Types.ToJSON.ToJSON Kbgen.CallMethodOfSuper
- Kbgen: instance GHC.Classes.Eq Kbgen.CallMethodOfSuper
- Kbgen: instance GHC.Classes.Ord Kbgen.CallMethodOfSuper
- Kbgen: instance GHC.Generics.Generic Kbgen.CallMethodOfSuper
- Kbgen: instance GHC.Show.Show Kbgen.CallMethodOfSuper
+ Kbgen: CallMethodOfClass :: Call -> MethodName -> Class -> CallMethodOfClass
+ Kbgen: CallMethodOfClassCtor :: CallMethodOfClass -> Fact
+ Kbgen: data CallMethodOfClass
+ Kbgen: instance Data.Aeson.Types.FromJSON.FromJSON Kbgen.CallMethodOfClass
+ Kbgen: instance Data.Aeson.Types.ToJSON.ToJSON Kbgen.CallMethodOfClass
+ Kbgen: instance GHC.Classes.Eq Kbgen.CallMethodOfClass
+ Kbgen: instance GHC.Classes.Ord Kbgen.CallMethodOfClass
+ Kbgen: instance GHC.Generics.Generic Kbgen.CallMethodOfClass
+ Kbgen: instance GHC.Show.Show Kbgen.CallMethodOfClass
Files
- dhscanner-kbgen.cabal +1/−1
- src/Kbgen.hs +14/−13
dhscanner-kbgen.cabal view
@@ -33,7 +33,7 @@ * explain in plain English your query's purpose * et voilà ! -version: 1.0.12 +version: 1.0.13 license: GPL-3.0-only license-file: LICENSE author: OrenGitHub
src/Kbgen.hs view
@@ -56,7 +56,7 @@ ParamResolvedType(..), ClassName(..), ParamName(..), - CallMethodOfSuper(..), + CallMethodOfClass(..), ConstString(..), ArgForCall(..), MethodOfClass(..), @@ -205,8 +205,8 @@ -- -- @ -- skip_level_subclass_of( Subclass, \'tornado.web.RequestHandler\' ) :- --- kb_class_name( Class, ClassType ), --- kb_class_named_super( Subclass, ClassType ), +-- kb_class_name( Class, ClassName ), +-- kb_class_named_super( Subclass, ClassName ), -- kb_class_resolved_super( Class, \'tornado.web.RequestHandler\' ). -- @ -- @@ -321,21 +321,22 @@ -- -- @ -- user_controlled_query_argument( Call ) :- --- kb_call_method_of_super( Call, \'get_query_argument\', \'tornado.web.RequestHandler\' ), +-- kb_call_method_of_class( Call, \'get_query_argument\', Class ), +-- kb_class_has_resolved_super( Class, \'tornado.web.RequestHandler\'), -- kb_arg_i_for_call( QueryParamName, 0, Call), -- kb_const_string( QueryParamName, _ ). --- -- @ -- -- Other facts combined in this predicate: -- +-- * 'ClassResolvedSuper' -- * 'ArgiForCall' -- * 'ConstString' -- -data CallMethodOfSuper = CallMethodOfSuper +data CallMethodOfClass = CallMethodOfClass Call -- ^ MethodName -- ^ - ResolvedSuper -- ^ + Class -- ^ deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON ) -- | @@ -514,7 +515,7 @@ | ParamiOfCallableCtor ParamiOfCallable | KeywordArgForCallCtor KeywordArgForCall | ParamResolvedTypeCtor ParamResolvedType - | CallMethodOfSuperCtor CallMethodOfSuper + | CallMethodOfClassCtor CallMethodOfClass | ClassResolvedSuperCtor ClassResolvedSuper | CallableAnnotationCtor CallableAnnotation deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON ) @@ -541,7 +542,7 @@ prologify (ClassAnnotationCtor content) = prologify_ClassAnnotation content prologify (ParamiOfCallableCtor content) = prologify_ParamiOfCallable content prologify (ParamResolvedTypeCtor content) = prologify_ParamResolvedType content -prologify (CallMethodOfSuperCtor content) = prologify_CallMethodOfSuper content +prologify (CallMethodOfClassCtor content) = prologify_CallMethodOfClass content prologify (KeywordArgForCallCtor content) = prologify_KeywordArgForCall content prologify (ClassResolvedSuperCtor content) = prologifyClassResolvedSuper content prologify (CallableAnnotationCtor content) = prologify_CallableAnnotation content @@ -552,11 +553,11 @@ prologify_ParamResolvedType :: ParamResolvedType -> String prologify_ParamResolvedType (ParamResolvedType (Param loc) (ResolvedType (Fqn content))) = prologify_ParamResolvedType' loc content -prologify_CallMethodOfSuper' :: Location -> String -> String -> String -prologify_CallMethodOfSuper' call method super = printf "kb_call_method_of_super( %s, \'%s\', \'%s\' )." (locationify call) method super +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) -prologify_CallMethodOfSuper :: CallMethodOfSuper -> String -prologify_CallMethodOfSuper (CallMethodOfSuper (Call loc) (MethodName m) (ResolvedSuper (Fqn s))) = prologify_CallMethodOfSuper' loc m s +prologify_CallMethodOfClass :: CallMethodOfClass -> String +prologify_CallMethodOfClass (CallMethodOfClass (Call loc) (MethodName m) (Class c)) = prologify_CallMethodOfClass' loc m c prologify_ParamName' :: Location -> String -> String prologify_ParamName' l name = printf "kb_param_has_name( %s, \'%s\' )." (locationify l) name