fixes

Author: oscarddssmith

src/expr.jl

@@ -580,8 +580,8 @@ end
 
 function build_tree(::Type{Tuple{Expr, SyntaxNode}}, stream::ParseStream;
                     filename=nothing, first_line=1, kws...)
-    syntaxtree = build_tree(SyntaxNode, stream, filename, first_line, kws...)
-    Expr.(syntaxtree)
+    syntaxtree = build_tree(SyntaxNode, stream; filename, first_line, kws...)
+    Expr(:toplevel, map(Expr, syntaxtree))
 end
 
 function _to_expr(node)

src/hooks.jl

@@ -296,7 +296,7 @@ _default_system_parser = _has_v1_6_hooks ? Core._parse : nothing
 
 
 # hook into InteractiveUtils.@activate
-activate!(enable=true) = enable_in_core!(enable)
+activate!(enable=true; for_lowering=false) = enable_in_core!(enable, for_lowering)
 
 """
     enable_in_core!([enable=true; freeze_world_age=true, debug_filename=nothing])
@@ -312,7 +312,7 @@ Keyword arguments:
 * `debug_filename` - File name of parser debug log (defaults to `nothing` or
   the value of `ENV["JULIA_SYNTAX_DEBUG_FILE"]`).
 """
-function enable_in_core!(enable=true; freeze_world_age = true,
+function enable_in_core!(enable=true, for_lowering=false; freeze_world_age = true,
         debug_filename   = get(ENV, "JULIA_SYNTAX_DEBUG_FILE", nothing))
     if !_has_v1_6_hooks
         error("Cannot use JuliaSyntax as the main Julia parser in Julia version $VERSION < 1.6")
@@ -323,12 +323,10 @@ function enable_in_core!(enable=true; freeze_world_age = true,
         close(_debug_log[])
         _debug_log[] = nothing
     end
-    if enable == :JuliaLowering
+    if enable
+        hook = for_lowering ? core_parser_hook_for_lowering : core_parser_hook
         world_age = freeze_world_age ? Base.get_world_counter() : typemax(UInt)
-        _set_core_parse_hook(fix_world_age(core_parser_hook_for_lowering, world_age))
-    elseif enable
-        world_age = freeze_world_age ? Base.get_world_counter() : typemax(UInt)
-        _set_core_parse_hook(fix_world_age(core_parser_hook, world_age))
+        _set_core_parse_hook(fix_world_age(hook, world_age))
     else
         @assert !isnothing(_default_system_parser)
         _set_core_parse_hook(_default_system_parser)

src/syntax_tree.jl

@@ -131,12 +131,17 @@ numchildren(node::TreeNode) = (isnothing(node.children) ? 0 : length(node.childr
 Base.getindex(node::AbstractSyntaxNode, i::Int) = children(node)[i]
 Base.getindex(node::AbstractSyntaxNode, rng::UnitRange) = view(children(node), rng)
 Base.firstindex(node::AbstractSyntaxNode) = 1
-Base.lastindex(node::AbstractSyntaxNode) = length(children(node))
+Base.length(node::AbstractSyntaxNode) = length(children(node))
+Base.lastindex(node::AbstractSyntaxNode) = length(node)
 
 function Base.setindex!(node::SN, x::SN, i::Int) where {SN<:AbstractSyntaxNode}
     children(node)[i] = x
 end
 
+function Base.iterate(A::AbstractSyntaxNode, i=1)
+    (@inline; (i - 1)%UInt < length(A)%UInt ? (@inbounds A[i], i + 1) : nothing)
+end
+
 """
     head(x)