plcopeneditor_history: comparison TextViewer.py

equal deleted inserted replaced

-:4a36f2ec8967
+:c6ef6d92ce16
 # Indentation size
 self.SetTabWidth(2)
 self.SetUseTabs(0)
 self.Keywords = []
-self.Variables = []
+self.Variables = {}
 self.Functions = []
 self.Jumps = []
 self.EnumeratedValues = []
 self.DisableEvents = True
 self.TextSyntax = "ST"
 self.CurrentAction = None
 self.TagName = tagname
 self.Errors = []
 self.Debug = debug
 self.InstancePath = instancepath
+self.StructElementsStack = []
 self.ParentWindow = window
 self.Controler = controler
 self.SetModEventMask(wx.stc.STC_MOD_BEFOREINSERT|wx.stc.STC_MOD_BEFOREDELETE)
 self.RefreshJumpList()
 self.EmptyUndoBuffer()
 self.DisableEvents = False
 words = self.TagName.split("::")
-self.Variables = [variable["Name"].upper() for variable in self.Controler.GetEditedElementInterfaceVars(self.TagName, self.Debug)]
+self.Variables = dict([(variable["Name"], variable["Tree"]) for variable in self.Controler.GetEditedElementInterfaceVars(self.TagName, self.Debug)])
 if self.Controler.GetEditedElementType(self.TagName, self.Debug)[1] == "function" or words[0] == "T" and self.TextSyntax == "IL":
-self.Variables.append(words[-1].upper())
+self.Variables[words[-1]] = {}
 self.Functions = []
 for category in self.Controler.GetBlockTypes(self.TagName, self.Debug):
 for blocktype in category["list"]:
-if blocktype["type"] == "function" and blocktype["name"] not in self.Keywords and blocktype["name"] not in self.Variables:
+if blocktype["type"] == "function" and blocktype["name"] not in self.Keywords and blocktype["name"] not in self.Variables.keys():
 self.Functions.append(blocktype["name"].upper())
 self.EnumeratedValues = []
 for value in self.Controler.GetEnumeratedDataValues():
 self.EnumeratedValues.append(value.upper())
 self.Colourise(0, -1)
 def RefreshScaling(self, refresh=True):
 pass
+def IsValidVariable(self, name_list, var_tree):
+if len(name_list) == 0:
+return True
+else:
+sub_tree = var_tree.get(name_list[0].upper(), None)
+if sub_tree is not None:
+return self.IsValidVariable(name_list[1:], sub_tree)
+return False
 def OnStyleNeeded(self, event):
 self.TextChanged = True
 line = self.LineFromPosition(self.GetEndStyled())
 if line == 0:
 start_pos = last_styled_pos = 0
 else:
 start_pos = last_styled_pos = self.GetLineEndPosition(line - 1) + 1
 end_pos = event.GetPosition()
 self.StartStyling(start_pos, 0xff)
+struct_elements = []
 current_pos = last_styled_pos
 state = SPACE
 line = ""
 word = ""
 elif state == NUMBER:
 self.SetStyling(current_pos - last_styled_pos, STC_PLC_NUMBER)
 elif state == WORD:
 if word in self.Keywords:
 self.SetStyling(current_pos - last_styled_pos, STC_PLC_WORD)
-elif word in self.Variables:
+elif self.IsValidVariable(struct_elements + [word], self.Variables):
 self.SetStyling(current_pos - last_styled_pos, STC_PLC_VARIABLE)
 elif word in self.Functions:
 self.SetStyling(current_pos - last_styled_pos, STC_PLC_FUNCTION)
 elif word in self.Jumps:
 self.SetStyling(current_pos - last_styled_pos, STC_PLC_JUMP)
 elif word in self.EnumeratedValues:
 self.SetStyling(current_pos - last_styled_pos, STC_PLC_NUMBER)
 else:
 self.SetStyling(current_pos - last_styled_pos, 31)
-if self.GetCurrentPos() < last_styled_pos or self.GetCurrentPos() > current_pos:
+if word != "]" and (self.GetCurrentPos() < last_styled_pos or self.GetCurrentPos() > current_pos):
 self.StartStyling(last_styled_pos, wx.stc.STC_INDICS_MASK)
 self.SetStyling(current_pos - last_styled_pos, wx.stc.STC_INDIC0_MASK)
 self.StartStyling(current_pos, 0xff)
