| Index: source/common/rbbirpt.h
|
| diff --git a/source/common/rbbirpt.h b/source/common/rbbirpt.h
|
| index deea57b7addf0aaccc4fe71244680905efd8c560..b5bc8f7bf31baaff9858da6c1125f450b213e12d 100644
|
| --- a/source/common/rbbirpt.h
|
| +++ b/source/common/rbbirpt.h
|
| @@ -1,3 +1,5 @@
|
| +// Copyright (C) 2016 and later: Unicode, Inc. and others.
|
| +// License & terms of use: http://www.unicode.org/copyright.html
|
| //---------------------------------------------------------------------------------
|
| //
|
| // Generated Header File. Do not edit by hand.
|
| @@ -6,13 +8,15 @@
|
| // It is generated by the Perl script "rbbicst.pl" from
|
| // the rule parser state definitions file "rbbirpt.txt".
|
| //
|
| -// Copyright (C) 2002-2005 International Business Machines Corporation
|
| +// Copyright (C) 2002-2016 International Business Machines Corporation
|
| // and others. All rights reserved.
|
| //
|
| //---------------------------------------------------------------------------------
|
| #ifndef RBBIRPT_H
|
| #define RBBIRPT_H
|
|
|
| +#include "unicode/utypes.h"
|
| +
|
| U_NAMESPACE_BEGIN
|
| //
|
| // Character classes for RBBI rule scanning.
|
| @@ -38,6 +42,7 @@ enum RBBI_RuleParseAction {
|
| doExprStart,
|
| doLParen,
|
| doNOP,
|
| + doNoChain,
|
| doOptionEnd,
|
| doOptionStart,
|
| doReverseDir,
|
| @@ -75,101 +80,109 @@ struct RBBIRuleTableEl {
|
|
|
| static const struct RBBIRuleTableEl gRuleParseStateTable[] = {
|
| {doNOP, 0, 0, 0, TRUE}
|
| - , {doExprStart, 254, 21, 8, FALSE} // 1 start
|
| + , {doExprStart, 254, 29, 9, FALSE} // 1 start
|
| , {doNOP, 132, 1,0, TRUE} // 2
|
| - , {doExprStart, 36 /* $ */, 80, 90, FALSE} // 3
|
| - , {doNOP, 33 /* ! */, 11,0, TRUE} // 4
|
| - , {doNOP, 59 /* ; */, 1,0, TRUE} // 5
|
| - , {doNOP, 252, 0,0, FALSE} // 6
|
| - , {doExprStart, 255, 21, 8, FALSE} // 7
|
| - , {doEndOfRule, 59 /* ; */, 1,0, TRUE} // 8 break-rule-end
|
| - , {doNOP, 132, 8,0, TRUE} // 9
|
| - , {doRuleError, 255, 95,0, FALSE} // 10
|
| - , {doNOP, 33 /* ! */, 13,0, TRUE} // 11 rev-option
|
| - , {doReverseDir, 255, 20, 8, FALSE} // 12
|
| - , {doOptionStart, 130, 15,0, TRUE} // 13 option-scan1
|
| - , {doRuleError, 255, 95,0, FALSE} // 14
|
| - , {doNOP, 129, 15,0, TRUE} // 15 option-scan2
|
| - , {doOptionEnd, 255, 17,0, FALSE} // 16
|
| - , {doNOP, 59 /* ; */, 1,0, TRUE} // 17 option-scan3
|
| - , {doNOP, 132, 17,0, TRUE} // 18
|
| - , {doRuleError, 255, 95,0, FALSE} // 19
|
| - , {doExprStart, 255, 21, 8, FALSE} // 20 reverse-rule
|
| - , {doRuleChar, 254, 30,0, TRUE} // 21 term
|
| - , {doNOP, 132, 21,0, TRUE} // 22
|
| - , {doRuleChar, 131, 30,0, TRUE} // 23
|
| - , {doNOP, 91 /* [ */, 86, 30, FALSE} // 24
|
| - , {doLParen, 40 /* ( */, 21, 30, TRUE} // 25
|
| - , {doNOP, 36 /* $ */, 80, 29, FALSE} // 26
|
| - , {doDotAny, 46 /* . */, 30,0, TRUE} // 27
|
| - , {doRuleError, 255, 95,0, FALSE} // 28
|
| - , {doCheckVarDef, 255, 30,0, FALSE} // 29 term-var-ref
|
| - , {doNOP, 132, 30,0, TRUE} // 30 expr-mod
|
| - , {doUnaryOpStar, 42 /* * */, 35,0, TRUE} // 31
|
| - , {doUnaryOpPlus, 43 /* + */, 35,0, TRUE} // 32
|
| - , {doUnaryOpQuestion, 63 /* ? */, 35,0, TRUE} // 33
|
| - , {doNOP, 255, 35,0, FALSE} // 34
|
| - , {doExprCatOperator, 254, 21,0, FALSE} // 35 expr-cont
|
| - , {doNOP, 132, 35,0, TRUE} // 36
|
| - , {doExprCatOperator, 131, 21,0, FALSE} // 37
|
| - , {doExprCatOperator, 91 /* [ */, 21,0, FALSE} // 38
|
| - , {doExprCatOperator, 40 /* ( */, 21,0, FALSE} // 39
|
| - , {doExprCatOperator, 36 /* $ */, 21,0, FALSE} // 40
|
| - , {doExprCatOperator, 46 /* . */, 21,0, FALSE} // 41
|
| - , {doExprCatOperator, 47 /* / */, 47,0, FALSE} // 42
|
| - , {doExprCatOperator, 123 /* { */, 59,0, TRUE} // 43
|
| - , {doExprOrOperator, 124 /* | */, 21,0, TRUE} // 44
|
| - , {doExprRParen, 41 /* ) */, 255,0, TRUE} // 45
|
| - , {doExprFinished, 255, 255,0, FALSE} // 46
|
| - , {doSlash, 47 /* / */, 49,0, TRUE} // 47 look-ahead
|
| - , {doNOP, 255, 95,0, FALSE} // 48
|
| - , {doExprCatOperator, 254, 21,0, FALSE} // 49 expr-cont-no-slash
|
| - , {doNOP, 132, 35,0, TRUE} // 50
|
| - , {doExprCatOperator, 131, 21,0, FALSE} // 51
|
| - , {doExprCatOperator, 91 /* [ */, 21,0, FALSE} // 52
|
| - , {doExprCatOperator, 40 /* ( */, 21,0, FALSE} // 53
|
| - , {doExprCatOperator, 36 /* $ */, 21,0, FALSE} // 54
|
| - , {doExprCatOperator, 46 /* . */, 21,0, FALSE} // 55
|
| - , {doExprOrOperator, 124 /* | */, 21,0, TRUE} // 56
|
| - , {doExprRParen, 41 /* ) */, 255,0, TRUE} // 57
|
| - , {doExprFinished, 255, 255,0, FALSE} // 58
|
| - , {doNOP, 132, 59,0, TRUE} // 59 tag-open
|
| - , {doStartTagValue, 128, 62,0, FALSE} // 60
|
| - , {doTagExpectedError, 255, 95,0, FALSE} // 61
|
| - , {doNOP, 132, 66,0, TRUE} // 62 tag-value
|
| - , {doNOP, 125 /* } */, 66,0, FALSE} // 63
|
| - , {doTagDigit, 128, 62,0, TRUE} // 64
|
| - , {doTagExpectedError, 255, 95,0, FALSE} // 65
|
| - , {doNOP, 132, 66,0, TRUE} // 66 tag-close
|
| - , {doTagValue, 125 /* } */, 69,0, TRUE} // 67
|
| - , {doTagExpectedError, 255, 95,0, FALSE} // 68
|
| - , {doExprCatOperator, 254, 21,0, FALSE} // 69 expr-cont-no-tag
|
| - , {doNOP, 132, 69,0, TRUE} // 70
|
| - , {doExprCatOperator, 131, 21,0, FALSE} // 71
|
| - , {doExprCatOperator, 91 /* [ */, 21,0, FALSE} // 72
|
| - , {doExprCatOperator, 40 /* ( */, 21,0, FALSE} // 73
|
| - , {doExprCatOperator, 36 /* $ */, 21,0, FALSE} // 74
|
| - , {doExprCatOperator, 46 /* . */, 21,0, FALSE} // 75
|
| - , {doExprCatOperator, 47 /* / */, 47,0, FALSE} // 76
|
| - , {doExprOrOperator, 124 /* | */, 21,0, TRUE} // 77
|
| - , {doExprRParen, 41 /* ) */, 255,0, TRUE} // 78
|
| - , {doExprFinished, 255, 255,0, FALSE} // 79
|
| - , {doStartVariableName, 36 /* $ */, 82,0, TRUE} // 80 scan-var-name
|
| - , {doNOP, 255, 95,0, FALSE} // 81
|
| - , {doNOP, 130, 84,0, TRUE} // 82 scan-var-start
|
| - , {doVariableNameExpectedErr, 255, 95,0, FALSE} // 83
|
| - , {doNOP, 129, 84,0, TRUE} // 84 scan-var-body
|
| - , {doEndVariableName, 255, 255,0, FALSE} // 85
|
| - , {doScanUnicodeSet, 91 /* [ */, 255,0, TRUE} // 86 scan-unicode-set
|
| - , {doScanUnicodeSet, 112 /* p */, 255,0, TRUE} // 87
|
| - , {doScanUnicodeSet, 80 /* P */, 255,0, TRUE} // 88
|
| - , {doNOP, 255, 95,0, FALSE} // 89
|
| - , {doNOP, 132, 90,0, TRUE} // 90 assign-or-rule
|
| - , {doStartAssign, 61 /* = */, 21, 93, TRUE} // 91
|
| - , {doNOP, 255, 29, 8, FALSE} // 92
|
| - , {doEndAssign, 59 /* ; */, 1,0, TRUE} // 93 assign-end
|
| - , {doRuleErrorAssignExpr, 255, 95,0, FALSE} // 94
|
| - , {doExit, 255, 95,0, TRUE} // 95 errorDeath
|
| + , {doNoChain, 94 /* ^ */, 12, 9, TRUE} // 3
|
| + , {doExprStart, 36 /* $ */, 88, 98, FALSE} // 4
|
| + , {doNOP, 33 /* ! */, 19,0, TRUE} // 5
|
| + , {doNOP, 59 /* ; */, 1,0, TRUE} // 6
|
| + , {doNOP, 252, 0,0, FALSE} // 7
|
| + , {doExprStart, 255, 29, 9, FALSE} // 8
|
| + , {doEndOfRule, 59 /* ; */, 1,0, TRUE} // 9 break-rule-end
|
| + , {doNOP, 132, 9,0, TRUE} // 10
|
| + , {doRuleError, 255, 103,0, FALSE} // 11
|
| + , {doExprStart, 254, 29,0, FALSE} // 12 start-after-caret
|
| + , {doNOP, 132, 12,0, TRUE} // 13
|
| + , {doRuleError, 94 /* ^ */, 103,0, FALSE} // 14
|
| + , {doExprStart, 36 /* $ */, 88, 37, FALSE} // 15
|
| + , {doRuleError, 59 /* ; */, 103,0, FALSE} // 16
|
| + , {doRuleError, 252, 103,0, FALSE} // 17
|
| + , {doExprStart, 255, 29,0, FALSE} // 18
|
| + , {doNOP, 33 /* ! */, 21,0, TRUE} // 19 rev-option
|
| + , {doReverseDir, 255, 28, 9, FALSE} // 20
|
| + , {doOptionStart, 130, 23,0, TRUE} // 21 option-scan1
|
| + , {doRuleError, 255, 103,0, FALSE} // 22
|
| + , {doNOP, 129, 23,0, TRUE} // 23 option-scan2
|
| + , {doOptionEnd, 255, 25,0, FALSE} // 24
|
| + , {doNOP, 59 /* ; */, 1,0, TRUE} // 25 option-scan3
|
| + , {doNOP, 132, 25,0, TRUE} // 26
|
| + , {doRuleError, 255, 103,0, FALSE} // 27
|
| + , {doExprStart, 255, 29, 9, FALSE} // 28 reverse-rule
|
| + , {doRuleChar, 254, 38,0, TRUE} // 29 term
|
| + , {doNOP, 132, 29,0, TRUE} // 30
|
| + , {doRuleChar, 131, 38,0, TRUE} // 31
|
| + , {doNOP, 91 /* [ */, 94, 38, FALSE} // 32
|
| + , {doLParen, 40 /* ( */, 29, 38, TRUE} // 33
|
| + , {doNOP, 36 /* $ */, 88, 37, FALSE} // 34
|
| + , {doDotAny, 46 /* . */, 38,0, TRUE} // 35
|
| + , {doRuleError, 255, 103,0, FALSE} // 36
|
| + , {doCheckVarDef, 255, 38,0, FALSE} // 37 term-var-ref
|
| + , {doNOP, 132, 38,0, TRUE} // 38 expr-mod
|
| + , {doUnaryOpStar, 42 /* * */, 43,0, TRUE} // 39
|
| + , {doUnaryOpPlus, 43 /* + */, 43,0, TRUE} // 40
|
| + , {doUnaryOpQuestion, 63 /* ? */, 43,0, TRUE} // 41
|
| + , {doNOP, 255, 43,0, FALSE} // 42
|
| + , {doExprCatOperator, 254, 29,0, FALSE} // 43 expr-cont
|
| + , {doNOP, 132, 43,0, TRUE} // 44
|
| + , {doExprCatOperator, 131, 29,0, FALSE} // 45
|
| + , {doExprCatOperator, 91 /* [ */, 29,0, FALSE} // 46
|
| + , {doExprCatOperator, 40 /* ( */, 29,0, FALSE} // 47
|
| + , {doExprCatOperator, 36 /* $ */, 29,0, FALSE} // 48
|
| + , {doExprCatOperator, 46 /* . */, 29,0, FALSE} // 49
|
| + , {doExprCatOperator, 47 /* / */, 55,0, FALSE} // 50
|
| + , {doExprCatOperator, 123 /* { */, 67,0, TRUE} // 51
|
| + , {doExprOrOperator, 124 /* | */, 29,0, TRUE} // 52
|
| + , {doExprRParen, 41 /* ) */, 255,0, TRUE} // 53
|
| + , {doExprFinished, 255, 255,0, FALSE} // 54
|
| + , {doSlash, 47 /* / */, 57,0, TRUE} // 55 look-ahead
|
| + , {doNOP, 255, 103,0, FALSE} // 56
|
| + , {doExprCatOperator, 254, 29,0, FALSE} // 57 expr-cont-no-slash
|
| + , {doNOP, 132, 43,0, TRUE} // 58
|
| + , {doExprCatOperator, 131, 29,0, FALSE} // 59
|
| + , {doExprCatOperator, 91 /* [ */, 29,0, FALSE} // 60
|
| + , {doExprCatOperator, 40 /* ( */, 29,0, FALSE} // 61
|
| + , {doExprCatOperator, 36 /* $ */, 29,0, FALSE} // 62
|
| + , {doExprCatOperator, 46 /* . */, 29,0, FALSE} // 63
|
| + , {doExprOrOperator, 124 /* | */, 29,0, TRUE} // 64
|
| + , {doExprRParen, 41 /* ) */, 255,0, TRUE} // 65
|
| + , {doExprFinished, 255, 255,0, FALSE} // 66
|
| + , {doNOP, 132, 67,0, TRUE} // 67 tag-open
|
| + , {doStartTagValue, 128, 70,0, FALSE} // 68
|
| + , {doTagExpectedError, 255, 103,0, FALSE} // 69
|
| + , {doNOP, 132, 74,0, TRUE} // 70 tag-value
|
| + , {doNOP, 125 /* } */, 74,0, FALSE} // 71
|
| + , {doTagDigit, 128, 70,0, TRUE} // 72
|
| + , {doTagExpectedError, 255, 103,0, FALSE} // 73
|
| + , {doNOP, 132, 74,0, TRUE} // 74 tag-close
|
| + , {doTagValue, 125 /* } */, 77,0, TRUE} // 75
|
| + , {doTagExpectedError, 255, 103,0, FALSE} // 76
|
| + , {doExprCatOperator, 254, 29,0, FALSE} // 77 expr-cont-no-tag
|
| + , {doNOP, 132, 77,0, TRUE} // 78
|
| + , {doExprCatOperator, 131, 29,0, FALSE} // 79
|
| + , {doExprCatOperator, 91 /* [ */, 29,0, FALSE} // 80
|
| + , {doExprCatOperator, 40 /* ( */, 29,0, FALSE} // 81
|
| + , {doExprCatOperator, 36 /* $ */, 29,0, FALSE} // 82
|
| + , {doExprCatOperator, 46 /* . */, 29,0, FALSE} // 83
|
| + , {doExprCatOperator, 47 /* / */, 55,0, FALSE} // 84
|
| + , {doExprOrOperator, 124 /* | */, 29,0, TRUE} // 85
|
| + , {doExprRParen, 41 /* ) */, 255,0, TRUE} // 86
|
| + , {doExprFinished, 255, 255,0, FALSE} // 87
|
| + , {doStartVariableName, 36 /* $ */, 90,0, TRUE} // 88 scan-var-name
|
| + , {doNOP, 255, 103,0, FALSE} // 89
|
| + , {doNOP, 130, 92,0, TRUE} // 90 scan-var-start
|
| + , {doVariableNameExpectedErr, 255, 103,0, FALSE} // 91
|
| + , {doNOP, 129, 92,0, TRUE} // 92 scan-var-body
|
| + , {doEndVariableName, 255, 255,0, FALSE} // 93
|
| + , {doScanUnicodeSet, 91 /* [ */, 255,0, TRUE} // 94 scan-unicode-set
|
| + , {doScanUnicodeSet, 112 /* p */, 255,0, TRUE} // 95
|
| + , {doScanUnicodeSet, 80 /* P */, 255,0, TRUE} // 96
|
| + , {doNOP, 255, 103,0, FALSE} // 97
|
| + , {doNOP, 132, 98,0, TRUE} // 98 assign-or-rule
|
| + , {doStartAssign, 61 /* = */, 29, 101, TRUE} // 99
|
| + , {doNOP, 255, 37, 9, FALSE} // 100
|
| + , {doEndAssign, 59 /* ; */, 1,0, TRUE} // 101 assign-end
|
| + , {doRuleErrorAssignExpr, 255, 103,0, FALSE} // 102
|
| + , {doExit, 255, 103,0, TRUE} // 103 errorDeath
|
| };
|
| #ifdef RBBI_DEBUG
|
| static const char * const RBBIRuleStateNames[] = { 0,
|
| @@ -180,9 +193,17 @@ static const char * const RBBIRuleStateNames[] = { 0,
|
| 0,
|
| 0,
|
| 0,
|
| + 0,
|
| "break-rule-end",
|
| 0,
|
| 0,
|
| + "start-after-caret",
|
| + 0,
|
| + 0,
|
| + 0,
|
| + 0,
|
| + 0,
|
| + 0,
|
| "rev-option",
|
| 0,
|
| "option-scan1",
|
|
|