X-Git-Url: https://gitweb.ps.run/toc/blobdiff_plain/17860defa84c6d8bc0e8bc088a7e09361f17db07..c6ad2948bb98d42f8e0883ef82cd14cd2d5eda60:/src/visit.h

diff --git a/src/visit.h b/src/visit.h
index 3fe2cb2..279a4fc 100644
--- a/src/visit.h
+++ b/src/visit.h
@@ -4,22 +4,26 @@
 
 #include <functional>
 
+// struct with callback functions for all relevant types
+// tree can be walked selectively by providing only
+// needed callbacks
 struct Visitor {
-  std::function<void(const Type &, const std::shared_ptr<Context> ctx)> onType = [](auto, auto){};
-  std::function<void(const Expr &, const std::shared_ptr<Context> ctx)> onExpr = [](auto, auto){};
-  std::function<void(const Stmt &, const std::shared_ptr<Context> ctx)> onStmt = [](auto, auto){};
-  std::function<void(const Body &, const std::shared_ptr<Context> ctx)> onBody = [](auto, auto){};
-  std::function<void(const Function &, const std::shared_ptr<Context> ctx)> onFunction = [](auto, auto){};
-  std::function<void(const Variable &, const std::shared_ptr<Context> ctx)> onVariable = [](auto, auto){};
+  std::function<void(const Type &, const std::shared_ptr<Context> ctx)>                   onType = [](auto, auto){};
+  std::function<void(const Expr &, const std::shared_ptr<Context> ctx)>                   onExpr = [](auto, auto){};
+  std::function<void(const Stmt &, const std::shared_ptr<Context> ctx)>                   onStmt = [](auto, auto){};
+  std::function<void(const Body &, const std::shared_ptr<Context> ctx)>                   onBody = [](auto, auto){};
+  std::function<void(const Function &, const std::shared_ptr<Context> ctx)>               onFunction = [](auto, auto){};
+  std::function<void(const Variable &, const std::shared_ptr<Context> ctx)>               onVariable = [](auto, auto){};
   std::function<void(const StructMember<Function> &, const std::shared_ptr<Context> ctx)> onStructMethod = [](auto, auto){};
   std::function<void(const StructMember<Variable> &, const std::shared_ptr<Context> ctx)> onStructMember = [](auto, auto){};
-  std::function<void(const Struct &, const std::shared_ptr<Context> ctx)> onStruct = [](auto, auto){};
-  std::function<void(const Namespace &, const std::shared_ptr<Context> ctx)> onNamespace = [](auto, auto){};
-  std::function<void(const Program &, const std::shared_ptr<Context> ctx)> onProgram = [](auto, auto){};
+  std::function<void(const Struct &, const std::shared_ptr<Context> ctx)>                 onStruct = [](auto, auto){};
+  std::function<void(const Namespace &, const std::shared_ptr<Context> ctx)>              onNamespace = [](auto, auto){};
+  std::function<void(const Program &, const std::shared_ptr<Context> ctx)>                onProgram = [](auto, auto){};
 };
 
 #define VISIT(XS) for (auto x : XS) visit(x);
 
+// simply walk IR by recursively calling functions for all children
 struct Visit {
 private:
   Visitor v;
@@ -141,7 +145,7 @@ public:
     
     ctx = x.ctx;
 
-    VISIT(x.namespaces)
+    VISIT(x.ctx->namespaces)
     VISIT(x.ctx->variables)
     VISIT(x.ctx->structs)
     VISIT(x.ctx->functions)
@@ -158,9 +162,9 @@ public:
     v.onFunction(x, ctx);
 
     if (x.defined) {
-      visit(x.body);
       for (auto v : x.parameters)
         visit(v.type);
+      visit(x.body);
     }
   }
   void visit(const StructMember<Function> & x)
@@ -188,7 +192,7 @@ public:
 
     ctx = x.ctx;
 
-    VISIT(x.namespaces)
+    VISIT(x.ctx->namespaces)
     VISIT(x.ctx->variables)
     VISIT(x.ctx->structs)
     VISIT(x.ctx->functions)