Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix # command in sqf_validator.py (#6768)

Browse Source 
**When merged this pull request will:**
- Fix the sqf validator to correctly detect the use of # as select or preprocessor command.
This commit is contained in:
NeilZar 2019-01-05 03:10:40 +01:00 committed by jonpas
parent 73386c5391
commit b181fa6013
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/sqf_validator.py
View File

@ -48,6 +48,7 @@ def check_sqf_syntax(filepath):
lastIsCurlyBrace = False lastIsCurlyBrace = False
checkForSemicolon = False checkForSemicolon = False
onlyWhitespace = True
# Extra information so we know what line we find errors at # Extra information so we know what line we find errors at
lineNumber = 1 lineNumber = 1
@ -61,6 +62,7 @@ def check_sqf_syntax(filepath):
checkForSemicolon = not re.search('findIf', content, re.IGNORECASE) checkForSemicolon = not re.search('findIf', content, re.IGNORECASE)
if c == '\n': # Keeping track of our line numbers if c == '\n': # Keeping track of our line numbers
onlyWhitespace = True # reset so we can see if # is for a preprocessor command
lineNumber += 1 # so we can print accurate line number information when we detect a possible error lineNumber += 1 # so we can print accurate line number information when we detect a possible error
if (isInString): # while we are in a string, we can ignore everything else, except the end of the string if (isInString): # while we are in a string, we can ignore everything else, except the end of the string
if (c == inStringType): if (c == inStringType):
@ -84,7 +86,7 @@ def check_sqf_syntax(filepath):
if (c == '"' or c == "'"): if (c == '"' or c == "'"):
isInString = True isInString = True
inStringType = c inStringType = c
elif (c == '#'): elif (c == '#' and onlyWhitespace):
ignoreTillEndOfLine = True ignoreTillEndOfLine = True
elif (c == '/'): elif (c == '/'):
checkIfInComment = True checkIfInComment = True
@ -114,6 +116,9 @@ def check_sqf_syntax(filepath):
print("ERROR: Tab detected at {0} Line number: {1}".format(filepath,lineNumber)) print("ERROR: Tab detected at {0} Line number: {1}".format(filepath,lineNumber))
bad_count_file += 1 bad_count_file += 1
if (c not in [' ', '\t', '\n']):
onlyWhitespace = False
if (checkForSemicolon): if (checkForSemicolon):
if (c not in [' ', '\t', '\n', '/']): # keep reading until no white space or comments if (c not in [' ', '\t', '\n', '/']): # keep reading until no white space or comments
checkForSemicolon = False checkForSemicolon = False