@@ -194,11 +194,17 @@ class Lowering()(using Config, TL, Raise, State, Ctx):
194194 final def term (t : st, inStmtPos : Bool = false )(k : Result => Block )(using Subst ): Block =
195195 tl.log(s " Lowering.term ${t.showDbg.truncate(100 , " [...]"
196196 if inStmtPos then " (in stmt)" else " "
197- t.symbol.fold(" " " – symbol " + _)}" )
197+ t.resolvedSymbol.fold(" " " – symbol " + _)}" )
198+
198199 def warnStmt = if inStmtPos then
199200 raise :
200201 WarningReport (msg " Pure expression in statement position " -> t.toLoc :: Nil , S (t))
202+
203+ // Funny Scala: the non-exhaustive match is actually the second match
201204 t match
205+ case t : sem.Resolvable => t.instantiate
206+ case t => t
207+ match
202208 case st.UnitVal () => k(unit)
203209 case st.Lit (lit) =>
204210 warnStmt
@@ -224,37 +230,39 @@ class Lowering()(using Config, TL, Raise, State, Ctx):
224230 if sym.binary then
225231 val t1 = new Tree .Ident (" arg1"
226232 val t2 = new Tree .Ident (" arg2"
227- val p1 = Param (FldFlags .empty, VarSymbol (t1), N )
228- val p2 = Param (FldFlags .empty, VarSymbol (t2), N )
233+ val p1 = Param (FldFlags .empty, VarSymbol (t1), N , Modulefulness .none )
234+ val p2 = Param (FldFlags .empty, VarSymbol (t2), N , Modulefulness .none )
229235 val ps = PlainParamList (p1 :: p2 :: Nil )
230- val bod = st.App (t, st.Tup (List (st.Ref (p1.sym)(t1, 666 ) , st.Ref (p2.sym)(t2, 666 ) ))
236+ val bod = st.App (t, st.Tup (List (st.Ref (p1.sym)(t1, 666 , N ).noIArgs , st.Ref (p2.sym)(t2, 666 , N ).noIArgs ))
231237 (Tree .Tup (Nil // FIXME should not be required (using dummy value)
232238 )))(
233239 Tree .App (Tree .Empty (), Tree .Empty ()), // FIXME should not be required (using dummy value)
240+ N ,
234241 FlowSymbol (sym.nme)
235- )
242+ ).noIArgs
236243 val (paramLists, bodyBlock) = setupFunctionDef(ps :: Nil , bod, S (sym.nme))
237244 tl.log(s " Ref builtin $sym" )
238245 assert(paramLists.length === 1 )
239246 return k(Value .Lam (paramLists.head, bodyBlock))
240247 if sym.unary then
241248 val t1 = new Tree .Ident (" arg"
242- val p1 = Param (FldFlags .empty, VarSymbol (t1), N )
249+ val p1 = Param (FldFlags .empty, VarSymbol (t1), N , Modulefulness .none )
243250 val ps = PlainParamList (p1 :: Nil )
244- val bod = st.App (t, st.Tup (List (st.Ref (p1.sym)(t1, 666 ) ))
251+ val bod = st.App (t, st.Tup (List (st.Ref (p1.sym)(t1, 666 , N ).noIArgs ))
245252 (Tree .Tup (Nil // FIXME should not be required (using dummy value)
246253 )))(
247254 Tree .App (Tree .Empty (), Tree .Empty ()), // FIXME should not be required (using dummy value)
255+ N ,
248256 FlowSymbol (sym.nme)
249- )
257+ ).noIArgs
250258 val (paramLists, bodyBlock) = setupFunctionDef(ps :: Nil , bod, S (sym.nme))
251259 tl.log(s " Ref builtin $sym" )
252260 assert(paramLists.length === 1 )
253261 return k(Value .Lam (paramLists.head, bodyBlock))
254262 case bs : BlockMemberSymbol =>
255263 bs.defn match
256264 case S (d) if d.isDeclare.isDefined =>
257- return term(Sel (State .globalThisSymbol.ref(), ref.tree)(S (bs)))(k)
265+ return term(Sel (State .globalThisSymbol.ref().noIArgs , ref.tree)(S (bs)).noIArgs )(k)
258266 case S (td : TermDefinition ) if td.k is syntax.Fun =>
259267 // * Local functions with no parameter lists are getters
260268 // * and are lowered to functions with an empty parameter list
@@ -298,7 +306,7 @@ class Lowering()(using Config, TL, Raise, State, Ctx):
298306 End (" error"
299307 case st.TyApp (f, ts) => term(f)(k) // * Type arguments are erased
300308 case st.App (f, arg) =>
301- val isMlsFun = f.symbol .fold(f.isInstanceOf [st.Lam ]):
309+ val isMlsFun = f.resolvedSymbol .fold(f.isInstanceOf [st.Lam ]):
302310 case _ : sem.BuiltinSymbol => true
303311 case sym : sem.BlockMemberSymbol =>
304312 sym.trmImplTree.fold(sym.clsTree.isDefined)(_.k is syntax.Fun )
@@ -312,17 +320,17 @@ class Lowering()(using Config, TL, Raise, State, Ctx):
312320 subTerm_nonTail(arg): ar =>
313321 k(Call (fr, Arg (spread = true , ar) :: Nil )(isMlsFun, true ).withLocOf(t))
314322 f match
315- case t if t.symbol .isDefined && (t.symbol .get is ctx.builtins.js.try_catch) =>
323+ case t if t.resolvedSymbol .isDefined && (t.resolvedSymbol .get is ctx.builtins.js.try_catch) =>
316324 conclude(Value .Ref (State .runtimeSymbol).selN(Tree .Ident (" try_catch"
317- case t if t.symbol .isDefined && (t.symbol .get is ctx.builtins.debug.printStack) =>
325+ case t if t.resolvedSymbol .isDefined && (t.resolvedSymbol .get is ctx.builtins.debug.printStack) =>
318326 if ! config.effectHandlers.exists(_.debug) then
319327 raise(ErrorReport (
320328 msg " Debugging functions are not enabled " ->
321329 t.toLoc :: Nil ,
322330 source = Diagnostic .Source .Compilation ))
323331 return End (" error"
324332 conclude(Value .Ref (State .runtimeSymbol).selSN(" raisePrintStackEffect"
325- case t if t.symbol .isDefined && (t.symbol .get is ctx.builtins.debug.getLocals) =>
333+ case t if t.resolvedSymbol .isDefined && (t.resolvedSymbol .get is ctx.builtins.debug.getLocals) =>
326334 if ! config.effectHandlers.exists(_.debug) then
327335 raise(ErrorReport (
328336 msg " Debugging functions are not enabled " ->
@@ -532,7 +540,7 @@ class Lowering()(using Config, TL, Raise, State, Ctx):
532540 Return (Call (Value .Ref (State .builtinOpsMap(" super" true , true ), implct = true )
533541 val clsDef = ClsLikeDefn (N , isym, sym, syntax.Cls , N , Nil , S (clsp),
534542 mtds, privateFlds, publicFlds, pctor, ctor)
535- Define (clsDef, term_nonTail(New (sym.ref(), Nil , N ))(k))
543+ Define (clsDef, term_nonTail(New (sym.ref().noIArgs , Nil , N ))(k))
536544
537545 case Try (sub, finallyDo) =>
538546 val l = new TempSymbol (S (sub))
@@ -605,13 +613,6 @@ class Lowering()(using Config, TL, Raise, State, Ctx):
605613 case sem.Fld (sem.FldFlags .benign(), idx, S (rhs)) => L (idx -> rhs)
606614 case arg @ sem.Fld (flags, value, asc) => TODO (s " Other argument forms: $arg" )
607615 case spd : Spd => R (true -> spd.term)
608- case ca : sem.CtxArg => ca.term match
609- case S (t) =>
610- R (false -> t)
611- case N =>
612- // * All contextual arguments should have been
613- // * populated by implicit resolution before lowering.
614- lastWords(s " Found unpopulated contextual argument: ${ca}. " )
615616 // * The straightforward way to lower arguments creates too much recursion depth
616617 // * and makes Lowering stack overflow when lowering functions with lots of arguments.
617618 /*
0 commit comments