fix error in parse_expression

GenieFramework · Nov 28, 2024 · 6c7feef · 6c7feef
1 parent 2708e3d
commit 6c7feef
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 28 deletions.
diff --git a/src/ReactiveTools.jl b/src/ReactiveTools.jl
@@ -451,7 +451,7 @@ function parse_macros(expr::Expr, storage::LittleDict, m::Module)
     end
 
     reactive = flag != :non_reactive
-    var, ex = parse_expression(expr[1], mode, source)
+    var, ex = parse_expression(expr[1], mode, source, m)
     storage[var] = ex
   elseif fn == :mixin
     mixin, prefix, postfix = parse_mixin_params(params)
@@ -576,7 +576,7 @@ function get_varnames(app_expr::Vector, context::Module)
   for ex in app_expr
       ex isa LineNumberNode && continue
       if ex.args[1] ∈ [Symbol("@in"), Symbol("@out"), Symbol("@jsfunction"), Symbol("@private")]
-          res = Stipple.parse_expression(ex)
+          res = Stipple.get_varname(ex)
           push!(varnames, res isa Symbol ? res : res[1])
       elseif ex.args[1] == Symbol("@mixin")
           mixin, prefix, postfix = parse_mixin_params(ex.args[2:end])

diff --git a/src/stipple/reactivity.jl b/src/stipple/reactivity.jl
@@ -241,6 +241,12 @@ function find_assignment(expr)
   assignment
 end
 
+function get_varname(expr)
+  expr = find_assignment(expr)
+  var = expr.args[1]
+  var isa Symbol ? var : var.args[1]
+end
+
 function parse_expression!(expr::Expr, @nospecialize(mode) = nothing, source = nothing, m::Union{Module, Nothing} = nothing)
   expr = find_assignment(expr)
   Rtype = isnothing(m) || ! isdefined(m, :R) ? :(Stipple.R) : :R
@@ -252,37 +258,28 @@ function parse_expression!(expr::Expr, @nospecialize(mode) = nothing, source = n
 
   # args[end] instead of args[2] because of potential LineNumberNode
   var = expr.args[1]
-  if !isnothing(mode)
-    mode = mode isa Symbol && ! isdefined(m, mode) ? :(Stipple.$mode) : mode
-    type = if isa(var, Expr) && var.head == Symbol("::")
-      # change type T to type R{T}
-      var.args[end] = :($Rtype{$(var.args[end])})
-    else
-      try
-        # add type definition `::R{T}` to the var where T is the type of the default value
-        T = @eval(m === nothing ? @__MODULE__() : m, typeof($(expr.args[end])))
-        expr.args[1] = :($var::$Rtype{$T})
-        Rtype
-      catch ex
-        # if the default value is not defined, we can't infer the type
-        # so we just set the type to R{Any}
-        :($Rtype{Any})
-      end
-    end
-    expr.args[end] = :($type($(expr.args[end]), $mode, false, false, $source))
-  end
-
-  # if no type is defined, set the type of the default value
-  if expr.args[1] isa Symbol
+  mode === nothing && (mode = PRIVATE)
+  context = isnothing(m) ? @__MODULE__() : m
+
+  mode = mode isa Symbol && ! isdefined(context, mode) ? :(Stipple.$mode) : mode
+  type = if isa(var, Expr) && var.head == Symbol("::")
+    # change type T to type R{T}
+    var.args[end] = :($Rtype{$(var.args[end])})
+  else # no type is defined, so determine it from the type of the default value
     try
-      T = @eval m typeof($(expr.args[end]))
-      expr.args[1] = :($(expr.args[1])::$T)
+      # add type definition `::R{T}` to the var where T is the type of the default value
+      T = @eval(context, $(expr.args[end])) |> typeof
+      expr.args[1] = :($var::$Rtype{$T})
+      Rtype
     catch ex
+      println("catch")
       # if the default value is not defined, we can't infer the type
-      # so we just set the type to Any
-      expr.args[1] = :($(expr.args[1])::Any)
+      # so we just set the type to R{Any}
+      :($Rtype{Any})
     end
   end
+  expr.args[end] = :($type($(expr.args[end]), $mode, false, false, $source))
+
   expr.args[1].args[1], expr
 end