diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2018-08-03 20:29:50 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2018-08-03 20:29:50 (GMT) |
| commit | b8525c3dd6b1e98d1b8754cfeb25a2f8a5a56479 (patch) | |
| tree | cce6ece606536feed1304203c11ee3cb446ba774 /tksao/frame/contourparser.C | |
| parent | f0f09fa30fea1f957e2a7c98b9d66431c2e31df7 (diff) | |
| download | blt-b8525c3dd6b1e98d1b8754cfeb25a2f8a5a56479.zip blt-b8525c3dd6b1e98d1b8754cfeb25a2f8a5a56479.tar.gz blt-b8525c3dd6b1e98d1b8754cfeb25a2f8a5a56479.tar.bz2 | |
simplify coord system options
Diffstat (limited to 'tksao/frame/contourparser.C')
| -rw-r--r-- | tksao/frame/contourparser.C | 822 |
1 files changed, 399 insertions, 423 deletions
diff --git a/tksao/frame/contourparser.C b/tksao/frame/contourparser.C index 5a384f6..45003e2 100644 --- a/tksao/frame/contourparser.C +++ b/tksao/frame/contourparser.C @@ -94,55 +94,52 @@ ECLIPTIC_ = 275, FALSE_ = 276, FK4_ = 277, - FK4_NO_E_ = 278, - FK5_ = 279, - GALACTIC_ = 280, - GLOBAL_ = 281, - HELIOECLIPTIC_ = 282, - ICRS_ = 283, - IMAGE_ = 284, - J2000_ = 285, - LEVEL_ = 286, - LEVELS_ = 287, - LINEAR_ = 288, - N_ = 289, - NO_ = 290, - OFF_ = 291, - ON_ = 292, - PHYSICAL_ = 293, - SUPERGALACTIC_ = 294, - TRUE_ = 295, - VERSION_ = 296, - WCS_ = 297, - WCSA_ = 298, - WCSB_ = 299, - WCSC_ = 300, - WCSD_ = 301, - WCSE_ = 302, - WCSF_ = 303, - WCSG_ = 304, - WCSH_ = 305, - WCSI_ = 306, - WCSJ_ = 307, - WCSK_ = 308, - WCSL_ = 309, - WCSM_ = 310, - WCSN_ = 311, - WCSO_ = 312, - WCSP_ = 313, - WCSQ_ = 314, - WCSR_ = 315, - WCSS_ = 316, - WCST_ = 317, - WCSU_ = 318, - WCSV_ = 319, - WCSW_ = 320, - WCSX_ = 321, - WCSY_ = 322, - WCSZ_ = 323, - WIDTH_ = 324, - Y_ = 325, - YES_ = 326 + FK5_ = 278, + GALACTIC_ = 279, + GLOBAL_ = 280, + ICRS_ = 281, + IMAGE_ = 282, + J2000_ = 283, + LEVEL_ = 284, + LEVELS_ = 285, + LINEAR_ = 286, + N_ = 287, + NO_ = 288, + OFF_ = 289, + ON_ = 290, + PHYSICAL_ = 291, + TRUE_ = 292, + VERSION_ = 293, + WCS_ = 294, + WCSA_ = 295, + WCSB_ = 296, + WCSC_ = 297, + WCSD_ = 298, + WCSE_ = 299, + WCSF_ = 300, + WCSG_ = 301, + WCSH_ = 302, + WCSI_ = 303, + WCSJ_ = 304, + WCSK_ = 305, + WCSL_ = 306, + WCSM_ = 307, + WCSN_ = 308, + WCSO_ = 309, + WCSP_ = 310, + WCSQ_ = 311, + WCSR_ = 312, + WCSS_ = 313, + WCST_ = 314, + WCSU_ = 315, + WCSV_ = 316, + WCSW_ = 317, + WCSX_ = 318, + WCSY_ = 319, + WCSZ_ = 320, + WIDTH_ = 321, + Y_ = 322, + YES_ = 323 }; #endif /* Tokens. */ @@ -166,55 +163,52 @@ #define ECLIPTIC_ 275 #define FALSE_ 276 #define FK4_ 277 -#define FK4_NO_E_ 278 -#define FK5_ 279 -#define GALACTIC_ 280 -#define GLOBAL_ 281 -#define HELIOECLIPTIC_ 282 -#define ICRS_ 283 -#define IMAGE_ 284 -#define J2000_ 285 -#define LEVEL_ 286 -#define LEVELS_ 287 -#define LINEAR_ 288 -#define N_ 289 -#define NO_ 290 -#define OFF_ 291 -#define ON_ 292 -#define PHYSICAL_ 293 -#define SUPERGALACTIC_ 294 -#define TRUE_ 295 -#define VERSION_ 296 -#define WCS_ 297 -#define WCSA_ 298 -#define WCSB_ 299 -#define WCSC_ 300 -#define WCSD_ 301 -#define WCSE_ 302 -#define WCSF_ 303 -#define WCSG_ 304 -#define WCSH_ 305 -#define WCSI_ 306 -#define WCSJ_ 307 -#define WCSK_ 308 -#define WCSL_ 309 -#define WCSM_ 310 -#define WCSN_ 311 -#define WCSO_ 312 -#define WCSP_ 313 -#define WCSQ_ 314 -#define WCSR_ 315 -#define WCSS_ 316 -#define WCST_ 317 -#define WCSU_ 318 -#define WCSV_ 319 -#define WCSW_ 320 -#define WCSX_ 321 -#define WCSY_ 322 -#define WCSZ_ 323 -#define WIDTH_ 324 -#define Y_ 325 -#define YES_ 326 +#define FK5_ 278 +#define GALACTIC_ 279 +#define GLOBAL_ 280 +#define ICRS_ 281 +#define IMAGE_ 282 +#define J2000_ 283 +#define LEVEL_ 284 +#define LEVELS_ 285 +#define LINEAR_ 286 +#define N_ 287 +#define NO_ 288 +#define OFF_ 289 +#define ON_ 290 +#define PHYSICAL_ 291 +#define TRUE_ 292 +#define VERSION_ 293 +#define WCS_ 294 +#define WCSA_ 295 +#define WCSB_ 296 +#define WCSC_ 297 +#define WCSD_ 298 +#define WCSE_ 299 +#define WCSF_ 300 +#define WCSG_ 301 +#define WCSH_ 302 +#define WCSI_ 303 +#define WCSJ_ 304 +#define WCSK_ 305 +#define WCSL_ 306 +#define WCSM_ 307 +#define WCSN_ 308 +#define WCSO_ 309 +#define WCSP_ 310 +#define WCSQ_ 311 +#define WCSR_ 312 +#define WCSS_ 313 +#define WCST_ 314 +#define WCSU_ 315 +#define WCSV_ 316 +#define WCSW_ 317 +#define WCSX_ 318 +#define WCSY_ 319 +#define WCSZ_ 320 +#define WIDTH_ 321 +#define Y_ 322 +#define YES_ 323 @@ -294,7 +288,7 @@ typedef union YYSTYPE double vector[3]; } /* Line 193 of yacc.c. */ -#line 298 "frame/contourparser.C" +#line 292 "frame/contourparser.C" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -307,7 +301,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 311 "frame/contourparser.C" +#line 305 "frame/contourparser.C" #ifdef short # undef short @@ -522,20 +516,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 292 +#define YYLAST 283 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 79 +#define YYNTOKENS 76 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 31 /* YYNRULES -- Number of rules. */ -#define YYNRULES 115 +#define YYNRULES 112 /* YYNRULES -- Number of states. */ -#define YYNSTATES 175 +#define YYNSTATES 172 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 326 +#define YYMAXUTOK 323 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -544,12 +538,12 @@ union yyalloc static const yytype_uint8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 76, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 73, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 75, 2, 2, 2, 2, - 73, 74, 2, 2, 78, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 77, - 2, 72, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 72, 2, 2, 2, 2, + 70, 71, 2, 2, 75, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 74, + 2, 69, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -575,7 +569,7 @@ static const yytype_uint8 yytranslate[] = 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, - 65, 66, 67, 68, 69, 70, 71 + 65, 66, 67, 68 }; #if YYDEBUG @@ -592,61 +586,61 @@ static const yytype_uint16 yyprhs[] = 147, 149, 151, 153, 155, 157, 159, 161, 163, 165, 167, 169, 171, 173, 175, 177, 179, 181, 183, 185, 187, 189, 191, 193, 195, 197, 199, 201, 203, 205, - 207, 209, 211, 213, 215, 217, 219, 223, 225, 229, - 233, 238, 242, 246, 250, 252, 256, 260, 265, 269, - 273, 277, 281, 285, 289, 293 + 207, 209, 211, 213, 217, 219, 223, 227, 232, 236, + 240, 244, 246, 250, 254, 259, 263, 267, 271, 275, + 279, 283, 287 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int8 yyrhs[] = { - 80, 0, -1, 100, 81, -1, 81, 82, 92, -1, - 82, 92, -1, -1, 18, 94, -1, 41, -1, 26, - 105, 90, -1, 102, 90, -1, 104, 90, -1, 33, - 90, -1, 32, 72, 73, 86, 74, -1, -1, 31, - 72, 93, 83, 101, 90, 87, -1, -1, 31, 72, - 93, 84, 101, 107, 90, 87, -1, 73, 90, -1, - 88, -1, 74, 90, -1, -1, 75, 85, 5, -1, - 86, 96, 93, -1, 93, -1, -1, 88, 96, 89, - -1, 89, -1, 109, 90, -1, -1, -1, 75, 91, - 5, -1, 76, -1, 77, -1, 12, -1, 4, -1, - 3, -1, 37, -1, 36, -1, 3, -1, 71, -1, - 70, -1, 37, -1, 40, -1, 35, -1, 34, -1, - 36, -1, 21, -1, -1, 78, -1, 9, -1, 10, - -1, 11, -1, -1, -1, 29, -1, 38, -1, 19, - -1, 13, -1, 103, -1, 42, -1, 43, -1, 44, - -1, 45, -1, 46, -1, 47, -1, 48, -1, 49, - -1, 50, -1, 51, -1, 52, -1, 53, -1, 54, - -1, 55, -1, 56, -1, 57, -1, 58, -1, 59, - -1, 60, -1, 61, -1, 62, -1, 63, -1, 64, - -1, 65, -1, 66, -1, 67, -1, 68, -1, 22, - -1, 14, -1, 23, -1, 24, -1, 30, -1, 28, - -1, 25, -1, 39, -1, 20, -1, 27, -1, 105, - 96, 106, -1, 106, -1, 15, 72, 5, -1, 16, - 72, 95, -1, 17, 72, 3, 3, -1, 42, 72, - 103, -1, 69, 72, 3, -1, 107, 96, 108, -1, - 108, -1, 15, 72, 5, -1, 16, 72, 95, -1, - 17, 72, 3, 3, -1, 69, 72, 3, -1, 97, - 96, 97, -1, 98, 96, 99, -1, 99, 96, 99, - -1, 93, 96, 93, -1, 6, 96, 6, -1, 8, - 96, 8, -1, 7, 96, 7, -1 + 77, 0, -1, 97, 78, -1, 78, 79, 89, -1, + 79, 89, -1, -1, 18, 91, -1, 38, -1, 25, + 102, 87, -1, 99, 87, -1, 101, 87, -1, 31, + 87, -1, 30, 69, 70, 83, 71, -1, -1, 29, + 69, 90, 80, 98, 87, 84, -1, -1, 29, 69, + 90, 81, 98, 104, 87, 84, -1, 70, 87, -1, + 85, -1, 71, 87, -1, -1, 72, 82, 5, -1, + 83, 93, 90, -1, 90, -1, -1, 85, 93, 86, + -1, 86, -1, 106, 87, -1, -1, -1, 72, 88, + 5, -1, 73, -1, 74, -1, 12, -1, 4, -1, + 3, -1, 35, -1, 34, -1, 3, -1, 68, -1, + 67, -1, 35, -1, 37, -1, 33, -1, 32, -1, + 34, -1, 21, -1, -1, 75, -1, 9, -1, 10, + -1, 11, -1, -1, -1, 27, -1, 36, -1, 19, + -1, 13, -1, 100, -1, 39, -1, 40, -1, 41, + -1, 42, -1, 43, -1, 44, -1, 45, -1, 46, + -1, 47, -1, 48, -1, 49, -1, 50, -1, 51, + -1, 52, -1, 53, -1, 54, -1, 55, -1, 56, + -1, 57, -1, 58, -1, 59, -1, 60, -1, 61, + -1, 62, -1, 63, -1, 64, -1, 65, -1, 22, + -1, 14, -1, 23, -1, 28, -1, 26, -1, 24, + -1, 20, -1, 102, 93, 103, -1, 103, -1, 15, + 69, 5, -1, 16, 69, 92, -1, 17, 69, 3, + 3, -1, 39, 69, 100, -1, 66, 69, 3, -1, + 104, 93, 105, -1, 105, -1, 15, 69, 5, -1, + 16, 69, 92, -1, 17, 69, 3, 3, -1, 66, + 69, 3, -1, 94, 93, 94, -1, 95, 93, 96, + -1, 96, 93, 96, -1, 90, 93, 90, -1, 6, + 93, 6, -1, 8, 93, 8, -1, 7, 93, 7, + -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 148, 148, 151, 152, 155, 156, 157, 159, 160, - 164, 169, 173, 174, 174, 175, 175, 176, 181, 182, - 187, 187, 190, 191, 195, 202, 203, 206, 213, 214, - 214, 217, 218, 219, 227, 228, 231, 232, 235, 237, - 238, 239, 240, 242, 243, 244, 245, 248, 249, 252, - 255, 258, 261, 275, 284, 285, 286, 287, 288, 291, - 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, - 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, - 312, 313, 314, 315, 316, 317, 320, 321, 322, 323, - 324, 325, 326, 327, 328, 329, 332, 333, 336, 337, - 338, 339, 340, 343, 344, 347, 348, 349, 350, 353, - 366, 374, 382, 389, 397, 404 + 0, 145, 145, 148, 149, 152, 153, 154, 156, 157, + 161, 166, 170, 171, 171, 172, 172, 173, 178, 179, + 184, 184, 187, 188, 192, 199, 200, 203, 210, 211, + 211, 214, 215, 216, 224, 225, 228, 229, 232, 234, + 235, 236, 237, 239, 240, 241, 242, 245, 246, 249, + 252, 255, 258, 272, 281, 282, 283, 284, 285, 288, + 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, + 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, + 309, 310, 311, 312, 313, 314, 317, 318, 319, 320, + 321, 322, 323, 326, 327, 330, 331, 332, 333, 334, + 337, 338, 341, 342, 343, 344, 347, 360, 368, 376, + 383, 391, 398 }; #endif @@ -658,19 +652,18 @@ static const char *const yytname[] = "$end", "error", "$undefined", "INT", "REAL", "STRING", "ANGDEGREE", "PHYCOORD", "IMGCOORD", "SEXSTR", "HMSSTR", "DMSSTR", "EOF_", "AMPLIFIER_", "B1950_", "COLOR_", "DASH_", "DASHLIST_", "DEBUG_", - "DETECTOR_", "ECLIPTIC_", "FALSE_", "FK4_", "FK4_NO_E_", "FK5_", - "GALACTIC_", "GLOBAL_", "HELIOECLIPTIC_", "ICRS_", "IMAGE_", "J2000_", - "LEVEL_", "LEVELS_", "LINEAR_", "N_", "NO_", "OFF_", "ON_", "PHYSICAL_", - "SUPERGALACTIC_", "TRUE_", "VERSION_", "WCS_", "WCSA_", "WCSB_", "WCSC_", - "WCSD_", "WCSE_", "WCSF_", "WCSG_", "WCSH_", "WCSI_", "WCSJ_", "WCSK_", - "WCSL_", "WCSM_", "WCSN_", "WCSO_", "WCSP_", "WCSQ_", "WCSR_", "WCSS_", - "WCST_", "WCSU_", "WCSV_", "WCSW_", "WCSX_", "WCSY_", "WCSZ_", "WIDTH_", - "Y_", "YES_", "'='", "'('", "')'", "'#'", "'\\n'", "';'", "','", - "$accept", "start", "commands", "command", "@1", "@2", "@3", "levels", - "newcl", "nodes", "node", "comment", "@4", "terminator", "numeric", - "debug", "yesno", "sp", "sexagesimal", "hms", "dms", "initGlobal", - "initLocal", "coordSystem", "wcsSystem", "skyFrame", "global", - "globalProperty", "local", "localProperty", "coord", 0 + "DETECTOR_", "ECLIPTIC_", "FALSE_", "FK4_", "FK5_", "GALACTIC_", + "GLOBAL_", "ICRS_", "IMAGE_", "J2000_", "LEVEL_", "LEVELS_", "LINEAR_", + "N_", "NO_", "OFF_", "ON_", "PHYSICAL_", "TRUE_", "VERSION_", "WCS_", + "WCSA_", "WCSB_", "WCSC_", "WCSD_", "WCSE_", "WCSF_", "WCSG_", "WCSH_", + "WCSI_", "WCSJ_", "WCSK_", "WCSL_", "WCSM_", "WCSN_", "WCSO_", "WCSP_", + "WCSQ_", "WCSR_", "WCSS_", "WCST_", "WCSU_", "WCSV_", "WCSW_", "WCSX_", + "WCSY_", "WCSZ_", "WIDTH_", "Y_", "YES_", "'='", "'('", "')'", "'#'", + "'\\n'", "';'", "','", "$accept", "start", "commands", "command", "@1", + "@2", "@3", "levels", "newcl", "nodes", "node", "comment", "@4", + "terminator", "numeric", "debug", "yesno", "sp", "sexagesimal", "hms", + "dms", "initGlobal", "initLocal", "coordSystem", "wcsSystem", "skyFrame", + "global", "globalProperty", "local", "localProperty", "coord", 0 }; #endif @@ -685,26 +678,26 @@ static const yytype_uint16 yytoknum[] = 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, - 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, - 325, 326, 61, 40, 41, 35, 10, 59, 44 + 315, 316, 317, 318, 319, 320, 321, 322, 323, 61, + 40, 41, 35, 10, 59, 44 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 79, 80, 81, 81, 82, 82, 82, 82, 82, - 82, 82, 82, 83, 82, 84, 82, 82, 82, 82, - 85, 82, 86, 86, 87, 88, 88, 89, 90, 91, - 90, 92, 92, 92, 93, 93, 94, 94, 95, 95, - 95, 95, 95, 95, 95, 95, 95, 96, 96, 97, - 98, 99, 100, 101, 102, 102, 102, 102, 102, 103, - 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, - 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, - 103, 103, 103, 103, 103, 103, 104, 104, 104, 104, - 104, 104, 104, 104, 104, 104, 105, 105, 106, 106, - 106, 106, 106, 107, 107, 108, 108, 108, 108, 109, - 109, 109, 109, 109, 109, 109 + 0, 76, 77, 78, 78, 79, 79, 79, 79, 79, + 79, 79, 79, 80, 79, 81, 79, 79, 79, 79, + 82, 79, 83, 83, 84, 85, 85, 86, 87, 88, + 87, 89, 89, 89, 90, 90, 91, 91, 92, 92, + 92, 92, 92, 92, 92, 92, 92, 93, 93, 94, + 95, 96, 97, 98, 99, 99, 99, 99, 99, 100, + 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, + 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, + 100, 100, 100, 100, 100, 100, 101, 101, 101, 101, + 101, 101, 101, 102, 102, 103, 103, 103, 103, 103, + 104, 104, 105, 105, 105, 105, 106, 106, 106, 106, + 106, 106, 106 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -719,9 +712,9 @@ static const yytype_uint8 yyr2[] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 3, 1, 3, 3, - 4, 3, 3, 3, 1, 3, 3, 4, 3, 3, - 3, 3, 3, 3, 3, 3 + 1, 1, 1, 3, 1, 3, 3, 4, 3, 3, + 3, 1, 3, 3, 4, 3, 3, 3, 3, 3, + 3, 3, 3 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -730,66 +723,66 @@ static const yytype_uint8 yyr2[] = static const yytype_uint8 yydefact[] = { 52, 0, 5, 1, 35, 34, 47, 47, 47, 49, - 50, 51, 57, 87, 0, 56, 94, 86, 88, 89, - 92, 0, 95, 91, 54, 90, 0, 0, 28, 55, - 93, 7, 59, 60, 61, 62, 63, 64, 65, 66, - 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, - 77, 78, 79, 80, 81, 82, 83, 84, 85, 28, - 28, 20, 5, 0, 47, 26, 47, 47, 47, 47, - 28, 58, 28, 28, 48, 0, 0, 0, 37, 36, - 6, 0, 0, 0, 0, 0, 47, 97, 0, 0, - 29, 11, 17, 19, 0, 0, 33, 31, 32, 4, - 0, 0, 0, 0, 0, 9, 10, 27, 113, 115, - 114, 0, 0, 0, 0, 0, 8, 0, 13, 0, - 0, 21, 3, 25, 112, 109, 110, 111, 98, 38, - 46, 44, 43, 45, 41, 42, 40, 39, 99, 0, - 101, 102, 96, 53, 53, 47, 23, 30, 100, 28, - 0, 12, 0, 24, 0, 0, 0, 0, 47, 104, - 22, 14, 0, 0, 0, 0, 24, 0, 105, 106, - 0, 108, 16, 103, 107 + 50, 51, 57, 87, 0, 56, 92, 86, 88, 91, + 0, 90, 54, 89, 0, 0, 28, 55, 7, 59, + 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, + 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 28, 28, 20, 5, + 0, 47, 26, 47, 47, 47, 47, 28, 58, 28, + 28, 48, 0, 0, 0, 37, 36, 6, 0, 0, + 0, 0, 0, 47, 94, 0, 0, 29, 11, 17, + 19, 0, 0, 33, 31, 32, 4, 0, 0, 0, + 0, 0, 9, 10, 27, 110, 112, 111, 0, 0, + 0, 0, 0, 8, 0, 13, 0, 0, 21, 3, + 25, 109, 106, 107, 108, 95, 38, 46, 44, 43, + 45, 41, 42, 40, 39, 96, 0, 98, 99, 93, + 53, 53, 47, 23, 30, 97, 28, 0, 12, 0, + 24, 0, 0, 0, 0, 47, 101, 22, 14, 0, + 0, 0, 0, 24, 0, 102, 103, 0, 105, 16, + 100, 104 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 62, 63, 143, 144, 94, 145, 161, 64, - 65, 91, 120, 99, 66, 80, 138, 75, 67, 68, - 69, 2, 149, 70, 71, 72, 86, 87, 158, 159, - 73 + -1, 1, 59, 60, 140, 141, 91, 142, 158, 61, + 62, 88, 117, 96, 63, 77, 135, 72, 64, 65, + 66, 2, 146, 67, 68, 69, 83, 84, 155, 156, + 70 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -93 +#define YYPACT_NINF -80 static const yytype_int16 yypact[] = { - -93, 21, 190, -93, -93, -93, -70, -70, -70, -93, - -93, -93, -93, -93, -30, -93, -93, -93, -93, -93, - -93, 27, -93, -93, -93, -93, -49, -48, -50, -93, - -93, -93, -93, -93, -93, -93, -93, -93, -93, -93, - -93, -93, -93, -93, -93, -93, -93, -93, -93, -93, - -93, -93, -93, -93, -93, -93, -93, -93, -93, -50, - -50, -93, 117, 8, 5, -93, -70, -70, -70, -70, - -50, -93, -50, -50, -93, 20, 23, 32, -93, -93, - -93, -44, -41, -33, -23, -22, -2, -93, 15, -21, - -93, -93, -93, -93, 46, 8, -93, -93, -93, -93, - 99, 15, 44, 43, 43, -93, -93, -93, -93, -93, - -93, 50, 1, 53, 224, 55, -93, 27, 17, 15, - 58, -93, -93, -93, -93, -93, -93, -93, -93, -93, - -93, -93, -93, -93, -93, -93, -93, -93, -93, 61, - -93, -93, -93, -93, -93, -69, -93, -93, -93, -50, - 31, -93, 15, -93, -6, -5, -4, 16, -2, -93, - -93, -93, 60, 1, 67, 74, -93, 31, -93, -93, - 77, -93, -93, -93, -93 + -80, 10, 184, -80, -80, -80, -63, -63, -63, -80, + -80, -80, -80, -80, -27, -80, -80, -80, -80, -80, + 9, -80, -80, -80, -55, -51, -49, -80, -80, -80, + -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, + -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, + -80, -80, -80, -80, -80, -80, -49, -49, -80, 114, + 8, 5, -80, -63, -63, -63, -63, -49, -80, -49, + -49, -80, 15, 23, 37, -80, -80, -80, -23, -22, + -20, -19, -18, -1, -80, 28, -17, -80, -80, -80, + -80, 47, 8, -80, -80, -80, -80, 96, 28, 46, + 49, 49, -80, -80, -80, -80, -80, -80, 56, 1, + 59, 218, 60, -80, 9, 24, 28, 61, -80, -80, + -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, + -80, -80, -80, -80, -80, -80, 62, -80, -80, -80, + -80, -80, -66, -80, -80, -80, -49, 27, -80, 28, + -80, -5, -2, 14, 16, -1, -80, -80, -80, 72, + 1, 81, 83, -80, 27, -80, -80, 84, -80, -80, + -80, -80 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int8 yypgoto[] = { - -93, -93, -93, 25, -93, -93, -93, -93, -77, -93, - -10, -57, -93, -1, -74, -93, -72, -7, -9, -93, - -92, -93, -47, -93, -19, -93, -93, -18, -93, -63, - -93 + -80, -80, -80, 29, -80, -80, -80, -80, -74, -80, + -6, -54, -80, 2, -79, -80, -65, -7, -3, -80, + -73, -80, -44, -80, -13, -80, -80, -4, -80, -56, + -80 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -799,94 +792,92 @@ static const yytype_int8 yypgoto[] = #define YYTABLE_NINF -29 static const yytype_int16 yytable[] = { - 76, 77, 92, 93, 129, 151, 78, 79, 74, 74, - -28, 126, 127, 105, 118, 106, 107, -18, 4, 5, - 96, 3, 130, 88, 89, 90, 108, 124, 111, 116, - 109, 112, -15, -15, -15, 131, 132, 133, 134, 113, - 110, 135, 81, 82, 83, 146, 154, 155, 156, 114, - 115, 121, 119, 9, 11, 128, 139, 100, 141, 101, - 102, 103, 104, 147, 148, 168, 162, 163, 164, 84, - 170, 136, 137, 90, -28, -28, 74, 171, 160, 117, - 174, -18, -18, 74, 97, 98, -15, 95, 165, 172, - 123, 169, 153, 125, 122, 140, 85, 150, 0, 142, - 157, 166, 4, 5, 173, 6, 7, 8, 9, 10, - 11, 0, 0, 0, 0, 0, 0, -2, 0, 0, - 4, 5, 0, 6, 7, 8, 9, 10, 11, 0, - 12, 13, 0, 0, 0, 14, 15, 16, 152, 17, - 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, - 28, 167, 0, 0, 0, 29, 30, 0, 31, 32, - 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, - 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, - 53, 54, 55, 56, 57, 58, 0, 0, 0, 0, - 59, 60, 61, 4, 5, 0, 6, 7, 8, 9, - 10, 11, 0, 12, 13, 0, 0, 0, 14, 15, - 16, 0, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 0, 0, 0, 0, 29, 30, - 0, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, - 50, 51, 52, 53, 54, 55, 56, 57, 58, 0, - 0, 0, 0, 59, 60, 61, 32, 33, 34, 35, + 73, 74, 89, 90, 126, 148, 115, 75, 76, 71, + 3, -28, 71, 102, 85, 103, 104, -18, 86, 121, + 93, 105, 127, 87, 78, 79, 80, 123, 124, 113, + 106, 4, 5, 128, 129, 130, 131, 143, 132, -15, + -15, -15, 151, 152, 153, 107, 108, 109, 81, 110, + 111, 112, 118, 116, 97, 9, 98, 99, 100, 101, + 11, 125, 136, 138, 159, 145, 144, 160, 133, 134, + 157, 87, -28, -28, 71, 82, 114, 165, -18, -18, + 71, 94, 95, 161, 167, 162, 168, 171, 92, 169, + -15, 120, 150, 154, 119, 166, 122, 147, 137, 4, + 5, 163, 6, 7, 8, 9, 10, 11, 170, 0, + 139, 0, 0, 0, -2, 0, 0, 4, 5, 0, + 6, 7, 8, 9, 10, 11, 0, 12, 13, 0, + 0, 0, 14, 15, 16, 149, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 0, 0, 164, 0, + 27, 0, 28, 29, 30, 31, 32, 33, 34, 35, + 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, + 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, + 0, 0, 0, 0, 56, 57, 58, 4, 5, 0, + 6, 7, 8, 9, 10, 11, 0, 12, 13, 0, + 0, 0, 14, 15, 16, 0, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 0, 0, 0, 0, + 27, 0, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 58 + 0, 0, 0, 0, 56, 57, 58, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, + 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, + 52, 53, 54, 55 }; static const yytype_int16 yycheck[] = { - 7, 8, 59, 60, 3, 74, 36, 37, 78, 78, - 12, 103, 104, 70, 88, 72, 73, 12, 3, 4, - 12, 0, 21, 72, 72, 75, 6, 101, 72, 86, - 7, 72, 15, 16, 17, 34, 35, 36, 37, 72, - 8, 40, 15, 16, 17, 119, 15, 16, 17, 72, - 72, 5, 73, 9, 11, 5, 3, 64, 3, 66, - 67, 68, 69, 5, 3, 5, 72, 72, 72, 42, - 3, 70, 71, 75, 76, 77, 78, 3, 152, 86, - 3, 76, 77, 78, 76, 77, 69, 62, 72, 166, - 100, 163, 149, 102, 95, 114, 69, 144, -1, 117, - 69, 158, 3, 4, 167, 6, 7, 8, 9, 10, - 11, -1, -1, -1, -1, -1, -1, 0, -1, -1, - 3, 4, -1, 6, 7, 8, 9, 10, 11, -1, - 13, 14, -1, -1, -1, 18, 19, 20, 145, 22, - 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, - 33, 158, -1, -1, -1, 38, 39, -1, 41, 42, - 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, - 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, - 63, 64, 65, 66, 67, 68, -1, -1, -1, -1, - 73, 74, 75, 3, 4, -1, 6, 7, 8, 9, - 10, 11, -1, 13, 14, -1, -1, -1, 18, 19, - 20, -1, 22, 23, 24, 25, 26, 27, 28, 29, - 30, 31, 32, 33, -1, -1, -1, -1, 38, 39, - -1, 41, 42, 43, 44, 45, 46, 47, 48, 49, - 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, - 60, 61, 62, 63, 64, 65, 66, 67, 68, -1, - -1, -1, -1, 73, 74, 75, 42, 43, 44, 45, + 7, 8, 56, 57, 3, 71, 85, 34, 35, 75, + 0, 12, 75, 67, 69, 69, 70, 12, 69, 98, + 12, 6, 21, 72, 15, 16, 17, 100, 101, 83, + 7, 3, 4, 32, 33, 34, 35, 116, 37, 15, + 16, 17, 15, 16, 17, 8, 69, 69, 39, 69, + 69, 69, 5, 70, 61, 9, 63, 64, 65, 66, + 11, 5, 3, 3, 69, 3, 5, 69, 67, 68, + 149, 72, 73, 74, 75, 66, 83, 5, 73, 74, + 75, 73, 74, 69, 3, 69, 3, 3, 59, 163, + 66, 97, 146, 66, 92, 160, 99, 141, 111, 3, + 4, 155, 6, 7, 8, 9, 10, 11, 164, -1, + 114, -1, -1, -1, 0, -1, -1, 3, 4, -1, + 6, 7, 8, 9, 10, 11, -1, 13, 14, -1, + -1, -1, 18, 19, 20, 142, 22, 23, 24, 25, + 26, 27, 28, 29, 30, 31, -1, -1, 155, -1, + 36, -1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 66, 67, 68 + -1, -1, -1, -1, 70, 71, 72, 3, 4, -1, + 6, 7, 8, 9, 10, 11, -1, 13, 14, -1, + -1, -1, 18, 19, 20, -1, 22, 23, 24, 25, + 26, 27, 28, 29, 30, 31, -1, -1, -1, -1, + 36, -1, 38, 39, 40, 41, 42, 43, 44, 45, + 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, + -1, -1, -1, -1, 70, 71, 72, 39, 40, 41, + 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, + 62, 63, 64, 65 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 80, 100, 0, 3, 4, 6, 7, 8, 9, + 0, 77, 97, 0, 3, 4, 6, 7, 8, 9, 10, 11, 13, 14, 18, 19, 20, 22, 23, 24, - 25, 26, 27, 28, 29, 30, 31, 32, 33, 38, - 39, 41, 42, 43, 44, 45, 46, 47, 48, 49, + 25, 26, 27, 28, 29, 30, 31, 36, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, - 60, 61, 62, 63, 64, 65, 66, 67, 68, 73, - 74, 75, 81, 82, 88, 89, 93, 97, 98, 99, - 102, 103, 104, 109, 78, 96, 96, 96, 36, 37, - 94, 15, 16, 17, 42, 69, 105, 106, 72, 72, - 75, 90, 90, 90, 85, 82, 12, 76, 77, 92, - 96, 96, 96, 96, 96, 90, 90, 90, 6, 7, - 8, 72, 72, 72, 72, 72, 90, 96, 93, 73, - 91, 5, 92, 89, 93, 97, 99, 99, 5, 3, - 21, 34, 35, 36, 37, 40, 70, 71, 95, 3, - 103, 3, 106, 83, 84, 86, 93, 5, 3, 101, - 101, 74, 96, 90, 15, 16, 17, 69, 107, 108, - 93, 87, 72, 72, 72, 72, 90, 96, 5, 95, - 3, 3, 87, 108, 3 + 60, 61, 62, 63, 64, 65, 70, 71, 72, 78, + 79, 85, 86, 90, 94, 95, 96, 99, 100, 101, + 106, 75, 93, 93, 93, 34, 35, 91, 15, 16, + 17, 39, 66, 102, 103, 69, 69, 72, 87, 87, + 87, 82, 79, 12, 73, 74, 89, 93, 93, 93, + 93, 93, 87, 87, 87, 6, 7, 8, 69, 69, + 69, 69, 69, 87, 93, 90, 70, 88, 5, 89, + 86, 90, 94, 96, 96, 5, 3, 21, 32, 33, + 34, 35, 37, 67, 68, 92, 3, 100, 3, 103, + 80, 81, 83, 90, 5, 3, 98, 98, 71, 93, + 87, 15, 16, 17, 66, 104, 105, 90, 84, 69, + 69, 69, 69, 87, 93, 5, 92, 3, 3, 84, + 105, 3 }; #define yyerrok (yyerrstatus = 0) @@ -1714,19 +1705,19 @@ yyreduce: switch (yyn) { case 7: -#line 157 "frame/contourparser.Y" +#line 154 "frame/contourparser.Y" {cerr << "DS9 Contour File 7.5" << endl;;} break; case 9: -#line 161 "frame/contourparser.Y" +#line 158 "frame/contourparser.Y" { globalSystem=(Coord::CoordSystem)(yyvsp[(1) - (2)].integer); ;} break; case 10: -#line 165 "frame/contourparser.Y" +#line 162 "frame/contourparser.Y" { globalSystem=globalWCS; globalSky=(Coord::SkyFrame)(yyvsp[(1) - (2)].integer); @@ -1734,24 +1725,24 @@ yyreduce: break; case 11: -#line 170 "frame/contourparser.Y" +#line 167 "frame/contourparser.Y" { globalSystem=globalWCS; globalSky=Coord::FK5; ;} break; case 13: -#line 174 "frame/contourparser.Y" +#line 171 "frame/contourparser.Y" {localLevel = (yyvsp[(3) - (3)].real);} break; case 15: -#line 175 "frame/contourparser.Y" +#line 172 "frame/contourparser.Y" {localLevel = (yyvsp[(3) - (3)].real);} break; case 17: -#line 177 "frame/contourparser.Y" +#line 174 "frame/contourparser.Y" { if (cl) cc = new Contour(cl); @@ -1759,7 +1750,7 @@ yyreduce: break; case 19: -#line 183 "frame/contourparser.Y" +#line 180 "frame/contourparser.Y" { if (cc && cl) cl->lcontour().append(cc); @@ -1767,12 +1758,12 @@ yyreduce: break; case 20: -#line 187 "frame/contourparser.Y" +#line 184 "frame/contourparser.Y" {DISCARD_(1);;} break; case 24: -#line 195 "frame/contourparser.Y" +#line 192 "frame/contourparser.Y" { if (cl) fr->contourAppendCmd(cl); @@ -1781,7 +1772,7 @@ yyreduce: break; case 27: -#line 207 "frame/contourparser.Y" +#line 204 "frame/contourparser.Y" { if (cc) cc->lvertex().append(new Vertex((yyvsp[(1) - (2)].vector))); @@ -1789,12 +1780,12 @@ yyreduce: break; case 29: -#line 214 "frame/contourparser.Y" +#line 211 "frame/contourparser.Y" {DISCARD_(1);;} break; case 33: -#line 220 "frame/contourparser.Y" +#line 217 "frame/contourparser.Y" { if (cl) fr->contourAppendCmd(cl); @@ -1803,87 +1794,87 @@ yyreduce: break; case 34: -#line 227 "frame/contourparser.Y" +#line 224 "frame/contourparser.Y" {(yyval.real)=(yyvsp[(1) - (1)].real);;} break; case 35: -#line 228 "frame/contourparser.Y" +#line 225 "frame/contourparser.Y" {(yyval.real)=(yyvsp[(1) - (1)].integer);;} break; case 36: -#line 231 "frame/contourparser.Y" +#line 228 "frame/contourparser.Y" {yydebug=1;;} break; case 37: -#line 232 "frame/contourparser.Y" +#line 229 "frame/contourparser.Y" {yydebug=0;;} break; case 38: -#line 235 "frame/contourparser.Y" +#line 232 "frame/contourparser.Y" {(yyval.integer)=((yyvsp[(1) - (1)].integer) ? 1 : 0);;} break; case 39: -#line 237 "frame/contourparser.Y" +#line 234 "frame/contourparser.Y" {(yyval.integer)=1;;} break; case 40: -#line 238 "frame/contourparser.Y" +#line 235 "frame/contourparser.Y" {(yyval.integer)=1;;} break; case 41: -#line 239 "frame/contourparser.Y" +#line 236 "frame/contourparser.Y" {(yyval.integer)=1;;} break; case 42: -#line 240 "frame/contourparser.Y" +#line 237 "frame/contourparser.Y" {(yyval.integer)=1;;} break; case 43: -#line 242 "frame/contourparser.Y" +#line 239 "frame/contourparser.Y" {(yyval.integer)=0;;} break; case 44: -#line 243 "frame/contourparser.Y" +#line 240 "frame/contourparser.Y" {(yyval.integer)=0;;} break; case 45: -#line 244 "frame/contourparser.Y" +#line 241 "frame/contourparser.Y" {(yyval.integer)=0;;} break; case 46: -#line 245 "frame/contourparser.Y" +#line 242 "frame/contourparser.Y" {(yyval.integer)=0;;} break; case 49: -#line 252 "frame/contourparser.Y" +#line 249 "frame/contourparser.Y" {(yyval.real) = parseSEXStr((yyvsp[(1) - (1)].str));;} break; case 50: -#line 255 "frame/contourparser.Y" +#line 252 "frame/contourparser.Y" {(yyval.real) = parseHMSStr((yyvsp[(1) - (1)].str));;} break; case 51: -#line 258 "frame/contourparser.Y" +#line 255 "frame/contourparser.Y" {(yyval.real) = parseDMSStr((yyvsp[(1) - (1)].str));;} break; case 52: -#line 261 "frame/contourparser.Y" +#line 258 "frame/contourparser.Y" { cl = NULL; cc = NULL; @@ -1899,7 +1890,7 @@ yyreduce: break; case 53: -#line 275 "frame/contourparser.Y" +#line 272 "frame/contourparser.Y" { strcpy(localColor,globalColor); localDash = globalDash; @@ -1910,262 +1901,247 @@ yyreduce: break; case 54: -#line 284 "frame/contourparser.Y" +#line 281 "frame/contourparser.Y" {(yyval.integer) = Coord::IMAGE;;} break; case 55: -#line 285 "frame/contourparser.Y" +#line 282 "frame/contourparser.Y" {(yyval.integer) = Coord::PHYSICAL;;} break; case 56: -#line 286 "frame/contourparser.Y" +#line 283 "frame/contourparser.Y" {(yyval.integer) = Coord::DETECTOR;;} break; case 57: -#line 287 "frame/contourparser.Y" +#line 284 "frame/contourparser.Y" {(yyval.integer) = Coord::AMPLIFIER;;} break; case 58: -#line 288 "frame/contourparser.Y" +#line 285 "frame/contourparser.Y" {(yyval.integer) = (yyvsp[(1) - (1)].integer); globalWCS = (Coord::CoordSystem)(yyvsp[(1) - (1)].integer);;} break; case 59: -#line 291 "frame/contourparser.Y" +#line 288 "frame/contourparser.Y" {(yyval.integer) = Coord::WCS;;} break; case 60: -#line 292 "frame/contourparser.Y" +#line 289 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSA;;} break; case 61: -#line 293 "frame/contourparser.Y" +#line 290 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSB;;} break; case 62: -#line 294 "frame/contourparser.Y" +#line 291 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSC;;} break; case 63: -#line 295 "frame/contourparser.Y" +#line 292 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSD;;} break; case 64: -#line 296 "frame/contourparser.Y" +#line 293 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSE;;} break; case 65: -#line 297 "frame/contourparser.Y" +#line 294 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSF;;} break; case 66: -#line 298 "frame/contourparser.Y" +#line 295 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSG;;} break; case 67: -#line 299 "frame/contourparser.Y" +#line 296 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSH;;} break; case 68: -#line 300 "frame/contourparser.Y" +#line 297 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSI;;} break; case 69: -#line 301 "frame/contourparser.Y" +#line 298 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSJ;;} break; case 70: -#line 302 "frame/contourparser.Y" +#line 299 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSK;;} break; case 71: -#line 303 "frame/contourparser.Y" +#line 300 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSL;;} break; case 72: -#line 304 "frame/contourparser.Y" +#line 301 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSM;;} break; case 73: -#line 305 "frame/contourparser.Y" +#line 302 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSN;;} break; case 74: -#line 306 "frame/contourparser.Y" +#line 303 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSO;;} break; case 75: -#line 307 "frame/contourparser.Y" +#line 304 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSP;;} break; case 76: -#line 308 "frame/contourparser.Y" +#line 305 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSQ;;} break; case 77: -#line 309 "frame/contourparser.Y" +#line 306 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSR;;} break; case 78: -#line 310 "frame/contourparser.Y" +#line 307 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSS;;} break; case 79: -#line 311 "frame/contourparser.Y" +#line 308 "frame/contourparser.Y" {(yyval.integer) = Coord::WCST;;} break; case 80: -#line 312 "frame/contourparser.Y" +#line 309 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSU;;} break; case 81: -#line 313 "frame/contourparser.Y" +#line 310 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSV;;} break; case 82: -#line 314 "frame/contourparser.Y" +#line 311 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSW;;} break; case 83: -#line 315 "frame/contourparser.Y" +#line 312 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSX;;} break; case 84: -#line 316 "frame/contourparser.Y" +#line 313 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSY;;} break; case 85: -#line 317 "frame/contourparser.Y" +#line 314 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSZ;;} break; case 86: -#line 320 "frame/contourparser.Y" +#line 317 "frame/contourparser.Y" {(yyval.integer) = Coord::FK4;;} break; case 87: -#line 321 "frame/contourparser.Y" +#line 318 "frame/contourparser.Y" {(yyval.integer) = Coord::FK4;;} break; case 88: -#line 322 "frame/contourparser.Y" - {(yyval.integer) = Coord::FK4_NO_E;;} +#line 319 "frame/contourparser.Y" + {(yyval.integer) = Coord::FK5;;} break; case 89: -#line 323 "frame/contourparser.Y" +#line 320 "frame/contourparser.Y" {(yyval.integer) = Coord::FK5;;} break; case 90: -#line 324 "frame/contourparser.Y" - {(yyval.integer) = Coord::FK5;;} - break; - - case 91: -#line 325 "frame/contourparser.Y" +#line 321 "frame/contourparser.Y" {(yyval.integer) = Coord::ICRS;;} break; - case 92: -#line 326 "frame/contourparser.Y" + case 91: +#line 322 "frame/contourparser.Y" {(yyval.integer) = Coord::GALACTIC;;} break; - case 93: -#line 327 "frame/contourparser.Y" - {(yyval.integer) = Coord::SUPERGALACTIC;;} - break; - - case 94: -#line 328 "frame/contourparser.Y" + case 92: +#line 323 "frame/contourparser.Y" {(yyval.integer) = Coord::ECLIPTIC;;} break; case 95: -#line 329 "frame/contourparser.Y" - {(yyval.integer) = Coord::HELIOECLIPTIC;;} - break; - - case 98: -#line 336 "frame/contourparser.Y" +#line 330 "frame/contourparser.Y" {strncpy(globalColor,(yyvsp[(3) - (3)].str),16);;} break; - case 99: -#line 337 "frame/contourparser.Y" + case 96: +#line 331 "frame/contourparser.Y" {globalDash = (yyvsp[(3) - (3)].integer);;} break; - case 100: -#line 338 "frame/contourparser.Y" + case 97: +#line 332 "frame/contourparser.Y" {globalDashList[0] =(yyvsp[(3) - (4)].integer); globalDashList[1] =(yyvsp[(4) - (4)].integer);;} break; - case 101: -#line 339 "frame/contourparser.Y" + case 98: +#line 333 "frame/contourparser.Y" {globalWCS = (Coord::CoordSystem)(yyvsp[(3) - (3)].integer);;} break; - case 102: -#line 340 "frame/contourparser.Y" + case 99: +#line 334 "frame/contourparser.Y" {globalWidth = (yyvsp[(3) - (3)].integer);;} break; - case 105: -#line 347 "frame/contourparser.Y" + case 102: +#line 341 "frame/contourparser.Y" {strncpy(localColor,(yyvsp[(3) - (3)].str),16);;} break; - case 106: -#line 348 "frame/contourparser.Y" + case 103: +#line 342 "frame/contourparser.Y" {localDash = (yyvsp[(3) - (3)].integer);;} break; - case 107: -#line 349 "frame/contourparser.Y" + case 104: +#line 343 "frame/contourparser.Y" {localDashList[0] =(yyvsp[(3) - (4)].integer); localDashList[1] =(yyvsp[(4) - (4)].integer);;} break; - case 108: -#line 350 "frame/contourparser.Y" + case 105: +#line 344 "frame/contourparser.Y" {localWidth = (yyvsp[(3) - (3)].integer);;} break; - case 109: -#line 354 "frame/contourparser.Y" + case 106: +#line 348 "frame/contourparser.Y" { Vector r; Coord::CoordSystem sys = checkWCSSystem(); @@ -2180,8 +2156,8 @@ yyreduce: ;} break; - case 110: -#line 367 "frame/contourparser.Y" + case 107: +#line 361 "frame/contourparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), checkWCSSystem(), checkWCSSky()); @@ -2191,8 +2167,8 @@ yyreduce: ;} break; - case 111: -#line 375 "frame/contourparser.Y" + case 108: +#line 369 "frame/contourparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), checkWCSSystem(), checkWCSSky()); @@ -2202,8 +2178,8 @@ yyreduce: ;} break; - case 112: -#line 383 "frame/contourparser.Y" + case 109: +#line 377 "frame/contourparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), globalSystem, globalSky); (yyval.vector)[0] = r[0]; @@ -2212,8 +2188,8 @@ yyreduce: ;} break; - case 113: -#line 390 "frame/contourparser.Y" + case 110: +#line 384 "frame/contourparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), checkWCSSystem(), checkWCSSky()); @@ -2223,8 +2199,8 @@ yyreduce: ;} break; - case 114: -#line 398 "frame/contourparser.Y" + case 111: +#line 392 "frame/contourparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), Coord::IMAGE); (yyval.vector)[0] = r[0]; @@ -2233,8 +2209,8 @@ yyreduce: ;} break; - case 115: -#line 405 "frame/contourparser.Y" + case 112: +#line 399 "frame/contourparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), Coord::PHYSICAL); (yyval.vector)[0] = r[0]; @@ -2244,7 +2220,7 @@ yyreduce: /* Line 1267 of yacc.c. */ -#line 2248 "frame/contourparser.C" +#line 2224 "frame/contourparser.C" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2458,7 +2434,7 @@ yyreturn: } -#line 411 "frame/contourparser.Y" +#line 405 "frame/contourparser.Y" static Coord::CoordSystem checkWCSSystem() |