extend cil-source pretty printer

Author: sipma

chc/app/CAttributes.py

@@ -113,6 +113,9 @@ def is_index(self) -> bool:
     def is_question(self) -> bool:
         return False
 
+    def accept(self, visitor: "CVisitor") -> None:
+        raise UF.CHCError("visitor not yet implemented for " + str(self))
+
     def __str__(self) -> str:
         return "attrparam:" + self.tags[0]
 
@@ -135,6 +138,9 @@ def intvalue(self) -> int:
     def is_int(self) -> bool:
         return True
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_attr_int(self)
+
     def __str__(self) -> str:
         return "aint(" + str(self.intvalue) + ")"
 
@@ -157,6 +163,9 @@ def stringvalue(self) -> str:
     def is_str(self) -> bool:
         return True
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_attr_str(self)
+
     def __str__(self) -> str:
         return "astr(" + str(self.stringvalue) + ")"
 
@@ -184,6 +193,9 @@ def params(self) -> List[CAttr]:
     def is_cons(self) -> bool:
         return True
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_attr_cons(self)
+
     def __str__(self) -> str:
         return "acons(" + str(self.name) + ")"
 
@@ -206,6 +218,9 @@ def typ(self) -> "CTyp":
     def is_sizeof(self) -> bool:
         return True
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_attr_sizeof(self)
+
     def __str__(self) -> str:
         return "asizeof(" + str(self.typ) + ")"
 
@@ -228,6 +243,9 @@ def param(self) -> CAttr:
     def is_sizeofe(self) -> bool:
         return True
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_attr_sizeofe(self)
+
     def __str__(self) -> str:
         return "asizeofe(" + str(self.param) + ")"
 
@@ -250,6 +268,9 @@ def typsig(self) -> "CTypsig":
     def is_sizeofs(self) -> bool:
         return True
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_attr_sizeofs(self)
+
     def __str__(self) -> str:
         return "asizeofs(" + str(self.typsig) + ")"
 
@@ -272,6 +293,9 @@ def typ(self) -> "CTyp":
     def is_alignof(self) -> bool:
         return True
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_attr_alignof(self)
+
     def __str__(self) -> str:
         return "aalignof(" + str(self.typ) + ")"
 
@@ -294,6 +318,9 @@ def param(self) -> CAttr:
     def is_alignofe(self) -> bool:
         return True
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_attr_alignofe(self)
+
     def __str__(self) -> str:
         return "aalignofe(" + str(self.param) + ")"
 
@@ -316,6 +343,9 @@ def typsig(self) -> "CTypsig":
     def is_alignofs(self) -> bool:
         return True
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_attr_alignofs(self)
+
     def __str__(self) -> str:
         return "aalignofs(" + str(self.typsig) + ")"
 
@@ -343,6 +373,9 @@ def param(self) -> CAttr:
     def is_unop(self) -> bool:
         return True
 
+    def acecpt(self, visitor: "CVisitor") -> None:
+        visitor.visit_attr_unop(self)
+
     def __str__(self) -> str:
         return "aunop(" + self.op + "," + str(self.param) + ")"
 
