From 45e681d416bbb0e23b9884f5697234a69bb7f06e Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 10 Feb 2012 08:53:15 +1100 Subject: heimdal: Re-run lexyacc.sh to remove #line statements --- source4/heimdal/lib/asn1/asn1parse.c | 93 ------------------------------ source4/heimdal/lib/asn1/lex.c | 108 ----------------------------------- source4/heimdal/lib/com_err/lex.c | 30 ---------- source4/heimdal/lib/com_err/parse.c | 14 ----- source4/heimdal/lib/hx509/lex.yy.c | 26 --------- source4/heimdal/lib/hx509/sel-gram.c | 29 ---------- source4/heimdal/lib/hx509/sel-lex.c | 27 --------- 7 files changed, 327 deletions(-) (limited to 'source4/heimdal') diff --git a/source4/heimdal/lib/asn1/asn1parse.c b/source4/heimdal/lib/asn1/asn1parse.c index 3f4fd58771..22c8f289f4 100644 --- a/source4/heimdal/lib/asn1/asn1parse.c +++ b/source4/heimdal/lib/asn1/asn1parse.c @@ -16,7 +16,6 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; #define YYPURE 0 -#line 39 "asn1parse.c" #include @@ -47,7 +46,6 @@ struct string_list { #define YYMALLOC malloc #define YYFREE free -#line 71 "asn1parse.c" #ifdef YYSTYPE #undef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 @@ -69,7 +67,6 @@ typedef union { struct constraint_spec *constraint_spec; } YYSTYPE; #endif /* !YYSTYPE_IS_DECLARED */ -#line 72 "asn1parse.c" /* compatibility with bison */ #ifdef YYPARSE_PARAM /* compatibility with FreeBSD */ @@ -624,7 +621,6 @@ YYSTYPE yylval; /* variables for the parser stack */ static YYSTACKDATA yystack; -#line 945 "asn1parse.c" void yyerror (const char *s) @@ -718,7 +714,6 @@ fix_labels(Symbol *s) fix_labels2(s->type, p); free(p); } -#line 721 "asn1parse.c" #if YYDEBUG #include /* needed for printf */ @@ -925,25 +920,20 @@ yyreduce: switch (yyn) { case 1: -#line 241 "asn1parse.c" { checkundefined(); } break; case 3: -#line 248 "asn1parse.c" { lex_error_message("implicit tagging is not supported"); } break; case 4: -#line 250 "asn1parse.c" { lex_error_message("automatic tagging is not supported"); } break; case 6: -#line 255 "asn1parse.c" { lex_error_message("no extensibility options supported"); } break; case 16: -#line 276 "asn1parse.c" { struct string_list *sl; for(sl = yystack.l_mark[-3].sl; sl != NULL; sl = sl->next) { @@ -955,7 +945,6 @@ case 16: } break; case 17: -#line 288 "asn1parse.c" { struct string_list *sl; for(sl = yystack.l_mark[-1].sl; sl != NULL; sl = sl->next) @@ -963,7 +952,6 @@ case 17: } break; case 24: -#line 306 "asn1parse.c" { yyval.sl = emalloc(sizeof(*yyval.sl)); yyval.sl->string = yystack.l_mark[-2].name; @@ -971,7 +959,6 @@ case 24: } break; case 25: -#line 312 "asn1parse.c" { yyval.sl = emalloc(sizeof(*yyval.sl)); yyval.sl->string = yystack.l_mark[0].name; @@ -979,7 +966,6 @@ case 25: } break; case 26: -#line 320 "asn1parse.c" { Symbol *s = addsym (yystack.l_mark[-2].name); s->stype = Stype; @@ -989,14 +975,12 @@ case 26: } break; case 44: -#line 351 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_Boolean, TE_EXPLICIT, new_type(TBoolean)); } break; case 45: -#line 358 "asn1parse.c" { if(yystack.l_mark[-3].value->type != integervalue) lex_error_message("Non-integer used in first part of range"); @@ -1008,7 +992,6 @@ case 45: } break; case 46: -#line 368 "asn1parse.c" { if(yystack.l_mark[-3].value->type != integervalue) lex_error_message("Non-integer in first part of range"); @@ -1018,7 +1001,6 @@ case 46: } break; case 47: -#line 376 "asn1parse.c" { if(yystack.l_mark[-1].value->type != integervalue) lex_error_message("Non-integer in second part of range"); @@ -1028,7 +1010,6 @@ case 47: } break; case 48: -#line 384 "asn1parse.c" { if(yystack.l_mark[-1].value->type != integervalue) lex_error_message("Non-integer used in limit"); @@ -1038,14 +1019,12 @@ case 48: } break; case 49: -#line 395 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_Integer, TE_EXPLICIT, new_type(TInteger)); } break; case 50: -#line 400 "asn1parse.c" { yyval.type = new_type(TInteger); yyval.type->range = yystack.l_mark[0].range; @@ -1053,7 +1032,6 @@ case 50: } break; case 51: -#line 406 "asn1parse.c" { yyval.type = new_type(TInteger); yyval.type->members = yystack.l_mark[-1].members; @@ -1061,7 +1039,6 @@ case 51: } break; case 52: -#line 414 "asn1parse.c" { yyval.members = emalloc(sizeof(*yyval.members)); ASN1_TAILQ_INIT(yyval.members); @@ -1069,18 +1046,15 @@ case 52: } break; case 53: -#line 420 "asn1parse.c" { ASN1_TAILQ_INSERT_TAIL(yystack.l_mark[-2].members, yystack.l_mark[0].member, members); yyval.members = yystack.l_mark[-2].members; } break; case 54: -#line 425 "asn1parse.c" { yyval.members = yystack.l_mark[-2].members; } break; case 55: -#line 429 "asn1parse.c" { yyval.member = emalloc(sizeof(*yyval.member)); yyval.member->name = yystack.l_mark[-3].name; @@ -1093,7 +1067,6 @@ case 55: } break; case 56: -#line 442 "asn1parse.c" { yyval.type = new_type(TInteger); yyval.type->members = yystack.l_mark[-1].members; @@ -1101,7 +1074,6 @@ case 56: } break; case 58: -#line 453 "asn1parse.c" { yyval.type = new_type(TBitString); yyval.type->members = emalloc(sizeof(*yyval.type->members)); @@ -1110,7 +1082,6 @@ case 58: } break; case 59: -#line 460 "asn1parse.c" { yyval.type = new_type(TBitString); yyval.type->members = yystack.l_mark[-1].members; @@ -1118,14 +1089,12 @@ case 59: } break; case 60: -#line 468 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_OID, TE_EXPLICIT, new_type(TOID)); } break; case 61: -#line 474 "asn1parse.c" { Type *t = new_type(TOctetString); t->range = yystack.l_mark[0].range; @@ -1134,22 +1103,18 @@ case 61: } break; case 62: -#line 483 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_Null, TE_EXPLICIT, new_type(TNull)); } break; case 63: -#line 490 "asn1parse.c" { yyval.range = NULL; } break; case 64: -#line 492 "asn1parse.c" { yyval.range = yystack.l_mark[0].range; } break; case 65: -#line 497 "asn1parse.c" { yyval.type = new_type(TSequence); yyval.type->members = yystack.l_mark[-1].members; @@ -1157,7 +1122,6 @@ case 65: } break; case 66: -#line 503 "asn1parse.c" { yyval.type = new_type(TSequence); yyval.type->members = NULL; @@ -1165,7 +1129,6 @@ case 66: } break; case 67: -#line 511 "asn1parse.c" { yyval.type = new_type(TSequenceOf); yyval.type->range = yystack.l_mark[-2].range; @@ -1174,7 +1137,6 @@ case 67: } break; case 68: -#line 520 "asn1parse.c" { yyval.type = new_type(TSet); yyval.type->members = yystack.l_mark[-1].members; @@ -1182,7 +1144,6 @@ case 68: } break; case 69: -#line 526 "asn1parse.c" { yyval.type = new_type(TSet); yyval.type->members = NULL; @@ -1190,7 +1151,6 @@ case 69: } break; case 70: -#line 534 "asn1parse.c" { yyval.type = new_type(TSetOf); yyval.type->subtype = yystack.l_mark[0].type; @@ -1198,14 +1158,12 @@ case 70: } break; case 71: -#line 542 "asn1parse.c" { yyval.type = new_type(TChoice); yyval.type->members = yystack.l_mark[-1].members; } break; case 74: -#line 553 "asn1parse.c" { Symbol *s = addsym(yystack.l_mark[0].name); yyval.type = new_type(TType); @@ -1216,21 +1174,18 @@ case 74: } break; case 75: -#line 564 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_GeneralizedTime, TE_EXPLICIT, new_type(TGeneralizedTime)); } break; case 76: -#line 569 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_UTCTime, TE_EXPLICIT, new_type(TUTCTime)); } break; case 77: -#line 576 "asn1parse.c" { /* if (Constraint.type == contentConstrant) { assert(Constraint.u.constraint.type == octetstring|bitstring-w/o-NamedBitList); // remember to check type reference too @@ -1245,13 +1200,11 @@ case 77: } break; case 78: -#line 592 "asn1parse.c" { yyval.constraint_spec = yystack.l_mark[-1].constraint_spec; } break; case 82: -#line 605 "asn1parse.c" { yyval.constraint_spec = new_constraint_spec(CT_CONTENTS); yyval.constraint_spec->u.content.type = yystack.l_mark[0].type; @@ -1259,7 +1212,6 @@ case 82: } break; case 83: -#line 611 "asn1parse.c" { if (yystack.l_mark[0].value->type != objectidentifiervalue) lex_error_message("Non-OID used in ENCODED BY constraint"); @@ -1269,7 +1221,6 @@ case 83: } break; case 84: -#line 619 "asn1parse.c" { if (yystack.l_mark[0].value->type != objectidentifiervalue) lex_error_message("Non-OID used in ENCODED BY constraint"); @@ -1279,13 +1230,11 @@ case 84: } break; case 85: -#line 629 "asn1parse.c" { yyval.constraint_spec = new_constraint_spec(CT_USER); } break; case 86: -#line 635 "asn1parse.c" { yyval.type = new_type(TTag); yyval.type->tag = yystack.l_mark[-2].tag; @@ -1298,7 +1247,6 @@ case 86: } break; case 87: -#line 648 "asn1parse.c" { yyval.tag.tagclass = yystack.l_mark[-2].constant; yyval.tag.tagvalue = yystack.l_mark[-1].constant; @@ -1306,49 +1254,41 @@ case 87: } break; case 88: -#line 656 "asn1parse.c" { yyval.constant = ASN1_C_CONTEXT; } break; case 89: -#line 660 "asn1parse.c" { yyval.constant = ASN1_C_UNIV; } break; case 90: -#line 664 "asn1parse.c" { yyval.constant = ASN1_C_APPL; } break; case 91: -#line 668 "asn1parse.c" { yyval.constant = ASN1_C_PRIVATE; } break; case 92: -#line 674 "asn1parse.c" { yyval.constant = TE_EXPLICIT; } break; case 93: -#line 678 "asn1parse.c" { yyval.constant = TE_EXPLICIT; } break; case 94: -#line 682 "asn1parse.c" { yyval.constant = TE_IMPLICIT; } break; case 95: -#line 689 "asn1parse.c" { Symbol *s; s = addsym (yystack.l_mark[-3].name); @@ -1359,63 +1299,54 @@ case 95: } break; case 97: -#line 703 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_GeneralString, TE_EXPLICIT, new_type(TGeneralString)); } break; case 98: -#line 708 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_TeletexString, TE_EXPLICIT, new_type(TTeletexString)); } break; case 99: -#line 713 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_UTF8String, TE_EXPLICIT, new_type(TUTF8String)); } break; case 100: -#line 718 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_PrintableString, TE_EXPLICIT, new_type(TPrintableString)); } break; case 101: -#line 723 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_VisibleString, TE_EXPLICIT, new_type(TVisibleString)); } break; case 102: -#line 728 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_IA5String, TE_EXPLICIT, new_type(TIA5String)); } break; case 103: -#line 733 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_BMPString, TE_EXPLICIT, new_type(TBMPString)); } break; case 104: -#line 738 "asn1parse.c" { yyval.type = new_tag(ASN1_C_UNIV, UT_UniversalString, TE_EXPLICIT, new_type(TUniversalString)); } break; case 105: -#line 746 "asn1parse.c" { yyval.members = emalloc(sizeof(*yyval.members)); ASN1_TAILQ_INIT(yyval.members); @@ -1423,14 +1354,12 @@ case 105: } break; case 106: -#line 752 "asn1parse.c" { ASN1_TAILQ_INSERT_TAIL(yystack.l_mark[-2].members, yystack.l_mark[0].member, members); yyval.members = yystack.l_mark[-2].members; } break; case 107: -#line 757 "asn1parse.c" { struct member *m = ecalloc(1, sizeof(*m)); m->name = estrdup("..."); @@ -1441,7 +1370,6 @@ case 107: } break; case 108: -#line 768 "asn1parse.c" { yyval.member = emalloc(sizeof(*yyval.member)); yyval.member->name = yystack.l_mark[-1].name; @@ -1452,7 +1380,6 @@ case 108: } break; case 109: -#line 779 "asn1parse.c" { yyval.member = yystack.l_mark[0].member; yyval.member->optional = 0; @@ -1460,7 +1387,6 @@ case 109: } break; case 110: -#line 785 "asn1parse.c" { yyval.member = yystack.l_mark[-1].member; yyval.member->optional = 1; @@ -1468,7 +1394,6 @@ case 110: } break; case 111: -#line 791 "asn1parse.c" { yyval.member = yystack.l_mark[-2].member; yyval.member->optional = 0; @@ -1476,7 +1401,6 @@ case 111: } break; case 112: -#line 799 "asn1parse.c" { yyval.members = emalloc(sizeof(*yyval.members)); ASN1_TAILQ_INIT(yyval.members); @@ -1484,14 +1408,12 @@ case 112: } break; case 113: -#line 805 "asn1parse.c" { ASN1_TAILQ_INSERT_TAIL(yystack.l_mark[-2].members, yystack.l_mark[0].member, members); yyval.members = yystack.l_mark[-2].members; } break; case 114: -#line 812 "asn1parse.c" { yyval.member = emalloc(sizeof(*yyval.member)); yyval.member->name = yystack.l_mark[-3].name; @@ -1504,23 +1426,19 @@ case 114: } break; case 116: -#line 825 "asn1parse.c" { yyval.objid = NULL; } break; case 117: -#line 829 "asn1parse.c" { yyval.objid = yystack.l_mark[-1].objid; } break; case 118: -#line 835 "asn1parse.c" { yyval.objid = NULL; } break; case 119: -#line 839 "asn1parse.c" { if (yystack.l_mark[0].objid) { yyval.objid = yystack.l_mark[0].objid; @@ -1531,13 +1449,11 @@ case 119: } break; case 120: -#line 850 "asn1parse.c" { yyval.objid = new_objid(yystack.l_mark[-3].name, yystack.l_mark[-1].constant); } break; case 121: -#line 854 "asn1parse.c" { Symbol *s = addsym(yystack.l_mark[0].name); if(s->stype != SValue || @@ -1550,13 +1466,11 @@ case 121: } break; case 122: -#line 865 "asn1parse.c" { yyval.objid = new_objid(NULL, yystack.l_mark[0].constant); } break; case 132: -#line 888 "asn1parse.c" { Symbol *s = addsym(yystack.l_mark[0].name); if(s->stype != SValue) @@ -1567,7 +1481,6 @@ case 132: } break; case 133: -#line 899 "asn1parse.c" { yyval.value = emalloc(sizeof(*yyval.value)); yyval.value->type = stringvalue; @@ -1575,7 +1488,6 @@ case 133: } break; case 134: -#line 907 "asn1parse.c" { yyval.value = emalloc(sizeof(*yyval.value)); yyval.value->type = booleanvalue; @@ -1583,7 +1495,6 @@ case 134: } break; case 135: -#line 913 "asn1parse.c" { yyval.value = emalloc(sizeof(*yyval.value)); yyval.value->type = booleanvalue; @@ -1591,7 +1502,6 @@ case 135: } break; case 136: -#line 921 "asn1parse.c" { yyval.value = emalloc(sizeof(*yyval.value)); yyval.value->type = integervalue; @@ -1599,19 +1509,16 @@ case 136: } break; case 138: -#line 932 "asn1parse.c" { } break; case 139: -#line 937 "asn1parse.c" { yyval.value = emalloc(sizeof(*yyval.value)); yyval.value->type = objectidentifiervalue; yyval.value->u.objectidentifiervalue = yystack.l_mark[0].objid; } break; -#line 1614 "asn1parse.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/source4/heimdal/lib/asn1/lex.c b/source4/heimdal/lib/asn1/lex.c index 301629eed7..3069f24277 100644 --- a/source4/heimdal/lib/asn1/lex.c +++ b/source4/heimdal/lib/asn1/lex.c @@ -1,6 +1,5 @@ #include "config.h" -#line 3 "lex.c" #define YY_INT_ALIGNED short int @@ -788,8 +787,6 @@ int yy_flex_debug = 0; #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "lex.l" -#line 2 "lex.l" /* * Copyright (c) 1997 - 2005 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). @@ -848,7 +845,6 @@ static unsigned lineno = 1; static void unterminated(const char *, unsigned); /* This is for broken old lexes (solaris 10 and hpux) */ -#line 851 "lex.c" #define INITIAL 0 @@ -1030,10 +1026,6 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 68 "lex.l" - -#line 1035 "lex.c" - if ( !(yy_init) ) { (yy_init) = 1; @@ -1117,427 +1109,342 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 69 "lex.l" { return kw_ABSENT; } YY_BREAK case 2: YY_RULE_SETUP -#line 70 "lex.l" { return kw_ABSTRACT_SYNTAX; } YY_BREAK case 3: YY_RULE_SETUP -#line 71 "lex.l" { return kw_ALL; } YY_BREAK case 4: YY_RULE_SETUP -#line 72 "lex.l" { return kw_APPLICATION; } YY_BREAK case 5: YY_RULE_SETUP -#line 73 "lex.l" { return kw_AUTOMATIC; } YY_BREAK case 6: YY_RULE_SETUP -#line 74 "lex.l" { return kw_BEGIN; } YY_BREAK case 7: YY_RULE_SETUP -#line 75 "lex.l" { return kw_BIT; } YY_BREAK case 8: YY_RULE_SETUP -#line 76 "lex.l" { return kw_BMPString; } YY_BREAK case 9: YY_RULE_SETUP -#line 77 "lex.l" { return kw_BOOLEAN; } YY_BREAK case 10: YY_RULE_SETUP -#line 78 "lex.l" { return kw_BY; } YY_BREAK case 11: YY_RULE_SETUP -#line 79 "lex.l" { return kw_CHARACTER; } YY_BREAK case 12: YY_RULE_SETUP -#line 80 "lex.l" { return kw_CHOICE; } YY_BREAK case 13: YY_RULE_SETUP -#line 81 "lex.l" { return kw_CLASS; } YY_BREAK case 14: YY_RULE_SETUP -#line 82 "lex.l" { return kw_COMPONENT; } YY_BREAK case 15: YY_RULE_SETUP -#line 83 "lex.l" { return kw_COMPONENTS; } YY_BREAK case 16: YY_RULE_SETUP -#line 84 "lex.l" { return kw_CONSTRAINED; } YY_BREAK case 17: YY_RULE_SETUP -#line 85 "lex.l" { return kw_CONTAINING; } YY_BREAK case 18: YY_RULE_SETUP -#line 86 "lex.l" { return kw_DEFAULT; } YY_BREAK case 19: YY_RULE_SETUP -#line 87 "lex.l" { return kw_DEFINITIONS; } YY_BREAK case 20: YY_RULE_SETUP -#line 88 "lex.l" { return kw_EMBEDDED; } YY_BREAK case 21: YY_RULE_SETUP -#line 89 "lex.l" { return kw_ENCODED; } YY_BREAK case 22: YY_RULE_SETUP -#line 90 "lex.l" { return kw_END; } YY_BREAK case 23: YY_RULE_SETUP -#line 91 "lex.l" { return kw_ENUMERATED; } YY_BREAK case 24: YY_RULE_SETUP -#line 92 "lex.l" { return kw_EXCEPT; } YY_BREAK case 25: YY_RULE_SETUP -#line 93 "lex.l" { return kw_EXPLICIT; } YY_BREAK case 26: YY_RULE_SETUP -#line 94 "lex.l" { return kw_EXPORTS; } YY_BREAK case 27: YY_RULE_SETUP -#line 95 "lex.l" { return kw_EXTENSIBILITY; } YY_BREAK case 28: YY_RULE_SETUP -#line 96 "lex.l" { return kw_EXTERNAL; } YY_BREAK case 29: YY_RULE_SETUP -#line 97 "lex.l" { return kw_FALSE; } YY_BREAK case 30: YY_RULE_SETUP -#line 98 "lex.l" { return kw_FROM; } YY_BREAK case 31: YY_RULE_SETUP -#line 99 "lex.l" { return kw_GeneralString; } YY_BREAK case 32: YY_RULE_SETUP -#line 100 "lex.l" { return kw_GeneralizedTime; } YY_BREAK case 33: YY_RULE_SETUP -#line 101 "lex.l" { return kw_GraphicString; } YY_BREAK case 34: YY_RULE_SETUP -#line 102 "lex.l" { return kw_IA5String; } YY_BREAK case 35: YY_RULE_SETUP -#line 103 "lex.l" { return kw_IDENTIFIER; } YY_BREAK case 36: YY_RULE_SETUP -#line 104 "lex.l" { return kw_IMPLICIT; } YY_BREAK case 37: YY_RULE_SETUP -#line 105 "lex.l" { return kw_IMPLIED; } YY_BREAK case 38: YY_RULE_SETUP -#line 106 "lex.l" { return kw_IMPORTS; } YY_BREAK case 39: YY_RULE_SETUP -#line 107 "lex.l" { return kw_INCLUDES; } YY_BREAK case 40: YY_RULE_SETUP -#line 108 "lex.l" { return kw_INSTANCE; } YY_BREAK case 41: YY_RULE_SETUP -#line 109 "lex.l" { return kw_INTEGER; } YY_BREAK case 42: YY_RULE_SETUP -#line 110 "lex.l" { return kw_INTERSECTION; } YY_BREAK case 43: YY_RULE_SETUP -#line 111 "lex.l" { return kw_ISO646String; } YY_BREAK case 44: YY_RULE_SETUP -#line 112 "lex.l" { return kw_MAX; } YY_BREAK case 45: YY_RULE_SETUP -#line 113 "lex.l" { return kw_MIN; } YY_BREAK case 46: YY_RULE_SETUP -#line 114 "lex.l" { return kw_MINUS_INFINITY; } YY_BREAK case 47: YY_RULE_SETUP -#line 115 "lex.l" { return kw_NULL; } YY_BREAK case 48: YY_RULE_SETUP -#line 116 "lex.l" { return kw_NumericString; } YY_BREAK case 49: YY_RULE_SETUP -#line 117 "lex.l" { return kw_OBJECT; } YY_BREAK case 50: YY_RULE_SETUP -#line 118 "lex.l" { return kw_OCTET; } YY_BREAK case 51: YY_RULE_SETUP -#line 119 "lex.l" { return kw_OF; } YY_BREAK case 52: YY_RULE_SETUP -#line 120 "lex.l" { return kw_OPTIONAL; } YY_BREAK case 53: YY_RULE_SETUP -#line 121 "lex.l" { return kw_ObjectDescriptor; } YY_BREAK case 54: YY_RULE_SETUP -#line 122 "lex.l" { return kw_PATTERN; } YY_BREAK case 55: YY_RULE_SETUP -#line 123 "lex.l" { return kw_PDV; } YY_BREAK case 56: YY_RULE_SETUP -#line 124 "lex.l" { return kw_PLUS_INFINITY; } YY_BREAK case 57: YY_RULE_SETUP -#line 125 "lex.l" { return kw_PRESENT; } YY_BREAK case 58: YY_RULE_SETUP -#line 126 "lex.l" { return kw_PRIVATE; } YY_BREAK case 59: YY_RULE_SETUP -#line 127 "lex.l" { return kw_PrintableString; } YY_BREAK case 60: YY_RULE_SETUP -#line 128 "lex.l" { return kw_REAL; } YY_BREAK case 61: YY_RULE_SETUP -#line 129 "lex.l" { return kw_RELATIVE_OID; } YY_BREAK case 62: YY_RULE_SETUP -#line 130 "lex.l" { return kw_SEQUENCE; } YY_BREAK case 63: YY_RULE_SETUP -#line 131 "lex.l" { return kw_SET; } YY_BREAK case 64: YY_RULE_SETUP -#line 132 "lex.l" { return kw_SIZE; } YY_BREAK case 65: YY_RULE_SETUP -#line 133 "lex.l" { return kw_STRING; } YY_BREAK case 66: YY_RULE_SETUP -#line 134 "lex.l" { return kw_SYNTAX; } YY_BREAK case 67: YY_RULE_SETUP -#line 135 "lex.l" { return kw_T61String; } YY_BREAK case 68: YY_RULE_SETUP -#line 136 "lex.l" { return kw_TAGS; } YY_BREAK case 69: YY_RULE_SETUP -#line 137 "lex.l" { return kw_TRUE; } YY_BREAK case 70: YY_RULE_SETUP -#line 138 "lex.l" { return kw_TYPE_IDENTIFIER; } YY_BREAK case 71: YY_RULE_SETUP -#line 139 "lex.l" { return kw_TeletexString; } YY_BREAK case 72: YY_RULE_SETUP -#line 140 "lex.l" { return kw_UNION; } YY_BREAK case 73: YY_RULE_SETUP -#line 141 "lex.l" { return kw_UNIQUE; } YY_BREAK case 74: YY_RULE_SETUP -#line 142 "lex.l" { return kw_UNIVERSAL; } YY_BREAK case 75: YY_RULE_SETUP -#line 143 "lex.l" { return kw_UTCTime; } YY_BREAK case 76: YY_RULE_SETUP -#line 144 "lex.l" { return kw_UTF8String; } YY_BREAK case 77: YY_RULE_SETUP -#line 145 "lex.l" { return kw_UniversalString; } YY_BREAK case 78: YY_RULE_SETUP -#line 146 "lex.l" { return kw_VideotexString; } YY_BREAK case 79: YY_RULE_SETUP -#line 147 "lex.l" { return kw_VisibleString; } YY_BREAK case 80: YY_RULE_SETUP -#line 148 "lex.l" { return kw_WITH; } YY_BREAK case 81: YY_RULE_SETUP -#line 149 "lex.l" { return *yytext; } YY_BREAK case 82: YY_RULE_SETUP -#line 150 "lex.l" { return *yytext; } YY_BREAK case 83: YY_RULE_SETUP -#line 151 "lex.l" { return *yytext; } YY_BREAK case 84: YY_RULE_SETUP -#line 152 "lex.l" { return EEQUAL; } YY_BREAK case 85: YY_RULE_SETUP -#line 153 "lex.l" { int c, start_lineno = lineno; int f = 0; @@ -1560,7 +1467,6 @@ YY_RULE_SETUP YY_BREAK case 86: YY_RULE_SETUP -#line 172 "lex.l" { int c, start_lineno = lineno; int level = 1; @@ -1604,7 +1510,6 @@ YY_RULE_SETUP YY_BREAK case 87: YY_RULE_SETUP -#line 212 "lex.l" { int start_lineno = lineno; int c; @@ -1652,7 +1557,6 @@ YY_RULE_SETUP YY_BREAK case 88: YY_RULE_SETUP -#line 257 "lex.l" { char *e, *y = yytext; yylval.constant = strtol((const char *)yytext, &e, 0); @@ -1664,7 +1568,6 @@ YY_RULE_SETUP YY_BREAK case 89: YY_RULE_SETUP -#line 265 "lex.l" { yylval.name = estrdup ((const char *)yytext); return IDENTIFIER; @@ -1672,36 +1575,29 @@ YY_RULE_SETUP YY_BREAK case 90: YY_RULE_SETUP -#line 269 "lex.l" ; YY_BREAK case 91: /* rule 91 can match eol */ YY_RULE_SETUP -#line 270 "lex.l" { ++lineno; } YY_BREAK case 92: YY_RULE_SETUP -#line 271 "lex.l" { return ELLIPSIS; } YY_BREAK case 93: YY_RULE_SETUP -#line 272 "lex.l" { return RANGE; } YY_BREAK case 94: YY_RULE_SETUP -#line 273 "lex.l" { lex_error_message("Ignoring char(%c)\n", *yytext); } YY_BREAK case 95: YY_RULE_SETUP -#line 274 "lex.l" ECHO; YY_BREAK -#line 1704 "lex.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -2699,10 +2595,6 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 274 "lex.l" - - - #ifndef yywrap /* XXX */ int yywrap () diff --git a/source4/heimdal/lib/com_err/lex.c b/source4/heimdal/lib/com_err/lex.c index e3c13a047e..6346268b98 100644 --- a/source4/heimdal/lib/com_err/lex.c +++ b/source4/heimdal/lib/com_err/lex.c @@ -1,6 +1,5 @@ #include "config.h" -#line 3 "lex.c" #define YY_INT_ALIGNED short int @@ -473,8 +472,6 @@ int yy_flex_debug = 0; #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "lex.l" -#line 2 "lex.l" /* * Copyright (c) 1998 - 2000 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). @@ -527,8 +524,6 @@ static int getstring(void); #undef ECHO -#line 530 "lex.c" - #define INITIAL 0 #ifndef YY_NO_UNISTD_H @@ -707,10 +702,6 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 58 "lex.l" - -#line 712 "lex.c" - if ( !(yy_init) ) { (yy_init) = 1; @@ -794,86 +785,69 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 59 "lex.l" { return ET; } YY_BREAK case 2: YY_RULE_SETUP -#line 60 "lex.l" { return ET; } YY_BREAK case 3: YY_RULE_SETUP -#line 61 "lex.l" { return EC; } YY_BREAK case 4: YY_RULE_SETUP -#line 62 "lex.l" { return EC; } YY_BREAK case 5: YY_RULE_SETUP -#line 63 "lex.l" { return PREFIX; } YY_BREAK case 6: YY_RULE_SETUP -#line 64 "lex.l" { return INDEX; } YY_BREAK case 7: YY_RULE_SETUP -#line 65 "lex.l" { return ID; } YY_BREAK case 8: YY_RULE_SETUP -#line 66 "lex.l" { return END; } YY_BREAK case 9: YY_RULE_SETUP -#line 67 "lex.l" { yylval.number = atoi(yytext); return NUMBER; } YY_BREAK case 10: YY_RULE_SETUP -#line 68 "lex.l" ; YY_BREAK case 11: YY_RULE_SETUP -#line 69 "lex.l" ; YY_BREAK case 12: /* rule 12 can match eol */ YY_RULE_SETUP -#line 70 "lex.l" { lineno++; } YY_BREAK case 13: YY_RULE_SETUP -#line 71 "lex.l" { return getstring(); } YY_BREAK case 14: YY_RULE_SETUP -#line 72 "lex.l" { yylval.string = strdup(yytext); return STRING; } YY_BREAK case 15: YY_RULE_SETUP -#line 73 "lex.l" { return *yytext; } YY_BREAK case 16: YY_RULE_SETUP -#line 74 "lex.l" ECHO; YY_BREAK -#line 876 "lex.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1834,10 +1808,6 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 74 "lex.l" - - - #ifndef yywrap /* XXX */ int yywrap () diff --git a/source4/heimdal/lib/com_err/parse.c b/source4/heimdal/lib/com_err/parse.c index 811133ceb1..cbb30765cb 100644 --- a/source4/heimdal/lib/com_err/parse.c +++ b/source4/heimdal/lib/com_err/parse.c @@ -16,7 +16,6 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; #define YYPURE 0 -#line 2 "parse.c" /* * Copyright (c) 1998 - 2000 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). @@ -67,7 +66,6 @@ extern char *yytext; #define YYMALLOC malloc #define YYFREE free -#line 54 "parse.c" #ifdef YYSTYPE #undef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 @@ -79,7 +77,6 @@ typedef union { int number; } YYSTYPE; #endif /* !YYSTYPE_IS_DECLARED */ -#line 82 "parse.c" /* compatibility with bison */ #ifdef YYPARSE_PARAM /* compatibility with FreeBSD */ @@ -273,7 +270,6 @@ YYSTYPE yylval; /* variables for the parser stack */ static YYSTACKDATA yystack; -#line 144 "parse.c" static long name2number(const char *str) @@ -305,7 +301,6 @@ yyerror (char *s) { _lex_error_message ("%s\n", s); } -#line 308 "parse.c" #if YYDEBUG #include /* needed for printf */ @@ -512,13 +507,11 @@ yyreduce: switch (yyn) { case 5: -#line 74 "parse.c" { id_str = yystack.l_mark[0].string; } break; case 6: -#line 80 "parse.c" { base_id = name2number(yystack.l_mark[0].string); strlcpy(name, yystack.l_mark[0].string, sizeof(name)); @@ -526,7 +519,6 @@ case 6: } break; case 7: -#line 86 "parse.c" { base_id = name2number(yystack.l_mark[-1].string); strlcpy(name, yystack.l_mark[0].string, sizeof(name)); @@ -535,13 +527,11 @@ case 7: } break; case 10: -#line 99 "parse.c" { number = yystack.l_mark[0].number; } break; case 11: -#line 103 "parse.c" { free(prefix); asprintf (&prefix, "%s_", yystack.l_mark[0].string); @@ -551,7 +541,6 @@ case 11: } break; case 12: -#line 111 "parse.c" { prefix = realloc(prefix, 1); if (prefix == NULL) @@ -560,7 +549,6 @@ case 12: } break; case 13: -#line 118 "parse.c" { struct error_code *ec = malloc(sizeof(*ec)); @@ -582,12 +570,10 @@ case 13: } break; case 14: -#line 138 "parse.c" { YYACCEPT; } break; -#line 590 "parse.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/source4/heimdal/lib/hx509/lex.yy.c b/source4/heimdal/lib/hx509/lex.yy.c index b967a4f943..5c0a9c4635 100644 --- a/source4/heimdal/lib/hx509/lex.yy.c +++ b/source4/heimdal/lib/hx509/lex.yy.c @@ -467,8 +467,6 @@ int yy_flex_debug = 0; #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "sel-lex.l" -#line 2 "sel-lex.l" /* * Copyright (c) 2004, 2008 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). @@ -534,8 +532,6 @@ struct hx_expr_input _hx509_expr_input; #undef ECHO -#line 538 "lex.yy.c" - #define INITIAL 0 #ifndef YY_NO_UNISTD_H @@ -716,11 +712,6 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 68 "sel-lex.l" - - -#line 723 "lex.yy.c" - if ( !(yy_init) ) { (yy_init) = 1; @@ -804,37 +795,30 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 70 "sel-lex.l" { return kw_TRUE; } YY_BREAK case 2: YY_RULE_SETUP -#line 71 "sel-lex.l" { return kw_FALSE; } YY_BREAK case 3: YY_RULE_SETUP -#line 72 "sel-lex.l" { return kw_AND; } YY_BREAK case 4: YY_RULE_SETUP -#line 73 "sel-lex.l" { return kw_OR; } YY_BREAK case 5: YY_RULE_SETUP -#line 74 "sel-lex.l" { return kw_IN; } YY_BREAK case 6: YY_RULE_SETUP -#line 75 "sel-lex.l" { return kw_TAILMATCH; } YY_BREAK case 7: YY_RULE_SETUP -#line 77 "sel-lex.l" { yylval.string = strdup ((const char *)yytext); return IDENTIFIER; @@ -842,31 +826,25 @@ YY_RULE_SETUP YY_BREAK case 8: YY_RULE_SETUP -#line 81 "sel-lex.l" { yylval.string = handle_string(); return STRING; } YY_BREAK case 9: /* rule 9 can match eol */ YY_RULE_SETUP -#line 82 "sel-lex.l" { ++lineno; } YY_BREAK case 10: YY_RULE_SETUP -#line 83 "sel-lex.l" { return *yytext; } YY_BREAK case 11: YY_RULE_SETUP -#line 84 "sel-lex.l" ; YY_BREAK case 12: YY_RULE_SETUP -#line 85 "sel-lex.l" ECHO; YY_BREAK -#line 870 "lex.yy.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1864,10 +1842,6 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 85 "sel-lex.l" - - - static char * handle_string(void) { diff --git a/source4/heimdal/lib/hx509/sel-gram.c b/source4/heimdal/lib/hx509/sel-gram.c index 187b683044..73859af147 100644 --- a/source4/heimdal/lib/hx509/sel-gram.c +++ b/source4/heimdal/lib/hx509/sel-gram.c @@ -16,7 +16,6 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; #define YYPURE 0 -#line 35 "sel-gram.c" #ifdef HAVE_CONFIG_H #include #endif @@ -25,7 +24,6 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; #include -#line 45 "sel-gram.c" #ifdef YYSTYPE #undef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 @@ -37,7 +35,6 @@ typedef union { struct hx_expr *expr; } YYSTYPE; #endif /* !YYSTYPE_IS_DECLARED */ -#line 40 "sel-gram.c" /* compatibility with bison */ #ifdef YYPARSE_PARAM /* compatibility with FreeBSD */ @@ -452,109 +449,83 @@ yyreduce: switch (yyn) { case 1: -#line 73 "sel-gram.c" { _hx509_expr_input.expr = yystack.l_mark[0].expr; } break; case 2: -#line 75 "sel-gram.c" { yyval.expr = _hx509_make_expr(op_TRUE, NULL, NULL); } break; case 3: -#line 76 "sel-gram.c" { yyval.expr = _hx509_make_expr(op_FALSE, NULL, NULL); } break; case 4: -#line 77 "sel-gram.c" { yyval.expr = _hx509_make_expr(op_NOT, yystack.l_mark[0].expr, NULL); } break; case 5: -#line 78 "sel-gram.c" { yyval.expr = _hx509_make_expr(op_AND, yystack.l_mark[-2].expr, yystack.l_mark[0].expr); } break; case 6: -#line 79 "sel-gram.c" { yyval.expr = _hx509_make_expr(op_OR, yystack.l_mark[-2].expr, yystack.l_mark[0].expr); } break; case 7: -#line 80 "sel-gram.c" { yyval.expr = yystack.l_mark[-1].expr; } break; case 8: -#line 81 "sel-gram.c" { yyval.expr = _hx509_make_expr(op_COMP, yystack.l_mark[0].expr, NULL); } break; case 9: -#line 84 "sel-gram.c" { yyval.expr = _hx509_make_expr(expr_WORDS, yystack.l_mark[0].expr, NULL); } break; case 10: -#line 85 "sel-gram.c" { yyval.expr = _hx509_make_expr(expr_WORDS, yystack.l_mark[-2].expr, yystack.l_mark[0].expr); } break; case 11: -#line 88 "sel-gram.c" { yyval.expr = _hx509_make_expr(comp_EQ, yystack.l_mark[-3].expr, yystack.l_mark[0].expr); } break; case 12: -#line 89 "sel-gram.c" { yyval.expr = _hx509_make_expr(comp_NE, yystack.l_mark[-3].expr, yystack.l_mark[0].expr); } break; case 13: -#line 90 "sel-gram.c" { yyval.expr = _hx509_make_expr(comp_TAILEQ, yystack.l_mark[-2].expr, yystack.l_mark[0].expr); } break; case 14: -#line 91 "sel-gram.c" { yyval.expr = _hx509_make_expr(comp_IN, yystack.l_mark[-4].expr, yystack.l_mark[-1].expr); } break; case 15: -#line 92 "sel-gram.c" { yyval.expr = _hx509_make_expr(comp_IN, yystack.l_mark[-2].expr, yystack.l_mark[0].expr); } break; case 16: -#line 95 "sel-gram.c" { yyval.expr = yystack.l_mark[0].expr; } break; case 17: -#line 96 "sel-gram.c" { yyval.expr = yystack.l_mark[0].expr; } break; case 18: -#line 97 "sel-gram.c" { yyval.expr = yystack.l_mark[0].expr; } break; case 19: -#line 98 "sel-gram.c" { yyval.expr = yystack.l_mark[0].expr; } break; case 20: -#line 101 "sel-gram.c" { yyval.expr = _hx509_make_expr(expr_NUMBER, yystack.l_mark[0].string, NULL); } break; case 21: -#line 102 "sel-gram.c" { yyval.expr = _hx509_make_expr(expr_STRING, yystack.l_mark[0].string, NULL); } break; case 22: -#line 104 "sel-gram.c" { yyval.expr = _hx509_make_expr(expr_FUNCTION, yystack.l_mark[-3].string, yystack.l_mark[-1].expr); } break; case 23: -#line 107 "sel-gram.c" { yyval.expr = yystack.l_mark[-1].expr; } break; case 24: -#line 110 "sel-gram.c" { yyval.expr = _hx509_make_expr(expr_VAR, yystack.l_mark[-2].string, yystack.l_mark[0].expr); } break; case 25: -#line 112 "sel-gram.c" { yyval.expr = _hx509_make_expr(expr_VAR, yystack.l_mark[0].string, NULL); } break; -#line 557 "sel-gram.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/source4/heimdal/lib/hx509/sel-lex.c b/source4/heimdal/lib/hx509/sel-lex.c index eacb68b43d..1cf90f04f2 100644 --- a/source4/heimdal/lib/hx509/sel-lex.c +++ b/source4/heimdal/lib/hx509/sel-lex.c @@ -1,6 +1,5 @@ #include "config.h" -#line 3 "sel-lex.c" #define YY_INT_ALIGNED short int @@ -468,8 +467,6 @@ int yy_flex_debug = 0; #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "sel-lex.l" -#line 2 "sel-lex.l" /* * Copyright (c) 2004, 2008 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). @@ -535,8 +532,6 @@ struct hx_expr_input _hx509_expr_input; #undef ECHO -#line 538 "sel-lex.c" - #define INITIAL 0 #ifndef YY_NO_UNISTD_H @@ -717,11 +712,6 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 68 "sel-lex.l" - - -#line 723 "sel-lex.c" - if ( !(yy_init) ) { (yy_init) = 1; @@ -805,37 +795,30 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 70 "sel-lex.l" { return kw_TRUE; } YY_BREAK case 2: YY_RULE_SETUP -#line 71 "sel-lex.l" { return kw_FALSE; } YY_BREAK case 3: YY_RULE_SETUP -#line 72 "sel-lex.l" { return kw_AND; } YY_BREAK case 4: YY_RULE_SETUP -#line 73 "sel-lex.l" { return kw_OR; } YY_BREAK case 5: YY_RULE_SETUP -#line 74 "sel-lex.l" { return kw_IN; } YY_BREAK case 6: YY_RULE_SETUP -#line 75 "sel-lex.l" { return kw_TAILMATCH; } YY_BREAK case 7: YY_RULE_SETUP -#line 77 "sel-lex.l" { yylval.string = strdup ((const char *)yytext); return IDENTIFIER; @@ -843,31 +826,25 @@ YY_RULE_SETUP YY_BREAK case 8: YY_RULE_SETUP -#line 81 "sel-lex.l" { yylval.string = handle_string(); return STRING; } YY_BREAK case 9: /* rule 9 can match eol */ YY_RULE_SETUP -#line 82 "sel-lex.l" { ++lineno; } YY_BREAK case 10: YY_RULE_SETUP -#line 83 "sel-lex.l" { return *yytext; } YY_BREAK case 11: YY_RULE_SETUP -#line 84 "sel-lex.l" ; YY_BREAK case 12: YY_RULE_SETUP -#line 85 "sel-lex.l" ECHO; YY_BREAK -#line 870 "sel-lex.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1865,10 +1842,6 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 85 "sel-lex.l" - - - static char * handle_string(void) { -- cgit