* ext/syck/token.c: directives choked on a period.
* ext/syck/gram.y: anchors work above a collection. [ruby-core:1071] * ext/syck/handler.c, ext/syck/syck.c: ensure a fresh strtable between parser iterations. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3905 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
why
parent
45c7ea552d
commit
017d4ff10a
@ -1,3 +1,12 @@
|
||||
Thu Jun 5 04:48:57 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
|
||||
|
||||
* ext/syck/token.c: directives choked on a period.
|
||||
|
||||
* ext/syck/gram.y: anchors work above a collection. [ruby-core:1071]
|
||||
|
||||
* ext/syck/handler.c, ext/syck/syck.c: ensure a fresh strtable between
|
||||
parser iterations.
|
||||
|
||||
Tue Jun 3 22:20:49 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* eval.c (rb_call_super): should search superclass method based on
|
||||
|
||||
261
ext/syck/gram.c
261
ext/syck/gram.c
@ -229,16 +229,16 @@ union yyalloc
|
||||
|
||||
/* YYFINAL -- State number of the termination state. */
|
||||
#define YYFINAL 34
|
||||
#define YYLAST 284
|
||||
#define YYLAST 307
|
||||
|
||||
/* YYNTOKENS -- Number of terminals. */
|
||||
#define YYNTOKENS 23
|
||||
/* YYNNTS -- Number of nonterminals. */
|
||||
#define YYNNTS 24
|
||||
#define YYNNTS 25
|
||||
/* YYNRULES -- Number of rules. */
|
||||
#define YYNRULES 58
|
||||
#define YYNRULES 62
|
||||
/* YYNRULES -- Number of states. */
|
||||
#define YYNSTATES 99
|
||||
#define YYNSTATES 104
|
||||
|
||||
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
|
||||
#define YYUNDEFTOK 2
|
||||
@ -288,8 +288,9 @@ static const unsigned char yyprhs[] =
|
||||
22, 26, 28, 29, 31, 34, 36, 38, 40, 43,
|
||||
46, 49, 52, 54, 56, 58, 61, 63, 65, 67,
|
||||
69, 71, 75, 78, 80, 84, 87, 91, 94, 96,
|
||||
100, 103, 107, 110, 112, 116, 120, 126, 130, 132,
|
||||
138, 140, 144, 148, 151, 155, 159, 162, 164
|
||||
100, 103, 107, 110, 112, 116, 120, 124, 128, 131,
|
||||
135, 138, 142, 144, 150, 152, 156, 160, 163, 167,
|
||||
171, 174, 176
|
||||
};
|
||||
|
||||
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
|
||||
@ -301,17 +302,18 @@ static const yysigned_char yyrhs[] =
|
||||
-1, 28, 12, -1, 13, -1, 12, -1, 13, -1,
|
||||
30, 31, -1, 5, 32, -1, 6, 32, -1, 3,
|
||||
32, -1, 4, -1, 7, -1, 8, -1, 5, 33,
|
||||
-1, 9, -1, 34, -1, 38, -1, 40, -1, 45,
|
||||
-1, 9, -1, 34, -1, 38, -1, 40, -1, 46,
|
||||
-1, 28, 36, 29, -1, 14, 27, -1, 37, -1,
|
||||
5, 30, 36, -1, 5, 36, -1, 3, 30, 36,
|
||||
-1, 3, 36, -1, 35, -1, 37, 30, 35, -1,
|
||||
37, 30, -1, 17, 39, 18, -1, 17, 18, -1,
|
||||
25, -1, 39, 21, 25, -1, 28, 43, 29, -1,
|
||||
28, 5, 30, 43, 29, -1, 32, 15, 27, -1,
|
||||
41, -1, 22, 25, 30, 15, 27, -1, 42, -1,
|
||||
43, 30, 35, -1, 43, 30, 42, -1, 43, 30,
|
||||
-1, 25, 15, 27, -1, 19, 46, 20, -1, 19,
|
||||
20, -1, 44, -1, 46, 21, 44, -1
|
||||
25, -1, 39, 21, 25, -1, 28, 41, 29, -1,
|
||||
28, 44, 29, -1, 5, 30, 44, -1, 5, 41,
|
||||
-1, 3, 30, 44, -1, 3, 41, -1, 32, 15,
|
||||
27, -1, 42, -1, 22, 25, 30, 15, 27, -1,
|
||||
43, -1, 44, 30, 35, -1, 44, 30, 43, -1,
|
||||
44, 30, -1, 25, 15, 27, -1, 19, 47, 20,
|
||||
-1, 19, 20, -1, 45, -1, 47, 21, 45, -1
|
||||
};
|
||||
|
||||
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
|
||||
@ -321,8 +323,9 @@ static const unsigned short yyrline[] =
|
||||
76, 82, 83, 101, 102, 105, 108, 111, 112, 120,
|
||||
125, 133, 137, 145, 158, 165, 170, 171, 172, 173,
|
||||
174, 180, 186, 192, 193, 198, 203, 207, 213, 217,
|
||||
222, 231, 235, 241, 245, 255, 260, 268, 283, 284,
|
||||
292, 293, 305, 312, 321, 329, 333, 339, 340
|
||||
222, 231, 235, 241, 245, 255, 260, 267, 272, 277,
|
||||
281, 287, 302, 303, 311, 312, 324, 331, 340, 348,
|
||||
352, 358, 359
|
||||
};
|
||||
#endif
|
||||
|
||||
@ -337,9 +340,9 @@ static const char *const yytname[] =
|
||||
"doc", "atom", "ind_rep", "atom_or_empty", "indent_open", "indent_end",
|
||||
"indent_sep", "indent_flex_end", "word_rep", "struct_rep",
|
||||
"implicit_seq", "basic_seq", "top_imp_seq", "in_implicit_seq",
|
||||
"inline_seq", "in_inline_seq", "implicit_map", "basic_mapping",
|
||||
"complex_mapping", "in_implicit_map", "basic_mapping2", "inline_map",
|
||||
"in_inline_map", 0
|
||||
"inline_seq", "in_inline_seq", "implicit_map", "top_imp_map",
|
||||
"basic_mapping", "complex_mapping", "in_implicit_map", "basic_mapping2",
|
||||
"inline_map", "in_inline_map", 0
|
||||
};
|
||||
#endif
|
||||
|
||||
@ -361,8 +364,9 @@ static const unsigned char yyr1[] =
|
||||
26, 27, 27, 28, 28, 29, 30, 31, 31, 32,
|
||||
32, 32, 32, 32, 32, 33, 33, 33, 33, 33,
|
||||
33, 34, 35, 36, 36, 36, 36, 36, 37, 37,
|
||||
37, 38, 38, 39, 39, 40, 40, 41, 42, 42,
|
||||
43, 43, 43, 43, 44, 45, 45, 46, 46
|
||||
37, 38, 38, 39, 39, 40, 40, 41, 41, 41,
|
||||
41, 42, 43, 43, 44, 44, 44, 44, 45, 46,
|
||||
46, 47, 47
|
||||
};
|
||||
|
||||
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
|
||||
@ -372,8 +376,9 @@ static const unsigned char yyr2[] =
|
||||
3, 1, 0, 1, 2, 1, 1, 1, 2, 2,
|
||||
2, 2, 1, 1, 1, 2, 1, 1, 1, 1,
|
||||
1, 3, 2, 1, 3, 2, 3, 2, 1, 3,
|
||||
2, 3, 2, 1, 3, 3, 5, 3, 1, 5,
|
||||
1, 3, 3, 2, 3, 3, 2, 1, 3
|
||||
2, 3, 2, 1, 3, 3, 3, 3, 2, 3,
|
||||
2, 3, 1, 5, 1, 3, 3, 2, 3, 3,
|
||||
2, 1, 3
|
||||
};
|
||||
|
||||
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
|
||||
@ -384,46 +389,48 @@ static const unsigned char yydefact[] =
|
||||
4, 0, 26, 12, 13, 0, 0, 0, 0, 2,
|
||||
27, 28, 29, 30, 25, 0, 22, 0, 0, 23,
|
||||
24, 11, 6, 3, 0, 5, 7, 42, 43, 0,
|
||||
56, 0, 57, 0, 1, 0, 0, 14, 12, 0,
|
||||
0, 38, 0, 33, 48, 50, 0, 8, 21, 0,
|
||||
19, 0, 20, 0, 0, 0, 0, 41, 0, 12,
|
||||
55, 0, 0, 16, 0, 37, 0, 35, 32, 0,
|
||||
12, 15, 31, 40, 45, 53, 0, 17, 0, 10,
|
||||
9, 44, 54, 58, 0, 0, 0, 36, 34, 0,
|
||||
0, 47, 39, 51, 52, 18, 46, 12, 49
|
||||
60, 0, 61, 0, 1, 0, 0, 14, 12, 0,
|
||||
0, 38, 0, 33, 0, 52, 54, 0, 8, 21,
|
||||
0, 19, 0, 20, 0, 0, 0, 0, 41, 0,
|
||||
12, 59, 0, 16, 0, 37, 50, 0, 35, 48,
|
||||
32, 0, 12, 15, 31, 40, 45, 46, 57, 17,
|
||||
0, 10, 9, 44, 58, 62, 0, 0, 36, 49,
|
||||
34, 47, 0, 51, 39, 55, 56, 18, 0, 0,
|
||||
12, 0, 0, 53
|
||||
};
|
||||
|
||||
/* YYDEFGOTO[NTERM-NUM]. */
|
||||
static const yysigned_char yydefgoto[] =
|
||||
{
|
||||
-1, 7, 21, 22, 23, 24, 72, 64, 79, 25,
|
||||
26, 10, 41, 67, 43, 11, 29, 12, 44, 45,
|
||||
46, 32, 13, 33
|
||||
-1, 7, 21, 22, 23, 24, 74, 78, 81, 25,
|
||||
26, 10, 41, 65, 43, 11, 29, 12, 44, 45,
|
||||
46, 47, 32, 13, 33
|
||||
};
|
||||
|
||||
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
|
||||
STATE-NUM. */
|
||||
#define YYPACT_NINF -47
|
||||
#define YYPACT_NINF -48
|
||||
static const short yypact[] =
|
||||
{
|
||||
4, 241, -47, 219, -47, 202, 150, 2, 114, -47,
|
||||
-47, -47, -47, -47, -47, 219, -47, 236, 276, -47,
|
||||
-47, -47, -47, -47, 94, -47, -47, -47, -47, 8,
|
||||
-47, 10, -47, -9, -47, 258, 258, -47, 219, 219,
|
||||
15, -47, 29, 37, -47, -47, 6, -47, -47, 276,
|
||||
-47, 276, -47, 168, 185, 23, 35, -47, 219, 219,
|
||||
-47, 219, 258, -47, 81, -47, 126, -47, -47, 37,
|
||||
219, -47, -47, 39, -47, 138, 185, -47, 23, -47,
|
||||
-47, -47, -47, -47, 81, 264, 264, -47, -47, 6,
|
||||
40, -47, -47, -47, -47, -47, -47, 219, -47
|
||||
241, 252, -48, 219, -48, 202, 150, 13, 114, -48,
|
||||
-48, -48, -48, -48, -48, 219, -48, 236, 299, -48,
|
||||
-48, -48, -48, -48, 94, -48, -48, -48, -48, 4,
|
||||
-48, 2, -48, -15, -48, 269, 269, -48, 219, 219,
|
||||
6, -48, 23, 20, 23, -48, -48, 54, -48, -48,
|
||||
299, -48, 299, -48, 168, 185, 75, 38, -48, 219,
|
||||
219, -48, 219, -48, 126, -48, -48, 126, -48, -48,
|
||||
-48, 20, 219, -48, -48, 12, -48, -48, 138, -48,
|
||||
75, -48, -48, -48, -48, -48, 281, 281, -48, 20,
|
||||
-48, 20, 37, -48, -48, -48, -48, -48, 79, 79,
|
||||
219, 287, 287, -48
|
||||
};
|
||||
|
||||
/* YYPGOTO[NTERM-NUM]. */
|
||||
static const yysigned_char yypgoto[] =
|
||||
{
|
||||
-47, -47, 32, -7, -31, 3, -45, 18, -46, 16,
|
||||
5, -47, -32, -8, -47, -47, -47, -47, -47, -15,
|
||||
-4, 7, -47, -47
|
||||
-48, -48, -2, 19, -37, 7, 21, -16, -47, -6,
|
||||
14, -48, -33, -8, -48, -48, -48, -48, 41, -48,
|
||||
-24, 11, 27, -48, -48
|
||||
};
|
||||
|
||||
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
|
||||
@ -433,50 +440,52 @@ static const yysigned_char yypgoto[] =
|
||||
#define YYTABLE_NINF -1
|
||||
static const unsigned char yytable[] =
|
||||
{
|
||||
42, 74, 34, 8, 8, 9, 14, 68, 47, 1,
|
||||
80, 60, 61, 2, 3, 4, 42, 55, 63, 71,
|
||||
8, 5, 14, 6, 40, 59, 57, 65, 82, 58,
|
||||
70, 48, 95, 50, 52, 63, 77, 28, 31, 91,
|
||||
56, 92, 71, 93, 96, 65, 47, 63, 77, 63,
|
||||
70, 48, 50, 38, 66, 97, 87, 8, 88, 14,
|
||||
94, 73, 89, 0, 75, 48, 98, 50, 83, 48,
|
||||
50, 69, 66, 78, 78, 0, 88, 65, 50, 8,
|
||||
84, 14, 40, 0, 85, 0, 86, 90, 0, 0,
|
||||
81, 40, 50, 31, 84, 38, 78, 53, 16, 54,
|
||||
18, 19, 20, 2, 84, 4, 37, 75, 38, 0,
|
||||
42, 70, 40, 28, 31, 61, 62, 8, 8, 49,
|
||||
82, 51, 53, 34, 9, 14, 42, 60, 57, 64,
|
||||
67, 72, 58, 84, 8, 59, 38, 75, 68, 49,
|
||||
51, 14, 63, 97, 48, 93, 73, 71, 64, 67,
|
||||
80, 80, 94, 56, 49, 95, 51, 68, 49, 51,
|
||||
63, 79, 100, 72, 96, 92, 88, 83, 40, 90,
|
||||
31, 40, 8, 103, 80, 76, 63, 73, 77, 14,
|
||||
98, 99, 40, 48, 0, 89, 66, 69, 91, 68,
|
||||
49, 51, 101, 0, 102, 98, 99, 63, 79, 85,
|
||||
88, 90, 0, 38, 68, 66, 69, 54, 16, 55,
|
||||
18, 19, 20, 2, 0, 4, 37, 0, 38, 0,
|
||||
0, 5, 0, 6, 0, 0, 39, 35, 16, 36,
|
||||
18, 19, 20, 0, 0, 0, 37, 0, 38, 35,
|
||||
16, 62, 18, 19, 20, 0, 39, 0, 0, 0,
|
||||
38, 49, 16, 51, 18, 19, 20, 0, 39, 0,
|
||||
18, 19, 20, 0, 0, 0, 37, 0, 38, 86,
|
||||
16, 87, 18, 19, 20, 0, 39, 0, 0, 0,
|
||||
38, 50, 16, 52, 18, 19, 20, 0, 39, 0,
|
||||
0, 0, 38, 15, 16, 17, 18, 19, 20, 2,
|
||||
39, 4, 0, 0, 0, 0, 0, 5, 0, 6,
|
||||
30, 53, 16, 76, 18, 19, 20, 2, 0, 4,
|
||||
30, 54, 16, 55, 18, 19, 20, 2, 0, 4,
|
||||
63, 0, 38, 0, 0, 5, 0, 6, 35, 16,
|
||||
76, 18, 19, 20, 2, 0, 4, 63, 0, 38,
|
||||
55, 18, 19, 20, 2, 0, 4, 63, 0, 38,
|
||||
0, 0, 5, 0, 6, 15, 16, 17, 18, 19,
|
||||
20, 2, 0, 4, 0, 0, 0, 0, 0, 5,
|
||||
27, 6, 15, 16, 17, 18, 19, 20, 2, 0,
|
||||
4, 0, 0, 0, 0, 0, 5, 0, 6, 49,
|
||||
4, 0, 0, 0, 0, 0, 5, 0, 6, 50,
|
||||
16, 17, 18, 19, 20, 2, 1, 4, 0, 0,
|
||||
2, 0, 4, 5, 0, 6, 0, 0, 5, 0,
|
||||
6, 35, 16, 62, 18, 19, 20, 85, 0, 86,
|
||||
63, 0, 38, 0, 0, 0, 63, 0, 38, 49,
|
||||
16, 51, 18, 19, 20
|
||||
2, 3, 4, 5, 0, 6, 0, 1, 5, 0,
|
||||
6, 2, 0, 4, 0, 0, 0, 0, 0, 5,
|
||||
0, 6, 35, 16, 36, 18, 19, 20, 0, 0,
|
||||
0, 63, 0, 38, 86, 16, 87, 18, 19, 20,
|
||||
101, 0, 102, 63, 0, 38, 0, 0, 0, 63,
|
||||
0, 38, 50, 16, 52, 18, 19, 20
|
||||
};
|
||||
|
||||
static const yysigned_char yycheck[] =
|
||||
{
|
||||
8, 46, 0, 0, 1, 0, 1, 38, 15, 5,
|
||||
56, 20, 21, 9, 10, 11, 24, 24, 12, 13,
|
||||
17, 17, 17, 19, 8, 15, 18, 35, 59, 21,
|
||||
15, 15, 78, 17, 18, 12, 13, 5, 6, 70,
|
||||
24, 73, 13, 75, 89, 53, 53, 12, 13, 12,
|
||||
15, 35, 36, 14, 36, 15, 64, 54, 66, 54,
|
||||
75, 43, 66, -1, 46, 49, 97, 51, 61, 53,
|
||||
54, 39, 54, 55, 56, -1, 84, 85, 62, 76,
|
||||
62, 76, 66, -1, 3, -1, 5, 69, -1, -1,
|
||||
58, 75, 76, 61, 76, 14, 78, 3, 4, 5,
|
||||
6, 7, 8, 9, 86, 11, 12, 89, 14, -1,
|
||||
8, 38, 8, 5, 6, 20, 21, 0, 1, 15,
|
||||
57, 17, 18, 0, 0, 1, 24, 15, 24, 35,
|
||||
36, 15, 18, 60, 17, 21, 14, 43, 36, 35,
|
||||
36, 17, 12, 80, 15, 72, 13, 39, 54, 55,
|
||||
56, 57, 75, 24, 50, 78, 52, 55, 54, 55,
|
||||
12, 13, 15, 15, 78, 71, 64, 59, 64, 67,
|
||||
62, 67, 55, 100, 80, 44, 12, 13, 47, 55,
|
||||
86, 87, 78, 54, -1, 64, 35, 36, 67, 87,
|
||||
86, 87, 3, -1, 5, 101, 102, 12, 13, 62,
|
||||
98, 99, -1, 14, 102, 54, 55, 3, 4, 5,
|
||||
6, 7, 8, 9, -1, 11, 12, -1, 14, -1,
|
||||
-1, 17, -1, 19, -1, -1, 22, 3, 4, 5,
|
||||
6, 7, 8, -1, -1, -1, 12, -1, 14, 3,
|
||||
4, 5, 6, 7, 8, -1, 22, -1, -1, -1,
|
||||
@ -491,10 +500,12 @@ static const yysigned_char yycheck[] =
|
||||
18, 19, 3, 4, 5, 6, 7, 8, 9, -1,
|
||||
11, -1, -1, -1, -1, -1, 17, -1, 19, 3,
|
||||
4, 5, 6, 7, 8, 9, 5, 11, -1, -1,
|
||||
9, -1, 11, 17, -1, 19, -1, -1, 17, -1,
|
||||
19, 3, 4, 5, 6, 7, 8, 3, -1, 5,
|
||||
12, -1, 14, -1, -1, -1, 12, -1, 14, 3,
|
||||
4, 5, 6, 7, 8
|
||||
9, 10, 11, 17, -1, 19, -1, 5, 17, -1,
|
||||
19, 9, -1, 11, -1, -1, -1, -1, -1, 17,
|
||||
-1, 19, 3, 4, 5, 6, 7, 8, -1, -1,
|
||||
-1, 12, -1, 14, 3, 4, 5, 6, 7, 8,
|
||||
3, -1, 5, 12, -1, 14, -1, -1, -1, 12,
|
||||
-1, 14, 3, 4, 5, 6, 7, 8
|
||||
};
|
||||
|
||||
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
|
||||
@ -502,15 +513,16 @@ static const yysigned_char yycheck[] =
|
||||
static const unsigned char yystos[] =
|
||||
{
|
||||
0, 5, 9, 10, 11, 17, 19, 24, 28, 33,
|
||||
34, 38, 40, 45, 33, 3, 4, 5, 6, 7,
|
||||
34, 38, 40, 46, 33, 3, 4, 5, 6, 7,
|
||||
8, 25, 26, 27, 28, 32, 33, 18, 25, 39,
|
||||
20, 25, 44, 46, 0, 3, 5, 12, 14, 22,
|
||||
32, 35, 36, 37, 41, 42, 43, 26, 32, 3,
|
||||
32, 5, 32, 3, 5, 26, 32, 18, 21, 15,
|
||||
20, 21, 5, 12, 30, 36, 30, 36, 27, 25,
|
||||
15, 13, 29, 30, 29, 30, 5, 13, 30, 31,
|
||||
31, 25, 27, 44, 30, 3, 5, 36, 36, 43,
|
||||
30, 27, 35, 35, 42, 31, 29, 15, 27
|
||||
20, 25, 45, 47, 0, 3, 5, 12, 14, 22,
|
||||
32, 35, 36, 37, 41, 42, 43, 44, 26, 32,
|
||||
3, 32, 5, 32, 3, 5, 26, 32, 18, 21,
|
||||
15, 20, 21, 12, 30, 36, 41, 30, 36, 41,
|
||||
27, 25, 15, 13, 29, 30, 29, 29, 30, 13,
|
||||
30, 31, 31, 25, 27, 45, 3, 5, 36, 44,
|
||||
36, 44, 30, 27, 35, 35, 43, 31, 30, 30,
|
||||
15, 3, 5, 27
|
||||
};
|
||||
|
||||
#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
|
||||
@ -1295,13 +1307,42 @@ yyreduce:
|
||||
#line 261 "gram.y"
|
||||
{
|
||||
apply_seq_in_map( (SyckParser *)parser, yyvsp[-1].nodeData );
|
||||
syck_add_transfer( yyvsp[-3].name, yyvsp[-1].nodeData, ((SyckParser *)parser)->taguri_expansion );
|
||||
yyval.nodeData = yyvsp[-1].nodeData;
|
||||
}
|
||||
break;
|
||||
|
||||
case 47:
|
||||
#line 269 "gram.y"
|
||||
#line 268 "gram.y"
|
||||
{
|
||||
syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
|
||||
yyval.nodeData = yyvsp[0].nodeData;
|
||||
}
|
||||
break;
|
||||
|
||||
case 48:
|
||||
#line 273 "gram.y"
|
||||
{
|
||||
syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
|
||||
yyval.nodeData = yyvsp[0].nodeData;
|
||||
}
|
||||
break;
|
||||
|
||||
case 49:
|
||||
#line 278 "gram.y"
|
||||
{
|
||||
yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-2].name, yyvsp[0].nodeData );
|
||||
}
|
||||
break;
|
||||
|
||||
case 50:
|
||||
#line 282 "gram.y"
|
||||
{
|
||||
yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
|
||||
}
|
||||
break;
|
||||
|
||||
case 51:
|
||||
#line 288 "gram.y"
|
||||
{
|
||||
yyval.nodeData = syck_new_map(
|
||||
syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-2].nodeData ),
|
||||
@ -1309,8 +1350,8 @@ yyreduce:
|
||||
}
|
||||
break;
|
||||
|
||||
case 49:
|
||||
#line 285 "gram.y"
|
||||
case 53:
|
||||
#line 304 "gram.y"
|
||||
{
|
||||
yyval.nodeData = syck_new_map(
|
||||
syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-3].nodeData ),
|
||||
@ -1318,8 +1359,8 @@ yyreduce:
|
||||
}
|
||||
break;
|
||||
|
||||
case 51:
|
||||
#line 294 "gram.y"
|
||||
case 55:
|
||||
#line 313 "gram.y"
|
||||
{
|
||||
if ( yyvsp[-2].nodeData->shortcut == NULL )
|
||||
{
|
||||
@ -1333,8 +1374,8 @@ yyreduce:
|
||||
}
|
||||
break;
|
||||
|
||||
case 52:
|
||||
#line 306 "gram.y"
|
||||
case 56:
|
||||
#line 325 "gram.y"
|
||||
{
|
||||
apply_seq_in_map( (SyckParser *)parser, yyvsp[-2].nodeData );
|
||||
syck_map_update( yyvsp[-2].nodeData, yyvsp[0].nodeData );
|
||||
@ -1343,15 +1384,15 @@ yyreduce:
|
||||
}
|
||||
break;
|
||||
|
||||
case 53:
|
||||
#line 313 "gram.y"
|
||||
case 57:
|
||||
#line 332 "gram.y"
|
||||
{
|
||||
yyval.nodeData = yyvsp[-1].nodeData;
|
||||
}
|
||||
break;
|
||||
|
||||
case 54:
|
||||
#line 322 "gram.y"
|
||||
case 58:
|
||||
#line 341 "gram.y"
|
||||
{
|
||||
yyval.nodeData = syck_new_map(
|
||||
syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-2].nodeData ),
|
||||
@ -1359,22 +1400,22 @@ yyreduce:
|
||||
}
|
||||
break;
|
||||
|
||||
case 55:
|
||||
#line 330 "gram.y"
|
||||
case 59:
|
||||
#line 349 "gram.y"
|
||||
{
|
||||
yyval.nodeData = yyvsp[-1].nodeData;
|
||||
}
|
||||
break;
|
||||
|
||||
case 56:
|
||||
#line 334 "gram.y"
|
||||
case 60:
|
||||
#line 353 "gram.y"
|
||||
{
|
||||
yyval.nodeData = syck_alloc_map();
|
||||
}
|
||||
break;
|
||||
|
||||
case 58:
|
||||
#line 341 "gram.y"
|
||||
case 62:
|
||||
#line 360 "gram.y"
|
||||
{
|
||||
syck_map_update( yyvsp[-2].nodeData, yyvsp[0].nodeData );
|
||||
syck_free_node( yyvsp[0].nodeData );
|
||||
@ -1386,7 +1427,7 @@ yyreduce:
|
||||
}
|
||||
|
||||
/* Line 1016 of /usr/local/share/bison/yacc.c. */
|
||||
#line 1390 "y.tab.c"
|
||||
#line 1431 "y.tab.c"
|
||||
|
||||
yyvsp -= yylen;
|
||||
yyssp -= yylen;
|
||||
@ -1605,7 +1646,7 @@ yyreturn:
|
||||
}
|
||||
|
||||
|
||||
#line 348 "gram.y"
|
||||
#line 367 "gram.y"
|
||||
|
||||
|
||||
void
|
||||
|
||||
@ -31,6 +31,10 @@ SyckNode *
|
||||
syck_hdlr_add_anchor( SyckParser *p, char *a, SyckNode *n )
|
||||
{
|
||||
n->anchor = a;
|
||||
if ( p->anchors == NULL )
|
||||
{
|
||||
p->anchors = st_init_strtable();
|
||||
}
|
||||
st_insert( p->anchors, (st_data_t)a, (st_data_t)n );
|
||||
return n;
|
||||
}
|
||||
@ -40,9 +44,12 @@ syck_hdlr_add_alias( SyckParser *p, char *a )
|
||||
{
|
||||
SyckNode *n;
|
||||
|
||||
if ( st_lookup( p->anchors, (st_data_t)a, (st_data_t *)&n ) )
|
||||
if ( p->anchors != NULL )
|
||||
{
|
||||
return n;
|
||||
if ( st_lookup( p->anchors, (st_data_t)a, (st_data_t *)&n ) )
|
||||
{
|
||||
return n;
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
|
||||
@ -192,7 +192,6 @@ syck_map_update( SyckNode *map1, SyckNode *map2 )
|
||||
S_REALLOC_N( m1->keys, SYMID, m1->capa );
|
||||
S_REALLOC_N( m1->values, SYMID, m1->capa );
|
||||
}
|
||||
new_idx = 0;
|
||||
for ( new_idx = 0; new_idx < m2->idx; m1->idx++, new_idx++ )
|
||||
{
|
||||
m1->keys[m1->idx] = m2->keys[new_idx];
|
||||
|
||||
@ -438,6 +438,14 @@ rb_syck_ensure(parser)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
syck_mark_parser(parser)
|
||||
SyckParser *parser;
|
||||
{
|
||||
rb_gc_mark(parser->root);
|
||||
rb_gc_mark(parser->root_on_error);
|
||||
}
|
||||
|
||||
/*
|
||||
* YAML::Syck::Parser.new
|
||||
*/
|
||||
@ -451,7 +459,7 @@ syck_parser_new(argc, argv, class)
|
||||
SyckParser *parser = syck_new_parser();
|
||||
|
||||
rb_scan_args(argc, argv, "01", &options);
|
||||
pobj = Data_Wrap_Struct( class, 0, syck_free_parser, parser );
|
||||
pobj = Data_Wrap_Struct( class, syck_mark_parser, syck_free_parser, parser );
|
||||
|
||||
syck_parser_set_root_on_error( parser, Qnil );
|
||||
|
||||
|
||||
@ -169,7 +169,7 @@ syck_new_parser()
|
||||
p->io_type = syck_io_str;
|
||||
p->io.str = NULL;
|
||||
p->syms = NULL;
|
||||
p->anchors = st_init_strtable();
|
||||
p->anchors = NULL;
|
||||
p->implicit_typing = 1;
|
||||
p->taguri_expansion = 0;
|
||||
p->bufsize = SYCK_BUFFERSIZE;
|
||||
@ -207,28 +207,38 @@ syck_st_free_nodes( char *key, SyckNode *n, char *arg )
|
||||
}
|
||||
|
||||
void
|
||||
syck_free_parser( SyckParser *p )
|
||||
syck_st_free( SyckParser *p )
|
||||
{
|
||||
char *key;
|
||||
SyckNode *node;
|
||||
|
||||
//
|
||||
// Free the adhoc symbol table
|
||||
//
|
||||
if ( p->syms != NULL )
|
||||
{
|
||||
st_free_table( p->syms );
|
||||
p->syms = NULL;
|
||||
}
|
||||
|
||||
//
|
||||
// Free the anchor table
|
||||
//
|
||||
st_foreach( p->anchors, syck_st_free_nodes, 0 );
|
||||
st_free_table( p->anchors );
|
||||
if ( p->anchors != NULL )
|
||||
{
|
||||
st_foreach( p->anchors, syck_st_free_nodes, 0 );
|
||||
st_free_table( p->anchors );
|
||||
p->anchors = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
syck_free_parser( SyckParser *p )
|
||||
{
|
||||
char *key;
|
||||
SyckNode *node;
|
||||
|
||||
//
|
||||
// Free all else
|
||||
// Free tables, levels
|
||||
//
|
||||
syck_st_free( p );
|
||||
syck_parser_reset_levels( p );
|
||||
S_FREE( p->levels[0].domain );
|
||||
S_FREE( p->levels );
|
||||
@ -467,6 +477,7 @@ syck_parse( SyckParser *p )
|
||||
|
||||
ASSERT( p != NULL );
|
||||
|
||||
syck_st_free( p );
|
||||
syck_parser_reset_levels( p );
|
||||
yyparse( p );
|
||||
return p->root;
|
||||
|
||||
200
ext/syck/token.c
200
ext/syck/token.c
@ -1,4 +1,4 @@
|
||||
/* Generated by re2c 0.5 on Fri May 30 15:54:17 2003 */
|
||||
/* Generated by re2c 0.5 on Mon Jun 2 23:45:51 2003 */
|
||||
#line 1 "token.re"
|
||||
/*
|
||||
* token.re
|
||||
@ -226,7 +226,7 @@ yylex( YYSTYPE *yylval, SyckParser *parser )
|
||||
return t;
|
||||
}
|
||||
|
||||
#line 243
|
||||
#line 244
|
||||
|
||||
|
||||
if ( YYLINEPTR != YYCURSOR )
|
||||
@ -260,19 +260,19 @@ yy2: yyaccept = 0;
|
||||
default: goto yy3;
|
||||
}
|
||||
yy3:
|
||||
#line 284
|
||||
#line 285
|
||||
{ YYPOS(0);
|
||||
goto Document;
|
||||
}
|
||||
yy4: yych = *++YYCURSOR;
|
||||
yy5:
|
||||
#line 270
|
||||
#line 271
|
||||
{ eat_comments( parser );
|
||||
goto Header;
|
||||
}
|
||||
yy6: yych = *++YYCURSOR;
|
||||
yy7:
|
||||
#line 274
|
||||
#line 275
|
||||
{ SyckLevel *lvl = CURRENT_LEVEL();
|
||||
ENSURE_IEND(lvl, -1);
|
||||
return 0;
|
||||
@ -280,7 +280,7 @@ yy7:
|
||||
yy8: yych = *++YYCURSOR;
|
||||
goto yy12;
|
||||
yy9:
|
||||
#line 279
|
||||
#line 280
|
||||
{ int indt_len;
|
||||
GOBBLE_UP_INDENT( indt_len, YYTOKEN );
|
||||
goto Header;
|
||||
@ -325,7 +325,7 @@ yy19: switch(yych){
|
||||
default: goto yy20;
|
||||
}
|
||||
yy20:
|
||||
#line 256
|
||||
#line 257
|
||||
{ SyckLevel *lvl = CURRENT_LEVEL();
|
||||
if ( lvl->status == syck_lvl_header )
|
||||
{
|
||||
@ -347,7 +347,7 @@ yy22: switch(yych){
|
||||
default: goto yy20;
|
||||
}
|
||||
}
|
||||
#line 288
|
||||
#line 289
|
||||
|
||||
|
||||
Document:
|
||||
@ -388,7 +388,7 @@ yy23:
|
||||
yy25: yych = *++YYCURSOR;
|
||||
goto yy77;
|
||||
yy26:
|
||||
#line 302
|
||||
#line 303
|
||||
{ // Isolate spaces
|
||||
int indt_len;
|
||||
GOBBLE_UP_INDENT( indt_len, YYTOKEN );
|
||||
@ -405,7 +405,7 @@ yy26:
|
||||
}
|
||||
yy27: yych = *++YYCURSOR;
|
||||
yy28:
|
||||
#line 317
|
||||
#line 318
|
||||
{ ENSURE_IOPEN(lvl, 0, 1);
|
||||
lvl = CURRENT_LEVEL();
|
||||
ADD_LEVEL(lvl->spaces + 1, syck_lvl_inline);
|
||||
@ -413,7 +413,7 @@ yy28:
|
||||
}
|
||||
yy29: yych = *++YYCURSOR;
|
||||
yy30:
|
||||
#line 323
|
||||
#line 324
|
||||
{ POP_LEVEL();
|
||||
return YYTOKEN[0];
|
||||
}
|
||||
@ -424,7 +424,7 @@ yy31: yych = *++YYCURSOR;
|
||||
default: goto yy32;
|
||||
}
|
||||
yy32:
|
||||
#line 381
|
||||
#line 382
|
||||
{ ENSURE_IOPEN(lvl, 0, 1);
|
||||
goto Plain;
|
||||
}
|
||||
@ -564,17 +564,17 @@ yy35: yych = *++YYCURSOR;
|
||||
}
|
||||
yy36: yych = *++YYCURSOR;
|
||||
yy37:
|
||||
#line 355
|
||||
#line 356
|
||||
{ ENSURE_IOPEN(lvl, 0, 1);
|
||||
goto TransferMethod; }
|
||||
yy38: yych = *++YYCURSOR;
|
||||
yy39:
|
||||
#line 358
|
||||
#line 359
|
||||
{ ENSURE_IOPEN(lvl, 0, 1);
|
||||
goto SingleQuote; }
|
||||
yy40: yych = *++YYCURSOR;
|
||||
yy41:
|
||||
#line 361
|
||||
#line 362
|
||||
{ ENSURE_IOPEN(lvl, 0, 1);
|
||||
goto DoubleQuote; }
|
||||
yy42: yyaccept = 0;
|
||||
@ -596,18 +596,18 @@ yy42: yyaccept = 0;
|
||||
}
|
||||
yy43: yych = *++YYCURSOR;
|
||||
yy44:
|
||||
#line 371
|
||||
#line 372
|
||||
{ eat_comments( parser );
|
||||
goto Document;
|
||||
}
|
||||
yy45: yych = *++YYCURSOR;
|
||||
goto yy51;
|
||||
yy46:
|
||||
#line 375
|
||||
#line 376
|
||||
{ goto Document; }
|
||||
yy47: yych = *++YYCURSOR;
|
||||
yy48:
|
||||
#line 377
|
||||
#line 378
|
||||
{ ENSURE_IEND(lvl, -1);
|
||||
return 0;
|
||||
}
|
||||
@ -650,7 +650,7 @@ yy56: switch(yych){
|
||||
default: goto yy57;
|
||||
}
|
||||
yy57:
|
||||
#line 364
|
||||
#line 365
|
||||
{ if ( *( YYCURSOR - 1 ) == '\n' )
|
||||
{
|
||||
YYCURSOR--;
|
||||
@ -731,7 +731,7 @@ yy61: switch(yych){
|
||||
default: goto yy62;
|
||||
}
|
||||
yy62:
|
||||
#line 350
|
||||
#line 351
|
||||
{ ENSURE_IOPEN(lvl, 0, 1);
|
||||
yylval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 );
|
||||
return ALIAS;
|
||||
@ -803,7 +803,7 @@ yy64: switch(yych){
|
||||
default: goto yy65;
|
||||
}
|
||||
yy65:
|
||||
#line 345
|
||||
#line 346
|
||||
{ ENSURE_IOPEN(lvl, 0, 1);
|
||||
yylval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 );
|
||||
return ANCHOR;
|
||||
@ -816,7 +816,7 @@ yy67: switch(yych){
|
||||
default: goto yy68;
|
||||
}
|
||||
yy68:
|
||||
#line 331
|
||||
#line 332
|
||||
{ ENSURE_IOPEN(lvl, YYTOKEN - YYLINEPTR, 1);
|
||||
FORCE_NEXT_TOKEN(IOPEN);
|
||||
if ( *YYCURSOR == '\n' || *( YYCURSOR - 1 ) == '\n' )
|
||||
@ -845,7 +845,7 @@ yy72: switch(yych){
|
||||
default: goto yy73;
|
||||
}
|
||||
yy73:
|
||||
#line 327
|
||||
#line 328
|
||||
{ YYPOS(1);
|
||||
return YYTOKEN[0];
|
||||
}
|
||||
@ -872,7 +872,7 @@ yy79: switch(yych){
|
||||
default: goto yy26;
|
||||
}
|
||||
}
|
||||
#line 385
|
||||
#line 386
|
||||
|
||||
}
|
||||
|
||||
@ -901,7 +901,9 @@ yy82: YYCURSOR = YYMARKER;
|
||||
yy83: yyaccept = 0;
|
||||
yych = *(YYMARKER = ++YYCURSOR);
|
||||
switch(yych){
|
||||
case '-': case '0':
|
||||
case '.':
|
||||
case '/':
|
||||
case '0':
|
||||
case '1':
|
||||
case '2':
|
||||
case '3':
|
||||
@ -910,7 +912,15 @@ yy83: yyaccept = 0;
|
||||
case '6':
|
||||
case '7':
|
||||
case '8':
|
||||
case '9': case 'A':
|
||||
case '9':
|
||||
case ':':
|
||||
case ';':
|
||||
case '<':
|
||||
case '=':
|
||||
case '>':
|
||||
case '?':
|
||||
case '@':
|
||||
case 'A':
|
||||
case 'B':
|
||||
case 'C':
|
||||
case 'D':
|
||||
@ -935,7 +945,12 @@ yy83: yyaccept = 0;
|
||||
case 'W':
|
||||
case 'X':
|
||||
case 'Y':
|
||||
case 'Z': case '_': case 'a':
|
||||
case 'Z':
|
||||
case '[':
|
||||
case '\\':
|
||||
case ']':
|
||||
case '^':
|
||||
case '_': case 'a':
|
||||
case 'b':
|
||||
case 'c':
|
||||
case 'd':
|
||||
@ -964,14 +979,14 @@ yy83: yyaccept = 0;
|
||||
default: goto yy84;
|
||||
}
|
||||
yy84:
|
||||
#line 398
|
||||
#line 399
|
||||
{ YYCURSOR = YYTOKTMP;
|
||||
return DOCSEP;
|
||||
}
|
||||
yy85: yych = *++YYCURSOR;
|
||||
goto yy89;
|
||||
yy86:
|
||||
#line 396
|
||||
#line 397
|
||||
{ goto Directive; }
|
||||
yy87: yych = *++YYCURSOR;
|
||||
goto yy84;
|
||||
@ -986,7 +1001,9 @@ yy90: ++YYCURSOR;
|
||||
if(YYLIMIT == YYCURSOR) YYFILL(1);
|
||||
yych = *YYCURSOR;
|
||||
yy91: switch(yych){
|
||||
case '-': case '0':
|
||||
case '.':
|
||||
case '/':
|
||||
case '0':
|
||||
case '1':
|
||||
case '2':
|
||||
case '3':
|
||||
@ -995,7 +1012,13 @@ yy91: switch(yych){
|
||||
case '6':
|
||||
case '7':
|
||||
case '8':
|
||||
case '9': case 'A':
|
||||
case '9': case ';':
|
||||
case '<':
|
||||
case '=':
|
||||
case '>':
|
||||
case '?':
|
||||
case '@':
|
||||
case 'A':
|
||||
case 'B':
|
||||
case 'C':
|
||||
case 'D':
|
||||
@ -1020,7 +1043,12 @@ yy91: switch(yych){
|
||||
case 'W':
|
||||
case 'X':
|
||||
case 'Y':
|
||||
case 'Z': case '_': case 'a':
|
||||
case 'Z':
|
||||
case '[':
|
||||
case '\\':
|
||||
case ']':
|
||||
case '^':
|
||||
case '_': case 'a':
|
||||
case 'b':
|
||||
case 'c':
|
||||
case 'd':
|
||||
@ -1051,7 +1079,9 @@ yy91: switch(yych){
|
||||
}
|
||||
yy92: yych = *++YYCURSOR;
|
||||
switch(yych){
|
||||
case '-': case '0':
|
||||
case '.':
|
||||
case '/':
|
||||
case '0':
|
||||
case '1':
|
||||
case '2':
|
||||
case '3':
|
||||
@ -1060,7 +1090,15 @@ yy92: yych = *++YYCURSOR;
|
||||
case '6':
|
||||
case '7':
|
||||
case '8':
|
||||
case '9': case 'A':
|
||||
case '9':
|
||||
case ':':
|
||||
case ';':
|
||||
case '<':
|
||||
case '=':
|
||||
case '>':
|
||||
case '?':
|
||||
case '@':
|
||||
case 'A':
|
||||
case 'B':
|
||||
case 'C':
|
||||
case 'D':
|
||||
@ -1085,7 +1123,12 @@ yy92: yych = *++YYCURSOR;
|
||||
case 'W':
|
||||
case 'X':
|
||||
case 'Y':
|
||||
case 'Z': case '_': case 'a':
|
||||
case 'Z':
|
||||
case '[':
|
||||
case '\\':
|
||||
case ']':
|
||||
case '^':
|
||||
case '_': case 'a':
|
||||
case 'b':
|
||||
case 'c':
|
||||
case 'd':
|
||||
@ -1117,7 +1160,9 @@ yy93: ++YYCURSOR;
|
||||
if(YYLIMIT == YYCURSOR) YYFILL(1);
|
||||
yych = *YYCURSOR;
|
||||
yy94: switch(yych){
|
||||
case '-': case '0':
|
||||
case '.':
|
||||
case '/':
|
||||
case '0':
|
||||
case '1':
|
||||
case '2':
|
||||
case '3':
|
||||
@ -1126,7 +1171,15 @@ yy94: switch(yych){
|
||||
case '6':
|
||||
case '7':
|
||||
case '8':
|
||||
case '9': case 'A':
|
||||
case '9':
|
||||
case ':':
|
||||
case ';':
|
||||
case '<':
|
||||
case '=':
|
||||
case '>':
|
||||
case '?':
|
||||
case '@':
|
||||
case 'A':
|
||||
case 'B':
|
||||
case 'C':
|
||||
case 'D':
|
||||
@ -1151,7 +1204,12 @@ yy94: switch(yych){
|
||||
case 'W':
|
||||
case 'X':
|
||||
case 'Y':
|
||||
case 'Z': case '_': case 'a':
|
||||
case 'Z':
|
||||
case '[':
|
||||
case '\\':
|
||||
case ']':
|
||||
case '^':
|
||||
case '_': case 'a':
|
||||
case 'b':
|
||||
case 'c':
|
||||
case 'd':
|
||||
@ -1180,10 +1238,10 @@ yy94: switch(yych){
|
||||
default: goto yy95;
|
||||
}
|
||||
yy95:
|
||||
#line 394
|
||||
#line 395
|
||||
{ goto Directive; }
|
||||
}
|
||||
#line 401
|
||||
#line 402
|
||||
|
||||
|
||||
}
|
||||
@ -1225,7 +1283,7 @@ yy96:
|
||||
yy98: yych = *++YYCURSOR;
|
||||
goto yy122;
|
||||
yy99:
|
||||
#line 424
|
||||
#line 425
|
||||
{ int indt_len, nl_count = 0;
|
||||
SyckLevel *lvl;
|
||||
char *tok = YYTOKTMP;
|
||||
@ -1264,13 +1322,13 @@ yy100: yych = *++YYCURSOR;
|
||||
default: goto yy101;
|
||||
}
|
||||
yy101:
|
||||
#line 475
|
||||
#line 476
|
||||
{ QUOTECATS(qstr, qcapa, qidx, YYTOKTMP, YYCURSOR - YYTOKTMP);
|
||||
goto Plain2;
|
||||
}
|
||||
yy102: yych = *++YYCURSOR;
|
||||
yy103:
|
||||
#line 458
|
||||
#line 459
|
||||
{ if ( plvl->status != syck_lvl_inline )
|
||||
{
|
||||
YYCURSOR--;
|
||||
@ -1291,17 +1349,17 @@ yy105: yych = *++YYCURSOR;
|
||||
default: goto yy106;
|
||||
}
|
||||
yy106:
|
||||
#line 473
|
||||
#line 474
|
||||
{ goto Plain3; }
|
||||
yy107: yych = *++YYCURSOR;
|
||||
yy108:
|
||||
#line 471
|
||||
#line 472
|
||||
{ RETURN_IMPLICIT(); }
|
||||
yy109: yych = *++YYCURSOR;
|
||||
goto yy101;
|
||||
yy110: yych = *++YYCURSOR;
|
||||
yy111:
|
||||
#line 467
|
||||
#line 468
|
||||
{ eat_comments( parser );
|
||||
RETURN_IMPLICIT();
|
||||
}
|
||||
@ -1327,7 +1385,7 @@ yy117: switch(yych){
|
||||
default: goto yy118;
|
||||
}
|
||||
yy118:
|
||||
#line 456
|
||||
#line 457
|
||||
{ RETURN_IMPLICIT(); }
|
||||
yy119: ++YYCURSOR;
|
||||
if(YYLIMIT == YYCURSOR) YYFILL(1);
|
||||
@ -1352,7 +1410,7 @@ yy124: switch(yych){
|
||||
default: goto yy99;
|
||||
}
|
||||
}
|
||||
#line 479
|
||||
#line 480
|
||||
|
||||
}
|
||||
|
||||
@ -1382,7 +1440,7 @@ yy125:
|
||||
yy127: yych = *++YYCURSOR;
|
||||
goto yy137;
|
||||
yy128:
|
||||
#line 493
|
||||
#line 494
|
||||
{ int indt_len;
|
||||
int nl_count = 0;
|
||||
SyckLevel *lvl;
|
||||
@ -1424,7 +1482,7 @@ yy129: yych = *++YYCURSOR;
|
||||
default: goto yy130;
|
||||
}
|
||||
yy130:
|
||||
#line 533
|
||||
#line 534
|
||||
{ SyckLevel *lvl;
|
||||
SyckNode *n = syck_alloc_str();
|
||||
lvl = CURRENT_LEVEL();
|
||||
@ -1442,13 +1500,13 @@ yy131: yych = *++YYCURSOR;
|
||||
goto yy130;
|
||||
yy132: yych = *++YYCURSOR;
|
||||
yy133:
|
||||
#line 547
|
||||
#line 548
|
||||
{ QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1));
|
||||
goto SingleQuote2;
|
||||
}
|
||||
yy134: yych = *++YYCURSOR;
|
||||
yy135:
|
||||
#line 529
|
||||
#line 530
|
||||
{ QUOTECAT(qstr, qcapa, qidx, '\'');
|
||||
goto SingleQuote2;
|
||||
}
|
||||
@ -1468,7 +1526,7 @@ yy139: switch(yych){
|
||||
default: goto yy128;
|
||||
}
|
||||
}
|
||||
#line 551
|
||||
#line 552
|
||||
|
||||
|
||||
}
|
||||
@ -1503,7 +1561,7 @@ yy140:
|
||||
yy142: yych = *++YYCURSOR;
|
||||
goto yy162;
|
||||
yy143:
|
||||
#line 569
|
||||
#line 570
|
||||
{ int indt_len;
|
||||
int nl_count = 0;
|
||||
SyckLevel *lvl;
|
||||
@ -1555,13 +1613,13 @@ yy144: yyaccept = 0;
|
||||
default: goto yy145;
|
||||
}
|
||||
yy145:
|
||||
#line 653
|
||||
#line 654
|
||||
{ QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1));
|
||||
goto DoubleQuote2;
|
||||
}
|
||||
yy146: yych = *++YYCURSOR;
|
||||
yy147:
|
||||
#line 639
|
||||
#line 640
|
||||
{ SyckLevel *lvl;
|
||||
SyckNode *n = syck_alloc_str();
|
||||
lvl = CURRENT_LEVEL();
|
||||
@ -1593,7 +1651,7 @@ yy152: YYCURSOR = YYMARKER;
|
||||
}
|
||||
yy153: yych = *++YYCURSOR;
|
||||
yy154:
|
||||
#line 634
|
||||
#line 635
|
||||
{ keep_nl = 0;
|
||||
YYCURSOR--;
|
||||
goto DoubleQuote2;
|
||||
@ -1624,7 +1682,7 @@ yy155: yych = *++YYCURSOR;
|
||||
}
|
||||
yy156: yych = *++YYCURSOR;
|
||||
yy157:
|
||||
#line 609
|
||||
#line 610
|
||||
{ char ch = *( YYCURSOR - 1 );
|
||||
switch ( ch )
|
||||
{
|
||||
@ -1666,7 +1724,7 @@ yy158: yych = *++YYCURSOR;
|
||||
}
|
||||
yy159: yych = *++YYCURSOR;
|
||||
yy160:
|
||||
#line 625
|
||||
#line 626
|
||||
{ long ch;
|
||||
char *chr_text = syck_strndup( YYTOKTMP, 4 );
|
||||
chr_text[0] = '0';
|
||||
@ -1691,7 +1749,7 @@ yy164: switch(yych){
|
||||
default: goto yy143;
|
||||
}
|
||||
}
|
||||
#line 657
|
||||
#line 658
|
||||
|
||||
}
|
||||
|
||||
@ -1716,7 +1774,7 @@ yy165:
|
||||
yy167:yy168: yych = *++YYCURSOR;
|
||||
goto yy176;
|
||||
yy169:
|
||||
#line 666
|
||||
#line 667
|
||||
{ SyckLevel *lvl;
|
||||
YYCURSOR = YYTOKTMP;
|
||||
if ( YYCURSOR == YYTOKEN + 1 )
|
||||
@ -1766,7 +1824,7 @@ yy170: yych = *++YYCURSOR;
|
||||
goto yy174;
|
||||
yy171: yych = *++YYCURSOR;
|
||||
yy172:
|
||||
#line 712
|
||||
#line 713
|
||||
{ goto TransferMethod; }
|
||||
yy173: ++YYCURSOR;
|
||||
if(YYLIMIT == YYCURSOR) YYFILL(1);
|
||||
@ -1783,7 +1841,7 @@ yy176: switch(yych){
|
||||
default: goto yy169;
|
||||
}
|
||||
}
|
||||
#line 714
|
||||
#line 715
|
||||
|
||||
}
|
||||
|
||||
@ -1847,7 +1905,7 @@ yy177:
|
||||
yy179: yych = *++YYCURSOR;
|
||||
goto yy188;
|
||||
yy180:
|
||||
#line 762
|
||||
#line 763
|
||||
{ char *pacer;
|
||||
char *tok = YYTOKTMP;
|
||||
int indt_len = 0, nl_count = 0, fold_nl = 0;
|
||||
@ -1917,7 +1975,7 @@ yy180:
|
||||
}
|
||||
yy181: yych = *++YYCURSOR;
|
||||
yy182:
|
||||
#line 831
|
||||
#line 832
|
||||
{ lvl = CURRENT_LEVEL();
|
||||
if ( lvl->status != syck_lvl_block )
|
||||
{
|
||||
@ -1932,14 +1990,14 @@ yy182:
|
||||
}
|
||||
yy183: yych = *++YYCURSOR;
|
||||
yy184:
|
||||
#line 845
|
||||
#line 846
|
||||
{ YYCURSOR--;
|
||||
POP_LEVEL();
|
||||
RETURN_BLOCK();
|
||||
}
|
||||
yy185: yych = *++YYCURSOR;
|
||||
yy186:
|
||||
#line 850
|
||||
#line 851
|
||||
{ QUOTECAT(qstr, qcapa, qidx, *YYTOKTMP);
|
||||
goto ScalarBlock2;
|
||||
}
|
||||
@ -1959,7 +2017,7 @@ yy190: switch(yych){
|
||||
default: goto yy180;
|
||||
}
|
||||
}
|
||||
#line 855
|
||||
#line 856
|
||||
|
||||
}
|
||||
|
||||
@ -1989,7 +2047,7 @@ yy191:
|
||||
}
|
||||
yy193: yych = *++YYCURSOR;
|
||||
yy194:
|
||||
#line 871
|
||||
#line 872
|
||||
{ SyckLevel *lvl = CURRENT_LEVEL();
|
||||
YYCURSOR = tok;
|
||||
return;
|
||||
@ -1998,7 +2056,7 @@ yy195: yych = *++YYCURSOR;
|
||||
goto yy199;
|
||||
yy196: yych = *++YYCURSOR;
|
||||
yy197:
|
||||
#line 876
|
||||
#line 877
|
||||
{ goto Comment;
|
||||
}
|
||||
yy198: ++YYCURSOR;
|
||||
@ -2009,7 +2067,7 @@ yy199: switch(yych){
|
||||
default: goto yy194;
|
||||
}
|
||||
}
|
||||
#line 879
|
||||
#line 880
|
||||
|
||||
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user