@@ -375,6 +408,9 @@ def param2(self) -> CAttr:
     def is_binop(self) -> bool:
         return True
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_attr_binop(self)
+
     def __str__(self) -> str:
         return (
             "abinop("
@@ -410,6 +446,9 @@ def param(self) -> CAttr:
     def is_dot(self) -> bool:
         return True
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_attr_dot(self)
+
     def __str__(self) -> str:
         return "adot(" + str(self.param) + "." + self.suffix + ")"
 
@@ -436,6 +475,9 @@ def param(self) -> CAttr:
     def is_star(self) -> bool:
         return True
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_attr_star(self)
+
     def __str__(self) -> str:
         if self.index == self.args[0]:
             return "astar()"
@@ -461,6 +503,9 @@ def param(self) -> CAttr:
     def is_addrof(self) -> bool:
         return True
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_attr_addrof(self)
+
     def __str__(self) -> str:
         return "aaddrof(" + str(self.param) + ")"
 
@@ -488,6 +533,9 @@ def param2(self) -> CAttr:
     def is_index(self) -> bool:
         return True
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_attr_index(self)
+
     def __str__(self) -> str:
         return "aindex(" + str(self.param1) + "," + str(self.param2) + ")"
 
@@ -516,6 +564,9 @@ def param2(self) -> CAttr:
     def param3(self) -> CAttr:
         return self.cd.get_attrparam(int(self.args[2]))
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_attr_question(self)
+
     def __str__(self) -> str:
         return (
             "aquestion("
@@ -541,6 +592,9 @@ def name(self) -> str:
     def params(self) -> List[CAttr]:
         return [self.cd.get_attrparam(int(i)) for i in self.args]
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_attribute(self)
+
     def __str__(self) -> str:
         return self.name + ": " + ",".join([str(p) for p in self.params])
 

chc/app/CCompInfo.py

@@ -6,7 +6,7 @@
 #
 # Copyright (c) 2017-2020 Kestrel Technology LLC
 # Copyright (c) 2020-2022 Henny B. Sipma
-# Copyright (c) 2023-2024 Aarno Labs LLC
+# Copyright (c) 2023-2025 Aarno Labs LLC
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -39,6 +39,7 @@
     from chc.app.CDeclarations import CDeclarations
     from chc.app.CFieldInfo import CFieldInfo
     from chc.app.CGlobalDeclarations import CGlobalDeclarations
+    from chc.app.CVisitor import CVisitor
 
 
 class CCompInfo(CDeclarationsRecord):
@@ -100,6 +101,9 @@ def name(self) -> str:
     def field_strings(self) -> str:
         return ":".join([f.fname for f in self.fields])
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_compinfo(self)
+
     def __str__(self) -> str:
         lines = []
         lines.append("struct " + self.name)

chc/app/CExp.py

@@ -32,6 +32,7 @@
 
 from chc.app.CDictionaryRecord import CDictionaryRecord, cdregistry
 
+import chc.util.fileutil as UF
 import chc.util.IndexedTable as IT
 
 if TYPE_CHECKING:
@@ -148,15 +149,15 @@ def get_strings(self) -> List[str]:
     def get_variable_uses(self, vid: int) -> int:
         return 0
 
-    def accept(self, visitor: "CVisitor") -> None:
-        raise Exception("CExp.accept: " + str(self))
-
     def to_dict(self) -> Dict[str, Any]:
         return {"base": "exp"}
 
     def to_idict(self) -> Dict[str, Any]:
         return {"t": self.tags, "a": self.args}
 
+    def accept(self, visitor: "CVisitor") -> None:
+        raise UF.CHCError("visitor not yet implemented for: " + str(self))
+
     def __str__(self) -> str:
         return "baseexp:" + self.tags[0]
 
@@ -223,6 +224,9 @@ def get_variable_uses(self, vid: int) -> int:
     def to_dict(self) -> Dict[str, Any]:
         return {"base": "lval", "lval": self.lval.to_dict()}
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_explval(self)
+
     def __str__(self) -> str:
         return str(self.lval)
 
@@ -248,6 +252,9 @@ def is_sizeof(self) -> bool:
     def to_dict(self) -> Dict[str, Any]:
         return {"base": "sizeof", "type": self.typ.to_dict()}
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_sizeof(self)
+
     def __str__(self) -> str:
         return "sizeof(" + str(self.typ) + ")"
 
@@ -279,6 +286,9 @@ def get_variable_uses(self, vid: int) -> int:
     def to_dict(self) -> Dict[str, Any]:
         return {"base": "sizeofe", "exp": self.exp.to_dict()}
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_sizeofe(self)
+
     def __str__(self) -> str:
         return "sizeofe(" + str(self.exp) + ")"
 
@@ -307,6 +317,9 @@ def is_sizeofstr(self) -> bool:
     def to_dict(self) -> Dict[str, Any]:
         return {"base": "sizeofstr", "string": self.stringvalue}
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_size_of_str(self)
+
     def __str__(self) -> str:
         return "sizeofstr(" + str(self.stringvalue) + ")"
 
@@ -332,6 +345,9 @@ def is_alignof(self) -> bool:
     def to_dict(self) -> Dict[str, Any]:
         return {"base": "alignof", "type": self.typ.to_dict()}
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_alignof(self)
+
     def __str__(self) -> str:
         return "alignof(" + str(self.typ) + ")"
 
@@ -366,6 +382,9 @@ def get_variable_uses(self, vid: int) -> int:
     def to_dict(self) -> Dict[str, Any]:
         return {"base": "alignofe", "exp": self.exp.to_dict()}
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_alignofe(self)
+
     def __str__(self) -> str:
         return "alignofe(" + str(self.exp) + ")"
 
@@ -411,6 +430,9 @@ def get_variable_uses(self, vid: int) -> int:
     def to_dict(self) -> Dict[str, Any]:
         return {"base": "unop", "op": self.op, "exp": self.exp.to_dict()}
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_unop(self)
+
     def __str__(self) -> str:
         return "(" + unoperatorstrings[self.op] + " " + str(self.exp) + ")"
 
@@ -474,6 +496,9 @@ def to_dict(self) -> Dict[str, Any]:
             "exp2": self.exp2.to_dict(),
         }
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_binop(self)
+
     def __str__(self) -> str:
         return (
             "("
@@ -549,6 +574,9 @@ def to_dict(self) -> Dict[str, object]:
             "type": self.typ.to_dict(),
         }
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_question(self)
+
     def __str__(self) -> str:
         return (
             "("
@@ -600,6 +628,9 @@ def to_dict(self) -> Dict[str, object]:
             "type": self.typ.to_dict(),
         }
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_cast(self)
+
     def __str__(self) -> str:
         return "caste(" + str(self.typ) + "," + str(self.exp) + ")"
 
@@ -634,6 +665,9 @@ def get_variable_uses(self, vid: int) -> int:
     def to_dict(self) -> Dict[str, object]:
         return {"base": "addrof", "lval": self.lval.to_dict()}
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_addrof(self)
+
     def __str__(self) -> str:
         return "&(" + str(self.lval) + ")"
 
@@ -655,6 +689,9 @@ def label_sid(self) -> int:
     def to_dict(self) -> Dict[str, object]:
         return {"base": "addroflabel", "label": self.label_sid}
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_addr_of_label(self)
+
     def __str__(self) -> str:
         return "addroflabel(" + str(self.label_sid) + ")"
 
@@ -689,6 +726,9 @@ def get_variable_uses(self, vid: int) -> int:
     def to_dict(self) -> Dict[str, Any]:
         return {"base": "startof", "lval": self.lval.to_dict()}
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_startof(self)
+
     def __str__(self) -> str:
         return "&(" + str(self.lval) + ")"
 
@@ -722,6 +762,9 @@ def arguments(self) -> List[Optional[CExp]]:
     def has_variable(self, vid: int) -> bool:
         return any([a.has_variable(vid) for a in self.arguments if a])
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_fn_app(self)
+
     def __str__(self) -> str:
         return (
             "fnapp("
@@ -762,6 +805,9 @@ def arguments(self) -> List[Optional[CExp]]:
     def has_variable(self, vid: int) -> bool:
         return any([a.has_variable(vid) for a in self.arguments if a])
 
+    def accept(self, visitor: "CVisitor") -> None:
+        visitor.visit_cn_app(self)
+
     def __str__(self) -> str:
         return (
             "cnapp("