Allow substitution of messages as variables in other messages.

grit/format/rc_header.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 '''Item formatters for RC headers.
 '''
 
 import re
 
 from grit.format import interface
 from grit import exception
 from grit import util
 
 from grit.extern import FP
 
 
 class TopLevel(interface.ItemFormatter):
   '''Writes the necessary preamble for a resource.h file.'''
 
-  def Format(self, item, lang='', begin_item=True, output_dir='.'):
-    if not begin_item:
-      return ''
-    else:
-      header_string = '''// Copyright (c) Google Inc. %d
+  def Format(self, item, lang='', output_dir='.'):
+    header_string = '''// Copyright (c) Google Inc. %d
 // All rights reserved.
 // This file is automatically generated by GRIT. Do not edit.
 
 #pragma once
 ''' % (util.GetCurrentYear())
-      # Check for emit nodes under the rc_header. If any emit node
-      # is present, we assume it means the GRD file wants to override
-      # the default header, with no includes.
-      for output_node in item.GetOutputFiles():
-        if output_node.GetType() == 'rc_header':
-          for child in output_node.children:
-            if child.name == 'emit':
-              if child.attrs['emit_type'] == 'prepend':
-                return header_string
-      # else print out the default header with include
-      return header_string + '''
+    # Check for emit nodes under the rc_header. If any emit node
+    # is present, we assume it means the GRD file wants to override
+    # the default header, with no includes.
+    for output_node in item.GetOutputFiles():
+      if output_node.GetType() == 'rc_header':
+        for child in output_node.children:
+          if child.name == 'emit':
+            if child.attrs['emit_type'] == 'prepend':
+              return header_string
+    # else print out the default header with include
+    return header_string + '''
 #include <atlres.h>
 
 '''
 
 
 class EmitAppender(interface.ItemFormatter):
   '''Adds the content of the <emit> nodes to the RC header file.'''
 
-  def Format(self, item, lang='', begin_item=True, output_dir='.'):
-    if not begin_item:
-      return ''
-    else:
-      return '%s\n' % (item.GetCdata())
+  def Format(self, item, lang='', output_dir='.'):
+    return '%s\n' % (item.GetCdata())
 
 class Item(interface.ItemFormatter):
   '''Writes the #define line(s) for a single item in a resource.h file.  If
   your node has multiple IDs that need to be defined (as is the case e.g. for
   dialog resources) it should define a function GetTextIds(self) that returns
   a list of textual IDs (strings).  Otherwise the formatter will use the
   'name' attribute of the node.'''
 
   # All IDs allocated so far, mapped to the textual ID they represent.
   # Used to detect and resolve collisions.
   ids_ = {}
 
   # All textual IDs allocated so far, mapped to the numerical ID they
   # represent. Used when literal IDs are being defined in the 'identifiers'
   # section of the GRD file to define other message IDs.
   tids_ = {}
 
   def _VerifyId(self, id, tid, msg_if_error):
     if id in self.ids_ and self.ids_[id] != tid:
       raise exception.IdRangeOverlap(msg_if_error +
         '\nUse the first_id attribute on grouping nodes (<structures>,\n'
         '<includes>, <messages> and <ids>) to fix this problem.')
     if id < 101:
       print ('WARNING: Numeric resource IDs should be greater than 100 to avoid\n'
              'conflicts with system-defined resource IDs.')
 
-  def Format(self, item, lang='', begin_item=True, output_dir='.'):
-    if not begin_item:
-      return ''
-
+  def Format(self, item, lang='', output_dir='.'):
     # Resources that use the RES protocol don't need
     # any numerical ids generated, so we skip them altogether.
     # This is accomplished by setting the flag 'generateid' to false
     # in the GRD file.
     if 'generateid' in item.attrs:
       if item.attrs['generateid'] == 'false':
         return ''
 
     text_ids = item.GetTextualIds()
 
@@ skipping 76 matching lines @@
         self._VerifyId(id, tid,
           'Wanted to make numeric value for ID %s (%d) follow the numeric value of\n'
           'the previous ID in the .grd file, but it was already used.' % (tid, id))
 
       if tid not in self.ids_.values():
         self.ids_[id] = tid
         self.tids_[tid] = id
         lines.append('#define %s %d\n' % (tid, id))
     return ''.join(lines)