scripts: emit raw enum value in API build description

Currently the value for an enum is only emitted if it is a plain
string. If the enum is an integer or hex value, or a complex code block,
it is omitted from the API build. This fixes that by emitting the raw
value if no string value is present.

With this change:

  <macro name='LIBVIR_CHECK_VERSION'
         file='libvirt-common'
         params='major,minor,micro'>
  <macro name='LIBVIR_VERSION_NUMBER'
         file='libvirt-common'>
  <macro name='VIR_COPY_CPUMAP'
         file='libvirt-domain'
         params='cpumaps,maplen,vcpu,cpumap'>
  ...snip...

  <macro name='LIBVIR_CHECK_VERSION'
         file='libvirt-common'
         params='major,minor,micro'
         raw='((major) * 1000000 + (minor) * 1000 + (micro) <= LIBVIR_VERSION_NUMBER)'>
  <macro name='LIBVIR_VERSION_NUMBER'
         file='libvirt-common'
         raw='6004000'>
  <macro name='VIR_COPY_CPUMAP'
         file='libvirt-domain'
         params='cpumaps,maplen,vcpu,cpumap'
         raw='memcpy(cpumap, VIR_GET_CPUMAP(cpumaps, maplen, vcpu), maplen)'>
  ...snip...

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/scripts/apibuild.py b/scripts/apibuild.py
index 9faf15a75ea16a9859ef298eefc74014e614080c..7cac9b136b4d756c42582ab278d0d1335c062fdb 100755 (executable)
--- a/scripts/apibuild.py
+++ b/scripts/apibuild.py
@@ -500,8 +500,8 @@ class CLexer:
 
                     endArg = self.tokens[1][1].find(")")
                     if endArg != -1:
-                        extra = self.tokens[1][1][endArg+1:]
-                        name = self.tokens[1][1][0:endArg+1]
+                        extra = self.tokens[1][1][endArg + 1:]
+                        name = self.tokens[1][1][0:endArg + 1]
                         newtokens.append(('preproc', name))
                         if extra != "":
                             newtokens.append(('preproc', extra))
@@ -1017,7 +1017,7 @@ class CParser:
                 paramStart = name.find("(")
                 params = None
                 if paramStart != -1:
-                    params = name[paramStart+1:-1]
+                    params = name[paramStart + 1:-1]
                     name = name[0:paramStart]
 
                 # skip hidden macros
@@ -1027,11 +1027,14 @@ class CParser:
                     return token
 
                 strValue = None
+                rawValue = None
                 if len(lst) == 1 and lst[0][0] == '"' and lst[0][-1] == '"':
                     strValue = lst[0][1:-1]
+                else:
+                    rawValue = " ".join(lst)
                 (args, desc) = self.parseMacroComment(name, not self.is_header)
                 self.index_add(name, self.filename, not self.is_header,
-                               "macro", (args, desc, params, strValue))
+                               "macro", (args, desc, params, strValue, rawValue))
                 return token
 
         #
@@ -2178,13 +2181,16 @@ class docBuilder:
             desc = None
             params = None
             strValue = None
+            rawValue = None
         else:
-            (args, desc, params, strValue) = id.info
+            (args, desc, params, strValue, rawValue) = id.info
 
         if params is not None:
             output.write(" params='%s'" % params)
         if strValue is not None:
             output.write(" string='%s'" % strValue)
+        else:
+            output.write(" raw='%s'" % escape(rawValue))
         output.write(">\n")
 
         if desc is not None and desc != "":