Revised version of new grammar style (chunk of symbol & literal objecs)

Author: HakiRose

textworld/textgen/__init__.py

@@ -5,7 +5,7 @@
 from textworld.textgen.parser import TextGrammarParser
 
 
-class NewAlternative:
+class Alternative:
     """
         A single alternative in a production rule.
     """
@@ -36,7 +36,7 @@ def __init__(self,  value: str):
         self._value = value
 
 
-class NewLiteralAlternative(NewAlternative):
+class LiteralAlternative(Alternative):
     """
         An alternative from a literal string and represents it as a chunk of literal and symbol objects.
     """
@@ -68,7 +68,7 @@ def split_form(self, include_adj=True) -> Tuple[Optional[str], str]:
         return None, self._node
 
 
-class NewAdjectiveNounAlternative(NewLiteralAlternative):
+class AdjectiveNounAlternative(LiteralAlternative):
     """
         An alternative that specifies an adjective and a noun as chunk of objects.
     """
@@ -89,12 +89,12 @@ def split_form(self, include_adj=True) -> Tuple[Optional[str], str]:
             return None, self._n_node
 
 
-class MatchAlternative(NewAlternative):
+class MatchAlternative(Alternative):
     """
         An alternative that specifies matching names for two objects.
     """
 
-    def __init__(self, lhs: NewAlternative, rhs: NewAlternative):
+    def __init__(self, lhs: Alternative, rhs: Alternative):
         self.lhs = lhs
         self.rhs = rhs
 
@@ -107,7 +107,7 @@ class ProductionRule:
         A production rule in a text grammar.
     """
 
-    def __init__(self, symbol: str, alternatives: Iterable[NewAlternative]):
+    def __init__(self, symbol: str, alternatives: Iterable[Alternative]):
         self.symbol = symbol
         self.alternatives = tuple(alternatives)
 
@@ -123,13 +123,13 @@ def walk_str(self, node):
     def walk_Literal(self, node):
         value = self.walk(node.value)
         if value:
-            return NewLiteralAlternative(value)
+            return LiteralAlternative(value)
         else:
             # Skip empty literals
             return None
 
     def walk_AdjectiveNoun(self, node):
-        return NewAdjectiveNounAlternative(self.walk(node.adjective), self.walk(node.noun))
+        return AdjectiveNounAlternative(self.walk(node.adjective), self.walk(node.noun))
 
     def walk_Match(self, node):
         return MatchAlternative(self.walk(node.lhs), self.walk(node.rhs))