From 6d9bc7b488be69859f4bf503579976167ccc1bfa Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 19 Mar 2020 16:05:56 -0400 Subject: clean up code --- fitsy/envilex.C | 164 +++++++++++++++--------------- fitsy/enviparser.C | 58 +++++------ fitsy/enviparser.H | 4 +- fitsy/lex.C | 108 ++++++++++---------- fitsy/nrrdlex.C | 230 +++++++++++++++++++++---------------------- fitsy/nrrdparser.C | 80 +++++++-------- fitsy/nrrdparser.H | 4 +- fitsy/parser.C | 146 +++++++++++++-------------- fitsy/parser.H | 4 +- tksao/Makefile.in | 12 +-- tksao/frame/annulus.C | 2 - tksao/frame/base.C | 1 + tksao/frame/base.h | 1 - tksao/frame/basebox.C | 3 +- tksao/frame/basecommand.C | 3 +- tksao/frame/baseellipse.C | 1 + tksao/frame/baseellipse.h | 2 - tksao/frame/baseline.C | 2 - tksao/frame/basemarker.C | 2 - tksao/frame/basemarker.h | 1 + tksao/frame/basepolygon.C | 2 - tksao/frame/box.C | 2 - tksao/frame/boxannulus.C | 2 - tksao/frame/bpanda.C | 2 - tksao/frame/circle.C | 2 - tksao/frame/compass.C | 3 +- tksao/frame/composite.C | 2 - tksao/frame/context.C | 4 +- tksao/frame/contour.C | 1 + tksao/frame/contourparser.C | 209 ++++++++++++++++++++------------------- tksao/frame/contourparser.H | 2 +- tksao/frame/contourparser.Y | 1 + tksao/frame/coord.C | 1 + tksao/frame/cpanda.C | 2 - tksao/frame/ellipse.C | 2 - tksao/frame/ellipseannulus.C | 2 - tksao/frame/epanda.C | 2 - tksao/frame/fitsanalysis.C | 1 + tksao/frame/fitsbin.C | 1 + tksao/frame/fitsblock.C | 1 + tksao/frame/fitsimage.C | 1 + tksao/frame/fitsmap.C | 1 + tksao/frame/fitsmask.C | 3 +- tksao/frame/fr3dcommand.C | 1 + tksao/frame/frame.C | 3 +- tksao/frame/frame3d.C | 1 + tksao/frame/frame3dbase.C | 1 + tksao/frame/framergb.C | 3 +- tksao/frame/frcommand.C | 2 - tksao/frame/frmap.C | 1 + tksao/frame/frmarker.C | 1 + tksao/frame/frmarkerxml.C | 1 + tksao/frame/frsave.C | 1 + tksao/frame/fvcontour.C | 1 + tksao/frame/grid.C | 1 + tksao/frame/line.C | 2 - tksao/frame/marker.C | 3 +- tksao/frame/point.C | 3 +- tksao/frame/polygon.C | 2 - tksao/frame/projection.C | 2 - tksao/frame/ruler.C | 3 +- tksao/frame/segment.C | 2 - tksao/frame/text.C | 3 +- tksao/frame/vect.C | 2 - 64 files changed, 545 insertions(+), 571 deletions(-) diff --git a/fitsy/envilex.C b/fitsy/envilex.C index ff9e3b2..8ae76fa 100644 --- a/fitsy/envilex.C +++ b/fitsy/envilex.C @@ -1,6 +1,6 @@ -#line 2 "fitsy++/envilex.C" +#line 2 "../fitsy/envilex.C" -#line 4 "fitsy++/envilex.C" +#line 4 "../fitsy/envilex.C" #define YY_INT_ALIGNED short int @@ -688,12 +688,12 @@ static yyconst flex_int16_t yy_chk[873] = #define yymore() yymore_used_but_not_detected #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET -#line 1 "fitsy++/envilex.L" +#line 1 "../fitsy/envilex.L" /* Copyright (C) 1999-2018 * Smithsonian Astrophysical Observatory, Cambridge, MA, USA * For conditions of distribution and use, see copyright notice in "copyright" */ -#line 11 "fitsy++/envilex.L" +#line 11 "../fitsy/envilex.L" #include #include #include @@ -706,7 +706,7 @@ static yyconst flex_int16_t yy_chk[873] = /* rules */ -#line 710 "fitsy++/envilex.C" +#line 710 "../fitsy/envilex.C" #define INITIAL 0 #define DISCARD 1 @@ -808,10 +808,10 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 30 "fitsy++/envilex.L" +#line 30 "../fitsy/envilex.L" -#line 815 "fitsy++/envilex.C" +#line 815 "../fitsy/envilex.C" if ( !(yy_init) ) { @@ -893,7 +893,7 @@ do_action: /* This label is used only to access EOF actions. */ case 1: /* rule 1 can match eol */ YY_RULE_SETUP -#line 32 "fitsy++/envilex.L" +#line 32 "../fitsy/envilex.L" { // special case-- #\n BEGIN INITIAL; yyless(0); // put back the terminator @@ -903,7 +903,7 @@ YY_RULE_SETUP YY_BREAK case 2: YY_RULE_SETUP -#line 39 "fitsy++/envilex.L" +#line 39 "../fitsy/envilex.L" { // Discard reset of line BEGIN INITIAL; int ll = yyleng <(ENVIPARSERSIZE-1) ? yyleng:(ENVIPARSERSIZE-1); @@ -914,7 +914,7 @@ YY_RULE_SETUP YY_BREAK case 3: YY_RULE_SETUP -#line 47 "fitsy++/envilex.L" +#line 47 "../fitsy/envilex.L" { BEGIN BRACKET; return '{'; @@ -922,7 +922,7 @@ YY_RULE_SETUP YY_BREAK case 4: YY_RULE_SETUP -#line 52 "fitsy++/envilex.L" +#line 52 "../fitsy/envilex.L" { BEGIN INITIAL; return '}'; @@ -930,272 +930,272 @@ YY_RULE_SETUP YY_BREAK case 5: YY_RULE_SETUP -#line 57 "fitsy++/envilex.L" +#line 57 "../fitsy/envilex.L" {return DEBUG_;} YY_BREAK case 6: YY_RULE_SETUP -#line 58 "fitsy++/envilex.L" +#line 58 "../fitsy/envilex.L" {return ON_;} YY_BREAK case 7: YY_RULE_SETUP -#line 59 "fitsy++/envilex.L" +#line 59 "../fitsy/envilex.L" {return OFF_;} YY_BREAK case 8: YY_RULE_SETUP -#line 61 "fitsy++/envilex.L" +#line 61 "../fitsy/envilex.L" {return AVERAGE_;} YY_BREAK case 9: YY_RULE_SETUP -#line 62 "fitsy++/envilex.L" +#line 62 "../fitsy/envilex.L" {return BAND_;} YY_BREAK case 10: YY_RULE_SETUP -#line 63 "fitsy++/envilex.L" +#line 63 "../fitsy/envilex.L" {return BANDS_;} YY_BREAK case 11: YY_RULE_SETUP -#line 64 "fitsy++/envilex.L" +#line 64 "../fitsy/envilex.L" {return BBL_;} YY_BREAK case 12: YY_RULE_SETUP -#line 65 "fitsy++/envilex.L" +#line 65 "../fitsy/envilex.L" {return BIL_;} YY_BREAK case 13: YY_RULE_SETUP -#line 66 "fitsy++/envilex.L" +#line 66 "../fitsy/envilex.L" {return BIP_;} YY_BREAK case 14: YY_RULE_SETUP -#line 67 "fitsy++/envilex.L" +#line 67 "../fitsy/envilex.L" {return BSQ_;} YY_BREAK case 15: YY_RULE_SETUP -#line 68 "fitsy++/envilex.L" +#line 68 "../fitsy/envilex.L" {return BYTE_;} YY_BREAK case 16: YY_RULE_SETUP -#line 69 "fitsy++/envilex.L" +#line 69 "../fitsy/envilex.L" {return ENVI_;} YY_BREAK case 17: YY_RULE_SETUP -#line 70 "fitsy++/envilex.L" +#line 70 "../fitsy/envilex.L" {return DATA_;} YY_BREAK case 18: YY_RULE_SETUP -#line 71 "fitsy++/envilex.L" +#line 71 "../fitsy/envilex.L" {return DEFAULT_;} YY_BREAK case 19: YY_RULE_SETUP -#line 72 "fitsy++/envilex.L" +#line 72 "../fitsy/envilex.L" {return DESCRIPTION_;} YY_BREAK case 20: YY_RULE_SETUP -#line 73 "fitsy++/envilex.L" +#line 73 "../fitsy/envilex.L" {return FACTOR_;} YY_BREAK case 21: YY_RULE_SETUP -#line 74 "fitsy++/envilex.L" +#line 74 "../fitsy/envilex.L" {return FRAME_;} YY_BREAK case 22: YY_RULE_SETUP -#line 75 "fitsy++/envilex.L" +#line 75 "../fitsy/envilex.L" {return FILE_;} YY_BREAK case 23: YY_RULE_SETUP -#line 76 "fitsy++/envilex.L" +#line 76 "../fitsy/envilex.L" {return FWHM_;} YY_BREAK case 24: YY_RULE_SETUP -#line 77 "fitsy++/envilex.L" +#line 77 "../fitsy/envilex.L" {return GAIN_;} YY_BREAK case 25: YY_RULE_SETUP -#line 78 "fitsy++/envilex.L" +#line 78 "../fitsy/envilex.L" {return HEADER_;} YY_BREAK case 26: YY_RULE_SETUP -#line 79 "fitsy++/envilex.L" +#line 79 "../fitsy/envilex.L" {return INFO_;} YY_BREAK case 27: YY_RULE_SETUP -#line 80 "fitsy++/envilex.L" +#line 80 "../fitsy/envilex.L" {return IGNORE_;} YY_BREAK case 28: YY_RULE_SETUP -#line 81 "fitsy++/envilex.L" +#line 81 "../fitsy/envilex.L" {return INTERLEAVE_;} YY_BREAK case 29: YY_RULE_SETUP -#line 82 "fitsy++/envilex.L" +#line 82 "../fitsy/envilex.L" {return LIMITS_;} YY_BREAK case 30: YY_RULE_SETUP -#line 83 "fitsy++/envilex.L" +#line 83 "../fitsy/envilex.L" {return LINES_;} YY_BREAK case 31: YY_RULE_SETUP -#line 84 "fitsy++/envilex.L" +#line 84 "../fitsy/envilex.L" {return MAJOR_;} YY_BREAK case 32: YY_RULE_SETUP -#line 85 "fitsy++/envilex.L" +#line 85 "../fitsy/envilex.L" {return MAP_;} YY_BREAK case 33: YY_RULE_SETUP -#line 86 "fitsy++/envilex.L" +#line 86 "../fitsy/envilex.L" {return MINOR_;} YY_BREAK case 34: YY_RULE_SETUP -#line 87 "fitsy++/envilex.L" +#line 87 "../fitsy/envilex.L" {return NAMES_;} YY_BREAK case 35: YY_RULE_SETUP -#line 88 "fitsy++/envilex.L" +#line 88 "../fitsy/envilex.L" {return OFFSET_;} YY_BREAK case 36: YY_RULE_SETUP -#line 89 "fitsy++/envilex.L" +#line 89 "../fitsy/envilex.L" {return OFFSETS_;} YY_BREAK case 37: YY_RULE_SETUP -#line 90 "fitsy++/envilex.L" +#line 90 "../fitsy/envilex.L" {return ORDER_;} YY_BREAK case 38: YY_RULE_SETUP -#line 91 "fitsy++/envilex.L" +#line 91 "../fitsy/envilex.L" {return PIXEL_;} YY_BREAK case 39: YY_RULE_SETUP -#line 92 "fitsy++/envilex.L" +#line 92 "../fitsy/envilex.L" {return PIXELS_;} YY_BREAK case 40: YY_RULE_SETUP -#line 93 "fitsy++/envilex.L" +#line 93 "../fitsy/envilex.L" {return PLOT_;} YY_BREAK case 41: YY_RULE_SETUP -#line 94 "fitsy++/envilex.L" +#line 94 "../fitsy/envilex.L" {return PROJECTION_;} YY_BREAK case 42: YY_RULE_SETUP -#line 95 "fitsy++/envilex.L" +#line 95 "../fitsy/envilex.L" {return RANGE_;} YY_BREAK case 43: YY_RULE_SETUP -#line 96 "fitsy++/envilex.L" +#line 96 "../fitsy/envilex.L" {return REFLECTANCE_;} YY_BREAK case 44: YY_RULE_SETUP -#line 97 "fitsy++/envilex.L" +#line 97 "../fitsy/envilex.L" {return SAMPLES_;} YY_BREAK case 45: YY_RULE_SETUP -#line 98 "fitsy++/envilex.L" +#line 98 "../fitsy/envilex.L" {return SCALE_;} YY_BREAK case 46: YY_RULE_SETUP -#line 99 "fitsy++/envilex.L" +#line 99 "../fitsy/envilex.L" {return SCANNER_;} YY_BREAK case 47: YY_RULE_SETUP -#line 100 "fitsy++/envilex.L" +#line 100 "../fitsy/envilex.L" {return SENSOR_;} YY_BREAK case 48: YY_RULE_SETUP -#line 101 "fitsy++/envilex.L" +#line 101 "../fitsy/envilex.L" {return SIZE_;} YY_BREAK case 49: YY_RULE_SETUP -#line 102 "fitsy++/envilex.L" +#line 102 "../fitsy/envilex.L" {return STRETCH_;} YY_BREAK case 50: YY_RULE_SETUP -#line 103 "fitsy++/envilex.L" +#line 103 "../fitsy/envilex.L" {return TITLES_;} YY_BREAK case 51: YY_RULE_SETUP -#line 104 "fitsy++/envilex.L" +#line 104 "../fitsy/envilex.L" {return TYPE_;} YY_BREAK case 52: YY_RULE_SETUP -#line 105 "fitsy++/envilex.L" +#line 105 "../fitsy/envilex.L" {return UNITS_;} YY_BREAK case 53: YY_RULE_SETUP -#line 106 "fitsy++/envilex.L" +#line 106 "../fitsy/envilex.L" {return VALUE_;} YY_BREAK case 54: YY_RULE_SETUP -#line 107 "fitsy++/envilex.L" +#line 107 "../fitsy/envilex.L" {return VALUES_;} YY_BREAK case 55: YY_RULE_SETUP -#line 108 "fitsy++/envilex.L" +#line 108 "../fitsy/envilex.L" {return WAVELENGTH_;} YY_BREAK case 56: YY_RULE_SETUP -#line 111 "fitsy++/envilex.L" +#line 111 "../fitsy/envilex.L" { // Integer envilval->integer = atoi(yytext); return INT; } YY_BREAK case 57: -#line 117 "fitsy++/envilex.L" +#line 117 "../fitsy/envilex.L" case 58: YY_RULE_SETUP -#line 117 "fitsy++/envilex.L" +#line 117 "../fitsy/envilex.L" { // Real Number envilval->real = atof(yytext); return REAL; @@ -1203,7 +1203,7 @@ YY_RULE_SETUP YY_BREAK case 59: YY_RULE_SETUP -#line 123 "fitsy++/envilex.L" +#line 123 "../fitsy/envilex.L" { // General String int ll = yyleng <(ENVIPARSERSIZE-1) ? yyleng:(ENVIPARSERSIZE-1); strncpy(envilval->str,yytext,ll); @@ -1213,43 +1213,43 @@ YY_RULE_SETUP YY_BREAK case 60: YY_RULE_SETUP -#line 130 "fitsy++/envilex.L" +#line 130 "../fitsy/envilex.L" { return ','; } YY_BREAK case 61: YY_RULE_SETUP -#line 134 "fitsy++/envilex.L" +#line 134 "../fitsy/envilex.L" { // White Spaces } YY_BREAK case 62: /* rule 62 can match eol */ YY_RULE_SETUP -#line 137 "fitsy++/envilex.L" +#line 137 "../fitsy/envilex.L" { // linefeed } YY_BREAK case 63: YY_RULE_SETUP -#line 140 "fitsy++/envilex.L" +#line 140 "../fitsy/envilex.L" { // other chars, eat it } YY_BREAK case 64: YY_RULE_SETUP -#line 143 "fitsy++/envilex.L" +#line 143 "../fitsy/envilex.L" { // Integer envilval->integer = atoi(yytext); return INT; } YY_BREAK case 65: -#line 149 "fitsy++/envilex.L" +#line 149 "../fitsy/envilex.L" case 66: YY_RULE_SETUP -#line 149 "fitsy++/envilex.L" +#line 149 "../fitsy/envilex.L" { // Real Number envilval->real = atof(yytext); return REAL; @@ -1257,7 +1257,7 @@ YY_RULE_SETUP YY_BREAK case 67: YY_RULE_SETUP -#line 155 "fitsy++/envilex.L" +#line 155 "../fitsy/envilex.L" { // General String int ll = yyleng <(ENVIPARSERSIZE-1) ? yyleng:(ENVIPARSERSIZE-1); strncpy(envilval->str,yytext,ll); @@ -1267,14 +1267,14 @@ YY_RULE_SETUP YY_BREAK case 68: YY_RULE_SETUP -#line 162 "fitsy++/envilex.L" +#line 162 "../fitsy/envilex.L" { // White Spaces } YY_BREAK case 69: /* rule 69 can match eol */ YY_RULE_SETUP -#line 165 "fitsy++/envilex.L" +#line 165 "../fitsy/envilex.L" { // windows line feed return '\n'; } @@ -1282,7 +1282,7 @@ YY_RULE_SETUP case 70: /* rule 70 can match eol */ YY_RULE_SETUP -#line 169 "fitsy++/envilex.L" +#line 169 "../fitsy/envilex.L" { // linefeed return '\n'; } @@ -1290,24 +1290,24 @@ YY_RULE_SETUP case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(DISCARD): case YY_STATE_EOF(BRACKET): -#line 173 "fitsy++/envilex.L" +#line 173 "../fitsy/envilex.L" { // eof return EOF_; } YY_BREAK case 71: YY_RULE_SETUP -#line 177 "fitsy++/envilex.L" +#line 177 "../fitsy/envilex.L" { // Else, return the char return yytext[0]; } YY_BREAK case 72: YY_RULE_SETUP -#line 181 "fitsy++/envilex.L" +#line 181 "../fitsy/envilex.L" ECHO; YY_BREAK -#line 1311 "fitsy++/envilex.C" +#line 1311 "../fitsy/envilex.C" case YY_END_OF_BUFFER: { @@ -2204,7 +2204,7 @@ void envifree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 181 "fitsy++/envilex.L" +#line 181 "../fitsy/envilex.L" diff --git a/fitsy/enviparser.C b/fitsy/enviparser.C index 1817b47..72e9449 100644 --- a/fitsy/enviparser.C +++ b/fitsy/enviparser.C @@ -194,7 +194,7 @@ /* Copy the first part of user declarations. */ -#line 10 "fitsy++/enviparser.Y" +#line 10 "../fitsy/enviparser.Y" #define YYDEBUG 1 @@ -235,7 +235,7 @@ static float wave[MAXWAVES]; #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 30 "fitsy++/enviparser.Y" +#line 30 "../fitsy/enviparser.Y" { #define ENVIPARSERSIZE 1024 float real; @@ -243,7 +243,7 @@ typedef union YYSTYPE char str[ENVIPARSERSIZE]; } /* Line 193 of yacc.c. */ -#line 247 "fitsy++/enviparser.C" +#line 247 "../fitsy/enviparser.C" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -256,7 +256,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 260 "fitsy++/enviparser.C" +#line 260 "../fitsy/enviparser.C" #ifdef short # undef short @@ -1629,82 +1629,82 @@ yyreduce: switch (yyn) { case 2: -#line 102 "fitsy++/enviparser.Y" +#line 102 "../fitsy/enviparser.Y" {envi->setpArch(FitsFile::BIG);} break; case 11: -#line 113 "fitsy++/enviparser.Y" +#line 113 "../fitsy/enviparser.Y" {envi->setpWidth((yyvsp[(3) - (3)].integer));;} break; case 12: -#line 114 "fitsy++/enviparser.Y" +#line 114 "../fitsy/enviparser.Y" {envi->setpHeight((yyvsp[(3) - (3)].integer));;} break; case 13: -#line 115 "fitsy++/enviparser.Y" +#line 115 "../fitsy/enviparser.Y" {envi->setpDepth((yyvsp[(3) - (3)].integer));;} break; case 14: -#line 116 "fitsy++/enviparser.Y" +#line 116 "../fitsy/enviparser.Y" {envi->setpSkip((yyvsp[(4) - (4)].integer));;} break; case 17: -#line 119 "fitsy++/enviparser.Y" +#line 119 "../fitsy/enviparser.Y" {DISCARD_(1);} break; case 21: -#line 122 "fitsy++/enviparser.Y" +#line 122 "../fitsy/enviparser.Y" {DISCARD_(1);} break; case 34: -#line 134 "fitsy++/enviparser.Y" +#line 134 "../fitsy/enviparser.Y" {DISCARD_(1);} break; case 38: -#line 137 "fitsy++/enviparser.Y" +#line 137 "../fitsy/enviparser.Y" {numWave=0;;} break; case 45: -#line 145 "fitsy++/enviparser.Y" +#line 145 "../fitsy/enviparser.Y" {DISCARD_(1);} break; case 48: -#line 149 "fitsy++/enviparser.Y" +#line 149 "../fitsy/enviparser.Y" {YYACCEPT;;} break; case 49: -#line 152 "fitsy++/enviparser.Y" +#line 152 "../fitsy/enviparser.Y" {(yyval.real)=(yyvsp[(1) - (1)].real);;} break; case 50: -#line 153 "fitsy++/enviparser.Y" +#line 153 "../fitsy/enviparser.Y" {(yyval.real)=(yyvsp[(1) - (1)].integer);;} break; case 51: -#line 156 "fitsy++/enviparser.Y" +#line 156 "../fitsy/enviparser.Y" {yydebug=1;;} break; case 52: -#line 157 "fitsy++/enviparser.Y" +#line 157 "../fitsy/enviparser.Y" {yydebug=0;;} break; case 53: -#line 161 "fitsy++/enviparser.Y" +#line 161 "../fitsy/enviparser.Y" { switch((yyvsp[(1) - (1)].integer)) { case 1: @@ -1735,22 +1735,22 @@ yyreduce: break; case 54: -#line 190 "fitsy++/enviparser.Y" +#line 190 "../fitsy/enviparser.Y" {envi->setpEncoding(FitsFile::BSQ);;} break; case 55: -#line 191 "fitsy++/enviparser.Y" +#line 191 "../fitsy/enviparser.Y" {envi->setpEncoding(FitsFile::BIP);;} break; case 56: -#line 192 "fitsy++/enviparser.Y" +#line 192 "../fitsy/enviparser.Y" {envi->setpEncoding(FitsFile::BIL);;} break; case 57: -#line 196 "fitsy++/enviparser.Y" +#line 196 "../fitsy/enviparser.Y" { switch((yyvsp[(1) - (1)].integer)) { case 0: @@ -1764,7 +1764,7 @@ yyreduce: break; case 72: -#line 239 "fitsy++/enviparser.Y" +#line 239 "../fitsy/enviparser.Y" { envi->setpCRPIX3(1); envi->setpCRVAL3(1); @@ -1773,7 +1773,7 @@ yyreduce: break; case 73: -#line 245 "fitsy++/enviparser.Y" +#line 245 "../fitsy/enviparser.Y" { if (numWave>=2) { envi->setpCRPIX3(1); @@ -1789,7 +1789,7 @@ yyreduce: break; case 77: -#line 265 "fitsy++/enviparser.Y" +#line 265 "../fitsy/enviparser.Y" { if (numWave < MAXWAVES) wave[numWave++] = (yyvsp[(1) - (1)].real); @@ -1798,7 +1798,7 @@ yyreduce: /* Line 1267 of yacc.c. */ -#line 1802 "fitsy++/enviparser.C" +#line 1802 "../fitsy/enviparser.C" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2012,6 +2012,6 @@ yyreturn: } -#line 271 "fitsy++/enviparser.Y" +#line 271 "../fitsy/enviparser.Y" diff --git a/fitsy/enviparser.H b/fitsy/enviparser.H index 7bbd68d..baad11a 100644 --- a/fitsy/enviparser.H +++ b/fitsy/enviparser.H @@ -160,7 +160,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 30 "fitsy++/enviparser.Y" +#line 30 "../fitsy/enviparser.Y" { #define ENVIPARSERSIZE 1024 float real; @@ -168,7 +168,7 @@ typedef union YYSTYPE char str[ENVIPARSERSIZE]; } /* Line 1529 of yacc.c. */ -#line 172 "fitsy++/enviparser.H" +#line 172 "../fitsy/enviparser.H" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 diff --git a/fitsy/lex.C b/fitsy/lex.C index 674570f..a36df18 100644 --- a/fitsy/lex.C +++ b/fitsy/lex.C @@ -1,6 +1,6 @@ -#line 2 "fitsy++/lex.C" +#line 2 "../fitsy/lex.C" -#line 4 "fitsy++/lex.C" +#line 4 "../fitsy/lex.C" #define YY_INT_ALIGNED short int @@ -557,12 +557,12 @@ static yyconst flex_int16_t yy_chk[439] = #define yymore() yymore_used_but_not_detected #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET -#line 1 "fitsy++/lex.L" +#line 1 "../fitsy/lex.L" /* Copyright (C) 1999-2018 * Smithsonian Astrophysical Observatory, Cambridge, MA, USA * For conditions of distribution and use, see copyright notice in "copyright" */ -#line 11 "fitsy++/lex.L" +#line 11 "../fitsy/lex.L" #include #include #include @@ -580,7 +580,7 @@ static yyconst flex_int16_t yy_chk[439] = /* rules */ -#line 584 "fitsy++/lex.C" +#line 584 "../fitsy/lex.C" #define INITIAL 0 #define EXT 1 @@ -683,10 +683,10 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 32 "fitsy++/lex.L" +#line 32 "../fitsy/lex.L" -#line 690 "fitsy++/lex.C" +#line 690 "../fitsy/lex.C" if ( !(yy_init) ) { @@ -768,7 +768,7 @@ do_action: /* This label is used only to access EOF actions. */ case 1: /* rule 1 can match eol */ YY_RULE_SETUP -#line 34 "fitsy++/lex.L" +#line 34 "../fitsy/lex.L" { // File strcpy(fflval->str,yytext); return STRING; @@ -776,7 +776,7 @@ YY_RULE_SETUP YY_BREAK case 2: YY_RULE_SETUP -#line 39 "fitsy++/lex.L" +#line 39 "../fitsy/lex.L" { // first bracket BEGIN EXT; CLEARFILTER @@ -785,13 +785,13 @@ YY_RULE_SETUP YY_BREAK case 3: YY_RULE_SETUP -#line 45 "fitsy++/lex.L" +#line 45 "../fitsy/lex.L" { // White Spaces } YY_BREAK case 4: YY_RULE_SETUP -#line 48 "fitsy++/lex.L" +#line 48 "../fitsy/lex.L" { // Else, return the char return yytext[0]; } @@ -799,162 +799,162 @@ YY_RULE_SETUP case 5: YY_RULE_SETUP -#line 54 "fitsy++/lex.L" +#line 54 "../fitsy/lex.L" {RET(ARCH_)} YY_BREAK case 6: YY_RULE_SETUP -#line 55 "fitsy++/lex.L" +#line 55 "../fitsy/lex.L" {RET(ARRAY_)} YY_BREAK case 7: YY_RULE_SETUP -#line 56 "fitsy++/lex.L" +#line 56 "../fitsy/lex.L" {RET(BIG_)} YY_BREAK case 8: YY_RULE_SETUP -#line 57 "fitsy++/lex.L" +#line 57 "../fitsy/lex.L" {RET(BIGENDIAN_)} YY_BREAK case 9: YY_RULE_SETUP -#line 58 "fitsy++/lex.L" +#line 58 "../fitsy/lex.L" {RET(BIN_)} YY_BREAK case 10: YY_RULE_SETUP -#line 59 "fitsy++/lex.L" +#line 59 "../fitsy/lex.L" {RET(BINKEY_)} YY_BREAK case 11: YY_RULE_SETUP -#line 60 "fitsy++/lex.L" +#line 60 "../fitsy/lex.L" {RET(BINCOL_)} YY_BREAK case 12: YY_RULE_SETUP -#line 61 "fitsy++/lex.L" +#line 61 "../fitsy/lex.L" {RET(BITPIX_)} YY_BREAK case 13: YY_RULE_SETUP -#line 62 "fitsy++/lex.L" +#line 62 "../fitsy/lex.L" {RET(COL_)} YY_BREAK case 14: YY_RULE_SETUP -#line 63 "fitsy++/lex.L" +#line 63 "../fitsy/lex.L" {RET(DIM_)} YY_BREAK case 15: YY_RULE_SETUP -#line 64 "fitsy++/lex.L" +#line 64 "../fitsy/lex.L" {RET(DIMS_)} YY_BREAK case 16: YY_RULE_SETUP -#line 65 "fitsy++/lex.L" +#line 65 "../fitsy/lex.L" {RET(ECLIPTIC_)} YY_BREAK case 17: YY_RULE_SETUP -#line 66 "fitsy++/lex.L" +#line 66 "../fitsy/lex.L" {RET(ENDIAN_)} YY_BREAK case 18: YY_RULE_SETUP -#line 67 "fitsy++/lex.L" +#line 67 "../fitsy/lex.L" {RET(EQUATORIAL_)} YY_BREAK case 19: YY_RULE_SETUP -#line 68 "fitsy++/lex.L" +#line 68 "../fitsy/lex.L" {RET(GALACTIC_)} YY_BREAK case 20: YY_RULE_SETUP -#line 69 "fitsy++/lex.L" +#line 69 "../fitsy/lex.L" {RET(KEY_)} YY_BREAK case 21: YY_RULE_SETUP -#line 70 "fitsy++/lex.L" +#line 70 "../fitsy/lex.L" {RET(LAYOUT_)} YY_BREAK case 22: YY_RULE_SETUP -#line 71 "fitsy++/lex.L" +#line 71 "../fitsy/lex.L" {RET(LITTLE_)} YY_BREAK case 23: YY_RULE_SETUP -#line 72 "fitsy++/lex.L" +#line 72 "../fitsy/lex.L" {RET(LITTLEENDIAN_)} YY_BREAK case 24: YY_RULE_SETUP -#line 73 "fitsy++/lex.L" +#line 73 "../fitsy/lex.L" {RET(NESTED_)} YY_BREAK case 25: YY_RULE_SETUP -#line 74 "fitsy++/lex.L" +#line 74 "../fitsy/lex.L" {RET(NORTH_)} YY_BREAK case 26: YY_RULE_SETUP -#line 75 "fitsy++/lex.L" +#line 75 "../fitsy/lex.L" {RET(ORDER_)} YY_BREAK case 27: YY_RULE_SETUP -#line 76 "fitsy++/lex.L" +#line 76 "../fitsy/lex.L" {RET(QUAD_)} YY_BREAK case 28: YY_RULE_SETUP -#line 77 "fitsy++/lex.L" +#line 77 "../fitsy/lex.L" {RET(RING_)} YY_BREAK case 29: YY_RULE_SETUP -#line 78 "fitsy++/lex.L" +#line 78 "../fitsy/lex.L" {RET(SKIP_)} YY_BREAK case 30: YY_RULE_SETUP -#line 79 "fitsy++/lex.L" +#line 79 "../fitsy/lex.L" {RET(SOUTH_)} YY_BREAK case 31: YY_RULE_SETUP -#line 80 "fitsy++/lex.L" +#line 80 "../fitsy/lex.L" {RET(SYSTEM_)} YY_BREAK case 32: YY_RULE_SETUP -#line 81 "fitsy++/lex.L" +#line 81 "../fitsy/lex.L" {RET(UNKNOWN_)} YY_BREAK case 33: YY_RULE_SETUP -#line 82 "fitsy++/lex.L" +#line 82 "../fitsy/lex.L" {RET(XDIM_)} YY_BREAK case 34: YY_RULE_SETUP -#line 83 "fitsy++/lex.L" +#line 83 "../fitsy/lex.L" {RET(YDIM_)} YY_BREAK case 35: YY_RULE_SETUP -#line 84 "fitsy++/lex.L" +#line 84 "../fitsy/lex.L" {RET(ZDIM_)} YY_BREAK case 36: YY_RULE_SETUP -#line 86 "fitsy++/lex.L" +#line 86 "../fitsy/lex.L" { // Integer fflval->integer = atoi(yytext); RET(INT) @@ -962,7 +962,7 @@ YY_RULE_SETUP YY_BREAK case 37: YY_RULE_SETUP -#line 91 "fitsy++/lex.L" +#line 91 "../fitsy/lex.L" { // Extn/Col Name strcpy(fflval->str,yytext); RET(STRING) @@ -970,7 +970,7 @@ YY_RULE_SETUP YY_BREAK case 38: YY_RULE_SETUP -#line 96 "fitsy++/lex.L" +#line 96 "../fitsy/lex.L" { // bracket CLEARFILTER return yytext[0]; @@ -978,7 +978,7 @@ YY_RULE_SETUP YY_BREAK case 39: YY_RULE_SETUP -#line 101 "fitsy++/lex.L" +#line 101 "../fitsy/lex.L" { // comma CLEARFILTER return yytext[0]; @@ -986,14 +986,14 @@ YY_RULE_SETUP YY_BREAK case 40: YY_RULE_SETUP -#line 106 "fitsy++/lex.L" +#line 106 "../fitsy/lex.L" { // White Spaces strcat(ff_filter,yytext); } YY_BREAK case 41: YY_RULE_SETUP -#line 110 "fitsy++/lex.L" +#line 110 "../fitsy/lex.L" { // Else, return the char strcat(ff_filter,yytext); return yytext[0]; @@ -1002,7 +1002,7 @@ YY_RULE_SETUP case 42: YY_RULE_SETUP -#line 117 "fitsy++/lex.L" +#line 117 "../fitsy/lex.L" { // rest of Filter strcpy(fflval->str,yytext); fflval->str[yyleng-1] = '\0'; // Remove the ']' @@ -1013,7 +1013,7 @@ YY_RULE_SETUP case 43: YY_RULE_SETUP -#line 126 "fitsy++/lex.L" +#line 126 "../fitsy/lex.L" { // Integer fflval->integer = atoi(yytext); return INT; @@ -1021,7 +1021,7 @@ YY_RULE_SETUP YY_BREAK case 44: YY_RULE_SETUP -#line 131 "fitsy++/lex.L" +#line 131 "../fitsy/lex.L" { // Else, return the char return yytext[0]; } @@ -1029,10 +1029,10 @@ YY_RULE_SETUP case 45: YY_RULE_SETUP -#line 137 "fitsy++/lex.L" +#line 137 "../fitsy/lex.L" ECHO; YY_BREAK -#line 1036 "fitsy++/lex.C" +#line 1036 "../fitsy/lex.C" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(EXT): case YY_STATE_EOF(FILTER): @@ -1934,7 +1934,7 @@ void fffree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 137 "fitsy++/lex.L" +#line 137 "../fitsy/lex.L" diff --git a/fitsy/nrrdlex.C b/fitsy/nrrdlex.C index 0d2ac05..a456ec6 100644 --- a/fitsy/nrrdlex.C +++ b/fitsy/nrrdlex.C @@ -1,6 +1,6 @@ -#line 2 "fitsy++/nrrdlex.C" +#line 2 "../fitsy/nrrdlex.C" -#line 4 "fitsy++/nrrdlex.C" +#line 4 "../fitsy/nrrdlex.C" #define YY_INT_ALIGNED short int @@ -778,12 +778,12 @@ static yyconst flex_int16_t yy_chk[1165] = #define yymore() yymore_used_but_not_detected #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET -#line 1 "fitsy++/nrrdlex.L" +#line 1 "../fitsy/nrrdlex.L" /* Copyright (C) 1999-2018 * Smithsonian Astrophysical Observatory, Cambridge, MA, USA * For conditions of distribution and use, see copyright notice in "copyright" */ -#line 11 "fitsy++/nrrdlex.L" +#line 11 "../fitsy/nrrdlex.L" #include #include #include @@ -795,7 +795,7 @@ static yyconst flex_int16_t yy_chk[1165] = extern nrrdFlexLexer* nrrdlexx; /* rules */ -#line 799 "fitsy++/nrrdlex.C" +#line 799 "../fitsy/nrrdlex.C" #define INITIAL 0 #define DISCARD 1 @@ -896,10 +896,10 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 29 "fitsy++/nrrdlex.L" +#line 29 "../fitsy/nrrdlex.L" -#line 903 "fitsy++/nrrdlex.C" +#line 903 "../fitsy/nrrdlex.C" if ( !(yy_init) ) { @@ -981,7 +981,7 @@ do_action: /* This label is used only to access EOF actions. */ case 1: /* rule 1 can match eol */ YY_RULE_SETUP -#line 31 "fitsy++/nrrdlex.L" +#line 31 "../fitsy/nrrdlex.L" { // special case-- #\n BEGIN INITIAL; yyless(0); // put back the terminator @@ -991,7 +991,7 @@ YY_RULE_SETUP YY_BREAK case 2: YY_RULE_SETUP -#line 38 "fitsy++/nrrdlex.L" +#line 38 "../fitsy/nrrdlex.L" { // Discard reset of line BEGIN INITIAL; int ll = yyleng <(NRRDPARSERSIZE-1) ? yyleng:(NRRDPARSERSIZE-1); @@ -1002,477 +1002,477 @@ YY_RULE_SETUP YY_BREAK case 3: YY_RULE_SETUP -#line 46 "fitsy++/nrrdlex.L" +#line 46 "../fitsy/nrrdlex.L" {return DEBUG_;} YY_BREAK case 4: YY_RULE_SETUP -#line 47 "fitsy++/nrrdlex.L" +#line 47 "../fitsy/nrrdlex.L" {return ON_;} YY_BREAK case 5: YY_RULE_SETUP -#line 48 "fitsy++/nrrdlex.L" +#line 48 "../fitsy/nrrdlex.L" {return OFF_;} YY_BREAK case 6: YY_RULE_SETUP -#line 50 "fitsy++/nrrdlex.L" +#line 50 "../fitsy/nrrdlex.L" {return NRRD0001_;} YY_BREAK case 7: YY_RULE_SETUP -#line 51 "fitsy++/nrrdlex.L" +#line 51 "../fitsy/nrrdlex.L" {return NRRD0002_;} YY_BREAK case 8: YY_RULE_SETUP -#line 52 "fitsy++/nrrdlex.L" +#line 52 "../fitsy/nrrdlex.L" {return NRRD0003_;} YY_BREAK case 9: YY_RULE_SETUP -#line 53 "fitsy++/nrrdlex.L" +#line 53 "../fitsy/nrrdlex.L" {return NRRD0004_;} YY_BREAK case 10: YY_RULE_SETUP -#line 54 "fitsy++/nrrdlex.L" +#line 54 "../fitsy/nrrdlex.L" {return NRRD0005_;} YY_BREAK case 11: YY_RULE_SETUP -#line 56 "fitsy++/nrrdlex.L" +#line 56 "../fitsy/nrrdlex.L" {return DATA_;} YY_BREAK case 12: YY_RULE_SETUP -#line 57 "fitsy++/nrrdlex.L" +#line 57 "../fitsy/nrrdlex.L" {return FILE_;} YY_BREAK case 13: YY_RULE_SETUP -#line 59 "fitsy++/nrrdlex.L" +#line 59 "../fitsy/nrrdlex.L" {return SPACE_;} YY_BREAK case 14: YY_RULE_SETUP -#line 60 "fitsy++/nrrdlex.L" +#line 60 "../fitsy/nrrdlex.L" {return UNITS_;} YY_BREAK case 15: YY_RULE_SETUP -#line 61 "fitsy++/nrrdlex.L" +#line 61 "../fitsy/nrrdlex.L" {return DIMENSIONS_;} YY_BREAK case 16: YY_RULE_SETUP -#line 62 "fitsy++/nrrdlex.L" +#line 62 "../fitsy/nrrdlex.L" {return ORIGIN_;} YY_BREAK case 17: YY_RULE_SETUP -#line 63 "fitsy++/nrrdlex.L" +#line 63 "../fitsy/nrrdlex.L" {return DIRECTIONS_;} YY_BREAK case 18: YY_RULE_SETUP -#line 65 "fitsy++/nrrdlex.L" +#line 65 "../fitsy/nrrdlex.L" {return DIMENSION_;} YY_BREAK case 19: YY_RULE_SETUP -#line 67 "fitsy++/nrrdlex.L" +#line 67 "../fitsy/nrrdlex.L" {return TYPE_;} YY_BREAK case 20: YY_RULE_SETUP -#line 68 "fitsy++/nrrdlex.L" +#line 68 "../fitsy/nrrdlex.L" {return SIGNED_;} YY_BREAK case 21: YY_RULE_SETUP -#line 69 "fitsy++/nrrdlex.L" +#line 69 "../fitsy/nrrdlex.L" {return UNSIGNED_;} YY_BREAK case 22: YY_RULE_SETUP -#line 70 "fitsy++/nrrdlex.L" +#line 70 "../fitsy/nrrdlex.L" {return CHAR_;} YY_BREAK case 23: YY_RULE_SETUP -#line 71 "fitsy++/nrrdlex.L" +#line 71 "../fitsy/nrrdlex.L" {return INT8_;} YY_BREAK case 24: YY_RULE_SETUP -#line 72 "fitsy++/nrrdlex.L" +#line 72 "../fitsy/nrrdlex.L" {return INT8_T_;} YY_BREAK case 25: YY_RULE_SETUP -#line 73 "fitsy++/nrrdlex.L" +#line 73 "../fitsy/nrrdlex.L" {return UCHAR_;} YY_BREAK case 26: YY_RULE_SETUP -#line 74 "fitsy++/nrrdlex.L" +#line 74 "../fitsy/nrrdlex.L" {return UINT8_;} YY_BREAK case 27: YY_RULE_SETUP -#line 75 "fitsy++/nrrdlex.L" +#line 75 "../fitsy/nrrdlex.L" {return UINT8_T_;} YY_BREAK case 28: YY_RULE_SETUP -#line 76 "fitsy++/nrrdlex.L" +#line 76 "../fitsy/nrrdlex.L" {return SHORT_;} YY_BREAK case 29: YY_RULE_SETUP -#line 77 "fitsy++/nrrdlex.L" +#line 77 "../fitsy/nrrdlex.L" {return INT_;} YY_BREAK case 30: YY_RULE_SETUP -#line 78 "fitsy++/nrrdlex.L" +#line 78 "../fitsy/nrrdlex.L" {return INT16_;} YY_BREAK case 31: YY_RULE_SETUP -#line 79 "fitsy++/nrrdlex.L" +#line 79 "../fitsy/nrrdlex.L" {return INT16_T_;} YY_BREAK case 32: YY_RULE_SETUP -#line 80 "fitsy++/nrrdlex.L" +#line 80 "../fitsy/nrrdlex.L" {return USHORT_;} YY_BREAK case 33: YY_RULE_SETUP -#line 81 "fitsy++/nrrdlex.L" +#line 81 "../fitsy/nrrdlex.L" {return UINT16_;} YY_BREAK case 34: YY_RULE_SETUP -#line 82 "fitsy++/nrrdlex.L" +#line 82 "../fitsy/nrrdlex.L" {return UINT16_T_;} YY_BREAK case 35: YY_RULE_SETUP -#line 83 "fitsy++/nrrdlex.L" +#line 83 "../fitsy/nrrdlex.L" {return INT32_;} YY_BREAK case 36: YY_RULE_SETUP -#line 84 "fitsy++/nrrdlex.L" +#line 84 "../fitsy/nrrdlex.L" {return INT32_T_;} YY_BREAK case 37: YY_RULE_SETUP -#line 85 "fitsy++/nrrdlex.L" +#line 85 "../fitsy/nrrdlex.L" {return UINT_;} YY_BREAK case 38: YY_RULE_SETUP -#line 86 "fitsy++/nrrdlex.L" +#line 86 "../fitsy/nrrdlex.L" {return UINT32_;} YY_BREAK case 39: YY_RULE_SETUP -#line 87 "fitsy++/nrrdlex.L" +#line 87 "../fitsy/nrrdlex.L" {return UINT32_T_;} YY_BREAK case 40: YY_RULE_SETUP -#line 88 "fitsy++/nrrdlex.L" +#line 88 "../fitsy/nrrdlex.L" {return LONG_;} YY_BREAK case 41: YY_RULE_SETUP -#line 89 "fitsy++/nrrdlex.L" +#line 89 "../fitsy/nrrdlex.L" {return LONGLONG_;} YY_BREAK case 42: YY_RULE_SETUP -#line 90 "fitsy++/nrrdlex.L" +#line 90 "../fitsy/nrrdlex.L" {return INT64_;} YY_BREAK case 43: YY_RULE_SETUP -#line 91 "fitsy++/nrrdlex.L" +#line 91 "../fitsy/nrrdlex.L" {return INT64_T_;} YY_BREAK case 44: YY_RULE_SETUP -#line 92 "fitsy++/nrrdlex.L" +#line 92 "../fitsy/nrrdlex.L" {return ULONGLONG_;} YY_BREAK case 45: YY_RULE_SETUP -#line 93 "fitsy++/nrrdlex.L" +#line 93 "../fitsy/nrrdlex.L" {return UINT64_;} YY_BREAK case 46: YY_RULE_SETUP -#line 94 "fitsy++/nrrdlex.L" +#line 94 "../fitsy/nrrdlex.L" {return UINT64_T_;} YY_BREAK case 47: YY_RULE_SETUP -#line 95 "fitsy++/nrrdlex.L" +#line 95 "../fitsy/nrrdlex.L" {return FLOAT_;} YY_BREAK case 48: YY_RULE_SETUP -#line 96 "fitsy++/nrrdlex.L" +#line 96 "../fitsy/nrrdlex.L" {return DOUBLE_;} YY_BREAK case 49: YY_RULE_SETUP -#line 98 "fitsy++/nrrdlex.L" +#line 98 "../fitsy/nrrdlex.L" {return BLOCK_;} YY_BREAK case 50: YY_RULE_SETUP -#line 99 "fitsy++/nrrdlex.L" +#line 99 "../fitsy/nrrdlex.L" {return SIZE_;} YY_BREAK case 51: YY_RULE_SETUP -#line 100 "fitsy++/nrrdlex.L" +#line 100 "../fitsy/nrrdlex.L" {return BLOCKSIZE_;} YY_BREAK case 52: YY_RULE_SETUP -#line 102 "fitsy++/nrrdlex.L" +#line 102 "../fitsy/nrrdlex.L" {return ENCODING_;} YY_BREAK case 53: YY_RULE_SETUP -#line 103 "fitsy++/nrrdlex.L" +#line 103 "../fitsy/nrrdlex.L" {return RAW_;} YY_BREAK case 54: YY_RULE_SETUP -#line 104 "fitsy++/nrrdlex.L" +#line 104 "../fitsy/nrrdlex.L" {return TXT_;} YY_BREAK case 55: YY_RULE_SETUP -#line 105 "fitsy++/nrrdlex.L" +#line 105 "../fitsy/nrrdlex.L" {return TEXT_;} YY_BREAK case 56: YY_RULE_SETUP -#line 106 "fitsy++/nrrdlex.L" +#line 106 "../fitsy/nrrdlex.L" {return ASCII_;} YY_BREAK case 57: YY_RULE_SETUP -#line 107 "fitsy++/nrrdlex.L" +#line 107 "../fitsy/nrrdlex.L" {return HEX_;} YY_BREAK case 58: YY_RULE_SETUP -#line 108 "fitsy++/nrrdlex.L" +#line 108 "../fitsy/nrrdlex.L" {return GZ_;} YY_BREAK case 59: YY_RULE_SETUP -#line 109 "fitsy++/nrrdlex.L" +#line 109 "../fitsy/nrrdlex.L" {return GZIP_;} YY_BREAK case 60: YY_RULE_SETUP -#line 110 "fitsy++/nrrdlex.L" +#line 110 "../fitsy/nrrdlex.L" {return BZ2_;} YY_BREAK case 61: YY_RULE_SETUP -#line 111 "fitsy++/nrrdlex.L" +#line 111 "../fitsy/nrrdlex.L" {return BZIP2_;} YY_BREAK case 62: YY_RULE_SETUP -#line 113 "fitsy++/nrrdlex.L" +#line 113 "../fitsy/nrrdlex.L" {return ENDIAN_;} YY_BREAK case 63: YY_RULE_SETUP -#line 114 "fitsy++/nrrdlex.L" +#line 114 "../fitsy/nrrdlex.L" {return BIG_;} YY_BREAK case 64: YY_RULE_SETUP -#line 115 "fitsy++/nrrdlex.L" +#line 115 "../fitsy/nrrdlex.L" {return LITTLE_;} YY_BREAK case 65: YY_RULE_SETUP -#line 117 "fitsy++/nrrdlex.L" +#line 117 "../fitsy/nrrdlex.L" {return CONTENT_;} YY_BREAK case 66: YY_RULE_SETUP -#line 119 "fitsy++/nrrdlex.L" +#line 119 "../fitsy/nrrdlex.L" {return OLD_;} YY_BREAK case 67: YY_RULE_SETUP -#line 120 "fitsy++/nrrdlex.L" +#line 120 "../fitsy/nrrdlex.L" {return MIN_;} YY_BREAK case 68: YY_RULE_SETUP -#line 121 "fitsy++/nrrdlex.L" +#line 121 "../fitsy/nrrdlex.L" {return OLDMIN_;} YY_BREAK case 69: YY_RULE_SETUP -#line 122 "fitsy++/nrrdlex.L" +#line 122 "../fitsy/nrrdlex.L" {return MAX_;} YY_BREAK case 70: YY_RULE_SETUP -#line 123 "fitsy++/nrrdlex.L" +#line 123 "../fitsy/nrrdlex.L" {return OLDMAX_;} YY_BREAK case 71: YY_RULE_SETUP -#line 125 "fitsy++/nrrdlex.L" +#line 125 "../fitsy/nrrdlex.L" {return SKIP_;} YY_BREAK case 72: YY_RULE_SETUP -#line 126 "fitsy++/nrrdlex.L" +#line 126 "../fitsy/nrrdlex.L" {return LINE_;} YY_BREAK case 73: YY_RULE_SETUP -#line 127 "fitsy++/nrrdlex.L" +#line 127 "../fitsy/nrrdlex.L" {return LINESKIP_;} YY_BREAK case 74: YY_RULE_SETUP -#line 128 "fitsy++/nrrdlex.L" +#line 128 "../fitsy/nrrdlex.L" {return BYTE_;} YY_BREAK case 75: YY_RULE_SETUP -#line 129 "fitsy++/nrrdlex.L" +#line 129 "../fitsy/nrrdlex.L" {return BYTESKIP_;} YY_BREAK case 76: YY_RULE_SETUP -#line 131 "fitsy++/nrrdlex.L" +#line 131 "../fitsy/nrrdlex.L" {return NUMBER_;} YY_BREAK case 77: YY_RULE_SETUP -#line 133 "fitsy++/nrrdlex.L" +#line 133 "../fitsy/nrrdlex.L" {return SAMPLE_;} YY_BREAK case 78: YY_RULE_SETUP -#line 134 "fitsy++/nrrdlex.L" +#line 134 "../fitsy/nrrdlex.L" {return SAMPLEUNITS_;} YY_BREAK case 79: YY_RULE_SETUP -#line 136 "fitsy++/nrrdlex.L" +#line 136 "../fitsy/nrrdlex.L" {return SIZES_;} YY_BREAK case 80: YY_RULE_SETUP -#line 137 "fitsy++/nrrdlex.L" +#line 137 "../fitsy/nrrdlex.L" {return SPACINGS_;} YY_BREAK case 81: YY_RULE_SETUP -#line 138 "fitsy++/nrrdlex.L" +#line 138 "../fitsy/nrrdlex.L" {return THICKNESSES_;} YY_BREAK case 82: YY_RULE_SETUP -#line 139 "fitsy++/nrrdlex.L" +#line 139 "../fitsy/nrrdlex.L" {return AXIS_;} YY_BREAK case 83: YY_RULE_SETUP -#line 140 "fitsy++/nrrdlex.L" +#line 140 "../fitsy/nrrdlex.L" {return MINS_;} YY_BREAK case 84: YY_RULE_SETUP -#line 141 "fitsy++/nrrdlex.L" +#line 141 "../fitsy/nrrdlex.L" {return AXISMINS_;} YY_BREAK case 85: YY_RULE_SETUP -#line 142 "fitsy++/nrrdlex.L" +#line 142 "../fitsy/nrrdlex.L" {return MAXS_;} YY_BREAK case 86: YY_RULE_SETUP -#line 143 "fitsy++/nrrdlex.L" +#line 143 "../fitsy/nrrdlex.L" {return AXISMAXS_;} YY_BREAK case 87: YY_RULE_SETUP -#line 144 "fitsy++/nrrdlex.L" +#line 144 "../fitsy/nrrdlex.L" {return CENTERS_;} YY_BREAK case 88: YY_RULE_SETUP -#line 145 "fitsy++/nrrdlex.L" +#line 145 "../fitsy/nrrdlex.L" {return CENTERINGS_;} YY_BREAK case 89: YY_RULE_SETUP -#line 146 "fitsy++/nrrdlex.L" +#line 146 "../fitsy/nrrdlex.L" {return CELL_;} YY_BREAK case 90: YY_RULE_SETUP -#line 147 "fitsy++/nrrdlex.L" +#line 147 "../fitsy/nrrdlex.L" {return NODE_;} YY_BREAK case 91: YY_RULE_SETUP -#line 148 "fitsy++/nrrdlex.L" +#line 148 "../fitsy/nrrdlex.L" {return NONE_;} YY_BREAK case 92: YY_RULE_SETUP -#line 149 "fitsy++/nrrdlex.L" +#line 149 "../fitsy/nrrdlex.L" {return LABELS_;} YY_BREAK case 93: YY_RULE_SETUP -#line 150 "fitsy++/nrrdlex.L" +#line 150 "../fitsy/nrrdlex.L" {return KINDS_;} YY_BREAK case 94: YY_RULE_SETUP -#line 151 "fitsy++/nrrdlex.L" +#line 151 "../fitsy/nrrdlex.L" {return DOMAINS_;} YY_BREAK case 95: YY_RULE_SETUP -#line 153 "fitsy++/nrrdlex.L" +#line 153 "../fitsy/nrrdlex.L" { // Integer nrrdlval->integer = atoi(yytext); return INT; } YY_BREAK case 96: -#line 159 "fitsy++/nrrdlex.L" +#line 159 "../fitsy/nrrdlex.L" case 97: YY_RULE_SETUP -#line 159 "fitsy++/nrrdlex.L" +#line 159 "../fitsy/nrrdlex.L" { // Real Number nrrdlval->real = atof(yytext); return REAL; @@ -1480,7 +1480,7 @@ YY_RULE_SETUP YY_BREAK case 98: YY_RULE_SETUP -#line 165 "fitsy++/nrrdlex.L" +#line 165 "../fitsy/nrrdlex.L" { // Quoted String int ll = (yyleng-2)<(NRRDPARSERSIZE-1) ? (yyleng-2):(NRRDPARSERSIZE-1); strncpy(nrrdlval->str,yytext+1,ll); // skip the '{' @@ -1490,7 +1490,7 @@ YY_RULE_SETUP YY_BREAK case 99: YY_RULE_SETUP -#line 172 "fitsy++/nrrdlex.L" +#line 172 "../fitsy/nrrdlex.L" { // General String int ll = yyleng <(NRRDPARSERSIZE-1) ? yyleng:(NRRDPARSERSIZE-1); strncpy(nrrdlval->str,yytext,ll); @@ -1500,21 +1500,21 @@ YY_RULE_SETUP YY_BREAK case 100: YY_RULE_SETUP -#line 179 "fitsy++/nrrdlex.L" +#line 179 "../fitsy/nrrdlex.L" { // White Spaces } YY_BREAK case 101: /* rule 101 can match eol */ YY_RULE_SETUP -#line 182 "fitsy++/nrrdlex.L" +#line 182 "../fitsy/nrrdlex.L" { // windows line feed return '\n'; } YY_BREAK case 102: YY_RULE_SETUP -#line 186 "fitsy++/nrrdlex.L" +#line 186 "../fitsy/nrrdlex.L" { // fake line feed return '\n'; } @@ -1522,31 +1522,31 @@ YY_RULE_SETUP case 103: /* rule 103 can match eol */ YY_RULE_SETUP -#line 190 "fitsy++/nrrdlex.L" +#line 190 "../fitsy/nrrdlex.L" { // linefeed return '\n'; } YY_BREAK case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(DISCARD): -#line 194 "fitsy++/nrrdlex.L" +#line 194 "../fitsy/nrrdlex.L" { // eof return EOF_; } YY_BREAK case 104: YY_RULE_SETUP -#line 198 "fitsy++/nrrdlex.L" +#line 198 "../fitsy/nrrdlex.L" { // Else, return the char return yytext[0]; } YY_BREAK case 105: YY_RULE_SETUP -#line 202 "fitsy++/nrrdlex.L" +#line 202 "../fitsy/nrrdlex.L" ECHO; YY_BREAK -#line 1550 "fitsy++/nrrdlex.C" +#line 1550 "../fitsy/nrrdlex.C" case YY_END_OF_BUFFER: { @@ -2443,7 +2443,7 @@ void nrrdfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 202 "fitsy++/nrrdlex.L" +#line 202 "../fitsy/nrrdlex.L" diff --git a/fitsy/nrrdparser.C b/fitsy/nrrdparser.C index bcc7cde..e84807d 100644 --- a/fitsy/nrrdparser.C +++ b/fitsy/nrrdparser.C @@ -274,7 +274,7 @@ /* Copy the first part of user declarations. */ -#line 10 "fitsy++/nrrdparser.Y" +#line 10 "../fitsy/nrrdparser.Y" #define YYDEBUG 1 @@ -314,7 +314,7 @@ int dim; #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 29 "fitsy++/nrrdparser.Y" +#line 29 "../fitsy/nrrdparser.Y" { #define NRRDPARSERSIZE 256 float real; @@ -322,7 +322,7 @@ typedef union YYSTYPE char str[NRRDPARSERSIZE]; } /* Line 193 of yacc.c. */ -#line 326 "fitsy++/nrrdparser.C" +#line 326 "../fitsy/nrrdparser.C" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -335,7 +335,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 339 "fitsy++/nrrdparser.C" +#line 339 "../fitsy/nrrdparser.C" #ifdef short # undef short @@ -1793,172 +1793,172 @@ yyreduce: switch (yyn) { case 2: -#line 168 "fitsy++/nrrdparser.Y" +#line 168 "../fitsy/nrrdparser.Y" {dim=0; nrrd->setpArch(FitsFile::BIG);;} break; case 17: -#line 186 "fitsy++/nrrdparser.Y" +#line 186 "../fitsy/nrrdparser.Y" {DISCARD_(1);} break; case 43: -#line 215 "fitsy++/nrrdparser.Y" +#line 215 "../fitsy/nrrdparser.Y" {DISCARD_(1);} break; case 46: -#line 219 "fitsy++/nrrdparser.Y" +#line 219 "../fitsy/nrrdparser.Y" {YYACCEPT;;} break; case 47: -#line 222 "fitsy++/nrrdparser.Y" +#line 222 "../fitsy/nrrdparser.Y" {(yyval.real)=(yyvsp[(1) - (1)].real);;} break; case 48: -#line 223 "fitsy++/nrrdparser.Y" +#line 223 "../fitsy/nrrdparser.Y" {(yyval.real)=(yyvsp[(1) - (1)].integer);;} break; case 49: -#line 226 "fitsy++/nrrdparser.Y" +#line 226 "../fitsy/nrrdparser.Y" {yydebug=1;;} break; case 50: -#line 227 "fitsy++/nrrdparser.Y" +#line 227 "../fitsy/nrrdparser.Y" {yydebug=0;;} break; case 51: -#line 230 "fitsy++/nrrdparser.Y" +#line 230 "../fitsy/nrrdparser.Y" {DISCARD_(1);} break; case 54: -#line 232 "fitsy++/nrrdparser.Y" +#line 232 "../fitsy/nrrdparser.Y" {DISCARD_(1);} break; case 56: -#line 233 "fitsy++/nrrdparser.Y" +#line 233 "../fitsy/nrrdparser.Y" {DISCARD_(1);} break; case 58: -#line 234 "fitsy++/nrrdparser.Y" +#line 234 "../fitsy/nrrdparser.Y" {DISCARD_(1);} break; case 60: -#line 237 "fitsy++/nrrdparser.Y" +#line 237 "../fitsy/nrrdparser.Y" {nrrd->setpBitpix(8);;} break; case 61: -#line 238 "fitsy++/nrrdparser.Y" +#line 238 "../fitsy/nrrdparser.Y" {nrrd->setpBitpix(8);;} break; case 62: -#line 239 "fitsy++/nrrdparser.Y" +#line 239 "../fitsy/nrrdparser.Y" {nrrd->setpBitpix(16);;} break; case 63: -#line 240 "fitsy++/nrrdparser.Y" +#line 240 "../fitsy/nrrdparser.Y" {nrrd->setpBitpix(16);;} break; case 64: -#line 241 "fitsy++/nrrdparser.Y" +#line 241 "../fitsy/nrrdparser.Y" {nrrd->setpBitpix(32);;} break; case 65: -#line 242 "fitsy++/nrrdparser.Y" +#line 242 "../fitsy/nrrdparser.Y" {nrrd->setpBitpix(32);;} break; case 66: -#line 243 "fitsy++/nrrdparser.Y" +#line 243 "../fitsy/nrrdparser.Y" {nrrd->setpBitpix(64);;} break; case 67: -#line 244 "fitsy++/nrrdparser.Y" +#line 244 "../fitsy/nrrdparser.Y" {nrrd->setpBitpix(64);;} break; case 68: -#line 245 "fitsy++/nrrdparser.Y" +#line 245 "../fitsy/nrrdparser.Y" {nrrd->setpBitpix(-32);;} break; case 69: -#line 246 "fitsy++/nrrdparser.Y" +#line 246 "../fitsy/nrrdparser.Y" {nrrd->setpBitpix(-64);;} break; case 112: -#line 309 "fitsy++/nrrdparser.Y" +#line 309 "../fitsy/nrrdparser.Y" {nrrd->setpEncoding(FitsFile::RAW);;} break; case 113: -#line 310 "fitsy++/nrrdparser.Y" +#line 310 "../fitsy/nrrdparser.Y" {nrrd->setpEncoding(FitsFile::ASCII);;} break; case 114: -#line 311 "fitsy++/nrrdparser.Y" +#line 311 "../fitsy/nrrdparser.Y" {nrrd->setpEncoding(FitsFile::ASCII);;} break; case 115: -#line 312 "fitsy++/nrrdparser.Y" +#line 312 "../fitsy/nrrdparser.Y" {nrrd->setpEncoding(FitsFile::ASCII);;} break; case 116: -#line 313 "fitsy++/nrrdparser.Y" +#line 313 "../fitsy/nrrdparser.Y" {nrrd->setpEncoding(FitsFile::HEX);;} break; case 117: -#line 314 "fitsy++/nrrdparser.Y" +#line 314 "../fitsy/nrrdparser.Y" {nrrd->setpEncoding(FitsFile::GZIP);;} break; case 118: -#line 315 "fitsy++/nrrdparser.Y" +#line 315 "../fitsy/nrrdparser.Y" {nrrd->setpEncoding(FitsFile::GZIP);;} break; case 119: -#line 316 "fitsy++/nrrdparser.Y" +#line 316 "../fitsy/nrrdparser.Y" {nrrd->setpEncoding(FitsFile::BZ2);;} break; case 120: -#line 317 "fitsy++/nrrdparser.Y" +#line 317 "../fitsy/nrrdparser.Y" {nrrd->setpEncoding(FitsFile::BZ2);;} break; case 121: -#line 320 "fitsy++/nrrdparser.Y" +#line 320 "../fitsy/nrrdparser.Y" {nrrd->setpArch(FitsFile::BIG);;} break; case 122: -#line 321 "fitsy++/nrrdparser.Y" +#line 321 "../fitsy/nrrdparser.Y" {nrrd->setpArch(FitsFile::LITTLE);;} break; case 133: -#line 345 "fitsy++/nrrdparser.Y" +#line 345 "../fitsy/nrrdparser.Y" { switch (dim) { case 0: @@ -1977,7 +1977,7 @@ yyreduce: /* Line 1267 of yacc.c. */ -#line 1981 "fitsy++/nrrdparser.C" +#line 1981 "../fitsy/nrrdparser.C" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2191,6 +2191,6 @@ yyreturn: } -#line 398 "fitsy++/nrrdparser.Y" +#line 398 "../fitsy/nrrdparser.Y" diff --git a/fitsy/nrrdparser.H b/fitsy/nrrdparser.H index 7495805..250d4eb 100644 --- a/fitsy/nrrdparser.H +++ b/fitsy/nrrdparser.H @@ -240,7 +240,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 29 "fitsy++/nrrdparser.Y" +#line 29 "../fitsy/nrrdparser.Y" { #define NRRDPARSERSIZE 256 float real; @@ -248,7 +248,7 @@ typedef union YYSTYPE char str[NRRDPARSERSIZE]; } /* Line 1529 of yacc.c. */ -#line 252 "fitsy++/nrrdparser.H" +#line 252 "../fitsy/nrrdparser.H" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 diff --git a/fitsy/parser.C b/fitsy/parser.C index 0324dfa..696f64a 100644 --- a/fitsy/parser.C +++ b/fitsy/parser.C @@ -148,7 +148,7 @@ /* Copy the first part of user declarations. */ -#line 10 "fitsy++/parser.Y" +#line 10 "../fitsy/parser.Y" #define YYDEBUG 1 @@ -191,7 +191,7 @@ extern void ffArray(int); #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 32 "fitsy++/parser.Y" +#line 32 "../fitsy/parser.Y" { float real; int integer; @@ -199,7 +199,7 @@ typedef union YYSTYPE void* ptr; } /* Line 193 of yacc.c. */ -#line 203 "fitsy++/parser.C" +#line 203 "../fitsy/parser.C" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -212,7 +212,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 216 "fitsy++/parser.C" +#line 216 "../fitsy/parser.C" #ifdef short # undef short @@ -1627,62 +1627,62 @@ yyreduce: switch (yyn) { case 24: -#line 106 "fitsy++/parser.Y" +#line 106 "../fitsy/parser.Y" {GOTOARR(0);} break; case 26: -#line 108 "fitsy++/parser.Y" +#line 108 "../fitsy/parser.Y" {GOTOFILT(0);} break; case 27: -#line 109 "fitsy++/parser.Y" +#line 109 "../fitsy/parser.Y" {ff->setValid(1);ff->setpFilter(ff_filter);;} break; case 29: -#line 113 "fitsy++/parser.Y" +#line 113 "../fitsy/parser.Y" {ff->setpName((yyvsp[(1) - (1)].str));;} break; case 30: -#line 123 "fitsy++/parser.Y" +#line 123 "../fitsy/parser.Y" {ff->setpExt((yyvsp[(2) - (3)].str));;} break; case 31: -#line 124 "fitsy++/parser.Y" +#line 124 "../fitsy/parser.Y" {ff->setpIndex((yyvsp[(2) - (3)].integer));;} break; case 32: -#line 127 "fitsy++/parser.Y" +#line 127 "../fitsy/parser.Y" {ff->setpExt((yyvsp[(1) - (2)].str));;} break; case 33: -#line 128 "fitsy++/parser.Y" +#line 128 "../fitsy/parser.Y" {ff->setpIndex((yyvsp[(1) - (2)].integer));;} break; case 44: -#line 144 "fitsy++/parser.Y" +#line 144 "../fitsy/parser.Y" {ff->setpcoord(0);;} break; case 45: -#line 145 "fitsy++/parser.Y" +#line 145 "../fitsy/parser.Y" {ff->setpcoord(1);;} break; case 46: -#line 146 "fitsy++/parser.Y" +#line 146 "../fitsy/parser.Y" {ff->setpcoord(1);;} break; case 47: -#line 150 "fitsy++/parser.Y" +#line 150 "../fitsy/parser.Y" { // this is not a mistake // need to fool parser into processing "xy0:xy1,block" @@ -1692,12 +1692,12 @@ yyreduce: break; case 48: -#line 157 "fitsy++/parser.Y" +#line 157 "../fitsy/parser.Y" {ff->setpxmin((yyvsp[(3) - (3)].integer)-(yyvsp[(1) - (3)].integer)/2); ff->setpxmax((yyvsp[(3) - (3)].integer)+(yyvsp[(1) - (3)].integer)/2); ff->setpxvalid(1);;} break; case 49: -#line 159 "fitsy++/parser.Y" +#line 159 "../fitsy/parser.Y" { // this is not a mistake // need to fool parser into processing "*,block" @@ -1706,22 +1706,22 @@ yyreduce: break; case 50: -#line 167 "fitsy++/parser.Y" +#line 167 "../fitsy/parser.Y" {ff->setpymin((yyvsp[(1) - (3)].integer)); ff->setpymax((yyvsp[(3) - (3)].integer)); ff->setpyvalid(1);;} break; case 51: -#line 169 "fitsy++/parser.Y" +#line 169 "../fitsy/parser.Y" {ff->setpymin((yyvsp[(3) - (3)].integer)-(yyvsp[(1) - (3)].integer)/2); ff->setpymax((yyvsp[(3) - (3)].integer)+(yyvsp[(1) - (3)].integer)/2); ff->setpyvalid(1);;} break; case 52: -#line 170 "fitsy++/parser.Y" +#line 170 "../fitsy/parser.Y" {ff->setpyvalid(0);;} break; case 53: -#line 174 "fitsy++/parser.Y" +#line 174 "../fitsy/parser.Y" { ff->setpxmin((yyvsp[(3) - (5)].integer)-(yyvsp[(1) - (5)].integer)/2); ff->setpxmax((yyvsp[(3) - (5)].integer)+(yyvsp[(1) - (5)].integer)/2); ff->setpxvalid(1); ff->setpymin((yyvsp[(5) - (5)].integer)-(yyvsp[(1) - (5)].integer)/2); ff->setpymax((yyvsp[(5) - (5)].integer)+(yyvsp[(1) - (5)].integer)/2); ff->setpyvalid(1); @@ -1729,253 +1729,253 @@ yyreduce: break; case 54: -#line 181 "fitsy++/parser.Y" +#line 181 "../fitsy/parser.Y" {ff->setpzmin((yyvsp[(1) - (3)].integer)); ff->setpzmax((yyvsp[(3) - (3)].integer)); ff->setpzvalid(1);;} break; case 55: -#line 183 "fitsy++/parser.Y" +#line 183 "../fitsy/parser.Y" {ff->setpzmin((yyvsp[(3) - (3)].integer)-(yyvsp[(1) - (3)].integer)/2); ff->setpzmax((yyvsp[(3) - (3)].integer)+(yyvsp[(1) - (3)].integer)/2); ff->setpzvalid(1);;} break; case 56: -#line 184 "fitsy++/parser.Y" +#line 184 "../fitsy/parser.Y" {ff->setpzvalid(0);;} break; case 57: -#line 187 "fitsy++/parser.Y" +#line 187 "../fitsy/parser.Y" {ff->setpblock((yyvsp[(1) - (1)].integer)); ff->setpbvalid(1);;} break; case 65: -#line 202 "fitsy++/parser.Y" +#line 202 "../fitsy/parser.Y" {ff->setpBinXY((yyvsp[(2) - (5)].str),(yyvsp[(4) - (5)].str));;} break; case 66: -#line 203 "fitsy++/parser.Y" +#line 203 "../fitsy/parser.Y" {ff->setpBinXY((yyvsp[(1) - (3)].str),(yyvsp[(3) - (3)].str));;} break; case 67: -#line 204 "fitsy++/parser.Y" +#line 204 "../fitsy/parser.Y" {ff->setpBinXYZ((yyvsp[(2) - (7)].str),(yyvsp[(4) - (7)].str),(yyvsp[(6) - (7)].str));;} break; case 68: -#line 205 "fitsy++/parser.Y" +#line 205 "../fitsy/parser.Y" {ff->setpBinXYZ((yyvsp[(1) - (5)].str),(yyvsp[(3) - (5)].str),(yyvsp[(5) - (5)].str));;} break; case 69: -#line 206 "fitsy++/parser.Y" +#line 206 "../fitsy/parser.Y" {ff->setpBinZ((yyvsp[(2) - (3)].str));;} break; case 70: -#line 207 "fitsy++/parser.Y" +#line 207 "../fitsy/parser.Y" {ff->setpBinZ((yyvsp[(1) - (1)].str));;} break; case 74: -#line 217 "fitsy++/parser.Y" +#line 217 "../fitsy/parser.Y" {ff->setpWidth((yyvsp[(3) - (3)].integer));;} break; case 75: -#line 218 "fitsy++/parser.Y" +#line 218 "../fitsy/parser.Y" {ff->setpHeight((yyvsp[(3) - (3)].integer));;} break; case 76: -#line 219 "fitsy++/parser.Y" +#line 219 "../fitsy/parser.Y" {ff->setpDepth((yyvsp[(3) - (3)].integer));;} break; case 77: -#line 220 "fitsy++/parser.Y" +#line 220 "../fitsy/parser.Y" {ff->setpWidth((yyvsp[(3) - (3)].integer));ff->setpHeight((yyvsp[(3) - (3)].integer));;} break; case 78: -#line 221 "fitsy++/parser.Y" +#line 221 "../fitsy/parser.Y" {ff->setpWidth((yyvsp[(3) - (3)].integer));ff->setpHeight((yyvsp[(3) - (3)].integer));;} break; case 79: -#line 222 "fitsy++/parser.Y" +#line 222 "../fitsy/parser.Y" {ff->setpBitpix((yyvsp[(3) - (3)].integer));;} break; case 80: -#line 223 "fitsy++/parser.Y" +#line 223 "../fitsy/parser.Y" {ff->setpSkip((yyvsp[(3) - (3)].integer));;} break; case 81: -#line 224 "fitsy++/parser.Y" +#line 224 "../fitsy/parser.Y" {ff->setpArch((FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;} break; case 82: -#line 225 "fitsy++/parser.Y" +#line 225 "../fitsy/parser.Y" {ff->setpArch((FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;} break; case 83: -#line 226 "fitsy++/parser.Y" +#line 226 "../fitsy/parser.Y" {ff->setpArch((FitsFile::ArchType)(yyvsp[(1) - (1)].integer));;} break; case 84: -#line 229 "fitsy++/parser.Y" +#line 229 "../fitsy/parser.Y" {(yyval.integer) = FitsFile::BIG;;} break; case 85: -#line 230 "fitsy++/parser.Y" +#line 230 "../fitsy/parser.Y" {(yyval.integer) = FitsFile::BIG;;} break; case 86: -#line 231 "fitsy++/parser.Y" +#line 231 "../fitsy/parser.Y" {(yyval.integer) = FitsFile::LITTLE;;} break; case 87: -#line 232 "fitsy++/parser.Y" +#line 232 "../fitsy/parser.Y" {(yyval.integer) = FitsFile::LITTLE;;} break; case 89: -#line 238 "fitsy++/parser.Y" +#line 238 "../fitsy/parser.Y" {ff->setpBitpix(8);;} break; case 90: -#line 239 "fitsy++/parser.Y" +#line 239 "../fitsy/parser.Y" {ff->setpBitpix(16);;} break; case 91: -#line 240 "fitsy++/parser.Y" +#line 240 "../fitsy/parser.Y" {ff->setpBitpix(-16);;} break; case 92: -#line 241 "fitsy++/parser.Y" +#line 241 "../fitsy/parser.Y" {ff->setpBitpix(32);;} break; case 93: -#line 242 "fitsy++/parser.Y" +#line 242 "../fitsy/parser.Y" {ff->setpBitpix(64);;} break; case 94: -#line 243 "fitsy++/parser.Y" +#line 243 "../fitsy/parser.Y" {ff->setpBitpix(-32);;} break; case 95: -#line 244 "fitsy++/parser.Y" +#line 244 "../fitsy/parser.Y" {ff->setpBitpix(-32);;} break; case 96: -#line 245 "fitsy++/parser.Y" +#line 245 "../fitsy/parser.Y" {ff->setpBitpix(-64);;} break; case 97: -#line 248 "fitsy++/parser.Y" +#line 248 "../fitsy/parser.Y" {ff->setpWidth((yyvsp[(1) - (1)].integer));ff->setpHeight((yyvsp[(1) - (1)].integer));;} break; case 98: -#line 249 "fitsy++/parser.Y" +#line 249 "../fitsy/parser.Y" {ff->setpWidth((yyvsp[(1) - (3)].integer));ff->setpHeight((yyvsp[(3) - (3)].integer));;} break; case 99: -#line 251 "fitsy++/parser.Y" +#line 251 "../fitsy/parser.Y" {ff->setpWidth((yyvsp[(1) - (5)].integer));ff->setpHeight((yyvsp[(3) - (5)].integer));ff->setpDepth((yyvsp[(5) - (5)].integer));;} break; case 101: -#line 255 "fitsy++/parser.Y" +#line 255 "../fitsy/parser.Y" {ff->setpSkip((yyvsp[(2) - (2)].integer));;} break; case 103: -#line 259 "fitsy++/parser.Y" +#line 259 "../fitsy/parser.Y" {ff->setpArch(FitsFile::LITTLE);;} break; case 104: -#line 260 "fitsy++/parser.Y" +#line 260 "../fitsy/parser.Y" {ff->setpArch(FitsFile::BIG);;} break; case 111: -#line 273 "fitsy++/parser.Y" +#line 273 "../fitsy/parser.Y" {ff->setpHPXColumn((yyvsp[(3) - (3)].integer));;} break; case 112: -#line 274 "fitsy++/parser.Y" +#line 274 "../fitsy/parser.Y" {ff->setpHPXQuad((yyvsp[(3) - (3)].integer));;} break; case 113: -#line 277 "fitsy++/parser.Y" +#line 277 "../fitsy/parser.Y" {ff->setpHPXSystem(FitsHPX::EQU);;} break; case 114: -#line 278 "fitsy++/parser.Y" +#line 278 "../fitsy/parser.Y" {ff->setpHPXSystem(FitsHPX::GAL);;} break; case 115: -#line 279 "fitsy++/parser.Y" +#line 279 "../fitsy/parser.Y" {ff->setpHPXSystem(FitsHPX::ECL);;} break; case 116: -#line 280 "fitsy++/parser.Y" +#line 280 "../fitsy/parser.Y" {ff->setpHPXSystem(FitsHPX::UNKNOWN);;} break; case 117: -#line 283 "fitsy++/parser.Y" +#line 283 "../fitsy/parser.Y" {ff->setpHPXOrder(FitsHPX::RING);;} break; case 118: -#line 284 "fitsy++/parser.Y" +#line 284 "../fitsy/parser.Y" {ff->setpHPXOrder(FitsHPX::NESTED);;} break; case 119: -#line 287 "fitsy++/parser.Y" +#line 287 "../fitsy/parser.Y" {ff->setpHPXLayout(FitsHPX::EQUATOR);;} break; case 120: -#line 288 "fitsy++/parser.Y" +#line 288 "../fitsy/parser.Y" {ff->setpHPXLayout(FitsHPX::NORTH);;} break; case 121: -#line 289 "fitsy++/parser.Y" +#line 289 "../fitsy/parser.Y" {ff->setpHPXLayout(FitsHPX::SOUTH);;} break; /* Line 1267 of yacc.c. */ -#line 1979 "fitsy++/parser.C" +#line 1979 "../fitsy/parser.C" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2189,6 +2189,6 @@ yyreturn: } -#line 292 "fitsy++/parser.Y" +#line 292 "../fitsy/parser.Y" diff --git a/fitsy/parser.H b/fitsy/parser.H index 6149ddc..17bdbb8 100644 --- a/fitsy/parser.H +++ b/fitsy/parser.H @@ -114,7 +114,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 32 "fitsy++/parser.Y" +#line 32 "../fitsy/parser.Y" { float real; int integer; @@ -122,7 +122,7 @@ typedef union YYSTYPE void* ptr; } /* Line 1529 of yacc.c. */ -#line 126 "fitsy++/parser.H" +#line 126 "../fitsy/parser.H" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 diff --git a/tksao/Makefile.in b/tksao/Makefile.in index a6e6d0e..0a1b225 100644 --- a/tksao/Makefile.in +++ b/tksao/Makefile.in @@ -223,16 +223,16 @@ cbsaoparser: flex -Pli -ocolorbar/saolex.C colorbar/saolex.L fitsyparser : - bison -d -p ff -o fitsy++/parser.C fitsy++/parser.Y - flex -Pff -ofitsy++/lex.C fitsy++/lex.L + bison -d -p ff -o ../fitsy/parser.C ../fitsy/parser.Y + flex -Pff -o../fitsy/lex.C ../fitsy/lex.L nrrdparser : - bison -d -p nrrd -o fitsy++/nrrdparser.C fitsy++/nrrdparser.Y - flex -Pnrrd -ofitsy++/nrrdlex.C fitsy++/nrrdlex.L + bison -d -p nrrd -o ../fitsy/nrrdparser.C ../fitsy/nrrdparser.Y + flex -Pnrrd -o../fitsy/nrrdlex.C ../fitsy/nrrdlex.L enviparser : - bison -d -p envi -o fitsy++/enviparser.C fitsy++/enviparser.Y - flex -Penvi -ofitsy++/envilex.C fitsy++/envilex.L + bison -d -p envi -o ../fitsy/enviparser.C ../fitsy/enviparser.Y + flex -Penvi -o../fitsy/envilex.C ../fitsy/envilex.L ciaoparser : bison -d -p ciao -o frame/ciaoparser.C frame/ciaoparser.Y diff --git a/tksao/frame/annulus.C b/tksao/frame/annulus.C index 0d78a02..af4c8fa 100644 --- a/tksao/frame/annulus.C +++ b/tksao/frame/annulus.C @@ -2,8 +2,6 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include - #include "annulus.h" #include "fitsimage.h" diff --git a/tksao/frame/base.C b/tksao/frame/base.C index 73a130c..c6490b2 100644 --- a/tksao/frame/base.C +++ b/tksao/frame/base.C @@ -10,6 +10,7 @@ #include "marker.h" #include "wcsast.h" #include "ps.h" +#include "util.h" #include "circle.h" #include "ellipse.h" diff --git a/tksao/frame/base.h b/tksao/frame/base.h index 9e51b7a..af86f87 100644 --- a/tksao/frame/base.h +++ b/tksao/frame/base.h @@ -21,7 +21,6 @@ #include "inversescale.h" #include "list.h" #include "tag.h" -#include "util.h" #include "point.h" #include "fitsmask.h" diff --git a/tksao/frame/basebox.C b/tksao/frame/basebox.C index 79cb2ae..8678f70 100644 --- a/tksao/frame/basebox.C +++ b/tksao/frame/basebox.C @@ -2,10 +2,9 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include - #include "basebox.h" #include "fitsimage.h" +#include "util.h" BaseBox::BaseBox(Base* p, const Vector& ctr, double ang) : BaseMarker(p, ctr, ang) diff --git a/tksao/frame/basecommand.C b/tksao/frame/basecommand.C index fb85638..2514d89 100644 --- a/tksao/frame/basecommand.C +++ b/tksao/frame/basecommand.C @@ -5,8 +5,6 @@ #include #include "fdstream.hpp" -#include - #include "base.h" #include "context.h" #include "fitsimage.h" @@ -14,6 +12,7 @@ #include "outfile.h" #include "outchannel.h" #include "outsocket.h" +#include "util.h" #include "sigbus.h" diff --git a/tksao/frame/baseellipse.C b/tksao/frame/baseellipse.C index 2f84fb9..842d95a 100644 --- a/tksao/frame/baseellipse.C +++ b/tksao/frame/baseellipse.C @@ -4,6 +4,7 @@ #include "baseellipse.h" #include "fitsimage.h" +#include "util.h" #define XPOINT_BLOCK 1024 diff --git a/tksao/frame/baseellipse.h b/tksao/frame/baseellipse.h index 29287d4..e1804ed 100644 --- a/tksao/frame/baseellipse.h +++ b/tksao/frame/baseellipse.h @@ -5,8 +5,6 @@ #ifndef __baseellipse_h__ #define __baseellipse_h__ -#include - #include "basemarker.h" class BaseEllipse : public BaseMarker { diff --git a/tksao/frame/baseline.C b/tksao/frame/baseline.C index a1c5598..f7230c4 100644 --- a/tksao/frame/baseline.C +++ b/tksao/frame/baseline.C @@ -2,8 +2,6 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include - #include "baseline.h" #include "fitsimage.h" diff --git a/tksao/frame/basemarker.C b/tksao/frame/basemarker.C index 1693542..608c255 100644 --- a/tksao/frame/basemarker.C +++ b/tksao/frame/basemarker.C @@ -2,8 +2,6 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include - #include "basemarker.h" #include "base.h" diff --git a/tksao/frame/basemarker.h b/tksao/frame/basemarker.h index 7155b30..e1a98bf 100644 --- a/tksao/frame/basemarker.h +++ b/tksao/frame/basemarker.h @@ -6,6 +6,7 @@ #define __basemarker_h__ #include "marker.h" +#include "util.h" #define MAXANNULI 512 #define MAXANGLES 720 diff --git a/tksao/frame/basepolygon.C b/tksao/frame/basepolygon.C index 6288836..e3fac46 100644 --- a/tksao/frame/basepolygon.C +++ b/tksao/frame/basepolygon.C @@ -2,8 +2,6 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include - #include "basepolygon.h" #include "fitsimage.h" diff --git a/tksao/frame/box.C b/tksao/frame/box.C index ce760cc..c97a96c 100644 --- a/tksao/frame/box.C +++ b/tksao/frame/box.C @@ -2,8 +2,6 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include - #include "box.h" #include "fitsimage.h" diff --git a/tksao/frame/boxannulus.C b/tksao/frame/boxannulus.C index 2f85be2..015843b 100644 --- a/tksao/frame/boxannulus.C +++ b/tksao/frame/boxannulus.C @@ -2,8 +2,6 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include - #include "boxannulus.h" #include "fitsimage.h" diff --git a/tksao/frame/bpanda.C b/tksao/frame/bpanda.C index e700eb0..b21b288 100644 --- a/tksao/frame/bpanda.C +++ b/tksao/frame/bpanda.C @@ -2,8 +2,6 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include - #include "bpanda.h" #include "fitsimage.h" diff --git a/tksao/frame/circle.C b/tksao/frame/circle.C index b11e2da..e46b812 100644 --- a/tksao/frame/circle.C +++ b/tksao/frame/circle.C @@ -2,8 +2,6 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include - #include "circle.h" #include "fitsimage.h" diff --git a/tksao/frame/compass.C b/tksao/frame/compass.C index ba6b71d..31be7bf 100644 --- a/tksao/frame/compass.C +++ b/tksao/frame/compass.C @@ -2,10 +2,9 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include - #include "compass.h" #include "fitsimage.h" +#include "util.h" Compass::Compass(const Compass& a) : Marker(a) { diff --git a/tksao/frame/composite.C b/tksao/frame/composite.C index 2407115..55c9271 100644 --- a/tksao/frame/composite.C +++ b/tksao/frame/composite.C @@ -2,8 +2,6 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include - #include "composite.h" #include "fitsimage.h" diff --git a/tksao/frame/context.C b/tksao/frame/context.C index 1c77c4f..288e06c 100644 --- a/tksao/frame/context.C +++ b/tksao/frame/context.C @@ -5,6 +5,8 @@ #include "context.h" #include "fitsimage.h" #include "fvcontour.h" +#include "convolve.h" +#include "util.h" #include "alloc.h" #include "allocgz.h" @@ -17,8 +19,6 @@ #include "socket.h" #include "socketgz.h" #include "var.h" -#include "convolve.h" - #include "head.h" extern "C" { diff --git a/tksao/frame/contour.C b/tksao/frame/contour.C index 0279cd3..445236c 100644 --- a/tksao/frame/contour.C +++ b/tksao/frame/contour.C @@ -5,6 +5,7 @@ #include "contour.h" #include "base.h" #include "context.h" +#include "util.h" // ContourLevel ContourLevel::ContourLevel(Base* pp, double lev, diff --git a/tksao/frame/contourparser.C b/tksao/frame/contourparser.C index c99dc35..40f5e73 100644 --- a/tksao/frame/contourparser.C +++ b/tksao/frame/contourparser.C @@ -229,6 +229,7 @@ #include "context.h" #include "fitsimage.h" #include "contour.h" +#include "util.h" #undef yyFlexLexer #define yyFlexLexer ctFlexLexer @@ -280,7 +281,7 @@ static Coord::SkyFrame checkWCSSky(); #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 55 "frame/contourparser.Y" +#line 56 "frame/contourparser.Y" { #define CTBUFSIZE 2048 double real; @@ -289,7 +290,7 @@ typedef union YYSTYPE double vector[3]; } /* Line 193 of yacc.c. */ -#line 293 "frame/contourparser.C" +#line 294 "frame/contourparser.C" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -302,7 +303,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 306 "frame/contourparser.C" +#line 307 "frame/contourparser.C" #ifdef short # undef short @@ -630,18 +631,18 @@ static const yytype_int8 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 147, 147, 150, 151, 155, 161, 162, 164, 165, - 169, 174, 179, 180, 180, 181, 181, 182, 187, 188, - 195, 195, 198, 199, 203, 210, 211, 214, 228, 229, - 229, 232, 233, 234, 244, 245, 248, 249, 252, 254, - 255, 256, 257, 259, 260, 261, 262, 265, 266, 269, - 272, 275, 278, 292, 301, 302, 303, 304, 305, 308, - 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, - 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, - 329, 330, 331, 332, 333, 334, 337, 338, 339, 340, - 341, 342, 343, 346, 347, 350, 351, 352, 353, 354, - 357, 358, 361, 362, 363, 364, 367, 380, 388, 396, - 403, 411, 418 + 0, 148, 148, 151, 152, 156, 162, 163, 165, 166, + 170, 175, 180, 181, 181, 182, 182, 183, 188, 189, + 196, 196, 199, 200, 204, 211, 212, 215, 229, 230, + 230, 233, 234, 235, 245, 246, 249, 250, 253, 255, + 256, 257, 258, 260, 261, 262, 263, 266, 267, 270, + 273, 276, 279, 293, 302, 303, 304, 305, 306, 309, + 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, + 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, + 330, 331, 332, 333, 334, 335, 338, 339, 340, 341, + 342, 343, 344, 347, 348, 351, 352, 353, 354, 355, + 358, 359, 362, 363, 364, 365, 368, 381, 389, 397, + 404, 412, 419 }; #endif @@ -1706,7 +1707,7 @@ yyreduce: switch (yyn) { case 5: -#line 155 "frame/contourparser.Y" +#line 156 "frame/contourparser.Y" { if (cc && cl) { cl->lcontour().append(cc); @@ -1716,19 +1717,19 @@ yyreduce: break; case 7: -#line 162 "frame/contourparser.Y" +#line 163 "frame/contourparser.Y" {cerr << "DS9 Contour File 7.5" << endl;;} break; case 9: -#line 166 "frame/contourparser.Y" +#line 167 "frame/contourparser.Y" { globalSystem=(Coord::CoordSystem)(yyvsp[(1) - (2)].integer); ;} break; case 10: -#line 170 "frame/contourparser.Y" +#line 171 "frame/contourparser.Y" { globalSystem=globalWCS; globalSky=(Coord::SkyFrame)(yyvsp[(1) - (2)].integer); @@ -1736,7 +1737,7 @@ yyreduce: break; case 11: -#line 175 "frame/contourparser.Y" +#line 176 "frame/contourparser.Y" { globalSystem=globalWCS; globalSky=Coord::FK5; @@ -1744,17 +1745,17 @@ yyreduce: break; case 13: -#line 180 "frame/contourparser.Y" +#line 181 "frame/contourparser.Y" {localLevel = (yyvsp[(3) - (3)].real);} break; case 15: -#line 181 "frame/contourparser.Y" +#line 182 "frame/contourparser.Y" {localLevel = (yyvsp[(3) - (3)].real);} break; case 17: -#line 183 "frame/contourparser.Y" +#line 184 "frame/contourparser.Y" { if (cl) cc = new Contour(cl); @@ -1762,7 +1763,7 @@ yyreduce: break; case 19: -#line 189 "frame/contourparser.Y" +#line 190 "frame/contourparser.Y" { if (cc && cl) { cl->lcontour().append(cc); @@ -1772,12 +1773,12 @@ yyreduce: break; case 20: -#line 195 "frame/contourparser.Y" +#line 196 "frame/contourparser.Y" {DISCARD_(1);;} break; case 24: -#line 203 "frame/contourparser.Y" +#line 204 "frame/contourparser.Y" { if (cl) ct->contourAppendAux(cl); @@ -1786,7 +1787,7 @@ yyreduce: break; case 27: -#line 215 "frame/contourparser.Y" +#line 216 "frame/contourparser.Y" { if (cc) cc->lvertex().append(new Vertex((yyvsp[(1) - (2)].vector))); @@ -1801,12 +1802,12 @@ yyreduce: break; case 29: -#line 229 "frame/contourparser.Y" +#line 230 "frame/contourparser.Y" {DISCARD_(1);;} break; case 33: -#line 235 "frame/contourparser.Y" +#line 236 "frame/contourparser.Y" { if (cl) { ct->contourAppendAux(cl); @@ -1817,87 +1818,87 @@ yyreduce: break; case 34: -#line 244 "frame/contourparser.Y" +#line 245 "frame/contourparser.Y" {(yyval.real)=(yyvsp[(1) - (1)].real);;} break; case 35: -#line 245 "frame/contourparser.Y" +#line 246 "frame/contourparser.Y" {(yyval.real)=(yyvsp[(1) - (1)].integer);;} break; case 36: -#line 248 "frame/contourparser.Y" +#line 249 "frame/contourparser.Y" {yydebug=1;;} break; case 37: -#line 249 "frame/contourparser.Y" +#line 250 "frame/contourparser.Y" {yydebug=0;;} break; case 38: -#line 252 "frame/contourparser.Y" +#line 253 "frame/contourparser.Y" {(yyval.integer)=((yyvsp[(1) - (1)].integer) ? 1 : 0);;} break; case 39: -#line 254 "frame/contourparser.Y" +#line 255 "frame/contourparser.Y" {(yyval.integer)=1;;} break; case 40: -#line 255 "frame/contourparser.Y" +#line 256 "frame/contourparser.Y" {(yyval.integer)=1;;} break; case 41: -#line 256 "frame/contourparser.Y" +#line 257 "frame/contourparser.Y" {(yyval.integer)=1;;} break; case 42: -#line 257 "frame/contourparser.Y" +#line 258 "frame/contourparser.Y" {(yyval.integer)=1;;} break; case 43: -#line 259 "frame/contourparser.Y" +#line 260 "frame/contourparser.Y" {(yyval.integer)=0;;} break; case 44: -#line 260 "frame/contourparser.Y" +#line 261 "frame/contourparser.Y" {(yyval.integer)=0;;} break; case 45: -#line 261 "frame/contourparser.Y" +#line 262 "frame/contourparser.Y" {(yyval.integer)=0;;} break; case 46: -#line 262 "frame/contourparser.Y" +#line 263 "frame/contourparser.Y" {(yyval.integer)=0;;} break; case 49: -#line 269 "frame/contourparser.Y" +#line 270 "frame/contourparser.Y" {(yyval.real) = parseSEXStr((yyvsp[(1) - (1)].str));;} break; case 50: -#line 272 "frame/contourparser.Y" +#line 273 "frame/contourparser.Y" {(yyval.real) = parseHMSStr((yyvsp[(1) - (1)].str));;} break; case 51: -#line 275 "frame/contourparser.Y" +#line 276 "frame/contourparser.Y" {(yyval.real) = parseDMSStr((yyvsp[(1) - (1)].str));;} break; case 52: -#line 278 "frame/contourparser.Y" +#line 279 "frame/contourparser.Y" { cl = NULL; cc = NULL; @@ -1913,7 +1914,7 @@ yyreduce: break; case 53: -#line 292 "frame/contourparser.Y" +#line 293 "frame/contourparser.Y" { strcpy(localColor,globalColor); localDash = globalDash; @@ -1924,247 +1925,247 @@ yyreduce: break; case 54: -#line 301 "frame/contourparser.Y" +#line 302 "frame/contourparser.Y" {(yyval.integer) = Coord::IMAGE;;} break; case 55: -#line 302 "frame/contourparser.Y" +#line 303 "frame/contourparser.Y" {(yyval.integer) = Coord::PHYSICAL;;} break; case 56: -#line 303 "frame/contourparser.Y" +#line 304 "frame/contourparser.Y" {(yyval.integer) = Coord::DETECTOR;;} break; case 57: -#line 304 "frame/contourparser.Y" +#line 305 "frame/contourparser.Y" {(yyval.integer) = Coord::AMPLIFIER;;} break; case 58: -#line 305 "frame/contourparser.Y" +#line 306 "frame/contourparser.Y" {(yyval.integer) = (yyvsp[(1) - (1)].integer); globalWCS = (Coord::CoordSystem)(yyvsp[(1) - (1)].integer);;} break; case 59: -#line 308 "frame/contourparser.Y" +#line 309 "frame/contourparser.Y" {(yyval.integer) = Coord::WCS;;} break; case 60: -#line 309 "frame/contourparser.Y" +#line 310 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSA;;} break; case 61: -#line 310 "frame/contourparser.Y" +#line 311 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSB;;} break; case 62: -#line 311 "frame/contourparser.Y" +#line 312 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSC;;} break; case 63: -#line 312 "frame/contourparser.Y" +#line 313 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSD;;} break; case 64: -#line 313 "frame/contourparser.Y" +#line 314 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSE;;} break; case 65: -#line 314 "frame/contourparser.Y" +#line 315 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSF;;} break; case 66: -#line 315 "frame/contourparser.Y" +#line 316 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSG;;} break; case 67: -#line 316 "frame/contourparser.Y" +#line 317 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSH;;} break; case 68: -#line 317 "frame/contourparser.Y" +#line 318 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSI;;} break; case 69: -#line 318 "frame/contourparser.Y" +#line 319 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSJ;;} break; case 70: -#line 319 "frame/contourparser.Y" +#line 320 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSK;;} break; case 71: -#line 320 "frame/contourparser.Y" +#line 321 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSL;;} break; case 72: -#line 321 "frame/contourparser.Y" +#line 322 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSM;;} break; case 73: -#line 322 "frame/contourparser.Y" +#line 323 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSN;;} break; case 74: -#line 323 "frame/contourparser.Y" +#line 324 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSO;;} break; case 75: -#line 324 "frame/contourparser.Y" +#line 325 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSP;;} break; case 76: -#line 325 "frame/contourparser.Y" +#line 326 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSQ;;} break; case 77: -#line 326 "frame/contourparser.Y" +#line 327 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSR;;} break; case 78: -#line 327 "frame/contourparser.Y" +#line 328 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSS;;} break; case 79: -#line 328 "frame/contourparser.Y" +#line 329 "frame/contourparser.Y" {(yyval.integer) = Coord::WCST;;} break; case 80: -#line 329 "frame/contourparser.Y" +#line 330 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSU;;} break; case 81: -#line 330 "frame/contourparser.Y" +#line 331 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSV;;} break; case 82: -#line 331 "frame/contourparser.Y" +#line 332 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSW;;} break; case 83: -#line 332 "frame/contourparser.Y" +#line 333 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSX;;} break; case 84: -#line 333 "frame/contourparser.Y" +#line 334 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSY;;} break; case 85: -#line 334 "frame/contourparser.Y" +#line 335 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSZ;;} break; case 86: -#line 337 "frame/contourparser.Y" +#line 338 "frame/contourparser.Y" {(yyval.integer) = Coord::FK4;;} break; case 87: -#line 338 "frame/contourparser.Y" +#line 339 "frame/contourparser.Y" {(yyval.integer) = Coord::FK4;;} break; case 88: -#line 339 "frame/contourparser.Y" +#line 340 "frame/contourparser.Y" {(yyval.integer) = Coord::FK5;;} break; case 89: -#line 340 "frame/contourparser.Y" +#line 341 "frame/contourparser.Y" {(yyval.integer) = Coord::FK5;;} break; case 90: -#line 341 "frame/contourparser.Y" +#line 342 "frame/contourparser.Y" {(yyval.integer) = Coord::ICRS;;} break; case 91: -#line 342 "frame/contourparser.Y" +#line 343 "frame/contourparser.Y" {(yyval.integer) = Coord::GALACTIC;;} break; case 92: -#line 343 "frame/contourparser.Y" +#line 344 "frame/contourparser.Y" {(yyval.integer) = Coord::ECLIPTIC;;} break; case 95: -#line 350 "frame/contourparser.Y" +#line 351 "frame/contourparser.Y" {strncpy(globalColor,(yyvsp[(3) - (3)].str),16);;} break; case 96: -#line 351 "frame/contourparser.Y" +#line 352 "frame/contourparser.Y" {globalDash = (yyvsp[(3) - (3)].integer);;} break; case 97: -#line 352 "frame/contourparser.Y" +#line 353 "frame/contourparser.Y" {globalDashList[0] =(yyvsp[(3) - (4)].integer); globalDashList[1] =(yyvsp[(4) - (4)].integer);;} break; case 98: -#line 353 "frame/contourparser.Y" +#line 354 "frame/contourparser.Y" {globalWCS = (Coord::CoordSystem)(yyvsp[(3) - (3)].integer);;} break; case 99: -#line 354 "frame/contourparser.Y" +#line 355 "frame/contourparser.Y" {globalWidth = (yyvsp[(3) - (3)].integer);;} break; case 102: -#line 361 "frame/contourparser.Y" +#line 362 "frame/contourparser.Y" {strncpy(localColor,(yyvsp[(3) - (3)].str),16);;} break; case 103: -#line 362 "frame/contourparser.Y" +#line 363 "frame/contourparser.Y" {localDash = (yyvsp[(3) - (3)].integer);;} break; case 104: -#line 363 "frame/contourparser.Y" +#line 364 "frame/contourparser.Y" {localDashList[0] =(yyvsp[(3) - (4)].integer); localDashList[1] =(yyvsp[(4) - (4)].integer);;} break; case 105: -#line 364 "frame/contourparser.Y" +#line 365 "frame/contourparser.Y" {localWidth = (yyvsp[(3) - (3)].integer);;} break; case 106: -#line 368 "frame/contourparser.Y" +#line 369 "frame/contourparser.Y" { Vector r; Coord::CoordSystem sys = checkWCSSystem(); @@ -2180,7 +2181,7 @@ yyreduce: break; case 107: -#line 381 "frame/contourparser.Y" +#line 382 "frame/contourparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), checkWCSSystem(), checkWCSSky()); @@ -2191,7 +2192,7 @@ yyreduce: break; case 108: -#line 389 "frame/contourparser.Y" +#line 390 "frame/contourparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), checkWCSSystem(), checkWCSSky()); @@ -2202,7 +2203,7 @@ yyreduce: break; case 109: -#line 397 "frame/contourparser.Y" +#line 398 "frame/contourparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), globalSystem, globalSky); (yyval.vector)[0] = r[0]; @@ -2212,7 +2213,7 @@ yyreduce: break; case 110: -#line 404 "frame/contourparser.Y" +#line 405 "frame/contourparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), checkWCSSystem(), checkWCSSky()); @@ -2223,7 +2224,7 @@ yyreduce: break; case 111: -#line 412 "frame/contourparser.Y" +#line 413 "frame/contourparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), Coord::IMAGE); (yyval.vector)[0] = r[0]; @@ -2233,7 +2234,7 @@ yyreduce: break; case 112: -#line 419 "frame/contourparser.Y" +#line 420 "frame/contourparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), Coord::PHYSICAL); (yyval.vector)[0] = r[0]; @@ -2243,7 +2244,7 @@ yyreduce: /* Line 1267 of yacc.c. */ -#line 2247 "frame/contourparser.C" +#line 2248 "frame/contourparser.C" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2457,7 +2458,7 @@ yyreturn: } -#line 425 "frame/contourparser.Y" +#line 426 "frame/contourparser.Y" static Coord::CoordSystem checkWCSSystem() diff --git a/tksao/frame/contourparser.H b/tksao/frame/contourparser.H index 8a19b95..a5df146 100644 --- a/tksao/frame/contourparser.H +++ b/tksao/frame/contourparser.H @@ -180,7 +180,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 55 "frame/contourparser.Y" +#line 56 "frame/contourparser.Y" { #define CTBUFSIZE 2048 double real; diff --git a/tksao/frame/contourparser.Y b/tksao/frame/contourparser.Y index 3983767..1cda1ca 100644 --- a/tksao/frame/contourparser.Y +++ b/tksao/frame/contourparser.Y @@ -21,6 +21,7 @@ #include "context.h" #include "fitsimage.h" #include "contour.h" +#include "util.h" #undef yyFlexLexer #define yyFlexLexer ctFlexLexer diff --git a/tksao/frame/coord.C b/tksao/frame/coord.C index 339e203..c01858b 100644 --- a/tksao/frame/coord.C +++ b/tksao/frame/coord.C @@ -4,6 +4,7 @@ #include "coord.h" #include "fitsimage.h" +#include "util.h" Coord coord; diff --git a/tksao/frame/cpanda.C b/tksao/frame/cpanda.C index fff5c93..69f330f 100644 --- a/tksao/frame/cpanda.C +++ b/tksao/frame/cpanda.C @@ -2,8 +2,6 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include - #include "cpanda.h" #include "fitsimage.h" diff --git a/tksao/frame/ellipse.C b/tksao/frame/ellipse.C index 242a29a..28012ed 100644 --- a/tksao/frame/ellipse.C +++ b/tksao/frame/ellipse.C @@ -2,8 +2,6 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include - #include "ellipse.h" #include "fitsimage.h" diff --git a/tksao/frame/ellipseannulus.C b/tksao/frame/ellipseannulus.C index dbd3504..6102cc0 100644 --- a/tksao/frame/ellipseannulus.C +++ b/tksao/frame/ellipseannulus.C @@ -2,8 +2,6 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include - #include "ellipseannulus.h" #include "fitsimage.h" diff --git a/tksao/frame/epanda.C b/tksao/frame/epanda.C index 0971951..55fa6d2 100644 --- a/tksao/frame/epanda.C +++ b/tksao/frame/epanda.C @@ -2,8 +2,6 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include - #include "epanda.h" #include "fitsimage.h" diff --git a/tksao/frame/fitsanalysis.C b/tksao/frame/fitsanalysis.C index 13a2aed..db489cc 100644 --- a/tksao/frame/fitsanalysis.C +++ b/tksao/frame/fitsanalysis.C @@ -8,6 +8,7 @@ #include "fitsimage.h" #include "context.h" #include "convolve.h" +#include "util.h" void FitsImage::analysis(int which, pthread_t* thread, void* targ) { diff --git a/tksao/frame/fitsbin.C b/tksao/frame/fitsbin.C index 176c919..ca14267 100644 --- a/tksao/frame/fitsbin.C +++ b/tksao/frame/fitsbin.C @@ -4,6 +4,7 @@ #include "fitsimage.h" #include "context.h" +#include "util.h" Matrix FitsImage::bin(const Vector& vv) { diff --git a/tksao/frame/fitsblock.C b/tksao/frame/fitsblock.C index 1261cc9..2c49281 100644 --- a/tksao/frame/fitsblock.C +++ b/tksao/frame/fitsblock.C @@ -6,6 +6,7 @@ #include "block.h" #include "context.h" #include "wcsast.h" +#include "util.h" void* blockproc(void* tt); diff --git a/tksao/frame/fitsimage.C b/tksao/frame/fitsimage.C index 925be24..96e2043 100644 --- a/tksao/frame/fitsimage.C +++ b/tksao/frame/fitsimage.C @@ -6,6 +6,7 @@ #include "fitsimage.h" #include "framebase.h" +#include "util.h" #include "context.h" #include "mmap.h" diff --git a/tksao/frame/fitsmap.C b/tksao/frame/fitsmap.C index b71bb06..4631bab 100644 --- a/tksao/frame/fitsmap.C +++ b/tksao/frame/fitsmap.C @@ -4,6 +4,7 @@ #include "fitsimage.h" #include "context.h" +#include "util.h" // Map Point diff --git a/tksao/frame/fitsmask.C b/tksao/frame/fitsmask.C index 95b7ce9..ea8da13 100644 --- a/tksao/frame/fitsmask.C +++ b/tksao/frame/fitsmask.C @@ -2,11 +2,10 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include - #include "fitsmask.h" #include "base.h" #include "context.h" +#include "util.h" FitsMask::FitsMask(Base* pp, char* clr, MaskType mm, double ll, double hh) : mark_(mm), low_(ll), high_(hh) diff --git a/tksao/frame/fr3dcommand.C b/tksao/frame/fr3dcommand.C index 3304a45..23ff192 100644 --- a/tksao/frame/fr3dcommand.C +++ b/tksao/frame/fr3dcommand.C @@ -6,6 +6,7 @@ #include "fitsimage.h" #include "context.h" #include "marker.h" +#include "util.h" void Frame3dBase::binToFitCmd() { diff --git a/tksao/frame/frame.C b/tksao/frame/frame.C index b101eb0..3e5411a 100644 --- a/tksao/frame/frame.C +++ b/tksao/frame/frame.C @@ -6,8 +6,9 @@ #include "frame.h" #include "fitsimage.h" -#include "ps.h" #include "analysis.h" +#include "ps.h" +#include "util.h" #include "sigbus.h" diff --git a/tksao/frame/frame3d.C b/tksao/frame/frame3d.C index 1c37865..06c7457 100644 --- a/tksao/frame/frame3d.C +++ b/tksao/frame/frame3d.C @@ -5,6 +5,7 @@ #include "frame3d.h" #include "fitsimage.h" #include "ps.h" +#include "util.h" #include "sigbus.h" #include diff --git a/tksao/frame/frame3dbase.C b/tksao/frame/frame3dbase.C index 10192aa..c1f612e 100644 --- a/tksao/frame/frame3dbase.C +++ b/tksao/frame/frame3dbase.C @@ -9,6 +9,7 @@ #include "marker.h" #include "context.h" #include "ps.h" +#include "util.h" #include "sigbus.h" Frame3dBase::Frame3dBase(Tcl_Interp* i, Tk_Canvas c, Tk_Item* item) diff --git a/tksao/frame/framergb.C b/tksao/frame/framergb.C index d170282..0e9501b 100644 --- a/tksao/frame/framergb.C +++ b/tksao/frame/framergb.C @@ -6,10 +6,11 @@ #include "framergb.h" #include "fitsimage.h" -#include "ps.h" #include "outfile.h" #include "outchannel.h" #include "outsocket.h" +#include "ps.h" +#include "util.h" #include "sigbus.h" diff --git a/tksao/frame/frcommand.C b/tksao/frame/frcommand.C index 665243e..bd6cbc1 100644 --- a/tksao/frame/frcommand.C +++ b/tksao/frame/frcommand.C @@ -5,8 +5,6 @@ #include #include "fdstream.hpp" -#include - #include "framebase.h" #include "fitsimage.h" #include "context.h" diff --git a/tksao/frame/frmap.C b/tksao/frame/frmap.C index 72ed4f4..f856603 100644 --- a/tksao/frame/frmap.C +++ b/tksao/frame/frmap.C @@ -5,6 +5,7 @@ #include "context.h" #include "framebase.h" #include "fitsimage.h" +#include "util.h" double Base::mapAngleFromRef(double angle, Coord::CoordSystem sys, Coord::SkyFrame sky) diff --git a/tksao/frame/frmarker.C b/tksao/frame/frmarker.C index c2028c2..bac3ff5 100644 --- a/tksao/frame/frmarker.C +++ b/tksao/frame/frmarker.C @@ -11,6 +11,7 @@ #include "fvcontour.h" #include "marker.h" #include "basemarker.h" +#include "util.h" #include "sigbus.h" #include "circle.h" diff --git a/tksao/frame/frmarkerxml.C b/tksao/frame/frmarkerxml.C index c1074e3..b4f17ab 100644 --- a/tksao/frame/frmarkerxml.C +++ b/tksao/frame/frmarkerxml.C @@ -9,6 +9,7 @@ #include "context.h" #include "framebase.h" #include "fitsimage.h" +#include "util.h" static int xmlRead (void * context, char * buffer, int len) { diff --git a/tksao/frame/frsave.C b/tksao/frame/frsave.C index 467239b..1ca46e3 100644 --- a/tksao/frame/frsave.C +++ b/tksao/frame/frsave.C @@ -9,6 +9,7 @@ #include "outfile.h" #include "outchannel.h" #include "outsocket.h" +#include "util.h" #include "sigbus.h" #include "wcsast.h" diff --git a/tksao/frame/fvcontour.C b/tksao/frame/fvcontour.C index c042ee2..4402cf1 100644 --- a/tksao/frame/fvcontour.C +++ b/tksao/frame/fvcontour.C @@ -7,6 +7,7 @@ #include "base.h" #include "fitsimage.h" #include "convolve.h" +#include "util.h" #include "sigbus.h" diff --git a/tksao/frame/grid.C b/tksao/frame/grid.C index b07b973..e18c0c8 100644 --- a/tksao/frame/grid.C +++ b/tksao/frame/grid.C @@ -5,6 +5,7 @@ #include "grid.h" #include "context.h" #include "fitsimage.h" +#include "util.h" extern "C" { #include "ast.h" diff --git a/tksao/frame/line.C b/tksao/frame/line.C index 1d069e2..2fb5dce 100644 --- a/tksao/frame/line.C +++ b/tksao/frame/line.C @@ -2,8 +2,6 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include - #include "line.h" #include "fitsimage.h" diff --git a/tksao/frame/marker.C b/tksao/frame/marker.C index 375846f..d4bf50b 100644 --- a/tksao/frame/marker.C +++ b/tksao/frame/marker.C @@ -2,12 +2,11 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include - #include "marker.h" #include "framebase.h" #include "frame3dbase.h" #include "fitsimage.h" +#include "util.h" extern "C" { #include "tkbltVector.h" diff --git a/tksao/frame/point.C b/tksao/frame/point.C index e8784e2..6ba5a42 100644 --- a/tksao/frame/point.C +++ b/tksao/frame/point.C @@ -2,10 +2,9 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include - #include "point.h" #include "fitsimage.h" +#include "util.h" #define NUMSEG 16 diff --git a/tksao/frame/polygon.C b/tksao/frame/polygon.C index 46ff671..0197765 100644 --- a/tksao/frame/polygon.C +++ b/tksao/frame/polygon.C @@ -2,8 +2,6 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include - #include "polygon.h" #include "fitsimage.h" diff --git a/tksao/frame/projection.C b/tksao/frame/projection.C index 5bfbaf3..c46985d 100644 --- a/tksao/frame/projection.C +++ b/tksao/frame/projection.C @@ -2,8 +2,6 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include - #include "projection.h" #include "fitsimage.h" diff --git a/tksao/frame/ruler.C b/tksao/frame/ruler.C index 0813274..227fa52 100644 --- a/tksao/frame/ruler.C +++ b/tksao/frame/ruler.C @@ -2,10 +2,9 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include - #include "ruler.h" #include "fitsimage.h" +#include "util.h" Ruler::Ruler(const Ruler& a) : BaseLine(a) { diff --git a/tksao/frame/segment.C b/tksao/frame/segment.C index f67d37c..ec6b2cb 100644 --- a/tksao/frame/segment.C +++ b/tksao/frame/segment.C @@ -2,8 +2,6 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include - #include "segment.h" #include "fitsimage.h" diff --git a/tksao/frame/text.C b/tksao/frame/text.C index a4de348..ae2a902 100644 --- a/tksao/frame/text.C +++ b/tksao/frame/text.C @@ -2,10 +2,9 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include - #include "text.h" #include "fitsimage.h" +#include "util.h" EXTERN void TkDrawAngledChars(Display *display, Drawable drawable, GC gc, Tk_Font tkfont, diff --git a/tksao/frame/vect.C b/tksao/frame/vect.C index 8957560..dd00986 100644 --- a/tksao/frame/vect.C +++ b/tksao/frame/vect.C @@ -2,8 +2,6 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" -#include - #include "vect.h" #include "fitsimage.h" -- cgit v0.12