Changeset 4428

Timestamp:

Jan 19, 2015, 8:43:56 PM (4 years ago)

Author:

cameron

Message:

Generator support for precompiled property cpp files

Location:

proto/charsetcompiler

Files:

• Makefile (modified) (2 diffs)
• UCD/cformat.py (modified) (2 diffs)
• generate_UCD_property_functions.py (modified) (4 diffs)

proto/charsetcompiler/Makefile

@@ -1 +1 @@
 OUTFILE=src/unicode_categories.h
+
 PABLO_SRC=cat.pablo
 PABLO_TEMPLATE=category_template.h
@@ -16 +17 @@
 
 gc:
-        python $(PABLO_COMPILER) DerivedGeneralCategory.pablo -Z -t ucd_precompiled_gc.h -o src/precompiled_gc.h
+        python $(PABLO_COMPILER) DerivedGeneralCategory.pablo -Z -t precompiled_gc.cpp -o src/precompiled_gc.cpp
 
 sc:
-        python $(PABLO_COMPILER) Scripts.pablo -Z -t ucd_precompiled_sc.h -o src/precompiled_sc.h
+        python $(PABLO_COMPILER) Scripts.pablo -Z -t precompiled_sc.cpp -o src/precompiled_sc.cpp
 
 scx:
-        python $(PABLO_COMPILER) ScriptExtensions.pablo -Z -t ucd_precompiled_scx.h -o src/precompiled_scx.h
+        python $(PABLO_COMPILER) ScriptExtensions.pablo -Z -t precompiled_scx.cpp -o src/precompiled_scx.cpp
 
 blk:
-        python $(PABLO_COMPILER) Blocks.pablo -Z -t ucd_precompiled_blk.h -o src/precompiled_blk.h
+        python $(PABLO_COMPILER) Blocks.pablo -Z -t precompiled_blk.cpp -o src/precompiled_blk.cpp
 
 core:
-        python $(PABLO_COMPILER) DerivedCoreProperties.pablo -Z -t ucd_precompiled_derivedcoreproperties.h -o src/precompiled_derivedcoreproperties.h
+        python $(PABLO_COMPILER) DerivedCoreProperties.pablo -Z -t precompiled_derivedcoreproperties.cpp -o src/precompiled_derivedcoreproperties.cpp
 
 proplist:
-        python $(PABLO_COMPILER) PropList.pablo -Z -t ucd_precompiled_proplist.h -o src/precompiled_proplist.h
+        python $(PABLO_COMPILER) PropList.pablo -Z -t precompiled_proplist.cpp -o src/precompiled_proplist.cpp
+

proto/charsetcompiler/UCD/cformat.py

