Fixes issues in string interpolation tests

frog/scripts/tokenizer_gen.py

 #!/usr/bin/env python
 # Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 '''Generates the Tokenizer class into tokenenizer.g.dart.'''
 
 import re
 from token_info import tokens, keywords
 from codegen import CodeWriter, HEADER
@@ skipping 52 matching lines @@
       if self.includeWhitespace:
         self.writeWhitespace(cw)
       for key, case in sorted(self.cases.items()):
         cw.enterBlock('case %s:' % makeSafe(key))
 
         case.writeCases(cw)
         cw.exitBlock()
       if self.includeWhitespace:
         cw.enterBlock('default:')
         cw.enterBlock('if (isIdentifierStart(ch)) {')
-        cw.writeln('return this.finishIdentifier();')
+        cw.writeln('return this.finishIdentifier(ch);')
         cw.exitBlock('} else if (isDigit(ch)) {')
         cw.enterBlock()
         cw.writeln('return this.finishNumber();')
         cw.exitBlock('} else {')
         cw.enterBlock()
         cw.writeln(self.defaultReturn())
         cw.exitBlock('}')
       else:
         cw.writeln('default: ' + self.defaultReturn())
       cw.exitBlock('}')
@@ skipping 153 matching lines @@
   cw.enterBlock()
   cw.writeln()
   writeClass(cw, 'IdentifierStart', OrTest(
     CharTest('a', 'z'), CharTest('A', 'Z'), CharTest('_'))) #TODO: CharTest('$')
   writeClass(cw, 'Digit', CharTest('0', '9'))
   writeClass(cw, 'HexDigit', OrTest(
     ExplicitTest('isDigit(c)'), CharTest('a', 'f'), CharTest('A', 'F')))
   writeClass(cw, 'Whitespace', OrTest(
     CharTest(' '), CharTest('\t'), CharTest('\n'), CharTest('\r')))
   writeClass(cw, 'IdentifierPart', OrTest(
-    ExplicitTest('isIdentifierStart(c)'), ExplicitTest('isDigit(c)')))
+    ExplicitTest('isIdentifierStart(c)'),
+    ExplicitTest('isDigit(c)'),
+    CharTest('$')))
+  # This is like IdentifierPart, but without $
+  writeClass(cw, 'InterpIdentifierPart', OrTest(
+    ExplicitTest('isIdentifierStart(c)'),
+    ExplicitTest('isDigit(c)')))
 
 def writeExtraMethods(cw):
   lengths = {}
   for kw in keywords:
     l = len(kw.text)
     if not lengths.has_key(l):
       lengths[l] = LengthGroup(l)
     lengths[l].add(kw)
 
   # TODO(jimhug): Consider merging this with the finishIdentifier code.
@@ skipping 29 matching lines @@
   pat = re.compile('@(.)', re.DOTALL)
   text = pat.sub(makeSafe1, TOKENIZER)
   out.write(text % {
       'cases': casesCode,
       'extraMethods': extraMethods,
       'helperMethods': helperMethods })
   out.close()
 
 
 if __name__ == '__main__': main()