1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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 2003-06-05 04:43:05 +00:00
parent 45c7ea552d
commit 017d4ff10a
7 changed files with 326 additions and 193 deletions

View file

@ -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> Tue Jun 3 22:20:49 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_call_super): should search superclass method based on * eval.c (rb_call_super): should search superclass method based on

View file

@ -229,16 +229,16 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */ /* YYFINAL -- State number of the termination state. */
#define YYFINAL 34 #define YYFINAL 34
#define YYLAST 284 #define YYLAST 307
/* YYNTOKENS -- Number of terminals. */ /* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 23 #define YYNTOKENS 23
/* YYNNTS -- Number of nonterminals. */ /* YYNNTS -- Number of nonterminals. */
#define YYNNTS 24 #define YYNNTS 25
/* YYNRULES -- Number of rules. */ /* YYNRULES -- Number of rules. */
#define YYNRULES 58 #define YYNRULES 62
/* YYNRULES -- Number of states. */ /* YYNRULES -- Number of states. */
#define YYNSTATES 99 #define YYNSTATES 104
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2 #define YYUNDEFTOK 2
@ -288,8 +288,9 @@ static const unsigned char yyprhs[] =
22, 26, 28, 29, 31, 34, 36, 38, 40, 43, 22, 26, 28, 29, 31, 34, 36, 38, 40, 43,
46, 49, 52, 54, 56, 58, 61, 63, 65, 67, 46, 49, 52, 54, 56, 58, 61, 63, 65, 67,
69, 71, 75, 78, 80, 84, 87, 91, 94, 96, 69, 71, 75, 78, 80, 84, 87, 91, 94, 96,
100, 103, 107, 110, 112, 116, 120, 126, 130, 132, 100, 103, 107, 110, 112, 116, 120, 124, 128, 131,
138, 140, 144, 148, 151, 155, 159, 162, 164 135, 138, 142, 144, 150, 152, 156, 160, 163, 167,
171, 174, 176
}; };
/* YYRHS -- A `-1'-separated list of the rules' RHS. */ /* 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, -1, 28, 12, -1, 13, -1, 12, -1, 13, -1,
30, 31, -1, 5, 32, -1, 6, 32, -1, 3, 30, 31, -1, 5, 32, -1, 6, 32, -1, 3,
32, -1, 4, -1, 7, -1, 8, -1, 5, 33, 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, -1, 28, 36, 29, -1, 14, 27, -1, 37, -1,
5, 30, 36, -1, 5, 36, -1, 3, 30, 36, 5, 30, 36, -1, 5, 36, -1, 3, 30, 36,
-1, 3, 36, -1, 35, -1, 37, 30, 35, -1, -1, 3, 36, -1, 35, -1, 37, 30, 35, -1,
37, 30, -1, 17, 39, 18, -1, 17, 18, -1, 37, 30, -1, 17, 39, 18, -1, 17, 18, -1,
25, -1, 39, 21, 25, -1, 28, 43, 29, -1, 25, -1, 39, 21, 25, -1, 28, 41, 29, -1,
28, 5, 30, 43, 29, -1, 32, 15, 27, -1, 28, 44, 29, -1, 5, 30, 44, -1, 5, 41,
41, -1, 22, 25, 30, 15, 27, -1, 42, -1, -1, 3, 30, 44, -1, 3, 41, -1, 32, 15,
43, 30, 35, -1, 43, 30, 42, -1, 43, 30, 27, -1, 42, -1, 22, 25, 30, 15, 27, -1,
-1, 25, 15, 27, -1, 19, 46, 20, -1, 19, 43, -1, 44, 30, 35, -1, 44, 30, 43, -1,
20, -1, 44, -1, 46, 21, 44, -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. */ /* 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, 76, 82, 83, 101, 102, 105, 108, 111, 112, 120,
125, 133, 137, 145, 158, 165, 170, 171, 172, 173, 125, 133, 137, 145, 158, 165, 170, 171, 172, 173,
174, 180, 186, 192, 193, 198, 203, 207, 213, 217, 174, 180, 186, 192, 193, 198, 203, 207, 213, 217,
222, 231, 235, 241, 245, 255, 260, 268, 283, 284, 222, 231, 235, 241, 245, 255, 260, 267, 272, 277,
292, 293, 305, 312, 321, 329, 333, 339, 340 281, 287, 302, 303, 311, 312, 324, 331, 340, 348,
352, 358, 359
}; };
#endif #endif
@ -337,9 +340,9 @@ static const char *const yytname[] =
"doc", "atom", "ind_rep", "atom_or_empty", "indent_open", "indent_end", "doc", "atom", "ind_rep", "atom_or_empty", "indent_open", "indent_end",
"indent_sep", "indent_flex_end", "word_rep", "struct_rep", "indent_sep", "indent_flex_end", "word_rep", "struct_rep",
"implicit_seq", "basic_seq", "top_imp_seq", "in_implicit_seq", "implicit_seq", "basic_seq", "top_imp_seq", "in_implicit_seq",
"inline_seq", "in_inline_seq", "implicit_map", "basic_mapping", "inline_seq", "in_inline_seq", "implicit_map", "top_imp_map",
"complex_mapping", "in_implicit_map", "basic_mapping2", "inline_map", "basic_mapping", "complex_mapping", "in_implicit_map", "basic_mapping2",
"in_inline_map", 0 "inline_map", "in_inline_map", 0
}; };
#endif #endif
@ -361,8 +364,9 @@ static const unsigned char yyr1[] =
26, 27, 27, 28, 28, 29, 30, 31, 31, 32, 26, 27, 27, 28, 28, 29, 30, 31, 31, 32,
32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33,
33, 34, 35, 36, 36, 36, 36, 36, 37, 37, 33, 34, 35, 36, 36, 36, 36, 36, 37, 37,
37, 38, 38, 39, 39, 40, 40, 41, 42, 42, 37, 38, 38, 39, 39, 40, 40, 41, 41, 41,
43, 43, 43, 43, 44, 45, 45, 46, 46 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. */ /* 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, 3, 1, 0, 1, 2, 1, 1, 1, 2, 2,
2, 2, 1, 1, 1, 2, 1, 1, 1, 1, 2, 2, 1, 1, 1, 2, 1, 1, 1, 1,
1, 3, 2, 1, 3, 2, 3, 2, 1, 3, 1, 3, 2, 1, 3, 2, 3, 2, 1, 3,
2, 3, 2, 1, 3, 3, 5, 3, 1, 5, 2, 3, 2, 1, 3, 3, 3, 3, 2, 3,
1, 3, 3, 2, 3, 3, 2, 1, 3 2, 3, 1, 5, 1, 3, 3, 2, 3, 3,
2, 1, 3
}; };
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state /* 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, 4, 0, 26, 12, 13, 0, 0, 0, 0, 2,
27, 28, 29, 30, 25, 0, 22, 0, 0, 23, 27, 28, 29, 30, 25, 0, 22, 0, 0, 23,
24, 11, 6, 3, 0, 5, 7, 42, 43, 0, 24, 11, 6, 3, 0, 5, 7, 42, 43, 0,
56, 0, 57, 0, 1, 0, 0, 14, 12, 0, 60, 0, 61, 0, 1, 0, 0, 14, 12, 0,
0, 38, 0, 33, 48, 50, 0, 8, 21, 0, 0, 38, 0, 33, 0, 52, 54, 0, 8, 21,
19, 0, 20, 0, 0, 0, 0, 41, 0, 12, 0, 19, 0, 20, 0, 0, 0, 0, 41, 0,
55, 0, 0, 16, 0, 37, 0, 35, 32, 0, 12, 59, 0, 16, 0, 37, 50, 0, 35, 48,
12, 15, 31, 40, 45, 53, 0, 17, 0, 10, 32, 0, 12, 15, 31, 40, 45, 46, 57, 17,
9, 44, 54, 58, 0, 0, 0, 36, 34, 0, 0, 10, 9, 44, 58, 62, 0, 0, 36, 49,
0, 47, 39, 51, 52, 18, 46, 12, 49 34, 47, 0, 51, 39, 55, 56, 18, 0, 0,
12, 0, 0, 53
}; };
/* YYDEFGOTO[NTERM-NUM]. */ /* YYDEFGOTO[NTERM-NUM]. */
static const yysigned_char yydefgoto[] = static const yysigned_char yydefgoto[] =
{ {
-1, 7, 21, 22, 23, 24, 72, 64, 79, 25, -1, 7, 21, 22, 23, 24, 74, 78, 81, 25,
26, 10, 41, 67, 43, 11, 29, 12, 44, 45, 26, 10, 41, 65, 43, 11, 29, 12, 44, 45,
46, 32, 13, 33 46, 47, 32, 13, 33
}; };
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */ STATE-NUM. */
#define YYPACT_NINF -47 #define YYPACT_NINF -48
static const short yypact[] = static const short yypact[] =
{ {
4, 241, -47, 219, -47, 202, 150, 2, 114, -47, 241, 252, -48, 219, -48, 202, 150, 13, 114, -48,
-47, -47, -47, -47, -47, 219, -47, 236, 276, -47, -48, -48, -48, -48, -48, 219, -48, 236, 299, -48,
-47, -47, -47, -47, 94, -47, -47, -47, -47, 8, -48, -48, -48, -48, 94, -48, -48, -48, -48, 4,
-47, 10, -47, -9, -47, 258, 258, -47, 219, 219, -48, 2, -48, -15, -48, 269, 269, -48, 219, 219,
15, -47, 29, 37, -47, -47, 6, -47, -47, 276, 6, -48, 23, 20, 23, -48, -48, 54, -48, -48,
-47, 276, -47, 168, 185, 23, 35, -47, 219, 219, 299, -48, 299, -48, 168, 185, 75, 38, -48, 219,
-47, 219, 258, -47, 81, -47, 126, -47, -47, 37, 219, -48, 219, -48, 126, -48, -48, 126, -48, -48,
219, -47, -47, 39, -47, 138, 185, -47, 23, -47, -48, 20, 219, -48, -48, 12, -48, -48, 138, -48,
-47, -47, -47, -47, 81, 264, 264, -47, -47, 6, 75, -48, -48, -48, -48, -48, 281, 281, -48, 20,
40, -47, -47, -47, -47, -47, -47, 219, -47 -48, 20, 37, -48, -48, -48, -48, -48, 79, 79,
219, 287, 287, -48
}; };
/* YYPGOTO[NTERM-NUM]. */ /* YYPGOTO[NTERM-NUM]. */
static const yysigned_char yypgoto[] = static const yysigned_char yypgoto[] =
{ {
-47, -47, 32, -7, -31, 3, -45, 18, -46, 16, -48, -48, -2, 19, -37, 7, 21, -16, -47, -6,
5, -47, -32, -8, -47, -47, -47, -47, -47, -15, 14, -48, -33, -8, -48, -48, -48, -48, 41, -48,
-4, 7, -47, -47 -24, 11, 27, -48, -48
}; };
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If /* 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 #define YYTABLE_NINF -1
static const unsigned char yytable[] = static const unsigned char yytable[] =
{ {
42, 74, 34, 8, 8, 9, 14, 68, 47, 1, 42, 70, 40, 28, 31, 61, 62, 8, 8, 49,
80, 60, 61, 2, 3, 4, 42, 55, 63, 71, 82, 51, 53, 34, 9, 14, 42, 60, 57, 64,
8, 5, 14, 6, 40, 59, 57, 65, 82, 58, 67, 72, 58, 84, 8, 59, 38, 75, 68, 49,
70, 48, 95, 50, 52, 63, 77, 28, 31, 91, 51, 14, 63, 97, 48, 93, 73, 71, 64, 67,
56, 92, 71, 93, 96, 65, 47, 63, 77, 63, 80, 80, 94, 56, 49, 95, 51, 68, 49, 51,
70, 48, 50, 38, 66, 97, 87, 8, 88, 14, 63, 79, 100, 72, 96, 92, 88, 83, 40, 90,
94, 73, 89, 0, 75, 48, 98, 50, 83, 48, 31, 40, 8, 103, 80, 76, 63, 73, 77, 14,
50, 69, 66, 78, 78, 0, 88, 65, 50, 8, 98, 99, 40, 48, 0, 89, 66, 69, 91, 68,
84, 14, 40, 0, 85, 0, 86, 90, 0, 0, 49, 51, 101, 0, 102, 98, 99, 63, 79, 85,
81, 40, 50, 31, 84, 38, 78, 53, 16, 54, 88, 90, 0, 38, 68, 66, 69, 54, 16, 55,
18, 19, 20, 2, 84, 4, 37, 75, 38, 0, 18, 19, 20, 2, 0, 4, 37, 0, 38, 0,
0, 5, 0, 6, 0, 0, 39, 35, 16, 36, 0, 5, 0, 6, 0, 0, 39, 35, 16, 36,
18, 19, 20, 0, 0, 0, 37, 0, 38, 35, 18, 19, 20, 0, 0, 0, 37, 0, 38, 86,
16, 62, 18, 19, 20, 0, 39, 0, 0, 0, 16, 87, 18, 19, 20, 0, 39, 0, 0, 0,
38, 49, 16, 51, 18, 19, 20, 0, 39, 0, 38, 50, 16, 52, 18, 19, 20, 0, 39, 0,
0, 0, 38, 15, 16, 17, 18, 19, 20, 2, 0, 0, 38, 15, 16, 17, 18, 19, 20, 2,
39, 4, 0, 0, 0, 0, 0, 5, 0, 6, 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, 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, 0, 0, 5, 0, 6, 15, 16, 17, 18, 19,
20, 2, 0, 4, 0, 0, 0, 0, 0, 5, 20, 2, 0, 4, 0, 0, 0, 0, 0, 5,
27, 6, 15, 16, 17, 18, 19, 20, 2, 0, 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, 16, 17, 18, 19, 20, 2, 1, 4, 0, 0,
2, 0, 4, 5, 0, 6, 0, 0, 5, 0, 2, 3, 4, 5, 0, 6, 0, 1, 5, 0,
6, 35, 16, 62, 18, 19, 20, 85, 0, 86, 6, 2, 0, 4, 0, 0, 0, 0, 0, 5,
63, 0, 38, 0, 0, 0, 63, 0, 38, 49, 0, 6, 35, 16, 36, 18, 19, 20, 0, 0,
16, 51, 18, 19, 20 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[] = static const yysigned_char yycheck[] =
{ {
8, 46, 0, 0, 1, 0, 1, 38, 15, 5, 8, 38, 8, 5, 6, 20, 21, 0, 1, 15,
56, 20, 21, 9, 10, 11, 24, 24, 12, 13, 57, 17, 18, 0, 0, 1, 24, 15, 24, 35,
17, 17, 17, 19, 8, 15, 18, 35, 59, 21, 36, 15, 18, 60, 17, 21, 14, 43, 36, 35,
15, 15, 78, 17, 18, 12, 13, 5, 6, 70, 36, 17, 12, 80, 15, 72, 13, 39, 54, 55,
24, 73, 13, 75, 89, 53, 53, 12, 13, 12, 56, 57, 75, 24, 50, 78, 52, 55, 54, 55,
15, 35, 36, 14, 36, 15, 64, 54, 66, 54, 12, 13, 15, 15, 78, 71, 64, 59, 64, 67,
75, 43, 66, -1, 46, 49, 97, 51, 61, 53, 62, 67, 55, 100, 80, 44, 12, 13, 47, 55,
54, 39, 54, 55, 56, -1, 84, 85, 62, 76, 86, 87, 78, 54, -1, 64, 35, 36, 67, 87,
62, 76, 66, -1, 3, -1, 5, 69, -1, -1, 86, 87, 3, -1, 5, 101, 102, 12, 13, 62,
58, 75, 76, 61, 76, 14, 78, 3, 4, 5, 98, 99, -1, 14, 102, 54, 55, 3, 4, 5,
6, 7, 8, 9, 86, 11, 12, 89, 14, -1, 6, 7, 8, 9, -1, 11, 12, -1, 14, -1,
-1, 17, -1, 19, -1, -1, 22, 3, 4, 5, -1, 17, -1, 19, -1, -1, 22, 3, 4, 5,
6, 7, 8, -1, -1, -1, 12, -1, 14, 3, 6, 7, 8, -1, -1, -1, 12, -1, 14, 3,
4, 5, 6, 7, 8, -1, 22, -1, -1, -1, 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, 18, 19, 3, 4, 5, 6, 7, 8, 9, -1,
11, -1, -1, -1, -1, -1, 17, -1, 19, 3, 11, -1, -1, -1, -1, -1, 17, -1, 19, 3,
4, 5, 6, 7, 8, 9, 5, 11, -1, -1, 4, 5, 6, 7, 8, 9, 5, 11, -1, -1,
9, -1, 11, 17, -1, 19, -1, -1, 17, -1, 9, 10, 11, 17, -1, 19, -1, 5, 17, -1,
19, 3, 4, 5, 6, 7, 8, 3, -1, 5, 19, 9, -1, 11, -1, -1, -1, -1, -1, 17,
12, -1, 14, -1, -1, -1, 12, -1, 14, 3, -1, 19, 3, 4, 5, 6, 7, 8, -1, -1,
4, 5, 6, 7, 8 -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 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@ -502,15 +513,16 @@ static const yysigned_char yycheck[] =
static const unsigned char yystos[] = static const unsigned char yystos[] =
{ {
0, 5, 9, 10, 11, 17, 19, 24, 28, 33, 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, 8, 25, 26, 27, 28, 32, 33, 18, 25, 39,
20, 25, 44, 46, 0, 3, 5, 12, 14, 22, 20, 25, 45, 47, 0, 3, 5, 12, 14, 22,
32, 35, 36, 37, 41, 42, 43, 26, 32, 3, 32, 35, 36, 37, 41, 42, 43, 44, 26, 32,
32, 5, 32, 3, 5, 26, 32, 18, 21, 15, 3, 32, 5, 32, 3, 5, 26, 32, 18, 21,
20, 21, 5, 12, 30, 36, 30, 36, 27, 25, 15, 20, 21, 12, 30, 36, 41, 30, 36, 41,
15, 13, 29, 30, 29, 30, 5, 13, 30, 31, 27, 25, 15, 13, 29, 30, 29, 29, 30, 13,
31, 25, 27, 44, 30, 3, 5, 36, 36, 43, 30, 31, 31, 25, 27, 45, 3, 5, 36, 44,
30, 27, 35, 35, 42, 31, 29, 15, 27 36, 44, 30, 27, 35, 35, 43, 31, 30, 30,
15, 3, 5, 27
}; };
#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
@ -1295,13 +1307,42 @@ yyreduce:
#line 261 "gram.y" #line 261 "gram.y"
{ {
apply_seq_in_map( (SyckParser *)parser, yyvsp[-1].nodeData ); 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; yyval.nodeData = yyvsp[-1].nodeData;
} }
break; break;
case 47: 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( yyval.nodeData = syck_new_map(
syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-2].nodeData ), syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-2].nodeData ),
@ -1309,8 +1350,8 @@ yyreduce:
} }
break; break;
case 49: case 53:
#line 285 "gram.y" #line 304 "gram.y"
{ {
yyval.nodeData = syck_new_map( yyval.nodeData = syck_new_map(
syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-3].nodeData ), syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-3].nodeData ),
@ -1318,8 +1359,8 @@ yyreduce:
} }
break; break;
case 51: case 55:
#line 294 "gram.y" #line 313 "gram.y"
{ {
if ( yyvsp[-2].nodeData->shortcut == NULL ) if ( yyvsp[-2].nodeData->shortcut == NULL )
{ {
@ -1333,8 +1374,8 @@ yyreduce:
} }
break; break;
case 52: case 56:
#line 306 "gram.y" #line 325 "gram.y"
{ {
apply_seq_in_map( (SyckParser *)parser, yyvsp[-2].nodeData ); apply_seq_in_map( (SyckParser *)parser, yyvsp[-2].nodeData );
syck_map_update( yyvsp[-2].nodeData, yyvsp[0].nodeData ); syck_map_update( yyvsp[-2].nodeData, yyvsp[0].nodeData );
@ -1343,15 +1384,15 @@ yyreduce:
} }
break; break;
case 53: case 57:
#line 313 "gram.y" #line 332 "gram.y"
{ {
yyval.nodeData = yyvsp[-1].nodeData; yyval.nodeData = yyvsp[-1].nodeData;
} }
break; break;
case 54: case 58:
#line 322 "gram.y" #line 341 "gram.y"
{ {
yyval.nodeData = syck_new_map( yyval.nodeData = syck_new_map(
syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-2].nodeData ), syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-2].nodeData ),
@ -1359,22 +1400,22 @@ yyreduce:
} }
break; break;
case 55: case 59:
#line 330 "gram.y" #line 349 "gram.y"
{ {
yyval.nodeData = yyvsp[-1].nodeData; yyval.nodeData = yyvsp[-1].nodeData;
} }
break; break;
case 56: case 60:
#line 334 "gram.y" #line 353 "gram.y"
{ {
yyval.nodeData = syck_alloc_map(); yyval.nodeData = syck_alloc_map();
} }
break; break;
case 58: case 62:
#line 341 "gram.y" #line 360 "gram.y"
{ {
syck_map_update( yyvsp[-2].nodeData, yyvsp[0].nodeData ); syck_map_update( yyvsp[-2].nodeData, yyvsp[0].nodeData );
syck_free_node( yyvsp[0].nodeData ); syck_free_node( yyvsp[0].nodeData );
@ -1386,7 +1427,7 @@ yyreduce:
} }
/* Line 1016 of /usr/local/share/bison/yacc.c. */ /* Line 1016 of /usr/local/share/bison/yacc.c. */
#line 1390 "y.tab.c" #line 1431 "y.tab.c"
yyvsp -= yylen; yyvsp -= yylen;
yyssp -= yylen; yyssp -= yylen;
@ -1605,7 +1646,7 @@ yyreturn:
} }
#line 348 "gram.y" #line 367 "gram.y"
void void

