Merge pull request #4985 from lioncash/enum-class ExpressionParser: Convert parse state enum into an enum class
