Configtool: let the parsing method decide what a name is.
This is mostly for code robustness.
This commit is contained in:
parent
e7395c8dd8
commit
d9e4cd1086
|
|
@ -291,8 +291,8 @@ class BoardPanel(wx.Panel):
|
|||
if self.parseCandidateValues(ln):
|
||||
continue
|
||||
|
||||
elif ln.lstrip().startswith("#define"):
|
||||
self.parseDefineName(ln)
|
||||
if self.parseDefineName(ln):
|
||||
continue
|
||||
|
||||
# Ignore candidates in the metadata file.
|
||||
self.candHeatPins = []
|
||||
|
|
@ -370,6 +370,9 @@ class BoardPanel(wx.Panel):
|
|||
t = m.groups()
|
||||
if len(t) == 1:
|
||||
self.cfgNames.append(t[0])
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
def parseDefineValue(self, ln):
|
||||
m = reDefQS.search(ln)
|
||||
|
|
|
|||
|
|
@ -242,7 +242,8 @@ class PrinterPanel(wx.Panel):
|
|||
ln = prevLines + ln
|
||||
prevLines = ""
|
||||
|
||||
self.parseDefineName(ln)
|
||||
if self.parseDefineName(ln):
|
||||
continue
|
||||
|
||||
prevLines = ""
|
||||
for ln in self.userBuffer:
|
||||
|
|
@ -282,6 +283,9 @@ class PrinterPanel(wx.Panel):
|
|||
t = m.groups()
|
||||
if len(t) == 1:
|
||||
self.cfgNames.append(t[0])
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
def parseDefineValue(self, ln):
|
||||
if ln.lstrip().startswith("#define"):
|
||||
|
|
|
|||
Loading…
Reference in New Issue