Changeset 5642


Ignore:
Timestamp:
Sep 20, 2017, 10:34:18 AM (17 months ago)
Author:
cameron
Message:

Minor updates to UCD generation for consistency with manual edits

Location:
proto/charsetcompiler/UCD
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • proto/charsetcompiler/UCD/README-generate-UCD.txt

    r5143 r5642  
    12125. python generate_UCD_tests.py
    1313    copy output to icgrep-devel/QA/proptest.xml
    14 -------------------------------------------
    1514
    16 Generating Precompiled UCD files.  (Now Deprecated)
    17 
    18 1.   python generate_UCD_property_functions.py
    19 
    20 Generates .pablo files, .cpp templates and .h files
    21 
    22 2.   Use the pablo compiler to generate the full .cpp files.
    23 make gc
    24 make sc
    25 make blk
    26 make scx
    27 make core
    28 make proplist
    29 
    30 3.   cp src/pre*pp   ${ICGREP_HOME}/UCD
    31      cp pre*h        ${ICGREP_HOME}/UCD
    32 
  • proto/charsetcompiler/UCD/UnicodeNameData.py

    r5143 r5642  
    1616#include "UnicodeNameData.h"
    1717const int Unamesize = %s;
    18 char __attribute__ ((aligned (32))) Unamedata[Unamesize] = "%s";
     18char __attribute__ ((aligned (32))) Unamedata[Unamesize + %s] = "%s";
    1919
    2020char * getUnicodeNameDataPtr() {
     
    3636        name_data_len += len(cp) + len(name) + 2
    3737    f = open(UCD_config.UCD_output_dir + '/UnicodeNameData.cpp', 'w')
    38     f.write(UnicodeNameData_cpp_template % (name_data_len + 1, name_data_string))
     38    f.write(UnicodeNameData_cpp_template % (name_data_len + 1, 255 - (name_data_len % 256), name_data_string))
    3939    f.close()
    4040
  • proto/charsetcompiler/UCD/casefold.py

    r5143 r5642  
    191191   cm = simple_CaseClosure_map(fv)
    192192   f = cformat.open_header_file_for_write('CaseFolding_txt', 'casefold.py')
    193    cformat.write_imports(f, ["<vector>", "<utility>", '"re/re_re.h"', '"re/re_cc.h"'])
     193   cformat.write_imports(f, ["<vector>", '"re/re_cc.h"'])
    194194   f.write(foldDeclarations)
    195195   f.write(genFoldEntryData(cm))
Note: See TracChangeset for help on using the changeset viewer.