From: Graham B. <gb...@us...> - 2003-05-07 15:13:31
|
Update of /cvsroot/perl-ldap/asn/lib/Convert/ASN1 In directory sc8-pr-cvs1:/tmp/cvs-serv22740/lib/Convert/ASN1 Modified Files: parser.pm Log Message: Support OPTIONAL on SET OF and SEQUENCE OF Index: parser.pm =================================================================== RCS file: /cvsroot/perl-ldap/asn/lib/Convert/ASN1/parser.pm,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- parser.pm 6 May 2003 21:29:07 -0000 1.11 +++ parser.pm 7 May 2003 15:13:28 -0000 1.12 @@ -99,14 +99,14 @@ my @yylhs = ( -1, 0, 0, 2, 2, 3, 3, 6, 6, 6, 6, 8, 13, 13, 12, 14, 14, 14, 9, 9, 9, - 10, 17, 17, 17, 17, 17, 18, 18, 11, 15, - 15, 19, 19, 19, 20, 1, 1, 21, 21, 21, - 23, 23, 23, 23, 22, 22, 22, 24, 24, 4, - 4, 5, 5, 5, 16, 16, 25, 7, 7, + 10, 18, 18, 18, 18, 18, 19, 19, 11, 16, + 16, 20, 20, 20, 21, 1, 1, 22, 22, 22, + 24, 24, 24, 24, 23, 23, 23, 15, 15, 4, + 4, 5, 5, 5, 17, 17, 25, 7, 7, ); my @yylen = ( 2, 1, 1, 3, 4, 4, 1, 1, 1, 1, 1, - 3, 1, 1, 5, 1, 1, 1, 4, 4, 4, + 3, 1, 1, 6, 1, 1, 1, 4, 4, 4, 4, 1, 1, 1, 2, 1, 0, 3, 1, 1, 2, 1, 3, 3, 4, 1, 2, 1, 3, 3, 2, 1, 1, 1, 4, 1, 3, 0, 1, 0, @@ -122,85 +122,87 @@ 0, 0, 0, 0, 0, 32, 59, 5, 0, 0, 0, 55, 0, 18, 19, 0, 20, 0, 0, 28, 57, 21, 0, 0, 0, 34, 33, 56, 0, 0, - 17, 15, 16, 14, 35, + 17, 15, 16, 0, 35, 14, ); my @yydgoto = ( 4, 5, 6, 20, 7, 17, 50, 68, 8, 51, 52, - 53, 54, 43, 94, 64, 71, 44, 56, 65, 66, - 9, 10, 45, 59, 72, + 53, 54, 43, 94, 59, 64, 71, 44, 56, 65, + 66, 9, 10, 45, 72, ); my @yysindex = ( 7, - 9, 0, 12, 0, 0, 19, 99, 0, 59, 0, - 73, 99, 31, -1, 0, 0, 88, 57, 57, 0, - 99, 0, 95, 0, 73, 26, 34, 62, 0, 50, - 0, 0, 95, 0, 26, 34, 64, 66, 0, 0, - 86, 0, 106, 0, 0, 0, 57, 57, 101, 102, - 0, 0, 0, 0, 94, 0, 135, 0, 0, 50, - 120, 131, 50, 138, 61, 0, 0, 0, 149, 137, - 98, 0, 99, 0, 0, 99, 0, 101, 101, 0, - 0, 0, 135, 100, 95, 0, 0, 0, 26, 34, - 0, 0, 0, 0, 0, + 9, 0, 12, 0, 0, 19, 51, 0, 34, 0, + 75, 51, 31, -1, 0, 0, 90, 55, 55, 0, + 51, 0, 114, 0, 75, 26, 53, 61, 0, 77, + 0, 0, 114, 0, 26, 53, 64, 76, 0, 0, + 89, 0, 96, 0, 0, 0, 55, 55, 111, 103, + 0, 0, 0, 0, 94, 0, 130, 0, 0, 77, + 122, 128, 77, 139, 78, 0, 0, 0, 154, 143, + 33, 0, 51, 0, 0, 51, 0, 111, 111, 0, + 0, 0, 130, 119, 114, 0, 0, 0, 26, 53, + 0, 0, 0, 89, 0, 0, ); -my @yyrindex = ( 130, - 81, 0, 0, 0, 0, 151, 136, 0, 39, 0, - 81, 114, 0, 0, 0, 0, 0, 130, 121, 0, - 114, 0, 0, 0, 81, 0, 0, 0, 0, 81, +my @yyrindex = ( 149, + 100, 0, 0, 0, 0, 159, 106, 0, 39, 0, + 100, 133, 0, 0, 0, 0, 0, 149, 140, 0, + 133, 0, 0, 0, 100, 0, 0, 0, 0, 100, 0, 0, 0, 0, 16, 29, 42, 69, 0, 0, - 37, 0, 0, 0, 0, 0, 130, 130, 0, 122, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 81, - 0, 0, 81, 0, 142, 0, 0, 0, 0, 0, - 0, 0, 114, 0, 0, 114, 0, 0, 143, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 3, 45, - 0, 0, 0, 0, 0, + 37, 0, 0, 0, 0, 0, 149, 149, 0, 125, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 100, + 0, 0, 100, 0, 150, 0, 0, 0, 0, 0, + 0, 0, 133, 0, 0, 133, 0, 0, 151, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 73, 88, + 0, 0, 0, 3, 0, 0, ); my @yygindex = ( 0, - 96, 0, 132, 1, -11, 70, 0, 8, -17, -18, - -16, 133, 0, 0, 0, 0, 0, 0, 0, 67, - 0, 129, 0, 0, 75, + 28, 0, 135, 1, -11, 79, 0, 8, -17, -18, + -16, 142, 0, 0, 72, 0, 0, 0, 0, 0, + 50, 0, 123, 0, 80, ); -sub constYYTABLESIZE () { 158 } +sub constYYTABLESIZE () { 166 } my @yytable = ( 29, - 23, 12, 23, 23, 40, 39, 41, 1, 2, 33, - 2, 21, 25, 23, 23, 23, 23, 13, 22, 14, - 23, 12, 11, 3, 23, 21, 23, 23, 24, 24, + 23, 12, 48, 48, 40, 39, 41, 1, 2, 33, + 2, 21, 25, 48, 48, 23, 23, 13, 22, 14, + 48, 12, 11, 3, 23, 21, 23, 23, 24, 24, 12, 24, 22, 23, 13, 47, 48, 24, 36, 24, - 24, 27, 27, 48, 24, 24, 24, 48, 48, 36, - 27, 2, 27, 27, 48, 24, 24, 30, 2, 27, - 73, 84, 24, 76, 85, 92, 91, 93, 26, 26, - 18, 49, 78, 3, 2, 57, 19, 26, 79, 26, - 26, 50, 55, 50, 50, 50, 26, 50, 50, 3, - 26, 27, 28, 50, 58, 34, 50, 35, 36, 28, - 34, 63, 89, 90, 28, 15, 16, 37, 82, 83, - 38, 60, 37, 69, 52, 38, 52, 52, 52, 67, - 37, 58, 58, 50, 50, 50, 52, 50, 50, 52, - 74, 37, 50, 50, 50, 70, 50, 50, 52, 52, - 52, 75, 61, 62, 86, 87, 31, 32, 77, 80, - 2, 81, 30, 31, 95, 42, 46, 88, + 24, 27, 27, 82, 83, 18, 24, 48, 48, 36, + 27, 19, 27, 27, 48, 30, 2, 15, 16, 27, + 73, 84, 48, 76, 85, 92, 91, 93, 26, 26, + 49, 3, 23, 23, 61, 62, 2, 26, 2, 26, + 26, 23, 55, 23, 23, 57, 26, 24, 24, 78, + 23, 3, 26, 27, 28, 79, 24, 58, 24, 24, + 50, 60, 50, 50, 50, 24, 50, 50, 52, 52, + 52, 63, 50, 69, 34, 50, 35, 36, 28, 34, + 67, 89, 90, 28, 58, 58, 37, 86, 87, 38, + 70, 37, 74, 52, 38, 52, 52, 52, 75, 37, + 31, 32, 50, 50, 50, 52, 50, 50, 52, 77, + 37, 50, 50, 50, 80, 50, 50, 81, 2, 46, + 30, 31, 88, 95, 42, 96, ); my @yycheck = ( 17, 12, 1, 0, 1, 23, 23, 23, 1, 2, 21, 2, 11, 14, 11, 12, 0, 1, 6, 11, 1, 18, 6, 14, 17, 9, 25, 11, 12, 0, 1, 30, 1, 25, 18, 6, 10, 0, 9, 0, 11, - 12, 0, 1, 10, 0, 1, 18, 11, 12, 11, - 9, 2, 11, 12, 18, 11, 12, 1, 2, 18, - 60, 73, 18, 63, 76, 84, 84, 84, 0, 1, - 12, 10, 12, 17, 2, 10, 18, 9, 18, 11, - 12, 1, 19, 3, 4, 5, 18, 7, 8, 17, - 3, 4, 5, 13, 9, 1, 16, 3, 4, 5, - 1, 1, 3, 4, 5, 7, 8, 13, 11, 12, - 16, 6, 13, 20, 1, 16, 3, 4, 5, 18, - 0, 0, 1, 3, 4, 5, 13, 7, 8, 16, - 11, 11, 3, 4, 5, 1, 7, 8, 3, 4, - 5, 11, 47, 48, 78, 79, 18, 19, 11, 1, - 0, 15, 11, 11, 85, 23, 25, 83, + 12, 0, 1, 11, 12, 12, 18, 11, 12, 11, + 9, 18, 11, 12, 18, 1, 2, 7, 8, 18, + 60, 73, 10, 63, 76, 84, 84, 84, 0, 1, + 10, 17, 0, 1, 47, 48, 2, 9, 2, 11, + 12, 9, 19, 11, 12, 10, 18, 0, 1, 12, + 18, 17, 3, 4, 5, 18, 9, 9, 11, 12, + 1, 6, 3, 4, 5, 18, 7, 8, 3, 4, + 5, 1, 13, 20, 1, 16, 3, 4, 5, 1, + 18, 3, 4, 5, 0, 1, 13, 78, 79, 16, + 1, 13, 11, 1, 16, 3, 4, 5, 11, 0, + 18, 19, 3, 4, 5, 13, 7, 8, 16, 11, + 11, 3, 4, 5, 1, 7, 8, 15, 0, 25, + 11, 11, 83, 85, 23, 94, ); sub constYYFINAL () { 4 } sub constYYMAXTOKEN () { 20 } -# 268 "y.tab.pl" +# 270 "y.tab.pl" sub yyclearin { $yychar = -1; } sub yyerrok { $yyerrflag = 0; } @@ -239,7 +241,7 @@ else { return (1) if $yychar == 0; -# 319 "y.tab.pl" +# 321 "y.tab.pl" $yychar = -1; next yyloop; @@ -271,7 +273,7 @@ if ($yychar < 0) { if (($yychar = &yylex) < 0) { $yychar = 0; } -# 358 "y.tab.pl" +# 360 "y.tab.pl" } if (($yyn = $yysindex[$yystate]) && ($yyn += $yychar) >= 0 && @@ -354,9 +356,9 @@ # 136 "parser.y" { - $yyvs[$yyvsp-0]->[cTAG] = $yyvs[$yyvsp-2]; - @{$yyval = []}[cTYPE,cCHILD,cLOOP] = ($yyvs[$yyvsp-4], [$yyvs[$yyvsp-0]], 1); - $yyval = explicit($yyval) if $yyvs[$yyvsp-1]; + $yyvs[$yyvsp-1]->[cTAG] = $yyvs[$yyvsp-3]; + @{$yyval = []}[cTYPE,cCHILD,cLOOP,cOPT] = ($yyvs[$yyvsp-5], [$yyvs[$yyvsp-1]], 1, $yyvs[$yyvsp-0]); + $yyval = explicit($yyval) if $yyvs[$yyvsp-2]; last switch; } } @@ -610,7 +612,7 @@ { last switch; } } -# 651 "y.tab.pl" +# 653 "y.tab.pl" } # switch $yyssp -= $yym; @@ -629,7 +631,7 @@ if ($yychar < 0) { if (($yychar = &yylex) < 0) { $yychar = 0; } -# 677 "y.tab.pl" +# 679 "y.tab.pl" } return $yyvs[$yyvsp] if $yychar == 0; @@ -953,15 +955,15 @@ 1; -# 999 "y.tab.pl" +# 1001 "y.tab.pl" -%yystate = ('State34','','State11','','State33','','State24','','State47', -'','State40','','State31','','State37','','State23','','State22','', -'State21','','State57','','State39','','State56','','State20','','State25', -'','State38','','State14','','State19','','State5','','State53','', -'State26','','State27','','State50','','State36','','State45','','State4', -'','State3','','State32','','State49','','State30','','State35','', -'State48','','State52','','State55','','State28','','State58','','State41', -'','State18','','State59','','State1','','State54',''); +%yystate = ('State11','','State30','','State31','','State50','','State32', +'','State14','','State33','','State52','','State34','','State53','', +'State35','','State54','','State36','','State18','','State55','','State37', +'','State19','','State56','','State38','','State57','','State39','', +'State58','','State59','','State1','','State3','','State4','','State5','', +'State20','','State21','','State22','','State40','','State23','','State41', +'','State24','','State25','','State26','','State27','','State45','', +'State28','','State47','','State48','','State49',''); 1; |