* Reapply revisions 1383, 1384, 1391, 1398, 1401, 1402,...

tools/js2c.py

 #!/usr/bin/env python
 #
 # Copyright 2006-2008 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 86 matching lines @@
 
 
 def ExpandConstants(lines, constants):
   for key, value in constants.items():
     lines = lines.replace(key, str(value))
   return lines
 
 
 def ExpandMacros(lines, macros):
   for name, macro in macros.items():
-    start = lines.find(name, 0)
+    start = lines.find(name + '(', 0)
     while start != -1:
       # Scan over the arguments
       assert lines[start + len(name)] == '('
       height = 1
       end = start + len(name) + 1
       last_match = end
       arg_index = 0
       mapping = { }
       def add_arg(str):
         # Remember to expand recursively in the arguments
         replacement = ExpandMacros(str.strip(), macros)
         mapping[macro.args[arg_index]] = replacement
       while end < len(lines) and height > 0:
         # We don't count commas at higher nesting levels.
         if lines[end] == ',' and height == 1:
           add_arg(lines[last_match:end])
           last_match = end + 1
         elif lines[end] in ['(', '{', '[']:
           height = height + 1
         elif lines[end] in [')', '}', ']']:
           height = height - 1
         end = end + 1
       # Remember to add the last match.
       add_arg(lines[last_match:end-1])
       result = macro.expand(mapping)
       # Replace the occurrence of the macro with the expansion
       lines = lines[:start] + result + lines[end:]
-      start = lines.find(name, end)
+      start = lines.find(name + '(', end)
   return lines
 
 class TextMacro:
   def __init__(self, args, body):
     self.args = args
     self.body = body
   def expand(self, mapping):
     result = self.body
     for key, value in mapping.items():
         result = result.replace(key, value)
@@ skipping 210 matching lines @@
 
 def main():
   natives = sys.argv[1]
   natives_empty = sys.argv[2]
   type = sys.argv[3]
   source_files = sys.argv[4:]
   JS2C(source_files, [natives, natives_empty], { 'TYPE': type })
 
 if __name__ == "__main__":
   main()