Merge 28e0520 into cd9fb4a

tbklang · May 14, 2024 · 1658ea9 · 1658ea9
2 parents cd9fb4a + 28e0520
commit 1658ea9
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 2 deletions.
diff --git a/source/tlang/compiler/parsing/core.d b/source/tlang/compiler/parsing/core.d
@@ -2017,6 +2017,48 @@ public final class Parser
 
                         parentToContainer(container, [binOpExp.getLeftExpression(), binOpExp.getRightExpression()]);
                     }
+                    /** 
+                     * If we have an `UnaryOperatorExpression`
+                     * then we want to parent its inner
+                     * expression
+                     */
+                    else if(cast(UnaryOperatorExpression)statement)
+                    {
+                        UnaryOperatorExpression unaryOp = cast(UnaryOperatorExpression)statement;
+                        Expression opExpr = unaryOp.getExpression();
+
+                        parentToContainer(container, [opExpr]);
+                    }
+                    /** 
+                     * If we have an `ArrayIndex` then
+                     * we will want to parent its inner
+                     * expression which is what the
+                     * index itself is formed out of.
+                     *
+                     * We will also want to parent the
+                     * expression being indexed itself.
+                     */
+                    else if(cast(ArrayIndex)statement)
+                    {
+                        ArrayIndex indexOp = cast(ArrayIndex)statement;
+                        Expression indexedExpr = indexOp.getIndexed();
+                        Expression indexExpr = indexOp.getIndex();
+
+                        parentToContainer(container, [indexedExpr, indexExpr]);
+                    }
+                    /** 
+                     * If we have an `ArrayAssignment` then
+                     * we will want to parent its inner
+                     * index-expression
+                     */
+                    else if(cast(ArrayAssignment)statement)
+                    {
+                        ArrayAssignment arrAss = cast(ArrayAssignment)statement;
+                        Expression indexExpr = arrAss.getArrayLeft();
+                        Expression assExpr = arrAss.getAssignmentExpression();
+
+                        parentToContainer(container, [indexExpr, assExpr]);
+                    }
                     /** 
                      * If we have a `VariableAssignmentStdAlone`
                      * then we must parent its expression
@@ -2055,6 +2097,16 @@ public final class Parser
                         Expression[] actualArguments = funcCall.getCallArguments();
                         parentToContainer(container, cast(Statement[])actualArguments);
                     }
+                    /**
+                     * If we have a `CastedExpression`
+                     */
+                    else if(cast(CastedExpression)statement)
+                    {
+                        CastedExpression castExpr = cast(CastedExpression)statement;
+
+                        Expression toCast = castExpr.getEmbeddedExpression();
+                        parentToContainer(container, [toCast]);
+                    }
                     /** 
                      * If we have a `ReturnStmt`
                      * then we must process its

diff --git a/source/tlang/compiler/typecheck/dependency/core.d b/source/tlang/compiler/typecheck/dependency/core.d
@@ -597,6 +597,8 @@ public class DNodeGenerator
         WARN("expressionPass(Exp): Processing "~exp.toString());
         DEBUG("expressionPass(Exp): Context coming in "~to!(string)(context));
 
+        // TODO: Automatic dnode.getStatement().context = context?
+
         /* TODO: Add pooling */
 
         /**
@@ -617,7 +619,7 @@ public class DNodeGenerator
             DEBUG("FuncCall: "~funcCall.getName());
 
             /* TODO: We need to fetch the cached function definition here and call it */
-            Entity funcEntity = resolver.resolveBest(context.container, funcCall.getName());
+            Entity funcEntity = resolver.resolveBest(funcCall.parentOf(), funcCall.getName());
             assert(funcEntity);
 
             // FIXME: The below is failing (we probably need a forward look ahead?)
@@ -716,7 +718,7 @@ public class DNodeGenerator
             varExp.setContext(context);
 
             // Resolve the entity the name refers to
-            Entity namedEntity = tc.getResolver().resolveBest(context.getContainer(), nearestName);
+            Entity namedEntity = tc.getResolver().resolveBest(varExp.parentOf(), nearestName);
 
 
             /* If the entity was found */