Comment 1 for bug 1503661

I think I have this fixed:

Hex$ more example.template test.subs
::::::::::::::
example.template
::::::::::::::
${ONE} ${TWO}
::::::::::::::
test.subs
::::::::::::::
file example.template {
  pattern {ONE, TWO}
  {1, 2}
  {3, 4}
}
}
Hex$ ../bin/linux-x86_64/msi -Stest.subs -o test.db
msi: Parse error, unexpected '}'
  in substitution file 'test.subs' at line 7:
  }
Hex$ ls
example.template test.subs

The attached patch contains just the changes needed to fix this and related problems, although I'm going to commit additional internal changes to msi that include code reformatting, various minor cleanups and the addition of debugging tracing macros.