Merge pull request #22 from JuliaPluto/primitive

support `primitive type` expr

Project.toml

@@ -2,7 +2,7 @@ name = "ExpressionExplorer"
 uuid = "21656369-7473-754a-2065-74616d696c43"
 license = "MIT"
 authors = ["Paul Berg <[email protected]>", "Fons van der Plas <[email protected]>"]
-version = "1.0.2"
+version = "1.0.3"
 
 [compat]
 julia = "1.6"

src/explore.jl

@@ -535,6 +535,12 @@ function explore_abstract!(ex::Expr, scopestate::ScopeState)
     explore_struct!(Expr(:struct, false, ex.args[1], Expr(:block, nothing)), scopestate)
 end
 
+function explore_primitive!(ex::Expr, scopestate::ScopeState)
+    type_name, type_body = ex.args
+    symstate = explore_struct!(Expr(:struct, false, type_name, Expr(:block)), scopestate)
+    union!(symstate, explore!(type_body, scopestate))
+end
+
 function explore_function_macro!(ex::Expr, scopestate::ScopeState)
     symstate = SymbolsState()
     # Creates local scope
@@ -784,6 +790,8 @@ function explore!(ex::Expr, scopestate::ScopeState)::SymbolsState
         return explore!(ex.args[2], scopestate)
     elseif ex.head === :struct
         return explore_struct!(ex, scopestate)
+    elseif ex.head === :primitive
+        return explore_primitive!(ex, scopestate)
     elseif ex.head === :abstract
         return explore_abstract!(ex, scopestate)
     elseif ex.head === :function || ex.head === :macro
@@ -966,7 +974,7 @@ function explore_funcdef!(ex::Expr, scopestate::ScopeState)::Tuple{FunctionName,
         return name, symstate
 
     elseif ex.head === :(<:)
-        # for use in `struct` and `abstract`
+        # for use in `struct`, `abstract` and `primitive`
         name, symstate = uncurly!(ex.args[1], scopestate)
         if length(ex.args) != 1
             union!(symstate, explore!(ex.args[2], scopestate))

test/ExpressionExplorer.jl

@@ -90,6 +90,15 @@ end
     @test testee(:(let abstract type a end end), [], [:a], [], [
         :a => ([], [], [], [])
     ])
+    @test testee(:(primitive type Int24 24 end), [], [:Int24], [], [
+        :Int24 => ([], [], [], [])
+    ])
+    @test testee(:(primitive type Int24 <: Integer 24 end), [], [:Int24], [], [
+        :Int24 => ([:Integer], [], [], [])
+    ])
+    @test testee(:(primitive type Int24 <: Integer size end), [:size], [:Int24], [], [
+        :Int24 => ([:Integer], [], [], [])
+    ])
 
     @test testee(:(module a; f(x) = x; z = r end), [], [:a], [], [])
 end