Skip to content

Commit 28629c0

Browse files
Lars MaierMBkktAndrei Lobov
authored
[APM-823] Multi Delimiter (iresearch-toolkit#580)
* First draft of multi delimiter analyzer. * Added vpack deserializer code. * Build real automaton. * Intermediate state. * Single start and end state. * Intermediate state. * Fix * Still not working. * Build deterministic automaton by hand. * Working version for multi character words. * Clean up. * Use hashmap instead of array. * Clang format. * Fixing code style. * Small changes. * Unify next functions. * Add offset calculation. * Added error handling. * Added test for offset computation. * Fix formatting. * Fix formatting. * Fixing usage of std::distance. * Add special case for mac. * adress review comments * styling * fix build * fix after master merge * fix mac build * fix UB --------- Co-authored-by: Valery Mironov <[email protected]> Co-authored-by: Andrei Lobov <[email protected]>
1 parent fab8ee2 commit 28629c0

File tree

6 files changed

+911
-6
lines changed

6 files changed

+911
-6
lines changed

core/CMakeLists.txt

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,7 @@ add_dependencies(iresearch-static
343343
iresearch-build_identifier
344344
iresearch-build_version
345345
iresearch-analyzer-delimiter-static
346+
iresearch-analyzer-multi-delimiter-static
346347
iresearch-analyzer-ngram-static
347348
iresearch-analyzer-text-static
348349
iresearch-analyzer-norm-static
@@ -392,6 +393,7 @@ endif ()
392393

393394
target_link_libraries(iresearch-static
394395
PUBLIC iresearch-analyzer-delimiter-static
396+
PUBLIC iresearch-analyzer-multi-delimiter-static
395397
PUBLIC iresearch-analyzer-ngram-static
396398
PUBLIC iresearch-analyzer-text-static
397399
PUBLIC iresearch-analyzer-norm-static
@@ -433,7 +435,7 @@ endif ()
433435
add_library(iresearch-analyzer-delimiter-static
434436
STATIC
435437
./analysis/delimited_token_stream.cpp
436-
)
438+
)
437439

438440
set_ipo(iresearch-analyzer-delimiter-static)
439441

@@ -442,11 +444,34 @@ set_target_properties(iresearch-analyzer-delimiter-static
442444
PREFIX lib
443445
IMPORT_PREFIX lib
444446
OUTPUT_NAME analyzer-delimiter-s
445-
)
447+
)
446448

447449
target_link_libraries(iresearch-analyzer-delimiter-static
448450
iresearch-static
449-
)
451+
)
452+
453+
################################################################################
454+
### analysis plugin : multi-delimiter
455+
################################################################################
456+
457+
add_library(iresearch-analyzer-multi-delimiter-static
458+
STATIC
459+
./analysis/multi_delimited_token_stream.cpp
460+
)
461+
462+
set_ipo(iresearch-analyzer-multi-delimiter-static)
463+
464+
set_target_properties(iresearch-analyzer-multi-delimiter-static
465+
PROPERTIES
466+
PREFIX lib
467+
IMPORT_PREFIX lib
468+
OUTPUT_NAME analyzer-multi-delimiter-s
469+
)
470+
471+
target_link_libraries(iresearch-analyzer-multi-delimiter-static
472+
iresearch-static
473+
iresearch-ofst
474+
)
450475

451476
################################################################################
452477
### analysis plugin : text

0 commit comments

Comments
 (0)