Fix JS2C, so that macros with multiple parameters actually WORK.

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 110 matching lines @@
   # we don't allow self-dependecies or recursion.
   for name_pattern, macro in reversed(macros):
     pattern_match = name_pattern.search(lines, 0)
     while pattern_match is not None:
       # Scan over the arguments
       height = 1
       start = pattern_match.start()
       end = pattern_match.end()
       assert lines[end - 1] == '('
       last_match = end
-      arg_index = 0
+      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
+        mapping[macro.args[arg_index[0]]] = replacement
+        arg_index[0] += 1
       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
@@ skipping 239 matching lines @@
 
 def main():
   natives = sys.argv[1]
   type = sys.argv[2]
   compression = sys.argv[3]
   source_files = sys.argv[4:]
   JS2C(source_files, [natives], { 'TYPE': type, 'COMPRESSION': compression })
 
 if __name__ == "__main__":
   main()