@@ -12 +12 @@
 """
 
+cpp_template = r"""
+/*
+ *  Copyright (c) 2015 International Characters, Inc.
+ *  This software is licensed to the public under the Open Software License 3.0.
+ *  icgrep is a trademark of International Characters, Inc.
+ *
+ *  This file is generated by %s - manual edits may be lost.
+ */
+
+#include "%s.h"
+"""
+
+
+
 def open_header_file_for_write(filename, generator_name='UCD_properties.py'):
    f = open(filename + '.h', 'w')
@@ -18 +32 @@
    return f
 
+def open_cpp_file_for_write(filename, generator_name='UCD_properties.py'):
+   f = open(filename + '.cpp', 'w')
+   f.write(cpp_template % (generator_name, filename))
+   return f
+
 def close_header_file(f):
    f.write("\n#endif\n")
+   f.close()
+
+def close_cpp_file(f):
    f.close()
 

proto/charsetcompiler/generate_UCD_property_functions.py

@@ -48 +48 @@
 Unicode_template_var = Template("struct_${property}_%s.cc")
 
+install_fn_header = r"""
+void install_property_%s_fn_ptrs(pablo::PabloCompiler & p);
+"""
 install_fn = r"""
 void install_property_%s_fn_ptrs(pablo::PabloCompiler & p) {
@@ -64 +67 @@
         (self.property_value_list, self.property_value_enum_integer, self.property_value_full_name_map, self.property_value_lookup_map, self.missing_specs) = parse_PropertyValueAlias_txt(self.property_lookup_map)
 
-    def generate_enumerated_property_template(self, filename_root, property_code):
-        f = cformat.open_header_file_for_write(os.path.basename("ucd_precompiled_%s" % property_code), 'generate_UCD_property_functions.py')
-        cformat.write_imports(f, ['"pablo/pablo_compiler.h"'])
-        f.write(Unicode_pablo_template)
+    def generate_enumerated_property_header_and_template(self, filename_root, property_code):
+        hf = cformat.open_header_file_for_write(os.path.basename("precompiled_%s" % property_code), 'generate_UCD_property_functions.py')
+        cformat.write_imports(hf, ['"pablo/pablo_compiler.h"'])
         pc = property_code.lower()
+        hf.write(install_fn_header % pc)
+        cformat.close_header_file(hf)
+        tf = cformat.open_cpp_file_for_write(os.path.basename("precompiled_%s" % property_code), 'generate_UCD_property_functions.py')
+        cformat.write_imports(tf, ['"icgrep.h"'])
+        tf.write(Unicode_pablo_template)
         vlist = self.property_value_list[property_code]
         for v in vlist:
-            f.write(Unicode_property_fn_template.substitute({'property': pc, 'value': v}))
+            tf.write(Unicode_property_fn_template.substitute({'property': pc, 'value': v}))
         install_stmt = "  p.InstallExternalFunction(\"__get_%s_%%s\", (void *) & __get_%s_%%s);\n" % (pc, pc)
         install_list = [install_stmt % (k, k) for k in vlist]
-        f.write(install_fn % (pc, "".join(install_list)))
-        cformat.close_header_file(f)
-       
+        tf.write(install_fn % (pc, "".join(install_list)))
+        cformat.close_cpp_file(tf)
+
     def generate_enumerated_property_file(self, filename_root, property_code):
         vlist = self.property_value_list[property_code]
@@ -108 +115 @@
         f.close()
 
-    def generate_binary_property_template(self, filename_root):
+    def generate_binary_property_header_and_template(self, filename_root):
         (props, prop_map) = parse_UCD_codepoint_name_map(filename_root + '.txt', self.property_lookup_map)
         lprops = [p.lower() for p in props]
-        f = cformat.open_header_file_for_write(os.path.basename("ucd_precompiled_%s" % filename_root.lower()), 'generate_UCD_property_functions.py')
-        cformat.write_imports(f, ['"pablo/pablo_compiler.h"'])
-        f.write(Unicode_pablo_template)
+        hf = cformat.open_header_file_for_write(os.path.basename("precompiled_%s" % filename_root.lower()), 'generate_UCD_property_functions.py')
+        cformat.write_imports(hf, ['"pablo/pablo_compiler.h"'])
+        hf.write(install_fn_header % filename_root)
+        cformat.close_header_file(hf)
+        tf = cformat.open_cpp_file_for_write(os.path.basename("precompiled_%s" % filename_root.lower()), 'generate_UCD_property_functions.py')
+        cformat.write_imports(tf, ['"icgrep.h"'])
+        tf.write(Unicode_pablo_template)
         for p in lprops:
-            f.write(Unicode_property_fn_template.substitute({'property': p, 'value': 'Y'}))
+            tf.write(Unicode_property_fn_template.substitute({'property': p, 'value': 'Y'}))
         install_stmt = "  p.InstallExternalFunction(\"__get_%s_Y\", (void *) & __get_%s_Y);\n"
         install_list = [install_stmt % (p, p) for p in lprops]
-        f.write(install_fn % (filename_root, "".join(install_list)))
-        cformat.close_header_file(f)
+        tf.write(install_fn % (filename_root, "".join(install_list)))
+        cformat.close_cpp_file(tf)
        
     def generate_binary_properties_file(self, filename_root):
@@ -145 +156 @@
     #
     # The Block property
-    ucd.generate_enumerated_property_template('Blocks', 'blk')
+    ucd.generate_enumerated_property_header_and_template('Blocks', 'blk')
     ucd.generate_enumerated_property_file('Blocks', 'blk')
     #
     # Scripts
-    ucd.generate_enumerated_property_template('Scripts', 'sc')
+    ucd.generate_enumerated_property_header_and_template('Scripts', 'sc')
     ucd.generate_enumerated_property_file('Scripts', 'sc')
     #
     # Script Extensions
-    ucd.generate_enumerated_property_template('ScriptExtensions', 'scx')
+    ucd.generate_enumerated_property_header_and_template('ScriptExtensions', 'scx')
     ucd.generate_ScriptExtensions_pablo()
     #
     # General Category
-    ucd.generate_enumerated_property_template('GeneralCategory', 'gc')
+    ucd.generate_enumerated_property_header_and_template('GeneralCategory', 'gc')
     ucd.generate_enumerated_property_file('extracted/DerivedGeneralCategory', 'gc')
     #
     # Core Properties
-    ucd.generate_binary_property_template('DerivedCoreProperties')
+    ucd.generate_binary_property_header_and_template('DerivedCoreProperties')
     ucd.generate_binary_properties_file('DerivedCoreProperties')
     #
-    ucd.generate_binary_property_template('PropList')
+    ucd.generate_binary_property_header_and_template('PropList')
     ucd.generate_binary_properties_file('PropList')