Fix hyphenated word

Artur Zakirov · Artur Zakirov · commit 833e5b2f571c · 2017-02-03T21:25:47.000+03:00
diff --git a/README.md b/README.md
@@ -23,6 +23,13 @@ SELECT to_tsvector('english', '123-abc') as def_parser,
 -----------------+-----------------------------
  '123':1 'abc':2 | '123':2 '123-abc':1 'abc':3
 (1 row)
+
+SELECT to_tsvector('english', 'rel-3.2-A') as def_parser,
+       to_tsvector('english_ts', 'rel-3.2-A')  as new_parser;
+    def_parser    |          new_parser
+------------------+-------------------------------
+ '-3.2':2 'rel':1 | '3.2':3 'rel':2 'rel-3.2-a':1
+(1 row)
 ```
 
 ## License
diff --git a/expected/pg_tsparser.out b/expected/pg_tsparser.out
@@ -152,12 +152,16 @@ SELECT * FROM ts_parse('tsparser', '345 qwe@efd.r '' http://www.com/ http://aew.
     12 | . 
     20 | 4.2
     12 | , 
-     1 | readline
-    20 | -4.2
+    15 | readline-4.2
+    11 | readline
+    12 | -
+     9 | 4.2
+    12 |  
+    15 | readline-4.2
+    11 | readline
+    12 | -
+     9 | 4.2.
     12 |  
-     1 | readline
-    20 | -4.2
-    12 | . 
     22 | 234
     12 |                                     +
        | 
@@ -173,7 +177,7 @@ SELECT * FROM ts_parse('tsparser', '345 qwe@efd.r '' http://www.com/ http://aew.
     12 |  
     12 | <> 
      1 | qwerty
-(139 rows)
+(143 rows)
 
 -- Test text search configuration with parser
 CREATE TEXT SEARCH CONFIGURATION english_ts (
diff --git a/tsparser.c b/tsparser.c
@@ -1600,7 +1600,7 @@ static const TParserStateActionItem actionTPS_InHyphenAsciiWordFirst[] = {
 	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
 	{p_isasclet, 0, A_NEXT, TPS_InHyphenAsciiWord, 0, NULL},
 	{p_isalpha, 0, A_NEXT, TPS_InHyphenWord, 0, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InHyphenDigitLookahead, 0, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InHyphenNumWord, 0, NULL},
 	{NULL, 0, A_POP, TPS_Null, 0, NULL}
 };
 
@@ -1618,7 +1618,7 @@ static const TParserStateActionItem actionTPS_InHyphenAsciiWord[] = {
 static const TParserStateActionItem actionTPS_InHyphenWordFirst[] = {
 	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
 	{p_isalpha, 0, A_NEXT, TPS_InHyphenWord, 0, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InHyphenDigitLookahead, 0, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InHyphenNumWord, 0, NULL},
 	{NULL, 0, A_POP, TPS_Null, 0, NULL}
 };
 
@@ -1635,14 +1635,15 @@ static const TParserStateActionItem actionTPS_InHyphenWord[] = {
 static const TParserStateActionItem actionTPS_InHyphenNumWordFirst[] = {
 	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
 	{p_isalpha, 0, A_NEXT, TPS_InHyphenNumWord, 0, NULL},
-	{p_isdigit, 0, A_NEXT, TPS_InHyphenDigitLookahead, 0, NULL},
+	{p_isdigit, 0, A_NEXT, TPS_InHyphenNumWord, 0, NULL},
 	{NULL, 0, A_POP, TPS_Null, 0, NULL}
 };
 
 static const TParserStateActionItem actionTPS_InHyphenNumWord[] = {
 	{p_isEOF, 0, A_BINGO | A_CLRALL, TPS_InParseHyphen, NUMHWORD, SpecialHyphen},
 	{p_isalnum, 0, A_NEXT, TPS_InHyphenNumWord, 0, NULL},
 	{p_isspecial, 0, A_NEXT, TPS_InHyphenNumWord, 0, NULL},
+	{p_iseqC, '.', A_PUSH, TPS_InHyphenNumWordFirst, 0, NULL},
 	{p_iseqC, '-', A_PUSH, TPS_InHyphenNumWordFirst, 0, NULL},
 	{p_iseqC, '_', A_PUSH, TPS_InHyphenNumWordFirst, 0, NULL},
 	{NULL, 0, A_BINGO | A_CLRALL, TPS_InParseHyphen, NUMHWORD, SpecialHyphen}
@@ -1694,6 +1695,7 @@ static const TParserStateActionItem actionTPS_InHyphenNumWordPart[] = {
 	{p_isEOF, 0, A_BINGO, TPS_Base, NUMPARTHWORD, NULL},
 	{p_isalnum, 0, A_NEXT, TPS_InHyphenNumWordPart, 0, NULL},
 	{p_isspecial, 0, A_NEXT, TPS_InHyphenNumWordPart, 0, NULL},
+	{p_iseqC, '.', A_NEXT, TPS_InHyphenNumWordPart, 0, NULL},
 	{NULL, 0, A_BINGO, TPS_InParseHyphen, NUMPARTHWORD, NULL}
 };
 
