Simplified by using new yacc rules.  The new lex rules can't be used here, at least without ifdefs for the bootstrap.
Simplified by using new yacc rules.  The new lex rules can't be used
here, at least without ifdefs for the bootstrap.

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase