research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[ck2cti] Narrow implicit end-of-section test

Browse source 
Assume that the new section label must be the first word on a line
This commit is contained in:
Ray Speth 2015-02-26 00:13:34 +00:00
parent 26c6d93168
commit 74f1cf05b1
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
interfaces/cython/cantera/ck2cti.py
View file

@ -1403,7 +1403,7 @@ class Parser(object):
tokens = tokens[1:] tokens = tokens[1:]
while line is not None and not contains(line, 'END'): while line is not None and not contains(line, 'END'):
# Grudging support for implicit end of section # Grudging support for implicit end of section
if contains(line, 'SPEC'): if line.strip()[:4].upper() == 'SPEC':
self.warn('"ELEMENTS" section implicitly ended by start of ' self.warn('"ELEMENTS" section implicitly ended by start of '
'next section on line {0}.'.format(self.line_number)) 'next section on line {0}.'.format(self.line_number))
advance = False advance = False
@ -1424,8 +1424,7 @@ class Parser(object):
inHeader = False inHeader = False
while line is not None and not contains(line, 'END'): while line is not None and not contains(line, 'END'):
# Grudging support for implicit end of section # Grudging support for implicit end of section
if (contains(line, 'REAC') or contains(line, 'TRAN') or if line.strip()[:4].upper() in ('REAC', 'TRAN', 'THER'):
contains(line, 'THER')):
self.warn('"SPECIES" section implicitly ended by start of ' self.warn('"SPECIES" section implicitly ended by start of '
'next section on line {0}.'.format(self.line_number)) 'next section on line {0}.'.format(self.line_number))
advance = False advance = False
@ -1458,7 +1457,7 @@ class Parser(object):
entry = [] entry = []
while line is not None and not get_index(line, 'END') == 0: while line is not None and not get_index(line, 'END') == 0:
# Grudging support for implicit end of section # Grudging support for implicit end of section
if (contains(line, 'REAC') or contains(line, 'TRAN')): if line.strip()[:4].upper() in ('REAC', 'TRAN'):
self.warn('"THERMO" section implicitly ended by start of ' self.warn('"THERMO" section implicitly ended by start of '
'next section on line {0}.'.format(self.line_number)) 'next section on line {0}.'.format(self.line_number))
advance = False advance = False
@ -1526,7 +1525,7 @@ class Parser(object):
thermo = [] thermo = []
while line is not None and not contains(line, 'END'): while line is not None and not contains(line, 'END'):
# Grudging support for implicit end of section # Grudging support for implicit end of section
if contains(line, 'REAC') or contains(line, 'TRAN'): if line.strip()[:4].upper() in ('REAC', 'TRAN'):
self.warn('"THERMO" section implicitly ended by start of ' self.warn('"THERMO" section implicitly ended by start of '
'next section on line {0}.'.format(self.line_number)) 'next section on line {0}.'.format(self.line_number))
advance = False advance = False
@ -1595,7 +1594,7 @@ class Parser(object):
line, comment = readline() line, comment = readline()
while line is not None and not contains(line, 'END'): while line is not None and not contains(line, 'END'):
# Grudging support for implicit end of section # Grudging support for implicit end of section
if contains(line, 'TRAN'): if line.strip()[:4].upper() == 'TRAN':
self.warn('"REACTIONS" section implicitly ended by start of ' self.warn('"REACTIONS" section implicitly ended by start of '
'next section on line {0}.'.format(self.line_number)) 'next section on line {0}.'.format(self.line_number))
advance = False advance = False
@ -1653,7 +1652,7 @@ class Parser(object):
transport_start_line = self.line_number transport_start_line = self.line_number
while line is not None and not contains(line, 'END'): while line is not None and not contains(line, 'END'):
# Grudging support for implicit end of section # Grudging support for implicit end of section
if contains(line, 'REAC'): if line.strip()[:4].upper() == 'REAC':
self.warn('"TRANSPORT" section implicitly ended by start of ' self.warn('"TRANSPORT" section implicitly ended by start of '
'next section on line {0}.'.format(self.line_number)) 'next section on line {0}.'.format(self.line_number))
advance = False advance = False