+struct_elements = []
 else:
 self.SetStyling(current_pos - last_styled_pos, 31)
 last_styled_pos = current_pos
 state = SPACE
 line = ""
 elif line.endswith("(*") and state != COMMENT:
 self.SetStyling(current_pos - last_styled_pos - 1, 31)
 last_styled_pos = current_pos
+if state == WORD:
+struct_elements = []
 state = COMMENT
 elif state == COMMENT:
 if line.endswith("*)"):
 self.SetStyling(current_pos - last_styled_pos + 2, STC_PLC_COMMENT)
 last_styled_pos = current_pos + 1
 word += char
 else:
 if state == WORD:
 if word in self.Keywords:
 self.SetStyling(current_pos - last_styled_pos, STC_PLC_WORD)
-elif word in self.Variables:
+elif self.IsValidVariable(struct_elements + [word], self.Variables):
 self.SetStyling(current_pos - last_styled_pos, STC_PLC_VARIABLE)
 elif word in self.Functions:
 self.SetStyling(current_pos - last_styled_pos, STC_PLC_FUNCTION)
 elif word in self.Jumps:
 self.SetStyling(current_pos - last_styled_pos, STC_PLC_JUMP)
 elif word in self.EnumeratedValues:
 self.SetStyling(current_pos - last_styled_pos, STC_PLC_NUMBER)
 else:
 self.SetStyling(current_pos - last_styled_pos, 31)
-if self.GetCurrentPos() < last_styled_pos or self.GetCurrentPos() > current_pos:
+if word != "]" and (self.GetCurrentPos() < last_styled_pos or self.GetCurrentPos() > current_pos):
 self.StartStyling(last_styled_pos, wx.stc.STC_INDICS_MASK)
 self.SetStyling(current_pos - last_styled_pos, wx.stc.STC_INDIC0_MASK)
 self.StartStyling(current_pos, 0xff)
+if char == '.':
+if word != "]":
+struct_elements.append(word)
+else:
+if char == '[':
+self.StructElementsStack.append(struct_elements + [word])
+struct_elements = []
 word = ""
 last_styled_pos = current_pos
 state = SPACE
 elif state == NUMBER:
 self.SetStyling(current_pos - last_styled_pos, STC_PLC_NUMBER)
 last_styled_pos = current_pos
 state = SPACE
+if char == ']':
+struct_elements = self.StructElementsStack.pop(-1)
+word = char
+state = WORD
 current_pos += 1
 if state == COMMENT:
 self.SetStyling(current_pos - last_styled_pos + 2, STC_PLC_COMMENT)
 elif state == NUMBER:
 self.SetStyling(current_pos - last_styled_pos, STC_PLC_NUMBER)
 elif state == WORD:
 if word in self.Keywords:
 self.SetStyling(current_pos - last_styled_pos, STC_PLC_WORD)
-elif word in self.Variables:
+elif self.IsValidVariable(struct_elements + [word], self.Variables):
 self.SetStyling(current_pos - last_styled_pos, STC_PLC_VARIABLE)
 elif word in self.Functions:
 self.SetStyling(current_pos - last_styled_pos, STC_PLC_FUNCTION)
 elif word in self.Jumps:
 self.SetStyling(current_pos - last_styled_pos, STC_PLC_JUMP)
 if words[0].upper() in ["CAL", "CALC", "CALNC"]:
 kw = self.Functions
 elif words[0].upper() in ["JMP", "JMPC", "JMPNC"]:
 kw = self.Jumps
 else:
-kw = self.Variables
+kw = self.Variables.keys()
 else:
-kw = self.Keywords + self.Variables + self.Functions
+kw = self.Keywords + self.Variables.keys() + self.Functions
 if len(kw) > 0:
 kw.sort()
 self.AutoCompSetIgnoreCase(True)
 self.AutoCompShow(len(words[-1]), " ".join(kw))
 else:

changeset 295	c6ef6d92ce16
parent 249	d8425712acef
child 297	e837b67cb184