View file

@ -31,6 +31,10 @@ SyckNode *
syck_hdlr_add_anchor( SyckParser *p, char *a, SyckNode *n ) syck_hdlr_add_anchor( SyckParser *p, char *a, SyckNode *n )
{ {
n->anchor = a; n->anchor = a;
if ( p->anchors == NULL )
{
p->anchors = st_init_strtable();
}
st_insert( p->anchors, (st_data_t)a, (st_data_t)n ); st_insert( p->anchors, (st_data_t)a, (st_data_t)n );
return n; return n;
} }
@ -40,9 +44,12 @@ syck_hdlr_add_alias( SyckParser *p, char *a )
{ {
SyckNode *n; 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;
}
} }
// //

View file

@ -192,7 +192,6 @@ syck_map_update( SyckNode *map1, SyckNode *map2 )
S_REALLOC_N( m1->keys, SYMID, m1->capa ); S_REALLOC_N( m1->keys, SYMID, m1->capa );
S_REALLOC_N( m1->values, 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++ ) for ( new_idx = 0; new_idx < m2->idx; m1->idx++, new_idx++ )
{ {
m1->keys[m1->idx] = m2->keys[new_idx]; m1->keys[m1->idx] = m2->keys[new_idx];

View file

@ -438,6 +438,14 @@ rb_syck_ensure(parser)
return 0; 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 * YAML::Syck::Parser.new
*/ */
@ -451,7 +459,7 @@ syck_parser_new(argc, argv, class)
SyckParser *parser = syck_new_parser(); SyckParser *parser = syck_new_parser();
rb_scan_args(argc, argv, "01", &options); 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 ); syck_parser_set_root_on_error( parser, Qnil );

View file

@ -169,7 +169,7 @@ syck_new_parser()
p->io_type = syck_io_str; p->io_type = syck_io_str;
p->io.str = NULL; p->io.str = NULL;
p->syms = NULL; p->syms = NULL;
p->anchors = st_init_strtable(); p->anchors = NULL;
p->implicit_typing = 1; p->implicit_typing = 1;
p->taguri_expansion = 0; p->taguri_expansion = 0;
p->bufsize = SYCK_BUFFERSIZE; p->bufsize = SYCK_BUFFERSIZE;
@ -207,28 +207,38 @@ syck_st_free_nodes( char *key, SyckNode *n, char *arg )
} }
void void
syck_free_parser( SyckParser *p ) syck_st_free( SyckParser *p )
{ {
char *key;
SyckNode *node;
// //
// Free the adhoc symbol table // Free the adhoc symbol table
// //
if ( p->syms != NULL ) if ( p->syms != NULL )
{ {
st_free_table( p->syms ); st_free_table( p->syms );
p->syms = NULL;
} }
// //
// Free the anchor table // Free the anchor table
// //
st_foreach( p->anchors, syck_st_free_nodes, 0 ); if ( p->anchors != NULL )
st_free_table( p->anchors ); {
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 ); syck_parser_reset_levels( p );
S_FREE( p->levels[0].domain ); S_FREE( p->levels[0].domain );
S_FREE( p->levels ); S_FREE( p->levels );
@ -467,6 +477,7 @@ syck_parse( SyckParser *p )
ASSERT( p != NULL ); ASSERT( p != NULL );
syck_st_free( p );
syck_parser_reset_levels( p ); syck_parser_reset_levels( p );
yyparse( p ); yyparse( p );
return p->root; return p->root;

View file

@ -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" #line 1 "token.re"
/* /*
* token.re * token.re
@ -226,7 +226,7 @@ yylex( YYSTYPE *yylval, SyckParser *parser )
return t; return t;
} }
#line 243 #line 244
if ( YYLINEPTR != YYCURSOR ) if ( YYLINEPTR != YYCURSOR )
@ -260,19 +260,19 @@ yy2: yyaccept = 0;
default: goto yy3; default: goto yy3;
} }
yy3: yy3:
#line 284 #line 285
{ YYPOS(0); { YYPOS(0);
goto Document; goto Document;
} }
yy4: yych = *++YYCURSOR; yy4: yych = *++YYCURSOR;
yy5: yy5:
#line 270 #line 271
{ eat_comments( parser ); { eat_comments( parser );
goto Header; goto Header;
} }
yy6: yych = *++YYCURSOR; yy6: yych = *++YYCURSOR;
yy7: yy7:
#line 274 #line 275
{ SyckLevel *lvl = CURRENT_LEVEL(); { SyckLevel *lvl = CURRENT_LEVEL();
ENSURE_IEND(lvl, -1); ENSURE_IEND(lvl, -1);
return 0; return 0;
@ -280,7 +280,7 @@ yy7:
yy8: yych = *++YYCURSOR; yy8: yych = *++YYCURSOR;
goto yy12; goto yy12;
yy9: yy9:
#line 279 #line 280
{ int indt_len; { int indt_len;
GOBBLE_UP_INDENT( indt_len, YYTOKEN ); GOBBLE_UP_INDENT( indt_len, YYTOKEN );
goto Header; goto Header;
@ -325,7 +325,7 @@ yy19: switch(yych){
default: goto yy20; default: goto yy20;
} }
yy20: yy20:
#line 256 #line 257
{ SyckLevel *lvl = CURRENT_LEVEL(); { SyckLevel *lvl = CURRENT_LEVEL();
if ( lvl->status == syck_lvl_header ) if ( lvl->status == syck_lvl_header )
{ {
@ -347,7 +347,7 @@ yy22: switch(yych){
default: goto yy20; default: goto yy20;
} }
} }
#line 288 #line 289
Document: Document:
@ -388,7 +388,7 @@ yy23:
yy25: yych = *++YYCURSOR; yy25: yych = *++YYCURSOR;
goto yy77; goto yy77;
yy26: yy26:
#line 302 #line 303
{ // Isolate spaces { // Isolate spaces
int indt_len; int indt_len;
GOBBLE_UP_INDENT( indt_len, YYTOKEN ); GOBBLE_UP_INDENT( indt_len, YYTOKEN );
@ -405,7 +405,7 @@ yy26:
} }
yy27: yych = *++YYCURSOR; yy27: yych = *++YYCURSOR;
yy28: yy28:
#line 317 #line 318
{ ENSURE_IOPEN(lvl, 0, 1); { ENSURE_IOPEN(lvl, 0, 1);
lvl = CURRENT_LEVEL(); lvl = CURRENT_LEVEL();
ADD_LEVEL(lvl->spaces + 1, syck_lvl_inline); ADD_LEVEL(lvl->spaces + 1, syck_lvl_inline);
@ -413,7 +413,7 @@ yy28:
} }
yy29: yych = *++YYCURSOR; yy29: yych = *++YYCURSOR;
yy30: yy30:
#line 323 #line 324
{ POP_LEVEL(); { POP_LEVEL();
return YYTOKEN[0]; return YYTOKEN[0];
} }
@ -424,7 +424,7 @@ yy31: yych = *++YYCURSOR;
default: goto yy32; default: goto yy32;
} }
yy32: yy32:
#line 381 #line 382
{ ENSURE_IOPEN(lvl, 0, 1); { ENSURE_IOPEN(lvl, 0, 1);
goto Plain; goto Plain;
} }
@ -564,17 +564,17 @@ yy35: yych = *++YYCURSOR;
} }
yy36: yych = *++YYCURSOR; yy36: yych = *++YYCURSOR;
yy37: yy37:
#line 355 #line 356
{ ENSURE_IOPEN(lvl, 0, 1); { ENSURE_IOPEN(lvl, 0, 1);
goto TransferMethod; } goto TransferMethod; }
yy38: yych = *++YYCURSOR; yy38: yych = *++YYCURSOR;
yy39: yy39:
#line 358 #line 359
{ ENSURE_IOPEN(lvl, 0, 1); { ENSURE_IOPEN(lvl, 0, 1);
goto SingleQuote; } goto SingleQuote; }
yy40: yych = *++YYCURSOR; yy40: yych = *++YYCURSOR;
yy41: yy41:
#line 361 #line 362
{ ENSURE_IOPEN(lvl, 0, 1); { ENSURE_IOPEN(lvl, 0, 1);
goto DoubleQuote; } goto DoubleQuote; }
yy42: yyaccept = 0; yy42: yyaccept = 0;
@ -596,18 +596,18 @@ yy42: yyaccept = 0;
} }
yy43: yych = *++YYCURSOR; yy43: yych = *++YYCURSOR;
yy44: yy44:
#line 371 #line 372
{ eat_comments( parser ); { eat_comments( parser );
goto Document; goto Document;
} }
yy45: yych = *++YYCURSOR; yy45: yych = *++YYCURSOR;
goto yy51; goto yy51;
yy46: yy46:
#line 375 #line 376
{ goto Document; } { goto Document; }
yy47: yych = *++YYCURSOR; yy47: yych = *++YYCURSOR;
yy48: yy48:
#line 377 #line 378
{ ENSURE_IEND(lvl, -1); { ENSURE_IEND(lvl, -1);
return 0; return 0;
} }
@ -650,7 +650,7 @@ yy56: switch(yych){
default: goto yy57; default: goto yy57;
} }
yy57: yy57:
#line 364 #line 365
{ if ( *( YYCURSOR - 1 ) == '\n' ) { if ( *( YYCURSOR - 1 ) == '\n' )
{ {
YYCURSOR--; YYCURSOR--;
@ -731,7 +731,7 @@ yy61: switch(yych){
default: goto yy62; default: goto yy62;
} }
yy62: yy62:
#line 350 #line 351
{ ENSURE_IOPEN(lvl, 0, 1); { ENSURE_IOPEN(lvl, 0, 1);
yylval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 ); yylval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 );
return ALIAS; return ALIAS;
@ -803,7 +803,7 @@ yy64: switch(yych){
default: goto yy65; default: goto yy65;
} }
yy65: yy65:
#line 345 #line 346
{ ENSURE_IOPEN(lvl, 0, 1); { ENSURE_IOPEN(lvl, 0, 1);
yylval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 ); yylval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 );
return ANCHOR; return ANCHOR;
@ -816,7 +816,7 @@ yy67: switch(yych){
default: goto yy68; default: goto yy68;
} }
yy68: yy68:
#line 331 #line 332
{ ENSURE_IOPEN(lvl, YYTOKEN - YYLINEPTR, 1); { ENSURE_IOPEN(lvl, YYTOKEN - YYLINEPTR, 1);
FORCE_NEXT_TOKEN(IOPEN); FORCE_NEXT_TOKEN(IOPEN);
if ( *YYCURSOR == '\n' || *( YYCURSOR - 1 ) == '\n' ) if ( *YYCURSOR == '\n' || *( YYCURSOR - 1 ) == '\n' )
@ -845,7 +845,7 @@ yy72: switch(yych){
default: goto yy73; default: goto yy73;
} }
yy73: yy73:
#line 327 #line 328
{ YYPOS(1); { YYPOS(1);
return YYTOKEN[0]; return YYTOKEN[0];
} }
@ -872,7 +872,7 @@ yy79: switch(yych){
default: goto yy26; default: goto yy26;
} }
} }
#line 385 #line 386
} }
@ -901,7 +901,9 @@ yy82: YYCURSOR = YYMARKER;
yy83: yyaccept = 0; yy83: yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR); yych = *(YYMARKER = ++YYCURSOR);
switch(yych){ switch(yych){
case '-': case '0': case '.':
case '/':
case '0':
case '1': case '1':
case '2': case '2':
case '3': case '3':
@ -910,7 +912,15 @@ yy83: yyaccept = 0;
case '6': case '6':
case '7': case '7':
case '8': case '8':
case '9': case 'A': case '9':
case ':':
case ';':
case '<':
case '=':
case '>':
case '?':
case '@':
case 'A':
case 'B': case 'B':
case 'C': case 'C':
case 'D': case 'D':
@ -935,7 +945,12 @@ yy83: yyaccept = 0;
case 'W': case 'W':
case 'X': case 'X':
case 'Y': case 'Y':
case 'Z': case '_': case 'a': case 'Z':
case '[':
case '\\':
case ']':
case '^':
case '_': case 'a':
case 'b': case 'b':
case 'c': case 'c':
case 'd': case 'd':
@ -964,14 +979,14 @@ yy83: yyaccept = 0;
default: goto yy84; default: goto yy84;
} }
yy84: yy84:
#line 398 #line 399
{ YYCURSOR = YYTOKTMP; { YYCURSOR = YYTOKTMP;
return DOCSEP; return DOCSEP;
} }
yy85: yych = *++YYCURSOR; yy85: yych = *++YYCURSOR;
goto yy89; goto yy89;
yy86: yy86:
#line 396 #line 397
{ goto Directive; } { goto Directive; }
yy87: yych = *++YYCURSOR; yy87: yych = *++YYCURSOR;
goto yy84; goto yy84;
@ -986,7 +1001,9 @@ yy90: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1); if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR; yych = *YYCURSOR;
yy91: switch(yych){ yy91: switch(yych){
case '-': case '0': case '.':
case '/':
case '0':
case '1': case '1':
case '2': case '2':
case '3': case '3':
@ -995,7 +1012,13 @@ yy91: switch(yych){
case '6': case '6':
case '7': case '7':
case '8': case '8':
case '9': case 'A': case '9': case ';':
case '<':
case '=':
case '>':
case '?':
case '@':
case 'A':
case 'B': case 'B':
case 'C': case 'C':
case 'D': case 'D':
@ -1020,7 +1043,12 @@ yy91: switch(yych){
case 'W': case 'W':
case 'X': case 'X':
case 'Y': case 'Y':
case 'Z': case '_': case 'a': case 'Z':
case '[':
case '\\':
case ']':
case '^':
case '_': case 'a':
case 'b': case 'b':
case 'c': case 'c':
case 'd': case 'd':
@ -1051,7 +1079,9 @@ yy91: switch(yych){
} }
yy92: yych = *++YYCURSOR; yy92: yych = *++YYCURSOR;
switch(yych){ switch(yych){
case '-': case '0': case '.':
case '/':
case '0':
case '1': case '1':
case '2': case '2':
case '3': case '3':
@ -1060,7 +1090,15 @@ yy92: yych = *++YYCURSOR;
case '6': case '6':
case '7': case '7':
case '8': case '8':
case '9': case 'A': case '9':
case ':':
case ';':
case '<':
case '=':
case '>':
case '?':
case '@':
case 'A':
case 'B': case 'B':
case 'C': case 'C':
case 'D': case 'D':
@ -1085,7 +1123,12 @@ yy92: yych = *++YYCURSOR;
case 'W': case 'W':
case 'X': case 'X':
case 'Y': case 'Y':
case 'Z': case '_': case 'a': case 'Z':
case '[':
case '\\':
case ']':
case '^':
case '_': case 'a':
case 'b': case 'b':
case 'c': case 'c':
case 'd': case 'd':
@ -1117,7 +1160,9 @@ yy93: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1); if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR; yych = *YYCURSOR;
yy94: switch(yych){ yy94: switch(yych){
case '-': case '0': case '.':
case '/':
case '0':
case '1': case '1':
case '2': case '2':
case '3': case '3':
@ -1126,7 +1171,15 @@ yy94: switch(yych){
case '6': case '6':
case '7': case '7':
case '8': case '8':
case '9': case 'A': case '9':
case ':':
case ';':
case '<':
case '=':
case '>':
case '?':
case '@':
case 'A':
case 'B': case 'B':
case 'C': case 'C':
case 'D': case 'D':
@ -1151,7 +1204,12 @@ yy94: switch(yych){
case 'W': case 'W':
case 'X': case 'X':
case 'Y': case 'Y':
case 'Z': case '_': case 'a': case 'Z':
case '[':
case '\\':
case ']':
case '^':
case '_': case 'a':
case 'b': case 'b':
case 'c': case 'c':
case 'd': case 'd':
@ -1180,10 +1238,10 @@ yy94: switch(yych){
default: goto yy95; default: goto yy95;
} }
yy95: yy95:
#line 394 #line 395
{ goto Directive; } { goto Directive; }
} }
#line 401 #line 402
} }
@ -1225,7 +1283,7 @@ yy96:
yy98: yych = *++YYCURSOR; yy98: yych = *++YYCURSOR;
goto yy122; goto yy122;
yy99: yy99:
#line 424 #line 425
{ int indt_len, nl_count = 0; { int indt_len, nl_count = 0;
SyckLevel *lvl; SyckLevel *lvl;
char *tok = YYTOKTMP; char *tok = YYTOKTMP;
@ -1264,13 +1322,13 @@ yy100: yych = *++YYCURSOR;
default: goto yy101; default: goto yy101;
} }
yy101: yy101:
#line 475 #line 476
{ QUOTECATS(qstr, qcapa, qidx, YYTOKTMP, YYCURSOR - YYTOKTMP); { QUOTECATS(qstr, qcapa, qidx, YYTOKTMP, YYCURSOR - YYTOKTMP);
goto Plain2; goto Plain2;
} }
yy102: yych = *++YYCURSOR; yy102: yych = *++YYCURSOR;
yy103: yy103:
#line 458 #line 459
{ if ( plvl->status != syck_lvl_inline ) { if ( plvl->status != syck_lvl_inline )
{ {
YYCURSOR--; YYCURSOR--;
@ -1291,17 +1349,17 @@ yy105: yych = *++YYCURSOR;
default: goto yy106; default: goto yy106;
} }
yy106: yy106:
#line 473 #line 474
{ goto Plain3; } { goto Plain3; }
yy107: yych = *++YYCURSOR; yy107: yych = *++YYCURSOR;
yy108: yy108:
#line 471 #line 472
{ RETURN_IMPLICIT(); } { RETURN_IMPLICIT(); }
yy109: yych = *++YYCURSOR; yy109: yych = *++YYCURSOR;
goto yy101; goto yy101;
yy110: yych = *++YYCURSOR; yy110: yych = *++YYCURSOR;
yy111: yy111:
#line 467 #line 468
{ eat_comments( parser ); { eat_comments( parser );
RETURN_IMPLICIT(); RETURN_IMPLICIT();
} }
@ -1327,7 +1385,7 @@ yy117: switch(yych){
default: goto yy118; default: goto yy118;
} }
yy118: yy118:
#line 456 #line 457
{ RETURN_IMPLICIT(); } { RETURN_IMPLICIT(); }
yy119: ++YYCURSOR; yy119: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1); if(YYLIMIT == YYCURSOR) YYFILL(1);
@ -1352,7 +1410,7 @@ yy124: switch(yych){
default: goto yy99; default: goto yy99;
} }
} }
#line 479 #line 480
} }
@ -1382,7 +1440,7 @@ yy125:
yy127: yych = *++YYCURSOR; yy127: yych = *++YYCURSOR;
goto yy137; goto yy137;
yy128: yy128:
#line 493 #line 494
{ int indt_len; { int indt_len;
int nl_count = 0; int nl_count = 0;
SyckLevel *lvl; SyckLevel *lvl;
@ -1424,7 +1482,7 @@ yy129: yych = *++YYCURSOR;
default: goto yy130; default: goto yy130;
} }
yy130: yy130:
#line 533 #line 534
{ SyckLevel *lvl; { SyckLevel *lvl;
SyckNode *n = syck_alloc_str(); SyckNode *n = syck_alloc_str();
lvl = CURRENT_LEVEL(); lvl = CURRENT_LEVEL();
@ -1442,13 +1500,13 @@ yy131: yych = *++YYCURSOR;
goto yy130; goto yy130;
yy132: yych = *++YYCURSOR; yy132: yych = *++YYCURSOR;
yy133: yy133:
#line 547 #line 548
{ QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); { QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1));
goto SingleQuote2; goto SingleQuote2;
} }
yy134: yych = *++YYCURSOR; yy134: yych = *++YYCURSOR;
yy135: yy135:
#line 529 #line 530
{ QUOTECAT(qstr, qcapa, qidx, '\''); { QUOTECAT(qstr, qcapa, qidx, '\'');
goto SingleQuote2; goto SingleQuote2;
} }
@ -1468,7 +1526,7 @@ yy139: switch(yych){
default: goto yy128; default: goto yy128;
} }
} }
#line 551 #line 552
} }
@ -1503,7 +1561,7 @@ yy140:
yy142: yych = *++YYCURSOR; yy142: yych = *++YYCURSOR;
goto yy162; goto yy162;
yy143: yy143:
#line 569 #line 570
{ int indt_len; { int indt_len;
int nl_count = 0; int nl_count = 0;
SyckLevel *lvl; SyckLevel *lvl;
@ -1555,13 +1613,13 @@ yy144: yyaccept = 0;
default: goto yy145; default: goto yy145;
} }
yy145: yy145:
#line 653 #line 654
{ QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); { QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1));
goto DoubleQuote2; goto DoubleQuote2;
} }
yy146: yych = *++YYCURSOR; yy146: yych = *++YYCURSOR;
yy147: yy147:
#line 639 #line 640
{ SyckLevel *lvl; { SyckLevel *lvl;
SyckNode *n = syck_alloc_str(); SyckNode *n = syck_alloc_str();
lvl = CURRENT_LEVEL(); lvl = CURRENT_LEVEL();
@ -1593,7 +1651,7 @@ yy152: YYCURSOR = YYMARKER;
} }
yy153: yych = *++YYCURSOR; yy153: yych = *++YYCURSOR;
yy154: yy154:
#line 634 #line 635
{ keep_nl = 0; { keep_nl = 0;
YYCURSOR--; YYCURSOR--;
goto DoubleQuote2; goto DoubleQuote2;
@ -1624,7 +1682,7 @@ yy155: yych = *++YYCURSOR;
} }
yy156: yych = *++YYCURSOR; yy156: yych = *++YYCURSOR;
yy157: yy157:
#line 609 #line 610
{ char ch = *( YYCURSOR - 1 ); { char ch = *( YYCURSOR - 1 );
switch ( ch ) switch ( ch )
{ {
@ -1666,7 +1724,7 @@ yy158: yych = *++YYCURSOR;
} }
yy159: yych = *++YYCURSOR; yy159: yych = *++YYCURSOR;
yy160: yy160:
#line 625 #line 626
{ long ch; { long ch;
char *chr_text = syck_strndup( YYTOKTMP, 4 ); char *chr_text = syck_strndup( YYTOKTMP, 4 );
chr_text[0] = '0'; chr_text[0] = '0';
@ -1691,7 +1749,7 @@ yy164: switch(yych){
default: goto yy143; default: goto yy143;
} }
} }
#line 657 #line 658
} }
@ -1716,7 +1774,7 @@ yy165:
yy167:yy168: yych = *++YYCURSOR; yy167:yy168: yych = *++YYCURSOR;
goto yy176; goto yy176;
yy169: yy169:
#line 666 #line 667
{ SyckLevel *lvl; { SyckLevel *lvl;
YYCURSOR = YYTOKTMP; YYCURSOR = YYTOKTMP;
if ( YYCURSOR == YYTOKEN + 1 ) if ( YYCURSOR == YYTOKEN + 1 )
@ -1766,7 +1824,7 @@ yy170: yych = *++YYCURSOR;
goto yy174; goto yy174;
yy171: yych = *++YYCURSOR; yy171: yych = *++YYCURSOR;
yy172: yy172:
#line 712 #line 713
{ goto TransferMethod; } { goto TransferMethod; }
yy173: ++YYCURSOR; yy173: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1); if(YYLIMIT == YYCURSOR) YYFILL(1);
@ -1783,7 +1841,7 @@ yy176: switch(yych){
default: goto yy169; default: goto yy169;
} }
} }
#line 714 #line 715
} }
@ -1847,7 +1905,7 @@ yy177:
yy179: yych = *++YYCURSOR; yy179: yych = *++YYCURSOR;
goto yy188; goto yy188;
yy180: yy180:
#line 762 #line 763
{ char *pacer; { char *pacer;
char *tok = YYTOKTMP; char *tok = YYTOKTMP;
int indt_len = 0, nl_count = 0, fold_nl = 0; int indt_len = 0, nl_count = 0, fold_nl = 0;
@ -1917,7 +1975,7 @@ yy180:
} }
yy181: yych = *++YYCURSOR; yy181: yych = *++YYCURSOR;
yy182: yy182:
#line 831 #line 832
{ lvl = CURRENT_LEVEL(); { lvl = CURRENT_LEVEL();
if ( lvl->status != syck_lvl_block ) if ( lvl->status != syck_lvl_block )
{ {
@ -1932,14 +1990,14 @@ yy182:
} }
yy183: yych = *++YYCURSOR; yy183: yych = *++YYCURSOR;
yy184: yy184:
#line 845 #line 846
{ YYCURSOR--; { YYCURSOR--;
POP_LEVEL(); POP_LEVEL();
RETURN_BLOCK(); RETURN_BLOCK();
} }
yy185: yych = *++YYCURSOR; yy185: yych = *++YYCURSOR;
yy186: yy186:
#line 850 #line 851
{ QUOTECAT(qstr, qcapa, qidx, *YYTOKTMP); { QUOTECAT(qstr, qcapa, qidx, *YYTOKTMP);
goto ScalarBlock2; goto ScalarBlock2;
} }
@ -1959,7 +2017,7 @@ yy190: switch(yych){
default: goto yy180; default: goto yy180;
} }
} }
#line 855 #line 856
} }
@ -1989,7 +2047,7 @@ yy191:
} }
yy193: yych = *++YYCURSOR; yy193: yych = *++YYCURSOR;
yy194: yy194:
#line 871 #line 872
{ SyckLevel *lvl = CURRENT_LEVEL(); { SyckLevel *lvl = CURRENT_LEVEL();
YYCURSOR = tok; YYCURSOR = tok;
return; return;
@ -1998,7 +2056,7 @@ yy195: yych = *++YYCURSOR;
goto yy199; goto yy199;
yy196: yych = *++YYCURSOR; yy196: yych = *++YYCURSOR;
yy197: yy197:
#line 876 #line 877
{ goto Comment; { goto Comment;
} }
yy198: ++YYCURSOR; yy198: ++YYCURSOR;
@ -2009,7 +2067,7 @@ yy199: switch(yych){
default: goto yy194; default: goto yy194;
} }
} }
#line 879 #line 880
} }