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

* lib/gram.c: fixes to one-line documents and end of stream documents.

Browse source 
* lib/syck.c, lib/syck.h: add root_on_error to parser struct, specifying
  the symbol to be returned on a parse error.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
why 2003-05-15 21:46:47 +00:00
parent d8bd0ea32e
commit c601cf5318
6 changed files with 197 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Thu May 15 21:55:54 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
* lib/gram.c: fixes to one-line documents and end of stream documents.
* lib/syck.c, lib/syck.h: add root_on_error to parser struct, specifying
the symbol to be returned on a parse error.
Thu May 15 18:44:31 2003 Tanaka Akira <akr@m17n.org> Thu May 15 18:44:31 2003 Tanaka Akira <akr@m17n.org>
* lib/open-uri.rb (OpenURI::Redirect#initialize): call super to * lib/open-uri.rb (OpenURI::Redirect#initialize): call super to

332
ext/syck/gram.c
View file

@ -229,16 +229,16 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */ /* YYFINAL -- State number of the termination state. */
#define YYFINAL 32 #define YYFINAL 32
#define YYLAST 197 #define YYLAST 198
/* YYNTOKENS -- Number of terminals. */ /* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 23 #define YYNTOKENS 23
/* YYNNTS -- Number of nonterminals. */ /* YYNNTS -- Number of nonterminals. */
#define YYNNTS 21 #define YYNNTS 22
/* YYNRULES -- Number of rules. */ /* YYNRULES -- Number of rules. */
#define YYNRULES 49 #define YYNRULES 51
/* YYNRULES -- Number of states. */ /* YYNRULES -- Number of states. */
#define YYNSTATES 81 #define YYNSTATES 84
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2 #define YYUNDEFTOK 2
@ -285,40 +285,42 @@ static const unsigned char yytranslate[] =
static const unsigned char yyprhs[] = static const unsigned char yyprhs[] =
{ {
0, 0, 3, 5, 8, 9, 11, 13, 16, 18, 0, 0, 3, 5, 8, 9, 11, 13, 16, 18,
22, 24, 25, 27, 30, 32, 34, 37, 40, 42, 22, 24, 25, 27, 30, 32, 34, 36, 39, 42,
44, 47, 49, 51, 53, 55, 57, 61, 67, 70, 45, 47, 49, 52, 54, 56, 58, 60, 62, 66,
72, 76, 79, 83, 86, 88, 92, 96, 102, 106, 72, 75, 77, 81, 84, 88, 91, 93, 97, 101,
108, 114, 116, 120, 124, 127, 131, 135, 138, 140 107, 111, 113, 119, 121, 125, 129, 132, 136, 140,
143, 145
}; };
/* YYRHS -- A `-1'-separated list of the rules' RHS. */ /* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yysigned_char yyrhs[] = static const yysigned_char yyrhs[] =
{ {
24, 0, -1, 31, -1, 10, 25, -1, -1, 30, 24, 0, -1, 32, -1, 10, 25, -1, -1, 31,
-1, 31, -1, 3, 25, -1, 4, -1, 27, 25, -1, 32, -1, 3, 25, -1, 4, -1, 27, 25,
28, -1, 25, -1, -1, 11, -1, 27, 12, -1, 30, -1, 25, -1, -1, 11, -1, 27, 12, -1,
13, -1, 12, -1, 5, 30, -1, 6, 30, -1, 13, -1, 12, -1, 13, -1, 29, 30, -1, 5,
7, -1, 8, -1, 5, 31, -1, 9, -1, 32, 31, -1, 6, 31, -1, 7, -1, 8, -1, 5,
-1, 35, -1, 37, -1, 42, -1, 27, 34, 28, 32, -1, 9, -1, 33, -1, 36, -1, 38, -1,
-1, 27, 5, 29, 34, 28, -1, 14, 26, -1, 43, -1, 27, 35, 28, -1, 27, 5, 29, 35,
33, -1, 34, 29, 33, -1, 34, 29, -1, 17, 28, -1, 14, 26, -1, 34, -1, 35, 29, 34,
36, 18, -1, 17, 18, -1, 25, -1, 36, 21, -1, 35, 29, -1, 17, 37, 18, -1, 17, 18,
25, -1, 27, 40, 28, -1, 27, 5, 29, 40, -1, 25, -1, 37, 21, 25, -1, 27, 41, 28,
28, -1, 30, 15, 26, -1, 38, -1, 22, 25, -1, 27, 5, 29, 41, 28, -1, 31, 15, 26,
29, 15, 26, -1, 39, -1, 40, 29, 33, -1, -1, 39, -1, 22, 25, 29, 15, 26, -1, 40,
40, 29, 39, -1, 40, 29, -1, 25, 15, 26, -1, 41, 29, 34, -1, 41, 29, 40, -1, 41,
-1, 19, 43, 20, -1, 19, 20, -1, 41, -1, 29, -1, 25, 15, 26, -1, 19, 44, 20, -1,
43, 21, 41, -1 19, 20, -1, 42, -1, 44, 21, 42, -1
}; };
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ /* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const unsigned short yyrline[] = static const unsigned short yyrline[] =
{ {
0, 44, 44, 48, 52, 58, 59, 60, 69, 77, 0, 44, 44, 48, 52, 58, 59, 60, 69, 77,
83, 84, 102, 103, 106, 109, 117, 122, 130, 143, 83, 84, 102, 103, 106, 109, 112, 113, 121, 126,
150, 155, 156, 157, 158, 159, 165, 169, 176, 182, 134, 147, 154, 159, 160, 161, 162, 163, 169, 173,
186, 191, 200, 204, 210, 214, 224, 229, 237, 252, 180, 186, 190, 195, 204, 208, 214, 218, 228, 233,
253, 261, 262, 274, 281, 291, 299, 303, 309, 310 241, 256, 257, 265, 266, 278, 285, 295, 303, 307,
313, 314
}; };
#endif #endif
@ -331,10 +333,10 @@ static const char *const yytname[] =
"WORD", "PLAIN", "BLOCK", "DOCSEP", "IOPEN", "INDENT", "IEND", "'-'", "WORD", "PLAIN", "BLOCK", "DOCSEP", "IOPEN", "INDENT", "IEND", "'-'",
"':'", "'+'", "'['", "']'", "'{'", "'}'", "','", "'?'", "$accept", "':'", "'+'", "'['", "']'", "'{'", "'}'", "','", "'?'", "$accept",
"doc", "atom", "atom_or_empty", "indent_open", "indent_end", "doc", "atom", "atom_or_empty", "indent_open", "indent_end",
"indent_sep", "word_rep", "struct_rep", "implicit_seq", "basic_seq", "indent_sep", "indent_flex_end", "word_rep", "struct_rep",
"in_implicit_seq", "inline_seq", "in_inline_seq", "implicit_map", "implicit_seq", "basic_seq", "in_implicit_seq", "inline_seq",
"basic_mapping", "complex_mapping", "in_implicit_map", "basic_mapping2", "in_inline_seq", "implicit_map", "basic_mapping", "complex_mapping",
"inline_map", "in_inline_map", 0 "in_implicit_map", "basic_mapping2", "inline_map", "in_inline_map", 0
}; };
#endif #endif
@ -353,20 +355,22 @@ static const unsigned short yytoknum[] =
static const unsigned char yyr1[] = static const unsigned char yyr1[] =
{ {
0, 23, 24, 24, 24, 25, 25, 25, 25, 25, 0, 23, 24, 24, 24, 25, 25, 25, 25, 25,
26, 26, 27, 27, 28, 29, 30, 30, 30, 30, 26, 26, 27, 27, 28, 29, 30, 30, 31, 31,
31, 31, 31, 31, 31, 31, 32, 32, 33, 34, 31, 31, 32, 32, 32, 32, 32, 32, 33, 33,
34, 34, 35, 35, 36, 36, 37, 37, 38, 39, 34, 35, 35, 35, 36, 36, 37, 37, 38, 38,
39, 40, 40, 40, 40, 41, 42, 42, 43, 43 39, 40, 40, 41, 41, 41, 41, 42, 43, 43,
44, 44
}; };
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
static const unsigned char yyr2[] = static const unsigned char yyr2[] =
{ {
0, 2, 1, 2, 0, 1, 1, 2, 1, 3, 0, 2, 1, 2, 0, 1, 1, 2, 1, 3,
1, 0, 1, 2, 1, 1, 2, 2, 1, 1, 1, 0, 1, 2, 1, 1, 1, 2, 2, 2,
2, 1, 1, 1, 1, 1, 3, 5, 2, 1, 1, 1, 2, 1, 1, 1, 1, 1, 3, 5,
3, 2, 3, 2, 1, 3, 3, 5, 3, 1, 2, 1, 3, 2, 3, 2, 1, 3, 3, 5,
5, 1, 3, 3, 2, 3, 3, 2, 1, 3 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
@ -374,47 +378,47 @@ static const unsigned char yyr2[] =
means the default is an error. */ means the default is an error. */
static const unsigned char yydefact[] = static const unsigned char yydefact[] =
{ {
4, 0, 21, 0, 12, 0, 0, 0, 0, 2, 4, 0, 23, 0, 12, 0, 0, 0, 0, 2,
22, 23, 24, 25, 20, 0, 8, 0, 0, 18, 24, 25, 26, 27, 22, 0, 8, 0, 0, 20,
19, 3, 0, 5, 6, 33, 34, 0, 47, 0, 21, 3, 0, 5, 6, 35, 36, 0, 49, 0,
48, 0, 1, 0, 13, 11, 0, 0, 29, 0, 50, 0, 1, 0, 13, 11, 0, 0, 31, 0,
39, 41, 0, 7, 16, 0, 17, 0, 0, 5, 41, 43, 0, 7, 18, 0, 19, 0, 0, 5,
32, 0, 11, 46, 0, 15, 0, 10, 28, 0, 34, 0, 11, 48, 0, 15, 0, 10, 30, 0,
11, 14, 26, 31, 36, 44, 9, 35, 45, 49, 11, 14, 28, 33, 38, 46, 16, 0, 9, 37,
0, 0, 0, 38, 30, 42, 43, 27, 37, 11, 47, 51, 0, 0, 0, 40, 32, 44, 45, 17,
40 29, 39, 11, 42
}; };
/* YYDEFGOTO[NTERM-NUM]. */ /* YYDEFGOTO[NTERM-NUM]. */
static const yysigned_char yydefgoto[] = static const yysigned_char yydefgoto[] =
{ {
-1, 7, 57, 58, 22, 62, 56, 23, 24, 10, -1, 7, 57, 58, 22, 62, 56, 68, 23, 24,
38, 39, 11, 27, 12, 40, 41, 42, 30, 13, 10, 38, 39, 11, 27, 12, 40, 41, 42, 30,
31 13, 31
}; };
/* 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 -41 #define YYPACT_NINF -47
static const short yypact[] = static const short yypact[] =
{ {
166, 177, -41, 131, -41, 114, 76, 5, 92, -41, 168, 179, -47, 133, -47, 116, 78, 5, 94, -47,
-41, -41, -41, -41, -41, 131, -41, 161, 83, -41, -47, -47, -47, -47, -47, 133, -47, 163, 85, -47,
-41, -41, 56, -41, -41, -41, -41, 1, -41, 2, -47, -47, 58, -47, -47, -47, -47, -3, -47, 9,
-41, 12, -41, 185, -41, 131, 131, 25, -41, 14, -47, 1, -47, 35, -47, 133, 133, 12, -47, 18,
-41, -41, 14, -41, -41, 83, -41, 146, 8, 25, -47, -47, 18, -47, -47, 85, -47, 148, 32, 12,
-41, 131, 131, -41, 131, -41, 102, -41, -41, 17, -47, 133, 133, -47, 133, -47, 104, -47, -47, 24,
131, -41, -41, 27, -41, 102, -41, -41, -41, -41, 133, -47, -47, 36, -47, 104, -47, 32, -47, -47,
14, 14, 29, -41, -41, -41, -41, -41, -41, 131, -47, -47, 18, 18, 40, -47, -47, -47, -47, -47,
-41 -47, -47, 133, -47
}; };
/* YYPGOTO[NTERM-NUM]. */ /* YYPGOTO[NTERM-NUM]. */
static const yysigned_char yypgoto[] = static const yysigned_char yypgoto[] =
{ {
-41, -41, -2, -36, 6, -40, -24, -8, 11, -41, -47, -47, -2, -44, 6, -40, -13, -16, -8, 11,
-27, -14, -41, -41, -41, -41, -20, -6, -3, -41, -47, -46, 0, -47, -47, -47, -47, 3, 15, 19,
-41 -47, -47
}; };
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@ -424,65 +428,65 @@ static const yysigned_char yypgoto[] =
#define YYTABLE_NINF -1 #define YYTABLE_NINF -1
static const unsigned char yytable[] = static const unsigned char yytable[] =
{ {
37, 21, 64, 26, 29, 32, 8, 8, 66, 44, 37, 21, 64, 26, 29, 32, 8, 8, 70, 44,
46, 9, 14, 43, 49, 63, 68, 52, 65, 50, 46, 9, 14, 43, 49, 50, 75, 76, 51, 77,
48, 61, 51, 8, 73, 44, 55, 61, 14, 55, 48, 53, 54, 8, 52, 44, 63, 60, 14, 65,
77, 78, 53, 54, 59, 72, 74, 44, 75, 44, 55, 61, 80, 81, 59, 67, 55, 44, 83, 44,
60, 35, 70, 80, 79, 76, 63, 65, 37, 67, 45, 18, 19, 20, 55, 66, 74, 55, 37, 69,
71, 69, 29, 8, 0, 0, 0, 37, 14, 15, 35, 79, 29, 8, 67, 82, 72, 37, 14, 63,
16, 47, 18, 19, 20, 2, 0, 4, 34, 0, 65, 15, 16, 47, 18, 19, 20, 2, 78, 4,
35, 0, 0, 5, 0, 6, 0, 0, 36, 15, 34, 73, 35, 71, 0, 5, 0, 6, 0, 0,
16, 17, 18, 19, 20, 2, 0, 4, 45, 18, 36, 15, 16, 17, 18, 19, 20, 2, 0, 4,
19, 20, 0, 5, 0, 6, 28, 33, 18, 19, 45, 18, 19, 20, 0, 5, 0, 6, 28, 33,
20, 0, 0, 0, 34, 0, 35, 45, 18, 19, 18, 19, 20, 0, 0, 0, 34, 0, 35, 45,
20, 0, 0, 0, 36, 0, 35, 15, 16, 17, 18, 19, 20, 0, 0, 0, 36, 0, 35, 15,
18, 19, 20, 2, 36, 4, 0, 0, 0, 0, 16, 17, 18, 19, 20, 2, 36, 4, 0, 0,
0, 5, 25, 6, 15, 16, 17, 18, 19, 20, 0, 0, 0, 5, 25, 6, 15, 16, 17, 18,
2, 0, 4, 0, 0, 0, 0, 0, 5, 0, 19, 20, 2, 0, 4, 0, 0, 0, 0, 0,
6, 17, 18, 19, 20, 2, 0, 4, 55, 0, 5, 0, 6, 17, 18, 19, 20, 2, 0, 4,
0, 0, 0, 5, 0, 6, 17, 18, 19, 20, 55, 0, 0, 0, 0, 5, 0, 6, 17, 18,
2, 1, 4, 0, 0, 2, 3, 4, 5, 0, 19, 20, 2, 1, 4, 0, 0, 2, 3, 4,
6, 0, 1, 5, 0, 6, 2, 0, 4, 0, 5, 0, 6, 0, 1, 5, 0, 6, 2, 0,
45, 18, 19, 20, 5, 0, 6, 55 4, 0, 0, 0, 0, 0, 5, 0, 6
}; };
static const yysigned_char yycheck[] = static const yysigned_char yycheck[] =
{ {
8, 3, 42, 5, 6, 0, 0, 1, 48, 17, 8, 3, 42, 5, 6, 0, 0, 1, 52, 17,
18, 0, 1, 15, 22, 39, 52, 15, 42, 18, 18, 0, 1, 15, 22, 18, 60, 63, 21, 65,
22, 13, 21, 17, 60, 33, 12, 13, 17, 12, 22, 20, 21, 17, 15, 33, 39, 15, 17, 42,
70, 71, 20, 21, 36, 59, 63, 45, 65, 47, 12, 13, 72, 73, 36, 48, 12, 45, 82, 47,
15, 14, 56, 79, 15, 65, 70, 71, 56, 51, 5, 6, 7, 8, 12, 13, 59, 12, 56, 51,
56, 54, 54, 47, -1, -1, -1, 65, 47, 3, 14, 67, 54, 47, 67, 15, 56, 65, 47, 72,
4, 5, 6, 7, 8, 9, -1, 11, 12, -1, 73, 3, 4, 5, 6, 7, 8, 9, 65, 11,
14, -1, -1, 17, -1, 19, -1, -1, 22, 3, 12, 56, 14, 54, -1, 17, -1, 19, -1, -1,
4, 5, 6, 7, 8, 9, -1, 11, 5, 6, 22, 3, 4, 5, 6, 7, 8, 9, -1, 11,
7, 8, -1, 17, -1, 19, 20, 5, 6, 7, 5, 6, 7, 8, -1, 17, -1, 19, 20, 5,
8, -1, -1, -1, 12, -1, 14, 5, 6, 7, 6, 7, 8, -1, -1, -1, 12, -1, 14, 5,
8, -1, -1, -1, 22, -1, 14, 3, 4, 5, 6, 7, 8, -1, -1, -1, 22, -1, 14, 3,
6, 7, 8, 9, 22, 11, -1, -1, -1, -1, 4, 5, 6, 7, 8, 9, 22, 11, -1, -1,
-1, 17, 18, 19, 3, 4, 5, 6, 7, 8, -1, -1, -1, 17, 18, 19, 3, 4, 5, 6,
9, -1, 11, -1, -1, -1, -1, -1, 17, -1, 7, 8, 9, -1, 11, -1, -1, -1, -1, -1,
19, 5, 6, 7, 8, 9, -1, 11, 12, -1, 17, -1, 19, 5, 6, 7, 8, 9, -1, 11,
-1, -1, -1, 17, -1, 19, 5, 6, 7, 8, 12, -1, -1, -1, -1, 17, -1, 19, 5, 6,
9, 5, 11, -1, -1, 9, 10, 11, 17, -1, 7, 8, 9, 5, 11, -1, -1, 9, 10, 11,
19, -1, 5, 17, -1, 19, 9, -1, 11, -1, 17, -1, 19, -1, 5, 17, -1, 19, 9, -1,
5, 6, 7, 8, 17, -1, 19, 12 11, -1, -1, -1, -1, -1, 17, -1, 19
}; };
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */ symbol of state STATE-NUM. */
static const unsigned char yystos[] = static const unsigned char yystos[] =
{ {
0, 5, 9, 10, 11, 17, 19, 24, 27, 31, 0, 5, 9, 10, 11, 17, 19, 24, 27, 32,
32, 35, 37, 42, 31, 3, 4, 5, 6, 7, 33, 36, 38, 43, 32, 3, 4, 5, 6, 7,
8, 25, 27, 30, 31, 18, 25, 36, 20, 25, 8, 25, 27, 31, 32, 18, 25, 37, 20, 25,
41, 43, 0, 5, 12, 14, 22, 30, 33, 34, 42, 44, 0, 5, 12, 14, 22, 31, 34, 35,
38, 39, 40, 25, 30, 5, 30, 5, 25, 30, 39, 40, 41, 25, 31, 5, 31, 5, 25, 31,
18, 21, 15, 20, 21, 12, 29, 25, 26, 25, 18, 21, 15, 20, 21, 12, 29, 25, 26, 25,
15, 13, 28, 29, 28, 29, 28, 25, 26, 41, 15, 13, 28, 29, 28, 29, 13, 29, 30, 25,
34, 40, 29, 26, 33, 33, 39, 28, 28, 15, 26, 42, 35, 41, 29, 26, 34, 34, 40, 30,
26 28, 28, 15, 26
}; };
#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
@ -1103,16 +1107,16 @@ yyreduce:
} }
break; break;
case 16: case 18:
#line 118 "gram.y" #line 122 "gram.y"
{ {
syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion ); syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
yyval.nodeData = yyvsp[0].nodeData; yyval.nodeData = yyvsp[0].nodeData;
} }
break; break;
case 17: case 19:
#line 123 "gram.y" #line 127 "gram.y"
{ {
if ( ((SyckParser *)parser)->implicit_typing == 1 ) if ( ((SyckParser *)parser)->implicit_typing == 1 )
{ {
@ -1122,8 +1126,8 @@ yyreduce:
} }
break; break;
case 18: case 20:
#line 131 "gram.y" #line 135 "gram.y"
{ {
SyckNode *n = yyvsp[0].nodeData; SyckNode *n = yyvsp[0].nodeData;
if ( ((SyckParser *)parser)->taguri_expansion == 1 ) if ( ((SyckParser *)parser)->taguri_expansion == 1 )
@ -1138,97 +1142,97 @@ yyreduce:
} }
break; break;
case 20: case 22:
#line 151 "gram.y" #line 155 "gram.y"
{ {
syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion ); syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
yyval.nodeData = yyvsp[0].nodeData; yyval.nodeData = yyvsp[0].nodeData;
} }
break; break;
case 26: case 28:
#line 166 "gram.y" #line 170 "gram.y"
{ {
yyval.nodeData = yyvsp[-1].nodeData; yyval.nodeData = yyvsp[-1].nodeData;
} }
break; break;
case 27: case 29:
#line 170 "gram.y" #line 174 "gram.y"
{ {
syck_add_transfer( yyvsp[-3].name, yyvsp[-1].nodeData, ((SyckParser *)parser)->taguri_expansion ); 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 28: case 30:
#line 177 "gram.y" #line 181 "gram.y"
{ {
yyval.nodeId = syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ); yyval.nodeId = syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData );
} }
break; break;
case 29: case 31:
#line 183 "gram.y" #line 187 "gram.y"
{ {
yyval.nodeData = syck_new_seq( yyvsp[0].nodeId ); yyval.nodeData = syck_new_seq( yyvsp[0].nodeId );
} }
break; break;
case 30: case 32:
#line 187 "gram.y" #line 191 "gram.y"
{ {
syck_seq_add( yyvsp[-2].nodeData, yyvsp[0].nodeId ); syck_seq_add( yyvsp[-2].nodeData, yyvsp[0].nodeId );
yyval.nodeData = yyvsp[-2].nodeData; yyval.nodeData = yyvsp[-2].nodeData;
} }
break; break;
case 31: case 33:
#line 192 "gram.y" #line 196 "gram.y"
{ {
yyval.nodeData = yyvsp[-1].nodeData; yyval.nodeData = yyvsp[-1].nodeData;
} }
break; break;
case 32: case 34:
#line 201 "gram.y" #line 205 "gram.y"
{ {
yyval.nodeData = yyvsp[-1].nodeData; yyval.nodeData = yyvsp[-1].nodeData;
} }
break; break;
case 33: case 35:
#line 205 "gram.y" #line 209 "gram.y"
{ {
yyval.nodeData = syck_alloc_seq(); yyval.nodeData = syck_alloc_seq();
} }
break; break;
case 34: case 36:
#line 211 "gram.y" #line 215 "gram.y"
{ {
yyval.nodeData = syck_new_seq( syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) ); yyval.nodeData = syck_new_seq( syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) );
} }
break; break;
case 35: case 37:
#line 215 "gram.y" #line 219 "gram.y"
{ {
syck_seq_add( yyvsp[-2].nodeData, syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) ); syck_seq_add( yyvsp[-2].nodeData, syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) );
yyval.nodeData = yyvsp[-2].nodeData; yyval.nodeData = yyvsp[-2].nodeData;
} }
break; break;
case 36: case 38:
#line 225 "gram.y" #line 229 "gram.y"
{ {
apply_seq_in_map( (SyckParser *)parser, yyvsp[-1].nodeData ); apply_seq_in_map( (SyckParser *)parser, yyvsp[-1].nodeData );
yyval.nodeData = yyvsp[-1].nodeData; yyval.nodeData = yyvsp[-1].nodeData;
} }
break; break;
case 37: case 39:
#line 230 "gram.y" #line 234 "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 ); syck_add_transfer( yyvsp[-3].name, yyvsp[-1].nodeData, ((SyckParser *)parser)->taguri_expansion );
@ -1236,8 +1240,8 @@ yyreduce:
} }
break; break;
case 38: case 40:
#line 238 "gram.y" #line 242 "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 ),
@ -1245,8 +1249,8 @@ yyreduce:
} }
break; break;
case 40: case 42:
#line 254 "gram.y" #line 258 "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 ),
@ -1254,8 +1258,8 @@ yyreduce:
} }
break; break;
case 42: case 44:
#line 263 "gram.y" #line 267 "gram.y"
{ {
if ( yyvsp[-2].nodeData->shortcut == NULL ) if ( yyvsp[-2].nodeData->shortcut == NULL )
{ {
@ -1269,8 +1273,8 @@ yyreduce:
} }
break; break;
case 43: case 45:
#line 275 "gram.y" #line 279 "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 );
@ -1279,16 +1283,16 @@ yyreduce:
} }
break; break;
case 44: case 46:
#line 282 "gram.y" #line 286 "gram.y"
{ {
apply_seq_in_map( (SyckParser *)parser, yyvsp[-1].nodeData ); apply_seq_in_map( (SyckParser *)parser, yyvsp[-1].nodeData );
yyval.nodeData = yyvsp[-1].nodeData; yyval.nodeData = yyvsp[-1].nodeData;
} }
break; break;
case 45: case 47:
#line 292 "gram.y" #line 296 "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 ),
@ -1296,22 +1300,22 @@ yyreduce:
} }
break; break;
case 46: case 48:
#line 300 "gram.y" #line 304 "gram.y"
{ {
yyval.nodeData = yyvsp[-1].nodeData; yyval.nodeData = yyvsp[-1].nodeData;
} }
break; break;
case 47: case 49:
#line 304 "gram.y" #line 308 "gram.y"
{ {
yyval.nodeData = syck_alloc_map(); yyval.nodeData = syck_alloc_map();
} }
break; break;
case 49: case 51:
#line 311 "gram.y" #line 315 "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 );
@ -1323,7 +1327,7 @@ yyreduce:
} }
/* Line 1016 of /usr/local/share/bison/yacc.c. */ /* Line 1016 of /usr/local/share/bison/yacc.c. */
#line 1327 "y.tab.c" #line 1331 "y.tab.c"
yyvsp -= yylen; yyvsp -= yylen;
yyssp -= yylen; yyssp -= yylen;
@ -1542,7 +1546,7 @@ yyreturn:
} }
#line 318 "gram.y" #line 322 "gram.y"
void void

