CFL: Use Terminal and Nonterminal from common in cfl

cfl.py

@@ -4,46 +4,11 @@ from typing import Set, Dict, List, Union, Optional, Tuple, Iterable, \
 import typing
 from typing_extensions import Final
 from copy import deepcopy
-
+from common import Terminal, Nonterminal
 
 T = TypeVar("T")
 
 
-class Terminal:
-    def __init__(self, name: str):
-        self.name = name
-
-    def __eq__(self, obj):
-        if isinstance(obj, Terminal):
-            return obj.name == self.name
-        return False
-
-    def __hash__(self):
-        return hash(self.name)
-
-    def __repr__(self) -> str:
-        return f"Terminal({self.name})"
-
-
-class Nonterminal:
-    def __init__(self, name: str):
-        self.name = name
-
-    def __eq__(self, obj):
-        if isinstance(obj, Nonterminal):
-            return obj.name == self.name
-        return False
-
-    def __hash__(self):
-        return hash(self.name)
-
-    def __lt__(self, other : Nonterminal) -> bool:
-        return self.name < other.name
-
-    def __repr__(self) -> str:
-        return f"Nonterminal({self.name})"
-
-
 def all_of(pred: Callable[[T], bool], it: Iterable[T]) -> bool:
     return all(map(pred, it))
 

common.py

@@ -12,6 +12,9 @@ class Terminal:
     def __hash__(self):
         return hash(self.name)
 
+    def __repr__(self) -> str:
+        return f"Terminal({self.name})"
+
 
 class Nonterminal:
     def __init__(self, name: str):
@@ -25,6 +28,9 @@ class Nonterminal:
     def __hash__(self):
         return hash(self.name)
 
+    def __repr__(self) -> str:
+        return f"Nonterminal({self.name})"
+
 
 class Character:
     def __init__(self, name: str):
@@ -71,4 +77,4 @@ class Emptyset:
         return isinstance(other, Eps)
 
     def __hash__(self):
-        return hash("∅")
\ No newline at end of file
+        return hash("∅")