Deal with ca and CA transparency operators in pdf. add comments to generated classes.

experimental/PdfViewer/generate_code.py

 
 
 import sys
 
 import datatypes
 import pdfspec_autogen
 
 knowTypes = {
 '(any)': ['SkPdfObject*', 'ObjectFromDictionary', datatypes.CppNull(), 'true'],
 '(undefined)': ['SkPdfObject*', 'ObjectFromDictionary', datatypes.CppNull(), 'true'],
@@ skipping 21 matching lines @@
     self.fParent = parent
     self.fName = name
     self.fAbr = abr
     
     self.fDefault = ''
     self.fTypes = ''
     self.fCppName = ''
     self.fEnumValues = []
     self.fHasMust = False
     self.fMustBe = ''
+    self.fComment = ''
 
   def must(self, value):
     self.fHasMust = True
     self.fMustBe = value
     return self
     
   def default(self, value):
     self.fDefault = value
     return self
     
@@ skipping 11 matching lines @@
     types = types.replace('or', ' ')
     types = types.replace(',', ' ')
     types = types.replace('text', ' ') # TODO(edisonn): what is the difference between 'text string' and 'string'?
     types = types.replace('file specification', 'file_specification')
     
     
     self.fTypes = types
     return self
 
   def comment(self, comment):
+    self.fComment = comment
     return self
       
   def done(self):
     return self.fParent
 
 
 class PdfClassField:
-  def __init__(self, parent, required, version='', inheritable=False, comment=''):
+  def __init__(self, parent, required, version='', inheritable=False):
     #self.fProp = ''
     self.fParent = parent
     self.fRequired = required
     self.fVersion = version
     self.fInheritable = inheritable
-    self.fComment = comment
     
   def field(self, name, abr=''):
     self.fProp = PdfField(self, name, abr)
     return self.fProp 
     
   def done(self):
     return self.fParent
 
 class PdfClass:
   def __init__(self, name, base, comment):
@@ skipping 169 matching lines @@
       cls = self.fClasses[name]
       enum = cls.fEnum
       
       fileClass = open('SkPdf' + cls.fName + '_autogen.h', 'w')
       fileClass.write('#ifndef __DEFINED__SkPdf' + cls.fName + '\n')
       fileClass.write('#define __DEFINED__SkPdf' + cls.fName + '\n')
       fileClass.write('\n')
 
       fileClass.write('#include "SkPdfEnums_autogen.h"\n')
       fileClass.write('#include "SkPdfArray_autogen.h"\n')
+      if cls.fBase != '':
+        fileClass.write('#include "SkPdf' + cls.fBase + '_autogen.h"\n')
+      fileClass.write('\n')
+      
+      if cls.fComment != '':
+        fileClass.write('// ' + cls.fComment + '\n')
       
       if cls.fBase == '':
-        fileClass.write('\nclass SkPdf' + cls.fName + ' {\n')
+        fileClass.write('class SkPdf' + cls.fName + ' {\n')
       else:
-        fileClass.write('#include "SkPdf' + cls.fBase + '_autogen.h"\n')
-        fileClass.write('\nclass SkPdf' + cls.fName + ' : public SkPdf' + cls.fBase + ' {\n')
+        fileClass.write('class SkPdf' + cls.fName + ' : public SkPdf' + cls.fBase + ' {\n')
       
       fileClass.write('public:\n')
       fileClass.write('  virtual SkPdfObjectType getType() const { return ' + cls.fEnum + ';}\n')
       if len(cls.fEnumSubclasses) == 0:
         fileClass.write('  virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(' + cls.fEnum + ' + 1);}\n')
       else:
         fileClass.write('  virtual SkPdfObjectType getTypeEnd() const { return ' + cls.fEnumEnd + ';}\n')
       
       self.writeAsFoo(fileClass, cls, enumToCls)
       
@@ skipping 24 matching lines @@
       # right now valid return true      
       fileClass.write('  virtual bool valid() const {return true;}\n')
       fileClass.write('\n')
       
       fileClass.write('  SkPdf' + cls.fName + '& operator=(const SkPdf' + cls.fName + '& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}\n')
       fileClass.write('\n')
       
       for field in cls.fFields:
         prop = field.fProp
         if prop.fCppName != '':
+          
+          lines = prop.fComment.split('\n')
+          if prop.fComment != '' and len(lines) > 0:
+            fileClass.write('/** ' + lines[0] + '\n')
+            for line in lines[1:]:
+              fileClass.write(' *  ' + line + '\n')
+            fileClass.write('**/\n')
+          
           if prop.fCppName[0] == '[':
             fileClass.write('/*\n')  # comment code of the atributes that can have any name
           
           # TODO(edisonn): has_foo();  
-            fileClass.write('  bool has_' + prop.fCppName + '() const {\n')
-            fileClass.write('    return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), \"' + prop.fName + '\", \"' + prop.fAbr + '\", NULL));\n')
-            fileClass.write('  }\n') 
+          fileClass.write('  bool has_' + prop.fCppName + '() const {\n')
+          fileClass.write('    return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), \"' + prop.fName + '\", \"' + prop.fAbr + '\", NULL));\n')
+          fileClass.write('  }\n') 
+          fileClass.write('\n') 
 
           if len(prop.fTypes.split()) == 1:
             t = prop.fTypes.strip()
             fileClass.write('  ' + knowTypes[t][0] + ' ' + prop.fCppName + '() const {\n')
             fileClass.write('    ' + knowTypes[t][0] + ' ret;\n')
             fileClass.write('    if (' + knowTypes[t][1] + '(fPodofoDoc, fPodofoObj->GetDictionary(), \"' + prop.fName + '\", \"' + prop.fAbr + '\", &ret)) return ret;\n')
             if field.fRequired == False and prop.fDefault != '':
               fileClass.write('    return ' + prop.fDefault.toCpp() + ';\n');
             else:
               fileClass.write('    // TODO(edisonn): warn about missing required field, assert for known good pdfs\n')
@@ skipping 166 matching lines @@
   manager.write()
   
   fileHeaders.write('#endif  // __DEFINED__SkPdfHeaders\n')
   fileHeaders.close()
   
   return 1
 
 if '__main__' == __name__:
   sys.exit(generateCode())