From 0d1e79994d2f8f53ef0c92a2bc96b981d63b3c68 Mon Sep 17 00:00:00 2001
From: giopaglia <24519853+giopaglia@users.noreply.github.com>
Date: Sat, 4 Nov 2023 14:16:47 +1100
Subject: [PATCH] Minor

---
 src/anchored-formula.jl | 17 +++++++----------
 src/docstrings.jl       |  1 -
 src/logics.jl           | 10 ++++++++--
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/anchored-formula.jl b/src/anchored-formula.jl
index 0c072e16..215b839a 100644
--- a/src/anchored-formula.jl
+++ b/src/anchored-formula.jl
@@ -53,12 +53,12 @@ struct AnchoredFormula{L<:AbstractLogic} <: Formula
 
     function AnchoredFormula{L}(
         l::Union{L,Base.RefValue{L}},
-        tokt::Union{SyntaxToken,AbstractSyntaxStructure};
+        φ::AbstractSyntaxStructure;
         check_atoms::Bool = false,
         check_tree::Bool = false,
     ) where {L<:AbstractLogic}
         _logic = _l(l)
-        synstruct = convert(AbstractSyntaxStructure, tokt)
+        synstruct = convert(AbstractSyntaxStructure, φ)
 
         if check_tree
             return error("TODO implement check_tree parameter when constructing AnchoredFormula's!")
@@ -82,19 +82,19 @@ struct AnchoredFormula{L<:AbstractLogic} <: Formula
 
     # function AnchoredFormula{L}(
     #     l::Union{L,Base.RefValue{L}},
-    #     tokt::Union{SyntaxToken,AbstractSyntaxStructure};
+    #     φ::AbstractSyntaxStructure;
     #     kwargs...
     # ) where {L<:AbstractLogic}
-    #     t = convert(SyntaxTree, tokt)
+    #     t = convert(SyntaxTree, φ)
     #     return AnchoredFormula{L,typeof(t)}(l, t; kwargs...)
     # end
 
     function AnchoredFormula(
         l::Union{L,Base.RefValue{L}},
-        tokt;
+        φ;
         kwargs...
     ) where {L<:AbstractLogic}
-        return AnchoredFormula{L}(l, tokt; kwargs...)
+        return AnchoredFormula{L}(l, φ; kwargs...)
     end
 end
 
@@ -134,10 +134,7 @@ function Base._promote(x::AnchoredFormula, y::AbstractSyntaxStructure)
     return (x, x(y))
 end
 
-function Base._promote(x::AnchoredFormula, y::SyntaxToken)
-    Base._promote(x, Base.convert(SyntaxTree, y)) # TODO fix
-end
-Base._promote(x::Union{SyntaxToken,AbstractSyntaxStructure}, y::AnchoredFormula) = reverse(Base._promote(y, x))
+Base._promote(x::AbstractSyntaxStructure, y::AnchoredFormula) = reverse(Base._promote(y, x))
 
 iscrisp(f::AnchoredFormula) = iscrisp(logic(f))
 grammar(f::AnchoredFormula) = grammar(logic(f))
diff --git a/src/docstrings.jl b/src/docstrings.jl
index 7de9cdc9..1a39bf64 100644
--- a/src/docstrings.jl
+++ b/src/docstrings.jl
@@ -300,7 +300,6 @@ See also [`SyntaxBranch`](@ref), [`SyntaxTree`](@ref).
 
 doc_formula_basein = """
     Base.in(tok::SyntaxToken, φ::Formula)::Bool
-    Base.in(tok::SyntaxToken, tree::SyntaxBranch)::Bool
 
 Return whether a syntax token appears in a formula.
 
diff --git a/src/logics.jl b/src/logics.jl
index a44e1e2c..5958a62f 100644
--- a/src/logics.jl
+++ b/src/logics.jl
@@ -248,12 +248,18 @@ function Base.in(::SyntaxTree, g::AbstractGrammar)::Bool
     return error("Please, provide method Base.in(::SyntaxTree, ::$(typeof(g))).")
 end
 
+function Base.in(φ::Formula, g::AbstractGrammar)::Bool
+    return Base.in(tree(φ), g)
+end
+
+# TODO are these correct?
+
 # Note: when using this file's syntax tokens, these methods suffice:
 Base.in(p::Atom, g::AbstractGrammar) = Base.in(p, alphabet(g))
 Base.in(op::Truth, g::AbstractGrammar) = (op <: operatorstype(g))
-
 function Base.in(tok::Connective, g::AbstractGrammar)
-    return error("Please, provide method Base.in(::$(typeof(tok)), ::$(typeof(g))).")
+    return (op <: operatorstype(g))
+    # return error("Please, provide method Base.in(::$(typeof(tok)), ::$(typeof(g))).")
 end
 
 """