rename text parser

python/graphs_manager.py

@@ -3,7 +3,7 @@ from PySide6.QtCore import Slot # for signal/slot support
 from PySide6.QtCore import Qt, QAbstractTableModel, QModelIndex
 from graph_item import GraphItem
 from settings_manager import settings
-from mp_code_text_parser import event_dict, event_list
+from mp_code_event_dict import mp_code_event_dict, mp_code_event_list
 from mp_logger import log_to_statusbar
 
 # graph list model column constants
@@ -68,8 +68,8 @@ class GraphsManager(QAbstractTableModel):
     # instantiate graphs, set settings, then signal
     def set_graphs(self, mp_code, gry_graphs, scope):
         self.mp_code = mp_code
-        self.mp_code_event_dict = event_dict(mp_code)
-        self.mp_code_event_list = event_list(self.mp_code_event_dict)
+        self.mp_code_event_dict = mp_code_event_dict(mp_code)
+        self.mp_code_event_list = mp_code_event_list(self.mp_code_event_dict)
         self.mp_code_schema = self.mp_code_event_dict["schema"]
 
         # clear graphs

python/mp_code_text_parser.py → python/mp_code_event_dict.py

@@ -130,7 +130,7 @@ def _parse_line(mp_line, events):
         _parse_righthand_events(mp_line[match.capturedEnd():], events)
 
 # return events classified as dict event_type of sets of event names
-def event_dict(mp_code_text):
+def mp_code_event_dict(mp_code_text):
     """Define events where key=event type, value=event(s).
        We call schema an event."""
     events = {"schema": "Schema not defined",
@@ -170,7 +170,7 @@ def event_dict(mp_code_text):
     return events
 
 # get the list of connectable events without schema and say events
-def event_list(event_dict):
+def mp_code_event_list(event_dict):
     event_types = ["root", "atomic", "composite"]
     events = list()
     for event_type in event_types:
@@ -178,3 +178,4 @@ def event_list(event_dict):
     events = sorted(events, key=str.casefold)
     return events
 
+

python/mp_code_manager.py

@@ -5,7 +5,7 @@ from PySide6.QtGui import QTextDocument
 from PySide6.QtWidgets import QPlainTextDocumentLayout
 from mp_code_syntax_highlighter import MPCodeSyntaxHighlighter
 from mp_code_syntax_checker import mp_check_syntax
-from mp_code_text_parser import event_dict, event_list
+from mp_code_event_dict import mp_code_event_dict, mp_code_event_list
 from mp_code_spell_checker import mp_code_misspell_expression
 
 # use this to signal completion to GUI.
@@ -77,7 +77,7 @@ class MPCodeManager(QObject):
         self.syntax_check_signaler = SyntaxCheckSignaller()
 
         self.mp_code_text = ""
-        self.mp_code_event_dict = event_dict("")
+        self.mp_code_event_dict = mp_code_event_dict("")
         self.mp_code_event_list = list()
         self.mp_code_schema = self.mp_code_event_dict["schema"]
 
@@ -100,8 +100,8 @@ class MPCodeManager(QObject):
             # no change to actual text
             return
         self.mp_code_text = new_mp_code_text
-        self.mp_code_event_dict = event_dict(new_mp_code_text)
-        self.mp_code_event_list = event_list(self.mp_code_event_dict)
+        self.mp_code_event_dict = mp_code_event_dict(new_mp_code_text)
+        self.mp_code_event_list = mp_code_event_list(self.mp_code_event_dict)
         self.mp_code_schema = self.mp_code_event_dict["schema"]
         if True:
             self.mp_code_misspell_expression \

python/search_mp_code_dialog_wrapper.py

@@ -14,7 +14,7 @@ from mp_code_syntax_highlighter import MPCodeSyntaxHighlighter
 from search_mp_code_dialog import Ui_SearchMPCodeDialog
 from preferences import preferences
 from settings_manager import settings
-from mp_code_text_parser import event_dict, event_list
+from mp_code_event_dict import mp_code_event_dict, mp_code_event_list
 
 # private support for SearchMPCodeView, this is a duplicate of mp_code_view.py
 class SecondLineNumberArea(QWidget):
@@ -151,8 +151,8 @@ class SearchMPCodeManager(QObject):
     def _set_text(self, mp_code_text):
         self.document.setPlainText(mp_code_text)
         self.mp_code_text = mp_code_text
-        self.mp_code_event_dict = event_dict(mp_code_text)
-        self.mp_code_event_list = event_list(self.mp_code_event_dict)
+        self.mp_code_event_dict = mp_code_event_dict(mp_code_text)
+        self.mp_code_event_list = mp_code_event_list(self.mp_code_event_dict)
         self.mp_code_schema = self.mp_code_event_dict["schema"]
   
         # run highlighter

python/test.py

@@ -19,7 +19,7 @@ from PySide6.QtWidgets import QApplication
 from version_file import VERSION
 import resources_rc
 from settings_manager import set_default_settings, settings
-from mp_code_text_parser import event_dict
+from mp_code_event_dict import mp_code_event_dict
 from export_trace import export_trace
 from trace_generator_manager import TraceGeneratorManager
 from mp_json_io_manager import read_mp_code_file
@@ -234,8 +234,8 @@ class Tester():
             return
 
         # schema_name
-        mp_code_event_dict = event_dict(self.mp_code_text)
-        self.schema_name = mp_code_event_dict["schema"]
+        event_dict = mp_code_event_dict(self.mp_code_text)
+        self.schema_name = event_dict["schema"]
 
         # start time
         self.start_time = time()