Q2 done?! maybe

Q2/Artefacts/fspowVisitorUser.py

@@ -1,36 +1,88 @@
-# Generated from fspow.g4 by ANTLR
 from antlr4 import *
-#from idlelib.idle_test.test_configdialog import root
-if __name__ is not None and "." in __name__:
-    from .fspowParser import fspowParser
-else:
-    from fspowParser import fspowParser
-
-# superclass
+from fspowParser import fspowParser
 from fspowVisitor import fspowVisitor
 
-# our own imports:
-from repertoire.FileCollection import *
-from repertoire.Selector import *
-from repertoire.FSObject import *
+from repertoire.FileCollection import FileCollection
+from repertoire.Selector import Selector
 
-# for symbol table
-from collections import defaultdict
-
-# This class defines a complete specific visitor for a parse tree produced by fspowParser.
 
 class fspowVisitorUser(fspowVisitor):
-    
-    # where all the variables reside
-    variablesTable = defaultdict()
+    def __init__(self):
+        # Dictionary to track assigned variables during the AST walk
+        self.variablesTable = {}
 
-    
-    # just write methods to be overridden
-    # in future, may want to implement multiple subclasses
-    # but for now, I'd copy the ones I need to override here to implement them
-    
+    def visitMessage(self, ctx):
+        # Quotes are already stripped by the inline lexer action
+        print(ctx.STRING().getText())
+        return self.visitChildren(ctx)
 
+    def visitFcCreation(self, ctx):
+        root_name = self.visit(ctx.rootSpecifier())
+        return FileCollection(root_name)
 
-del fspowParser
+    def visitRootSpecifier(self, ctx):
+        return ctx.STRING().getText()
 
+    def visitAssignment(self, ctx):
+        # Maps string identifiers to their evaluated backend objects
+        var_id = ctx.ID().getText()
+        self.variablesTable[var_id] = self.visit(ctx.expression())
+        return True
 
+    def visitFcList(self, ctx):
+        var_id = ctx.getChild(0).getText()
+        if var_id in self.variablesTable:
+            print(self.variablesTable[var_id].list())
+        else:
+            print(f"File collection {var_id} not found")
+
+    def visitFcApplySelector(self, ctx):
+        fc_id = ctx.ID().getText()
+        if fc_id in self.variablesTable:
+            sel_id = ctx.expression().getText()
+            if sel_id in self.variablesTable:
+                self.variablesTable[fc_id].apply(self.variablesTable[sel_id])
+            else:
+                print(f"Selector {sel_id} not found")
+        else:
+            print(f"File collection {fc_id} not found")
+
+    def visitSelCreation(self, ctx):
+        # Triggers the AST walk to process the complex filter expression
+        return self.visit(ctx.testexpression())
+
+    def visitExprID(self, ctx):
+        var_id = ctx.ID().getText()
+        return self.variablesTable.get(var_id)
+
+    # --- Filter List ---
+
+    def visitTestexpression(self, ctx):
+        # Dynamically builds the recursive list, encoding 'intersect' as 1
+        expr_list = []
+        for i in range(ctx.getChildCount()):
+            child = ctx.getChild(i)
+            if child.getText() == 'intersect':
+                expr_list.append(1)
+            else:
+                expr_list.append(self.visit(child))
+        return expr_list
+
+    def visitTestunitnottestexpression(self, ctx):
+        # Appends -1 to mathematically encode the 'not' inversion
+        return [-1, self.visit(ctx.testexpression())]
+
+    def visitTestunittestexpression(self, ctx):
+        return self.visit(ctx.testexpression())
+
+    def visitTestunitname(self, ctx):
+        return {"name": ctx.STRING().getText()}
+
+    def visitTestunitsize(self, ctx):
+        return {"size": ctx.STRING().getText()}
+
+    def visitTestunittype(self, ctx):
+        return {"type": ctx.STRING().getText()}
+
+    def visitTestunitdate(self, ctx):
+        return {"date": ctx.STRING().getText()}