Merge pull request #25 from metadsl/dotted-names

Dotted names

Author: saulshanabrook

docs/changelog.md

@@ -11,6 +11,7 @@ _This project uses semantic versioning. Before 1.0.0, this means that every brea
   - Added `Set` sort and removed set method from `Map`
   - Added `Vec` sort
   - Added support for variable args for builtin functions, to use in creation of `Vec` and `Set` sorts.
+- Switch generated egg names to use `.` as seperate (i.e. `Math.__add__`) instead of `_` (i.e. `Math___add__`)
 
 ## 0.4.0 (2023-05-03)
 

python/egglog/declarations.py

@@ -209,8 +209,8 @@ def generate_egg_name(self) -> str:
         """
         if not self.args:
             return self.name
-        args = "_".join(a.generate_egg_name() for a in self.args)
-        return f"{self.name}__{args}"
+        args = ", ".join(a.generate_egg_name() for a in self.args)
+        return f"{self.name}[{args}]"
 
     def to_commands(self, decls: Declarations) -> Iterable[bindings._Command]:
         """
@@ -271,7 +271,7 @@ class MethodRef:
     method_name: str
 
     def generate_egg_name(self) -> str:
-        return f"{self.class_name}__{self.method_name}"
+        return f"{self.class_name}.{self.method_name}"
 
 
 @dataclass(frozen=True)
@@ -283,7 +283,7 @@ def to_egg(self, decls: Declarations) -> str:
         return decls._callable_ref_to_egg_fn[self]
 
     def generate_egg_name(self) -> str:
-        return f"{self.class_name}__{self.method_name}"
+        return f"{self.class_name}.{self.method_name}"
 
 
 @dataclass(frozen=True)
@@ -300,7 +300,7 @@ class ClassVariableRef:
     variable_name: str
 
     def generate_egg_name(self) -> str:
-        return f"{self.class_name}__{self.variable_name}"
+        return f"{self.class_name}.{self.variable_name}"
 
 
 CallableRef = Union[FunctionRef, MethodRef, ClassMethodRef, ConstantRef, ClassVariableRef]