2
ext/syck/rubyext.c
View file

@ -446,6 +446,8 @@ syck_parser_new(argc, argv, class)
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, 0, syck_free_parser, parser );
syck_parser_set_root_on_error( parser, Qnil );
if ( ! rb_obj_is_instance_of( options, rb_cHash ) ) if ( ! rb_obj_is_instance_of( options, rb_cHash ) )
{ {
options = rb_hash_new(); options = rb_hash_new();

12
ext/syck/syck.c
View file

@ -120,8 +120,8 @@ syck_parser_reset_levels( SyckParser *p )
p->lvl_idx = 1; p->lvl_idx = 1;
p->levels[0].spaces = -1; p->levels[0].spaces = -1;
p->levels[0].domain = syck_strndup( "", 0 ); p->levels[0].domain = syck_strndup( "", 0 );
p->levels[0].status = syck_lvl_header;
} }
p->levels[0].status = syck_lvl_header;
} }
void void
@ -130,6 +130,7 @@ syck_parser_reset_cursor( SyckParser *p )
if ( p->buffer == NULL ) if ( p->buffer == NULL )
{ {
p->buffer = S_ALLOC_N( char, p->bufsize ); p->buffer = S_ALLOC_N( char, p->bufsize );
S_MEMZERO( p->buffer, char, p->bufsize );
} }
p->buffer[0] = '\0'; p->buffer[0] = '\0';
@ -140,12 +141,20 @@ syck_parser_reset_cursor( SyckParser *p )
p->marker = NULL; p->marker = NULL;
p->limit = NULL; p->limit = NULL;
p->root = 0;
p->root_on_error = 0;
p->linect = 0; p->linect = 0;
p->eof = 0; p->eof = 0;
p->last_token = 0; p->last_token = 0;
p->force_token = 0; p->force_token = 0;
} }
void
syck_parser_set_root_on_error( SyckParser *p, SYMID roer )
{
p->root_on_error = roer;
}
/* /*
* Allocate the parser * Allocate the parser
*/ */
@ -455,7 +464,6 @@ syck_parse( SyckParser *p )
ASSERT( p != NULL ); ASSERT( p != NULL );
p->root = 0;
syck_parser_reset_levels( p ); syck_parser_reset_levels( p );
yyparse( p ); yyparse( p );
return p->root; return p->root;

10
ext/syck/syck.h
View file

@ -10,7 +10,7 @@
#ifndef SYCK_H #ifndef SYCK_H
#define SYCK_H #define SYCK_H
#define SYCK_VERSION "0.28" #define SYCK_VERSION "0.29"
#define YAML_DOMAIN "yaml.org,2002" #define YAML_DOMAIN "yaml.org,2002"
#include <stdio.h> #include <stdio.h>
@ -112,6 +112,7 @@ struct _syck_node {
long len; long len;
} *str; } *str;
} data; } data;
// Shortcut node
void *shortcut; void *shortcut;
}; };
@ -142,7 +143,7 @@ enum syck_level_status {
struct _syck_parser { struct _syck_parser {
// Root node // Root node
SYMID root; SYMID root, root_on_error;
// Implicit typing flag // Implicit typing flag
int implicit_typing, taguri_expansion; int implicit_typing, taguri_expansion;
// Scripting language function to handle nodes // Scripting language function to handle nodes
@ -213,6 +214,7 @@ long syck_io_file_read( char *, SyckIoFile *, long, long );
long syck_io_str_read( char *, SyckIoStr *, long, long ); long syck_io_str_read( char *, SyckIoStr *, long, long );
SyckParser *syck_new_parser(); SyckParser *syck_new_parser();
void syck_free_parser( SyckParser * ); void syck_free_parser( SyckParser * );
void syck_parser_set_root_on_error( SyckParser *, SYMID );
void syck_parser_implicit_typing( SyckParser *, int ); void syck_parser_implicit_typing( SyckParser *, int );
void syck_parser_taguri_expansion( SyckParser *, int ); void syck_parser_taguri_expansion( SyckParser *, int );
void syck_parser_handler( SyckParser *, SyckNodeHandler ); void syck_parser_handler( SyckParser *, SyckNodeHandler );
@ -222,6 +224,7 @@ void syck_parser_str( SyckParser *, char *, long, SyckIoStrRead );
void syck_parser_str_auto( SyckParser *, char *, SyckIoStrRead ); void syck_parser_str_auto( SyckParser *, char *, SyckIoStrRead );
SyckLevel *syck_parser_current_level( SyckParser * ); SyckLevel *syck_parser_current_level( SyckParser * );
void syck_parser_add_level( SyckParser *, int, enum syck_level_status ); void syck_parser_add_level( SyckParser *, int, enum syck_level_status );
void syck_parser_pop_level( SyckParser * );
void free_any_io( SyckParser * ); void free_any_io( SyckParser * );
long syck_parser_read( SyckParser * ); long syck_parser_read( SyckParser * );
long syck_parser_readlen( SyckParser *, long ); long syck_parser_readlen( SyckParser *, long );
@ -244,13 +247,14 @@ char *syck_str_read( SyckNode * );
SyckNode *syck_new_map( SYMID, SYMID ); SyckNode *syck_new_map( SYMID, SYMID );
void syck_map_add( SyckNode *, SYMID, SYMID ); void syck_map_add( SyckNode *, SYMID, SYMID );
SYMID syck_map_read( SyckNode *, enum map_part, long ); SYMID syck_map_read( SyckNode *, enum map_part, long );
long syck_map_count( SyckNode * );
void syck_map_assign( SyckNode *, enum map_part, long, SYMID ); void syck_map_assign( SyckNode *, enum map_part, long, SYMID );
long syck_map_count( SyckNode * );
void syck_map_update( SyckNode *, SyckNode * ); void syck_map_update( SyckNode *, SyckNode * );
SyckNode *syck_new_seq( SYMID ); SyckNode *syck_new_seq( SYMID );
void syck_seq_add( SyckNode *, SYMID ); void syck_seq_add( SyckNode *, SYMID );
SYMID syck_seq_read( SyckNode *, long ); SYMID syck_seq_read( SyckNode *, long );
long syck_seq_count( SyckNode * ); long syck_seq_count( SyckNode * );
void apply_seq_in_map( SyckParser *, SyckNode * ); void apply_seq_in_map( SyckParser *, SyckNode * );
#if defined(__cplusplus) #if defined(__cplusplus)

6
ext/syck/token.c
View file

@ -1,4 +1,4 @@
/* Generated by re2c 0.5 on Tue May 13 14:03:13 2003 */ /* Generated by re2c 0.5 on Thu May 15 15:42:01 2003 */
#line 1 "token.re" #line 1 "token.re"
/* /*
* token.re * token.re
@ -134,7 +134,7 @@
if ( *YYCURSOR == '\0' ) \ if ( *YYCURSOR == '\0' ) \
{ \ { \
ict = -1; \ ict = -1; \
start = YYCURSOR; \ start = YYCURSOR - 1; \
} \ } \
else if ( *YYLINEPTR == ' ' ) \ else if ( *YYLINEPTR == ' ' ) \
{ \ { \
@ -1637,7 +1637,7 @@ yyerror( char *msg )
if ( syck_parser_ptr->error_handler == NULL ) if ( syck_parser_ptr->error_handler == NULL )
syck_parser_ptr->error_handler = syck_default_error_handler; syck_parser_ptr->error_handler = syck_default_error_handler;
syck_parser_ptr->root = 0; syck_parser_ptr->root = syck_parser_ptr->root_on_error;
(syck_parser_ptr->error_handler)(syck_parser_ptr, msg); (syck_parser_ptr->error_handler)(syck_parser_ptr, msg);
} }