diff options
49 files changed, 6069 insertions, 5687 deletions
diff --git a/ds9/doc/release/r8.1.html b/ds9/doc/release/r8.1.html index 27c4edb..8d70475 100644 --- a/ds9/doc/release/r8.1.html +++ b/ds9/doc/release/r8.1.html @@ -89,11 +89,11 @@ <li><tt>07.03.2019 GUI: lock down geometry at startup so that unneeded configure events are not generated, a problem with recent versions of linux.</tt></li> <li><tt>07.17.2019 PREFS: new -prefs yes/no command line option.</tt></li> <li><tt>07.18.2019 PANDA: fix radial analysis.</tt></li> -<li><tt>07.29.2019 COLORBAR: fixed SAO color table parser to recognize british spelling for PSEUDOCOLOUR.</tt></li> <li><tt>07.31.2019 PLOT: add new multiple graphs per plot.</tt></li> <li><tt>07.31.2019 PLOT: add new add/select/delete graph.</tt></li> <li><tt>07.31.2019 PLOT: add new /select/delete dataset.</tt></li> <li><tt>07.31.2019 PLOT: add new layout grid|row|column|strip.</tt></li> +<li><tt>07.31.2019 PARSER: update all parsers to accept british spelling of COLOUR.</tt></li> <li><tt><b>xx.xx.2019 RELEASE version 8.1b2</b></tt></li> </ol> </div> diff --git a/ds9/parsers/catlex.fcl b/ds9/parsers/catlex.fcl index cd6836b..c4d51e0 100644 --- a/ds9/parsers/catlex.fcl +++ b/ds9/parsers/catlex.fcl @@ -26,6 +26,7 @@ circle {return $CIRCLE_} clear {return $CLEAR_} close {return $CLOSE_} color {return $COLOR_} +colour {return $COLOR_} condition {return $CONDITION_} coordinate {return $COORDINATE_} cross {return $CROSS_} diff --git a/ds9/parsers/catlex.tcl b/ds9/parsers/catlex.tcl index 5c4bd0f..90b525d 100644 --- a/ds9/parsers/catlex.tcl +++ b/ds9/parsers/catlex.tcl @@ -479,944 +479,951 @@ set SAAO_ 402 set yyleng [string length $yytext] set matched_rule 18 } - # rule 19: condition - if {[regexp -start $index_ -indices -line -nocase -- {\A(condition)} $yy_current_buffer match] > 0 && \ + # rule 19: colour + if {[regexp -start $index_ -indices -line -nocase -- {\A(colour)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 19 } - # rule 20: coordinate - if {[regexp -start $index_ -indices -line -nocase -- {\A(coordinate)} $yy_current_buffer match] > 0 && \ + # rule 20: condition + if {[regexp -start $index_ -indices -line -nocase -- {\A(condition)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 20 } - # rule 21: cross - if {[regexp -start $index_ -indices -line -nocase -- {\A(cross)} $yy_current_buffer match] > 0 && \ + # rule 21: coordinate + if {[regexp -start $index_ -indices -line -nocase -- {\A(coordinate)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 21 } - # rule 22: crosshair - if {[regexp -start $index_ -indices -line -nocase -- {\A(crosshair)} $yy_current_buffer match] > 0 && \ + # rule 22: cross + if {[regexp -start $index_ -indices -line -nocase -- {\A(cross)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 22 } - # rule 23: csv - if {[regexp -start $index_ -indices -line -nocase -- {\A(csv)} $yy_current_buffer match] > 0 && \ + # rule 23: crosshair + if {[regexp -start $index_ -indices -line -nocase -- {\A(crosshair)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 23 } - # rule 24: dec - if {[regexp -start $index_ -indices -line -nocase -- {\A(dec)} $yy_current_buffer match] > 0 && \ + # rule 24: csv + if {[regexp -start $index_ -indices -line -nocase -- {\A(csv)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 24 } - # rule 25: decr - if {[regexp -start $index_ -indices -line -nocase -- {\A(decr)} $yy_current_buffer match] > 0 && \ + # rule 25: dec + if {[regexp -start $index_ -indices -line -nocase -- {\A(dec)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 25 } - # rule 26: diamond - if {[regexp -start $index_ -indices -line -nocase -- {\A(diamond)} $yy_current_buffer match] > 0 && \ + # rule 26: decr + if {[regexp -start $index_ -indices -line -nocase -- {\A(decr)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 26 } - # rule 27: edit - if {[regexp -start $index_ -indices -line -nocase -- {\A(edit)} $yy_current_buffer match] > 0 && \ + # rule 27: diamond + if {[regexp -start $index_ -indices -line -nocase -- {\A(diamond)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 27 } - # rule 28: ellipse - if {[regexp -start $index_ -indices -line -nocase -- {\A(ellipse)} $yy_current_buffer match] > 0 && \ + # rule 28: edit + if {[regexp -start $index_ -indices -line -nocase -- {\A(edit)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 28 } - # rule 29: error - if {[regexp -start $index_ -indices -line -nocase -- {\A(error)} $yy_current_buffer match] > 0 && \ + # rule 29: ellipse + if {[regexp -start $index_ -indices -line -nocase -- {\A(ellipse)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 29 } - # rule 30: export - if {[regexp -start $index_ -indices -line -nocase -- {\A(export)} $yy_current_buffer match] > 0 && \ + # rule 30: error + if {[regexp -start $index_ -indices -line -nocase -- {\A(error)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 30 } - # rule 31: file - if {[regexp -start $index_ -indices -line -nocase -- {\A(file)} $yy_current_buffer match] > 0 && \ + # rule 31: export + if {[regexp -start $index_ -indices -line -nocase -- {\A(export)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 31 } - # rule 32: filter - if {[regexp -start $index_ -indices -line -nocase -- {\A(filter)} $yy_current_buffer match] > 0 && \ + # rule 32: file + if {[regexp -start $index_ -indices -line -nocase -- {\A(file)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 32 } - # rule 33: function - if {[regexp -start $index_ -indices -line -nocase -- {\A(function)} $yy_current_buffer match] > 0 && \ + # rule 33: filter + if {[regexp -start $index_ -indices -line -nocase -- {\A(filter)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 33 } - # rule 34: header - if {[regexp -start $index_ -indices -line -nocase -- {\A(header)} $yy_current_buffer match] > 0 && \ + # rule 34: function + if {[regexp -start $index_ -indices -line -nocase -- {\A(function)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 34 } - # rule 35: hide - if {[regexp -start $index_ -indices -line -nocase -- {\A(hide)} $yy_current_buffer match] > 0 && \ + # rule 35: header + if {[regexp -start $index_ -indices -line -nocase -- {\A(header)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 35 } - # rule 36: import - if {[regexp -start $index_ -indices -line -nocase -- {\A(import)} $yy_current_buffer match] > 0 && \ + # rule 36: hide + if {[regexp -start $index_ -indices -line -nocase -- {\A(hide)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 36 } - # rule 37: incr - if {[regexp -start $index_ -indices -line -nocase -- {\A(incr)} $yy_current_buffer match] > 0 && \ + # rule 37: import + if {[regexp -start $index_ -indices -line -nocase -- {\A(import)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 37 } - # rule 38: load - if {[regexp -start $index_ -indices -line -nocase -- {\A(load)} $yy_current_buffer match] > 0 && \ + # rule 38: incr + if {[regexp -start $index_ -indices -line -nocase -- {\A(incr)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 38 } - # rule 39: location - if {[regexp -start $index_ -indices -line -nocase -- {\A(location)} $yy_current_buffer match] > 0 && \ + # rule 39: load + if {[regexp -start $index_ -indices -line -nocase -- {\A(load)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 39 } - # rule 40: match - if {[regexp -start $index_ -indices -line -nocase -- {\A(match)} $yy_current_buffer match] > 0 && \ + # rule 40: location + if {[regexp -start $index_ -indices -line -nocase -- {\A(location)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 40 } - # rule 41: maxrows - if {[regexp -start $index_ -indices -line -nocase -- {\A(maxrows)} $yy_current_buffer match] > 0 && \ + # rule 41: match + if {[regexp -start $index_ -indices -line -nocase -- {\A(match)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 41 } - # rule 42: name - if {[regexp -start $index_ -indices -line -nocase -- {\A(name)} $yy_current_buffer match] > 0 && \ + # rule 42: maxrows + if {[regexp -start $index_ -indices -line -nocase -- {\A(maxrows)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 42 } - # rule 43: new - if {[regexp -start $index_ -indices -line -nocase -- {\A(new)} $yy_current_buffer match] > 0 && \ + # rule 43: name + if {[regexp -start $index_ -indices -line -nocase -- {\A(name)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 43 } - # rule 44: panto - if {[regexp -start $index_ -indices -line -nocase -- {\A(panto)} $yy_current_buffer match] > 0 && \ + # rule 44: new + if {[regexp -start $index_ -indices -line -nocase -- {\A(new)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 44 } - # rule 45: plot - if {[regexp -start $index_ -indices -line -nocase -- {\A(plot)} $yy_current_buffer match] > 0 && \ + # rule 45: panto + if {[regexp -start $index_ -indices -line -nocase -- {\A(panto)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 45 } - # rule 46: point - if {[regexp -start $index_ -indices -line -nocase -- {\A(point)} $yy_current_buffer match] > 0 && \ + # rule 46: plot + if {[regexp -start $index_ -indices -line -nocase -- {\A(plot)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 46 } - # rule 47: print - if {[regexp -start $index_ -indices -line -nocase -- {\A(print)} $yy_current_buffer match] > 0 && \ + # rule 47: point + if {[regexp -start $index_ -indices -line -nocase -- {\A(point)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 47 } - # rule 48: psky - if {[regexp -start $index_ -indices -line -nocase -- {\A(psky)} $yy_current_buffer match] > 0 && \ + # rule 48: print + if {[regexp -start $index_ -indices -line -nocase -- {\A(print)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 48 } - # rule 49: psystem - if {[regexp -start $index_ -indices -line -nocase -- {\A(psystem)} $yy_current_buffer match] > 0 && \ + # rule 49: psky + if {[regexp -start $index_ -indices -line -nocase -- {\A(psky)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 49 } - # rule 50: ra - if {[regexp -start $index_ -indices -line -nocase -- {\A(ra)} $yy_current_buffer match] > 0 && \ + # rule 50: psystem + if {[regexp -start $index_ -indices -line -nocase -- {\A(psystem)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 50 } - # rule 51: radius - if {[regexp -start $index_ -indices -line -nocase -- {\A(radius)} $yy_current_buffer match] > 0 && \ + # rule 51: ra + if {[regexp -start $index_ -indices -line -nocase -- {\A(ra)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 51 } - # rule 52: regions - if {[regexp -start $index_ -indices -line -nocase -- {\A(regions)} $yy_current_buffer match] > 0 && \ + # rule 52: radius + if {[regexp -start $index_ -indices -line -nocase -- {\A(radius)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 52 } - # rule 53: remove - if {[regexp -start $index_ -indices -line -nocase -- {\A(remove)} $yy_current_buffer match] > 0 && \ + # rule 53: regions + if {[regexp -start $index_ -indices -line -nocase -- {\A(regions)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 53 } - # rule 54: retrieve - if {[regexp -start $index_ -indices -line -nocase -- {\A(retrieve)} $yy_current_buffer match] > 0 && \ + # rule 54: remove + if {[regexp -start $index_ -indices -line -nocase -- {\A(remove)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 54 } - # rule 55: return - if {[regexp -start $index_ -indices -line -nocase -- {\A(return)} $yy_current_buffer match] > 0 && \ + # rule 55: retrieve + if {[regexp -start $index_ -indices -line -nocase -- {\A(retrieve)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 55 } - # rule 56: samp - if {[regexp -start $index_ -indices -line -nocase -- {\A(samp)} $yy_current_buffer match] > 0 && \ + # rule 56: return + if {[regexp -start $index_ -indices -line -nocase -- {\A(return)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 56 } - # rule 57: save - if {[regexp -start $index_ -indices -line -nocase -- {\A(save)} $yy_current_buffer match] > 0 && \ + # rule 57: samp + if {[regexp -start $index_ -indices -line -nocase -- {\A(samp)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 57 } - # rule 58: sb - if {[regexp -start $index_ -indices -line -nocase -- {\A(sb)} $yy_current_buffer match] > 0 && \ + # rule 58: save + if {[regexp -start $index_ -indices -line -nocase -- {\A(save)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 58 } - # rule 59: server - if {[regexp -start $index_ -indices -line -nocase -- {\A(server)} $yy_current_buffer match] > 0 && \ + # rule 59: sb + if {[regexp -start $index_ -indices -line -nocase -- {\A(sb)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 59 } - # rule 60: shape - if {[regexp -start $index_ -indices -line -nocase -- {\A(shape)} $yy_current_buffer match] > 0 && \ + # rule 60: server + if {[regexp -start $index_ -indices -line -nocase -- {\A(server)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 60 } - # rule 61: show - if {[regexp -start $index_ -indices -line -nocase -- {\A(show)} $yy_current_buffer match] > 0 && \ + # rule 61: shape + if {[regexp -start $index_ -indices -line -nocase -- {\A(shape)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 61 } - # rule 62: size - if {[regexp -start $index_ -indices -line -nocase -- {\A(size)} $yy_current_buffer match] > 0 && \ + # rule 62: show + if {[regexp -start $index_ -indices -line -nocase -- {\A(show)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 62 } - # rule 63: size2 - if {[regexp -start $index_ -indices -line -nocase -- {\A(size2)} $yy_current_buffer match] > 0 && \ + # rule 63: size + if {[regexp -start $index_ -indices -line -nocase -- {\A(size)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 63 } - # rule 64: sky - if {[regexp -start $index_ -indices -line -nocase -- {\A(sky)} $yy_current_buffer match] > 0 && \ + # rule 64: size2 + if {[regexp -start $index_ -indices -line -nocase -- {\A(size2)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 64 } - # rule 65: skyformat - if {[regexp -start $index_ -indices -line -nocase -- {\A(skyformat)} $yy_current_buffer match] > 0 && \ + # rule 65: sky + if {[regexp -start $index_ -indices -line -nocase -- {\A(sky)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 65 } - # rule 66: sort - if {[regexp -start $index_ -indices -line -nocase -- {\A(sort)} $yy_current_buffer match] > 0 && \ + # rule 66: skyformat + if {[regexp -start $index_ -indices -line -nocase -- {\A(skyformat)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 66 } - # rule 67: starbase - if {[regexp -start $index_ -indices -line -nocase -- {\A(starbase)} $yy_current_buffer match] > 0 && \ + # rule 67: sort + if {[regexp -start $index_ -indices -line -nocase -- {\A(sort)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 67 } - # rule 68: symbol - if {[regexp -start $index_ -indices -line -nocase -- {\A(symbol)} $yy_current_buffer match] > 0 && \ + # rule 68: starbase + if {[regexp -start $index_ -indices -line -nocase -- {\A(starbase)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 68 } - # rule 69: system - if {[regexp -start $index_ -indices -line -nocase -- {\A(system)} $yy_current_buffer match] > 0 && \ + # rule 69: symbol + if {[regexp -start $index_ -indices -line -nocase -- {\A(symbol)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 69 } - # rule 70: text - if {[regexp -start $index_ -indices -line -nocase -- {\A(text)} $yy_current_buffer match] > 0 && \ + # rule 70: system + if {[regexp -start $index_ -indices -line -nocase -- {\A(system)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 70 } - # rule 71: tsv - if {[regexp -start $index_ -indices -line -nocase -- {\A(tsv)} $yy_current_buffer match] > 0 && \ + # rule 71: text + if {[regexp -start $index_ -indices -line -nocase -- {\A(text)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 71 } - # rule 72: unique - if {[regexp -start $index_ -indices -line -nocase -- {\A(unique)} $yy_current_buffer match] > 0 && \ + # rule 72: tsv + if {[regexp -start $index_ -indices -line -nocase -- {\A(tsv)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 72 } - # rule 73: units - if {[regexp -start $index_ -indices -line -nocase -- {\A(units)} $yy_current_buffer match] > 0 && \ + # rule 73: unique + if {[regexp -start $index_ -indices -line -nocase -- {\A(unique)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 73 } - # rule 74: update - if {[regexp -start $index_ -indices -line -nocase -- {\A(update)} $yy_current_buffer match] > 0 && \ + # rule 74: units + if {[regexp -start $index_ -indices -line -nocase -- {\A(units)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 74 } - # rule 75: vot - if {[regexp -start $index_ -indices -line -nocase -- {\A(vot)} $yy_current_buffer match] > 0 && \ + # rule 75: update + if {[regexp -start $index_ -indices -line -nocase -- {\A(update)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 75 } - # rule 76: xml - if {[regexp -start $index_ -indices -line -nocase -- {\A(xml)} $yy_current_buffer match] > 0 && \ + # rule 76: vot + if {[regexp -start $index_ -indices -line -nocase -- {\A(vot)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 76 } - # rule 77: cds - if {[regexp -start $index_ -indices -line -nocase -- {\A(cds)} $yy_current_buffer match] > 0 && \ + # rule 77: xml + if {[regexp -start $index_ -indices -line -nocase -- {\A(xml)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 77 } - # rule 78: adac - if {[regexp -start $index_ -indices -line -nocase -- {\A(adac)} $yy_current_buffer match] > 0 && \ + # rule 78: cds + if {[regexp -start $index_ -indices -line -nocase -- {\A(cds)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 78 } - # rule 79: cadc - if {[regexp -start $index_ -indices -line -nocase -- {\A(cadc)} $yy_current_buffer match] > 0 && \ + # rule 79: adac + if {[regexp -start $index_ -indices -line -nocase -- {\A(adac)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 79 } - # rule 80: cambridge - if {[regexp -start $index_ -indices -line -nocase -- {\A(cambridge)} $yy_current_buffer match] > 0 && \ + # rule 80: cadc + if {[regexp -start $index_ -indices -line -nocase -- {\A(cadc)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 80 } - # rule 81: sao - if {[regexp -start $index_ -indices -line -nocase -- {\A(sao)} $yy_current_buffer match] > 0 && \ + # rule 81: cambridge + if {[regexp -start $index_ -indices -line -nocase -- {\A(cambridge)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 81 } - # rule 82: ukirt - if {[regexp -start $index_ -indices -line -nocase -- {\A(ukirt)} $yy_current_buffer match] > 0 && \ + # rule 82: sao + if {[regexp -start $index_ -indices -line -nocase -- {\A(sao)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 82 } - # rule 83: iucaa - if {[regexp -start $index_ -indices -line -nocase -- {\A(iucaa)} $yy_current_buffer match] > 0 && \ + # rule 83: ukirt + if {[regexp -start $index_ -indices -line -nocase -- {\A(ukirt)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 83 } - # rule 84: bejing - if {[regexp -start $index_ -indices -line -nocase -- {\A(bejing)} $yy_current_buffer match] > 0 && \ + # rule 84: iucaa + if {[regexp -start $index_ -indices -line -nocase -- {\A(iucaa)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 84 } - # rule 85: saao - if {[regexp -start $index_ -indices -line -nocase -- {\A(saao)} $yy_current_buffer match] > 0 && \ + # rule 85: bejing + if {[regexp -start $index_ -indices -line -nocase -- {\A(bejing)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 85 } - # rule 86: yes - if {[regexp -start $index_ -indices -line -nocase -- {\A(yes)} $yy_current_buffer match] > 0 && \ + # rule 86: saao + if {[regexp -start $index_ -indices -line -nocase -- {\A(saao)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 86 } - # rule 87: no - if {[regexp -start $index_ -indices -line -nocase -- {\A(no)} $yy_current_buffer match] > 0 && \ + # rule 87: yes + if {[regexp -start $index_ -indices -line -nocase -- {\A(yes)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 87 } - # rule 88: on - if {[regexp -start $index_ -indices -line -nocase -- {\A(on)} $yy_current_buffer match] > 0 && \ + # rule 88: no + if {[regexp -start $index_ -indices -line -nocase -- {\A(no)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 88 } - # rule 89: off - if {[regexp -start $index_ -indices -line -nocase -- {\A(off)} $yy_current_buffer match] > 0 && \ + # rule 89: on + if {[regexp -start $index_ -indices -line -nocase -- {\A(on)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 89 } - # rule 90: true - if {[regexp -start $index_ -indices -line -nocase -- {\A(true)} $yy_current_buffer match] > 0 && \ + # rule 90: off + if {[regexp -start $index_ -indices -line -nocase -- {\A(off)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 90 } - # rule 91: false - if {[regexp -start $index_ -indices -line -nocase -- {\A(false)} $yy_current_buffer match] > 0 && \ + # rule 91: true + if {[regexp -start $index_ -indices -line -nocase -- {\A(true)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 91 } - # rule 92: font - if {[regexp -start $index_ -indices -line -nocase -- {\A(font)} $yy_current_buffer match] > 0 && \ + # rule 92: false + if {[regexp -start $index_ -indices -line -nocase -- {\A(false)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 92 } - # rule 93: fontsize - if {[regexp -start $index_ -indices -line -nocase -- {\A(fontsize)} $yy_current_buffer match] > 0 && \ + # rule 93: font + if {[regexp -start $index_ -indices -line -nocase -- {\A(font)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 93 } - # rule 94: fontslant - if {[regexp -start $index_ -indices -line -nocase -- {\A(fontslant)} $yy_current_buffer match] > 0 && \ + # rule 94: fontsize + if {[regexp -start $index_ -indices -line -nocase -- {\A(fontsize)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 94 } - # rule 95: fontstyle - if {[regexp -start $index_ -indices -line -nocase -- {\A(fontstyle)} $yy_current_buffer match] > 0 && \ + # rule 95: fontslant + if {[regexp -start $index_ -indices -line -nocase -- {\A(fontslant)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 95 } - # rule 96: fontweight - if {[regexp -start $index_ -indices -line -nocase -- {\A(fontweight)} $yy_current_buffer match] > 0 && \ + # rule 96: fontstyle + if {[regexp -start $index_ -indices -line -nocase -- {\A(fontstyle)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 96 } - # rule 97: times - if {[regexp -start $index_ -indices -line -nocase -- {\A(times)} $yy_current_buffer match] > 0 && \ + # rule 97: fontweight + if {[regexp -start $index_ -indices -line -nocase -- {\A(fontweight)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 97 } - # rule 98: helvetica - if {[regexp -start $index_ -indices -line -nocase -- {\A(helvetica)} $yy_current_buffer match] > 0 && \ + # rule 98: times + if {[regexp -start $index_ -indices -line -nocase -- {\A(times)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 98 } - # rule 99: courier - if {[regexp -start $index_ -indices -line -nocase -- {\A(courier)} $yy_current_buffer match] > 0 && \ + # rule 99: helvetica + if {[regexp -start $index_ -indices -line -nocase -- {\A(helvetica)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 99 } - # rule 100: normal - if {[regexp -start $index_ -indices -line -nocase -- {\A(normal)} $yy_current_buffer match] > 0 && \ + # rule 100: courier + if {[regexp -start $index_ -indices -line -nocase -- {\A(courier)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 100 } - # rule 101: bold - if {[regexp -start $index_ -indices -line -nocase -- {\A(bold)} $yy_current_buffer match] > 0 && \ + # rule 101: normal + if {[regexp -start $index_ -indices -line -nocase -- {\A(normal)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 101 } - # rule 102: roman - if {[regexp -start $index_ -indices -line -nocase -- {\A(roman)} $yy_current_buffer match] > 0 && \ + # rule 102: bold + if {[regexp -start $index_ -indices -line -nocase -- {\A(bold)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 102 } - # rule 103: italic - if {[regexp -start $index_ -indices -line -nocase -- {\A(italic)} $yy_current_buffer match] > 0 && \ + # rule 103: roman + if {[regexp -start $index_ -indices -line -nocase -- {\A(roman)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 103 } - # rule 104: wcs - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcs)} $yy_current_buffer match] > 0 && \ + # rule 104: italic + if {[regexp -start $index_ -indices -line -nocase -- {\A(italic)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 104 } - # rule 105: wcsa - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsa)} $yy_current_buffer match] > 0 && \ + # rule 105: wcs + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcs)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 105 } - # rule 106: wcsb - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsb)} $yy_current_buffer match] > 0 && \ + # rule 106: wcsa + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsa)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 106 } - # rule 107: wcsc - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsc)} $yy_current_buffer match] > 0 && \ + # rule 107: wcsb + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsb)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 107 } - # rule 108: wcsd - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsd)} $yy_current_buffer match] > 0 && \ + # rule 108: wcsc + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsc)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 108 } - # rule 109: wcse - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcse)} $yy_current_buffer match] > 0 && \ + # rule 109: wcsd + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsd)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 109 } - # rule 110: wcsf - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsf)} $yy_current_buffer match] > 0 && \ + # rule 110: wcse + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcse)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 110 } - # rule 111: wcsg - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsg)} $yy_current_buffer match] > 0 && \ + # rule 111: wcsf + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsf)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 111 } - # rule 112: wcsh - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsh)} $yy_current_buffer match] > 0 && \ + # rule 112: wcsg + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsg)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 112 } - # rule 113: wcsi - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsi)} $yy_current_buffer match] > 0 && \ + # rule 113: wcsh + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsh)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 113 } - # rule 114: wcsj - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsj)} $yy_current_buffer match] > 0 && \ + # rule 114: wcsi + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsi)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 114 } - # rule 115: wcsk - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsk)} $yy_current_buffer match] > 0 && \ + # rule 115: wcsj + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsj)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 115 } - # rule 116: wcsl - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsl)} $yy_current_buffer match] > 0 && \ + # rule 116: wcsk + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsk)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 116 } - # rule 117: wcsm - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsm)} $yy_current_buffer match] > 0 && \ + # rule 117: wcsl + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsl)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 117 } - # rule 118: wcsn - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsn)} $yy_current_buffer match] > 0 && \ + # rule 118: wcsm + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsm)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 118 } - # rule 119: wcso - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcso)} $yy_current_buffer match] > 0 && \ + # rule 119: wcsn + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsn)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 119 } - # rule 120: wcsp - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsp)} $yy_current_buffer match] > 0 && \ + # rule 120: wcso + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcso)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 120 } - # rule 121: wcsq - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsq)} $yy_current_buffer match] > 0 && \ + # rule 121: wcsp + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsp)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 121 } - # rule 122: wcsr - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsr)} $yy_current_buffer match] > 0 && \ + # rule 122: wcsq + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsq)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 122 } - # rule 123: wcss - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcss)} $yy_current_buffer match] > 0 && \ + # rule 123: wcsr + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsr)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 123 } - # rule 124: wcst - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcst)} $yy_current_buffer match] > 0 && \ + # rule 124: wcss + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcss)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 124 } - # rule 125: wcsu - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsu)} $yy_current_buffer match] > 0 && \ + # rule 125: wcst + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcst)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 125 } - # rule 126: wcsv - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsv)} $yy_current_buffer match] > 0 && \ + # rule 126: wcsu + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsu)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 126 } - # rule 127: wcsw - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsw)} $yy_current_buffer match] > 0 && \ + # rule 127: wcsv + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsv)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 127 } - # rule 128: wcsx - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsx)} $yy_current_buffer match] > 0 && \ + # rule 128: wcsw + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsw)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 128 } - # rule 129: wcsy - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsy)} $yy_current_buffer match] > 0 && \ + # rule 129: wcsx + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsx)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 129 } - # rule 130: wcsz - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsz)} $yy_current_buffer match] > 0 && \ + # rule 130: wcsy + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsy)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 130 } - # rule 131: fk4 - if {[regexp -start $index_ -indices -line -nocase -- {\A(fk4)} $yy_current_buffer match] > 0 && \ + # rule 131: wcsz + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsz)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 131 } - # rule 132: b1950 - if {[regexp -start $index_ -indices -line -nocase -- {\A(b1950)} $yy_current_buffer match] > 0 && \ + # rule 132: fk4 + if {[regexp -start $index_ -indices -line -nocase -- {\A(fk4)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 132 } - # rule 133: fk5 - if {[regexp -start $index_ -indices -line -nocase -- {\A(fk5)} $yy_current_buffer match] > 0 && \ + # rule 133: b1950 + if {[regexp -start $index_ -indices -line -nocase -- {\A(b1950)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 133 } - # rule 134: j2000 - if {[regexp -start $index_ -indices -line -nocase -- {\A(j2000)} $yy_current_buffer match] > 0 && \ + # rule 134: fk5 + if {[regexp -start $index_ -indices -line -nocase -- {\A(fk5)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 134 } - # rule 135: icrs - if {[regexp -start $index_ -indices -line -nocase -- {\A(icrs)} $yy_current_buffer match] > 0 && \ + # rule 135: j2000 + if {[regexp -start $index_ -indices -line -nocase -- {\A(j2000)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 135 } - # rule 136: galactic - if {[regexp -start $index_ -indices -line -nocase -- {\A(galactic)} $yy_current_buffer match] > 0 && \ + # rule 136: icrs + if {[regexp -start $index_ -indices -line -nocase -- {\A(icrs)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 136 } - # rule 137: ecliptic - if {[regexp -start $index_ -indices -line -nocase -- {\A(ecliptic)} $yy_current_buffer match] > 0 && \ + # rule 137: galactic + if {[regexp -start $index_ -indices -line -nocase -- {\A(galactic)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 137 } - # rule 138: degrees - if {[regexp -start $index_ -indices -line -nocase -- {\A(degrees)} $yy_current_buffer match] > 0 && \ + # rule 138: ecliptic + if {[regexp -start $index_ -indices -line -nocase -- {\A(ecliptic)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 138 } - # rule 139: arcmin - if {[regexp -start $index_ -indices -line -nocase -- {\A(arcmin)} $yy_current_buffer match] > 0 && \ + # rule 139: degrees + if {[regexp -start $index_ -indices -line -nocase -- {\A(degrees)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 139 } - # rule 140: arcsec - if {[regexp -start $index_ -indices -line -nocase -- {\A(arcsec)} $yy_current_buffer match] > 0 && \ + # rule 140: arcmin + if {[regexp -start $index_ -indices -line -nocase -- {\A(arcmin)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 140 } - # rule 141: sexagesimal - if {[regexp -start $index_ -indices -line -nocase -- {\A(sexagesimal)} $yy_current_buffer match] > 0 && \ + # rule 141: arcsec + if {[regexp -start $index_ -indices -line -nocase -- {\A(arcsec)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 141 } - # rule 142: [+-]?{D}+ - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+)} $yy_current_buffer match] > 0 && \ + # rule 142: sexagesimal + if {[regexp -start $index_ -indices -line -nocase -- {\A(sexagesimal)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 142 } - # rule 143: [+-]?{D}+\.?({E})? - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+\.?(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ + # rule 143: [+-]?{D}+ + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 143 } - # rule 144: [+-]?{D}*\.{D}+({E})? - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])*\.([0-9])+(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ + # rule 144: [+-]?{D}+\.?({E})? + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+\.?(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 144 } - # rule 145: [+-]?{D}+:{D}+:{D}+\.? - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+:([0-9])+:([0-9])+\.?)} $yy_current_buffer match] > 0 && \ + # rule 145: [+-]?{D}*\.{D}+({E})? + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])*\.([0-9])+(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 145 } - # rule 146: [+-]?{D}+:{D}+:{D}*\.{D}+ - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+:([0-9])+:([0-9])*\.([0-9])+)} $yy_current_buffer match] > 0 && \ + # rule 146: [+-]?{D}+:{D}+:{D}+\.? + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+:([0-9])+:([0-9])+\.?)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 146 } - # rule 147: \"[^\"]*\" - if {[regexp -start $index_ -indices -line -nocase -- {\A(\"[^\"]*\")} $yy_current_buffer match] > 0 && \ + # rule 147: [+-]?{D}+:{D}+:{D}*\.{D}+ + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+:([0-9])+:([0-9])*\.([0-9])+)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 147 } - # rule 148: \'[^\']*\' - if {[regexp -start $index_ -indices -line -nocase -- {\A(\'[^\']*\')} $yy_current_buffer match] > 0 && \ + # rule 148: \"[^\"]*\" + if {[regexp -start $index_ -indices -line -nocase -- {\A(\"[^\"]*\")} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 148 } - # rule 149: \{[^\}]*\} - if {[regexp -start $index_ -indices -line -nocase -- {\A(\{[^\}]*\})} $yy_current_buffer match] > 0 && \ + # rule 149: \'[^\']*\' + if {[regexp -start $index_ -indices -line -nocase -- {\A(\'[^\']*\')} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 149 } - # rule 150: \S+\S+ - if {[regexp -start $index_ -indices -line -nocase -- {\A(\S+\S+)} $yy_current_buffer match] > 0 && \ + # rule 150: \{[^\}]*\} + if {[regexp -start $index_ -indices -line -nocase -- {\A(\{[^\}]*\})} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 150 } - # rule 151: \s - if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ + # rule 151: \S+\S+ + if {[regexp -start $index_ -indices -line -nocase -- {\A(\S+\S+)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 151 } - # rule 152: . - if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + # rule 152: \s + if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 152 } + # rule 153: . + if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + [lindex $match 1] - $index_ + 1 > $yyleng} { + set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] + set yyleng [string length $yytext] + set matched_rule 153 + } if {$matched_rule == -1} { set yytext [string index $yy_current_buffer $index_] set yyleng 1 @@ -1487,387 +1494,387 @@ return $CLOSE_ return $COLOR_ } 19 { -return $CONDITION_ +return $COLOR_ } 20 { -return $COORDINATE_ +return $CONDITION_ } 21 { -return $CROSS_ +return $COORDINATE_ } 22 { -return $CROSSHAIR_ +return $CROSS_ } 23 { -return $CSV_ +return $CROSSHAIR_ } 24 { -return $DEC_ +return $CSV_ } 25 { -return $DECR_ +return $DEC_ } 26 { -return $DIAMOND_ +return $DECR_ } 27 { -return $EDIT_ +return $DIAMOND_ } 28 { -return $ELLIPSE_ +return $EDIT_ } 29 { -return $ERROR_ +return $ELLIPSE_ } 30 { -return $EXPORT_ +return $ERROR_ } 31 { -return $FILE_ +return $EXPORT_ } 32 { -return $FILTER_ +return $FILE_ } 33 { -return $FUNCTION_ +return $FILTER_ } 34 { -return $HEADER_ +return $FUNCTION_ } 35 { -return $HIDE_ +return $HEADER_ } 36 { -return $IMPORT_ +return $HIDE_ } 37 { -return $INCR_ +return $IMPORT_ } 38 { -return $LOAD_ +return $INCR_ } 39 { -return $LOCATION_ +return $LOAD_ } 40 { -return $MATCH_ +return $LOCATION_ } 41 { -return $MAXROWS_ +return $MATCH_ } 42 { -return $NAME_ +return $MAXROWS_ } 43 { -return $NEW_ +return $NAME_ } 44 { -return $PANTO_ +return $NEW_ } 45 { -return $PLOT_ +return $PANTO_ } 46 { -return $POINT_ +return $PLOT_ } 47 { -return $PRINT_ +return $POINT_ } 48 { -return $PSKY_ +return $PRINT_ } 49 { -return $PSYSTEM_ +return $PSKY_ } 50 { -return $RA_ +return $PSYSTEM_ } 51 { -return $RADIUS_ +return $RA_ } 52 { -return $REGIONS_ +return $RADIUS_ } 53 { -return $REMOVE_ +return $REGIONS_ } 54 { -return $RETRIEVE_ +return $REMOVE_ } 55 { -return $RETURN_ +return $RETRIEVE_ } 56 { -return $SAMP_ +return $RETURN_ } 57 { -return $SAVE_ +return $SAMP_ } 58 { -return $SB_ +return $SAVE_ } 59 { -return $SERVER_ +return $SB_ } 60 { -return $SHAPE_ +return $SERVER_ } 61 { -return $SHOW_ +return $SHAPE_ } 62 { -return $SIZE_ +return $SHOW_ } 63 { -return $SIZE2_ +return $SIZE_ } 64 { -return $SKY_ +return $SIZE2_ } 65 { -return $SKYFORMAT_ +return $SKY_ } 66 { -return $SORT_ +return $SKYFORMAT_ } 67 { -return $STARBASE_ +return $SORT_ } 68 { -return $SYMBOL_ +return $STARBASE_ } 69 { -return $SYSTEM_ +return $SYMBOL_ } 70 { -return $TEXT_ +return $SYSTEM_ } 71 { -return $TSV_ +return $TEXT_ } 72 { -return $UNIQUE_ +return $TSV_ } 73 { -return $UNITS_ +return $UNIQUE_ } 74 { -return $UPDATE_ +return $UNITS_ } 75 { -return $VOT_ +return $UPDATE_ } 76 { -return $XML_ +return $VOT_ } 77 { -return $CDS_ +return $XML_ } 78 { -return $ADAC_ +return $CDS_ } 79 { -return $CADC_ +return $ADAC_ } 80 { -return $CAMBRIDGE_ +return $CADC_ } 81 { -return $SAO_ +return $CAMBRIDGE_ } 82 { -return $UKIRT_ +return $SAO_ } 83 { -return $IUCAA_ +return $UKIRT_ } 84 { -return $BEJING_ +return $IUCAA_ } 85 { -return $SAAO_ +return $BEJING_ } 86 { -return $YES_ +return $SAAO_ } 87 { -return $NO_ +return $YES_ } 88 { -return $ON_ +return $NO_ } 89 { -return $OFF_ +return $ON_ } 90 { -return $TRUE_ +return $OFF_ } 91 { -return $FALSE_ +return $TRUE_ } 92 { -return $FONT_ +return $FALSE_ } 93 { -return $FONTSIZE_ +return $FONT_ } 94 { -return $FONTSLANT_ +return $FONTSIZE_ } 95 { -return $FONTSTYLE_ +return $FONTSLANT_ } 96 { -return $FONTWEIGHT_ +return $FONTSTYLE_ } 97 { -return $TIMES_ +return $FONTWEIGHT_ } 98 { -return $HELVETICA_ +return $TIMES_ } 99 { -return $COURIER_ +return $HELVETICA_ } 100 { -return $NORMAL_ +return $COURIER_ } 101 { -return $BOLD_ +return $NORMAL_ } 102 { -return $ROMAN_ +return $BOLD_ } 103 { -return $ITALIC_ +return $ROMAN_ } 104 { -return $WCS_ +return $ITALIC_ } 105 { -return $WCSA_ +return $WCS_ } 106 { -return $WCSB_ +return $WCSA_ } 107 { -return $WCSC_ +return $WCSB_ } 108 { -return $WCSD_ +return $WCSC_ } 109 { -return $WCSE_ +return $WCSD_ } 110 { -return $WCSF_ +return $WCSE_ } 111 { -return $WCSG_ +return $WCSF_ } 112 { -return $WCSH_ +return $WCSG_ } 113 { -return $WCSI_ +return $WCSH_ } 114 { -return $WCSJ_ +return $WCSI_ } 115 { -return $WCSK_ +return $WCSJ_ } 116 { -return $WCSL_ +return $WCSK_ } 117 { -return $WCSM_ +return $WCSL_ } 118 { -return $WCSN_ +return $WCSM_ } 119 { -return $WCSO_ +return $WCSN_ } 120 { -return $WCSP_ +return $WCSO_ } 121 { -return $WCSQ_ +return $WCSP_ } 122 { -return $WCSR_ +return $WCSQ_ } 123 { -return $WCSS_ +return $WCSR_ } 124 { -return $WCST_ +return $WCSS_ } 125 { -return $WCSU_ +return $WCST_ } 126 { -return $WCSV_ +return $WCSU_ } 127 { -return $WCSW_ +return $WCSV_ } 128 { -return $WCSX_ +return $WCSW_ } 129 { -return $WCSY_ +return $WCSX_ } 130 { -return $WCSZ_ +return $WCSY_ } 131 { -return $FK4_ +return $WCSZ_ } 132 { return $FK4_ } 133 { -return $FK5_ +return $FK4_ } 134 { return $FK5_ } 135 { -return $ICRS_ +return $FK5_ } 136 { -return $GALACTIC_ +return $ICRS_ } 137 { -return $ECLIPTIC_ +return $GALACTIC_ } 138 { -return $DEGREES_ +return $ECLIPTIC_ } 139 { -return $ARCMIN_ +return $DEGREES_ } 140 { -return $ARCSEC_ +return $ARCMIN_ } 141 { -return $SEXAGESIMAL_ +return $ARCSEC_ } 142 { +return $SEXAGESIMAL_ + } + 143 { set yylval $yytext; return $INT_ } - 143 - - 144 { + 144 - + 145 { set yylval $yytext; return $REAL_ } - 145 - - 146 { -set yylval $yytext; return $SEXSTR_ - } + 146 - 147 { -set yylval [string range $yytext 1 end-1]; return $STRING_ +set yylval $yytext; return $SEXSTR_ } 148 { set yylval [string range $yytext 1 end-1]; return $STRING_ @@ -1876,12 +1883,15 @@ set yylval [string range $yytext 1 end-1]; return $STRING_ set yylval [string range $yytext 1 end-1]; return $STRING_ } 150 { -set yylval $yytext; return $STRING_ +set yylval [string range $yytext 1 end-1]; return $STRING_ } 151 { -# ignore whitespace +set yylval $yytext; return $STRING_ } 152 { +# ignore whitespace + } + 153 { set yylval $yytext; return $yylval } default diff --git a/ds9/parsers/contourlex.fcl b/ds9/parsers/contourlex.fcl index 7fa48fc..20c918b 100644 --- a/ds9/parsers/contourlex.fcl +++ b/ds9/parsers/contourlex.fcl @@ -12,6 +12,7 @@ block {return $BLOCK_} clear {return $CLEAR_} close {return $CLOSE_} color {return $COLOR_} +colour {return $COLOR_} convert {return $CONVERT_} copy {return $COPY_} dash {return $DASH_} diff --git a/ds9/parsers/contourlex.tcl b/ds9/parsers/contourlex.tcl index 1d3632f..1fd2ed2 100644 --- a/ds9/parsers/contourlex.tcl +++ b/ds9/parsers/contourlex.tcl @@ -319,601 +319,608 @@ set ZSCALE_ 340 set yyleng [string length $yytext] set matched_rule 4 } - # rule 5: convert - if {[regexp -start $index_ -indices -line -nocase -- {\A(convert)} $yy_current_buffer match] > 0 && \ + # rule 5: colour + if {[regexp -start $index_ -indices -line -nocase -- {\A(colour)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 5 } - # rule 6: copy - if {[regexp -start $index_ -indices -line -nocase -- {\A(copy)} $yy_current_buffer match] > 0 && \ + # rule 6: convert + if {[regexp -start $index_ -indices -line -nocase -- {\A(convert)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 6 } - # rule 7: dash - if {[regexp -start $index_ -indices -line -nocase -- {\A(dash)} $yy_current_buffer match] > 0 && \ + # rule 7: copy + if {[regexp -start $index_ -indices -line -nocase -- {\A(copy)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 7 } - # rule 8: exp - if {[regexp -start $index_ -indices -line -nocase -- {\A(exp)} $yy_current_buffer match] > 0 && \ + # rule 8: dash + if {[regexp -start $index_ -indices -line -nocase -- {\A(dash)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 8 } - # rule 9: generate - if {[regexp -start $index_ -indices -line -nocase -- {\A(generate)} $yy_current_buffer match] > 0 && \ + # rule 9: exp + if {[regexp -start $index_ -indices -line -nocase -- {\A(exp)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 9 } - # rule 10: global - if {[regexp -start $index_ -indices -line -nocase -- {\A(global)} $yy_current_buffer match] > 0 && \ + # rule 10: generate + if {[regexp -start $index_ -indices -line -nocase -- {\A(generate)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 10 } - # rule 11: histequ - if {[regexp -start $index_ -indices -line -nocase -- {\A(histequ)} $yy_current_buffer match] > 0 && \ + # rule 11: global + if {[regexp -start $index_ -indices -line -nocase -- {\A(global)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 11 } - # rule 12: levels - if {[regexp -start $index_ -indices -line -nocase -- {\A(levels)} $yy_current_buffer match] > 0 && \ + # rule 12: histequ + if {[regexp -start $index_ -indices -line -nocase -- {\A(histequ)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 12 } - # rule 13: limits - if {[regexp -start $index_ -indices -line -nocase -- {\A(limits)} $yy_current_buffer match] > 0 && \ + # rule 13: levels + if {[regexp -start $index_ -indices -line -nocase -- {\A(levels)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 13 } - # rule 14: linear - if {[regexp -start $index_ -indices -line -nocase -- {\A(linear)} $yy_current_buffer match] > 0 && \ + # rule 14: limits + if {[regexp -start $index_ -indices -line -nocase -- {\A(limits)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 14 } - # rule 15: load - if {[regexp -start $index_ -indices -line -nocase -- {\A(load)} $yy_current_buffer match] > 0 && \ + # rule 15: linear + if {[regexp -start $index_ -indices -line -nocase -- {\A(linear)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 15 } - # rule 16: loadlevels - if {[regexp -start $index_ -indices -line -nocase -- {\A(loadlevels)} $yy_current_buffer match] > 0 && \ + # rule 16: load + if {[regexp -start $index_ -indices -line -nocase -- {\A(load)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 16 } - # rule 17: local - if {[regexp -start $index_ -indices -line -nocase -- {\A(local)} $yy_current_buffer match] > 0 && \ + # rule 17: loadlevels + if {[regexp -start $index_ -indices -line -nocase -- {\A(loadlevels)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 17 } - # rule 18: log - if {[regexp -start $index_ -indices -line -nocase -- {\A(log)} $yy_current_buffer match] > 0 && \ + # rule 18: local + if {[regexp -start $index_ -indices -line -nocase -- {\A(local)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 18 } - # rule 19: method - if {[regexp -start $index_ -indices -line -nocase -- {\A(method)} $yy_current_buffer match] > 0 && \ + # rule 19: log + if {[regexp -start $index_ -indices -line -nocase -- {\A(log)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 19 } - # rule 20: minmax - if {[regexp -start $index_ -indices -line -nocase -- {\A(minmax)} $yy_current_buffer match] > 0 && \ + # rule 20: method + if {[regexp -start $index_ -indices -line -nocase -- {\A(method)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 20 } - # rule 21: mode - if {[regexp -start $index_ -indices -line -nocase -- {\A(mode)} $yy_current_buffer match] > 0 && \ + # rule 21: minmax + if {[regexp -start $index_ -indices -line -nocase -- {\A(minmax)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 21 } - # rule 22: nlevels - if {[regexp -start $index_ -indices -line -nocase -- {\A(nlevels)} $yy_current_buffer match] > 0 && \ + # rule 22: mode + if {[regexp -start $index_ -indices -line -nocase -- {\A(mode)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 22 } - # rule 23: open - if {[regexp -start $index_ -indices -line -nocase -- {\A(open)} $yy_current_buffer match] > 0 && \ + # rule 23: nlevels + if {[regexp -start $index_ -indices -line -nocase -- {\A(nlevels)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 23 } - # rule 24: paste - if {[regexp -start $index_ -indices -line -nocase -- {\A(paste)} $yy_current_buffer match] > 0 && \ + # rule 24: open + if {[regexp -start $index_ -indices -line -nocase -- {\A(open)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 24 } - # rule 25: pow - if {[regexp -start $index_ -indices -line -nocase -- {\A(pow)} $yy_current_buffer match] > 0 && \ + # rule 25: paste + if {[regexp -start $index_ -indices -line -nocase -- {\A(paste)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 25 } - # rule 26: save - if {[regexp -start $index_ -indices -line -nocase -- {\A(save)} $yy_current_buffer match] > 0 && \ + # rule 26: pow + if {[regexp -start $index_ -indices -line -nocase -- {\A(pow)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 26 } - # rule 27: savelevels - if {[regexp -start $index_ -indices -line -nocase -- {\A(savelevels)} $yy_current_buffer match] > 0 && \ + # rule 27: save + if {[regexp -start $index_ -indices -line -nocase -- {\A(save)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 27 } - # rule 28: scale - if {[regexp -start $index_ -indices -line -nocase -- {\A(scale)} $yy_current_buffer match] > 0 && \ + # rule 28: savelevels + if {[regexp -start $index_ -indices -line -nocase -- {\A(savelevels)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 28 } - # rule 29: scope - if {[regexp -start $index_ -indices -line -nocase -- {\A(scope)} $yy_current_buffer match] > 0 && \ + # rule 29: scale + if {[regexp -start $index_ -indices -line -nocase -- {\A(scale)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 29 } - # rule 30: sinh - if {[regexp -start $index_ -indices -line -nocase -- {\A(sinh)} $yy_current_buffer match] > 0 && \ + # rule 30: scope + if {[regexp -start $index_ -indices -line -nocase -- {\A(scope)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 30 } - # rule 31: smooth - if {[regexp -start $index_ -indices -line -nocase -- {\A(smooth)} $yy_current_buffer match] > 0 && \ + # rule 31: sinh + if {[regexp -start $index_ -indices -line -nocase -- {\A(sinh)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 31 } - # rule 32: sqrt - if {[regexp -start $index_ -indices -line -nocase -- {\A(sqrt)} $yy_current_buffer match] > 0 && \ + # rule 32: smooth + if {[regexp -start $index_ -indices -line -nocase -- {\A(smooth)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 32 } - # rule 33: squared - if {[regexp -start $index_ -indices -line -nocase -- {\A(squared)} $yy_current_buffer match] > 0 && \ + # rule 33: sqrt + if {[regexp -start $index_ -indices -line -nocase -- {\A(sqrt)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 33 } - # rule 34: width - if {[regexp -start $index_ -indices -line -nocase -- {\A(width)} $yy_current_buffer match] > 0 && \ + # rule 34: squared + if {[regexp -start $index_ -indices -line -nocase -- {\A(squared)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 34 } - # rule 35: zmax - if {[regexp -start $index_ -indices -line -nocase -- {\A(zmax)} $yy_current_buffer match] > 0 && \ + # rule 35: width + if {[regexp -start $index_ -indices -line -nocase -- {\A(width)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 35 } - # rule 36: zscale - if {[regexp -start $index_ -indices -line -nocase -- {\A(zscale)} $yy_current_buffer match] > 0 && \ + # rule 36: zmax + if {[regexp -start $index_ -indices -line -nocase -- {\A(zmax)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 36 } - # rule 37: yes - if {[regexp -start $index_ -indices -line -nocase -- {\A(yes)} $yy_current_buffer match] > 0 && \ + # rule 37: zscale + if {[regexp -start $index_ -indices -line -nocase -- {\A(zscale)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 37 } - # rule 38: no - if {[regexp -start $index_ -indices -line -nocase -- {\A(no)} $yy_current_buffer match] > 0 && \ + # rule 38: yes + if {[regexp -start $index_ -indices -line -nocase -- {\A(yes)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 38 } - # rule 39: on - if {[regexp -start $index_ -indices -line -nocase -- {\A(on)} $yy_current_buffer match] > 0 && \ + # rule 39: no + if {[regexp -start $index_ -indices -line -nocase -- {\A(no)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 39 } - # rule 40: off - if {[regexp -start $index_ -indices -line -nocase -- {\A(off)} $yy_current_buffer match] > 0 && \ + # rule 40: on + if {[regexp -start $index_ -indices -line -nocase -- {\A(on)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 40 } - # rule 41: true - if {[regexp -start $index_ -indices -line -nocase -- {\A(true)} $yy_current_buffer match] > 0 && \ + # rule 41: off + if {[regexp -start $index_ -indices -line -nocase -- {\A(off)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 41 } - # rule 42: false - if {[regexp -start $index_ -indices -line -nocase -- {\A(false)} $yy_current_buffer match] > 0 && \ + # rule 42: true + if {[regexp -start $index_ -indices -line -nocase -- {\A(true)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 42 } - # rule 43: image - if {[regexp -start $index_ -indices -line -nocase -- {\A(image)} $yy_current_buffer match] > 0 && \ + # rule 43: false + if {[regexp -start $index_ -indices -line -nocase -- {\A(false)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 43 } - # rule 44: physical - if {[regexp -start $index_ -indices -line -nocase -- {\A(physical)} $yy_current_buffer match] > 0 && \ + # rule 44: image + if {[regexp -start $index_ -indices -line -nocase -- {\A(image)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 44 } - # rule 45: amplifier - if {[regexp -start $index_ -indices -line -nocase -- {\A(amplifier)} $yy_current_buffer match] > 0 && \ + # rule 45: physical + if {[regexp -start $index_ -indices -line -nocase -- {\A(physical)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 45 } - # rule 46: detector - if {[regexp -start $index_ -indices -line -nocase -- {\A(detector)} $yy_current_buffer match] > 0 && \ + # rule 46: amplifier + if {[regexp -start $index_ -indices -line -nocase -- {\A(amplifier)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 46 } - # rule 47: wcs - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcs)} $yy_current_buffer match] > 0 && \ + # rule 47: detector + if {[regexp -start $index_ -indices -line -nocase -- {\A(detector)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 47 } - # rule 48: wcsa - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsa)} $yy_current_buffer match] > 0 && \ + # rule 48: wcs + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcs)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 48 } - # rule 49: wcsb - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsb)} $yy_current_buffer match] > 0 && \ + # rule 49: wcsa + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsa)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 49 } - # rule 50: wcsc - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsc)} $yy_current_buffer match] > 0 && \ + # rule 50: wcsb + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsb)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 50 } - # rule 51: wcsd - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsd)} $yy_current_buffer match] > 0 && \ + # rule 51: wcsc + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsc)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 51 } - # rule 52: wcse - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcse)} $yy_current_buffer match] > 0 && \ + # rule 52: wcsd + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsd)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 52 } - # rule 53: wcsf - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsf)} $yy_current_buffer match] > 0 && \ + # rule 53: wcse + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcse)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 53 } - # rule 54: wcsg - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsg)} $yy_current_buffer match] > 0 && \ + # rule 54: wcsf + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsf)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 54 } - # rule 55: wcsh - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsh)} $yy_current_buffer match] > 0 && \ + # rule 55: wcsg + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsg)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 55 } - # rule 56: wcsi - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsi)} $yy_current_buffer match] > 0 && \ + # rule 56: wcsh + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsh)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 56 } - # rule 57: wcsj - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsj)} $yy_current_buffer match] > 0 && \ + # rule 57: wcsi + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsi)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 57 } - # rule 58: wcsk - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsk)} $yy_current_buffer match] > 0 && \ + # rule 58: wcsj + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsj)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 58 } - # rule 59: wcsl - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsl)} $yy_current_buffer match] > 0 && \ + # rule 59: wcsk + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsk)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 59 } - # rule 60: wcsm - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsm)} $yy_current_buffer match] > 0 && \ + # rule 60: wcsl + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsl)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 60 } - # rule 61: wcsn - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsn)} $yy_current_buffer match] > 0 && \ + # rule 61: wcsm + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsm)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 61 } - # rule 62: wcso - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcso)} $yy_current_buffer match] > 0 && \ + # rule 62: wcsn + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsn)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 62 } - # rule 63: wcsp - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsp)} $yy_current_buffer match] > 0 && \ + # rule 63: wcso + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcso)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 63 } - # rule 64: wcsq - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsq)} $yy_current_buffer match] > 0 && \ + # rule 64: wcsp + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsp)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 64 } - # rule 65: wcsr - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsr)} $yy_current_buffer match] > 0 && \ + # rule 65: wcsq + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsq)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 65 } - # rule 66: wcss - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcss)} $yy_current_buffer match] > 0 && \ + # rule 66: wcsr + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsr)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 66 } - # rule 67: wcst - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcst)} $yy_current_buffer match] > 0 && \ + # rule 67: wcss + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcss)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 67 } - # rule 68: wcsu - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsu)} $yy_current_buffer match] > 0 && \ + # rule 68: wcst + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcst)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 68 } - # rule 69: wcsv - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsv)} $yy_current_buffer match] > 0 && \ + # rule 69: wcsu + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsu)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 69 } - # rule 70: wcsw - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsw)} $yy_current_buffer match] > 0 && \ + # rule 70: wcsv + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsv)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 70 } - # rule 71: wcsx - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsx)} $yy_current_buffer match] > 0 && \ + # rule 71: wcsw + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsw)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 71 } - # rule 72: wcsy - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsy)} $yy_current_buffer match] > 0 && \ + # rule 72: wcsx + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsx)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 72 } - # rule 73: wcsz - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsz)} $yy_current_buffer match] > 0 && \ + # rule 73: wcsy + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsy)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 73 } - # rule 74: fk4 - if {[regexp -start $index_ -indices -line -nocase -- {\A(fk4)} $yy_current_buffer match] > 0 && \ + # rule 74: wcsz + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsz)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 74 } - # rule 75: b1950 - if {[regexp -start $index_ -indices -line -nocase -- {\A(b1950)} $yy_current_buffer match] > 0 && \ + # rule 75: fk4 + if {[regexp -start $index_ -indices -line -nocase -- {\A(fk4)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 75 } - # rule 76: fk5 - if {[regexp -start $index_ -indices -line -nocase -- {\A(fk5)} $yy_current_buffer match] > 0 && \ + # rule 76: b1950 + if {[regexp -start $index_ -indices -line -nocase -- {\A(b1950)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 76 } - # rule 77: j2000 - if {[regexp -start $index_ -indices -line -nocase -- {\A(j2000)} $yy_current_buffer match] > 0 && \ + # rule 77: fk5 + if {[regexp -start $index_ -indices -line -nocase -- {\A(fk5)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 77 } - # rule 78: icrs - if {[regexp -start $index_ -indices -line -nocase -- {\A(icrs)} $yy_current_buffer match] > 0 && \ + # rule 78: j2000 + if {[regexp -start $index_ -indices -line -nocase -- {\A(j2000)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 78 } - # rule 79: galactic - if {[regexp -start $index_ -indices -line -nocase -- {\A(galactic)} $yy_current_buffer match] > 0 && \ + # rule 79: icrs + if {[regexp -start $index_ -indices -line -nocase -- {\A(icrs)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 79 } - # rule 80: ecliptic - if {[regexp -start $index_ -indices -line -nocase -- {\A(ecliptic)} $yy_current_buffer match] > 0 && \ + # rule 80: galactic + if {[regexp -start $index_ -indices -line -nocase -- {\A(galactic)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 80 } - # rule 81: [+-]?{D}+ - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+)} $yy_current_buffer match] > 0 && \ + # rule 81: ecliptic + if {[regexp -start $index_ -indices -line -nocase -- {\A(ecliptic)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 81 } - # rule 82: [+-]?{D}+\.?({E})? - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+\.?(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ + # rule 82: [+-]?{D}+ + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 82 } - # rule 83: [+-]?{D}*\.{D}+({E})? - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])*\.([0-9])+(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ + # rule 83: [+-]?{D}+\.?({E})? + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+\.?(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 83 } - # rule 84: \"[^\"]*\" - if {[regexp -start $index_ -indices -line -nocase -- {\A(\"[^\"]*\")} $yy_current_buffer match] > 0 && \ + # rule 84: [+-]?{D}*\.{D}+({E})? + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])*\.([0-9])+(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 84 } - # rule 85: \'[^\']*\' - if {[regexp -start $index_ -indices -line -nocase -- {\A(\'[^\']*\')} $yy_current_buffer match] > 0 && \ + # rule 85: \"[^\"]*\" + if {[regexp -start $index_ -indices -line -nocase -- {\A(\"[^\"]*\")} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 85 } - # rule 86: \{[^\}]*\} - if {[regexp -start $index_ -indices -line -nocase -- {\A(\{[^\}]*\})} $yy_current_buffer match] > 0 && \ + # rule 86: \'[^\']*\' + if {[regexp -start $index_ -indices -line -nocase -- {\A(\'[^\']*\')} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 86 } - # rule 87: \S+\S+ - if {[regexp -start $index_ -indices -line -nocase -- {\A(\S+\S+)} $yy_current_buffer match] > 0 && \ + # rule 87: \{[^\}]*\} + if {[regexp -start $index_ -indices -line -nocase -- {\A(\{[^\}]*\})} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 87 } - # rule 88: \s - if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ + # rule 88: \S+\S+ + if {[regexp -start $index_ -indices -line -nocase -- {\A(\S+\S+)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 88 } - # rule 89: . - if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + # rule 89: \s + if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 89 } + # rule 90: . + if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + [lindex $match 1] - $index_ + 1 > $yyleng} { + set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] + set yyleng [string length $yytext] + set matched_rule 90 + } if {$matched_rule == -1} { set yytext [string index $yy_current_buffer $index_] set yyleng 1 @@ -942,242 +949,242 @@ return $CLOSE_ return $COLOR_ } 5 { -return $CONVERT_ +return $COLOR_ } 6 { -return $COPY_ +return $CONVERT_ } 7 { -return $DASH_ +return $COPY_ } 8 { -return $EXP_ +return $DASH_ } 9 { -return $GENERATE_ +return $EXP_ } 10 { -return $GLOBAL_ +return $GENERATE_ } 11 { -return $HISTEQU_ +return $GLOBAL_ } 12 { -return $LEVELS_ +return $HISTEQU_ } 13 { -return $LIMITS_ +return $LEVELS_ } 14 { -return $LINEAR_ +return $LIMITS_ } 15 { -return $LOAD_ +return $LINEAR_ } 16 { -return $LOADLEVELS_ +return $LOAD_ } 17 { -return $LOCAL_ +return $LOADLEVELS_ } 18 { -return $LOG_ +return $LOCAL_ } 19 { -return $METHOD_ +return $LOG_ } 20 { -return $MINMAX_ +return $METHOD_ } 21 { -return $MODE_ +return $MINMAX_ } 22 { -return $NLEVELS_ +return $MODE_ } 23 { -return $OPEN_ +return $NLEVELS_ } 24 { -return $PASTE_ +return $OPEN_ } 25 { -return $POW_ +return $PASTE_ } 26 { -return $SAVE_ +return $POW_ } 27 { -return $SAVELEVELS_ +return $SAVE_ } 28 { -return $SCALE_ +return $SAVELEVELS_ } 29 { -return $SCOPE_ +return $SCALE_ } 30 { -return $SINH_ +return $SCOPE_ } 31 { -return $SMOOTH_ +return $SINH_ } 32 { -return $SQRT_ +return $SMOOTH_ } 33 { -return $SQUARED_ +return $SQRT_ } 34 { -return $WIDTH_ +return $SQUARED_ } 35 { -return $ZMAX_ +return $WIDTH_ } 36 { -return $ZSCALE_ +return $ZMAX_ } 37 { -return $YES_ +return $ZSCALE_ } 38 { -return $NO_ +return $YES_ } 39 { -return $ON_ +return $NO_ } 40 { -return $OFF_ +return $ON_ } 41 { -return $TRUE_ +return $OFF_ } 42 { -return $FALSE_ +return $TRUE_ } 43 { -return $IMAGE_ +return $FALSE_ } 44 { -return $PHYSICAL_ +return $IMAGE_ } 45 { -return $AMPLIFIER_ +return $PHYSICAL_ } 46 { -return $DETECTOR_ +return $AMPLIFIER_ } 47 { -return $WCS_ +return $DETECTOR_ } 48 { -return $WCSA_ +return $WCS_ } 49 { -return $WCSB_ +return $WCSA_ } 50 { -return $WCSC_ +return $WCSB_ } 51 { -return $WCSD_ +return $WCSC_ } 52 { -return $WCSE_ +return $WCSD_ } 53 { -return $WCSF_ +return $WCSE_ } 54 { -return $WCSG_ +return $WCSF_ } 55 { -return $WCSH_ +return $WCSG_ } 56 { -return $WCSI_ +return $WCSH_ } 57 { -return $WCSJ_ +return $WCSI_ } 58 { -return $WCSK_ +return $WCSJ_ } 59 { -return $WCSL_ +return $WCSK_ } 60 { -return $WCSM_ +return $WCSL_ } 61 { -return $WCSN_ +return $WCSM_ } 62 { -return $WCSO_ +return $WCSN_ } 63 { -return $WCSP_ +return $WCSO_ } 64 { -return $WCSQ_ +return $WCSP_ } 65 { -return $WCSR_ +return $WCSQ_ } 66 { -return $WCSS_ +return $WCSR_ } 67 { -return $WCST_ +return $WCSS_ } 68 { -return $WCSU_ +return $WCST_ } 69 { -return $WCSV_ +return $WCSU_ } 70 { -return $WCSW_ +return $WCSV_ } 71 { -return $WCSX_ +return $WCSW_ } 72 { -return $WCSY_ +return $WCSX_ } 73 { -return $WCSZ_ +return $WCSY_ } 74 { -return $FK4_ +return $WCSZ_ } 75 { return $FK4_ } 76 { -return $FK5_ +return $FK4_ } 77 { return $FK5_ } 78 { -return $ICRS_ +return $FK5_ } 79 { -return $GALACTIC_ +return $ICRS_ } 80 { -return $ECLIPTIC_ +return $GALACTIC_ } 81 { -set yylval $yytext; return $INT_ +return $ECLIPTIC_ } - 82 - - 83 { -set yylval $yytext; return $REAL_ + 82 { +set yylval $yytext; return $INT_ } + 83 - 84 { -set yylval [string range $yytext 1 end-1]; return $STRING_ +set yylval $yytext; return $REAL_ } 85 { set yylval [string range $yytext 1 end-1]; return $STRING_ @@ -1186,12 +1193,15 @@ set yylval [string range $yytext 1 end-1]; return $STRING_ set yylval [string range $yytext 1 end-1]; return $STRING_ } 87 { -set yylval $yytext; return $STRING_ +set yylval [string range $yytext 1 end-1]; return $STRING_ } 88 { -# ignore whitespace +set yylval $yytext; return $STRING_ } 89 { +# ignore whitespace + } + 90 { set yylval $yytext; return $yylval } default diff --git a/ds9/parsers/contoursendlex.fcl b/ds9/parsers/contoursendlex.fcl index ecf6c4f..9442cf3 100644 --- a/ds9/parsers/contoursendlex.fcl +++ b/ds9/parsers/contoursendlex.fcl @@ -8,6 +8,7 @@ %% color {return $COLOR_} +colour {return $COLOR_} dash {return $DASH_} exp {return $EXP_} levels {return $LEVELS_} diff --git a/ds9/parsers/contoursendlex.tcl b/ds9/parsers/contoursendlex.tcl index afb9e84..0f40f06 100644 --- a/ds9/parsers/contoursendlex.tcl +++ b/ds9/parsers/contoursendlex.tcl @@ -258,370 +258,377 @@ set WIDTH_ 307 set yyleng [string length $yytext] set matched_rule 0 } - # rule 1: dash - if {[regexp -start $index_ -indices -line -nocase -- {\A(dash)} $yy_current_buffer match] > 0 && \ + # rule 1: colour + if {[regexp -start $index_ -indices -line -nocase -- {\A(colour)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 1 } - # rule 2: exp - if {[regexp -start $index_ -indices -line -nocase -- {\A(exp)} $yy_current_buffer match] > 0 && \ + # rule 2: dash + if {[regexp -start $index_ -indices -line -nocase -- {\A(dash)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 2 } - # rule 3: levels - if {[regexp -start $index_ -indices -line -nocase -- {\A(levels)} $yy_current_buffer match] > 0 && \ + # rule 3: exp + if {[regexp -start $index_ -indices -line -nocase -- {\A(exp)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 3 } - # rule 4: limits - if {[regexp -start $index_ -indices -line -nocase -- {\A(limits)} $yy_current_buffer match] > 0 && \ + # rule 4: levels + if {[regexp -start $index_ -indices -line -nocase -- {\A(levels)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 4 } - # rule 5: log - if {[regexp -start $index_ -indices -line -nocase -- {\A(log)} $yy_current_buffer match] > 0 && \ + # rule 5: limits + if {[regexp -start $index_ -indices -line -nocase -- {\A(limits)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 5 } - # rule 6: method - if {[regexp -start $index_ -indices -line -nocase -- {\A(method)} $yy_current_buffer match] > 0 && \ + # rule 6: log + if {[regexp -start $index_ -indices -line -nocase -- {\A(log)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 6 } - # rule 7: mode - if {[regexp -start $index_ -indices -line -nocase -- {\A(mode)} $yy_current_buffer match] > 0 && \ + # rule 7: method + if {[regexp -start $index_ -indices -line -nocase -- {\A(method)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 7 } - # rule 8: nlevels - if {[regexp -start $index_ -indices -line -nocase -- {\A(nlevels)} $yy_current_buffer match] > 0 && \ + # rule 8: mode + if {[regexp -start $index_ -indices -line -nocase -- {\A(mode)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 8 } - # rule 9: scale - if {[regexp -start $index_ -indices -line -nocase -- {\A(scale)} $yy_current_buffer match] > 0 && \ + # rule 9: nlevels + if {[regexp -start $index_ -indices -line -nocase -- {\A(nlevels)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 9 } - # rule 10: scope - if {[regexp -start $index_ -indices -line -nocase -- {\A(scope)} $yy_current_buffer match] > 0 && \ + # rule 10: scale + if {[regexp -start $index_ -indices -line -nocase -- {\A(scale)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 10 } - # rule 11: smooth - if {[regexp -start $index_ -indices -line -nocase -- {\A(smooth)} $yy_current_buffer match] > 0 && \ + # rule 11: scope + if {[regexp -start $index_ -indices -line -nocase -- {\A(scope)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 11 } - # rule 12: width - if {[regexp -start $index_ -indices -line -nocase -- {\A(width)} $yy_current_buffer match] > 0 && \ + # rule 12: smooth + if {[regexp -start $index_ -indices -line -nocase -- {\A(smooth)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 12 } - # rule 13: image - if {[regexp -start $index_ -indices -line -nocase -- {\A(image)} $yy_current_buffer match] > 0 && \ + # rule 13: width + if {[regexp -start $index_ -indices -line -nocase -- {\A(width)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 13 } - # rule 14: physical - if {[regexp -start $index_ -indices -line -nocase -- {\A(physical)} $yy_current_buffer match] > 0 && \ + # rule 14: image + if {[regexp -start $index_ -indices -line -nocase -- {\A(image)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 14 } - # rule 15: amplifier - if {[regexp -start $index_ -indices -line -nocase -- {\A(amplifier)} $yy_current_buffer match] > 0 && \ + # rule 15: physical + if {[regexp -start $index_ -indices -line -nocase -- {\A(physical)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 15 } - # rule 16: detector - if {[regexp -start $index_ -indices -line -nocase -- {\A(detector)} $yy_current_buffer match] > 0 && \ + # rule 16: amplifier + if {[regexp -start $index_ -indices -line -nocase -- {\A(amplifier)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 16 } - # rule 17: wcs - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcs)} $yy_current_buffer match] > 0 && \ + # rule 17: detector + if {[regexp -start $index_ -indices -line -nocase -- {\A(detector)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 17 } - # rule 18: wcsa - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsa)} $yy_current_buffer match] > 0 && \ + # rule 18: wcs + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcs)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 18 } - # rule 19: wcsb - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsb)} $yy_current_buffer match] > 0 && \ + # rule 19: wcsa + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsa)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 19 } - # rule 20: wcsc - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsc)} $yy_current_buffer match] > 0 && \ + # rule 20: wcsb + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsb)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 20 } - # rule 21: wcsd - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsd)} $yy_current_buffer match] > 0 && \ + # rule 21: wcsc + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsc)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 21 } - # rule 22: wcse - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcse)} $yy_current_buffer match] > 0 && \ + # rule 22: wcsd + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsd)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 22 } - # rule 23: wcsf - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsf)} $yy_current_buffer match] > 0 && \ + # rule 23: wcse + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcse)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 23 } - # rule 24: wcsg - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsg)} $yy_current_buffer match] > 0 && \ + # rule 24: wcsf + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsf)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 24 } - # rule 25: wcsh - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsh)} $yy_current_buffer match] > 0 && \ + # rule 25: wcsg + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsg)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 25 } - # rule 26: wcsi - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsi)} $yy_current_buffer match] > 0 && \ + # rule 26: wcsh + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsh)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 26 } - # rule 27: wcsj - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsj)} $yy_current_buffer match] > 0 && \ + # rule 27: wcsi + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsi)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 27 } - # rule 28: wcsk - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsk)} $yy_current_buffer match] > 0 && \ + # rule 28: wcsj + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsj)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 28 } - # rule 29: wcsl - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsl)} $yy_current_buffer match] > 0 && \ + # rule 29: wcsk + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsk)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 29 } - # rule 30: wcsm - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsm)} $yy_current_buffer match] > 0 && \ + # rule 30: wcsl + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsl)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 30 } - # rule 31: wcsn - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsn)} $yy_current_buffer match] > 0 && \ + # rule 31: wcsm + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsm)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 31 } - # rule 32: wcso - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcso)} $yy_current_buffer match] > 0 && \ + # rule 32: wcsn + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsn)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 32 } - # rule 33: wcsp - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsp)} $yy_current_buffer match] > 0 && \ + # rule 33: wcso + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcso)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 33 } - # rule 34: wcsq - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsq)} $yy_current_buffer match] > 0 && \ + # rule 34: wcsp + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsp)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 34 } - # rule 35: wcsr - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsr)} $yy_current_buffer match] > 0 && \ + # rule 35: wcsq + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsq)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 35 } - # rule 36: wcss - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcss)} $yy_current_buffer match] > 0 && \ + # rule 36: wcsr + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsr)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 36 } - # rule 37: wcst - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcst)} $yy_current_buffer match] > 0 && \ + # rule 37: wcss + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcss)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 37 } - # rule 38: wcsu - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsu)} $yy_current_buffer match] > 0 && \ + # rule 38: wcst + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcst)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 38 } - # rule 39: wcsv - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsv)} $yy_current_buffer match] > 0 && \ + # rule 39: wcsu + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsu)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 39 } - # rule 40: wcsw - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsw)} $yy_current_buffer match] > 0 && \ + # rule 40: wcsv + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsv)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 40 } - # rule 41: wcsx - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsx)} $yy_current_buffer match] > 0 && \ + # rule 41: wcsw + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsw)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 41 } - # rule 42: wcsy - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsy)} $yy_current_buffer match] > 0 && \ + # rule 42: wcsx + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsx)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 42 } - # rule 43: wcsz - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsz)} $yy_current_buffer match] > 0 && \ + # rule 43: wcsy + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsy)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 43 } - # rule 44: fk4 - if {[regexp -start $index_ -indices -line -nocase -- {\A(fk4)} $yy_current_buffer match] > 0 && \ + # rule 44: wcsz + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsz)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 44 } - # rule 45: b1950 - if {[regexp -start $index_ -indices -line -nocase -- {\A(b1950)} $yy_current_buffer match] > 0 && \ + # rule 45: fk4 + if {[regexp -start $index_ -indices -line -nocase -- {\A(fk4)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 45 } - # rule 46: fk5 - if {[regexp -start $index_ -indices -line -nocase -- {\A(fk5)} $yy_current_buffer match] > 0 && \ + # rule 46: b1950 + if {[regexp -start $index_ -indices -line -nocase -- {\A(b1950)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 46 } - # rule 47: j2000 - if {[regexp -start $index_ -indices -line -nocase -- {\A(j2000)} $yy_current_buffer match] > 0 && \ + # rule 47: fk5 + if {[regexp -start $index_ -indices -line -nocase -- {\A(fk5)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 47 } - # rule 48: icrs - if {[regexp -start $index_ -indices -line -nocase -- {\A(icrs)} $yy_current_buffer match] > 0 && \ + # rule 48: j2000 + if {[regexp -start $index_ -indices -line -nocase -- {\A(j2000)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 48 } - # rule 49: galactic - if {[regexp -start $index_ -indices -line -nocase -- {\A(galactic)} $yy_current_buffer match] > 0 && \ + # rule 49: icrs + if {[regexp -start $index_ -indices -line -nocase -- {\A(icrs)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 49 } - # rule 50: ecliptic - if {[regexp -start $index_ -indices -line -nocase -- {\A(ecliptic)} $yy_current_buffer match] > 0 && \ + # rule 50: galactic + if {[regexp -start $index_ -indices -line -nocase -- {\A(galactic)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 50 } - # rule 51: \s - if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ + # rule 51: ecliptic + if {[regexp -start $index_ -indices -line -nocase -- {\A(ecliptic)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 51 } - # rule 52: . - if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + # rule 52: \s + if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 52 } + # rule 53: . + if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + [lindex $match 1] - $index_ + 1 > $yyleng} { + set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] + set yyleng [string length $yytext] + set matched_rule 53 + } if {$matched_rule == -1} { set yytext [string index $yy_current_buffer $index_] set yyleng 1 @@ -638,159 +645,162 @@ set WIDTH_ 307 return $COLOR_ } 1 { -return $DASH_ +return $COLOR_ } 2 { -return $EXP_ +return $DASH_ } 3 { -return $LEVELS_ +return $EXP_ } 4 { -return $LIMITS_ +return $LEVELS_ } 5 { -return $LOG_ +return $LIMITS_ } 6 { -return $METHOD_ +return $LOG_ } 7 { -return $MODE_ +return $METHOD_ } 8 { -return $NLEVELS_ +return $MODE_ } 9 { -return $SCALE_ +return $NLEVELS_ } 10 { -return $SCOPE_ +return $SCALE_ } 11 { -return $SMOOTH_ +return $SCOPE_ } 12 { -return $WIDTH_ +return $SMOOTH_ } 13 { -return $IMAGE_ +return $WIDTH_ } 14 { -return $PHYSICAL_ +return $IMAGE_ } 15 { -return $AMPLIFIER_ +return $PHYSICAL_ } 16 { -return $DETECTOR_ +return $AMPLIFIER_ } 17 { -return $WCS_ +return $DETECTOR_ } 18 { -return $WCSA_ +return $WCS_ } 19 { -return $WCSB_ +return $WCSA_ } 20 { -return $WCSC_ +return $WCSB_ } 21 { -return $WCSD_ +return $WCSC_ } 22 { -return $WCSE_ +return $WCSD_ } 23 { -return $WCSF_ +return $WCSE_ } 24 { -return $WCSG_ +return $WCSF_ } 25 { -return $WCSH_ +return $WCSG_ } 26 { -return $WCSI_ +return $WCSH_ } 27 { -return $WCSJ_ +return $WCSI_ } 28 { -return $WCSK_ +return $WCSJ_ } 29 { -return $WCSL_ +return $WCSK_ } 30 { -return $WCSM_ +return $WCSL_ } 31 { -return $WCSN_ +return $WCSM_ } 32 { -return $WCSO_ +return $WCSN_ } 33 { -return $WCSP_ +return $WCSO_ } 34 { -return $WCSQ_ +return $WCSP_ } 35 { -return $WCSR_ +return $WCSQ_ } 36 { -return $WCSS_ +return $WCSR_ } 37 { -return $WCST_ +return $WCSS_ } 38 { -return $WCSU_ +return $WCST_ } 39 { -return $WCSV_ +return $WCSU_ } 40 { -return $WCSW_ +return $WCSV_ } 41 { -return $WCSX_ +return $WCSW_ } 42 { -return $WCSY_ +return $WCSX_ } 43 { -return $WCSZ_ +return $WCSY_ } 44 { -return $FK4_ +return $WCSZ_ } 45 { return $FK4_ } 46 { -return $FK5_ +return $FK4_ } 47 { return $FK5_ } 48 { -return $ICRS_ +return $FK5_ } 49 { -return $GALACTIC_ +return $ICRS_ } 50 { -return $ECLIPTIC_ +return $GALACTIC_ } 51 { -# ignore whitespace +return $ECLIPTIC_ } 52 { +# ignore whitespace + } + 53 { set yylval $yytext; return $yylval } default diff --git a/ds9/parsers/gridlex.fcl b/ds9/parsers/gridlex.fcl index 8262ded..6309c54 100644 --- a/ds9/parsers/gridlex.fcl +++ b/ds9/parsers/gridlex.fcl @@ -12,6 +12,7 @@ axes {return $AXES_} border {return $BORDER_} close {return $CLOSE_} color {return $COLOR_} +colour {return $COLOR_} dash {return $DASH_} def {return $DEF_} def1 {return $DEF1_} diff --git a/ds9/parsers/gridlex.tcl b/ds9/parsers/gridlex.tcl index 4c1718f..5602ead 100644 --- a/ds9/parsers/gridlex.tcl +++ b/ds9/parsers/gridlex.tcl @@ -344,825 +344,832 @@ set UUU_ 365 set yyleng [string length $yytext] set matched_rule 4 } - # rule 5: dash - if {[regexp -start $index_ -indices -line -nocase -- {\A(dash)} $yy_current_buffer match] > 0 && \ + # rule 5: colour + if {[regexp -start $index_ -indices -line -nocase -- {\A(colour)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 5 } - # rule 6: def - if {[regexp -start $index_ -indices -line -nocase -- {\A(def)} $yy_current_buffer match] > 0 && \ + # rule 6: dash + if {[regexp -start $index_ -indices -line -nocase -- {\A(dash)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 6 } - # rule 7: def1 - if {[regexp -start $index_ -indices -line -nocase -- {\A(def1)} $yy_current_buffer match] > 0 && \ + # rule 7: def + if {[regexp -start $index_ -indices -line -nocase -- {\A(def)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 7 } - # rule 8: def2 - if {[regexp -start $index_ -indices -line -nocase -- {\A(def2)} $yy_current_buffer match] > 0 && \ + # rule 8: def1 + if {[regexp -start $index_ -indices -line -nocase -- {\A(def1)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 8 } - # rule 9: exterior - if {[regexp -start $index_ -indices -line -nocase -- {\A(exterior)} $yy_current_buffer match] > 0 && \ + # rule 9: def2 + if {[regexp -start $index_ -indices -line -nocase -- {\A(def2)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 9 } - # rule 10: format1 - if {[regexp -start $index_ -indices -line -nocase -- {\A(format1)} $yy_current_buffer match] > 0 && \ + # rule 10: exterior + if {[regexp -start $index_ -indices -line -nocase -- {\A(exterior)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 10 } - # rule 11: format2 - if {[regexp -start $index_ -indices -line -nocase -- {\A(format2)} $yy_current_buffer match] > 0 && \ + # rule 11: format1 + if {[regexp -start $index_ -indices -line -nocase -- {\A(format1)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 11 } - # rule 12: gap - if {[regexp -start $index_ -indices -line -nocase -- {\A(gap)} $yy_current_buffer match] > 0 && \ + # rule 12: format2 + if {[regexp -start $index_ -indices -line -nocase -- {\A(format2)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 12 } - # rule 13: gap1 - if {[regexp -start $index_ -indices -line -nocase -- {\A(gap1)} $yy_current_buffer match] > 0 && \ + # rule 13: gap + if {[regexp -start $index_ -indices -line -nocase -- {\A(gap)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 13 } - # rule 14: gap2 - if {[regexp -start $index_ -indices -line -nocase -- {\A(gap2)} $yy_current_buffer match] > 0 && \ + # rule 14: gap1 + if {[regexp -start $index_ -indices -line -nocase -- {\A(gap1)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 14 } - # rule 15: gap3 - if {[regexp -start $index_ -indices -line -nocase -- {\A(gap3)} $yy_current_buffer match] > 0 && \ + # rule 15: gap2 + if {[regexp -start $index_ -indices -line -nocase -- {\A(gap2)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 15 } - # rule 16: grid - if {[regexp -start $index_ -indices -line -nocase -- {\A(grid)} $yy_current_buffer match] > 0 && \ + # rule 16: gap3 + if {[regexp -start $index_ -indices -line -nocase -- {\A(gap3)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 16 } - # rule 17: interior - if {[regexp -start $index_ -indices -line -nocase -- {\A(interior)} $yy_current_buffer match] > 0 && \ + # rule 17: grid + if {[regexp -start $index_ -indices -line -nocase -- {\A(grid)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 17 } - # rule 18: label - if {[regexp -start $index_ -indices -line -nocase -- {\A(label)} $yy_current_buffer match] > 0 && \ + # rule 18: interior + if {[regexp -start $index_ -indices -line -nocase -- {\A(interior)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 18 } - # rule 19: labels - if {[regexp -start $index_ -indices -line -nocase -- {\A(labels)} $yy_current_buffer match] > 0 && \ + # rule 19: label + if {[regexp -start $index_ -indices -line -nocase -- {\A(label)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 19 } - # rule 20: load - if {[regexp -start $index_ -indices -line -nocase -- {\A(load)} $yy_current_buffer match] > 0 && \ + # rule 20: labels + if {[regexp -start $index_ -indices -line -nocase -- {\A(labels)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 20 } - # rule 21: textlab - if {[regexp -start $index_ -indices -line -nocase -- {\A(textlab)} $yy_current_buffer match] > 0 && \ + # rule 21: load + if {[regexp -start $index_ -indices -line -nocase -- {\A(load)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 21 } - # rule 22: numlab - if {[regexp -start $index_ -indices -line -nocase -- {\A(numlab)} $yy_current_buffer match] > 0 && \ + # rule 22: textlab + if {[regexp -start $index_ -indices -line -nocase -- {\A(textlab)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 22 } - # rule 23: numbers - if {[regexp -start $index_ -indices -line -nocase -- {\A(numbers)} $yy_current_buffer match] > 0 && \ + # rule 23: numlab + if {[regexp -start $index_ -indices -line -nocase -- {\A(numlab)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 23 } - # rule 24: numeric - if {[regexp -start $index_ -indices -line -nocase -- {\A(numeric)} $yy_current_buffer match] > 0 && \ + # rule 24: numbers + if {[regexp -start $index_ -indices -line -nocase -- {\A(numbers)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 24 } - # rule 25: numerics - if {[regexp -start $index_ -indices -line -nocase -- {\A(numerics)} $yy_current_buffer match] > 0 && \ + # rule 25: numeric + if {[regexp -start $index_ -indices -line -nocase -- {\A(numeric)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 25 } - # rule 26: origin - if {[regexp -start $index_ -indices -line -nocase -- {\A(origin)} $yy_current_buffer match] > 0 && \ + # rule 26: numerics + if {[regexp -start $index_ -indices -line -nocase -- {\A(numerics)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 26 } - # rule 27: open - if {[regexp -start $index_ -indices -line -nocase -- {\A(open)} $yy_current_buffer match] > 0 && \ + # rule 27: origin + if {[regexp -start $index_ -indices -line -nocase -- {\A(origin)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 27 } - # rule 28: publication - if {[regexp -start $index_ -indices -line -nocase -- {\A(publication)} $yy_current_buffer match] > 0 && \ + # rule 28: open + if {[regexp -start $index_ -indices -line -nocase -- {\A(open)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 28 } - # rule 29: reset - if {[regexp -start $index_ -indices -line -nocase -- {\A(reset)} $yy_current_buffer match] > 0 && \ + # rule 29: publication + if {[regexp -start $index_ -indices -line -nocase -- {\A(publication)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 29 } - # rule 30: save - if {[regexp -start $index_ -indices -line -nocase -- {\A(save)} $yy_current_buffer match] > 0 && \ + # rule 30: reset + if {[regexp -start $index_ -indices -line -nocase -- {\A(reset)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 30 } - # rule 31: sky - if {[regexp -start $index_ -indices -line -nocase -- {\A(sky)} $yy_current_buffer match] > 0 && \ + # rule 31: save + if {[regexp -start $index_ -indices -line -nocase -- {\A(save)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 31 } - # rule 32: skyframe - if {[regexp -start $index_ -indices -line -nocase -- {\A(skyframe)} $yy_current_buffer match] > 0 && \ + # rule 32: sky + if {[regexp -start $index_ -indices -line -nocase -- {\A(sky)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 32 } - # rule 33: skyformat - if {[regexp -start $index_ -indices -line -nocase -- {\A(skyformat)} $yy_current_buffer match] > 0 && \ + # rule 33: skyframe + if {[regexp -start $index_ -indices -line -nocase -- {\A(skyframe)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 33 } - # rule 34: style - if {[regexp -start $index_ -indices -line -nocase -- {\A(style)} $yy_current_buffer match] > 0 && \ + # rule 34: skyformat + if {[regexp -start $index_ -indices -line -nocase -- {\A(skyformat)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 34 } - # rule 35: system - if {[regexp -start $index_ -indices -line -nocase -- {\A(system)} $yy_current_buffer match] > 0 && \ + # rule 35: style + if {[regexp -start $index_ -indices -line -nocase -- {\A(style)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 35 } - # rule 36: text - if {[regexp -start $index_ -indices -line -nocase -- {\A(text)} $yy_current_buffer match] > 0 && \ + # rule 36: system + if {[regexp -start $index_ -indices -line -nocase -- {\A(system)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 36 } - # rule 37: text1 - if {[regexp -start $index_ -indices -line -nocase -- {\A(text1)} $yy_current_buffer match] > 0 && \ + # rule 37: text + if {[regexp -start $index_ -indices -line -nocase -- {\A(text)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 37 } - # rule 38: text2 - if {[regexp -start $index_ -indices -line -nocase -- {\A(text2)} $yy_current_buffer match] > 0 && \ + # rule 38: text1 + if {[regexp -start $index_ -indices -line -nocase -- {\A(text1)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 38 } - # rule 39: tick - if {[regexp -start $index_ -indices -line -nocase -- {\A(tick)} $yy_current_buffer match] > 0 && \ + # rule 39: text2 + if {[regexp -start $index_ -indices -line -nocase -- {\A(text2)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 39 } - # rule 40: tickmark - if {[regexp -start $index_ -indices -line -nocase -- {\A(tickmark)} $yy_current_buffer match] > 0 && \ + # rule 40: tick + if {[regexp -start $index_ -indices -line -nocase -- {\A(tick)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 40 } - # rule 41: tickmarks - if {[regexp -start $index_ -indices -line -nocase -- {\A(tickmarks)} $yy_current_buffer match] > 0 && \ + # rule 41: tickmark + if {[regexp -start $index_ -indices -line -nocase -- {\A(tickmark)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 41 } - # rule 42: title - if {[regexp -start $index_ -indices -line -nocase -- {\A(title)} $yy_current_buffer match] > 0 && \ + # rule 42: tickmarks + if {[regexp -start $index_ -indices -line -nocase -- {\A(tickmarks)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 42 } - # rule 43: type - if {[regexp -start $index_ -indices -line -nocase -- {\A(type)} $yy_current_buffer match] > 0 && \ + # rule 43: title + if {[regexp -start $index_ -indices -line -nocase -- {\A(title)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 43 } - # rule 44: vertical - if {[regexp -start $index_ -indices -line -nocase -- {\A(vertical)} $yy_current_buffer match] > 0 && \ + # rule 44: type + if {[regexp -start $index_ -indices -line -nocase -- {\A(type)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 44 } - # rule 45: view - if {[regexp -start $index_ -indices -line -nocase -- {\A(view)} $yy_current_buffer match] > 0 && \ + # rule 45: vertical + if {[regexp -start $index_ -indices -line -nocase -- {\A(vertical)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 45 } - # rule 46: width - if {[regexp -start $index_ -indices -line -nocase -- {\A(width)} $yy_current_buffer match] > 0 && \ + # rule 46: view + if {[regexp -start $index_ -indices -line -nocase -- {\A(view)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 46 } - # rule 47: lll - if {[regexp -start $index_ -indices -line -nocase -- {\A(lll)} $yy_current_buffer match] > 0 && \ + # rule 47: width + if {[regexp -start $index_ -indices -line -nocase -- {\A(width)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 47 } - # rule 48: llu - if {[regexp -start $index_ -indices -line -nocase -- {\A(llu)} $yy_current_buffer match] > 0 && \ + # rule 48: lll + if {[regexp -start $index_ -indices -line -nocase -- {\A(lll)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 48 } - # rule 49: lul - if {[regexp -start $index_ -indices -line -nocase -- {\A(lul)} $yy_current_buffer match] > 0 && \ + # rule 49: llu + if {[regexp -start $index_ -indices -line -nocase -- {\A(llu)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 49 } - # rule 50: luu - if {[regexp -start $index_ -indices -line -nocase -- {\A(luu)} $yy_current_buffer match] > 0 && \ + # rule 50: lul + if {[regexp -start $index_ -indices -line -nocase -- {\A(lul)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 50 } - # rule 51: ull - if {[regexp -start $index_ -indices -line -nocase -- {\A(ull)} $yy_current_buffer match] > 0 && \ + # rule 51: luu + if {[regexp -start $index_ -indices -line -nocase -- {\A(luu)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 51 } - # rule 52: ulu - if {[regexp -start $index_ -indices -line -nocase -- {\A(ulu)} $yy_current_buffer match] > 0 && \ + # rule 52: ull + if {[regexp -start $index_ -indices -line -nocase -- {\A(ull)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 52 } - # rule 53: uul - if {[regexp -start $index_ -indices -line -nocase -- {\A(uul)} $yy_current_buffer match] > 0 && \ + # rule 53: ulu + if {[regexp -start $index_ -indices -line -nocase -- {\A(ulu)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 53 } - # rule 54: uuu - if {[regexp -start $index_ -indices -line -nocase -- {\A(uuu)} $yy_current_buffer match] > 0 && \ + # rule 54: uul + if {[regexp -start $index_ -indices -line -nocase -- {\A(uul)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 54 } - # rule 55: yes - if {[regexp -start $index_ -indices -line -nocase -- {\A(yes)} $yy_current_buffer match] > 0 && \ + # rule 55: uuu + if {[regexp -start $index_ -indices -line -nocase -- {\A(uuu)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 55 } - # rule 56: no - if {[regexp -start $index_ -indices -line -nocase -- {\A(no)} $yy_current_buffer match] > 0 && \ + # rule 56: yes + if {[regexp -start $index_ -indices -line -nocase -- {\A(yes)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 56 } - # rule 57: on - if {[regexp -start $index_ -indices -line -nocase -- {\A(on)} $yy_current_buffer match] > 0 && \ + # rule 57: no + if {[regexp -start $index_ -indices -line -nocase -- {\A(no)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 57 } - # rule 58: off - if {[regexp -start $index_ -indices -line -nocase -- {\A(off)} $yy_current_buffer match] > 0 && \ + # rule 58: on + if {[regexp -start $index_ -indices -line -nocase -- {\A(on)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 58 } - # rule 59: true - if {[regexp -start $index_ -indices -line -nocase -- {\A(true)} $yy_current_buffer match] > 0 && \ + # rule 59: off + if {[regexp -start $index_ -indices -line -nocase -- {\A(off)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 59 } - # rule 60: false - if {[regexp -start $index_ -indices -line -nocase -- {\A(false)} $yy_current_buffer match] > 0 && \ + # rule 60: true + if {[regexp -start $index_ -indices -line -nocase -- {\A(true)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 60 } - # rule 61: font - if {[regexp -start $index_ -indices -line -nocase -- {\A(font)} $yy_current_buffer match] > 0 && \ + # rule 61: false + if {[regexp -start $index_ -indices -line -nocase -- {\A(false)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 61 } - # rule 62: fontsize - if {[regexp -start $index_ -indices -line -nocase -- {\A(fontsize)} $yy_current_buffer match] > 0 && \ + # rule 62: font + if {[regexp -start $index_ -indices -line -nocase -- {\A(font)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 62 } - # rule 63: fontslant - if {[regexp -start $index_ -indices -line -nocase -- {\A(fontslant)} $yy_current_buffer match] > 0 && \ + # rule 63: fontsize + if {[regexp -start $index_ -indices -line -nocase -- {\A(fontsize)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 63 } - # rule 64: fontstyle - if {[regexp -start $index_ -indices -line -nocase -- {\A(fontstyle)} $yy_current_buffer match] > 0 && \ + # rule 64: fontslant + if {[regexp -start $index_ -indices -line -nocase -- {\A(fontslant)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 64 } - # rule 65: fontweight - if {[regexp -start $index_ -indices -line -nocase -- {\A(fontweight)} $yy_current_buffer match] > 0 && \ + # rule 65: fontstyle + if {[regexp -start $index_ -indices -line -nocase -- {\A(fontstyle)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 65 } - # rule 66: times - if {[regexp -start $index_ -indices -line -nocase -- {\A(times)} $yy_current_buffer match] > 0 && \ + # rule 66: fontweight + if {[regexp -start $index_ -indices -line -nocase -- {\A(fontweight)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 66 } - # rule 67: helvetica - if {[regexp -start $index_ -indices -line -nocase -- {\A(helvetica)} $yy_current_buffer match] > 0 && \ + # rule 67: times + if {[regexp -start $index_ -indices -line -nocase -- {\A(times)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 67 } - # rule 68: courier - if {[regexp -start $index_ -indices -line -nocase -- {\A(courier)} $yy_current_buffer match] > 0 && \ + # rule 68: helvetica + if {[regexp -start $index_ -indices -line -nocase -- {\A(helvetica)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 68 } - # rule 69: normal - if {[regexp -start $index_ -indices -line -nocase -- {\A(normal)} $yy_current_buffer match] > 0 && \ + # rule 69: courier + if {[regexp -start $index_ -indices -line -nocase -- {\A(courier)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 69 } - # rule 70: bold - if {[regexp -start $index_ -indices -line -nocase -- {\A(bold)} $yy_current_buffer match] > 0 && \ + # rule 70: normal + if {[regexp -start $index_ -indices -line -nocase -- {\A(normal)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 70 } - # rule 71: roman - if {[regexp -start $index_ -indices -line -nocase -- {\A(roman)} $yy_current_buffer match] > 0 && \ + # rule 71: bold + if {[regexp -start $index_ -indices -line -nocase -- {\A(bold)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 71 } - # rule 72: italic - if {[regexp -start $index_ -indices -line -nocase -- {\A(italic)} $yy_current_buffer match] > 0 && \ + # rule 72: roman + if {[regexp -start $index_ -indices -line -nocase -- {\A(roman)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 72 } - # rule 73: image - if {[regexp -start $index_ -indices -line -nocase -- {\A(image)} $yy_current_buffer match] > 0 && \ + # rule 73: italic + if {[regexp -start $index_ -indices -line -nocase -- {\A(italic)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 73 } - # rule 74: physical - if {[regexp -start $index_ -indices -line -nocase -- {\A(physical)} $yy_current_buffer match] > 0 && \ + # rule 74: image + if {[regexp -start $index_ -indices -line -nocase -- {\A(image)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 74 } - # rule 75: amplifier - if {[regexp -start $index_ -indices -line -nocase -- {\A(amplifier)} $yy_current_buffer match] > 0 && \ + # rule 75: physical + if {[regexp -start $index_ -indices -line -nocase -- {\A(physical)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 75 } - # rule 76: detector - if {[regexp -start $index_ -indices -line -nocase -- {\A(detector)} $yy_current_buffer match] > 0 && \ + # rule 76: amplifier + if {[regexp -start $index_ -indices -line -nocase -- {\A(amplifier)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 76 } - # rule 77: wcs - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcs)} $yy_current_buffer match] > 0 && \ + # rule 77: detector + if {[regexp -start $index_ -indices -line -nocase -- {\A(detector)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 77 } - # rule 78: wcsa - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsa)} $yy_current_buffer match] > 0 && \ + # rule 78: wcs + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcs)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 78 } - # rule 79: wcsb - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsb)} $yy_current_buffer match] > 0 && \ + # rule 79: wcsa + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsa)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 79 } - # rule 80: wcsc - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsc)} $yy_current_buffer match] > 0 && \ + # rule 80: wcsb + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsb)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 80 } - # rule 81: wcsd - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsd)} $yy_current_buffer match] > 0 && \ + # rule 81: wcsc + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsc)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 81 } - # rule 82: wcse - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcse)} $yy_current_buffer match] > 0 && \ + # rule 82: wcsd + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsd)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 82 } - # rule 83: wcsf - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsf)} $yy_current_buffer match] > 0 && \ + # rule 83: wcse + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcse)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 83 } - # rule 84: wcsg - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsg)} $yy_current_buffer match] > 0 && \ + # rule 84: wcsf + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsf)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 84 } - # rule 85: wcsh - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsh)} $yy_current_buffer match] > 0 && \ + # rule 85: wcsg + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsg)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 85 } - # rule 86: wcsi - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsi)} $yy_current_buffer match] > 0 && \ + # rule 86: wcsh + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsh)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 86 } - # rule 87: wcsj - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsj)} $yy_current_buffer match] > 0 && \ + # rule 87: wcsi + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsi)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 87 } - # rule 88: wcsk - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsk)} $yy_current_buffer match] > 0 && \ + # rule 88: wcsj + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsj)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 88 } - # rule 89: wcsl - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsl)} $yy_current_buffer match] > 0 && \ + # rule 89: wcsk + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsk)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 89 } - # rule 90: wcsm - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsm)} $yy_current_buffer match] > 0 && \ + # rule 90: wcsl + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsl)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 90 } - # rule 91: wcsn - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsn)} $yy_current_buffer match] > 0 && \ + # rule 91: wcsm + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsm)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 91 } - # rule 92: wcso - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcso)} $yy_current_buffer match] > 0 && \ + # rule 92: wcsn + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsn)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 92 } - # rule 93: wcsp - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsp)} $yy_current_buffer match] > 0 && \ + # rule 93: wcso + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcso)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 93 } - # rule 94: wcsq - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsq)} $yy_current_buffer match] > 0 && \ + # rule 94: wcsp + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsp)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 94 } - # rule 95: wcsr - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsr)} $yy_current_buffer match] > 0 && \ + # rule 95: wcsq + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsq)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 95 } - # rule 96: wcss - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcss)} $yy_current_buffer match] > 0 && \ + # rule 96: wcsr + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsr)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 96 } - # rule 97: wcst - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcst)} $yy_current_buffer match] > 0 && \ + # rule 97: wcss + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcss)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 97 } - # rule 98: wcsu - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsu)} $yy_current_buffer match] > 0 && \ + # rule 98: wcst + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcst)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 98 } - # rule 99: wcsv - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsv)} $yy_current_buffer match] > 0 && \ + # rule 99: wcsu + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsu)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 99 } - # rule 100: wcsw - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsw)} $yy_current_buffer match] > 0 && \ + # rule 100: wcsv + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsv)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 100 } - # rule 101: wcsx - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsx)} $yy_current_buffer match] > 0 && \ + # rule 101: wcsw + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsw)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 101 } - # rule 102: wcsy - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsy)} $yy_current_buffer match] > 0 && \ + # rule 102: wcsx + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsx)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 102 } - # rule 103: wcsz - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsz)} $yy_current_buffer match] > 0 && \ + # rule 103: wcsy + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsy)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 103 } - # rule 104: fk4 - if {[regexp -start $index_ -indices -line -nocase -- {\A(fk4)} $yy_current_buffer match] > 0 && \ + # rule 104: wcsz + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsz)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 104 } - # rule 105: b1950 - if {[regexp -start $index_ -indices -line -nocase -- {\A(b1950)} $yy_current_buffer match] > 0 && \ + # rule 105: fk4 + if {[regexp -start $index_ -indices -line -nocase -- {\A(fk4)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 105 } - # rule 106: fk5 - if {[regexp -start $index_ -indices -line -nocase -- {\A(fk5)} $yy_current_buffer match] > 0 && \ + # rule 106: b1950 + if {[regexp -start $index_ -indices -line -nocase -- {\A(b1950)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 106 } - # rule 107: j2000 - if {[regexp -start $index_ -indices -line -nocase -- {\A(j2000)} $yy_current_buffer match] > 0 && \ + # rule 107: fk5 + if {[regexp -start $index_ -indices -line -nocase -- {\A(fk5)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 107 } - # rule 108: icrs - if {[regexp -start $index_ -indices -line -nocase -- {\A(icrs)} $yy_current_buffer match] > 0 && \ + # rule 108: j2000 + if {[regexp -start $index_ -indices -line -nocase -- {\A(j2000)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 108 } - # rule 109: galactic - if {[regexp -start $index_ -indices -line -nocase -- {\A(galactic)} $yy_current_buffer match] > 0 && \ + # rule 109: icrs + if {[regexp -start $index_ -indices -line -nocase -- {\A(icrs)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 109 } - # rule 110: ecliptic - if {[regexp -start $index_ -indices -line -nocase -- {\A(ecliptic)} $yy_current_buffer match] > 0 && \ + # rule 110: galactic + if {[regexp -start $index_ -indices -line -nocase -- {\A(galactic)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 110 } - # rule 111: degrees - if {[regexp -start $index_ -indices -line -nocase -- {\A(degrees)} $yy_current_buffer match] > 0 && \ + # rule 111: ecliptic + if {[regexp -start $index_ -indices -line -nocase -- {\A(ecliptic)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 111 } - # rule 112: sexagesimal - if {[regexp -start $index_ -indices -line -nocase -- {\A(sexagesimal)} $yy_current_buffer match] > 0 && \ + # rule 112: degrees + if {[regexp -start $index_ -indices -line -nocase -- {\A(degrees)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 112 } - # rule 113: [+-]?{D}+ - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+)} $yy_current_buffer match] > 0 && \ + # rule 113: sexagesimal + if {[regexp -start $index_ -indices -line -nocase -- {\A(sexagesimal)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 113 } - # rule 114: [+-]?{D}+\.?({E})? - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+\.?(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ + # rule 114: [+-]?{D}+ + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 114 } - # rule 115: [+-]?{D}*\.{D}+({E})? - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])*\.([0-9])+(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ + # rule 115: [+-]?{D}+\.?({E})? + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+\.?(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 115 } - # rule 116: \"[^\"]*\" - if {[regexp -start $index_ -indices -line -nocase -- {\A(\"[^\"]*\")} $yy_current_buffer match] > 0 && \ + # rule 116: [+-]?{D}*\.{D}+({E})? + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])*\.([0-9])+(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 116 } - # rule 117: \'[^\']*\' - if {[regexp -start $index_ -indices -line -nocase -- {\A(\'[^\']*\')} $yy_current_buffer match] > 0 && \ + # rule 117: \"[^\"]*\" + if {[regexp -start $index_ -indices -line -nocase -- {\A(\"[^\"]*\")} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 117 } - # rule 118: \{[^\}]*\} - if {[regexp -start $index_ -indices -line -nocase -- {\A(\{[^\}]*\})} $yy_current_buffer match] > 0 && \ + # rule 118: \'[^\']*\' + if {[regexp -start $index_ -indices -line -nocase -- {\A(\'[^\']*\')} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 118 } - # rule 119: \S+\S+ - if {[regexp -start $index_ -indices -line -nocase -- {\A(\S+\S+)} $yy_current_buffer match] > 0 && \ + # rule 119: \{[^\}]*\} + if {[regexp -start $index_ -indices -line -nocase -- {\A(\{[^\}]*\})} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 119 } - # rule 120: \s - if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ + # rule 120: \S+\S+ + if {[regexp -start $index_ -indices -line -nocase -- {\A(\S+\S+)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 120 } - # rule 121: . - if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + # rule 121: \s + if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 121 } + # rule 122: . + if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + [lindex $match 1] - $index_ + 1 > $yyleng} { + set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] + set yyleng [string length $yytext] + set matched_rule 122 + } if {$matched_rule == -1} { set yytext [string index $yy_current_buffer $index_] set yyleng 1 @@ -1191,109 +1198,109 @@ return $CLOSE_ return $COLOR_ } 5 { -return $DASH_ +return $COLOR_ } 6 { -return $DEF_ +return $DASH_ } 7 { -return $DEF1_ +return $DEF_ } 8 { -return $DEF2_ +return $DEF1_ } 9 { -return $EXTERIOR_ +return $DEF2_ } 10 { -return $FORMAT1_ +return $EXTERIOR_ } 11 { -return $FORMAT2_ +return $FORMAT1_ } 12 { -return $GAP_ +return $FORMAT2_ } 13 { -return $GAP1_ +return $GAP_ } 14 { -return $GAP2_ +return $GAP1_ } 15 { -return $GAP3_ +return $GAP2_ } 16 { -return $GRID_ +return $GAP3_ } 17 { -return $INTERIOR_ +return $GRID_ } 18 { -return $LABELS_ +return $INTERIOR_ } 19 { return $LABELS_ } 20 { -return $LOAD_ +return $LABELS_ } 21 { -return $LABELS_ +return $LOAD_ } 22 { -return $NUMERICS_ +return $LABELS_ } 23 { -return $NUMBERS_ +return $NUMERICS_ } 24 { -return $NUMERICS_ +return $NUMBERS_ } 25 { return $NUMERICS_ } 26 { -return $ORIGIN_ +return $NUMERICS_ } 27 { -return $OPEN_ +return $ORIGIN_ } 28 { -return $PUBLICATION_ +return $OPEN_ } 29 { -return $RESET_ +return $PUBLICATION_ } 30 { -return $SAVE_ +return $RESET_ } 31 { -return $SKYFRAME_ +return $SAVE_ } 32 { return $SKYFRAME_ } 33 { -return $SKYFORMAT_ +return $SKYFRAME_ } 34 { -return $STYLE_ +return $SKYFORMAT_ } 35 { -return $SYSTEM_ +return $STYLE_ } 36 { -return $TEXT_ +return $SYSTEM_ } 37 { -return $TEXT1_ +return $TEXT_ } 38 { -return $TEXT2_ +return $TEXT1_ } 39 { -return $TICKMARKS_ +return $TEXT2_ } 40 { return $TICKMARKS_ @@ -1302,227 +1309,227 @@ return $TICKMARKS_ return $TICKMARKS_ } 42 { -return $TITLE_ +return $TICKMARKS_ } 43 { -return $TYPE_ +return $TITLE_ } 44 { -return $VERTICAL_ +return $TYPE_ } 45 { -return $VIEW_ +return $VERTICAL_ } 46 { -return $WIDTH_ +return $VIEW_ } 47 { -return $LLL_ +return $WIDTH_ } 48 { -return $LLU_ +return $LLL_ } 49 { -return $LUL_ +return $LLU_ } 50 { -return $LUU_ +return $LUL_ } 51 { -return $ULL_ +return $LUU_ } 52 { -return $ULU_ +return $ULL_ } 53 { -return $UUL_ +return $ULU_ } 54 { -return $UUU_ +return $UUL_ } 55 { -return $YES_ +return $UUU_ } 56 { -return $NO_ +return $YES_ } 57 { -return $ON_ +return $NO_ } 58 { -return $OFF_ +return $ON_ } 59 { -return $TRUE_ +return $OFF_ } 60 { -return $FALSE_ +return $TRUE_ } 61 { -return $FONT_ +return $FALSE_ } 62 { -return $FONTSIZE_ +return $FONT_ } 63 { -return $FONTSLANT_ +return $FONTSIZE_ } 64 { -return $FONTSTYLE_ +return $FONTSLANT_ } 65 { -return $FONTWEIGHT_ +return $FONTSTYLE_ } 66 { -return $TIMES_ +return $FONTWEIGHT_ } 67 { -return $HELVETICA_ +return $TIMES_ } 68 { -return $COURIER_ +return $HELVETICA_ } 69 { -return $NORMAL_ +return $COURIER_ } 70 { -return $BOLD_ +return $NORMAL_ } 71 { -return $ROMAN_ +return $BOLD_ } 72 { -return $ITALIC_ +return $ROMAN_ } 73 { -return $IMAGE_ +return $ITALIC_ } 74 { -return $PHYSICAL_ +return $IMAGE_ } 75 { -return $AMPLIFIER_ +return $PHYSICAL_ } 76 { -return $DETECTOR_ +return $AMPLIFIER_ } 77 { -return $WCS_ +return $DETECTOR_ } 78 { -return $WCSA_ +return $WCS_ } 79 { -return $WCSB_ +return $WCSA_ } 80 { -return $WCSC_ +return $WCSB_ } 81 { -return $WCSD_ +return $WCSC_ } 82 { -return $WCSE_ +return $WCSD_ } 83 { -return $WCSF_ +return $WCSE_ } 84 { -return $WCSG_ +return $WCSF_ } 85 { -return $WCSH_ +return $WCSG_ } 86 { -return $WCSI_ +return $WCSH_ } 87 { -return $WCSJ_ +return $WCSI_ } 88 { -return $WCSK_ +return $WCSJ_ } 89 { -return $WCSL_ +return $WCSK_ } 90 { -return $WCSM_ +return $WCSL_ } 91 { -return $WCSN_ +return $WCSM_ } 92 { -return $WCSO_ +return $WCSN_ } 93 { -return $WCSP_ +return $WCSO_ } 94 { -return $WCSQ_ +return $WCSP_ } 95 { -return $WCSR_ +return $WCSQ_ } 96 { -return $WCSS_ +return $WCSR_ } 97 { -return $WCST_ +return $WCSS_ } 98 { -return $WCSU_ +return $WCST_ } 99 { -return $WCSV_ +return $WCSU_ } 100 { -return $WCSW_ +return $WCSV_ } 101 { -return $WCSX_ +return $WCSW_ } 102 { -return $WCSY_ +return $WCSX_ } 103 { -return $WCSZ_ +return $WCSY_ } 104 { -return $FK4_ +return $WCSZ_ } 105 { return $FK4_ } 106 { -return $FK5_ +return $FK4_ } 107 { return $FK5_ } 108 { -return $ICRS_ +return $FK5_ } 109 { -return $GALACTIC_ +return $ICRS_ } 110 { -return $ECLIPTIC_ +return $GALACTIC_ } 111 { -return $DEGREES_ +return $ECLIPTIC_ } 112 { -return $SEXAGESIMAL_ +return $DEGREES_ } 113 { -set yylval $yytext; return $INT_ +return $SEXAGESIMAL_ } - 114 - - 115 { -set yylval $yytext; return $REAL_ + 114 { +set yylval $yytext; return $INT_ } + 115 - 116 { -set yylval [string range $yytext 1 end-1]; return $STRING_ +set yylval $yytext; return $REAL_ } 117 { set yylval [string range $yytext 1 end-1]; return $STRING_ @@ -1531,12 +1538,15 @@ set yylval [string range $yytext 1 end-1]; return $STRING_ set yylval [string range $yytext 1 end-1]; return $STRING_ } 119 { -set yylval $yytext; return $STRING_ +set yylval [string range $yytext 1 end-1]; return $STRING_ } 120 { -# ignore whitespace +set yylval $yytext; return $STRING_ } 121 { +# ignore whitespace + } + 122 { set yylval $yytext; return $yylval } default diff --git a/ds9/parsers/gridsendlex.fcl b/ds9/parsers/gridsendlex.fcl index 7e27d79..77797cc 100644 --- a/ds9/parsers/gridsendlex.fcl +++ b/ds9/parsers/gridsendlex.fcl @@ -10,6 +10,7 @@ axes {return $AXES_} border {return $BORDER_} color {return $COLOR_} +colour {return $COLOR_} dash {return $DASH_} def {return $DEF_} def1 {return $DEF1_} diff --git a/ds9/parsers/gridsendlex.tcl b/ds9/parsers/gridsendlex.tcl index f7a8686..218379e 100644 --- a/ds9/parsers/gridsendlex.tcl +++ b/ds9/parsers/gridsendlex.tcl @@ -257,300 +257,307 @@ set VIEW_ 292 set yyleng [string length $yytext] set matched_rule 2 } - # rule 3: dash - if {[regexp -start $index_ -indices -line -nocase -- {\A(dash)} $yy_current_buffer match] > 0 && \ + # rule 3: colour + if {[regexp -start $index_ -indices -line -nocase -- {\A(colour)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 3 } - # rule 4: def - if {[regexp -start $index_ -indices -line -nocase -- {\A(def)} $yy_current_buffer match] > 0 && \ + # rule 4: dash + if {[regexp -start $index_ -indices -line -nocase -- {\A(dash)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 4 } - # rule 5: def1 - if {[regexp -start $index_ -indices -line -nocase -- {\A(def1)} $yy_current_buffer match] > 0 && \ + # rule 5: def + if {[regexp -start $index_ -indices -line -nocase -- {\A(def)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 5 } - # rule 6: def2 - if {[regexp -start $index_ -indices -line -nocase -- {\A(def2)} $yy_current_buffer match] > 0 && \ + # rule 6: def1 + if {[regexp -start $index_ -indices -line -nocase -- {\A(def1)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 6 } - # rule 7: format1 - if {[regexp -start $index_ -indices -line -nocase -- {\A(format1)} $yy_current_buffer match] > 0 && \ + # rule 7: def2 + if {[regexp -start $index_ -indices -line -nocase -- {\A(def2)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 7 } - # rule 8: format2 - if {[regexp -start $index_ -indices -line -nocase -- {\A(format2)} $yy_current_buffer match] > 0 && \ + # rule 8: format1 + if {[regexp -start $index_ -indices -line -nocase -- {\A(format1)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 8 } - # rule 9: gap - if {[regexp -start $index_ -indices -line -nocase -- {\A(gap)} $yy_current_buffer match] > 0 && \ + # rule 9: format2 + if {[regexp -start $index_ -indices -line -nocase -- {\A(format2)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 9 } - # rule 10: gap1 - if {[regexp -start $index_ -indices -line -nocase -- {\A(gap1)} $yy_current_buffer match] > 0 && \ + # rule 10: gap + if {[regexp -start $index_ -indices -line -nocase -- {\A(gap)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 10 } - # rule 11: gap2 - if {[regexp -start $index_ -indices -line -nocase -- {\A(gap2)} $yy_current_buffer match] > 0 && \ + # rule 11: gap1 + if {[regexp -start $index_ -indices -line -nocase -- {\A(gap1)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 11 } - # rule 12: gap3 - if {[regexp -start $index_ -indices -line -nocase -- {\A(gap3)} $yy_current_buffer match] > 0 && \ + # rule 12: gap2 + if {[regexp -start $index_ -indices -line -nocase -- {\A(gap2)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 12 } - # rule 13: grid - if {[regexp -start $index_ -indices -line -nocase -- {\A(grid)} $yy_current_buffer match] > 0 && \ + # rule 13: gap3 + if {[regexp -start $index_ -indices -line -nocase -- {\A(gap3)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 13 } - # rule 14: label - if {[regexp -start $index_ -indices -line -nocase -- {\A(label)} $yy_current_buffer match] > 0 && \ + # rule 14: grid + if {[regexp -start $index_ -indices -line -nocase -- {\A(grid)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 14 } - # rule 15: labels - if {[regexp -start $index_ -indices -line -nocase -- {\A(labels)} $yy_current_buffer match] > 0 && \ + # rule 15: label + if {[regexp -start $index_ -indices -line -nocase -- {\A(label)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 15 } - # rule 16: textlab - if {[regexp -start $index_ -indices -line -nocase -- {\A(textlab)} $yy_current_buffer match] > 0 && \ + # rule 16: labels + if {[regexp -start $index_ -indices -line -nocase -- {\A(labels)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 16 } - # rule 17: numlab - if {[regexp -start $index_ -indices -line -nocase -- {\A(numlab)} $yy_current_buffer match] > 0 && \ + # rule 17: textlab + if {[regexp -start $index_ -indices -line -nocase -- {\A(textlab)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 17 } - # rule 18: numbers - if {[regexp -start $index_ -indices -line -nocase -- {\A(numbers)} $yy_current_buffer match] > 0 && \ + # rule 18: numlab + if {[regexp -start $index_ -indices -line -nocase -- {\A(numlab)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 18 } - # rule 19: numeric - if {[regexp -start $index_ -indices -line -nocase -- {\A(numeric)} $yy_current_buffer match] > 0 && \ + # rule 19: numbers + if {[regexp -start $index_ -indices -line -nocase -- {\A(numbers)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 19 } - # rule 20: numerics - if {[regexp -start $index_ -indices -line -nocase -- {\A(numerics)} $yy_current_buffer match] > 0 && \ + # rule 20: numeric + if {[regexp -start $index_ -indices -line -nocase -- {\A(numeric)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 20 } - # rule 21: origin - if {[regexp -start $index_ -indices -line -nocase -- {\A(origin)} $yy_current_buffer match] > 0 && \ + # rule 21: numerics + if {[regexp -start $index_ -indices -line -nocase -- {\A(numerics)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 21 } - # rule 22: sky - if {[regexp -start $index_ -indices -line -nocase -- {\A(sky)} $yy_current_buffer match] > 0 && \ + # rule 22: origin + if {[regexp -start $index_ -indices -line -nocase -- {\A(origin)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 22 } - # rule 23: skyframe - if {[regexp -start $index_ -indices -line -nocase -- {\A(skyframe)} $yy_current_buffer match] > 0 && \ + # rule 23: sky + if {[regexp -start $index_ -indices -line -nocase -- {\A(sky)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 23 } - # rule 24: skyformat - if {[regexp -start $index_ -indices -line -nocase -- {\A(skyformat)} $yy_current_buffer match] > 0 && \ + # rule 24: skyframe + if {[regexp -start $index_ -indices -line -nocase -- {\A(skyframe)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 24 } - # rule 25: style - if {[regexp -start $index_ -indices -line -nocase -- {\A(style)} $yy_current_buffer match] > 0 && \ + # rule 25: skyformat + if {[regexp -start $index_ -indices -line -nocase -- {\A(skyformat)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 25 } - # rule 26: system - if {[regexp -start $index_ -indices -line -nocase -- {\A(system)} $yy_current_buffer match] > 0 && \ + # rule 26: style + if {[regexp -start $index_ -indices -line -nocase -- {\A(style)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 26 } - # rule 27: text - if {[regexp -start $index_ -indices -line -nocase -- {\A(text)} $yy_current_buffer match] > 0 && \ + # rule 27: system + if {[regexp -start $index_ -indices -line -nocase -- {\A(system)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 27 } - # rule 28: text1 - if {[regexp -start $index_ -indices -line -nocase -- {\A(text1)} $yy_current_buffer match] > 0 && \ + # rule 28: text + if {[regexp -start $index_ -indices -line -nocase -- {\A(text)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 28 } - # rule 29: text2 - if {[regexp -start $index_ -indices -line -nocase -- {\A(text2)} $yy_current_buffer match] > 0 && \ + # rule 29: text1 + if {[regexp -start $index_ -indices -line -nocase -- {\A(text1)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 29 } - # rule 30: tick - if {[regexp -start $index_ -indices -line -nocase -- {\A(tick)} $yy_current_buffer match] > 0 && \ + # rule 30: text2 + if {[regexp -start $index_ -indices -line -nocase -- {\A(text2)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 30 } - # rule 31: tickmark - if {[regexp -start $index_ -indices -line -nocase -- {\A(tickmark)} $yy_current_buffer match] > 0 && \ + # rule 31: tick + if {[regexp -start $index_ -indices -line -nocase -- {\A(tick)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 31 } - # rule 32: tickmarks - if {[regexp -start $index_ -indices -line -nocase -- {\A(tickmarks)} $yy_current_buffer match] > 0 && \ + # rule 32: tickmark + if {[regexp -start $index_ -indices -line -nocase -- {\A(tickmark)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 32 } - # rule 33: title - if {[regexp -start $index_ -indices -line -nocase -- {\A(title)} $yy_current_buffer match] > 0 && \ + # rule 33: tickmarks + if {[regexp -start $index_ -indices -line -nocase -- {\A(tickmarks)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 33 } - # rule 34: type - if {[regexp -start $index_ -indices -line -nocase -- {\A(type)} $yy_current_buffer match] > 0 && \ + # rule 34: title + if {[regexp -start $index_ -indices -line -nocase -- {\A(title)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 34 } - # rule 35: vertical - if {[regexp -start $index_ -indices -line -nocase -- {\A(vertical)} $yy_current_buffer match] > 0 && \ + # rule 35: type + if {[regexp -start $index_ -indices -line -nocase -- {\A(type)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 35 } - # rule 36: view - if {[regexp -start $index_ -indices -line -nocase -- {\A(view)} $yy_current_buffer match] > 0 && \ + # rule 36: vertical + if {[regexp -start $index_ -indices -line -nocase -- {\A(vertical)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 36 } - # rule 37: width - if {[regexp -start $index_ -indices -line -nocase -- {\A(width)} $yy_current_buffer match] > 0 && \ + # rule 37: view + if {[regexp -start $index_ -indices -line -nocase -- {\A(view)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 37 } - # rule 38: font - if {[regexp -start $index_ -indices -line -nocase -- {\A(font)} $yy_current_buffer match] > 0 && \ + # rule 38: width + if {[regexp -start $index_ -indices -line -nocase -- {\A(width)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 38 } - # rule 39: fontsize - if {[regexp -start $index_ -indices -line -nocase -- {\A(fontsize)} $yy_current_buffer match] > 0 && \ + # rule 39: font + if {[regexp -start $index_ -indices -line -nocase -- {\A(font)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 39 } - # rule 40: fontslant - if {[regexp -start $index_ -indices -line -nocase -- {\A(fontslant)} $yy_current_buffer match] > 0 && \ + # rule 40: fontsize + if {[regexp -start $index_ -indices -line -nocase -- {\A(fontsize)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 40 } - # rule 41: fontstyle - if {[regexp -start $index_ -indices -line -nocase -- {\A(fontstyle)} $yy_current_buffer match] > 0 && \ + # rule 41: fontslant + if {[regexp -start $index_ -indices -line -nocase -- {\A(fontslant)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 41 } - # rule 42: fontweight - if {[regexp -start $index_ -indices -line -nocase -- {\A(fontweight)} $yy_current_buffer match] > 0 && \ + # rule 42: fontstyle + if {[regexp -start $index_ -indices -line -nocase -- {\A(fontstyle)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 42 } - # rule 43: \s - if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ + # rule 43: fontweight + if {[regexp -start $index_ -indices -line -nocase -- {\A(fontweight)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 43 } - # rule 44: . - if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + # rule 44: \s + if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 44 } + # rule 45: . + if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + [lindex $match 1] - $index_ + 1 > $yyleng} { + set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] + set yyleng [string length $yytext] + set matched_rule 45 + } if {$matched_rule == -1} { set yytext [string index $yy_current_buffer $index_] set yyleng 1 @@ -573,40 +580,40 @@ return $BORDER_ return $COLOR_ } 3 { -return $DASH_ +return $COLOR_ } 4 { -return $DEF_ +return $DASH_ } 5 { -return $DEF1_ +return $DEF_ } 6 { -return $DEF2_ +return $DEF1_ } 7 { -return $FORMAT1_ +return $DEF2_ } 8 { -return $FORMAT2_ +return $FORMAT1_ } 9 { -return $GAP_ +return $FORMAT2_ } 10 { -return $GAP1_ +return $GAP_ } 11 { -return $GAP2_ +return $GAP1_ } 12 { -return $GAP3_ +return $GAP2_ } 13 { -return $GRID_ +return $GAP3_ } 14 { -return $LABELS_ +return $GRID_ } 15 { return $LABELS_ @@ -615,46 +622,46 @@ return $LABELS_ return $LABELS_ } 17 { -return $NUMERICS_ +return $LABELS_ } 18 { -return $NUMBERS_ +return $NUMERICS_ } 19 { -return $NUMERICS_ +return $NUMBERS_ } 20 { return $NUMERICS_ } 21 { -return $ORIGIN_ +return $NUMERICS_ } 22 { -return $SKYFRAME_ +return $ORIGIN_ } 23 { return $SKYFRAME_ } 24 { -return $SKYFORMAT_ +return $SKYFRAME_ } 25 { -return $STYLE_ +return $SKYFORMAT_ } 26 { -return $SYSTEM_ +return $STYLE_ } 27 { -return $TEXT_ +return $SYSTEM_ } 28 { -return $TEXT1_ +return $TEXT_ } 29 { -return $TEXT2_ +return $TEXT1_ } 30 { -return $TICKMARKS_ +return $TEXT2_ } 31 { return $TICKMARKS_ @@ -663,39 +670,42 @@ return $TICKMARKS_ return $TICKMARKS_ } 33 { -return $TITLE_ +return $TICKMARKS_ } 34 { -return $TYPE_ +return $TITLE_ } 35 { -return $VERTICAL_ +return $TYPE_ } 36 { -return $VIEW_ +return $VERTICAL_ } 37 { -return $WIDTH_ +return $VIEW_ } 38 { -return $FONT_ +return $WIDTH_ } 39 { -return $FONTSIZE_ +return $FONT_ } 40 { -return $FONTSLANT_ +return $FONTSIZE_ } 41 { -return $FONTSTYLE_ +return $FONTSLANT_ } 42 { -return $FONTWEIGHT_ +return $FONTSTYLE_ } 43 { -# ignore whitespace +return $FONTWEIGHT_ } 44 { +# ignore whitespace + } + 45 { set yylval $yytext; return $yylval } default diff --git a/ds9/parsers/magnifierlex.fcl b/ds9/parsers/magnifierlex.fcl index c7cf020..4e75c7f 100644 --- a/ds9/parsers/magnifierlex.fcl +++ b/ds9/parsers/magnifierlex.fcl @@ -8,6 +8,7 @@ %% color {return $COLOR_} +colour {return $COLOR_} cursor {return $CURSOR_} region {return $REGION_} zoom {return $ZOOM_} diff --git a/ds9/parsers/magnifierlex.tcl b/ds9/parsers/magnifierlex.tcl index 70b8f44..ed47616 100644 --- a/ds9/parsers/magnifierlex.tcl +++ b/ds9/parsers/magnifierlex.tcl @@ -220,132 +220,139 @@ set ZOOM_ 269 set yyleng [string length $yytext] set matched_rule 0 } - # rule 1: cursor - if {[regexp -start $index_ -indices -line -nocase -- {\A(cursor)} $yy_current_buffer match] > 0 && \ + # rule 1: colour + if {[regexp -start $index_ -indices -line -nocase -- {\A(colour)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 1 } - # rule 2: region - if {[regexp -start $index_ -indices -line -nocase -- {\A(region)} $yy_current_buffer match] > 0 && \ + # rule 2: cursor + if {[regexp -start $index_ -indices -line -nocase -- {\A(cursor)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 2 } - # rule 3: zoom - if {[regexp -start $index_ -indices -line -nocase -- {\A(zoom)} $yy_current_buffer match] > 0 && \ + # rule 3: region + if {[regexp -start $index_ -indices -line -nocase -- {\A(region)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 3 } - # rule 4: yes - if {[regexp -start $index_ -indices -line -nocase -- {\A(yes)} $yy_current_buffer match] > 0 && \ + # rule 4: zoom + if {[regexp -start $index_ -indices -line -nocase -- {\A(zoom)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 4 } - # rule 5: no - if {[regexp -start $index_ -indices -line -nocase -- {\A(no)} $yy_current_buffer match] > 0 && \ + # rule 5: yes + if {[regexp -start $index_ -indices -line -nocase -- {\A(yes)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 5 } - # rule 6: on - if {[regexp -start $index_ -indices -line -nocase -- {\A(on)} $yy_current_buffer match] > 0 && \ + # rule 6: no + if {[regexp -start $index_ -indices -line -nocase -- {\A(no)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 6 } - # rule 7: off - if {[regexp -start $index_ -indices -line -nocase -- {\A(off)} $yy_current_buffer match] > 0 && \ + # rule 7: on + if {[regexp -start $index_ -indices -line -nocase -- {\A(on)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 7 } - # rule 8: true - if {[regexp -start $index_ -indices -line -nocase -- {\A(true)} $yy_current_buffer match] > 0 && \ + # rule 8: off + if {[regexp -start $index_ -indices -line -nocase -- {\A(off)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 8 } - # rule 9: false - if {[regexp -start $index_ -indices -line -nocase -- {\A(false)} $yy_current_buffer match] > 0 && \ + # rule 9: true + if {[regexp -start $index_ -indices -line -nocase -- {\A(true)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 9 } - # rule 10: [+-]?{D}+ - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+)} $yy_current_buffer match] > 0 && \ + # rule 10: false + if {[regexp -start $index_ -indices -line -nocase -- {\A(false)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 10 } - # rule 11: [+-]?{D}+\.?({E})? - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+\.?(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ + # rule 11: [+-]?{D}+ + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 11 } - # rule 12: [+-]?{D}*\.{D}+({E})? - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])*\.([0-9])+(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ + # rule 12: [+-]?{D}+\.?({E})? + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+\.?(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 12 } - # rule 13: \"[^\"]*\" - if {[regexp -start $index_ -indices -line -nocase -- {\A(\"[^\"]*\")} $yy_current_buffer match] > 0 && \ + # rule 13: [+-]?{D}*\.{D}+({E})? + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])*\.([0-9])+(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 13 } - # rule 14: \'[^\']*\' - if {[regexp -start $index_ -indices -line -nocase -- {\A(\'[^\']*\')} $yy_current_buffer match] > 0 && \ + # rule 14: \"[^\"]*\" + if {[regexp -start $index_ -indices -line -nocase -- {\A(\"[^\"]*\")} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 14 } - # rule 15: \{[^\}]*\} - if {[regexp -start $index_ -indices -line -nocase -- {\A(\{[^\}]*\})} $yy_current_buffer match] > 0 && \ + # rule 15: \'[^\']*\' + if {[regexp -start $index_ -indices -line -nocase -- {\A(\'[^\']*\')} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 15 } - # rule 16: \S+\S+ - if {[regexp -start $index_ -indices -line -nocase -- {\A(\S+\S+)} $yy_current_buffer match] > 0 && \ + # rule 16: \{[^\}]*\} + if {[regexp -start $index_ -indices -line -nocase -- {\A(\{[^\}]*\})} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 16 } - # rule 17: \s - if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ + # rule 17: \S+\S+ + if {[regexp -start $index_ -indices -line -nocase -- {\A(\S+\S+)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 17 } - # rule 18: . - if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + # rule 18: \s + if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 18 } + # rule 19: . + if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + [lindex $match 1] - $index_ + 1 > $yyleng} { + set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] + set yyleng [string length $yytext] + set matched_rule 19 + } if {$matched_rule == -1} { set yytext [string index $yy_current_buffer $index_] set yyleng 1 @@ -362,41 +369,41 @@ set ZOOM_ 269 return $COLOR_ } 1 { -return $CURSOR_ +return $COLOR_ } 2 { -return $REGION_ +return $CURSOR_ } 3 { -return $ZOOM_ +return $REGION_ } 4 { -return $YES_ +return $ZOOM_ } 5 { -return $NO_ +return $YES_ } 6 { -return $ON_ +return $NO_ } 7 { -return $OFF_ +return $ON_ } 8 { -return $TRUE_ +return $OFF_ } 9 { -return $FALSE_ +return $TRUE_ } 10 { -set yylval $yytext; return $INT_ +return $FALSE_ } - 11 - - 12 { -set yylval $yytext; return $REAL_ + 11 { +set yylval $yytext; return $INT_ } + 12 - 13 { -set yylval [string range $yytext 1 end-1]; return $STRING_ +set yylval $yytext; return $REAL_ } 14 { set yylval [string range $yytext 1 end-1]; return $STRING_ @@ -405,12 +412,15 @@ set yylval [string range $yytext 1 end-1]; return $STRING_ set yylval [string range $yytext 1 end-1]; return $STRING_ } 16 { -set yylval $yytext; return $STRING_ +set yylval [string range $yytext 1 end-1]; return $STRING_ } 17 { -# ignore whitespace +set yylval $yytext; return $STRING_ } 18 { +# ignore whitespace + } + 19 { set yylval $yytext; return $yylval } default diff --git a/ds9/parsers/magnifiersendlex.fcl b/ds9/parsers/magnifiersendlex.fcl index 18b9379..6c39a14 100644 --- a/ds9/parsers/magnifiersendlex.fcl +++ b/ds9/parsers/magnifiersendlex.fcl @@ -8,6 +8,7 @@ %% color {return $COLOR_} +colour {return $COLOR_} cursor {return $CURSOR_} region {return $REGION_} zoom {return $ZOOM_} diff --git a/ds9/parsers/magnifiersendlex.tcl b/ds9/parsers/magnifiersendlex.tcl index 0e58739..7f99384 100644 --- a/ds9/parsers/magnifiersendlex.tcl +++ b/ds9/parsers/magnifiersendlex.tcl @@ -211,41 +211,48 @@ set ZOOM_ 260 set yyleng [string length $yytext] set matched_rule 0 } - # rule 1: cursor - if {[regexp -start $index_ -indices -line -nocase -- {\A(cursor)} $yy_current_buffer match] > 0 && \ + # rule 1: colour + if {[regexp -start $index_ -indices -line -nocase -- {\A(colour)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 1 } - # rule 2: region - if {[regexp -start $index_ -indices -line -nocase -- {\A(region)} $yy_current_buffer match] > 0 && \ + # rule 2: cursor + if {[regexp -start $index_ -indices -line -nocase -- {\A(cursor)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 2 } - # rule 3: zoom - if {[regexp -start $index_ -indices -line -nocase -- {\A(zoom)} $yy_current_buffer match] > 0 && \ + # rule 3: region + if {[regexp -start $index_ -indices -line -nocase -- {\A(region)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 3 } - # rule 4: \s - if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ + # rule 4: zoom + if {[regexp -start $index_ -indices -line -nocase -- {\A(zoom)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 4 } - # rule 5: . - if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + # rule 5: \s + if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 5 } + # rule 6: . + if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + [lindex $match 1] - $index_ + 1 > $yyleng} { + set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] + set yyleng [string length $yytext] + set matched_rule 6 + } if {$matched_rule == -1} { set yytext [string index $yy_current_buffer $index_] set yyleng 1 @@ -262,18 +269,21 @@ set ZOOM_ 260 return $COLOR_ } 1 { -return $CURSOR_ +return $COLOR_ } 2 { -return $REGION_ +return $CURSOR_ } 3 { -return $ZOOM_ +return $REGION_ } 4 { -# ignore whitespace +return $ZOOM_ } 5 { +# ignore whitespace + } + 6 { set yylval $yytext; return $yylval } default diff --git a/ds9/parsers/masklex.fcl b/ds9/parsers/masklex.fcl index 22817ef..030a9ec 100644 --- a/ds9/parsers/masklex.fcl +++ b/ds9/parsers/masklex.fcl @@ -10,6 +10,7 @@ close {return $CLOSE_} clear {return $CLEAR_} color {return $COLOR_} +colour {return $COLOR_} mark {return $MARK_} nan {return $NAN_} nonnan {return $NONNAN_} diff --git a/ds9/parsers/masklex.tcl b/ds9/parsers/masklex.tcl index 5d33c03..315368b 100644 --- a/ds9/parsers/masklex.tcl +++ b/ds9/parsers/masklex.tcl @@ -267,349 +267,356 @@ set ZERO_ 302 set yyleng [string length $yytext] set matched_rule 2 } - # rule 3: mark - if {[regexp -start $index_ -indices -line -nocase -- {\A(mark)} $yy_current_buffer match] > 0 && \ + # rule 3: colour + if {[regexp -start $index_ -indices -line -nocase -- {\A(colour)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 3 } - # rule 4: nan - if {[regexp -start $index_ -indices -line -nocase -- {\A(nan)} $yy_current_buffer match] > 0 && \ + # rule 4: mark + if {[regexp -start $index_ -indices -line -nocase -- {\A(mark)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 4 } - # rule 5: nonnan - if {[regexp -start $index_ -indices -line -nocase -- {\A(nonnan)} $yy_current_buffer match] > 0 && \ + # rule 5: nan + if {[regexp -start $index_ -indices -line -nocase -- {\A(nan)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 5 } - # rule 6: nonzero - if {[regexp -start $index_ -indices -line -nocase -- {\A(nonzero)} $yy_current_buffer match] > 0 && \ + # rule 6: nonnan + if {[regexp -start $index_ -indices -line -nocase -- {\A(nonnan)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 6 } - # rule 7: open - if {[regexp -start $index_ -indices -line -nocase -- {\A(open)} $yy_current_buffer match] > 0 && \ + # rule 7: nonzero + if {[regexp -start $index_ -indices -line -nocase -- {\A(nonzero)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 7 } - # rule 8: range - if {[regexp -start $index_ -indices -line -nocase -- {\A(range)} $yy_current_buffer match] > 0 && \ + # rule 8: open + if {[regexp -start $index_ -indices -line -nocase -- {\A(open)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 8 } - # rule 9: system - if {[regexp -start $index_ -indices -line -nocase -- {\A(system)} $yy_current_buffer match] > 0 && \ + # rule 9: range + if {[regexp -start $index_ -indices -line -nocase -- {\A(range)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 9 } - # rule 10: transparency - if {[regexp -start $index_ -indices -line -nocase -- {\A(transparency)} $yy_current_buffer match] > 0 && \ + # rule 10: system + if {[regexp -start $index_ -indices -line -nocase -- {\A(system)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 10 } - # rule 11: zero - if {[regexp -start $index_ -indices -line -nocase -- {\A(zero)} $yy_current_buffer match] > 0 && \ + # rule 11: transparency + if {[regexp -start $index_ -indices -line -nocase -- {\A(transparency)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 11 } - # rule 12: image - if {[regexp -start $index_ -indices -line -nocase -- {\A(image)} $yy_current_buffer match] > 0 && \ + # rule 12: zero + if {[regexp -start $index_ -indices -line -nocase -- {\A(zero)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 12 } - # rule 13: physical - if {[regexp -start $index_ -indices -line -nocase -- {\A(physical)} $yy_current_buffer match] > 0 && \ + # rule 13: image + if {[regexp -start $index_ -indices -line -nocase -- {\A(image)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 13 } - # rule 14: amplifier - if {[regexp -start $index_ -indices -line -nocase -- {\A(amplifier)} $yy_current_buffer match] > 0 && \ + # rule 14: physical + if {[regexp -start $index_ -indices -line -nocase -- {\A(physical)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 14 } - # rule 15: detector - if {[regexp -start $index_ -indices -line -nocase -- {\A(detector)} $yy_current_buffer match] > 0 && \ + # rule 15: amplifier + if {[regexp -start $index_ -indices -line -nocase -- {\A(amplifier)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 15 } - # rule 16: wcs - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcs)} $yy_current_buffer match] > 0 && \ + # rule 16: detector + if {[regexp -start $index_ -indices -line -nocase -- {\A(detector)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 16 } - # rule 17: wcsa - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsa)} $yy_current_buffer match] > 0 && \ + # rule 17: wcs + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcs)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 17 } - # rule 18: wcsb - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsb)} $yy_current_buffer match] > 0 && \ + # rule 18: wcsa + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsa)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 18 } - # rule 19: wcsc - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsc)} $yy_current_buffer match] > 0 && \ + # rule 19: wcsb + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsb)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 19 } - # rule 20: wcsd - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsd)} $yy_current_buffer match] > 0 && \ + # rule 20: wcsc + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsc)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 20 } - # rule 21: wcse - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcse)} $yy_current_buffer match] > 0 && \ + # rule 21: wcsd + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsd)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 21 } - # rule 22: wcsf - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsf)} $yy_current_buffer match] > 0 && \ + # rule 22: wcse + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcse)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 22 } - # rule 23: wcsg - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsg)} $yy_current_buffer match] > 0 && \ + # rule 23: wcsf + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsf)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 23 } - # rule 24: wcsh - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsh)} $yy_current_buffer match] > 0 && \ + # rule 24: wcsg + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsg)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 24 } - # rule 25: wcsi - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsi)} $yy_current_buffer match] > 0 && \ + # rule 25: wcsh + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsh)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 25 } - # rule 26: wcsj - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsj)} $yy_current_buffer match] > 0 && \ + # rule 26: wcsi + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsi)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 26 } - # rule 27: wcsk - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsk)} $yy_current_buffer match] > 0 && \ + # rule 27: wcsj + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsj)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 27 } - # rule 28: wcsl - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsl)} $yy_current_buffer match] > 0 && \ + # rule 28: wcsk + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsk)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 28 } - # rule 29: wcsm - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsm)} $yy_current_buffer match] > 0 && \ + # rule 29: wcsl + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsl)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 29 } - # rule 30: wcsn - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsn)} $yy_current_buffer match] > 0 && \ + # rule 30: wcsm + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsm)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 30 } - # rule 31: wcso - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcso)} $yy_current_buffer match] > 0 && \ + # rule 31: wcsn + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsn)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 31 } - # rule 32: wcsp - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsp)} $yy_current_buffer match] > 0 && \ + # rule 32: wcso + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcso)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 32 } - # rule 33: wcsq - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsq)} $yy_current_buffer match] > 0 && \ + # rule 33: wcsp + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsp)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 33 } - # rule 34: wcsr - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsr)} $yy_current_buffer match] > 0 && \ + # rule 34: wcsq + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsq)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 34 } - # rule 35: wcss - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcss)} $yy_current_buffer match] > 0 && \ + # rule 35: wcsr + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsr)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 35 } - # rule 36: wcst - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcst)} $yy_current_buffer match] > 0 && \ + # rule 36: wcss + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcss)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 36 } - # rule 37: wcsu - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsu)} $yy_current_buffer match] > 0 && \ + # rule 37: wcst + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcst)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 37 } - # rule 38: wcsv - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsv)} $yy_current_buffer match] > 0 && \ + # rule 38: wcsu + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsu)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 38 } - # rule 39: wcsw - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsw)} $yy_current_buffer match] > 0 && \ + # rule 39: wcsv + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsv)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 39 } - # rule 40: wcsx - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsx)} $yy_current_buffer match] > 0 && \ + # rule 40: wcsw + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsw)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 40 } - # rule 41: wcsy - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsy)} $yy_current_buffer match] > 0 && \ + # rule 41: wcsx + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsx)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 41 } - # rule 42: wcsz - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsz)} $yy_current_buffer match] > 0 && \ + # rule 42: wcsy + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsy)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 42 } - # rule 43: [+-]?{D}+ - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+)} $yy_current_buffer match] > 0 && \ + # rule 43: wcsz + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsz)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 43 } - # rule 44: [+-]?{D}+\.?({E})? - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+\.?(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ + # rule 44: [+-]?{D}+ + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 44 } - # rule 45: [+-]?{D}*\.{D}+({E})? - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])*\.([0-9])+(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ + # rule 45: [+-]?{D}+\.?({E})? + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+\.?(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 45 } - # rule 46: \"[^\"]*\" - if {[regexp -start $index_ -indices -line -nocase -- {\A(\"[^\"]*\")} $yy_current_buffer match] > 0 && \ + # rule 46: [+-]?{D}*\.{D}+({E})? + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])*\.([0-9])+(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 46 } - # rule 47: \'[^\']*\' - if {[regexp -start $index_ -indices -line -nocase -- {\A(\'[^\']*\')} $yy_current_buffer match] > 0 && \ + # rule 47: \"[^\"]*\" + if {[regexp -start $index_ -indices -line -nocase -- {\A(\"[^\"]*\")} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 47 } - # rule 48: \{[^\}]*\} - if {[regexp -start $index_ -indices -line -nocase -- {\A(\{[^\}]*\})} $yy_current_buffer match] > 0 && \ + # rule 48: \'[^\']*\' + if {[regexp -start $index_ -indices -line -nocase -- {\A(\'[^\']*\')} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 48 } - # rule 49: \S+\S+ - if {[regexp -start $index_ -indices -line -nocase -- {\A(\S+\S+)} $yy_current_buffer match] > 0 && \ + # rule 49: \{[^\}]*\} + if {[regexp -start $index_ -indices -line -nocase -- {\A(\{[^\}]*\})} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 49 } - # rule 50: \s - if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ + # rule 50: \S+\S+ + if {[regexp -start $index_ -indices -line -nocase -- {\A(\S+\S+)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 50 } - # rule 51: . - if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + # rule 51: \s + if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 51 } + # rule 52: . + if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + [lindex $match 1] - $index_ + 1 > $yyleng} { + set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] + set yyleng [string length $yytext] + set matched_rule 52 + } if {$matched_rule == -1} { set yytext [string index $yy_current_buffer $index_] set yyleng 1 @@ -632,134 +639,134 @@ return $CLEAR_ return $COLOR_ } 3 { -return $MARK_ +return $COLOR_ } 4 { -return $NAN_ +return $MARK_ } 5 { -return $NONNAN_ +return $NAN_ } 6 { -return $NONZERO_ +return $NONNAN_ } 7 { -return $OPEN_ +return $NONZERO_ } 8 { -return $RANGE_ +return $OPEN_ } 9 { -return $SYSTEM_ +return $RANGE_ } 10 { -return $TRANSPARENCY_ +return $SYSTEM_ } 11 { -return $ZERO_ +return $TRANSPARENCY_ } 12 { -return $IMAGE_ +return $ZERO_ } 13 { -return $PHYSICAL_ +return $IMAGE_ } 14 { -return $AMPLIFIER_ +return $PHYSICAL_ } 15 { -return $DETECTOR_ +return $AMPLIFIER_ } 16 { -return $WCS_ +return $DETECTOR_ } 17 { -return $WCSA_ +return $WCS_ } 18 { -return $WCSB_ +return $WCSA_ } 19 { -return $WCSC_ +return $WCSB_ } 20 { -return $WCSD_ +return $WCSC_ } 21 { -return $WCSE_ +return $WCSD_ } 22 { -return $WCSF_ +return $WCSE_ } 23 { -return $WCSG_ +return $WCSF_ } 24 { -return $WCSH_ +return $WCSG_ } 25 { -return $WCSI_ +return $WCSH_ } 26 { -return $WCSJ_ +return $WCSI_ } 27 { -return $WCSK_ +return $WCSJ_ } 28 { -return $WCSL_ +return $WCSK_ } 29 { -return $WCSM_ +return $WCSL_ } 30 { -return $WCSN_ +return $WCSM_ } 31 { -return $WCSO_ +return $WCSN_ } 32 { -return $WCSP_ +return $WCSO_ } 33 { -return $WCSQ_ +return $WCSP_ } 34 { -return $WCSR_ +return $WCSQ_ } 35 { -return $WCSS_ +return $WCSR_ } 36 { -return $WCST_ +return $WCSS_ } 37 { -return $WCSU_ +return $WCST_ } 38 { -return $WCSV_ +return $WCSU_ } 39 { -return $WCSW_ +return $WCSV_ } 40 { -return $WCSX_ +return $WCSW_ } 41 { -return $WCSY_ +return $WCSX_ } 42 { -return $WCSZ_ +return $WCSY_ } 43 { -set yylval $yytext; return $INT_ +return $WCSZ_ } - 44 - - 45 { -set yylval $yytext; return $REAL_ + 44 { +set yylval $yytext; return $INT_ } + 45 - 46 { -set yylval [string range $yytext 1 end-1]; return $STRING_ +set yylval $yytext; return $REAL_ } 47 { set yylval [string range $yytext 1 end-1]; return $STRING_ @@ -768,12 +775,15 @@ set yylval [string range $yytext 1 end-1]; return $STRING_ set yylval [string range $yytext 1 end-1]; return $STRING_ } 49 { -set yylval $yytext; return $STRING_ +set yylval [string range $yytext 1 end-1]; return $STRING_ } 50 { -# ignore whitespace +set yylval $yytext; return $STRING_ } 51 { +# ignore whitespace + } + 52 { set yylval $yytext; return $yylval } default diff --git a/ds9/parsers/masksendlex.fcl b/ds9/parsers/masksendlex.fcl index 71d11c8..b5f556c 100644 --- a/ds9/parsers/masksendlex.fcl +++ b/ds9/parsers/masksendlex.fcl @@ -8,6 +8,7 @@ %% color {return $COLOR_} +colour {return $COLOR_} mark {return $MARK_} range {return $RANGE_} system {return $SYSTEM_} diff --git a/ds9/parsers/masksendlex.tcl b/ds9/parsers/masksendlex.tcl index 9aad31a..14913a0 100644 --- a/ds9/parsers/masksendlex.tcl +++ b/ds9/parsers/masksendlex.tcl @@ -212,48 +212,55 @@ set TRANSPARENCY_ 261 set yyleng [string length $yytext] set matched_rule 0 } - # rule 1: mark - if {[regexp -start $index_ -indices -line -nocase -- {\A(mark)} $yy_current_buffer match] > 0 && \ + # rule 1: colour + if {[regexp -start $index_ -indices -line -nocase -- {\A(colour)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 1 } - # rule 2: range - if {[regexp -start $index_ -indices -line -nocase -- {\A(range)} $yy_current_buffer match] > 0 && \ + # rule 2: mark + if {[regexp -start $index_ -indices -line -nocase -- {\A(mark)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 2 } - # rule 3: system - if {[regexp -start $index_ -indices -line -nocase -- {\A(system)} $yy_current_buffer match] > 0 && \ + # rule 3: range + if {[regexp -start $index_ -indices -line -nocase -- {\A(range)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 3 } - # rule 4: transparency - if {[regexp -start $index_ -indices -line -nocase -- {\A(transparency)} $yy_current_buffer match] > 0 && \ + # rule 4: system + if {[regexp -start $index_ -indices -line -nocase -- {\A(system)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 4 } - # rule 5: \s - if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ + # rule 5: transparency + if {[regexp -start $index_ -indices -line -nocase -- {\A(transparency)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 5 } - # rule 6: . - if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + # rule 6: \s + if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 6 } + # rule 7: . + if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + [lindex $match 1] - $index_ + 1 > $yyleng} { + set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] + set yyleng [string length $yytext] + set matched_rule 7 + } if {$matched_rule == -1} { set yytext [string index $yy_current_buffer $index_] set yyleng 1 @@ -270,21 +277,24 @@ set TRANSPARENCY_ 261 return $COLOR_ } 1 { -return $MARK_ +return $COLOR_ } 2 { -return $RANGE_ +return $MARK_ } 3 { -return $SYSTEM_ +return $RANGE_ } 4 { -return $TRANSPARENCY_ +return $SYSTEM_ } 5 { -# ignore whitespace +return $TRANSPARENCY_ } 6 { +# ignore whitespace + } + 7 { set yylval $yytext; return $yylval } default diff --git a/ds9/parsers/plotlex.fcl b/ds9/parsers/plotlex.fcl index fb9b05f..cd0760f 100644 --- a/ds9/parsers/plotlex.fcl +++ b/ds9/parsers/plotlex.fcl @@ -25,6 +25,7 @@ circle {return $CIRCLE_} clear {return $CLEAR_} close {return $CLOSE_} color {return $COLOR_} +colour {return $COLOR_} column {return $COLUMN_} command {return $COMMAND_} cross {return $CROSS_} @@ -46,6 +47,7 @@ file {return $FILE_} filename {return $FILENAME_} fill {return $FILL_} fillcolor {return $FILLCOLOR_} +fillcolour {return $FILLCOLOR_} flat {return $FLAT_} flip {return $FLIP_} font {return $FONT_} diff --git a/ds9/parsers/plotlex.tcl b/ds9/parsers/plotlex.tcl index 6c001d0..ee27f69 100644 --- a/ds9/parsers/plotlex.tcl +++ b/ds9/parsers/plotlex.tcl @@ -482,1035 +482,1049 @@ set DEFLATE_ 412 set yyleng [string length $yytext] set matched_rule 17 } - # rule 18: column - if {[regexp -start $index_ -indices -line -nocase -- {\A(column)} $yy_current_buffer match] > 0 && \ + # rule 18: colour + if {[regexp -start $index_ -indices -line -nocase -- {\A(colour)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 18 } - # rule 19: command - if {[regexp -start $index_ -indices -line -nocase -- {\A(command)} $yy_current_buffer match] > 0 && \ + # rule 19: column + if {[regexp -start $index_ -indices -line -nocase -- {\A(column)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 19 } - # rule 20: cross - if {[regexp -start $index_ -indices -line -nocase -- {\A(cross)} $yy_current_buffer match] > 0 && \ + # rule 20: command + if {[regexp -start $index_ -indices -line -nocase -- {\A(command)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 20 } - # rule 21: cubic - if {[regexp -start $index_ -indices -line -nocase -- {\A(cubic)} $yy_current_buffer match] > 0 && \ + # rule 21: cross + if {[regexp -start $index_ -indices -line -nocase -- {\A(cross)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 21 } - # rule 22: dash - if {[regexp -start $index_ -indices -line -nocase -- {\A(dash)} $yy_current_buffer match] > 0 && \ + # rule 22: cubic + if {[regexp -start $index_ -indices -line -nocase -- {\A(cubic)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 22 } - # rule 23: data - if {[regexp -start $index_ -indices -line -nocase -- {\A(data)} $yy_current_buffer match] > 0 && \ + # rule 23: dash + if {[regexp -start $index_ -indices -line -nocase -- {\A(dash)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 23 } - # rule 24: dataset - if {[regexp -start $index_ -indices -line -nocase -- {\A(dataset)} $yy_current_buffer match] > 0 && \ + # rule 24: data + if {[regexp -start $index_ -indices -line -nocase -- {\A(data)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 24 } - # rule 25: delete - if {[regexp -start $index_ -indices -line -nocase -- {\A(delete)} $yy_current_buffer match] > 0 && \ + # rule 25: dataset + if {[regexp -start $index_ -indices -line -nocase -- {\A(dataset)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 25 } - # rule 26: destination - if {[regexp -start $index_ -indices -line -nocase -- {\A(destination)} $yy_current_buffer match] > 0 && \ + # rule 26: delete + if {[regexp -start $index_ -indices -line -nocase -- {\A(delete)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 26 } - # rule 27: diamond - if {[regexp -start $index_ -indices -line -nocase -- {\A(diamond)} $yy_current_buffer match] > 0 && \ + # rule 27: destination + if {[regexp -start $index_ -indices -line -nocase -- {\A(destination)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 27 } - # rule 28: discrete - if {[regexp -start $index_ -indices -line -nocase -- {\A(discrete)} $yy_current_buffer match] > 0 && \ + # rule 28: diamond + if {[regexp -start $index_ -indices -line -nocase -- {\A(diamond)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 28 } - # rule 29: dup - if {[regexp -start $index_ -indices -line -nocase -- {\A(dup)} $yy_current_buffer match] > 0 && \ + # rule 29: discrete + if {[regexp -start $index_ -indices -line -nocase -- {\A(discrete)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 29 } - # rule 30: duplicate - if {[regexp -start $index_ -indices -line -nocase -- {\A(duplicate)} $yy_current_buffer match] > 0 && \ + # rule 30: dup + if {[regexp -start $index_ -indices -line -nocase -- {\A(dup)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 30 } - # rule 31: error - if {[regexp -start $index_ -indices -line -nocase -- {\A(error)} $yy_current_buffer match] > 0 && \ + # rule 31: duplicate + if {[regexp -start $index_ -indices -line -nocase -- {\A(duplicate)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 31 } - # rule 32: errorbar - if {[regexp -start $index_ -indices -line -nocase -- {\A(errorbar)} $yy_current_buffer match] > 0 && \ + # rule 32: error + if {[regexp -start $index_ -indices -line -nocase -- {\A(error)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 32 } - # rule 33: export - if {[regexp -start $index_ -indices -line -nocase -- {\A(export)} $yy_current_buffer match] > 0 && \ + # rule 33: errorbar + if {[regexp -start $index_ -indices -line -nocase -- {\A(errorbar)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 33 } - # rule 34: family - if {[regexp -start $index_ -indices -line -nocase -- {\A(family)} $yy_current_buffer match] > 0 && \ + # rule 34: export + if {[regexp -start $index_ -indices -line -nocase -- {\A(export)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 34 } - # rule 35: file - if {[regexp -start $index_ -indices -line -nocase -- {\A(file)} $yy_current_buffer match] > 0 && \ + # rule 35: family + if {[regexp -start $index_ -indices -line -nocase -- {\A(family)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 35 } - # rule 36: filename - if {[regexp -start $index_ -indices -line -nocase -- {\A(filename)} $yy_current_buffer match] > 0 && \ + # rule 36: file + if {[regexp -start $index_ -indices -line -nocase -- {\A(file)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 36 } - # rule 37: fill - if {[regexp -start $index_ -indices -line -nocase -- {\A(fill)} $yy_current_buffer match] > 0 && \ + # rule 37: filename + if {[regexp -start $index_ -indices -line -nocase -- {\A(filename)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 37 } - # rule 38: fillcolor - if {[regexp -start $index_ -indices -line -nocase -- {\A(fillcolor)} $yy_current_buffer match] > 0 && \ + # rule 38: fill + if {[regexp -start $index_ -indices -line -nocase -- {\A(fill)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 38 } - # rule 39: flat - if {[regexp -start $index_ -indices -line -nocase -- {\A(flat)} $yy_current_buffer match] > 0 && \ + # rule 39: fillcolor + if {[regexp -start $index_ -indices -line -nocase -- {\A(fillcolor)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 39 } - # rule 40: flip - if {[regexp -start $index_ -indices -line -nocase -- {\A(flip)} $yy_current_buffer match] > 0 && \ + # rule 40: fillcolour + if {[regexp -start $index_ -indices -line -nocase -- {\A(fillcolour)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 40 } - # rule 41: font - if {[regexp -start $index_ -indices -line -nocase -- {\A(font)} $yy_current_buffer match] > 0 && \ + # rule 41: flat + if {[regexp -start $index_ -indices -line -nocase -- {\A(flat)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 41 } - # rule 42: format - if {[regexp -start $index_ -indices -line -nocase -- {\A(format)} $yy_current_buffer match] > 0 && \ + # rule 42: flip + if {[regexp -start $index_ -indices -line -nocase -- {\A(flip)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 42 } - # rule 43: graph - if {[regexp -start $index_ -indices -line -nocase -- {\A(graph)} $yy_current_buffer match] > 0 && \ + # rule 43: font + if {[regexp -start $index_ -indices -line -nocase -- {\A(font)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 43 } - # rule 44: gray - if {[regexp -start $index_ -indices -line -nocase -- {\A(gray)} $yy_current_buffer match] > 0 && \ + # rule 44: format + if {[regexp -start $index_ -indices -line -nocase -- {\A(format)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 44 } - # rule 45: grid - if {[regexp -start $index_ -indices -line -nocase -- {\A(grid)} $yy_current_buffer match] > 0 && \ + # rule 45: graph + if {[regexp -start $index_ -indices -line -nocase -- {\A(graph)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 45 } - # rule 46: groove - if {[regexp -start $index_ -indices -line -nocase -- {\A(groove)} $yy_current_buffer match] > 0 && \ + # rule 46: gray + if {[regexp -start $index_ -indices -line -nocase -- {\A(gray)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 46 } - # rule 47: labels - if {[regexp -start $index_ -indices -line -nocase -- {\A(labels)} $yy_current_buffer match] > 0 && \ + # rule 47: grid + if {[regexp -start $index_ -indices -line -nocase -- {\A(grid)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 47 } - # rule 48: landscape - if {[regexp -start $index_ -indices -line -nocase -- {\A(landscape)} $yy_current_buffer match] > 0 && \ + # rule 48: groove + if {[regexp -start $index_ -indices -line -nocase -- {\A(groove)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 48 } - # rule 49: layout - if {[regexp -start $index_ -indices -line -nocase -- {\A(layout)} $yy_current_buffer match] > 0 && \ + # rule 49: labels + if {[regexp -start $index_ -indices -line -nocase -- {\A(labels)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 49 } - # rule 50: left - if {[regexp -start $index_ -indices -line -nocase -- {\A(left)} $yy_current_buffer match] > 0 && \ + # rule 50: landscape + if {[regexp -start $index_ -indices -line -nocase -- {\A(landscape)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 50 } - # rule 51: legal - if {[regexp -start $index_ -indices -line -nocase -- {\A(legal)} $yy_current_buffer match] > 0 && \ + # rule 51: layout + if {[regexp -start $index_ -indices -line -nocase -- {\A(layout)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 51 } - # rule 52: legend - if {[regexp -start $index_ -indices -line -nocase -- {\A(legend)} $yy_current_buffer match] > 0 && \ + # rule 52: left + if {[regexp -start $index_ -indices -line -nocase -- {\A(left)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 52 } - # rule 53: legendtitle - if {[regexp -start $index_ -indices -line -nocase -- {\A(legendtitle)} $yy_current_buffer match] > 0 && \ + # rule 53: legal + if {[regexp -start $index_ -indices -line -nocase -- {\A(legal)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 53 } - # rule 54: letter - if {[regexp -start $index_ -indices -line -nocase -- {\A(letter)} $yy_current_buffer match] > 0 && \ + # rule 54: legend + if {[regexp -start $index_ -indices -line -nocase -- {\A(legend)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 54 } - # rule 55: line - if {[regexp -start $index_ -indices -line -nocase -- {\A(line)} $yy_current_buffer match] > 0 && \ + # rule 55: legendtitle + if {[regexp -start $index_ -indices -line -nocase -- {\A(legendtitle)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 55 } - # rule 56: linear - if {[regexp -start $index_ -indices -line -nocase -- {\A(linear)} $yy_current_buffer match] > 0 && \ + # rule 56: letter + if {[regexp -start $index_ -indices -line -nocase -- {\A(letter)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 56 } - # rule 57: list - if {[regexp -start $index_ -indices -line -nocase -- {\A(list)} $yy_current_buffer match] > 0 && \ + # rule 57: line + if {[regexp -start $index_ -indices -line -nocase -- {\A(line)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 57 } - # rule 58: load - if {[regexp -start $index_ -indices -line -nocase -- {\A(load)} $yy_current_buffer match] > 0 && \ + # rule 58: linear + if {[regexp -start $index_ -indices -line -nocase -- {\A(linear)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 58 } - # rule 59: loadconfig - if {[regexp -start $index_ -indices -line -nocase -- {\A(loadconfig)} $yy_current_buffer match] > 0 && \ + # rule 59: list + if {[regexp -start $index_ -indices -line -nocase -- {\A(list)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 59 } - # rule 60: log - if {[regexp -start $index_ -indices -line -nocase -- {\A(log)} $yy_current_buffer match] > 0 && \ + # rule 60: load + if {[regexp -start $index_ -indices -line -nocase -- {\A(load)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 60 } - # rule 61: max - if {[regexp -start $index_ -indices -line -nocase -- {\A(max)} $yy_current_buffer match] > 0 && \ + # rule 61: loadconfig + if {[regexp -start $index_ -indices -line -nocase -- {\A(loadconfig)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 61 } - # rule 62: min - if {[regexp -start $index_ -indices -line -nocase -- {\A(min)} $yy_current_buffer match] > 0 && \ + # rule 62: log + if {[regexp -start $index_ -indices -line -nocase -- {\A(log)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 62 } - # rule 63: mode - if {[regexp -start $index_ -indices -line -nocase -- {\A(mode)} $yy_current_buffer match] > 0 && \ + # rule 63: max + if {[regexp -start $index_ -indices -line -nocase -- {\A(max)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 63 } - # rule 64: name - if {[regexp -start $index_ -indices -line -nocase -- {\A(name)} $yy_current_buffer match] > 0 && \ + # rule 64: min + if {[regexp -start $index_ -indices -line -nocase -- {\A(min)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 64 } - # rule 65: none - if {[regexp -start $index_ -indices -line -nocase -- {\A(none)} $yy_current_buffer match] > 0 && \ + # rule 65: mode + if {[regexp -start $index_ -indices -line -nocase -- {\A(mode)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 65 } - # rule 66: normal - if {[regexp -start $index_ -indices -line -nocase -- {\A(normal)} $yy_current_buffer match] > 0 && \ + # rule 66: name + if {[regexp -start $index_ -indices -line -nocase -- {\A(name)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 66 } - # rule 67: new - if {[regexp -start $index_ -indices -line -nocase -- {\A(new)} $yy_current_buffer match] > 0 && \ + # rule 67: none + if {[regexp -start $index_ -indices -line -nocase -- {\A(none)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 67 } - # rule 68: numbers - if {[regexp -start $index_ -indices -line -nocase -- {\A(numbers)} $yy_current_buffer match] > 0 && \ + # rule 68: normal + if {[regexp -start $index_ -indices -line -nocase -- {\A(normal)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 68 } - # rule 69: orient - if {[regexp -start $index_ -indices -line -nocase -- {\A(orient)} $yy_current_buffer match] > 0 && \ + # rule 69: new + if {[regexp -start $index_ -indices -line -nocase -- {\A(new)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 69 } - # rule 70: orientation - if {[regexp -start $index_ -indices -line -nocase -- {\A(orientation)} $yy_current_buffer match] > 0 && \ + # rule 70: numbers + if {[regexp -start $index_ -indices -line -nocase -- {\A(numbers)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 70 } - # rule 71: overlap - if {[regexp -start $index_ -indices -line -nocase -- {\A(overlap)} $yy_current_buffer match] > 0 && \ + # rule 71: orient + if {[regexp -start $index_ -indices -line -nocase -- {\A(orient)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 71 } - # rule 72: page - if {[regexp -start $index_ -indices -line -nocase -- {\A(page)} $yy_current_buffer match] > 0 && \ + # rule 72: orientation + if {[regexp -start $index_ -indices -line -nocase -- {\A(orientation)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 72 } - # rule 73: pagesetup - if {[regexp -start $index_ -indices -line -nocase -- {\A(pagesetup)} $yy_current_buffer match] > 0 && \ + # rule 73: overlap + if {[regexp -start $index_ -indices -line -nocase -- {\A(overlap)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 73 } - # rule 74: pagesize - if {[regexp -start $index_ -indices -line -nocase -- {\A(pagesize)} $yy_current_buffer match] > 0 && \ + # rule 74: page + if {[regexp -start $index_ -indices -line -nocase -- {\A(page)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 74 } - # rule 75: palette - if {[regexp -start $index_ -indices -line -nocase -- {\A(palette)} $yy_current_buffer match] > 0 && \ + # rule 75: pagesetup + if {[regexp -start $index_ -indices -line -nocase -- {\A(pagesetup)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 75 } - # rule 76: plus - if {[regexp -start $index_ -indices -line -nocase -- {\A(plus)} $yy_current_buffer match] > 0 && \ + # rule 76: pagesize + if {[regexp -start $index_ -indices -line -nocase -- {\A(pagesize)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 76 } - # rule 77: pointer - if {[regexp -start $index_ -indices -line -nocase -- {\A(pointer)} $yy_current_buffer match] > 0 && \ + # rule 77: palette + if {[regexp -start $index_ -indices -line -nocase -- {\A(palette)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 77 } - # rule 78: portrait - if {[regexp -start $index_ -indices -line -nocase -- {\A(portrait)} $yy_current_buffer match] > 0 && \ + # rule 78: plus + if {[regexp -start $index_ -indices -line -nocase -- {\A(plus)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 78 } - # rule 79: position - if {[regexp -start $index_ -indices -line -nocase -- {\A(position)} $yy_current_buffer match] > 0 && \ + # rule 79: pointer + if {[regexp -start $index_ -indices -line -nocase -- {\A(pointer)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 79 } - # rule 80: poster - if {[regexp -start $index_ -indices -line -nocase -- {\A(poster)} $yy_current_buffer match] > 0 && \ + # rule 80: portrait + if {[regexp -start $index_ -indices -line -nocase -- {\A(portrait)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 80 } - # rule 81: print - if {[regexp -start $index_ -indices -line -nocase -- {\A(print)} $yy_current_buffer match] > 0 && \ + # rule 81: position + if {[regexp -start $index_ -indices -line -nocase -- {\A(position)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 81 } - # rule 82: printer - if {[regexp -start $index_ -indices -line -nocase -- {\A(printer)} $yy_current_buffer match] > 0 && \ + # rule 82: poster + if {[regexp -start $index_ -indices -line -nocase -- {\A(poster)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 82 } - # rule 83: quadratic - if {[regexp -start $index_ -indices -line -nocase -- {\A(quadratic)} $yy_current_buffer match] > 0 && \ + # rule 83: print + if {[regexp -start $index_ -indices -line -nocase -- {\A(print)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 83 } - # rule 84: raised - if {[regexp -start $index_ -indices -line -nocase -- {\A(raised)} $yy_current_buffer match] > 0 && \ + # rule 84: printer + if {[regexp -start $index_ -indices -line -nocase -- {\A(printer)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 84 } - # rule 85: range - if {[regexp -start $index_ -indices -line -nocase -- {\A(range)} $yy_current_buffer match] > 0 && \ + # rule 85: quadratic + if {[regexp -start $index_ -indices -line -nocase -- {\A(quadratic)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 85 } - # rule 86: relief - if {[regexp -start $index_ -indices -line -nocase -- {\A(relief)} $yy_current_buffer match] > 0 && \ + # rule 86: raised + if {[regexp -start $index_ -indices -line -nocase -- {\A(raised)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 86 } - # rule 87: rgb - if {[regexp -start $index_ -indices -line -nocase -- {\A(rgb)} $yy_current_buffer match] > 0 && \ + # rule 87: range + if {[regexp -start $index_ -indices -line -nocase -- {\A(range)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 87 } - # rule 88: right - if {[regexp -start $index_ -indices -line -nocase -- {\A(right)} $yy_current_buffer match] > 0 && \ + # rule 88: relief + if {[regexp -start $index_ -indices -line -nocase -- {\A(relief)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 88 } - # rule 89: row - if {[regexp -start $index_ -indices -line -nocase -- {\A(row)} $yy_current_buffer match] > 0 && \ + # rule 89: rgb + if {[regexp -start $index_ -indices -line -nocase -- {\A(rgb)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 89 } - # rule 90: save - if {[regexp -start $index_ -indices -line -nocase -- {\A(save)} $yy_current_buffer match] > 0 && \ + # rule 90: right + if {[regexp -start $index_ -indices -line -nocase -- {\A(right)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 90 } - # rule 91: saveconfig - if {[regexp -start $index_ -indices -line -nocase -- {\A(saveconfig)} $yy_current_buffer match] > 0 && \ + # rule 91: row + if {[regexp -start $index_ -indices -line -nocase -- {\A(row)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 91 } - # rule 92: scale - if {[regexp -start $index_ -indices -line -nocase -- {\A(scale)} $yy_current_buffer match] > 0 && \ + # rule 92: save + if {[regexp -start $index_ -indices -line -nocase -- {\A(save)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 92 } - # rule 93: scatter - if {[regexp -start $index_ -indices -line -nocase -- {\A(scatter)} $yy_current_buffer match] > 0 && \ + # rule 93: saveconfig + if {[regexp -start $index_ -indices -line -nocase -- {\A(saveconfig)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 93 } - # rule 94: scross - if {[regexp -start $index_ -indices -line -nocase -- {\A(scross)} $yy_current_buffer match] > 0 && \ + # rule 94: scale + if {[regexp -start $index_ -indices -line -nocase -- {\A(scale)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 94 } - # rule 95: select - if {[regexp -start $index_ -indices -line -nocase -- {\A(select)} $yy_current_buffer match] > 0 && \ + # rule 95: scatter + if {[regexp -start $index_ -indices -line -nocase -- {\A(scatter)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 95 } - # rule 96: shape - if {[regexp -start $index_ -indices -line -nocase -- {\A(shape)} $yy_current_buffer match] > 0 && \ + # rule 96: scross + if {[regexp -start $index_ -indices -line -nocase -- {\A(scross)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 96 } - # rule 97: show - if {[regexp -start $index_ -indices -line -nocase -- {\A(show)} $yy_current_buffer match] > 0 && \ + # rule 97: select + if {[regexp -start $index_ -indices -line -nocase -- {\A(select)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 97 } - # rule 98: size - if {[regexp -start $index_ -indices -line -nocase -- {\A(size)} $yy_current_buffer match] > 0 && \ + # rule 98: shape + if {[regexp -start $index_ -indices -line -nocase -- {\A(shape)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 98 } - # rule 99: slant - if {[regexp -start $index_ -indices -line -nocase -- {\A(slant)} $yy_current_buffer match] > 0 && \ + # rule 99: show + if {[regexp -start $index_ -indices -line -nocase -- {\A(show)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 99 } - # rule 100: smooth - if {[regexp -start $index_ -indices -line -nocase -- {\A(smooth)} $yy_current_buffer match] > 0 && \ + # rule 100: size + if {[regexp -start $index_ -indices -line -nocase -- {\A(size)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 100 } - # rule 101: solid - if {[regexp -start $index_ -indices -line -nocase -- {\A(solid)} $yy_current_buffer match] > 0 && \ + # rule 101: slant + if {[regexp -start $index_ -indices -line -nocase -- {\A(slant)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 101 } - # rule 102: splus - if {[regexp -start $index_ -indices -line -nocase -- {\A(splus)} $yy_current_buffer match] > 0 && \ + # rule 102: smooth + if {[regexp -start $index_ -indices -line -nocase -- {\A(smooth)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 102 } - # rule 103: square - if {[regexp -start $index_ -indices -line -nocase -- {\A(square)} $yy_current_buffer match] > 0 && \ + # rule 103: solid + if {[regexp -start $index_ -indices -line -nocase -- {\A(solid)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 103 } - # rule 104: stacked - if {[regexp -start $index_ -indices -line -nocase -- {\A(stacked)} $yy_current_buffer match] > 0 && \ + # rule 104: splus + if {[regexp -start $index_ -indices -line -nocase -- {\A(splus)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 104 } - # rule 105: stats - if {[regexp -start $index_ -indices -line -nocase -- {\A(stats)} $yy_current_buffer match] > 0 && \ + # rule 105: square + if {[regexp -start $index_ -indices -line -nocase -- {\A(square)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 105 } - # rule 106: statistics - if {[regexp -start $index_ -indices -line -nocase -- {\A(statistics)} $yy_current_buffer match] > 0 && \ + # rule 106: stacked + if {[regexp -start $index_ -indices -line -nocase -- {\A(stacked)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 106 } - # rule 107: stdin - if {[regexp -start $index_ -indices -line -nocase -- {\A(stdin)} $yy_current_buffer match] > 0 && \ + # rule 107: stats + if {[regexp -start $index_ -indices -line -nocase -- {\A(stats)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 107 } - # rule 108: step - if {[regexp -start $index_ -indices -line -nocase -- {\A(step)} $yy_current_buffer match] > 0 && \ + # rule 108: statistics + if {[regexp -start $index_ -indices -line -nocase -- {\A(statistics)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 108 } - # rule 109: strip - if {[regexp -start $index_ -indices -line -nocase -- {\A(strip)} $yy_current_buffer match] > 0 && \ + # rule 109: stdin + if {[regexp -start $index_ -indices -line -nocase -- {\A(stdin)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 109 } - # rule 110: style - if {[regexp -start $index_ -indices -line -nocase -- {\A(style)} $yy_current_buffer match] > 0 && \ + # rule 110: step + if {[regexp -start $index_ -indices -line -nocase -- {\A(step)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 110 } - # rule 111: sunken - if {[regexp -start $index_ -indices -line -nocase -- {\A(sunken)} $yy_current_buffer match] > 0 && \ + # rule 111: strip + if {[regexp -start $index_ -indices -line -nocase -- {\A(strip)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 111 } - # rule 112: tabloid - if {[regexp -start $index_ -indices -line -nocase -- {\A(tabloid)} $yy_current_buffer match] > 0 && \ + # rule 112: style + if {[regexp -start $index_ -indices -line -nocase -- {\A(style)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 112 } - # rule 113: title - if {[regexp -start $index_ -indices -line -nocase -- {\A(title)} $yy_current_buffer match] > 0 && \ + # rule 113: sunken + if {[regexp -start $index_ -indices -line -nocase -- {\A(sunken)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 113 } - # rule 114: top - if {[regexp -start $index_ -indices -line -nocase -- {\A(top)} $yy_current_buffer match] > 0 && \ + # rule 114: tabloid + if {[regexp -start $index_ -indices -line -nocase -- {\A(tabloid)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 114 } - # rule 115: triangle - if {[regexp -start $index_ -indices -line -nocase -- {\A(triangle)} $yy_current_buffer match] > 0 && \ + # rule 115: title + if {[regexp -start $index_ -indices -line -nocase -- {\A(title)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 115 } - # rule 116: type - if {[regexp -start $index_ -indices -line -nocase -- {\A(type)} $yy_current_buffer match] > 0 && \ + # rule 116: top + if {[regexp -start $index_ -indices -line -nocase -- {\A(top)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 116 } - # rule 117: view - if {[regexp -start $index_ -indices -line -nocase -- {\A(view)} $yy_current_buffer match] > 0 && \ + # rule 117: triangle + if {[regexp -start $index_ -indices -line -nocase -- {\A(triangle)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 117 } - # rule 118: weight - if {[regexp -start $index_ -indices -line -nocase -- {\A(weight)} $yy_current_buffer match] > 0 && \ + # rule 118: type + if {[regexp -start $index_ -indices -line -nocase -- {\A(type)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 118 } - # rule 119: width - if {[regexp -start $index_ -indices -line -nocase -- {\A(width)} $yy_current_buffer match] > 0 && \ + # rule 119: view + if {[regexp -start $index_ -indices -line -nocase -- {\A(view)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 119 } - # rule 120: zoom - if {[regexp -start $index_ -indices -line -nocase -- {\A(zoom)} $yy_current_buffer match] > 0 && \ + # rule 120: weight + if {[regexp -start $index_ -indices -line -nocase -- {\A(weight)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 120 } - # rule 121: xy - if {[regexp -start $index_ -indices -line -nocase -- {\A(xy)} $yy_current_buffer match] > 0 && \ + # rule 121: width + if {[regexp -start $index_ -indices -line -nocase -- {\A(width)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 121 } - # rule 122: xyex - if {[regexp -start $index_ -indices -line -nocase -- {\A(xyex)} $yy_current_buffer match] > 0 && \ + # rule 122: zoom + if {[regexp -start $index_ -indices -line -nocase -- {\A(zoom)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 122 } - # rule 123: xyey - if {[regexp -start $index_ -indices -line -nocase -- {\A(xyey)} $yy_current_buffer match] > 0 && \ + # rule 123: xy + if {[regexp -start $index_ -indices -line -nocase -- {\A(xy)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 123 } - # rule 124: xyexey - if {[regexp -start $index_ -indices -line -nocase -- {\A(xyexey)} $yy_current_buffer match] > 0 && \ + # rule 124: xyex + if {[regexp -start $index_ -indices -line -nocase -- {\A(xyex)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 124 } - # rule 125: linearlinear - if {[regexp -start $index_ -indices -line -nocase -- {\A(linearlinear)} $yy_current_buffer match] > 0 && \ + # rule 125: xyey + if {[regexp -start $index_ -indices -line -nocase -- {\A(xyey)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 125 } - # rule 126: loglinear - if {[regexp -start $index_ -indices -line -nocase -- {\A(loglinear)} $yy_current_buffer match] > 0 && \ + # rule 126: xyexey + if {[regexp -start $index_ -indices -line -nocase -- {\A(xyexey)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 126 } - # rule 127: linearlog - if {[regexp -start $index_ -indices -line -nocase -- {\A(linearlog)} $yy_current_buffer match] > 0 && \ + # rule 127: linearlinear + if {[regexp -start $index_ -indices -line -nocase -- {\A(linearlinear)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 127 } - # rule 128: loglog - if {[regexp -start $index_ -indices -line -nocase -- {\A(loglog)} $yy_current_buffer match] > 0 && \ + # rule 128: loglinear + if {[regexp -start $index_ -indices -line -nocase -- {\A(loglinear)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 128 } - # rule 129: xaxis - if {[regexp -start $index_ -indices -line -nocase -- {\A(xaxis)} $yy_current_buffer match] > 0 && \ + # rule 129: linearlog + if {[regexp -start $index_ -indices -line -nocase -- {\A(linearlog)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 129 } - # rule 130: yaxis - if {[regexp -start $index_ -indices -line -nocase -- {\A(yaxis)} $yy_current_buffer match] > 0 && \ + # rule 130: loglog + if {[regexp -start $index_ -indices -line -nocase -- {\A(loglog)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 130 } - # rule 131: gif - if {[regexp -start $index_ -indices -line -nocase -- {\A(gif)} $yy_current_buffer match] > 0 && \ + # rule 131: xaxis + if {[regexp -start $index_ -indices -line -nocase -- {\A(xaxis)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 131 } - # rule 132: tiff - if {[regexp -start $index_ -indices -line -nocase -- {\A(tiff)} $yy_current_buffer match] > 0 && \ + # rule 132: yaxis + if {[regexp -start $index_ -indices -line -nocase -- {\A(yaxis)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 132 } - # rule 133: jpeg - if {[regexp -start $index_ -indices -line -nocase -- {\A(jpeg)} $yy_current_buffer match] > 0 && \ + # rule 133: gif + if {[regexp -start $index_ -indices -line -nocase -- {\A(gif)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 133 } - # rule 134: png - if {[regexp -start $index_ -indices -line -nocase -- {\A(png)} $yy_current_buffer match] > 0 && \ + # rule 134: tiff + if {[regexp -start $index_ -indices -line -nocase -- {\A(tiff)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 134 } - # rule 135: none - if {[regexp -start $index_ -indices -line -nocase -- {\A(none)} $yy_current_buffer match] > 0 && \ + # rule 135: jpeg + if {[regexp -start $index_ -indices -line -nocase -- {\A(jpeg)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 135 } - # rule 136: packbits - if {[regexp -start $index_ -indices -line -nocase -- {\A(packbits)} $yy_current_buffer match] > 0 && \ + # rule 136: png + if {[regexp -start $index_ -indices -line -nocase -- {\A(png)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 136 } - # rule 137: deflate - if {[regexp -start $index_ -indices -line -nocase -- {\A(deflate)} $yy_current_buffer match] > 0 && \ + # rule 137: none + if {[regexp -start $index_ -indices -line -nocase -- {\A(none)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 137 } - # rule 138: yes - if {[regexp -start $index_ -indices -line -nocase -- {\A(yes)} $yy_current_buffer match] > 0 && \ + # rule 138: packbits + if {[regexp -start $index_ -indices -line -nocase -- {\A(packbits)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 138 } - # rule 139: no - if {[regexp -start $index_ -indices -line -nocase -- {\A(no)} $yy_current_buffer match] > 0 && \ + # rule 139: deflate + if {[regexp -start $index_ -indices -line -nocase -- {\A(deflate)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 139 } - # rule 140: on - if {[regexp -start $index_ -indices -line -nocase -- {\A(on)} $yy_current_buffer match] > 0 && \ + # rule 140: yes + if {[regexp -start $index_ -indices -line -nocase -- {\A(yes)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 140 } - # rule 141: off - if {[regexp -start $index_ -indices -line -nocase -- {\A(off)} $yy_current_buffer match] > 0 && \ + # rule 141: no + if {[regexp -start $index_ -indices -line -nocase -- {\A(no)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 141 } - # rule 142: true - if {[regexp -start $index_ -indices -line -nocase -- {\A(true)} $yy_current_buffer match] > 0 && \ + # rule 142: on + if {[regexp -start $index_ -indices -line -nocase -- {\A(on)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 142 } - # rule 143: false - if {[regexp -start $index_ -indices -line -nocase -- {\A(false)} $yy_current_buffer match] > 0 && \ + # rule 143: off + if {[regexp -start $index_ -indices -line -nocase -- {\A(off)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 143 } - # rule 144: font - if {[regexp -start $index_ -indices -line -nocase -- {\A(font)} $yy_current_buffer match] > 0 && \ + # rule 144: true + if {[regexp -start $index_ -indices -line -nocase -- {\A(true)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 144 } - # rule 145: fontsize - if {[regexp -start $index_ -indices -line -nocase -- {\A(fontsize)} $yy_current_buffer match] > 0 && \ + # rule 145: false + if {[regexp -start $index_ -indices -line -nocase -- {\A(false)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 145 } - # rule 146: fontslant - if {[regexp -start $index_ -indices -line -nocase -- {\A(fontslant)} $yy_current_buffer match] > 0 && \ + # rule 146: font + if {[regexp -start $index_ -indices -line -nocase -- {\A(font)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 146 } - # rule 147: fontstyle - if {[regexp -start $index_ -indices -line -nocase -- {\A(fontstyle)} $yy_current_buffer match] > 0 && \ + # rule 147: fontsize + if {[regexp -start $index_ -indices -line -nocase -- {\A(fontsize)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 147 } - # rule 148: fontweight - if {[regexp -start $index_ -indices -line -nocase -- {\A(fontweight)} $yy_current_buffer match] > 0 && \ + # rule 148: fontslant + if {[regexp -start $index_ -indices -line -nocase -- {\A(fontslant)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 148 } - # rule 149: times - if {[regexp -start $index_ -indices -line -nocase -- {\A(times)} $yy_current_buffer match] > 0 && \ + # rule 149: fontstyle + if {[regexp -start $index_ -indices -line -nocase -- {\A(fontstyle)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 149 } - # rule 150: helvetica - if {[regexp -start $index_ -indices -line -nocase -- {\A(helvetica)} $yy_current_buffer match] > 0 && \ + # rule 150: fontweight + if {[regexp -start $index_ -indices -line -nocase -- {\A(fontweight)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 150 } - # rule 151: courier - if {[regexp -start $index_ -indices -line -nocase -- {\A(courier)} $yy_current_buffer match] > 0 && \ + # rule 151: times + if {[regexp -start $index_ -indices -line -nocase -- {\A(times)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 151 } - # rule 152: normal - if {[regexp -start $index_ -indices -line -nocase -- {\A(normal)} $yy_current_buffer match] > 0 && \ + # rule 152: helvetica + if {[regexp -start $index_ -indices -line -nocase -- {\A(helvetica)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 152 } - # rule 153: bold - if {[regexp -start $index_ -indices -line -nocase -- {\A(bold)} $yy_current_buffer match] > 0 && \ + # rule 153: courier + if {[regexp -start $index_ -indices -line -nocase -- {\A(courier)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 153 } - # rule 154: roman - if {[regexp -start $index_ -indices -line -nocase -- {\A(roman)} $yy_current_buffer match] > 0 && \ + # rule 154: normal + if {[regexp -start $index_ -indices -line -nocase -- {\A(normal)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 154 } - # rule 155: italic - if {[regexp -start $index_ -indices -line -nocase -- {\A(italic)} $yy_current_buffer match] > 0 && \ + # rule 155: bold + if {[regexp -start $index_ -indices -line -nocase -- {\A(bold)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 155 } - # rule 156: [+-]?{D}+ - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+)} $yy_current_buffer match] > 0 && \ + # rule 156: roman + if {[regexp -start $index_ -indices -line -nocase -- {\A(roman)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 156 } - # rule 157: [+-]?{D}+\.?({E})? - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+\.?(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ + # rule 157: italic + if {[regexp -start $index_ -indices -line -nocase -- {\A(italic)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 157 } - # rule 158: [+-]?{D}*\.{D}+({E})? - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])*\.([0-9])+(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ + # rule 158: [+-]?{D}+ + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 158 } - # rule 159: \"[^\"]*\" - if {[regexp -start $index_ -indices -line -nocase -- {\A(\"[^\"]*\")} $yy_current_buffer match] > 0 && \ + # rule 159: [+-]?{D}+\.?({E})? + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+\.?(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 159 } - # rule 160: \'[^\']*\' - if {[regexp -start $index_ -indices -line -nocase -- {\A(\'[^\']*\')} $yy_current_buffer match] > 0 && \ + # rule 160: [+-]?{D}*\.{D}+({E})? + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])*\.([0-9])+(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 160 } - # rule 161: \{[^\}]*\} - if {[regexp -start $index_ -indices -line -nocase -- {\A(\{[^\}]*\})} $yy_current_buffer match] > 0 && \ + # rule 161: \"[^\"]*\" + if {[regexp -start $index_ -indices -line -nocase -- {\A(\"[^\"]*\")} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 161 } - # rule 162: \S+\S+ - if {[regexp -start $index_ -indices -line -nocase -- {\A(\S+\S+)} $yy_current_buffer match] > 0 && \ + # rule 162: \'[^\']*\' + if {[regexp -start $index_ -indices -line -nocase -- {\A(\'[^\']*\')} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 162 } - # rule 163: \s - if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ + # rule 163: \{[^\}]*\} + if {[regexp -start $index_ -indices -line -nocase -- {\A(\{[^\}]*\})} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 163 } - # rule 164: . - if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + # rule 164: \S+\S+ + if {[regexp -start $index_ -indices -line -nocase -- {\A(\S+\S+)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 164 } + # rule 165: \s + if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ + [lindex $match 1] - $index_ + 1 > $yyleng} { + set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] + set yyleng [string length $yytext] + set matched_rule 165 + } + # rule 166: . + if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + [lindex $match 1] - $index_ + 1 > $yyleng} { + set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] + set yyleng [string length $yytext] + set matched_rule 166 + } if {$matched_rule == -1} { set yytext [string index $yy_current_buffer $index_] set yyleng 1 @@ -1578,442 +1592,448 @@ return $CLOSE_ return $COLOR_ } 18 { -return $COLUMN_ +return $COLOR_ } 19 { -return $COMMAND_ +return $COLUMN_ } 20 { -return $CROSS_ +return $COMMAND_ } 21 { -return $CUBIC_ +return $CROSS_ } 22 { -return $DASH_ +return $CUBIC_ } 23 { -return $DATA_ +return $DASH_ } 24 { -return $DATASET_ +return $DATA_ } 25 { -return $DELETE_ +return $DATASET_ } 26 { -return $DESTINATION_ +return $DELETE_ } 27 { -return $DIAMOND_ +return $DESTINATION_ } 28 { -return $DISCRETE_ +return $DIAMOND_ } 29 { -return $DUP_ +return $DISCRETE_ } 30 { -return $DUPLICATE_ +return $DUP_ } 31 { -return $ERROR_ +return $DUPLICATE_ } 32 { -return $ERRORBAR_ +return $ERROR_ } 33 { -return $EXPORT_ +return $ERRORBAR_ } 34 { -return $FAMILY_ +return $EXPORT_ } 35 { -return $FILE_ +return $FAMILY_ } 36 { -return $FILENAME_ +return $FILE_ } 37 { -return $FILL_ +return $FILENAME_ } 38 { -return $FILLCOLOR_ +return $FILL_ } 39 { -return $FLAT_ +return $FILLCOLOR_ } 40 { -return $FLIP_ +return $FILLCOLOR_ } 41 { -return $FONT_ +return $FLAT_ } 42 { -return $FORMAT_ +return $FLIP_ } 43 { -return $GRAPH_ +return $FONT_ } 44 { -return $GRAY_ +return $FORMAT_ } 45 { -return $GRID_ +return $GRAPH_ } 46 { -return $GROOVE_ +return $GRAY_ } 47 { -return $LABELS_ +return $GRID_ } 48 { -return $LANDSCAPE_ +return $GROOVE_ } 49 { -return $LAYOUT_ +return $LABELS_ } 50 { -return $LEFT_ +return $LANDSCAPE_ } 51 { -return $LEGAL_ +return $LAYOUT_ } 52 { -return $LEGEND_ +return $LEFT_ } 53 { -return $LEGENDTITLE_ +return $LEGAL_ } 54 { -return $LETTER_ +return $LEGEND_ } 55 { -return $LINE_ +return $LEGENDTITLE_ } 56 { -return $LINEAR_ +return $LETTER_ } 57 { -return $LIST_ +return $LINE_ } 58 { -return $LOAD_ +return $LINEAR_ } 59 { -return $LOADCONFIG_ +return $LIST_ } 60 { -return $LOG_ +return $LOAD_ } 61 { -return $MAX_ +return $LOADCONFIG_ } 62 { -return $MIN_ +return $LOG_ } 63 { -return $MODE_ +return $MAX_ } 64 { -return $NAME_ +return $MIN_ } 65 { -return $NONE_ +return $MODE_ } 66 { -return $NORMAL_ +return $NAME_ } 67 { -return $NEW_ +return $NONE_ } 68 { -return $NUMBERS_ +return $NORMAL_ } 69 { -return $ORIENT_ +return $NEW_ } 70 { -return $ORIENTATION_ +return $NUMBERS_ } 71 { -return $OVERLAP_ +return $ORIENT_ } 72 { -return $PAGE_ +return $ORIENTATION_ } 73 { -return $PAGESETUP_ +return $OVERLAP_ } 74 { -return $PAGESIZE_ +return $PAGE_ } 75 { -return $PALETTE_ +return $PAGESETUP_ } 76 { -return $PLUS_ +return $PAGESIZE_ } 77 { -return $POINTER_ +return $PALETTE_ } 78 { -return $PORTRAIT_ +return $PLUS_ } 79 { -return $POSITION_ +return $POINTER_ } 80 { -return $POSTER_ +return $PORTRAIT_ } 81 { -return $PRINT_ +return $POSITION_ } 82 { -return $PRINTER_ +return $POSTER_ } 83 { -return $QUADRATIC_ +return $PRINT_ } 84 { -return $RAISED_ +return $PRINTER_ } 85 { -return $RANGE_ +return $QUADRATIC_ } 86 { -return $RELIEF_ +return $RAISED_ } 87 { -return $RGB_ +return $RANGE_ } 88 { -return $RIGHT_ +return $RELIEF_ } 89 { -return $ROW_ +return $RGB_ } 90 { -return $SAVE_ +return $RIGHT_ } 91 { -return $SAVECONFIG_ +return $ROW_ } 92 { -return $SCALE_ +return $SAVE_ } 93 { -return $SCATTER_ +return $SAVECONFIG_ } 94 { -return $SCROSS_ +return $SCALE_ } 95 { -return $SELECT_ +return $SCATTER_ } 96 { -return $SHAPE_ +return $SCROSS_ } 97 { -return $SHOW_ +return $SELECT_ } 98 { -return $SIZE_ +return $SHAPE_ } 99 { -return $SLANT_ +return $SHOW_ } 100 { -return $SMOOTH_ +return $SIZE_ } 101 { -return $SOLID_ +return $SLANT_ } 102 { -return $SPLUS_ +return $SMOOTH_ } 103 { -return $SQUARE_ +return $SOLID_ } 104 { -return $STACKED_ +return $SPLUS_ } 105 { -return $STATS_ +return $SQUARE_ } 106 { -return $STATISTICS_ +return $STACKED_ } 107 { -return $STDIN_ +return $STATS_ } 108 { -return $STEP_ +return $STATISTICS_ } 109 { -return $STRIP_ +return $STDIN_ } 110 { -return $STYLE_ +return $STEP_ } 111 { -return $SUNKEN_ +return $STRIP_ } 112 { -return $TABLOID_ +return $STYLE_ } 113 { -return $TITLE_ +return $SUNKEN_ } 114 { -return $TOP_ +return $TABLOID_ } 115 { -return $TRIANGLE_ +return $TITLE_ } 116 { -return $TYPE_ +return $TOP_ } 117 { -return $VIEW_ +return $TRIANGLE_ } 118 { -return $WEIGHT_ +return $TYPE_ } 119 { -return $WIDTH_ +return $VIEW_ } 120 { -return $ZOOM_ +return $WEIGHT_ } 121 { -return $XY_ +return $WIDTH_ } 122 { -return $XYEX_ +return $ZOOM_ } 123 { -return $XYEY_ +return $XY_ } 124 { -return $XYEXEY_ +return $XYEX_ } 125 { -return $LINEARLINEAR_ +return $XYEY_ } 126 { -return $LOGLINEAR_ +return $XYEXEY_ } 127 { -return $LINEARLOG_ +return $LINEARLINEAR_ } 128 { -return $LOGLOG_ +return $LOGLINEAR_ } 129 { -return $XAXIS_ +return $LINEARLOG_ } 130 { -return $YAXIS_ +return $LOGLOG_ } 131 { -return $GIF_ +return $XAXIS_ } 132 { -return $TIFF_ +return $YAXIS_ } 133 { -return $JPEG_ +return $GIF_ } 134 { -return $PNG_ +return $TIFF_ } 135 { -return $NONE_ +return $JPEG_ } 136 { -return $PACKBITS_ +return $PNG_ } 137 { -return $DEFLATE_ +return $NONE_ } 138 { -return $YES_ +return $PACKBITS_ } 139 { -return $NO_ +return $DEFLATE_ } 140 { -return $ON_ +return $YES_ } 141 { -return $OFF_ +return $NO_ } 142 { -return $TRUE_ +return $ON_ } 143 { -return $FALSE_ +return $OFF_ } 144 { -return $FONT_ +return $TRUE_ } 145 { -return $FONTSIZE_ +return $FALSE_ } 146 { -return $FONTSLANT_ +return $FONT_ } 147 { -return $FONTSTYLE_ +return $FONTSIZE_ } 148 { -return $FONTWEIGHT_ +return $FONTSLANT_ } 149 { -return $TIMES_ +return $FONTSTYLE_ } 150 { -return $HELVETICA_ +return $FONTWEIGHT_ } 151 { -return $COURIER_ +return $TIMES_ } 152 { -return $NORMAL_ +return $HELVETICA_ } 153 { -return $BOLD_ +return $COURIER_ } 154 { -return $ROMAN_ +return $NORMAL_ } 155 { -return $ITALIC_ +return $BOLD_ } 156 { -set yylval $yytext; return $INT_ +return $ROMAN_ + } + 157 { +return $ITALIC_ } - 157 - 158 { +set yylval $yytext; return $INT_ + } + 159 - + 160 { set yylval $yytext; return $REAL_ } - 159 { + 161 { set yylval [string range $yytext 1 end-1]; return $STRING_ } - 160 { + 162 { set yylval [string range $yytext 1 end-1]; return $STRING_ } - 161 { + 163 { set yylval [string range $yytext 1 end-1]; return $STRING_ } - 162 { + 164 { set yylval $yytext; return $STRING_ } - 163 { + 165 { # ignore whitespace } - 164 { + 166 { set yylval $yytext; return $yylval } default diff --git a/ds9/parsers/plotsendlex.fcl b/ds9/parsers/plotsendlex.fcl index 99a96cc..70c1d9b 100644 --- a/ds9/parsers/plotsendlex.fcl +++ b/ds9/parsers/plotsendlex.fcl @@ -15,6 +15,7 @@ background {return $BACKGROUND_} barmode {return $BARMODE_} cap {return $CAP_} color {return $COLOR_} +colour {return $COLOR_} dash {return $DASH_} dataset {return $DATASET_} error {return $ERROR_} @@ -22,6 +23,7 @@ errorbar {return $ERRORBAR_} family {return $FAMILY_} fill {return $FILL_} fillcolor {return $FILLCOLOR_} +fillcolour {return $FILLCOLOR_} flip {return $FLIP_} format {return $FORMAT_} graph {return $GRAPH_} diff --git a/ds9/parsers/plotsendlex.tcl b/ds9/parsers/plotsendlex.tcl index b7d73be..568cd93 100644 --- a/ds9/parsers/plotsendlex.tcl +++ b/ds9/parsers/plotsendlex.tcl @@ -309,356 +309,370 @@ set YAXIS_ 309 set yyleng [string length $yytext] set matched_rule 7 } - # rule 8: dash - if {[regexp -start $index_ -indices -line -nocase -- {\A(dash)} $yy_current_buffer match] > 0 && \ + # rule 8: colour + if {[regexp -start $index_ -indices -line -nocase -- {\A(colour)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 8 } - # rule 9: dataset - if {[regexp -start $index_ -indices -line -nocase -- {\A(dataset)} $yy_current_buffer match] > 0 && \ + # rule 9: dash + if {[regexp -start $index_ -indices -line -nocase -- {\A(dash)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 9 } - # rule 10: error - if {[regexp -start $index_ -indices -line -nocase -- {\A(error)} $yy_current_buffer match] > 0 && \ + # rule 10: dataset + if {[regexp -start $index_ -indices -line -nocase -- {\A(dataset)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 10 } - # rule 11: errorbar - if {[regexp -start $index_ -indices -line -nocase -- {\A(errorbar)} $yy_current_buffer match] > 0 && \ + # rule 11: error + if {[regexp -start $index_ -indices -line -nocase -- {\A(error)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 11 } - # rule 12: family - if {[regexp -start $index_ -indices -line -nocase -- {\A(family)} $yy_current_buffer match] > 0 && \ + # rule 12: errorbar + if {[regexp -start $index_ -indices -line -nocase -- {\A(errorbar)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 12 } - # rule 13: fill - if {[regexp -start $index_ -indices -line -nocase -- {\A(fill)} $yy_current_buffer match] > 0 && \ + # rule 13: family + if {[regexp -start $index_ -indices -line -nocase -- {\A(family)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 13 } - # rule 14: fillcolor - if {[regexp -start $index_ -indices -line -nocase -- {\A(fillcolor)} $yy_current_buffer match] > 0 && \ + # rule 14: fill + if {[regexp -start $index_ -indices -line -nocase -- {\A(fill)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 14 } - # rule 15: flip - if {[regexp -start $index_ -indices -line -nocase -- {\A(flip)} $yy_current_buffer match] > 0 && \ + # rule 15: fillcolor + if {[regexp -start $index_ -indices -line -nocase -- {\A(fillcolor)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 15 } - # rule 16: format - if {[regexp -start $index_ -indices -line -nocase -- {\A(format)} $yy_current_buffer match] > 0 && \ + # rule 16: fillcolour + if {[regexp -start $index_ -indices -line -nocase -- {\A(fillcolour)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 16 } - # rule 17: graph - if {[regexp -start $index_ -indices -line -nocase -- {\A(graph)} $yy_current_buffer match] > 0 && \ + # rule 17: flip + if {[regexp -start $index_ -indices -line -nocase -- {\A(flip)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 17 } - # rule 18: grid - if {[regexp -start $index_ -indices -line -nocase -- {\A(grid)} $yy_current_buffer match] > 0 && \ + # rule 18: format + if {[regexp -start $index_ -indices -line -nocase -- {\A(format)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 18 } - # rule 19: labels - if {[regexp -start $index_ -indices -line -nocase -- {\A(labels)} $yy_current_buffer match] > 0 && \ + # rule 19: graph + if {[regexp -start $index_ -indices -line -nocase -- {\A(graph)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 19 } - # rule 20: layout - if {[regexp -start $index_ -indices -line -nocase -- {\A(layout)} $yy_current_buffer match] > 0 && \ + # rule 20: grid + if {[regexp -start $index_ -indices -line -nocase -- {\A(grid)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 20 } - # rule 21: legend - if {[regexp -start $index_ -indices -line -nocase -- {\A(legend)} $yy_current_buffer match] > 0 && \ + # rule 21: labels + if {[regexp -start $index_ -indices -line -nocase -- {\A(labels)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 21 } - # rule 22: legendtitle - if {[regexp -start $index_ -indices -line -nocase -- {\A(legendtitle)} $yy_current_buffer match] > 0 && \ + # rule 22: layout + if {[regexp -start $index_ -indices -line -nocase -- {\A(layout)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 22 } - # rule 23: list - if {[regexp -start $index_ -indices -line -nocase -- {\A(list)} $yy_current_buffer match] > 0 && \ + # rule 23: legend + if {[regexp -start $index_ -indices -line -nocase -- {\A(legend)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 23 } - # rule 24: log - if {[regexp -start $index_ -indices -line -nocase -- {\A(log)} $yy_current_buffer match] > 0 && \ + # rule 24: legendtitle + if {[regexp -start $index_ -indices -line -nocase -- {\A(legendtitle)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 24 } - # rule 25: max - if {[regexp -start $index_ -indices -line -nocase -- {\A(max)} $yy_current_buffer match] > 0 && \ + # rule 25: list + if {[regexp -start $index_ -indices -line -nocase -- {\A(list)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 25 } - # rule 26: min - if {[regexp -start $index_ -indices -line -nocase -- {\A(min)} $yy_current_buffer match] > 0 && \ + # rule 26: log + if {[regexp -start $index_ -indices -line -nocase -- {\A(log)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 26 } - # rule 27: mode - if {[regexp -start $index_ -indices -line -nocase -- {\A(mode)} $yy_current_buffer match] > 0 && \ + # rule 27: max + if {[regexp -start $index_ -indices -line -nocase -- {\A(max)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 27 } - # rule 28: numbers - if {[regexp -start $index_ -indices -line -nocase -- {\A(numbers)} $yy_current_buffer match] > 0 && \ + # rule 28: min + if {[regexp -start $index_ -indices -line -nocase -- {\A(min)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 28 } - # rule 29: name - if {[regexp -start $index_ -indices -line -nocase -- {\A(name)} $yy_current_buffer match] > 0 && \ + # rule 29: mode + if {[regexp -start $index_ -indices -line -nocase -- {\A(mode)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 29 } - # rule 30: position - if {[regexp -start $index_ -indices -line -nocase -- {\A(position)} $yy_current_buffer match] > 0 && \ + # rule 30: numbers + if {[regexp -start $index_ -indices -line -nocase -- {\A(numbers)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 30 } - # rule 31: relief - if {[regexp -start $index_ -indices -line -nocase -- {\A(relief)} $yy_current_buffer match] > 0 && \ + # rule 31: name + if {[regexp -start $index_ -indices -line -nocase -- {\A(name)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 31 } - # rule 32: select - if {[regexp -start $index_ -indices -line -nocase -- {\A(select)} $yy_current_buffer match] > 0 && \ + # rule 32: position + if {[regexp -start $index_ -indices -line -nocase -- {\A(position)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 32 } - # rule 33: shape - if {[regexp -start $index_ -indices -line -nocase -- {\A(shape)} $yy_current_buffer match] > 0 && \ + # rule 33: relief + if {[regexp -start $index_ -indices -line -nocase -- {\A(relief)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 33 } - # rule 34: show - if {[regexp -start $index_ -indices -line -nocase -- {\A(show)} $yy_current_buffer match] > 0 && \ + # rule 34: select + if {[regexp -start $index_ -indices -line -nocase -- {\A(select)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 34 } - # rule 35: size - if {[regexp -start $index_ -indices -line -nocase -- {\A(size)} $yy_current_buffer match] > 0 && \ + # rule 35: shape + if {[regexp -start $index_ -indices -line -nocase -- {\A(shape)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 35 } - # rule 36: slant - if {[regexp -start $index_ -indices -line -nocase -- {\A(slant)} $yy_current_buffer match] > 0 && \ + # rule 36: show + if {[regexp -start $index_ -indices -line -nocase -- {\A(show)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 36 } - # rule 37: smooth - if {[regexp -start $index_ -indices -line -nocase -- {\A(smooth)} $yy_current_buffer match] > 0 && \ + # rule 37: size + if {[regexp -start $index_ -indices -line -nocase -- {\A(size)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 37 } - # rule 38: stats - if {[regexp -start $index_ -indices -line -nocase -- {\A(stats)} $yy_current_buffer match] > 0 && \ + # rule 38: slant + if {[regexp -start $index_ -indices -line -nocase -- {\A(slant)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 38 } - # rule 39: statistics - if {[regexp -start $index_ -indices -line -nocase -- {\A(statistics)} $yy_current_buffer match] > 0 && \ + # rule 39: smooth + if {[regexp -start $index_ -indices -line -nocase -- {\A(smooth)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 39 } - # rule 40: strip - if {[regexp -start $index_ -indices -line -nocase -- {\A(strip)} $yy_current_buffer match] > 0 && \ + # rule 40: stats + if {[regexp -start $index_ -indices -line -nocase -- {\A(stats)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 40 } - # rule 41: style - if {[regexp -start $index_ -indices -line -nocase -- {\A(style)} $yy_current_buffer match] > 0 && \ + # rule 41: statistics + if {[regexp -start $index_ -indices -line -nocase -- {\A(statistics)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 41 } - # rule 42: title - if {[regexp -start $index_ -indices -line -nocase -- {\A(title)} $yy_current_buffer match] > 0 && \ + # rule 42: strip + if {[regexp -start $index_ -indices -line -nocase -- {\A(strip)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 42 } - # rule 43: weight - if {[regexp -start $index_ -indices -line -nocase -- {\A(weight)} $yy_current_buffer match] > 0 && \ + # rule 43: style + if {[regexp -start $index_ -indices -line -nocase -- {\A(style)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 43 } - # rule 44: width - if {[regexp -start $index_ -indices -line -nocase -- {\A(width)} $yy_current_buffer match] > 0 && \ + # rule 44: title + if {[regexp -start $index_ -indices -line -nocase -- {\A(title)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 44 } - # rule 45: xaxis - if {[regexp -start $index_ -indices -line -nocase -- {\A(xaxis)} $yy_current_buffer match] > 0 && \ + # rule 45: weight + if {[regexp -start $index_ -indices -line -nocase -- {\A(weight)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 45 } - # rule 46: yaxis - if {[regexp -start $index_ -indices -line -nocase -- {\A(yaxis)} $yy_current_buffer match] > 0 && \ + # rule 46: width + if {[regexp -start $index_ -indices -line -nocase -- {\A(width)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 46 } - # rule 47: font - if {[regexp -start $index_ -indices -line -nocase -- {\A(font)} $yy_current_buffer match] > 0 && \ + # rule 47: xaxis + if {[regexp -start $index_ -indices -line -nocase -- {\A(xaxis)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 47 } - # rule 48: fontsize - if {[regexp -start $index_ -indices -line -nocase -- {\A(fontsize)} $yy_current_buffer match] > 0 && \ + # rule 48: yaxis + if {[regexp -start $index_ -indices -line -nocase -- {\A(yaxis)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 48 } - # rule 49: fontslant - if {[regexp -start $index_ -indices -line -nocase -- {\A(fontslant)} $yy_current_buffer match] > 0 && \ + # rule 49: font + if {[regexp -start $index_ -indices -line -nocase -- {\A(font)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 49 } - # rule 50: fontstyle - if {[regexp -start $index_ -indices -line -nocase -- {\A(fontstyle)} $yy_current_buffer match] > 0 && \ + # rule 50: fontsize + if {[regexp -start $index_ -indices -line -nocase -- {\A(fontsize)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 50 } - # rule 51: fontweight - if {[regexp -start $index_ -indices -line -nocase -- {\A(fontweight)} $yy_current_buffer match] > 0 && \ + # rule 51: fontslant + if {[regexp -start $index_ -indices -line -nocase -- {\A(fontslant)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 51 } - # rule 52: \"[^\"]*\" - if {[regexp -start $index_ -indices -line -nocase -- {\A(\"[^\"]*\")} $yy_current_buffer match] > 0 && \ + # rule 52: fontstyle + if {[regexp -start $index_ -indices -line -nocase -- {\A(fontstyle)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 52 } - # rule 53: \'[^\']*\' - if {[regexp -start $index_ -indices -line -nocase -- {\A(\'[^\']*\')} $yy_current_buffer match] > 0 && \ + # rule 53: fontweight + if {[regexp -start $index_ -indices -line -nocase -- {\A(fontweight)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 53 } - # rule 54: \{[^\}]*\} - if {[regexp -start $index_ -indices -line -nocase -- {\A(\{[^\}]*\})} $yy_current_buffer match] > 0 && \ + # rule 54: \"[^\"]*\" + if {[regexp -start $index_ -indices -line -nocase -- {\A(\"[^\"]*\")} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 54 } - # rule 55: \S+\S+ - if {[regexp -start $index_ -indices -line -nocase -- {\A(\S+\S+)} $yy_current_buffer match] > 0 && \ + # rule 55: \'[^\']*\' + if {[regexp -start $index_ -indices -line -nocase -- {\A(\'[^\']*\')} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 55 } - # rule 56: \s - if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ + # rule 56: \{[^\}]*\} + if {[regexp -start $index_ -indices -line -nocase -- {\A(\{[^\}]*\})} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 56 } - # rule 57: . - if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + # rule 57: \S+\S+ + if {[regexp -start $index_ -indices -line -nocase -- {\A(\S+\S+)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 57 } + # rule 58: \s + if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ + [lindex $match 1] - $index_ + 1 > $yyleng} { + set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] + set yyleng [string length $yytext] + set matched_rule 58 + } + # rule 59: . + if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + [lindex $match 1] - $index_ + 1 > $yyleng} { + set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] + set yyleng [string length $yytext] + set matched_rule 59 + } if {$matched_rule == -1} { set yytext [string index $yy_current_buffer $index_] set yyleng 1 @@ -696,153 +710,159 @@ return $CAP_ return $COLOR_ } 8 { -return $DASH_ +return $COLOR_ } 9 { -return $DATASET_ +return $DASH_ } 10 { -return $ERROR_ +return $DATASET_ } 11 { -return $ERRORBAR_ +return $ERROR_ } 12 { -return $FAMILY_ +return $ERRORBAR_ } 13 { -return $FILL_ +return $FAMILY_ } 14 { -return $FILLCOLOR_ +return $FILL_ } 15 { -return $FLIP_ +return $FILLCOLOR_ } 16 { -return $FORMAT_ +return $FILLCOLOR_ } 17 { -return $GRAPH_ +return $FLIP_ } 18 { -return $GRID_ +return $FORMAT_ } 19 { -return $LABELS_ +return $GRAPH_ } 20 { -return $LAYOUT_ +return $GRID_ } 21 { -return $LEGEND_ +return $LABELS_ } 22 { -return $LEGENDTITLE_ +return $LAYOUT_ } 23 { -return $LIST_ +return $LEGEND_ } 24 { -return $LOG_ +return $LEGENDTITLE_ } 25 { -return $MAX_ +return $LIST_ } 26 { -return $MIN_ +return $LOG_ } 27 { -return $MODE_ +return $MAX_ } 28 { -return $NUMBERS_ +return $MIN_ } 29 { -return $NAME_ +return $MODE_ } 30 { -return $POSITION_ +return $NUMBERS_ } 31 { -return $RELIEF_ +return $NAME_ } 32 { -return $SELECT_ +return $POSITION_ } 33 { -return $SHAPE_ +return $RELIEF_ } 34 { -return $SHOW_ +return $SELECT_ } 35 { -return $SIZE_ +return $SHAPE_ } 36 { -return $SLANT_ +return $SHOW_ } 37 { -return $SMOOTH_ +return $SIZE_ } 38 { -return $STATS_ +return $SLANT_ } 39 { -return $STATISTICS_ +return $SMOOTH_ } 40 { -return $STRIP_ +return $STATS_ } 41 { -return $STYLE_ +return $STATISTICS_ } 42 { -return $TITLE_ +return $STRIP_ } 43 { -return $WEIGHT_ +return $STYLE_ } 44 { -return $WIDTH_ +return $TITLE_ } 45 { -return $XAXIS_ +return $WEIGHT_ } 46 { -return $YAXIS_ +return $WIDTH_ } 47 { -return $FONT_ +return $XAXIS_ } 48 { -return $FONTSIZE_ +return $YAXIS_ } 49 { -return $FONTSLANT_ +return $FONT_ } 50 { -return $FONTSTYLE_ +return $FONTSIZE_ } 51 { -return $FONTWEIGHT_ +return $FONTSLANT_ } 52 { -set yylval [string range $yytext 1 end-1]; return $STRING_ +return $FONTSTYLE_ } 53 { -set yylval [string range $yytext 1 end-1]; return $STRING_ +return $FONTWEIGHT_ } 54 { set yylval [string range $yytext 1 end-1]; return $STRING_ } 55 { -set yylval $yytext; return $STRING_ +set yylval [string range $yytext 1 end-1]; return $STRING_ } 56 { -# ignore whitespace +set yylval [string range $yytext 1 end-1]; return $STRING_ } 57 { +set yylval $yytext; return $STRING_ + } + 58 { +# ignore whitespace + } + 59 { set yylval $yytext; return $yylval } default diff --git a/ds9/parsers/prefsfirstlex.fcl b/ds9/parsers/prefsfirstlex.fcl index e1d4f9a..4fee467 100644 --- a/ds9/parsers/prefsfirstlex.fcl +++ b/ds9/parsers/prefsfirstlex.fcl @@ -8,9 +8,11 @@ %% bgcolor {return $BGCOLOR_} +bgcolour {return $BGCOLOR_} clear {return $CLEAR_} irafalign {return $IRAFALIGN_} nancolor {return $NANCOLOR_} +nancolour {return $NANCOLOR_} precision {return $PRECISION_} threads {return $THREADS_} diff --git a/ds9/parsers/prefsfirstlex.tcl b/ds9/parsers/prefsfirstlex.tcl index 312f2d6..0c3c162 100644 --- a/ds9/parsers/prefsfirstlex.tcl +++ b/ds9/parsers/prefsfirstlex.tcl @@ -221,132 +221,146 @@ set THREADS_ 270 set yyleng [string length $yytext] set matched_rule 0 } - # rule 1: clear - if {[regexp -start $index_ -indices -line -nocase -- {\A(clear)} $yy_current_buffer match] > 0 && \ + # rule 1: bgcolour + if {[regexp -start $index_ -indices -line -nocase -- {\A(bgcolour)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 1 } - # rule 2: irafalign - if {[regexp -start $index_ -indices -line -nocase -- {\A(irafalign)} $yy_current_buffer match] > 0 && \ + # rule 2: clear + if {[regexp -start $index_ -indices -line -nocase -- {\A(clear)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 2 } - # rule 3: nancolor - if {[regexp -start $index_ -indices -line -nocase -- {\A(nancolor)} $yy_current_buffer match] > 0 && \ + # rule 3: irafalign + if {[regexp -start $index_ -indices -line -nocase -- {\A(irafalign)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 3 } - # rule 4: precision - if {[regexp -start $index_ -indices -line -nocase -- {\A(precision)} $yy_current_buffer match] > 0 && \ + # rule 4: nancolor + if {[regexp -start $index_ -indices -line -nocase -- {\A(nancolor)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 4 } - # rule 5: threads - if {[regexp -start $index_ -indices -line -nocase -- {\A(threads)} $yy_current_buffer match] > 0 && \ + # rule 5: nancolour + if {[regexp -start $index_ -indices -line -nocase -- {\A(nancolour)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 5 } - # rule 6: yes - if {[regexp -start $index_ -indices -line -nocase -- {\A(yes)} $yy_current_buffer match] > 0 && \ + # rule 6: precision + if {[regexp -start $index_ -indices -line -nocase -- {\A(precision)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 6 } - # rule 7: no - if {[regexp -start $index_ -indices -line -nocase -- {\A(no)} $yy_current_buffer match] > 0 && \ + # rule 7: threads + if {[regexp -start $index_ -indices -line -nocase -- {\A(threads)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 7 } - # rule 8: on - if {[regexp -start $index_ -indices -line -nocase -- {\A(on)} $yy_current_buffer match] > 0 && \ + # rule 8: yes + if {[regexp -start $index_ -indices -line -nocase -- {\A(yes)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 8 } - # rule 9: off - if {[regexp -start $index_ -indices -line -nocase -- {\A(off)} $yy_current_buffer match] > 0 && \ + # rule 9: no + if {[regexp -start $index_ -indices -line -nocase -- {\A(no)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 9 } - # rule 10: true - if {[regexp -start $index_ -indices -line -nocase -- {\A(true)} $yy_current_buffer match] > 0 && \ + # rule 10: on + if {[regexp -start $index_ -indices -line -nocase -- {\A(on)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 10 } - # rule 11: false - if {[regexp -start $index_ -indices -line -nocase -- {\A(false)} $yy_current_buffer match] > 0 && \ + # rule 11: off + if {[regexp -start $index_ -indices -line -nocase -- {\A(off)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 11 } - # rule 12: [+-]?{D}+ - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+)} $yy_current_buffer match] > 0 && \ + # rule 12: true + if {[regexp -start $index_ -indices -line -nocase -- {\A(true)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 12 } - # rule 13: \"[^\"]*\" - if {[regexp -start $index_ -indices -line -nocase -- {\A(\"[^\"]*\")} $yy_current_buffer match] > 0 && \ + # rule 13: false + if {[regexp -start $index_ -indices -line -nocase -- {\A(false)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 13 } - # rule 14: \'[^\']*\' - if {[regexp -start $index_ -indices -line -nocase -- {\A(\'[^\']*\')} $yy_current_buffer match] > 0 && \ + # rule 14: [+-]?{D}+ + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 14 } - # rule 15: \{[^\}]*\} - if {[regexp -start $index_ -indices -line -nocase -- {\A(\{[^\}]*\})} $yy_current_buffer match] > 0 && \ + # rule 15: \"[^\"]*\" + if {[regexp -start $index_ -indices -line -nocase -- {\A(\"[^\"]*\")} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 15 } - # rule 16: \S+\S+ - if {[regexp -start $index_ -indices -line -nocase -- {\A(\S+\S+)} $yy_current_buffer match] > 0 && \ + # rule 16: \'[^\']*\' + if {[regexp -start $index_ -indices -line -nocase -- {\A(\'[^\']*\')} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 16 } - # rule 17: \s - if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ + # rule 17: \{[^\}]*\} + if {[regexp -start $index_ -indices -line -nocase -- {\A(\{[^\}]*\})} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 17 } - # rule 18: . - if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + # rule 18: \S+\S+ + if {[regexp -start $index_ -indices -line -nocase -- {\A(\S+\S+)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 18 } + # rule 19: \s + if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ + [lindex $match 1] - $index_ + 1 > $yyleng} { + set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] + set yyleng [string length $yytext] + set matched_rule 19 + } + # rule 20: . + if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + [lindex $match 1] - $index_ + 1 > $yyleng} { + set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] + set yyleng [string length $yytext] + set matched_rule 20 + } if {$matched_rule == -1} { set yytext [string index $yy_current_buffer $index_] set yyleng 1 @@ -363,57 +377,63 @@ set THREADS_ 270 return $BGCOLOR_ } 1 { -return $CLEAR_ +return $BGCOLOR_ } 2 { -return $IRAFALIGN_ +return $CLEAR_ } 3 { -return $NANCOLOR_ +return $IRAFALIGN_ } 4 { -return $PRECISION_ +return $NANCOLOR_ } 5 { -return $THREADS_ +return $NANCOLOR_ } 6 { -return $YES_ +return $PRECISION_ } 7 { -return $NO_ +return $THREADS_ } 8 { -return $ON_ +return $YES_ } 9 { -return $OFF_ +return $NO_ } 10 { -return $TRUE_ +return $ON_ } 11 { -return $FALSE_ +return $OFF_ } 12 { -set yylval $yytext; return $INT_ +return $TRUE_ } 13 { -set yylval [string range $yytext 1 end-1]; return $STRING_ +return $FALSE_ } 14 { -set yylval [string range $yytext 1 end-1]; return $STRING_ +set yylval $yytext; return $INT_ } 15 { set yylval [string range $yytext 1 end-1]; return $STRING_ } 16 { -set yylval $yytext; return $STRING_ +set yylval [string range $yytext 1 end-1]; return $STRING_ } 17 { -# ignore whitespace +set yylval [string range $yytext 1 end-1]; return $STRING_ } 18 { +set yylval $yytext; return $STRING_ + } + 19 { +# ignore whitespace + } + 20 { set yylval $yytext; return $yylval } default diff --git a/ds9/parsers/prefslex.fcl b/ds9/parsers/prefslex.fcl index 9b2387d..73dcbd2 100644 --- a/ds9/parsers/prefslex.fcl +++ b/ds9/parsers/prefslex.fcl @@ -8,9 +8,11 @@ %% bgcolor {return $BGCOLOR_} +bgcolour {return $BGCOLOR_} clear {return $CLEAR_} irafalign {return $IRAFALIGN_} nancolor {return $NANCOLOR_} +nancolour {return $NANCOLOR_} precision {return $PRECISION_} threads {return $THREADS_} diff --git a/ds9/parsers/prefslex.tcl b/ds9/parsers/prefslex.tcl index 5e5843c..4e82eae 100644 --- a/ds9/parsers/prefslex.tcl +++ b/ds9/parsers/prefslex.tcl @@ -221,132 +221,146 @@ set THREADS_ 270 set yyleng [string length $yytext] set matched_rule 0 } - # rule 1: clear - if {[regexp -start $index_ -indices -line -nocase -- {\A(clear)} $yy_current_buffer match] > 0 && \ + # rule 1: bgcolour + if {[regexp -start $index_ -indices -line -nocase -- {\A(bgcolour)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 1 } - # rule 2: irafalign - if {[regexp -start $index_ -indices -line -nocase -- {\A(irafalign)} $yy_current_buffer match] > 0 && \ + # rule 2: clear + if {[regexp -start $index_ -indices -line -nocase -- {\A(clear)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 2 } - # rule 3: nancolor - if {[regexp -start $index_ -indices -line -nocase -- {\A(nancolor)} $yy_current_buffer match] > 0 && \ + # rule 3: irafalign + if {[regexp -start $index_ -indices -line -nocase -- {\A(irafalign)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 3 } - # rule 4: precision - if {[regexp -start $index_ -indices -line -nocase -- {\A(precision)} $yy_current_buffer match] > 0 && \ + # rule 4: nancolor + if {[regexp -start $index_ -indices -line -nocase -- {\A(nancolor)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 4 } - # rule 5: threads - if {[regexp -start $index_ -indices -line -nocase -- {\A(threads)} $yy_current_buffer match] > 0 && \ + # rule 5: nancolour + if {[regexp -start $index_ -indices -line -nocase -- {\A(nancolour)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 5 } - # rule 6: yes - if {[regexp -start $index_ -indices -line -nocase -- {\A(yes)} $yy_current_buffer match] > 0 && \ + # rule 6: precision + if {[regexp -start $index_ -indices -line -nocase -- {\A(precision)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 6 } - # rule 7: no - if {[regexp -start $index_ -indices -line -nocase -- {\A(no)} $yy_current_buffer match] > 0 && \ + # rule 7: threads + if {[regexp -start $index_ -indices -line -nocase -- {\A(threads)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 7 } - # rule 8: on - if {[regexp -start $index_ -indices -line -nocase -- {\A(on)} $yy_current_buffer match] > 0 && \ + # rule 8: yes + if {[regexp -start $index_ -indices -line -nocase -- {\A(yes)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 8 } - # rule 9: off - if {[regexp -start $index_ -indices -line -nocase -- {\A(off)} $yy_current_buffer match] > 0 && \ + # rule 9: no + if {[regexp -start $index_ -indices -line -nocase -- {\A(no)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 9 } - # rule 10: true - if {[regexp -start $index_ -indices -line -nocase -- {\A(true)} $yy_current_buffer match] > 0 && \ + # rule 10: on + if {[regexp -start $index_ -indices -line -nocase -- {\A(on)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 10 } - # rule 11: false - if {[regexp -start $index_ -indices -line -nocase -- {\A(false)} $yy_current_buffer match] > 0 && \ + # rule 11: off + if {[regexp -start $index_ -indices -line -nocase -- {\A(off)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 11 } - # rule 12: [+-]?{D}+ - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+)} $yy_current_buffer match] > 0 && \ + # rule 12: true + if {[regexp -start $index_ -indices -line -nocase -- {\A(true)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 12 } - # rule 13: \"[^\"]*\" - if {[regexp -start $index_ -indices -line -nocase -- {\A(\"[^\"]*\")} $yy_current_buffer match] > 0 && \ + # rule 13: false + if {[regexp -start $index_ -indices -line -nocase -- {\A(false)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 13 } - # rule 14: \'[^\']*\' - if {[regexp -start $index_ -indices -line -nocase -- {\A(\'[^\']*\')} $yy_current_buffer match] > 0 && \ + # rule 14: [+-]?{D}+ + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 14 } - # rule 15: \{[^\}]*\} - if {[regexp -start $index_ -indices -line -nocase -- {\A(\{[^\}]*\})} $yy_current_buffer match] > 0 && \ + # rule 15: \"[^\"]*\" + if {[regexp -start $index_ -indices -line -nocase -- {\A(\"[^\"]*\")} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 15 } - # rule 16: \S+\S+ - if {[regexp -start $index_ -indices -line -nocase -- {\A(\S+\S+)} $yy_current_buffer match] > 0 && \ + # rule 16: \'[^\']*\' + if {[regexp -start $index_ -indices -line -nocase -- {\A(\'[^\']*\')} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 16 } - # rule 17: \s - if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ + # rule 17: \{[^\}]*\} + if {[regexp -start $index_ -indices -line -nocase -- {\A(\{[^\}]*\})} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 17 } - # rule 18: . - if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + # rule 18: \S+\S+ + if {[regexp -start $index_ -indices -line -nocase -- {\A(\S+\S+)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 18 } + # rule 19: \s + if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ + [lindex $match 1] - $index_ + 1 > $yyleng} { + set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] + set yyleng [string length $yytext] + set matched_rule 19 + } + # rule 20: . + if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + [lindex $match 1] - $index_ + 1 > $yyleng} { + set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] + set yyleng [string length $yytext] + set matched_rule 20 + } if {$matched_rule == -1} { set yytext [string index $yy_current_buffer $index_] set yyleng 1 @@ -363,57 +377,63 @@ set THREADS_ 270 return $BGCOLOR_ } 1 { -return $CLEAR_ +return $BGCOLOR_ } 2 { -return $IRAFALIGN_ +return $CLEAR_ } 3 { -return $NANCOLOR_ +return $IRAFALIGN_ } 4 { -return $PRECISION_ +return $NANCOLOR_ } 5 { -return $THREADS_ +return $NANCOLOR_ } 6 { -return $YES_ +return $PRECISION_ } 7 { -return $NO_ +return $THREADS_ } 8 { -return $ON_ +return $YES_ } 9 { -return $OFF_ +return $NO_ } 10 { -return $TRUE_ +return $ON_ } 11 { -return $FALSE_ +return $OFF_ } 12 { -set yylval $yytext; return $INT_ +return $TRUE_ } 13 { -set yylval [string range $yytext 1 end-1]; return $STRING_ +return $FALSE_ } 14 { -set yylval [string range $yytext 1 end-1]; return $STRING_ +set yylval $yytext; return $INT_ } 15 { set yylval [string range $yytext 1 end-1]; return $STRING_ } 16 { -set yylval $yytext; return $STRING_ +set yylval [string range $yytext 1 end-1]; return $STRING_ } 17 { -# ignore whitespace +set yylval [string range $yytext 1 end-1]; return $STRING_ } 18 { +set yylval $yytext; return $STRING_ + } + 19 { +# ignore whitespace + } + 20 { set yylval $yytext; return $yylval } default diff --git a/ds9/parsers/prefssendlex.fcl b/ds9/parsers/prefssendlex.fcl index aa1554a..19266fd 100644 --- a/ds9/parsers/prefssendlex.fcl +++ b/ds9/parsers/prefssendlex.fcl @@ -8,8 +8,10 @@ %% bgcolor {return $BGCOLOR_} +bgcolour {return $BGCOLOR_} irafalign {return $IRAFALIGN_} nancolor {return $NANCOLOR_} +nancolour {return $NANCOLOR_} precision {return $PRECISION_} threads {return $THREADS_} diff --git a/ds9/parsers/prefssendlex.tcl b/ds9/parsers/prefssendlex.tcl index 3623ba0..4dbda5f 100644 --- a/ds9/parsers/prefssendlex.tcl +++ b/ds9/parsers/prefssendlex.tcl @@ -212,48 +212,62 @@ set THREADS_ 261 set yyleng [string length $yytext] set matched_rule 0 } - # rule 1: irafalign - if {[regexp -start $index_ -indices -line -nocase -- {\A(irafalign)} $yy_current_buffer match] > 0 && \ + # rule 1: bgcolour + if {[regexp -start $index_ -indices -line -nocase -- {\A(bgcolour)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 1 } - # rule 2: nancolor - if {[regexp -start $index_ -indices -line -nocase -- {\A(nancolor)} $yy_current_buffer match] > 0 && \ + # rule 2: irafalign + if {[regexp -start $index_ -indices -line -nocase -- {\A(irafalign)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 2 } - # rule 3: precision - if {[regexp -start $index_ -indices -line -nocase -- {\A(precision)} $yy_current_buffer match] > 0 && \ + # rule 3: nancolor + if {[regexp -start $index_ -indices -line -nocase -- {\A(nancolor)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 3 } - # rule 4: threads - if {[regexp -start $index_ -indices -line -nocase -- {\A(threads)} $yy_current_buffer match] > 0 && \ + # rule 4: nancolour + if {[regexp -start $index_ -indices -line -nocase -- {\A(nancolour)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 4 } - # rule 5: \s - if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ + # rule 5: precision + if {[regexp -start $index_ -indices -line -nocase -- {\A(precision)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 5 } - # rule 6: . - if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + # rule 6: threads + if {[regexp -start $index_ -indices -line -nocase -- {\A(threads)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 6 } + # rule 7: \s + if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ + [lindex $match 1] - $index_ + 1 > $yyleng} { + set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] + set yyleng [string length $yytext] + set matched_rule 7 + } + # rule 8: . + if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + [lindex $match 1] - $index_ + 1 > $yyleng} { + set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] + set yyleng [string length $yytext] + set matched_rule 8 + } if {$matched_rule == -1} { set yytext [string index $yy_current_buffer $index_] set yyleng 1 @@ -270,21 +284,27 @@ set THREADS_ 261 return $BGCOLOR_ } 1 { -return $IRAFALIGN_ +return $BGCOLOR_ } 2 { -return $NANCOLOR_ +return $IRAFALIGN_ } 3 { -return $PRECISION_ +return $NANCOLOR_ } 4 { -return $THREADS_ +return $NANCOLOR_ } 5 { -# ignore whitespace +return $PRECISION_ } 6 { +return $THREADS_ + } + 7 { +# ignore whitespace + } + 8 { set yylval $yytext; return $yylval } default diff --git a/ds9/parsers/pslex.fcl b/ds9/parsers/pslex.fcl index fe13465..be2fe26 100644 --- a/ds9/parsers/pslex.fcl +++ b/ds9/parsers/pslex.fcl @@ -8,6 +8,7 @@ %% color {return $COLOR_} +colour {return $COLOR_} command {return $COMMAND_} destination {return $DESTINATION_} file {return $FILE_} diff --git a/ds9/parsers/pslex.tcl b/ds9/parsers/pslex.tcl index f3fceb4..14432f2 100644 --- a/ds9/parsers/pslex.tcl +++ b/ds9/parsers/pslex.tcl @@ -232,209 +232,216 @@ set 75_ 281 set yyleng [string length $yytext] set matched_rule 0 } - # rule 1: command - if {[regexp -start $index_ -indices -line -nocase -- {\A(command)} $yy_current_buffer match] > 0 && \ + # rule 1: colour + if {[regexp -start $index_ -indices -line -nocase -- {\A(colour)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 1 } - # rule 2: destination - if {[regexp -start $index_ -indices -line -nocase -- {\A(destination)} $yy_current_buffer match] > 0 && \ + # rule 2: command + if {[regexp -start $index_ -indices -line -nocase -- {\A(command)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 2 } - # rule 3: file - if {[regexp -start $index_ -indices -line -nocase -- {\A(file)} $yy_current_buffer match] > 0 && \ + # rule 3: destination + if {[regexp -start $index_ -indices -line -nocase -- {\A(destination)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 3 } - # rule 4: filename - if {[regexp -start $index_ -indices -line -nocase -- {\A(filename)} $yy_current_buffer match] > 0 && \ + # rule 4: file + if {[regexp -start $index_ -indices -line -nocase -- {\A(file)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 4 } - # rule 5: interpolate - if {[regexp -start $index_ -indices -line -nocase -- {\A(interpolate)} $yy_current_buffer match] > 0 && \ + # rule 5: filename + if {[regexp -start $index_ -indices -line -nocase -- {\A(filename)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 5 } - # rule 6: level - if {[regexp -start $index_ -indices -line -nocase -- {\A(level)} $yy_current_buffer match] > 0 && \ + # rule 6: interpolate + if {[regexp -start $index_ -indices -line -nocase -- {\A(interpolate)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 6 } - # rule 7: palette - if {[regexp -start $index_ -indices -line -nocase -- {\A(palette)} $yy_current_buffer match] > 0 && \ + # rule 7: level + if {[regexp -start $index_ -indices -line -nocase -- {\A(level)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 7 } - # rule 8: printer - if {[regexp -start $index_ -indices -line -nocase -- {\A(printer)} $yy_current_buffer match] > 0 && \ + # rule 8: palette + if {[regexp -start $index_ -indices -line -nocase -- {\A(palette)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 8 } - # rule 9: resolution - if {[regexp -start $index_ -indices -line -nocase -- {\A(resolution)} $yy_current_buffer match] > 0 && \ + # rule 9: printer + if {[regexp -start $index_ -indices -line -nocase -- {\A(printer)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 9 } - # rule 10: rgb - if {[regexp -start $index_ -indices -line -nocase -- {\A(rgb)} $yy_current_buffer match] > 0 && \ + # rule 10: resolution + if {[regexp -start $index_ -indices -line -nocase -- {\A(resolution)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 10 } - # rule 11: cmyk - if {[regexp -start $index_ -indices -line -nocase -- {\A(cmyk)} $yy_current_buffer match] > 0 && \ + # rule 11: rgb + if {[regexp -start $index_ -indices -line -nocase -- {\A(rgb)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 11 } - # rule 12: gray - if {[regexp -start $index_ -indices -line -nocase -- {\A(gray)} $yy_current_buffer match] > 0 && \ + # rule 12: cmyk + if {[regexp -start $index_ -indices -line -nocase -- {\A(cmyk)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 12 } - # rule 13: 72 - if {[regexp -start $index_ -indices -line -nocase -- {\A(72)} $yy_current_buffer match] > 0 && \ + # rule 13: gray + if {[regexp -start $index_ -indices -line -nocase -- {\A(gray)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 13 } - # rule 14: screen - if {[regexp -start $index_ -indices -line -nocase -- {\A(screen)} $yy_current_buffer match] > 0 && \ + # rule 14: 72 + if {[regexp -start $index_ -indices -line -nocase -- {\A(72)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 14 } - # rule 15: 96 - if {[regexp -start $index_ -indices -line -nocase -- {\A(96)} $yy_current_buffer match] > 0 && \ + # rule 15: screen + if {[regexp -start $index_ -indices -line -nocase -- {\A(screen)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 15 } - # rule 16: 144 - if {[regexp -start $index_ -indices -line -nocase -- {\A(144)} $yy_current_buffer match] > 0 && \ + # rule 16: 96 + if {[regexp -start $index_ -indices -line -nocase -- {\A(96)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 16 } - # rule 17: 150 - if {[regexp -start $index_ -indices -line -nocase -- {\A(150)} $yy_current_buffer match] > 0 && \ + # rule 17: 144 + if {[regexp -start $index_ -indices -line -nocase -- {\A(144)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 17 } - # rule 18: 225 - if {[regexp -start $index_ -indices -line -nocase -- {\A(225)} $yy_current_buffer match] > 0 && \ + # rule 18: 150 + if {[regexp -start $index_ -indices -line -nocase -- {\A(150)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 18 } - # rule 19: 300 - if {[regexp -start $index_ -indices -line -nocase -- {\A(300)} $yy_current_buffer match] > 0 && \ + # rule 19: 225 + if {[regexp -start $index_ -indices -line -nocase -- {\A(225)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 19 } - # rule 20: 600 - if {[regexp -start $index_ -indices -line -nocase -- {\A(600)} $yy_current_buffer match] > 0 && \ + # rule 20: 300 + if {[regexp -start $index_ -indices -line -nocase -- {\A(300)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 20 } - # rule 21: 1200 - if {[regexp -start $index_ -indices -line -nocase -- {\A(1200)} $yy_current_buffer match] > 0 && \ + # rule 21: 600 + if {[regexp -start $index_ -indices -line -nocase -- {\A(600)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 21 } - # rule 22: 53 - if {[regexp -start $index_ -indices -line -nocase -- {\A(53)} $yy_current_buffer match] > 0 && \ + # rule 22: 1200 + if {[regexp -start $index_ -indices -line -nocase -- {\A(1200)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 22 } - # rule 23: 75 - if {[regexp -start $index_ -indices -line -nocase -- {\A(75)} $yy_current_buffer match] > 0 && \ + # rule 23: 53 + if {[regexp -start $index_ -indices -line -nocase -- {\A(53)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 23 } - # rule 24: \"[^\"]*\" - if {[regexp -start $index_ -indices -line -nocase -- {\A(\"[^\"]*\")} $yy_current_buffer match] > 0 && \ + # rule 24: 75 + if {[regexp -start $index_ -indices -line -nocase -- {\A(75)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 24 } - # rule 25: \'[^\']*\' - if {[regexp -start $index_ -indices -line -nocase -- {\A(\'[^\']*\')} $yy_current_buffer match] > 0 && \ + # rule 25: \"[^\"]*\" + if {[regexp -start $index_ -indices -line -nocase -- {\A(\"[^\"]*\")} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 25 } - # rule 26: \{[^\}]*\} - if {[regexp -start $index_ -indices -line -nocase -- {\A(\{[^\}]*\})} $yy_current_buffer match] > 0 && \ + # rule 26: \'[^\']*\' + if {[regexp -start $index_ -indices -line -nocase -- {\A(\'[^\']*\')} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 26 } - # rule 27: \S+\S+ - if {[regexp -start $index_ -indices -line -nocase -- {\A(\S+\S+)} $yy_current_buffer match] > 0 && \ + # rule 27: \{[^\}]*\} + if {[regexp -start $index_ -indices -line -nocase -- {\A(\{[^\}]*\})} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 27 } - # rule 28: \s - if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ + # rule 28: \S+\S+ + if {[regexp -start $index_ -indices -line -nocase -- {\A(\S+\S+)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 28 } - # rule 29: . - if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + # rule 29: \s + if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 29 } + # rule 30: . + if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + [lindex $match 1] - $index_ + 1 > $yyleng} { + set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] + set yyleng [string length $yytext] + set matched_rule 30 + } if {$matched_rule == -1} { set yytext [string index $yy_current_buffer $index_] set yyleng 1 @@ -451,76 +458,76 @@ set 75_ 281 return $COLOR_ } 1 { -return $COMMAND_ +return $COLOR_ } 2 { -return $DESTINATION_ +return $COMMAND_ } 3 { -return $FILE_ +return $DESTINATION_ } 4 { -return $FILENAME_ +return $FILE_ } 5 { -return $INTERPOLATE_ +return $FILENAME_ } 6 { -return $LEVEL_ +return $INTERPOLATE_ } 7 { -return $PALETTE_ +return $LEVEL_ } 8 { -return $PRINTER_ +return $PALETTE_ } 9 { -return $RESOLUTION_ +return $PRINTER_ } 10 { -return $RGB_ +return $RESOLUTION_ } 11 { -return $CMYK_ +return $RGB_ } 12 { -return $GRAY_ +return $CMYK_ } 13 { -return $72_ +return $GRAY_ } 14 { -return $SCREEN_ +return $72_ } 15 { -return $96_ +return $SCREEN_ } 16 { -return $144_ +return $96_ } 17 { -return $150_ +return $144_ } 18 { -return $225_ +return $150_ } 19 { -return $300_ +return $225_ } 20 { -return $600_ +return $300_ } 21 { -return $1200_ +return $600_ } 22 { -return $53_ +return $1200_ } 23 { -return $75_ +return $53_ } 24 { -set yylval [string range $yytext 1 end-1]; return $STRING_ +return $75_ } 25 { set yylval [string range $yytext 1 end-1]; return $STRING_ @@ -529,12 +536,15 @@ set yylval [string range $yytext 1 end-1]; return $STRING_ set yylval [string range $yytext 1 end-1]; return $STRING_ } 27 { -set yylval $yytext; return $STRING_ +set yylval [string range $yytext 1 end-1]; return $STRING_ } 28 { -# ignore whitespace +set yylval $yytext; return $STRING_ } 29 { +# ignore whitespace + } + 30 { set yylval $yytext; return $yylval } default diff --git a/ds9/parsers/pssendlex.fcl b/ds9/parsers/pssendlex.fcl index 4b68654..a63b55a 100644 --- a/ds9/parsers/pssendlex.fcl +++ b/ds9/parsers/pssendlex.fcl @@ -8,6 +8,7 @@ %% color {return $COLOR_} +colour {return $COLOR_} command {return $COMMAND_} destination {return $DESTINATION_} filename {return $FILENAME_} diff --git a/ds9/parsers/pssendlex.tcl b/ds9/parsers/pssendlex.tcl index 5176987..4530e1c 100644 --- a/ds9/parsers/pssendlex.tcl +++ b/ds9/parsers/pssendlex.tcl @@ -214,62 +214,69 @@ set RESOLUTION_ 263 set yyleng [string length $yytext] set matched_rule 0 } - # rule 1: command - if {[regexp -start $index_ -indices -line -nocase -- {\A(command)} $yy_current_buffer match] > 0 && \ + # rule 1: colour + if {[regexp -start $index_ -indices -line -nocase -- {\A(colour)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 1 } - # rule 2: destination - if {[regexp -start $index_ -indices -line -nocase -- {\A(destination)} $yy_current_buffer match] > 0 && \ + # rule 2: command + if {[regexp -start $index_ -indices -line -nocase -- {\A(command)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 2 } - # rule 3: filename - if {[regexp -start $index_ -indices -line -nocase -- {\A(filename)} $yy_current_buffer match] > 0 && \ + # rule 3: destination + if {[regexp -start $index_ -indices -line -nocase -- {\A(destination)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 3 } - # rule 4: interpolate - if {[regexp -start $index_ -indices -line -nocase -- {\A(interpolate)} $yy_current_buffer match] > 0 && \ + # rule 4: filename + if {[regexp -start $index_ -indices -line -nocase -- {\A(filename)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 4 } - # rule 5: level - if {[regexp -start $index_ -indices -line -nocase -- {\A(level)} $yy_current_buffer match] > 0 && \ + # rule 5: interpolate + if {[regexp -start $index_ -indices -line -nocase -- {\A(interpolate)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 5 } - # rule 6: resolution - if {[regexp -start $index_ -indices -line -nocase -- {\A(resolution)} $yy_current_buffer match] > 0 && \ + # rule 6: level + if {[regexp -start $index_ -indices -line -nocase -- {\A(level)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 6 } - # rule 7: \s - if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ + # rule 7: resolution + if {[regexp -start $index_ -indices -line -nocase -- {\A(resolution)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 7 } - # rule 8: . - if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + # rule 8: \s + if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 8 } + # rule 9: . + if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + [lindex $match 1] - $index_ + 1 > $yyleng} { + set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] + set yyleng [string length $yytext] + set matched_rule 9 + } if {$matched_rule == -1} { set yytext [string index $yy_current_buffer $index_] set yyleng 1 @@ -286,27 +293,30 @@ set RESOLUTION_ 263 return $COLOR_ } 1 { -return $COMMAND_ +return $COLOR_ } 2 { -return $DESTINATION_ +return $COMMAND_ } 3 { -return $FILENAME_ +return $DESTINATION_ } 4 { -return $INTERPOLATE_ +return $FILENAME_ } 5 { -return $LEVEL_ +return $INTERPOLATE_ } 6 { -return $RESOLUTION_ +return $LEVEL_ } 7 { -# ignore whitespace +return $RESOLUTION_ } 8 { +# ignore whitespace + } + 9 { set yylval $yytext; return $yylval } default diff --git a/ds9/parsers/regionlex.fcl b/ds9/parsers/regionlex.fcl index 36e77d3..a33c1a4 100644 --- a/ds9/parsers/regionlex.fcl +++ b/ds9/parsers/regionlex.fcl @@ -16,6 +16,7 @@ background {return $BACKGROUND_} centroid {return $CENTROID_} close {return $CLOSE_} color {return $COLOR_} +colour {return $COLOR_} command {return $COMMAND_} composite {return $COMPOSITE_} copy {return $COPY_} diff --git a/ds9/parsers/regionlex.tcl b/ds9/parsers/regionlex.tcl index a1087ef..7c784a9 100644 --- a/ds9/parsers/regionlex.tcl +++ b/ds9/parsers/regionlex.tcl @@ -404,979 +404,986 @@ set MSKY_ 397 set yyleng [string length $yytext] set matched_rule 8 } - # rule 9: command - if {[regexp -start $index_ -indices -line -nocase -- {\A(command)} $yy_current_buffer match] > 0 && \ + # rule 9: colour + if {[regexp -start $index_ -indices -line -nocase -- {\A(colour)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 9 } - # rule 10: composite - if {[regexp -start $index_ -indices -line -nocase -- {\A(composite)} $yy_current_buffer match] > 0 && \ + # rule 10: command + if {[regexp -start $index_ -indices -line -nocase -- {\A(command)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 10 } - # rule 11: copy - if {[regexp -start $index_ -indices -line -nocase -- {\A(copy)} $yy_current_buffer match] > 0 && \ + # rule 11: composite + if {[regexp -start $index_ -indices -line -nocase -- {\A(composite)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 11 } - # rule 12: cut - if {[regexp -start $index_ -indices -line -nocase -- {\A(cut)} $yy_current_buffer match] > 0 && \ + # rule 12: copy + if {[regexp -start $index_ -indices -line -nocase -- {\A(copy)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 12 } - # rule 13: delete - if {[regexp -start $index_ -indices -line -nocase -- {\A(delete)} $yy_current_buffer match] > 0 && \ + # rule 13: cut + if {[regexp -start $index_ -indices -line -nocase -- {\A(cut)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 13 } - # rule 14: deleteall - if {[regexp -start $index_ -indices -line -nocase -- {\A(deleteall)} $yy_current_buffer match] > 0 && \ + # rule 14: delete + if {[regexp -start $index_ -indices -line -nocase -- {\A(delete)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 14 } - # rule 15: delim - if {[regexp -start $index_ -indices -line -nocase -- {\A(delim)} $yy_current_buffer match] > 0 && \ + # rule 15: deleteall + if {[regexp -start $index_ -indices -line -nocase -- {\A(deleteall)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 15 } - # rule 16: dissolve - if {[regexp -start $index_ -indices -line -nocase -- {\A(dissolve)} $yy_current_buffer match] > 0 && \ + # rule 16: delim + if {[regexp -start $index_ -indices -line -nocase -- {\A(delim)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 16 } - # rule 17: edit - if {[regexp -start $index_ -indices -line -nocase -- {\A(edit)} $yy_current_buffer match] > 0 && \ + # rule 17: dissolve + if {[regexp -start $index_ -indices -line -nocase -- {\A(dissolve)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 17 } - # rule 18: epsilon - if {[regexp -start $index_ -indices -line -nocase -- {\A(epsilon)} $yy_current_buffer match] > 0 && \ + # rule 18: edit + if {[regexp -start $index_ -indices -line -nocase -- {\A(edit)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 18 } - # rule 19: exclude - if {[regexp -start $index_ -indices -line -nocase -- {\A(exclude)} $yy_current_buffer match] > 0 && \ + # rule 19: epsilon + if {[regexp -start $index_ -indices -line -nocase -- {\A(epsilon)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 19 } - # rule 20: file - if {[regexp -start $index_ -indices -line -nocase -- {\A(file)} $yy_current_buffer match] > 0 && \ + # rule 20: exclude + if {[regexp -start $index_ -indices -line -nocase -- {\A(exclude)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 20 } - # rule 21: fixed - if {[regexp -start $index_ -indices -line -nocase -- {\A(fixed)} $yy_current_buffer match] > 0 && \ + # rule 21: file + if {[regexp -start $index_ -indices -line -nocase -- {\A(file)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 21 } - # rule 22: font - if {[regexp -start $index_ -indices -line -nocase -- {\A(font)} $yy_current_buffer match] > 0 && \ + # rule 22: fixed + if {[regexp -start $index_ -indices -line -nocase -- {\A(fixed)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 22 } - # rule 23: format - if {[regexp -start $index_ -indices -line -nocase -- {\A(format)} $yy_current_buffer match] > 0 && \ + # rule 23: font + if {[regexp -start $index_ -indices -line -nocase -- {\A(font)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 23 } - # rule 24: front - if {[regexp -start $index_ -indices -line -nocase -- {\A(front)} $yy_current_buffer match] > 0 && \ + # rule 24: format + if {[regexp -start $index_ -indices -line -nocase -- {\A(format)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 24 } - # rule 25: getinfo - if {[regexp -start $index_ -indices -line -nocase -- {\A(getinfo)} $yy_current_buffer match] > 0 && \ + # rule 25: front + if {[regexp -start $index_ -indices -line -nocase -- {\A(front)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 25 } - # rule 26: group - if {[regexp -start $index_ -indices -line -nocase -- {\A(group)} $yy_current_buffer match] > 0 && \ + # rule 26: getinfo + if {[regexp -start $index_ -indices -line -nocase -- {\A(getinfo)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 26 } - # rule 27: groups - if {[regexp -start $index_ -indices -line -nocase -- {\A(groups)} $yy_current_buffer match] > 0 && \ + # rule 27: group + if {[regexp -start $index_ -indices -line -nocase -- {\A(group)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 27 } - # rule 28: include - if {[regexp -start $index_ -indices -line -nocase -- {\A(include)} $yy_current_buffer match] > 0 && \ + # rule 28: groups + if {[regexp -start $index_ -indices -line -nocase -- {\A(groups)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 28 } - # rule 29: invert - if {[regexp -start $index_ -indices -line -nocase -- {\A(invert)} $yy_current_buffer match] > 0 && \ + # rule 29: include + if {[regexp -start $index_ -indices -line -nocase -- {\A(include)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 29 } - # rule 30: iteration - if {[regexp -start $index_ -indices -line -nocase -- {\A(iteration)} $yy_current_buffer match] > 0 && \ + # rule 30: invert + if {[regexp -start $index_ -indices -line -nocase -- {\A(invert)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 30 } - # rule 31: list - if {[regexp -start $index_ -indices -line -nocase -- {\A(list)} $yy_current_buffer match] > 0 && \ + # rule 31: iteration + if {[regexp -start $index_ -indices -line -nocase -- {\A(iteration)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 31 } - # rule 32: load - if {[regexp -start $index_ -indices -line -nocase -- {\A(load)} $yy_current_buffer match] > 0 && \ + # rule 32: list + if {[regexp -start $index_ -indices -line -nocase -- {\A(list)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 32 } - # rule 33: move - if {[regexp -start $index_ -indices -line -nocase -- {\A(move)} $yy_current_buffer match] > 0 && \ + # rule 33: load + if {[regexp -start $index_ -indices -line -nocase -- {\A(load)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 33 } - # rule 34: moveback - if {[regexp -start $index_ -indices -line -nocase -- {\A(moveback)} $yy_current_buffer match] > 0 && \ + # rule 34: move + if {[regexp -start $index_ -indices -line -nocase -- {\A(move)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 34 } - # rule 35: movefront - if {[regexp -start $index_ -indices -line -nocase -- {\A(movefront)} $yy_current_buffer match] > 0 && \ + # rule 35: moveback + if {[regexp -start $index_ -indices -line -nocase -- {\A(moveback)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 35 } - # rule 36: new - if {[regexp -start $index_ -indices -line -nocase -- {\A(new)} $yy_current_buffer match] > 0 && \ + # rule 36: movefront + if {[regexp -start $index_ -indices -line -nocase -- {\A(movefront)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 36 } - # rule 37: nl - if {[regexp -start $index_ -indices -line -nocase -- {\A(nl)} $yy_current_buffer match] > 0 && \ + # rule 37: new + if {[regexp -start $index_ -indices -line -nocase -- {\A(new)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 37 } - # rule 38: none - if {[regexp -start $index_ -indices -line -nocase -- {\A(none)} $yy_current_buffer match] > 0 && \ + # rule 38: nl + if {[regexp -start $index_ -indices -line -nocase -- {\A(nl)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 38 } - # rule 39: paste - if {[regexp -start $index_ -indices -line -nocase -- {\A(paste)} $yy_current_buffer match] > 0 && \ + # rule 39: none + if {[regexp -start $index_ -indices -line -nocase -- {\A(none)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 39 } - # rule 40: property - if {[regexp -start $index_ -indices -line -nocase -- {\A(property)} $yy_current_buffer match] > 0 && \ + # rule 40: paste + if {[regexp -start $index_ -indices -line -nocase -- {\A(paste)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 40 } - # rule 41: radius - if {[regexp -start $index_ -indices -line -nocase -- {\A(radius)} $yy_current_buffer match] > 0 && \ + # rule 41: property + if {[regexp -start $index_ -indices -line -nocase -- {\A(property)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 41 } - # rule 42: rotate - if {[regexp -start $index_ -indices -line -nocase -- {\A(rotate)} $yy_current_buffer match] > 0 && \ + # rule 42: radius + if {[regexp -start $index_ -indices -line -nocase -- {\A(radius)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 42 } - # rule 43: save - if {[regexp -start $index_ -indices -line -nocase -- {\A(save)} $yy_current_buffer match] > 0 && \ + # rule 43: rotate + if {[regexp -start $index_ -indices -line -nocase -- {\A(rotate)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 43 } - # rule 44: savetemplate - if {[regexp -start $index_ -indices -line -nocase -- {\A(savetemplate)} $yy_current_buffer match] > 0 && \ + # rule 44: save + if {[regexp -start $index_ -indices -line -nocase -- {\A(save)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 44 } - # rule 45: segment - if {[regexp -start $index_ -indices -line -nocase -- {\A(segment)} $yy_current_buffer match] > 0 && \ + # rule 45: savetemplate + if {[regexp -start $index_ -indices -line -nocase -- {\A(savetemplate)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 45 } - # rule 46: select - if {[regexp -start $index_ -indices -line -nocase -- {\A(select)} $yy_current_buffer match] > 0 && \ + # rule 46: segment + if {[regexp -start $index_ -indices -line -nocase -- {\A(segment)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 46 } - # rule 47: selectall - if {[regexp -start $index_ -indices -line -nocase -- {\A(selectall)} $yy_current_buffer match] > 0 && \ + # rule 47: select + if {[regexp -start $index_ -indices -line -nocase -- {\A(select)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 47 } - # rule 48: selectnone - if {[regexp -start $index_ -indices -line -nocase -- {\A(selectnone)} $yy_current_buffer match] > 0 && \ + # rule 48: selectall + if {[regexp -start $index_ -indices -line -nocase -- {\A(selectall)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 48 } - # rule 49: shape - if {[regexp -start $index_ -indices -line -nocase -- {\A(shape)} $yy_current_buffer match] > 0 && \ + # rule 49: selectnone + if {[regexp -start $index_ -indices -line -nocase -- {\A(selectnone)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 49 } - # rule 50: show - if {[regexp -start $index_ -indices -line -nocase -- {\A(show)} $yy_current_buffer match] > 0 && \ + # rule 50: shape + if {[regexp -start $index_ -indices -line -nocase -- {\A(shape)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 50 } - # rule 51: showtext - if {[regexp -start $index_ -indices -line -nocase -- {\A(showtext)} $yy_current_buffer match] > 0 && \ + # rule 51: show + if {[regexp -start $index_ -indices -line -nocase -- {\A(show)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 51 } - # rule 52: sky - if {[regexp -start $index_ -indices -line -nocase -- {\A(sky)} $yy_current_buffer match] > 0 && \ + # rule 52: showtext + if {[regexp -start $index_ -indices -line -nocase -- {\A(showtext)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 52 } - # rule 53: skyformat - if {[regexp -start $index_ -indices -line -nocase -- {\A(skyformat)} $yy_current_buffer match] > 0 && \ + # rule 53: sky + if {[regexp -start $index_ -indices -line -nocase -- {\A(sky)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 53 } - # rule 54: source - if {[regexp -start $index_ -indices -line -nocase -- {\A(source)} $yy_current_buffer match] > 0 && \ + # rule 54: skyformat + if {[regexp -start $index_ -indices -line -nocase -- {\A(skyformat)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 54 } - # rule 55: strip - if {[regexp -start $index_ -indices -line -nocase -- {\A(strip)} $yy_current_buffer match] > 0 && \ + # rule 55: source + if {[regexp -start $index_ -indices -line -nocase -- {\A(source)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 55 } - # rule 56: system - if {[regexp -start $index_ -indices -line -nocase -- {\A(system)} $yy_current_buffer match] > 0 && \ + # rule 56: strip + if {[regexp -start $index_ -indices -line -nocase -- {\A(strip)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 56 } - # rule 57: template - if {[regexp -start $index_ -indices -line -nocase -- {\A(template)} $yy_current_buffer match] > 0 && \ + # rule 57: system + if {[regexp -start $index_ -indices -line -nocase -- {\A(system)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 57 } - # rule 58: undo - if {[regexp -start $index_ -indices -line -nocase -- {\A(undo)} $yy_current_buffer match] > 0 && \ + # rule 58: template + if {[regexp -start $index_ -indices -line -nocase -- {\A(template)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 58 } - # rule 59: update - if {[regexp -start $index_ -indices -line -nocase -- {\A(update)} $yy_current_buffer match] > 0 && \ + # rule 59: undo + if {[regexp -start $index_ -indices -line -nocase -- {\A(undo)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 59 } - # rule 60: width - if {[regexp -start $index_ -indices -line -nocase -- {\A(width)} $yy_current_buffer match] > 0 && \ + # rule 60: update + if {[regexp -start $index_ -indices -line -nocase -- {\A(update)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 60 } - # rule 61: ds9 - if {[regexp -start $index_ -indices -line -nocase -- {\A(ds9)} $yy_current_buffer match] > 0 && \ + # rule 61: width + if {[regexp -start $index_ -indices -line -nocase -- {\A(width)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 61 } - # rule 62: xml - if {[regexp -start $index_ -indices -line -nocase -- {\A(xml)} $yy_current_buffer match] > 0 && \ + # rule 62: ds9 + if {[regexp -start $index_ -indices -line -nocase -- {\A(ds9)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 62 } - # rule 63: ciao - if {[regexp -start $index_ -indices -line -nocase -- {\A(ciao)} $yy_current_buffer match] > 0 && \ + # rule 63: xml + if {[regexp -start $index_ -indices -line -nocase -- {\A(xml)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 63 } - # rule 64: saotng - if {[regexp -start $index_ -indices -line -nocase -- {\A(saotng)} $yy_current_buffer match] > 0 && \ + # rule 64: ciao + if {[regexp -start $index_ -indices -line -nocase -- {\A(ciao)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 64 } - # rule 65: pros - if {[regexp -start $index_ -indices -line -nocase -- {\A(pros)} $yy_current_buffer match] > 0 && \ + # rule 65: saotng + if {[regexp -start $index_ -indices -line -nocase -- {\A(saotng)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 65 } - # rule 66: saoimage - if {[regexp -start $index_ -indices -line -nocase -- {\A(saoimage)} $yy_current_buffer match] > 0 && \ + # rule 66: pros + if {[regexp -start $index_ -indices -line -nocase -- {\A(pros)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 66 } - # rule 67: xy - if {[regexp -start $index_ -indices -line -nocase -- {\A(xy)} $yy_current_buffer match] > 0 && \ + # rule 67: saoimage + if {[regexp -start $index_ -indices -line -nocase -- {\A(saoimage)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 67 } - # rule 68: circle - if {[regexp -start $index_ -indices -line -nocase -- {\A(circle)} $yy_current_buffer match] > 0 && \ + # rule 68: xy + if {[regexp -start $index_ -indices -line -nocase -- {\A(xy)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 68 } - # rule 69: ellipse - if {[regexp -start $index_ -indices -line -nocase -- {\A(ellipse)} $yy_current_buffer match] > 0 && \ + # rule 69: circle + if {[regexp -start $index_ -indices -line -nocase -- {\A(circle)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 69 } - # rule 70: box - if {[regexp -start $index_ -indices -line -nocase -- {\A(box)} $yy_current_buffer match] > 0 && \ + # rule 70: ellipse + if {[regexp -start $index_ -indices -line -nocase -- {\A(ellipse)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 70 } - # rule 71: polygon - if {[regexp -start $index_ -indices -line -nocase -- {\A(polygon)} $yy_current_buffer match] > 0 && \ + # rule 71: box + if {[regexp -start $index_ -indices -line -nocase -- {\A(box)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 71 } - # rule 72: point - if {[regexp -start $index_ -indices -line -nocase -- {\A(point)} $yy_current_buffer match] > 0 && \ + # rule 72: polygon + if {[regexp -start $index_ -indices -line -nocase -- {\A(polygon)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 72 } - # rule 73: line - if {[regexp -start $index_ -indices -line -nocase -- {\A(line)} $yy_current_buffer match] > 0 && \ + # rule 73: point + if {[regexp -start $index_ -indices -line -nocase -- {\A(point)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 73 } - # rule 74: vector - if {[regexp -start $index_ -indices -line -nocase -- {\A(vector)} $yy_current_buffer match] > 0 && \ + # rule 74: line + if {[regexp -start $index_ -indices -line -nocase -- {\A(line)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 74 } - # rule 75: text - if {[regexp -start $index_ -indices -line -nocase -- {\A(text)} $yy_current_buffer match] > 0 && \ + # rule 75: vector + if {[regexp -start $index_ -indices -line -nocase -- {\A(vector)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 75 } - # rule 76: ruler - if {[regexp -start $index_ -indices -line -nocase -- {\A(ruler)} $yy_current_buffer match] > 0 && \ + # rule 76: text + if {[regexp -start $index_ -indices -line -nocase -- {\A(text)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 76 } - # rule 77: compass - if {[regexp -start $index_ -indices -line -nocase -- {\A(compass)} $yy_current_buffer match] > 0 && \ + # rule 77: ruler + if {[regexp -start $index_ -indices -line -nocase -- {\A(ruler)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 77 } - # rule 78: projection - if {[regexp -start $index_ -indices -line -nocase -- {\A(projection)} $yy_current_buffer match] > 0 && \ + # rule 78: compass + if {[regexp -start $index_ -indices -line -nocase -- {\A(compass)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 78 } - # rule 79: annulus - if {[regexp -start $index_ -indices -line -nocase -- {\A(annulus)} $yy_current_buffer match] > 0 && \ + # rule 79: projection + if {[regexp -start $index_ -indices -line -nocase -- {\A(projection)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 79 } - # rule 80: ellipseannulus - if {[regexp -start $index_ -indices -line -nocase -- {\A(ellipseannulus)} $yy_current_buffer match] > 0 && \ + # rule 80: annulus + if {[regexp -start $index_ -indices -line -nocase -- {\A(annulus)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 80 } - # rule 81: boxannulus - if {[regexp -start $index_ -indices -line -nocase -- {\A(boxannulus)} $yy_current_buffer match] > 0 && \ + # rule 81: ellipseannulus + if {[regexp -start $index_ -indices -line -nocase -- {\A(ellipseannulus)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 81 } - # rule 82: panda - if {[regexp -start $index_ -indices -line -nocase -- {\A(panda)} $yy_current_buffer match] > 0 && \ + # rule 82: boxannulus + if {[regexp -start $index_ -indices -line -nocase -- {\A(boxannulus)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 82 } - # rule 83: epanda - if {[regexp -start $index_ -indices -line -nocase -- {\A(epanda)} $yy_current_buffer match] > 0 && \ + # rule 83: panda + if {[regexp -start $index_ -indices -line -nocase -- {\A(panda)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 83 } - # rule 84: bpanda - if {[regexp -start $index_ -indices -line -nocase -- {\A(bpanda)} $yy_current_buffer match] > 0 && \ + # rule 84: epanda + if {[regexp -start $index_ -indices -line -nocase -- {\A(epanda)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 84 } - # rule 85: composite - if {[regexp -start $index_ -indices -line -nocase -- {\A(composite)} $yy_current_buffer match] > 0 && \ + # rule 85: bpanda + if {[regexp -start $index_ -indices -line -nocase -- {\A(bpanda)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 85 } - # rule 86: diamond - if {[regexp -start $index_ -indices -line -nocase -- {\A(diamond)} $yy_current_buffer match] > 0 && \ + # rule 86: composite + if {[regexp -start $index_ -indices -line -nocase -- {\A(composite)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 86 } - # rule 87: cross - if {[regexp -start $index_ -indices -line -nocase -- {\A(cross)} $yy_current_buffer match] > 0 && \ + # rule 87: diamond + if {[regexp -start $index_ -indices -line -nocase -- {\A(diamond)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 87 } - # rule 88: arrow - if {[regexp -start $index_ -indices -line -nocase -- {\A(arrow)} $yy_current_buffer match] > 0 && \ + # rule 88: cross + if {[regexp -start $index_ -indices -line -nocase -- {\A(cross)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 88 } - # rule 89: boxcircle - if {[regexp -start $index_ -indices -line -nocase -- {\A(boxcircle)} $yy_current_buffer match] > 0 && \ + # rule 89: arrow + if {[regexp -start $index_ -indices -line -nocase -- {\A(arrow)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 89 } - # rule 90: -format - if {[regexp -start $index_ -indices -line -nocase -- {\A(-format)} $yy_current_buffer match] > 0 && \ + # rule 90: boxcircle + if {[regexp -start $index_ -indices -line -nocase -- {\A(boxcircle)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 90 } - # rule 91: -system - if {[regexp -start $index_ -indices -line -nocase -- {\A(-system)} $yy_current_buffer match] > 0 && \ + # rule 91: -format + if {[regexp -start $index_ -indices -line -nocase -- {\A(-format)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 91 } - # rule 92: -sky - if {[regexp -start $index_ -indices -line -nocase -- {\A(-sky)} $yy_current_buffer match] > 0 && \ + # rule 92: -system + if {[regexp -start $index_ -indices -line -nocase -- {\A(-system)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 92 } - # rule 93: yes - if {[regexp -start $index_ -indices -line -nocase -- {\A(yes)} $yy_current_buffer match] > 0 && \ + # rule 93: -sky + if {[regexp -start $index_ -indices -line -nocase -- {\A(-sky)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 93 } - # rule 94: no - if {[regexp -start $index_ -indices -line -nocase -- {\A(no)} $yy_current_buffer match] > 0 && \ + # rule 94: yes + if {[regexp -start $index_ -indices -line -nocase -- {\A(yes)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 94 } - # rule 95: on - if {[regexp -start $index_ -indices -line -nocase -- {\A(on)} $yy_current_buffer match] > 0 && \ + # rule 95: no + if {[regexp -start $index_ -indices -line -nocase -- {\A(no)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 95 } - # rule 96: off - if {[regexp -start $index_ -indices -line -nocase -- {\A(off)} $yy_current_buffer match] > 0 && \ + # rule 96: on + if {[regexp -start $index_ -indices -line -nocase -- {\A(on)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 96 } - # rule 97: true - if {[regexp -start $index_ -indices -line -nocase -- {\A(true)} $yy_current_buffer match] > 0 && \ + # rule 97: off + if {[regexp -start $index_ -indices -line -nocase -- {\A(off)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 97 } - # rule 98: false - if {[regexp -start $index_ -indices -line -nocase -- {\A(false)} $yy_current_buffer match] > 0 && \ + # rule 98: true + if {[regexp -start $index_ -indices -line -nocase -- {\A(true)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 98 } - # rule 99: image - if {[regexp -start $index_ -indices -line -nocase -- {\A(image)} $yy_current_buffer match] > 0 && \ + # rule 99: false + if {[regexp -start $index_ -indices -line -nocase -- {\A(false)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 99 } - # rule 100: physical - if {[regexp -start $index_ -indices -line -nocase -- {\A(physical)} $yy_current_buffer match] > 0 && \ + # rule 100: image + if {[regexp -start $index_ -indices -line -nocase -- {\A(image)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 100 } - # rule 101: amplifier - if {[regexp -start $index_ -indices -line -nocase -- {\A(amplifier)} $yy_current_buffer match] > 0 && \ + # rule 101: physical + if {[regexp -start $index_ -indices -line -nocase -- {\A(physical)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 101 } - # rule 102: detector - if {[regexp -start $index_ -indices -line -nocase -- {\A(detector)} $yy_current_buffer match] > 0 && \ + # rule 102: amplifier + if {[regexp -start $index_ -indices -line -nocase -- {\A(amplifier)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 102 } - # rule 103: wcs - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcs)} $yy_current_buffer match] > 0 && \ + # rule 103: detector + if {[regexp -start $index_ -indices -line -nocase -- {\A(detector)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 103 } - # rule 104: wcsa - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsa)} $yy_current_buffer match] > 0 && \ + # rule 104: wcs + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcs)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 104 } - # rule 105: wcsb - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsb)} $yy_current_buffer match] > 0 && \ + # rule 105: wcsa + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsa)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 105 } - # rule 106: wcsc - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsc)} $yy_current_buffer match] > 0 && \ + # rule 106: wcsb + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsb)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 106 } - # rule 107: wcsd - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsd)} $yy_current_buffer match] > 0 && \ + # rule 107: wcsc + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsc)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 107 } - # rule 108: wcse - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcse)} $yy_current_buffer match] > 0 && \ + # rule 108: wcsd + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsd)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 108 } - # rule 109: wcsf - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsf)} $yy_current_buffer match] > 0 && \ + # rule 109: wcse + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcse)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 109 } - # rule 110: wcsg - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsg)} $yy_current_buffer match] > 0 && \ + # rule 110: wcsf + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsf)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 110 } - # rule 111: wcsh - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsh)} $yy_current_buffer match] > 0 && \ + # rule 111: wcsg + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsg)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 111 } - # rule 112: wcsi - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsi)} $yy_current_buffer match] > 0 && \ + # rule 112: wcsh + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsh)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 112 } - # rule 113: wcsj - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsj)} $yy_current_buffer match] > 0 && \ + # rule 113: wcsi + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsi)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 113 } - # rule 114: wcsk - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsk)} $yy_current_buffer match] > 0 && \ + # rule 114: wcsj + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsj)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 114 } - # rule 115: wcsl - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsl)} $yy_current_buffer match] > 0 && \ + # rule 115: wcsk + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsk)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 115 } - # rule 116: wcsm - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsm)} $yy_current_buffer match] > 0 && \ + # rule 116: wcsl + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsl)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 116 } - # rule 117: wcsn - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsn)} $yy_current_buffer match] > 0 && \ + # rule 117: wcsm + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsm)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 117 } - # rule 118: wcso - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcso)} $yy_current_buffer match] > 0 && \ + # rule 118: wcsn + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsn)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 118 } - # rule 119: wcsp - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsp)} $yy_current_buffer match] > 0 && \ + # rule 119: wcso + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcso)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 119 } - # rule 120: wcsq - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsq)} $yy_current_buffer match] > 0 && \ + # rule 120: wcsp + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsp)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 120 } - # rule 121: wcsr - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsr)} $yy_current_buffer match] > 0 && \ + # rule 121: wcsq + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsq)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 121 } - # rule 122: wcss - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcss)} $yy_current_buffer match] > 0 && \ + # rule 122: wcsr + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsr)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 122 } - # rule 123: wcst - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcst)} $yy_current_buffer match] > 0 && \ + # rule 123: wcss + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcss)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 123 } - # rule 124: wcsu - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsu)} $yy_current_buffer match] > 0 && \ + # rule 124: wcst + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcst)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 124 } - # rule 125: wcsv - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsv)} $yy_current_buffer match] > 0 && \ + # rule 125: wcsu + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsu)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 125 } - # rule 126: wcsw - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsw)} $yy_current_buffer match] > 0 && \ + # rule 126: wcsv + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsv)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 126 } - # rule 127: wcsx - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsx)} $yy_current_buffer match] > 0 && \ + # rule 127: wcsw + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsw)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 127 } - # rule 128: wcsy - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsy)} $yy_current_buffer match] > 0 && \ + # rule 128: wcsx + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsx)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 128 } - # rule 129: wcsz - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsz)} $yy_current_buffer match] > 0 && \ + # rule 129: wcsy + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsy)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 129 } - # rule 130: fk4 - if {[regexp -start $index_ -indices -line -nocase -- {\A(fk4)} $yy_current_buffer match] > 0 && \ + # rule 130: wcsz + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsz)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 130 } - # rule 131: b1950 - if {[regexp -start $index_ -indices -line -nocase -- {\A(b1950)} $yy_current_buffer match] > 0 && \ + # rule 131: fk4 + if {[regexp -start $index_ -indices -line -nocase -- {\A(fk4)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 131 } - # rule 132: fk5 - if {[regexp -start $index_ -indices -line -nocase -- {\A(fk5)} $yy_current_buffer match] > 0 && \ + # rule 132: b1950 + if {[regexp -start $index_ -indices -line -nocase -- {\A(b1950)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 132 } - # rule 133: j2000 - if {[regexp -start $index_ -indices -line -nocase -- {\A(j2000)} $yy_current_buffer match] > 0 && \ + # rule 133: fk5 + if {[regexp -start $index_ -indices -line -nocase -- {\A(fk5)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 133 } - # rule 134: icrs - if {[regexp -start $index_ -indices -line -nocase -- {\A(icrs)} $yy_current_buffer match] > 0 && \ + # rule 134: j2000 + if {[regexp -start $index_ -indices -line -nocase -- {\A(j2000)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 134 } - # rule 135: galactic - if {[regexp -start $index_ -indices -line -nocase -- {\A(galactic)} $yy_current_buffer match] > 0 && \ + # rule 135: icrs + if {[regexp -start $index_ -indices -line -nocase -- {\A(icrs)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 135 } - # rule 136: ecliptic - if {[regexp -start $index_ -indices -line -nocase -- {\A(ecliptic)} $yy_current_buffer match] > 0 && \ + # rule 136: galactic + if {[regexp -start $index_ -indices -line -nocase -- {\A(galactic)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 136 } - # rule 137: degrees - if {[regexp -start $index_ -indices -line -nocase -- {\A(degrees)} $yy_current_buffer match] > 0 && \ + # rule 137: ecliptic + if {[regexp -start $index_ -indices -line -nocase -- {\A(ecliptic)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 137 } - # rule 138: sexagesimal - if {[regexp -start $index_ -indices -line -nocase -- {\A(sexagesimal)} $yy_current_buffer match] > 0 && \ + # rule 138: degrees + if {[regexp -start $index_ -indices -line -nocase -- {\A(degrees)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 138 } - # rule 139: [+-]?{D}+ - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+)} $yy_current_buffer match] > 0 && \ + # rule 139: sexagesimal + if {[regexp -start $index_ -indices -line -nocase -- {\A(sexagesimal)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 139 } - # rule 140: [+-]?{D}+\.?({E})? - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+\.?(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ + # rule 140: [+-]?{D}+ + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 140 } - # rule 141: [+-]?{D}*\.{D}+({E})? - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])*\.([0-9])+(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ + # rule 141: [+-]?{D}+\.?({E})? + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+\.?(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 141 } - # rule 142: \"[^\"]*\" - if {[regexp -start $index_ -indices -line -nocase -- {\A(\"[^\"]*\")} $yy_current_buffer match] > 0 && \ + # rule 142: [+-]?{D}*\.{D}+({E})? + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])*\.([0-9])+(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 142 } - # rule 143: \'[^\']*\' - if {[regexp -start $index_ -indices -line -nocase -- {\A(\'[^\']*\')} $yy_current_buffer match] > 0 && \ + # rule 143: \"[^\"]*\" + if {[regexp -start $index_ -indices -line -nocase -- {\A(\"[^\"]*\")} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 143 } - # rule 144: \{[^\}]*\} - if {[regexp -start $index_ -indices -line -nocase -- {\A(\{[^\}]*\})} $yy_current_buffer match] > 0 && \ + # rule 144: \'[^\']*\' + if {[regexp -start $index_ -indices -line -nocase -- {\A(\'[^\']*\')} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 144 } - # rule 145: \S+\S+ - if {[regexp -start $index_ -indices -line -nocase -- {\A(\S+\S+)} $yy_current_buffer match] > 0 && \ + # rule 145: \{[^\}]*\} + if {[regexp -start $index_ -indices -line -nocase -- {\A(\{[^\}]*\})} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 145 } - # rule 146: \s - if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ + # rule 146: \S+\S+ + if {[regexp -start $index_ -indices -line -nocase -- {\A(\S+\S+)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 146 } - # rule 147: . - if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + # rule 147: \s + if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 147 } + # rule 148: . + if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + [lindex $match 1] - $index_ + 1 > $yyleng} { + set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] + set yyleng [string length $yytext] + set matched_rule 148 + } if {$matched_rule == -1} { set yytext [string index $yy_current_buffer $index_] set yyleng 1 @@ -1417,404 +1424,404 @@ return $CLOSE_ return $COLOR_ } 9 { -return $COMMAND_ +return $COLOR_ } 10 { -return $COMPOSITE_ +return $COMMAND_ } 11 { -return $COPY_ +return $COMPOSITE_ } 12 { -return $CUT_ +return $COPY_ } 13 { -return $DELETE_ +return $CUT_ } 14 { -return $DELETEALL_ +return $DELETE_ } 15 { -return $DELIM_ +return $DELETEALL_ } 16 { -return $DISSOLVE_ +return $DELIM_ } 17 { -return $EDIT_ +return $DISSOLVE_ } 18 { -return $EPSILON_ +return $EDIT_ } 19 { -return $EXCLUDE_ +return $EPSILON_ } 20 { -return $FILE_ +return $EXCLUDE_ } 21 { -return $FIXED_ +return $FILE_ } 22 { -return $FONT_ +return $FIXED_ } 23 { -return $FORMAT_ +return $FONT_ } 24 { -return $FRONT_ +return $FORMAT_ } 25 { -return $GETINFO_ +return $FRONT_ } 26 { -return $GROUP_ +return $GETINFO_ } 27 { -return $GROUPS_ +return $GROUP_ } 28 { -return $INCLUDE_ +return $GROUPS_ } 29 { -return $INVERT_ +return $INCLUDE_ } 30 { -return $ITERATION_ +return $INVERT_ } 31 { -return $LIST_ +return $ITERATION_ } 32 { -return $LOAD_ +return $LIST_ } 33 { -return $MOVE_ +return $LOAD_ } 34 { -return $MOVEBACK_ +return $MOVE_ } 35 { -return $MOVEFRONT_ +return $MOVEBACK_ } 36 { -return $NEW_ +return $MOVEFRONT_ } 37 { -return $NL_ +return $NEW_ } 38 { -return $NONE_ +return $NL_ } 39 { -return $PASTE_ +return $NONE_ } 40 { -return $PROPERTY_ +return $PASTE_ } 41 { -return $RADIUS_ +return $PROPERTY_ } 42 { -return $ROTATE_ +return $RADIUS_ } 43 { -return $SAVE_ +return $ROTATE_ } 44 { -return $SAVETEMPLATE_ +return $SAVE_ } 45 { -return $SEGMENT_ +return $SAVETEMPLATE_ } 46 { -return $SELECT_ +return $SEGMENT_ } 47 { -return $SELECTALL_ +return $SELECT_ } 48 { -return $SELECTNONE_ +return $SELECTALL_ } 49 { -return $SHAPE_ +return $SELECTNONE_ } 50 { -return $SHOW_ +return $SHAPE_ } 51 { -return $SHOWTEXT_ +return $SHOW_ } 52 { -return $SKY_ +return $SHOWTEXT_ } 53 { -return $SKYFORMAT_ +return $SKY_ } 54 { -return $SOURCE_ +return $SKYFORMAT_ } 55 { -return $STRIP_ +return $SOURCE_ } 56 { -return $SYSTEM_ +return $STRIP_ } 57 { -return $TEMPLATE_ +return $SYSTEM_ } 58 { -return $UNDO_ +return $TEMPLATE_ } 59 { -return $UPDATE_ +return $UNDO_ } 60 { -return $WIDTH_ +return $UPDATE_ } 61 { -return $DS9_ +return $WIDTH_ } 62 { -return $XML_ +return $DS9_ } 63 { -return $CIAO_ +return $XML_ } 64 { -return $SAOTNG_ +return $CIAO_ } 65 { -return $PROS_ +return $SAOTNG_ } 66 { -return $SAOIMAGE_ +return $PROS_ } 67 { -return $XY_ +return $SAOIMAGE_ } 68 { -return $CIRCLE_ +return $XY_ } 69 { -return $ELLIPSE_ +return $CIRCLE_ } 70 { -return $BOX_ +return $ELLIPSE_ } 71 { -return $POLYGON_ +return $BOX_ } 72 { -return $POINT_ +return $POLYGON_ } 73 { -return $LINE_ +return $POINT_ } 74 { -return $VECTOR_ +return $LINE_ } 75 { -return $TEXT_ +return $VECTOR_ } 76 { -return $RULER_ +return $TEXT_ } 77 { -return $COMPASS_ +return $RULER_ } 78 { -return $PROJECTION_ +return $COMPASS_ } 79 { -return $ANNULUS_ +return $PROJECTION_ } 80 { -return $ELLIPSEANNULUS_ +return $ANNULUS_ } 81 { -return $BOXANNULUS_ +return $ELLIPSEANNULUS_ } 82 { -return $PANDA_ +return $BOXANNULUS_ } 83 { -return $EPANDA_ +return $PANDA_ } 84 { -return $BPANDA_ +return $EPANDA_ } 85 { -return $COMPOSITE_ +return $BPANDA_ } 86 { -return $DIAMOND_ +return $COMPOSITE_ } 87 { -return $CROSS_ +return $DIAMOND_ } 88 { -return $ARROW_ +return $CROSS_ } 89 { -return $BOXCIRCLE_ +return $ARROW_ } 90 { -return $MFORMAT_ +return $BOXCIRCLE_ } 91 { -return $MSYSTEM_ +return $MFORMAT_ } 92 { -return $MSKY_ +return $MSYSTEM_ } 93 { -return $YES_ +return $MSKY_ } 94 { -return $NO_ +return $YES_ } 95 { -return $ON_ +return $NO_ } 96 { -return $OFF_ +return $ON_ } 97 { -return $TRUE_ +return $OFF_ } 98 { -return $FALSE_ +return $TRUE_ } 99 { -return $IMAGE_ +return $FALSE_ } 100 { -return $PHYSICAL_ +return $IMAGE_ } 101 { -return $AMPLIFIER_ +return $PHYSICAL_ } 102 { -return $DETECTOR_ +return $AMPLIFIER_ } 103 { -return $WCS_ +return $DETECTOR_ } 104 { -return $WCSA_ +return $WCS_ } 105 { -return $WCSB_ +return $WCSA_ } 106 { -return $WCSC_ +return $WCSB_ } 107 { -return $WCSD_ +return $WCSC_ } 108 { -return $WCSE_ +return $WCSD_ } 109 { -return $WCSF_ +return $WCSE_ } 110 { -return $WCSG_ +return $WCSF_ } 111 { -return $WCSH_ +return $WCSG_ } 112 { -return $WCSI_ +return $WCSH_ } 113 { -return $WCSJ_ +return $WCSI_ } 114 { -return $WCSK_ +return $WCSJ_ } 115 { -return $WCSL_ +return $WCSK_ } 116 { -return $WCSM_ +return $WCSL_ } 117 { -return $WCSN_ +return $WCSM_ } 118 { -return $WCSO_ +return $WCSN_ } 119 { -return $WCSP_ +return $WCSO_ } 120 { -return $WCSQ_ +return $WCSP_ } 121 { -return $WCSR_ +return $WCSQ_ } 122 { -return $WCSS_ +return $WCSR_ } 123 { -return $WCST_ +return $WCSS_ } 124 { -return $WCSU_ +return $WCST_ } 125 { -return $WCSV_ +return $WCSU_ } 126 { -return $WCSW_ +return $WCSV_ } 127 { -return $WCSX_ +return $WCSW_ } 128 { -return $WCSY_ +return $WCSX_ } 129 { -return $WCSZ_ +return $WCSY_ } 130 { -return $FK4_ +return $WCSZ_ } 131 { return $FK4_ } 132 { -return $FK5_ +return $FK4_ } 133 { return $FK5_ } 134 { -return $ICRS_ +return $FK5_ } 135 { -return $GALACTIC_ +return $ICRS_ } 136 { -return $ECLIPTIC_ +return $GALACTIC_ } 137 { -return $DEGREES_ +return $ECLIPTIC_ } 138 { -return $SEXAGESIMAL_ +return $DEGREES_ } 139 { -set yylval $yytext; return $INT_ +return $SEXAGESIMAL_ } - 140 - - 141 { -set yylval $yytext; return $REAL_ + 140 { +set yylval $yytext; return $INT_ } + 141 - 142 { -set yylval [string range $yytext 1 end-1]; return $STRING_ +set yylval $yytext; return $REAL_ } 143 { set yylval [string range $yytext 1 end-1]; return $STRING_ @@ -1823,12 +1830,15 @@ set yylval [string range $yytext 1 end-1]; return $STRING_ set yylval [string range $yytext 1 end-1]; return $STRING_ } 145 { -set yylval $yytext; return $STRING_ +set yylval [string range $yytext 1 end-1]; return $STRING_ } 146 { -# ignore whitespace +set yylval $yytext; return $STRING_ } 147 { +# ignore whitespace + } + 148 { set yylval $yytext; return $yylval } default diff --git a/ds9/parsers/regionsendlex.fcl b/ds9/parsers/regionsendlex.fcl index 023d749..03f8028 100644 --- a/ds9/parsers/regionsendlex.fcl +++ b/ds9/parsers/regionsendlex.fcl @@ -12,6 +12,7 @@ autocentroid {return $AUTOCENTROID_} background {return $BACKGROUND_} centroid {return $CENTROID_} color {return $COLOR_} +colour {return $COLOR_} delim {return $DELIM_} epsilon {return $EPSILON_} exclude {return $EXCLUDE_} diff --git a/ds9/parsers/regionsendlex.tcl b/ds9/parsers/regionsendlex.tcl index 53dcda1..7c25156 100644 --- a/ds9/parsers/regionsendlex.tcl +++ b/ds9/parsers/regionsendlex.tcl @@ -323,622 +323,629 @@ set MGROUP_ 344 set yyleng [string length $yytext] set matched_rule 4 } - # rule 5: delim - if {[regexp -start $index_ -indices -line -nocase -- {\A(delim)} $yy_current_buffer match] > 0 && \ + # rule 5: colour + if {[regexp -start $index_ -indices -line -nocase -- {\A(colour)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 5 } - # rule 6: epsilon - if {[regexp -start $index_ -indices -line -nocase -- {\A(epsilon)} $yy_current_buffer match] > 0 && \ + # rule 6: delim + if {[regexp -start $index_ -indices -line -nocase -- {\A(delim)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 6 } - # rule 7: exclude - if {[regexp -start $index_ -indices -line -nocase -- {\A(exclude)} $yy_current_buffer match] > 0 && \ + # rule 7: epsilon + if {[regexp -start $index_ -indices -line -nocase -- {\A(epsilon)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 7 } - # rule 8: format - if {[regexp -start $index_ -indices -line -nocase -- {\A(format)} $yy_current_buffer match] > 0 && \ + # rule 8: exclude + if {[regexp -start $index_ -indices -line -nocase -- {\A(exclude)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 8 } - # rule 9: group - if {[regexp -start $index_ -indices -line -nocase -- {\A(group)} $yy_current_buffer match] > 0 && \ + # rule 9: format + if {[regexp -start $index_ -indices -line -nocase -- {\A(format)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 9 } - # rule 10: groups - if {[regexp -start $index_ -indices -line -nocase -- {\A(groups)} $yy_current_buffer match] > 0 && \ + # rule 10: group + if {[regexp -start $index_ -indices -line -nocase -- {\A(group)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 10 } - # rule 11: include - if {[regexp -start $index_ -indices -line -nocase -- {\A(include)} $yy_current_buffer match] > 0 && \ + # rule 11: groups + if {[regexp -start $index_ -indices -line -nocase -- {\A(groups)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 11 } - # rule 12: iteration - if {[regexp -start $index_ -indices -line -nocase -- {\A(iteration)} $yy_current_buffer match] > 0 && \ + # rule 12: include + if {[regexp -start $index_ -indices -line -nocase -- {\A(include)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 12 } - # rule 13: nl - if {[regexp -start $index_ -indices -line -nocase -- {\A(nl)} $yy_current_buffer match] > 0 && \ + # rule 13: iteration + if {[regexp -start $index_ -indices -line -nocase -- {\A(iteration)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 13 } - # rule 14: radius - if {[regexp -start $index_ -indices -line -nocase -- {\A(radius)} $yy_current_buffer match] > 0 && \ + # rule 14: nl + if {[regexp -start $index_ -indices -line -nocase -- {\A(nl)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 14 } - # rule 15: selected - if {[regexp -start $index_ -indices -line -nocase -- {\A(selected)} $yy_current_buffer match] > 0 && \ + # rule 15: radius + if {[regexp -start $index_ -indices -line -nocase -- {\A(radius)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 15 } - # rule 16: shape - if {[regexp -start $index_ -indices -line -nocase -- {\A(shape)} $yy_current_buffer match] > 0 && \ + # rule 16: selected + if {[regexp -start $index_ -indices -line -nocase -- {\A(selected)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 16 } - # rule 17: show - if {[regexp -start $index_ -indices -line -nocase -- {\A(show)} $yy_current_buffer match] > 0 && \ + # rule 17: shape + if {[regexp -start $index_ -indices -line -nocase -- {\A(shape)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 17 } - # rule 18: showtext - if {[regexp -start $index_ -indices -line -nocase -- {\A(showtext)} $yy_current_buffer match] > 0 && \ + # rule 18: show + if {[regexp -start $index_ -indices -line -nocase -- {\A(show)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 18 } - # rule 19: sky - if {[regexp -start $index_ -indices -line -nocase -- {\A(sky)} $yy_current_buffer match] > 0 && \ + # rule 19: showtext + if {[regexp -start $index_ -indices -line -nocase -- {\A(showtext)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 19 } - # rule 20: skyformat - if {[regexp -start $index_ -indices -line -nocase -- {\A(skyformat)} $yy_current_buffer match] > 0 && \ + # rule 20: sky + if {[regexp -start $index_ -indices -line -nocase -- {\A(sky)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 20 } - # rule 21: source - if {[regexp -start $index_ -indices -line -nocase -- {\A(source)} $yy_current_buffer match] > 0 && \ + # rule 21: skyformat + if {[regexp -start $index_ -indices -line -nocase -- {\A(skyformat)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 21 } - # rule 22: strip - if {[regexp -start $index_ -indices -line -nocase -- {\A(strip)} $yy_current_buffer match] > 0 && \ + # rule 22: source + if {[regexp -start $index_ -indices -line -nocase -- {\A(source)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 22 } - # rule 23: system - if {[regexp -start $index_ -indices -line -nocase -- {\A(system)} $yy_current_buffer match] > 0 && \ + # rule 23: strip + if {[regexp -start $index_ -indices -line -nocase -- {\A(strip)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 23 } - # rule 24: width - if {[regexp -start $index_ -indices -line -nocase -- {\A(width)} $yy_current_buffer match] > 0 && \ + # rule 24: system + if {[regexp -start $index_ -indices -line -nocase -- {\A(system)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 24 } - # rule 25: ds9 - if {[regexp -start $index_ -indices -line -nocase -- {\A(ds9)} $yy_current_buffer match] > 0 && \ + # rule 25: width + if {[regexp -start $index_ -indices -line -nocase -- {\A(width)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 25 } - # rule 26: xml - if {[regexp -start $index_ -indices -line -nocase -- {\A(xml)} $yy_current_buffer match] > 0 && \ + # rule 26: ds9 + if {[regexp -start $index_ -indices -line -nocase -- {\A(ds9)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 26 } - # rule 27: ciao - if {[regexp -start $index_ -indices -line -nocase -- {\A(ciao)} $yy_current_buffer match] > 0 && \ + # rule 27: xml + if {[regexp -start $index_ -indices -line -nocase -- {\A(xml)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 27 } - # rule 28: saotng - if {[regexp -start $index_ -indices -line -nocase -- {\A(saotng)} $yy_current_buffer match] > 0 && \ + # rule 28: ciao + if {[regexp -start $index_ -indices -line -nocase -- {\A(ciao)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 28 } - # rule 29: pros - if {[regexp -start $index_ -indices -line -nocase -- {\A(pros)} $yy_current_buffer match] > 0 && \ + # rule 29: saotng + if {[regexp -start $index_ -indices -line -nocase -- {\A(saotng)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 29 } - # rule 30: saoimage - if {[regexp -start $index_ -indices -line -nocase -- {\A(saoimage)} $yy_current_buffer match] > 0 && \ + # rule 30: pros + if {[regexp -start $index_ -indices -line -nocase -- {\A(pros)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 30 } - # rule 31: xy - if {[regexp -start $index_ -indices -line -nocase -- {\A(xy)} $yy_current_buffer match] > 0 && \ + # rule 31: saoimage + if {[regexp -start $index_ -indices -line -nocase -- {\A(saoimage)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 31 } - # rule 32: -format - if {[regexp -start $index_ -indices -line -nocase -- {\A(-format)} $yy_current_buffer match] > 0 && \ + # rule 32: xy + if {[regexp -start $index_ -indices -line -nocase -- {\A(xy)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 32 } - # rule 33: -system - if {[regexp -start $index_ -indices -line -nocase -- {\A(-system)} $yy_current_buffer match] > 0 && \ + # rule 33: -format + if {[regexp -start $index_ -indices -line -nocase -- {\A(-format)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 33 } - # rule 34: -sky - if {[regexp -start $index_ -indices -line -nocase -- {\A(-sky)} $yy_current_buffer match] > 0 && \ + # rule 34: -system + if {[regexp -start $index_ -indices -line -nocase -- {\A(-system)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 34 } - # rule 35: -skyformat - if {[regexp -start $index_ -indices -line -nocase -- {\A(-skyformat)} $yy_current_buffer match] > 0 && \ + # rule 35: -sky + if {[regexp -start $index_ -indices -line -nocase -- {\A(-sky)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 35 } - # rule 36: -strip - if {[regexp -start $index_ -indices -line -nocase -- {\A(-strip)} $yy_current_buffer match] > 0 && \ + # rule 36: -skyformat + if {[regexp -start $index_ -indices -line -nocase -- {\A(-skyformat)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 36 } - # rule 37: -delim - if {[regexp -start $index_ -indices -line -nocase -- {\A(-delim)} $yy_current_buffer match] > 0 && \ + # rule 37: -strip + if {[regexp -start $index_ -indices -line -nocase -- {\A(-strip)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 37 } - # rule 38: -prop - if {[regexp -start $index_ -indices -line -nocase -- {\A(-prop)} $yy_current_buffer match] > 0 && \ + # rule 38: -delim + if {[regexp -start $index_ -indices -line -nocase -- {\A(-delim)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 38 } - # rule 39: -group - if {[regexp -start $index_ -indices -line -nocase -- {\A(-group)} $yy_current_buffer match] > 0 && \ + # rule 39: -prop + if {[regexp -start $index_ -indices -line -nocase -- {\A(-prop)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 39 } - # rule 40: yes - if {[regexp -start $index_ -indices -line -nocase -- {\A(yes)} $yy_current_buffer match] > 0 && \ + # rule 40: -group + if {[regexp -start $index_ -indices -line -nocase -- {\A(-group)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 40 } - # rule 41: no - if {[regexp -start $index_ -indices -line -nocase -- {\A(no)} $yy_current_buffer match] > 0 && \ + # rule 41: yes + if {[regexp -start $index_ -indices -line -nocase -- {\A(yes)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 41 } - # rule 42: on - if {[regexp -start $index_ -indices -line -nocase -- {\A(on)} $yy_current_buffer match] > 0 && \ + # rule 42: no + if {[regexp -start $index_ -indices -line -nocase -- {\A(no)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 42 } - # rule 43: off - if {[regexp -start $index_ -indices -line -nocase -- {\A(off)} $yy_current_buffer match] > 0 && \ + # rule 43: on + if {[regexp -start $index_ -indices -line -nocase -- {\A(on)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 43 } - # rule 44: true - if {[regexp -start $index_ -indices -line -nocase -- {\A(true)} $yy_current_buffer match] > 0 && \ + # rule 44: off + if {[regexp -start $index_ -indices -line -nocase -- {\A(off)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 44 } - # rule 45: false - if {[regexp -start $index_ -indices -line -nocase -- {\A(false)} $yy_current_buffer match] > 0 && \ + # rule 45: true + if {[regexp -start $index_ -indices -line -nocase -- {\A(true)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 45 } - # rule 46: image - if {[regexp -start $index_ -indices -line -nocase -- {\A(image)} $yy_current_buffer match] > 0 && \ + # rule 46: false + if {[regexp -start $index_ -indices -line -nocase -- {\A(false)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 46 } - # rule 47: physical - if {[regexp -start $index_ -indices -line -nocase -- {\A(physical)} $yy_current_buffer match] > 0 && \ + # rule 47: image + if {[regexp -start $index_ -indices -line -nocase -- {\A(image)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 47 } - # rule 48: amplifier - if {[regexp -start $index_ -indices -line -nocase -- {\A(amplifier)} $yy_current_buffer match] > 0 && \ + # rule 48: physical + if {[regexp -start $index_ -indices -line -nocase -- {\A(physical)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 48 } - # rule 49: detector - if {[regexp -start $index_ -indices -line -nocase -- {\A(detector)} $yy_current_buffer match] > 0 && \ + # rule 49: amplifier + if {[regexp -start $index_ -indices -line -nocase -- {\A(amplifier)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 49 } - # rule 50: wcs - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcs)} $yy_current_buffer match] > 0 && \ + # rule 50: detector + if {[regexp -start $index_ -indices -line -nocase -- {\A(detector)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 50 } - # rule 51: wcsa - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsa)} $yy_current_buffer match] > 0 && \ + # rule 51: wcs + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcs)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 51 } - # rule 52: wcsb - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsb)} $yy_current_buffer match] > 0 && \ + # rule 52: wcsa + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsa)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 52 } - # rule 53: wcsc - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsc)} $yy_current_buffer match] > 0 && \ + # rule 53: wcsb + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsb)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 53 } - # rule 54: wcsd - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsd)} $yy_current_buffer match] > 0 && \ + # rule 54: wcsc + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsc)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 54 } - # rule 55: wcse - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcse)} $yy_current_buffer match] > 0 && \ + # rule 55: wcsd + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsd)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 55 } - # rule 56: wcsf - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsf)} $yy_current_buffer match] > 0 && \ + # rule 56: wcse + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcse)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 56 } - # rule 57: wcsg - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsg)} $yy_current_buffer match] > 0 && \ + # rule 57: wcsf + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsf)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 57 } - # rule 58: wcsh - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsh)} $yy_current_buffer match] > 0 && \ + # rule 58: wcsg + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsg)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 58 } - # rule 59: wcsi - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsi)} $yy_current_buffer match] > 0 && \ + # rule 59: wcsh + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsh)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 59 } - # rule 60: wcsj - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsj)} $yy_current_buffer match] > 0 && \ + # rule 60: wcsi + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsi)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 60 } - # rule 61: wcsk - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsk)} $yy_current_buffer match] > 0 && \ + # rule 61: wcsj + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsj)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 61 } - # rule 62: wcsl - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsl)} $yy_current_buffer match] > 0 && \ + # rule 62: wcsk + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsk)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 62 } - # rule 63: wcsm - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsm)} $yy_current_buffer match] > 0 && \ + # rule 63: wcsl + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsl)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 63 } - # rule 64: wcsn - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsn)} $yy_current_buffer match] > 0 && \ + # rule 64: wcsm + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsm)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 64 } - # rule 65: wcso - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcso)} $yy_current_buffer match] > 0 && \ + # rule 65: wcsn + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsn)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 65 } - # rule 66: wcsp - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsp)} $yy_current_buffer match] > 0 && \ + # rule 66: wcso + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcso)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 66 } - # rule 67: wcsq - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsq)} $yy_current_buffer match] > 0 && \ + # rule 67: wcsp + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsp)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 67 } - # rule 68: wcsr - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsr)} $yy_current_buffer match] > 0 && \ + # rule 68: wcsq + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsq)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 68 } - # rule 69: wcss - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcss)} $yy_current_buffer match] > 0 && \ + # rule 69: wcsr + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsr)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 69 } - # rule 70: wcst - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcst)} $yy_current_buffer match] > 0 && \ + # rule 70: wcss + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcss)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 70 } - # rule 71: wcsu - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsu)} $yy_current_buffer match] > 0 && \ + # rule 71: wcst + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcst)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 71 } - # rule 72: wcsv - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsv)} $yy_current_buffer match] > 0 && \ + # rule 72: wcsu + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsu)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 72 } - # rule 73: wcsw - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsw)} $yy_current_buffer match] > 0 && \ + # rule 73: wcsv + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsv)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 73 } - # rule 74: wcsx - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsx)} $yy_current_buffer match] > 0 && \ + # rule 74: wcsw + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsw)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 74 } - # rule 75: wcsy - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsy)} $yy_current_buffer match] > 0 && \ + # rule 75: wcsx + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsx)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 75 } - # rule 76: wcsz - if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsz)} $yy_current_buffer match] > 0 && \ + # rule 76: wcsy + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsy)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 76 } - # rule 77: fk4 - if {[regexp -start $index_ -indices -line -nocase -- {\A(fk4)} $yy_current_buffer match] > 0 && \ + # rule 77: wcsz + if {[regexp -start $index_ -indices -line -nocase -- {\A(wcsz)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 77 } - # rule 78: b1950 - if {[regexp -start $index_ -indices -line -nocase -- {\A(b1950)} $yy_current_buffer match] > 0 && \ + # rule 78: fk4 + if {[regexp -start $index_ -indices -line -nocase -- {\A(fk4)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 78 } - # rule 79: fk5 - if {[regexp -start $index_ -indices -line -nocase -- {\A(fk5)} $yy_current_buffer match] > 0 && \ + # rule 79: b1950 + if {[regexp -start $index_ -indices -line -nocase -- {\A(b1950)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 79 } - # rule 80: j2000 - if {[regexp -start $index_ -indices -line -nocase -- {\A(j2000)} $yy_current_buffer match] > 0 && \ + # rule 80: fk5 + if {[regexp -start $index_ -indices -line -nocase -- {\A(fk5)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 80 } - # rule 81: icrs - if {[regexp -start $index_ -indices -line -nocase -- {\A(icrs)} $yy_current_buffer match] > 0 && \ + # rule 81: j2000 + if {[regexp -start $index_ -indices -line -nocase -- {\A(j2000)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 81 } - # rule 82: galactic - if {[regexp -start $index_ -indices -line -nocase -- {\A(galactic)} $yy_current_buffer match] > 0 && \ + # rule 82: icrs + if {[regexp -start $index_ -indices -line -nocase -- {\A(icrs)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 82 } - # rule 83: ecliptic - if {[regexp -start $index_ -indices -line -nocase -- {\A(ecliptic)} $yy_current_buffer match] > 0 && \ + # rule 83: galactic + if {[regexp -start $index_ -indices -line -nocase -- {\A(galactic)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 83 } - # rule 84: degrees - if {[regexp -start $index_ -indices -line -nocase -- {\A(degrees)} $yy_current_buffer match] > 0 && \ + # rule 84: ecliptic + if {[regexp -start $index_ -indices -line -nocase -- {\A(ecliptic)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 84 } - # rule 85: sexagesimal - if {[regexp -start $index_ -indices -line -nocase -- {\A(sexagesimal)} $yy_current_buffer match] > 0 && \ + # rule 85: degrees + if {[regexp -start $index_ -indices -line -nocase -- {\A(degrees)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 85 } - # rule 86: [+-]?{D}+ - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+)} $yy_current_buffer match] > 0 && \ + # rule 86: sexagesimal + if {[regexp -start $index_ -indices -line -nocase -- {\A(sexagesimal)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 86 } - # rule 87: \"[^\"]*\" - if {[regexp -start $index_ -indices -line -nocase -- {\A(\"[^\"]*\")} $yy_current_buffer match] > 0 && \ + # rule 87: [+-]?{D}+ + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 87 } - # rule 88: \'[^\']*\' - if {[regexp -start $index_ -indices -line -nocase -- {\A(\'[^\']*\')} $yy_current_buffer match] > 0 && \ + # rule 88: \"[^\"]*\" + if {[regexp -start $index_ -indices -line -nocase -- {\A(\"[^\"]*\")} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 88 } - # rule 89: \{[^\}]*\} - if {[regexp -start $index_ -indices -line -nocase -- {\A(\{[^\}]*\})} $yy_current_buffer match] > 0 && \ + # rule 89: \'[^\']*\' + if {[regexp -start $index_ -indices -line -nocase -- {\A(\'[^\']*\')} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 89 } - # rule 90: \S+\S+ - if {[regexp -start $index_ -indices -line -nocase -- {\A(\S+\S+)} $yy_current_buffer match] > 0 && \ + # rule 90: \{[^\}]*\} + if {[regexp -start $index_ -indices -line -nocase -- {\A(\{[^\}]*\})} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 90 } - # rule 91: \s - if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ + # rule 91: \S+\S+ + if {[regexp -start $index_ -indices -line -nocase -- {\A(\S+\S+)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 91 } - # rule 92: . - if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + # rule 92: \s + if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 92 } + # rule 93: . + if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + [lindex $match 1] - $index_ + 1 > $yyleng} { + set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] + set yyleng [string length $yytext] + set matched_rule 93 + } if {$matched_rule == -1} { set yytext [string index $yy_current_buffer $index_] set yyleng 1 @@ -967,253 +974,253 @@ return $CENTROID_ return $COLOR_ } 5 { -return $DELIM_ +return $COLOR_ } 6 { -return $EPSILON_ +return $DELIM_ } 7 { -return $EXCLUDE_ +return $EPSILON_ } 8 { -return $FORMAT_ +return $EXCLUDE_ } 9 { -return $GROUP_ +return $FORMAT_ } 10 { -return $GROUPS_ +return $GROUP_ } 11 { -return $INCLUDE_ +return $GROUPS_ } 12 { -return $ITERATION_ +return $INCLUDE_ } 13 { -return $NL_ +return $ITERATION_ } 14 { -return $RADIUS_ +return $NL_ } 15 { -return $SELECTED_ +return $RADIUS_ } 16 { -return $SHAPE_ +return $SELECTED_ } 17 { -return $SHOW_ +return $SHAPE_ } 18 { -return $SHOWTEXT_ +return $SHOW_ } 19 { -return $SKY_ +return $SHOWTEXT_ } 20 { -return $SKYFORMAT_ +return $SKY_ } 21 { -return $SOURCE_ +return $SKYFORMAT_ } 22 { -return $STRIP_ +return $SOURCE_ } 23 { -return $SYSTEM_ +return $STRIP_ } 24 { -return $WIDTH_ +return $SYSTEM_ } 25 { -return $DS9_ +return $WIDTH_ } 26 { -return $XML_ +return $DS9_ } 27 { -return $CIAO_ +return $XML_ } 28 { -return $SAOTNG_ +return $CIAO_ } 29 { -return $PROS_ +return $SAOTNG_ } 30 { -return $SAOIMAGE_ +return $PROS_ } 31 { -return $XY_ +return $SAOIMAGE_ } 32 { -return $MFORMAT_ +return $XY_ } 33 { -return $MSYSTEM_ +return $MFORMAT_ } 34 { -return $MSKY_ +return $MSYSTEM_ } 35 { -return $MSKYFORMAT_ +return $MSKY_ } 36 { -return $MSTRIP_ +return $MSKYFORMAT_ } 37 { -return $MDELIM_ +return $MSTRIP_ } 38 { -return $MPROP_ +return $MDELIM_ } 39 { -return $MGROUP_ +return $MPROP_ } 40 { -return $YES_ +return $MGROUP_ } 41 { -return $NO_ +return $YES_ } 42 { -return $ON_ +return $NO_ } 43 { -return $OFF_ +return $ON_ } 44 { -return $TRUE_ +return $OFF_ } 45 { -return $FALSE_ +return $TRUE_ } 46 { -return $IMAGE_ +return $FALSE_ } 47 { -return $PHYSICAL_ +return $IMAGE_ } 48 { -return $AMPLIFIER_ +return $PHYSICAL_ } 49 { -return $DETECTOR_ +return $AMPLIFIER_ } 50 { -return $WCS_ +return $DETECTOR_ } 51 { -return $WCSA_ +return $WCS_ } 52 { -return $WCSB_ +return $WCSA_ } 53 { -return $WCSC_ +return $WCSB_ } 54 { -return $WCSD_ +return $WCSC_ } 55 { -return $WCSE_ +return $WCSD_ } 56 { -return $WCSF_ +return $WCSE_ } 57 { -return $WCSG_ +return $WCSF_ } 58 { -return $WCSH_ +return $WCSG_ } 59 { -return $WCSI_ +return $WCSH_ } 60 { -return $WCSJ_ +return $WCSI_ } 61 { -return $WCSK_ +return $WCSJ_ } 62 { -return $WCSL_ +return $WCSK_ } 63 { -return $WCSM_ +return $WCSL_ } 64 { -return $WCSN_ +return $WCSM_ } 65 { -return $WCSO_ +return $WCSN_ } 66 { -return $WCSP_ +return $WCSO_ } 67 { -return $WCSQ_ +return $WCSP_ } 68 { -return $WCSR_ +return $WCSQ_ } 69 { -return $WCSS_ +return $WCSR_ } 70 { -return $WCST_ +return $WCSS_ } 71 { -return $WCSU_ +return $WCST_ } 72 { -return $WCSV_ +return $WCSU_ } 73 { -return $WCSW_ +return $WCSV_ } 74 { -return $WCSX_ +return $WCSW_ } 75 { -return $WCSY_ +return $WCSX_ } 76 { -return $WCSZ_ +return $WCSY_ } 77 { -return $FK4_ +return $WCSZ_ } 78 { return $FK4_ } 79 { -return $FK5_ +return $FK4_ } 80 { return $FK5_ } 81 { -return $ICRS_ +return $FK5_ } 82 { -return $GALACTIC_ +return $ICRS_ } 83 { -return $ECLIPTIC_ +return $GALACTIC_ } 84 { -return $DEGREES_ +return $ECLIPTIC_ } 85 { -return $SEXAGESIMAL_ +return $DEGREES_ } 86 { -set yylval $yytext; return $INT_ +return $SEXAGESIMAL_ } 87 { -set yylval [string range $yytext 1 end-1]; return $STRING_ +set yylval $yytext; return $INT_ } 88 { set yylval [string range $yytext 1 end-1]; return $STRING_ @@ -1222,12 +1229,15 @@ set yylval [string range $yytext 1 end-1]; return $STRING_ set yylval [string range $yytext 1 end-1]; return $STRING_ } 90 { -set yylval $yytext; return $STRING_ +set yylval [string range $yytext 1 end-1]; return $STRING_ } 91 { -# ignore whitespace +set yylval $yytext; return $STRING_ } 92 { +# ignore whitespace + } + 93 { set yylval $yytext; return $yylval } default diff --git a/ds9/parsers/threedlex.fcl b/ds9/parsers/threedlex.fcl index 2b954a2..976d975 100644 --- a/ds9/parsers/threedlex.fcl +++ b/ds9/parsers/threedlex.fcl @@ -15,6 +15,7 @@ bg {return $BG_} border {return $BORDER_} close {return $CLOSE_} color {return $COLOR_} +colour {return $COLOR_} compass {return $COMPASS_} el {return $EL_} elevation {return $EL_} diff --git a/ds9/parsers/threedlex.tcl b/ds9/parsers/threedlex.tcl index 9b3cca2..fcf0d8b 100644 --- a/ds9/parsers/threedlex.tcl +++ b/ds9/parsers/threedlex.tcl @@ -282,202 +282,209 @@ set VIEW_ 282 set yyleng [string length $yytext] set matched_rule 7 } - # rule 8: compass - if {[regexp -start $index_ -indices -line -nocase -- {\A(compass)} $yy_current_buffer match] > 0 && \ + # rule 8: colour + if {[regexp -start $index_ -indices -line -nocase -- {\A(colour)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 8 } - # rule 9: el - if {[regexp -start $index_ -indices -line -nocase -- {\A(el)} $yy_current_buffer match] > 0 && \ + # rule 9: compass + if {[regexp -start $index_ -indices -line -nocase -- {\A(compass)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 9 } - # rule 10: elevation - if {[regexp -start $index_ -indices -line -nocase -- {\A(elevation)} $yy_current_buffer match] > 0 && \ + # rule 10: el + if {[regexp -start $index_ -indices -line -nocase -- {\A(el)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 10 } - # rule 11: highlite - if {[regexp -start $index_ -indices -line -nocase -- {\A(highlite)} $yy_current_buffer match] > 0 && \ + # rule 11: elevation + if {[regexp -start $index_ -indices -line -nocase -- {\A(elevation)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 11 } - # rule 12: lock - if {[regexp -start $index_ -indices -line -nocase -- {\A(lock)} $yy_current_buffer match] > 0 && \ + # rule 12: highlite + if {[regexp -start $index_ -indices -line -nocase -- {\A(highlite)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 12 } - # rule 13: match - if {[regexp -start $index_ -indices -line -nocase -- {\A(match)} $yy_current_buffer match] > 0 && \ + # rule 13: lock + if {[regexp -start $index_ -indices -line -nocase -- {\A(lock)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 13 } - # rule 14: method - if {[regexp -start $index_ -indices -line -nocase -- {\A(method)} $yy_current_buffer match] > 0 && \ + # rule 14: match + if {[regexp -start $index_ -indices -line -nocase -- {\A(match)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 14 } - # rule 15: mip - if {[regexp -start $index_ -indices -line -nocase -- {\A(mip)} $yy_current_buffer match] > 0 && \ + # rule 15: method + if {[regexp -start $index_ -indices -line -nocase -- {\A(method)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 15 } - # rule 16: none - if {[regexp -start $index_ -indices -line -nocase -- {\A(none)} $yy_current_buffer match] > 0 && \ + # rule 16: mip + if {[regexp -start $index_ -indices -line -nocase -- {\A(mip)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 16 } - # rule 17: open - if {[regexp -start $index_ -indices -line -nocase -- {\A(open)} $yy_current_buffer match] > 0 && \ + # rule 17: none + if {[regexp -start $index_ -indices -line -nocase -- {\A(none)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 17 } - # rule 18: scale - if {[regexp -start $index_ -indices -line -nocase -- {\A(scale)} $yy_current_buffer match] > 0 && \ + # rule 18: open + if {[regexp -start $index_ -indices -line -nocase -- {\A(open)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 18 } - # rule 19: view - if {[regexp -start $index_ -indices -line -nocase -- {\A(view)} $yy_current_buffer match] > 0 && \ + # rule 19: scale + if {[regexp -start $index_ -indices -line -nocase -- {\A(scale)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 19 } - # rule 20: vp - if {[regexp -start $index_ -indices -line -nocase -- {\A(vp)} $yy_current_buffer match] > 0 && \ + # rule 20: view + if {[regexp -start $index_ -indices -line -nocase -- {\A(view)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 20 } - # rule 21: yes - if {[regexp -start $index_ -indices -line -nocase -- {\A(yes)} $yy_current_buffer match] > 0 && \ + # rule 21: vp + if {[regexp -start $index_ -indices -line -nocase -- {\A(vp)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 21 } - # rule 22: no - if {[regexp -start $index_ -indices -line -nocase -- {\A(no)} $yy_current_buffer match] > 0 && \ + # rule 22: yes + if {[regexp -start $index_ -indices -line -nocase -- {\A(yes)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 22 } - # rule 23: on - if {[regexp -start $index_ -indices -line -nocase -- {\A(on)} $yy_current_buffer match] > 0 && \ + # rule 23: no + if {[regexp -start $index_ -indices -line -nocase -- {\A(no)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 23 } - # rule 24: off - if {[regexp -start $index_ -indices -line -nocase -- {\A(off)} $yy_current_buffer match] > 0 && \ + # rule 24: on + if {[regexp -start $index_ -indices -line -nocase -- {\A(on)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 24 } - # rule 25: true - if {[regexp -start $index_ -indices -line -nocase -- {\A(true)} $yy_current_buffer match] > 0 && \ + # rule 25: off + if {[regexp -start $index_ -indices -line -nocase -- {\A(off)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 25 } - # rule 26: false - if {[regexp -start $index_ -indices -line -nocase -- {\A(false)} $yy_current_buffer match] > 0 && \ + # rule 26: true + if {[regexp -start $index_ -indices -line -nocase -- {\A(true)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 26 } - # rule 27: [+-]?{D}+ - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+)} $yy_current_buffer match] > 0 && \ + # rule 27: false + if {[regexp -start $index_ -indices -line -nocase -- {\A(false)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 27 } - # rule 28: [+-]?{D}+\.?({E})? - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+\.?(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ + # rule 28: [+-]?{D}+ + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 28 } - # rule 29: [+-]?{D}*\.{D}+({E})? - if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])*\.([0-9])+(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ + # rule 29: [+-]?{D}+\.?({E})? + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])+\.?(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 29 } - # rule 30: \"[^\"]*\" - if {[regexp -start $index_ -indices -line -nocase -- {\A(\"[^\"]*\")} $yy_current_buffer match] > 0 && \ + # rule 30: [+-]?{D}*\.{D}+({E})? + if {[regexp -start $index_ -indices -line -nocase -- {\A([+-]?([0-9])*\.([0-9])+(([Ee][+-]?([0-9])+))?)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 30 } - # rule 31: \'[^\']*\' - if {[regexp -start $index_ -indices -line -nocase -- {\A(\'[^\']*\')} $yy_current_buffer match] > 0 && \ + # rule 31: \"[^\"]*\" + if {[regexp -start $index_ -indices -line -nocase -- {\A(\"[^\"]*\")} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 31 } - # rule 32: \{[^\}]*\} - if {[regexp -start $index_ -indices -line -nocase -- {\A(\{[^\}]*\})} $yy_current_buffer match] > 0 && \ + # rule 32: \'[^\']*\' + if {[regexp -start $index_ -indices -line -nocase -- {\A(\'[^\']*\')} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 32 } - # rule 33: \S+\S+ - if {[regexp -start $index_ -indices -line -nocase -- {\A(\S+\S+)} $yy_current_buffer match] > 0 && \ + # rule 33: \{[^\}]*\} + if {[regexp -start $index_ -indices -line -nocase -- {\A(\{[^\}]*\})} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 33 } - # rule 34: \s - if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ + # rule 34: \S+\S+ + if {[regexp -start $index_ -indices -line -nocase -- {\A(\S+\S+)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 34 } - # rule 35: . - if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + # rule 35: \s + if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 35 } + # rule 36: . + if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + [lindex $match 1] - $index_ + 1 > $yyleng} { + set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] + set yyleng [string length $yytext] + set matched_rule 36 + } if {$matched_rule == -1} { set yytext [string index $yy_current_buffer $index_] set yyleng 1 @@ -515,71 +522,71 @@ return $CLOSE_ return $COLOR_ } 8 { -return $COMPASS_ +return $COLOR_ } 9 { -return $EL_ +return $COMPASS_ } 10 { return $EL_ } 11 { -return $HIGHLITE_ +return $EL_ } 12 { -return $LOCK_ +return $HIGHLITE_ } 13 { -return $MATCH_ +return $LOCK_ } 14 { -return $METHOD_ +return $MATCH_ } 15 { -return $MIP_ +return $METHOD_ } 16 { -return $NONE_ +return $MIP_ } 17 { -return $OPEN_ +return $NONE_ } 18 { -return $SCALE_ +return $OPEN_ } 19 { -return $VIEW_ +return $SCALE_ } 20 { return $VIEW_ } 21 { -return $YES_ +return $VIEW_ } 22 { -return $NO_ +return $YES_ } 23 { -return $ON_ +return $NO_ } 24 { -return $OFF_ +return $ON_ } 25 { -return $TRUE_ +return $OFF_ } 26 { -return $FALSE_ +return $TRUE_ } 27 { -set yylval $yytext; return $INT_ +return $FALSE_ } - 28 - - 29 { -set yylval $yytext; return $REAL_ + 28 { +set yylval $yytext; return $INT_ } + 29 - 30 { -set yylval [string range $yytext 1 end-1]; return $STRING_ +set yylval $yytext; return $REAL_ } 31 { set yylval [string range $yytext 1 end-1]; return $STRING_ @@ -588,12 +595,15 @@ set yylval [string range $yytext 1 end-1]; return $STRING_ set yylval [string range $yytext 1 end-1]; return $STRING_ } 33 { -set yylval $yytext; return $STRING_ +set yylval [string range $yytext 1 end-1]; return $STRING_ } 34 { -# ignore whitespace +set yylval $yytext; return $STRING_ } 35 { +# ignore whitespace + } + 36 { set yylval $yytext; return $yylval } default diff --git a/ds9/parsers/threedsendlex.fcl b/ds9/parsers/threedsendlex.fcl index 119553a..26cf5db 100644 --- a/ds9/parsers/threedsendlex.fcl +++ b/ds9/parsers/threedsendlex.fcl @@ -13,6 +13,7 @@ background {return $BG_} bg {return $BG_} border {return $BORDER_} color {return $COLOR_} +colour {return $COLOR_} compass {return $COMPASS_} el {return $EL_} elevation {return $EL_} diff --git a/ds9/parsers/threedsendlex.tcl b/ds9/parsers/threedsendlex.tcl index 4aa36b5..1d714d1 100644 --- a/ds9/parsers/threedsendlex.tcl +++ b/ds9/parsers/threedsendlex.tcl @@ -253,83 +253,90 @@ set VIEW_ 267 set yyleng [string length $yytext] set matched_rule 5 } - # rule 6: compass - if {[regexp -start $index_ -indices -line -nocase -- {\A(compass)} $yy_current_buffer match] > 0 && \ + # rule 6: colour + if {[regexp -start $index_ -indices -line -nocase -- {\A(colour)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 6 } - # rule 7: el - if {[regexp -start $index_ -indices -line -nocase -- {\A(el)} $yy_current_buffer match] > 0 && \ + # rule 7: compass + if {[regexp -start $index_ -indices -line -nocase -- {\A(compass)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 7 } - # rule 8: elevation - if {[regexp -start $index_ -indices -line -nocase -- {\A(elevation)} $yy_current_buffer match] > 0 && \ + # rule 8: el + if {[regexp -start $index_ -indices -line -nocase -- {\A(el)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 8 } - # rule 9: highlite - if {[regexp -start $index_ -indices -line -nocase -- {\A(highlite)} $yy_current_buffer match] > 0 && \ + # rule 9: elevation + if {[regexp -start $index_ -indices -line -nocase -- {\A(elevation)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 9 } - # rule 10: lock - if {[regexp -start $index_ -indices -line -nocase -- {\A(lock)} $yy_current_buffer match] > 0 && \ + # rule 10: highlite + if {[regexp -start $index_ -indices -line -nocase -- {\A(highlite)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 10 } - # rule 11: method - if {[regexp -start $index_ -indices -line -nocase -- {\A(method)} $yy_current_buffer match] > 0 && \ + # rule 11: lock + if {[regexp -start $index_ -indices -line -nocase -- {\A(lock)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 11 } - # rule 12: scale - if {[regexp -start $index_ -indices -line -nocase -- {\A(scale)} $yy_current_buffer match] > 0 && \ + # rule 12: method + if {[regexp -start $index_ -indices -line -nocase -- {\A(method)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 12 } - # rule 13: view - if {[regexp -start $index_ -indices -line -nocase -- {\A(view)} $yy_current_buffer match] > 0 && \ + # rule 13: scale + if {[regexp -start $index_ -indices -line -nocase -- {\A(scale)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 13 } - # rule 14: vp - if {[regexp -start $index_ -indices -line -nocase -- {\A(vp)} $yy_current_buffer match] > 0 && \ + # rule 14: view + if {[regexp -start $index_ -indices -line -nocase -- {\A(view)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 14 } - # rule 15: \s - if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ + # rule 15: vp + if {[regexp -start $index_ -indices -line -nocase -- {\A(vp)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 15 } - # rule 16: . - if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + # rule 16: \s + if {[regexp -start $index_ -indices -line -nocase -- {\A(\s)} $yy_current_buffer match] > 0 && \ [lindex $match 1] - $index_ + 1 > $yyleng} { set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] set yyleng [string length $yytext] set matched_rule 16 } + # rule 17: . + if {[regexp -start $index_ -indices -line -nocase -- {\A(.)} $yy_current_buffer match] > 0 && \ + [lindex $match 1] - $index_ + 1 > $yyleng} { + set yytext [string range $yy_current_buffer $index_ [lindex $match 1]] + set yyleng [string length $yytext] + set matched_rule 17 + } if {$matched_rule == -1} { set yytext [string index $yy_current_buffer $index_] set yyleng 1 @@ -361,36 +368,39 @@ return $BORDER_ return $COLOR_ } 6 { -return $COMPASS_ +return $COLOR_ } 7 { -return $EL_ +return $COMPASS_ } 8 { return $EL_ } 9 { -return $HIGHLITE_ +return $EL_ } 10 { -return $LOCK_ +return $HIGHLITE_ } 11 { -return $METHOD_ +return $LOCK_ } 12 { -return $SCALE_ +return $METHOD_ } 13 { -return $VIEW_ +return $SCALE_ } 14 { return $VIEW_ } 15 { -# ignore whitespace +return $VIEW_ } 16 { +# ignore whitespace + } + 17 { set yylval $yytext; return $yylval } default diff --git a/tksao/colorbar/lex.C b/tksao/colorbar/lex.C index 06c3d30..671f2ec 100644 --- a/tksao/colorbar/lex.C +++ b/tksao/colorbar/lex.C @@ -324,8 +324,8 @@ int yyFlexLexer::yywrap() { return 1; } *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 64 -#define YY_END_OF_BUFFER 65 +#define YY_NUM_RULES 67 +#define YY_END_OF_BUFFER 68 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -333,35 +333,36 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[244] = +static yyconst flex_int16_t yy_accept[257] = { 0, - 0, 0, 65, 63, 62, 64, 63, 63, 63, 63, - 63, 54, 54, 63, 63, 63, 63, 63, 63, 63, - 63, 63, 63, 63, 31, 63, 63, 63, 63, 63, - 63, 63, 63, 52, 63, 62, 61, 0, 61, 58, - 0, 61, 59, 61, 54, 56, 55, 61, 61, 61, - 61, 61, 4, 61, 61, 61, 61, 61, 61, 61, - 61, 61, 61, 61, 61, 61, 22, 61, 61, 61, - 61, 61, 61, 61, 61, 33, 61, 35, 61, 61, - 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, - 61, 0, 61, 60, 58, 59, 61, 61, 55, 57, - - 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, - 61, 15, 61, 61, 16, 61, 61, 61, 61, 24, - 61, 61, 61, 61, 29, 61, 61, 34, 61, 61, - 61, 61, 41, 61, 61, 44, 61, 61, 47, 61, - 61, 61, 53, 60, 61, 56, 61, 61, 3, 61, - 6, 61, 61, 61, 61, 61, 14, 61, 19, 17, - 61, 21, 61, 61, 26, 27, 61, 61, 32, 61, - 61, 61, 61, 61, 42, 43, 45, 61, 61, 61, - 61, 61, 61, 2, 61, 61, 61, 61, 12, 61, - 18, 61, 61, 25, 61, 61, 61, 37, 38, 39, - - 61, 46, 61, 49, 50, 61, 1, 61, 61, 61, - 61, 61, 11, 13, 20, 23, 28, 30, 61, 61, - 61, 51, 5, 61, 61, 61, 61, 61, 61, 48, - 8, 7, 61, 10, 61, 61, 61, 61, 61, 9, - 36, 40, 0 + 0, 0, 68, 66, 65, 67, 66, 66, 66, 66, + 66, 57, 57, 66, 66, 66, 66, 66, 66, 66, + 66, 66, 66, 66, 34, 66, 66, 66, 66, 66, + 66, 66, 66, 55, 66, 65, 64, 0, 64, 61, + 0, 64, 62, 64, 57, 59, 58, 64, 64, 64, + 64, 64, 4, 64, 64, 64, 64, 64, 64, 64, + 64, 64, 64, 64, 64, 64, 25, 64, 64, 64, + 64, 64, 64, 64, 64, 36, 64, 38, 64, 64, + 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, + 64, 0, 64, 63, 61, 62, 64, 64, 58, 60, + + 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, + 64, 18, 64, 64, 19, 64, 64, 64, 64, 27, + 64, 64, 64, 64, 32, 64, 64, 37, 64, 64, + 64, 64, 44, 64, 64, 47, 64, 64, 50, 64, + 64, 64, 56, 63, 64, 59, 64, 64, 3, 64, + 6, 64, 64, 64, 64, 64, 17, 64, 22, 20, + 64, 24, 64, 64, 29, 30, 64, 64, 35, 64, + 64, 64, 64, 64, 45, 46, 48, 64, 64, 64, + 64, 64, 64, 2, 64, 64, 64, 64, 64, 15, + 64, 21, 64, 64, 28, 64, 64, 64, 40, 41, + + 42, 64, 49, 64, 52, 53, 64, 1, 64, 64, + 64, 64, 64, 64, 14, 16, 23, 26, 31, 33, + 64, 64, 64, 54, 5, 64, 64, 64, 64, 64, + 64, 64, 64, 64, 51, 9, 7, 64, 64, 64, + 64, 13, 64, 64, 64, 10, 8, 64, 64, 64, + 11, 64, 39, 43, 12, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -407,9 +408,9 @@ static yyconst flex_int32_t yy_meta[65] = 3, 3, 3, 3 } ; -static yyconst flex_int16_t yy_base[251] = +static yyconst flex_int16_t yy_base[264] = { 0, - 0, 0, 120, 587, 107, 587, 0, 64, 66, 65, + 0, 0, 120, 604, 107, 604, 0, 64, 66, 65, 69, 74, 84, 71, 82, 80, 72, 82, 98, 85, 101, 105, 124, 121, 126, 131, 125, 71, 141, 141, 137, 152, 142, 151, 170, 104, 0, 92, 194, 0, @@ -418,58 +419,62 @@ static yyconst flex_int16_t yy_base[251] = 227, 229, 234, 254, 247, 253, 0, 236, 245, 245, 249, 268, 268, 250, 265, 0, 279, 0, 267, 278, 283, 270, 289, 275, 283, 292, 279, 289, 284, 301, - 285, 24, 328, 0, 587, 587, 336, 226, 344, 0, + 285, 24, 328, 0, 604, 604, 336, 226, 344, 0, 299, 312, 309, 323, 327, 324, 327, 329, 328, 345, 331, 0, 333, 349, 0, 331, 350, 353, 354, 0, 355, 341, 361, 351, 0, 358, 363, 0, 349, 356, 353, 373, 0, 382, 366, 0, 392, 377, 0, 380, - 380, 401, 0, 587, 409, 418, 383, 390, 0, 396, - 0, 393, 401, 405, 414, 406, 0, 423, 0, 0, - 423, 0, 414, 421, 0, 0, 415, 422, 0, 419, - 419, 415, 421, 430, 0, 0, 0, 438, 438, 440, - 60, 434, 430, 0, 447, 467, 453, 442, 0, 465, - 0, 451, 456, 0, 454, 467, 479, 0, 0, 0, - - 462, 0, 469, 0, 0, 464, 0, 476, 488, 489, - 475, 473, 0, 0, 0, 0, 0, 0, 475, 477, - 484, 0, 0, 481, 484, 501, 484, 501, 510, 0, - 0, 0, 517, 0, 505, 511, 523, 510, 517, 0, - 0, 0, 587, 67, 568, 571, 574, 577, 580, 583 + 380, 401, 0, 604, 409, 418, 383, 390, 0, 396, + 0, 410, 393, 404, 413, 401, 0, 421, 0, 0, + 424, 0, 415, 422, 0, 0, 418, 423, 0, 420, + 420, 416, 422, 431, 0, 0, 0, 442, 439, 441, + 60, 435, 432, 0, 449, 467, 442, 469, 453, 0, + 471, 0, 458, 461, 0, 458, 469, 481, 0, 0, + + 0, 466, 0, 473, 0, 0, 466, 0, 478, 490, + 491, 477, 508, 478, 0, 0, 0, 0, 0, 0, + 480, 479, 486, 0, 0, 486, 503, 519, 525, 527, + 514, 511, 523, 524, 0, 0, 0, 531, 518, 521, + 537, 0, 523, 525, 536, 0, 0, 539, 523, 533, + 0, 543, 0, 0, 0, 604, 67, 585, 588, 591, + 594, 597, 600 } ; -static yyconst flex_int16_t yy_def[251] = +static yyconst flex_int16_t yy_def[264] = { 0, - 243, 1, 243, 243, 243, 243, 244, 245, 246, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 247, 243, 244, 248, 245, 244, - 249, 246, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 250, 247, 244, 243, 243, 244, 244, 244, 49, - - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 243, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 0, 243, 243, 243, 243, 243, 243, 243 + 256, 1, 256, 256, 256, 256, 257, 258, 259, 257, + 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, + 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, + 257, 257, 257, 257, 260, 256, 257, 261, 258, 257, + 262, 259, 257, 257, 257, 257, 257, 257, 257, 257, + 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, + 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, + 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, + 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, + 257, 263, 260, 257, 256, 256, 257, 257, 257, 49, + + 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, + 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, + 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, + 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, + 257, 257, 257, 256, 257, 257, 257, 257, 257, 257, + 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, + 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, + 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, + 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, + 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, + + 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, + 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, + 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, + 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, + 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, + 257, 257, 257, 257, 257, 0, 256, 256, 256, 256, + 256, 256, 256 } ; -static yyconst flex_int16_t yy_nxt[652] = +static yyconst flex_int16_t yy_nxt[669] = { 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 13, 13, 14, 15, 16, 17, 18, 19, 20, 21, @@ -478,25 +483,25 @@ static yyconst flex_int16_t yy_nxt[652] = 17, 18, 19, 20, 21, 22, 7, 7, 23, 24, 25, 26, 27, 28, 29, 30, 31, 7, 32, 33, 7, 34, 35, 7, 38, 38, 41, 41, 40, 37, - 205, 43, 44, 45, 45, 45, 45, 46, 46, 46, + 206, 43, 44, 45, 45, 45, 45, 46, 46, 46, 46, 47, 45, 45, 45, 45, 50, 144, 58, 96, 48, 47, 45, 45, 45, 45, 95, 59, 51, 54, 48, 63, 52, 81, 55, 36, 56, 60, 36, 49, - 61, 50, 57, 58, 64, 48, 53, 65, 62, 243, + 61, 50, 57, 58, 64, 48, 53, 65, 62, 256, 67, 66, 59, 51, 54, 48, 63, 52, 81, 55, 68, 56, 60, 73, 49, 61, 69, 57, 75, 64, 70, 53, 65, 62, 71, 67, 66, 74, 77, 86, 72, 79, 76, 84, 80, 68, 78, 82, 73, 83, 85, 69, 90, 75, 88, 70, 87, 91, 89, 71, 92, 92, 74, 77, 86, 72, 79, 76, 84, 80, - 243, 78, 82, 243, 83, 85, 243, 90, 243, 88, - 243, 87, 91, 89, 38, 38, 41, 41, 40, 101, + 256, 78, 82, 256, 83, 85, 256, 90, 256, 88, + 256, 87, 91, 89, 38, 38, 41, 41, 40, 101, 102, 43, 46, 46, 46, 46, 47, 45, 45, 45, 45, 46, 46, 46, 46, 48, 103, 104, 105, 97, 46, 46, 46, 46, 101, 102, 108, 98, 48, 99, - 99, 99, 99, 94, 99, 99, 99, 99, 243, 109, + 99, 99, 99, 94, 99, 99, 99, 99, 256, 109, 48, 103, 104, 105, 97, 106, 111, 107, 112, 110, 113, 108, 114, 48, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 109, 115, 116, 117, 118, 119, @@ -505,47 +510,48 @@ static yyconst flex_int16_t yy_nxt[652] = 115, 116, 117, 118, 119, 125, 128, 129, 130, 131, 132, 120, 133, 121, 122, 123, 126, 124, 134, 135, - 136, 137, 138, 140, 127, 143, 141, 243, 139, 243, + 136, 137, 138, 140, 127, 143, 141, 256, 139, 256, 125, 128, 129, 130, 131, 132, 142, 133, 92, 92, - 243, 147, 148, 134, 135, 136, 137, 138, 140, 149, + 256, 147, 148, 134, 135, 136, 137, 138, 140, 149, 143, 141, 145, 139, 146, 146, 146, 146, 150, 151, 152, 142, 99, 99, 99, 99, 147, 148, 153, 154, - 155, 156, 157, 158, 149, 159, 243, 160, 161, 162, + 155, 156, 157, 158, 149, 159, 256, 160, 161, 162, 163, 164, 165, 150, 151, 152, 166, 167, 168, 169, 170, 171, 172, 153, 154, 155, 156, 157, 158, 173, 159, 94, 160, 161, 162, 163, 164, 165, 175, 174, 176, 166, 167, 168, 169, 170, 171, 172, 177, 178, 179, 180, 181, 183, 173, 184, 182, 146, 146, 146, - 146, 185, 186, 175, 174, 176, 146, 146, 146, 146, - 187, 188, 189, 177, 178, 179, 180, 190, 183, 191, - 184, 182, 192, 193, 194, 195, 185, 186, 196, 197, - 198, 199, 200, 201, 202, 187, 188, 189, 203, 204, - 206, 207, 190, 208, 191, 212, 243, 192, 193, 194, - 195, 213, 243, 196, 197, 198, 199, 200, 201, 202, - 209, 214, 215, 203, 204, 206, 207, 216, 208, 217, - 212, 210, 218, 219, 220, 221, 213, 211, 222, 223, - - 224, 225, 226, 227, 228, 209, 214, 215, 229, 230, - 231, 232, 216, 233, 217, 234, 210, 218, 219, 220, - 221, 235, 211, 222, 223, 224, 225, 226, 227, 228, - 236, 237, 238, 229, 230, 231, 232, 239, 233, 240, - 234, 241, 242, 243, 243, 243, 235, 243, 243, 243, - 243, 243, 243, 243, 243, 236, 237, 238, 243, 243, - 243, 243, 239, 243, 240, 243, 241, 242, 39, 243, - 39, 42, 243, 42, 93, 243, 93, 38, 243, 38, - 41, 243, 41, 92, 243, 92, 3, 243, 243, 243, - 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, - - 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, - 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, - 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, - 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, - 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, - 243 + 146, 185, 188, 175, 174, 176, 146, 146, 146, 146, + 189, 190, 191, 177, 178, 179, 180, 192, 183, 186, + 184, 182, 187, 193, 194, 195, 185, 188, 196, 197, + 198, 199, 200, 201, 202, 189, 190, 191, 203, 204, + 205, 207, 192, 208, 186, 209, 256, 187, 193, 194, + 195, 213, 256, 196, 197, 198, 199, 200, 201, 202, + 210, 214, 215, 203, 204, 205, 207, 216, 208, 217, + 209, 211, 218, 219, 220, 221, 213, 212, 222, 223, + + 224, 225, 226, 227, 228, 210, 214, 215, 232, 233, + 234, 235, 216, 256, 217, 236, 211, 218, 219, 220, + 221, 229, 212, 222, 223, 224, 225, 226, 227, 228, + 237, 238, 230, 232, 233, 234, 235, 239, 231, 240, + 236, 241, 242, 243, 244, 245, 229, 246, 247, 248, + 249, 250, 251, 252, 253, 237, 238, 230, 254, 255, + 256, 256, 239, 231, 240, 256, 241, 242, 243, 244, + 245, 256, 246, 247, 248, 249, 250, 251, 252, 253, + 256, 256, 256, 254, 255, 39, 256, 39, 42, 256, + 42, 93, 256, 93, 38, 256, 38, 41, 256, 41, + + 92, 256, 92, 3, 256, 256, 256, 256, 256, 256, + 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, + 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, + 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, + 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, + 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, + 256, 256, 256, 256, 256, 256, 256, 256 } ; -static yyconst flex_int16_t yy_chk[652] = +static yyconst flex_int16_t yy_chk[669] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -553,7 +559,7 @@ static yyconst flex_int16_t yy_chk[652] = 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, 8, 8, 9, 9, 8, 244, + 1, 1, 1, 1, 8, 8, 9, 9, 8, 257, 181, 9, 10, 10, 10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 12, 12, 14, 92, 17, 41, 12, 13, 13, 13, 13, 13, 38, 18, 15, 16, @@ -593,32 +599,33 @@ static yyconst flex_int16_t yy_chk[652] = 135, 123, 124, 126, 127, 129, 130, 131, 137, 138, 140, 141, 142, 147, 132, 148, 142, 145, 145, 145, - 145, 150, 152, 134, 132, 135, 146, 146, 146, 146, - 153, 154, 155, 137, 138, 140, 141, 156, 147, 158, - 148, 142, 161, 163, 164, 167, 150, 152, 168, 170, - 171, 172, 173, 174, 178, 153, 154, 155, 179, 180, - 182, 183, 156, 185, 158, 187, 0, 161, 163, 164, - 167, 188, 0, 168, 170, 171, 172, 173, 174, 178, - 186, 190, 192, 179, 180, 182, 183, 193, 185, 195, - 187, 186, 196, 197, 201, 203, 188, 186, 206, 208, - - 209, 210, 211, 212, 219, 186, 190, 192, 220, 221, - 224, 225, 193, 226, 195, 227, 186, 196, 197, 201, - 203, 228, 186, 206, 208, 209, 210, 211, 212, 219, - 229, 233, 235, 220, 221, 224, 225, 236, 226, 237, - 227, 238, 239, 0, 0, 0, 228, 0, 0, 0, - 0, 0, 0, 0, 0, 229, 233, 235, 0, 0, - 0, 0, 236, 0, 237, 0, 238, 239, 245, 0, - 245, 246, 0, 246, 247, 0, 247, 248, 0, 248, - 249, 0, 249, 250, 0, 250, 243, 243, 243, 243, - 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, - - 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, - 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, - 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, - 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, - 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, - 243 + 145, 150, 153, 134, 132, 135, 146, 146, 146, 146, + 154, 155, 156, 137, 138, 140, 141, 158, 147, 152, + 148, 142, 152, 161, 163, 164, 150, 153, 167, 168, + 170, 171, 172, 173, 174, 154, 155, 156, 178, 179, + 180, 182, 158, 183, 152, 185, 0, 152, 161, 163, + 164, 187, 0, 167, 168, 170, 171, 172, 173, 174, + 186, 188, 189, 178, 179, 180, 182, 191, 183, 193, + 185, 186, 194, 196, 197, 198, 187, 186, 202, 204, + + 207, 209, 210, 211, 212, 186, 188, 189, 214, 221, + 222, 223, 191, 0, 193, 226, 186, 194, 196, 197, + 198, 213, 186, 202, 204, 207, 209, 210, 211, 212, + 227, 228, 213, 214, 221, 222, 223, 229, 213, 230, + 226, 231, 232, 233, 234, 238, 213, 239, 240, 241, + 243, 244, 245, 248, 249, 227, 228, 213, 250, 252, + 0, 0, 229, 213, 230, 0, 231, 232, 233, 234, + 238, 0, 239, 240, 241, 243, 244, 245, 248, 249, + 0, 0, 0, 250, 252, 258, 0, 258, 259, 0, + 259, 260, 0, 260, 261, 0, 261, 262, 0, 262, + + 263, 0, 263, 256, 256, 256, 256, 256, 256, 256, + 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, + 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, + 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, + 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, + 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, + 256, 256, 256, 256, 256, 256, 256, 256 } ; /* The intent behind this definition is that it'll catch @@ -642,7 +649,7 @@ static yyconst flex_int16_t yy_chk[652] = extern YYSTYPE* cblval; /* rules */ -#line 646 "colorbar/lex.C" +#line 653 "colorbar/lex.C" #define INITIAL 0 @@ -745,7 +752,7 @@ YY_DECL #line 26 "colorbar/lex.L" -#line 749 "colorbar/lex.C" +#line 756 "colorbar/lex.C" if ( !(yy_init) ) { @@ -798,13 +805,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 244 ) + if ( yy_current_state >= 257 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_current_state != 243 ); + while ( yy_current_state != 256 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -862,264 +869,279 @@ YY_RULE_SETUP case 8: YY_RULE_SETUP #line 35 "colorbar/lex.L" -{return COLORBAR_;} +{return COLORMAP_;} YY_BREAK case 9: YY_RULE_SETUP #line 36 "colorbar/lex.L" -{return COLORSPACE_;} +{return COLORBAR_;} YY_BREAK case 10: YY_RULE_SETUP #line 37 "colorbar/lex.L" -{return CONTRAST_;} +{return COLORBAR_;} YY_BREAK case 11: YY_RULE_SETUP #line 38 "colorbar/lex.L" -{return CURSOR_;} +{return COLORSPACE_;} YY_BREAK case 12: YY_RULE_SETUP #line 39 "colorbar/lex.L" -{return DEBUG_;} +{return COLORSPACE_;} YY_BREAK case 13: YY_RULE_SETUP #line 40 "colorbar/lex.L" -{return DELETE_;} +{return CONTRAST_;} YY_BREAK case 14: YY_RULE_SETUP #line 41 "colorbar/lex.L" -{return EDIT_;} +{return CURSOR_;} YY_BREAK case 15: YY_RULE_SETUP #line 42 "colorbar/lex.L" -{return END_;} +{return DEBUG_;} YY_BREAK case 16: YY_RULE_SETUP #line 43 "colorbar/lex.L" -{return GET_;} +{return DELETE_;} YY_BREAK case 17: YY_RULE_SETUP #line 44 "colorbar/lex.L" -{return GRAY_;} +{return EDIT_;} YY_BREAK case 18: YY_RULE_SETUP #line 45 "colorbar/lex.L" -{return FALSE_;} +{return END_;} YY_BREAK case 19: YY_RULE_SETUP #line 46 "colorbar/lex.L" -{return FILE_;} +{return GET_;} YY_BREAK case 20: YY_RULE_SETUP #line 47 "colorbar/lex.L" -{return HEIGHT_;} +{return GRAY_;} YY_BREAK case 21: YY_RULE_SETUP #line 48 "colorbar/lex.L" -{return HIDE_;} +{return FALSE_;} YY_BREAK case 22: YY_RULE_SETUP #line 49 "colorbar/lex.L" -{return ID_;} +{return FILE_;} YY_BREAK case 23: YY_RULE_SETUP #line 50 "colorbar/lex.L" -{return INVERT_;} +{return HEIGHT_;} YY_BREAK case 24: YY_RULE_SETUP #line 51 "colorbar/lex.L" -{return ITT_;} +{return HIDE_;} YY_BREAK case 25: YY_RULE_SETUP #line 52 "colorbar/lex.L" -{return LEVEL_;} +{return ID_;} YY_BREAK case 26: YY_RULE_SETUP #line 53 "colorbar/lex.L" -{return LIST_;} +{return INVERT_;} YY_BREAK case 27: YY_RULE_SETUP #line 54 "colorbar/lex.L" -{return LOAD_;} +{return ITT_;} YY_BREAK case 28: YY_RULE_SETUP #line 55 "colorbar/lex.L" -{return MACOSX_;} +{return LEVEL_;} YY_BREAK case 29: YY_RULE_SETUP #line 56 "colorbar/lex.L" -{return MAP_;} +{return LIST_;} YY_BREAK case 30: YY_RULE_SETUP #line 57 "colorbar/lex.L" -{return MOTION_;} +{return LOAD_;} YY_BREAK case 31: YY_RULE_SETUP #line 58 "colorbar/lex.L" -{return N_;} +{return MACOSX_;} YY_BREAK case 32: YY_RULE_SETUP #line 59 "colorbar/lex.L" -{return NAME_;} +{return MAP_;} YY_BREAK case 33: YY_RULE_SETUP #line 60 "colorbar/lex.L" -{return NO_;} +{return MOTION_;} YY_BREAK case 34: YY_RULE_SETUP #line 61 "colorbar/lex.L" -{return OFF_;} +{return N_;} YY_BREAK case 35: YY_RULE_SETUP #line 62 "colorbar/lex.L" -{return ON_;} +{return NAME_;} YY_BREAK case 36: YY_RULE_SETUP #line 63 "colorbar/lex.L" -{return POSTSCRIPT_;} +{return NO_;} YY_BREAK case 37: YY_RULE_SETUP #line 64 "colorbar/lex.L" -{return PRINT_;} +{return OFF_;} YY_BREAK case 38: YY_RULE_SETUP #line 65 "colorbar/lex.L" -{return QUERY_;} +{return ON_;} YY_BREAK case 39: YY_RULE_SETUP #line 66 "colorbar/lex.L" -{return RESET_;} +{return POSTSCRIPT_;} YY_BREAK case 40: YY_RULE_SETUP #line 67 "colorbar/lex.L" -{return RESOLUTION_;} +{return PRINT_;} YY_BREAK case 41: YY_RULE_SETUP #line 68 "colorbar/lex.L" -{return RGB_;} +{return QUERY_;} YY_BREAK case 42: YY_RULE_SETUP #line 69 "colorbar/lex.L" -{return SAVE_;} +{return RESET_;} YY_BREAK case 43: YY_RULE_SETUP #line 70 "colorbar/lex.L" -{return SHOW_;} +{return RESOLUTION_;} YY_BREAK case 44: YY_RULE_SETUP #line 71 "colorbar/lex.L" -{return TAG_;} +{return RGB_;} YY_BREAK case 45: YY_RULE_SETUP #line 72 "colorbar/lex.L" -{return TRUE_;} +{return SAVE_;} YY_BREAK case 46: YY_RULE_SETUP #line 73 "colorbar/lex.L" -{return VALUE_;} +{return SHOW_;} YY_BREAK case 47: YY_RULE_SETUP #line 74 "colorbar/lex.L" -{return VAR_;} +{return TAG_;} YY_BREAK case 48: YY_RULE_SETUP #line 75 "colorbar/lex.L" -{return VERSION_;} +{return TRUE_;} YY_BREAK case 49: YY_RULE_SETUP #line 76 "colorbar/lex.L" -{return WIDTH_;} +{return VALUE_;} YY_BREAK case 50: YY_RULE_SETUP #line 77 "colorbar/lex.L" -{return WIN32_;} +{return VAR_;} YY_BREAK case 51: YY_RULE_SETUP #line 78 "colorbar/lex.L" -{return WINDOW_;} +{return VERSION_;} YY_BREAK case 52: YY_RULE_SETUP #line 79 "colorbar/lex.L" -{return Y_;} +{return WIDTH_;} YY_BREAK case 53: YY_RULE_SETUP #line 80 "colorbar/lex.L" -{return YES_;} +{return WIN32_;} YY_BREAK case 54: YY_RULE_SETUP +#line 81 "colorbar/lex.L" +{return WINDOW_;} + YY_BREAK +case 55: +YY_RULE_SETUP #line 82 "colorbar/lex.L" +{return Y_;} + YY_BREAK +case 56: +YY_RULE_SETUP +#line 83 "colorbar/lex.L" +{return YES_;} + YY_BREAK +case 57: +YY_RULE_SETUP +#line 85 "colorbar/lex.L" { // Integer cblval->integer = atoi(yytext); return INT; } YY_BREAK -case 55: -#line 88 "colorbar/lex.L" -case 56: +case 58: +#line 91 "colorbar/lex.L" +case 59: YY_RULE_SETUP -#line 88 "colorbar/lex.L" +#line 91 "colorbar/lex.L" { // Real Number cblval->real = atof(yytext); return REAL; } YY_BREAK -case 57: +case 60: YY_RULE_SETUP -#line 93 "colorbar/lex.L" +#line 96 "colorbar/lex.L" { // Pointer cblval->ptr = (void*)strtoul(yytext,NULL,16); return POINTER; } YY_BREAK -case 58: -#line 99 "colorbar/lex.L" -case 59: +case 61: +#line 102 "colorbar/lex.L" +case 62: YY_RULE_SETUP -#line 99 "colorbar/lex.L" +#line 102 "colorbar/lex.L" { // Quoted String int ll = (yyleng-2)<(CBBUFSIZE-1) ? (yyleng-2):(CBBUFSIZE-1); strncpy(cblval->str,yytext+1,ll); // skip the " " @@ -1127,9 +1149,9 @@ YY_RULE_SETUP return STRING; } YY_BREAK -case 60: +case 63: YY_RULE_SETUP -#line 106 "colorbar/lex.L" +#line 109 "colorbar/lex.L" { // Quoted String int ll = (yyleng-2)<(CBBUFSIZE-1) ? (yyleng-2):(CBBUFSIZE-1); strncpy(cblval->str,yytext+1,ll); // skip the '{' @@ -1137,9 +1159,9 @@ YY_RULE_SETUP return STRING; } YY_BREAK -case 61: +case 64: YY_RULE_SETUP -#line 113 "colorbar/lex.L" +#line 116 "colorbar/lex.L" { // General String-- at least 2 printable chars int ll = yyleng <(CBBUFSIZE-1) ? yyleng:(CBBUFSIZE-1); strncpy(cblval->str,yytext,ll); @@ -1147,25 +1169,25 @@ YY_RULE_SETUP return STRING; } YY_BREAK -case 62: +case 65: YY_RULE_SETUP -#line 120 "colorbar/lex.L" +#line 123 "colorbar/lex.L" { // White Spaces } YY_BREAK -case 63: +case 66: YY_RULE_SETUP -#line 123 "colorbar/lex.L" +#line 126 "colorbar/lex.L" { // Else, return the char return yytext[0]; } YY_BREAK -case 64: +case 67: YY_RULE_SETUP -#line 127 "colorbar/lex.L" +#line 130 "colorbar/lex.L" ECHO; YY_BREAK -#line 1169 "colorbar/lex.C" +#line 1191 "colorbar/lex.C" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1547,7 +1569,7 @@ int yyFlexLexer::yy_get_next_buffer() while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 244 ) + if ( yy_current_state >= 257 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1575,11 +1597,11 @@ int yyFlexLexer::yy_get_next_buffer() while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 244 ) + if ( yy_current_state >= 257 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 243); + yy_is_jam = (yy_current_state == 256); return yy_is_jam ? 0 : yy_current_state; } @@ -2064,7 +2086,7 @@ void cbfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 127 "colorbar/lex.L" +#line 130 "colorbar/lex.L" diff --git a/tksao/colorbar/lex.L b/tksao/colorbar/lex.L index 55977e1..1534e8b 100644 --- a/tksao/colorbar/lex.L +++ b/tksao/colorbar/lex.L @@ -32,8 +32,11 @@ bw {return BW_;} channel {return CHANNEL_;} cmyk {return CMYK_;} colormap {return COLORMAP_;} +colourmap {return COLORMAP_;} colorbar {return COLORBAR_;} +colourbar {return COLORBAR_;} colorspace {return COLORSPACE_;} +colourspace {return COLORSPACE_;} contrast {return CONTRAST_;} cursor {return CURSOR_;} debug {return DEBUG_;} diff --git a/tksao/frame/contourlex.C b/tksao/frame/contourlex.C index b179377..24cfb93 100644 --- a/tksao/frame/contourlex.C +++ b/tksao/frame/contourlex.C @@ -324,8 +324,8 @@ int yyFlexLexer::yywrap() { return 1; } *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 86 -#define YY_END_OF_BUFFER 87 +#define YY_NUM_RULES 87 +#define YY_END_OF_BUFFER 88 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -333,36 +333,36 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[252] = +static yyconst flex_int16_t yy_accept[254] = { 0, - 0, 0, 2, 2, 87, 85, 81, 84, 85, 85, - 85, 85, 85, 85, 59, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 22, 80, 80, 80, - 80, 80, 57, 85, 85, 2, 1, 81, 82, 0, - 77, 0, 0, 78, 0, 59, 61, 60, 59, 0, - 80, 62, 80, 80, 66, 64, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 23, 80, 25, 80, 80, 80, 80, 80, 80, - 83, 0, 79, 2, 0, 62, 0, 0, 66, 64, - 63, 0, 67, 65, 62, 0, 80, 0, 60, 80, - - 80, 80, 80, 80, 80, 80, 80, 80, 12, 13, - 80, 80, 80, 80, 80, 80, 80, 24, 80, 80, - 80, 29, 80, 58, 74, 0, 60, 0, 0, 61, - 0, 80, 80, 80, 80, 80, 6, 80, 80, 80, - 80, 80, 80, 16, 80, 80, 80, 80, 80, 27, - 80, 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, 80, 0, 0, - 0, 0, 68, 0, 80, 0, 80, 80, 4, 5, - 80, 8, 80, 80, 11, 80, 80, 17, 18, 19, - - 80, 80, 80, 56, 0, 0, 0, 69, 68, 0, - 0, 72, 0, 0, 70, 80, 80, 80, 80, 80, - 15, 20, 21, 80, 80, 75, 72, 70, 73, 71, - 80, 80, 80, 80, 80, 80, 28, 0, 80, 7, - 9, 10, 14, 26, 0, 3, 0, 0, 0, 76, - 0 + 0, 0, 2, 2, 88, 86, 82, 85, 86, 86, + 86, 86, 86, 86, 60, 81, 81, 81, 81, 81, + 81, 81, 81, 81, 81, 81, 23, 81, 81, 81, + 81, 81, 58, 86, 86, 2, 1, 82, 83, 0, + 78, 0, 0, 79, 0, 60, 62, 61, 60, 0, + 81, 63, 81, 81, 67, 65, 81, 81, 81, 81, + 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, + 81, 24, 81, 26, 81, 81, 81, 81, 81, 81, + 84, 0, 80, 2, 0, 63, 0, 0, 67, 65, + 64, 0, 68, 66, 63, 0, 81, 0, 61, 81, + + 81, 81, 81, 81, 81, 81, 81, 81, 13, 14, + 81, 81, 81, 81, 81, 81, 81, 25, 81, 81, + 81, 30, 81, 59, 75, 0, 61, 0, 0, 62, + 0, 81, 81, 81, 81, 81, 7, 81, 81, 81, + 81, 81, 81, 17, 81, 81, 81, 81, 81, 28, + 81, 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, 81, 0, 0, + 0, 0, 69, 0, 81, 0, 81, 81, 4, 5, + 81, 81, 9, 81, 81, 12, 81, 81, 18, 19, + + 20, 81, 81, 81, 57, 0, 0, 0, 70, 69, + 0, 0, 73, 0, 0, 71, 81, 6, 81, 81, + 81, 81, 16, 21, 22, 81, 81, 76, 73, 71, + 74, 72, 81, 81, 81, 81, 81, 81, 29, 0, + 81, 8, 10, 11, 15, 27, 0, 3, 0, 0, + 0, 77, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -409,73 +409,75 @@ static yyconst flex_int32_t yy_meta[73] = 1, 1 } ; -static yyconst flex_int16_t yy_base[270] = +static yyconst flex_int16_t yy_base[272] = { 0, - 0, 0, 220, 218, 212, 1257, 204, 1257, 202, 195, + 0, 0, 220, 218, 212, 1277, 204, 1277, 202, 195, 0, 187, 64, 71, 79, 89, 98, 93, 99, 94, 117, 120, 113, 133, 142, 138, 149, 152, 161, 162, - 176, 175, 187, 66, 117, 0, 1257, 186, 1257, 172, - 1257, 0, 166, 1257, 204, 228, 279, 330, 382, 219, + 176, 175, 187, 66, 117, 0, 1277, 186, 1277, 172, + 1277, 0, 166, 1277, 204, 228, 279, 330, 382, 219, 165, 253, 305, 355, 190, 194, 238, 242, 243, 239, 316, 294, 320, 269, 372, 265, 338, 368, 321, 270, 317, 287, 393, 365, 397, 400, 402, 409, 403, 412, - 1257, 96, 1257, 0, 0, 442, 466, 473, 1257, 1257, - 1257, 482, 1257, 1257, 1257, 489, 498, 506, 520, 547, + 1277, 96, 1277, 0, 0, 442, 466, 473, 1277, 1277, + 1277, 482, 1277, 1277, 1277, 489, 498, 506, 520, 547, 536, 432, 534, 529, 530, 558, 561, 533, 416, 423, 531, 427, 535, 565, 450, 577, 588, 452, 591, 600, 594, 648, 710, 453, 0, 710, 628, 718, 739, 746, 767, 775, 784, 603, 574, 793, 636, 604, 726, 794, 795, 796, 606, 454, 797, 727, 806, 812, 815, 616, - 816, 754, 755, 809, 822, 828, 831, 841, 842, 843, - 844, 847, 854, 856, 857, 858, 861, 863, 867, 868, - 870, 872, 873, 874, 877, 879, 883, 884, 0, 901, - 909, 892, 917, 927, 935, 943, 990, 958, 951, 952, - 956, 953, 955, 957, 967, 974, 968, 969, 970, 979, - - 1001, 1003, 1005, 1008, 0, 1018, 1046, 1033, 1055, 1062, - 1074, 1074, 1090, 1102, 1090, 1102, 1112, 1113, 1114, 1115, - 1118, 1125, 1127, 1134, 1130, 0, 1257, 1257, 1257, 1257, - 1137, 1140, 1141, 1153, 1154, 1173, 1147, 0, 1172, 1174, - 1175, 1176, 1178, 1188, 0, 1189, 0, 0, 0, 1257, - 1257, 1234, 1238, 163, 1242, 1244, 1248, 1252, 153, 152, - 139, 136, 132, 129, 119, 116, 114, 109, 95 + 816, 754, 755, 809, 828, 830, 831, 842, 843, 844, + 847, 854, 856, 857, 858, 861, 863, 867, 868, 870, + 872, 873, 874, 877, 879, 883, 884, 886, 0, 903, + 911, 894, 919, 929, 937, 945, 992, 960, 953, 954, + 955, 958, 957, 959, 976, 969, 978, 1003, 971, 972, + + 982, 1012, 1005, 1007, 1010, 0, 1066, 1074, 1057, 1081, + 1102, 1109, 1017, 1120, 1137, 1021, 1137, 1024, 1092, 1149, + 1150, 1151, 1026, 1027, 1037, 1152, 1162, 0, 1277, 1277, + 1277, 1277, 1165, 1169, 1175, 1171, 1185, 1190, 1039, 0, + 1192, 1040, 1041, 1044, 1089, 1090, 0, 1091, 0, 0, + 0, 1277, 1277, 1254, 1258, 163, 1262, 1264, 1268, 1272, + 153, 152, 139, 136, 132, 129, 119, 116, 114, 109, + 95 } ; -static yyconst flex_int16_t yy_def[270] = +static yyconst flex_int16_t yy_def[272] = { 0, - 251, 1, 252, 252, 251, 251, 251, 251, 251, 253, - 254, 255, 251, 251, 256, 256, 256, 256, 256, 256, - 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, - 256, 256, 256, 251, 257, 258, 251, 251, 251, 253, - 251, 259, 255, 251, 251, 251, 251, 251, 256, 251, - 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, - 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, - 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, - 251, 257, 251, 258, 260, 251, 251, 251, 251, 251, - 251, 251, 251, 251, 251, 251, 256, 251, 256, 256, - - 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, - 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, - 256, 251, 256, 256, 261, 251, 251, 251, 251, 251, - 251, 256, 256, 256, 256, 256, 256, 256, 256, 256, - 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, - 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, - 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, - 256, 256, 256, 256, 256, 256, 256, 256, 262, 251, - 251, 251, 251, 251, 256, 251, 256, 256, 256, 256, - 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, - - 256, 256, 256, 256, 263, 251, 251, 251, 251, 251, - 251, 256, 251, 251, 256, 256, 256, 256, 256, 256, - 256, 256, 256, 256, 256, 264, 251, 251, 251, 251, - 256, 256, 256, 256, 256, 256, 256, 265, 256, 256, - 256, 256, 256, 256, 266, 256, 267, 268, 269, 251, - 0, 251, 251, 251, 251, 251, 251, 251, 251, 251, - 251, 251, 251, 251, 251, 251, 251, 251, 251 + 253, 1, 254, 254, 253, 253, 253, 253, 253, 255, + 256, 257, 253, 253, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 253, 259, 260, 253, 253, 253, 255, + 253, 261, 257, 253, 253, 253, 253, 253, 258, 253, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 253, 259, 253, 260, 262, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 258, 253, 258, 258, + + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 253, 258, 258, 263, 253, 253, 253, 253, 253, + 253, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 264, 253, + 253, 253, 253, 253, 258, 253, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + + 258, 258, 258, 258, 258, 265, 253, 253, 253, 253, + 253, 253, 258, 253, 253, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 266, 253, 253, + 253, 253, 258, 258, 258, 258, 258, 258, 258, 267, + 258, 258, 258, 258, 258, 258, 268, 258, 269, 270, + 271, 253, 0, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, + 253 } ; -static yyconst flex_int16_t yy_nxt[1330] = +static yyconst flex_int16_t yy_nxt[1350] = { 0, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 15, 15, 15, 15, 15, 15, 6, 16, 17, 18, @@ -486,146 +488,148 @@ static yyconst flex_int16_t yy_nxt[1330] = 23, 23, 23, 30, 23, 31, 32, 23, 33, 23, 35, 6, 45, 46, 46, 46, 46, 46, 46, 46, 47, 47, 47, 47, 47, 47, 47, 48, 49, 49, - 49, 49, 49, 49, 49, 50, 81, 251, 250, 52, - - 53, 251, 251, 54, 55, 251, 251, 251, 58, 251, - 251, 56, 249, 62, 251, 251, 60, 248, 57, 247, - 61, 251, 245, 81, 59, 251, 52, 53, 251, 251, - 54, 55, 238, 251, 63, 226, 251, 65, 56, 205, - 62, 251, 179, 60, 64, 57, 251, 61, 66, 251, - 251, 59, 67, 69, 251, 125, 85, 251, 251, 70, - 251, 63, 68, 71, 65, 251, 42, 83, 251, 251, - 251, 64, 44, 251, 73, 66, 41, 251, 251, 67, - 72, 251, 74, 251, 251, 75, 70, 38, 83, 68, - 71, 251, 251, 44, 78, 251, 76, 77, 251, 41, - - 79, 73, 251, 251, 39, 38, 251, 72, 80, 74, - 251, 251, 75, 47, 47, 47, 47, 47, 47, 47, - 37, 78, 37, 76, 77, 251, 251, 79, 96, 96, + 49, 49, 49, 49, 49, 50, 81, 253, 252, 52, + + 53, 253, 253, 54, 55, 253, 253, 253, 58, 253, + 253, 56, 251, 62, 253, 253, 60, 250, 57, 249, + 61, 253, 247, 81, 59, 253, 52, 53, 253, 253, + 54, 55, 240, 253, 63, 228, 253, 65, 56, 206, + 62, 253, 179, 60, 64, 57, 253, 61, 66, 253, + 253, 59, 67, 69, 253, 125, 85, 253, 253, 70, + 253, 63, 68, 71, 65, 253, 42, 83, 253, 253, + 253, 64, 44, 253, 73, 66, 41, 253, 253, 67, + 72, 253, 74, 253, 253, 75, 70, 38, 83, 68, + 71, 253, 253, 44, 78, 253, 76, 77, 253, 41, + + 79, 73, 253, 253, 39, 38, 253, 72, 80, 74, + 253, 253, 75, 47, 47, 47, 47, 47, 47, 47, + 37, 78, 37, 76, 77, 253, 253, 79, 96, 96, 96, 96, 96, 96, 96, 80, 48, 46, 46, 46, - 46, 46, 46, 46, 50, 251, 251, 251, 86, 87, - 251, 251, 88, 89, 251, 251, 251, 102, 251, 251, - 90, 251, 97, 97, 97, 97, 97, 97, 97, 251, - 101, 103, 251, 251, 104, 86, 87, 251, 251, 88, - 89, 251, 109, 110, 251, 251, 251, 90, 47, 47, - 47, 47, 47, 47, 47, 251, 112, 101, 103, 91, - - 92, 104, 251, 251, 93, 251, 251, 251, 116, 251, - 251, 94, 98, 251, 99, 99, 99, 99, 99, 99, - 99, 251, 107, 112, 251, 251, 91, 92, 251, 251, - 115, 93, 251, 251, 105, 116, 251, 251, 94, 47, - 47, 47, 47, 47, 47, 47, 251, 117, 108, 107, - 95, 87, 106, 251, 251, 89, 251, 251, 251, 251, - 251, 105, 90, 251, 100, 100, 100, 100, 100, 100, - 100, 251, 113, 251, 117, 108, 251, 95, 87, 106, - 251, 251, 89, 251, 251, 114, 251, 251, 251, 90, + 46, 46, 46, 46, 50, 253, 253, 253, 86, 87, + 253, 253, 88, 89, 253, 253, 253, 102, 253, 253, + 90, 253, 97, 97, 97, 97, 97, 97, 97, 253, + 101, 103, 253, 253, 104, 86, 87, 253, 253, 88, + 89, 253, 109, 110, 253, 253, 253, 90, 47, 47, + 47, 47, 47, 47, 47, 253, 112, 101, 103, 91, + + 92, 104, 253, 253, 93, 253, 253, 253, 116, 253, + 253, 94, 98, 253, 99, 99, 99, 99, 99, 99, + 99, 253, 107, 112, 253, 253, 91, 92, 253, 253, + 115, 93, 253, 253, 105, 116, 253, 253, 94, 47, + 47, 47, 47, 47, 47, 47, 253, 117, 108, 107, + 95, 87, 106, 253, 253, 89, 253, 253, 253, 253, + 253, 105, 90, 253, 100, 100, 100, 100, 100, 100, + 100, 253, 113, 253, 117, 108, 253, 95, 87, 106, + 253, 253, 89, 253, 253, 114, 253, 253, 253, 90, 48, 49, 49, 49, 49, 49, 49, 49, 50, 113, - 111, 251, 52, 53, 251, 251, 54, 55, 251, 251, - 251, 251, 114, 251, 56, 118, 251, 251, 251, 251, - 251, 251, 251, 123, 251, 251, 251, 111, 251, 52, - 53, 251, 251, 54, 55, 251, 121, 120, 119, 251, - 251, 56, 118, 251, 122, 143, 135, 124, 251, 251, - 123, 126, 126, 126, 126, 126, 126, 126, 251, 146, - 251, 251, 251, 121, 120, 119, 251, 251, 251, 251, - 251, 122, 143, 98, 124, 127, 127, 127, 127, 127, + 111, 253, 52, 53, 253, 253, 54, 55, 253, 253, + 253, 253, 114, 253, 56, 118, 253, 253, 253, 253, + 253, 253, 253, 123, 253, 253, 253, 111, 253, 52, + 53, 253, 253, 54, 55, 253, 121, 120, 119, 253, + 253, 56, 118, 253, 122, 143, 135, 124, 253, 253, + 123, 126, 126, 126, 126, 126, 126, 126, 253, 146, + 253, 253, 253, 121, 120, 119, 253, 253, 253, 253, + 253, 122, 143, 98, 124, 127, 127, 127, 127, 127, 127, 127, 128, 128, 128, 128, 128, 128, 128, 129, - 251, 130, 130, 130, 130, 130, 130, 130, 96, 96, - - 96, 96, 96, 96, 96, 131, 251, 97, 97, 97, - 97, 97, 97, 97, 251, 127, 127, 127, 127, 127, - 127, 127, 251, 251, 251, 251, 251, 132, 251, 99, - 99, 99, 99, 99, 99, 99, 251, 251, 251, 251, - 251, 251, 251, 251, 251, 251, 251, 251, 142, 251, - 251, 251, 251, 137, 132, 251, 100, 100, 100, 100, - 100, 100, 100, 251, 134, 136, 251, 138, 141, 251, - 144, 251, 251, 251, 251, 142, 133, 251, 251, 139, - 137, 251, 251, 189, 251, 251, 140, 251, 145, 251, - 251, 134, 136, 251, 138, 141, 251, 144, 147, 251, - - 251, 251, 251, 133, 251, 251, 139, 251, 251, 148, - 251, 251, 251, 140, 251, 145, 251, 251, 251, 251, - 251, 150, 251, 197, 251, 147, 149, 192, 188, 151, - 251, 251, 251, 251, 251, 251, 148, 127, 127, 127, - 127, 127, 127, 127, 251, 251, 251, 251, 150, 251, - 197, 251, 251, 149, 192, 188, 151, 51, 51, 51, - 51, 51, 51, 51, 191, 152, 153, 154, 155, 156, + 253, 130, 130, 130, 130, 130, 130, 130, 96, 96, + + 96, 96, 96, 96, 96, 131, 253, 97, 97, 97, + 97, 97, 97, 97, 253, 127, 127, 127, 127, 127, + 127, 127, 253, 253, 253, 253, 253, 132, 253, 99, + 99, 99, 99, 99, 99, 99, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 142, 253, + 253, 253, 253, 137, 132, 253, 100, 100, 100, 100, + 100, 100, 100, 253, 134, 136, 253, 138, 141, 253, + 144, 253, 253, 253, 253, 142, 133, 253, 253, 139, + 137, 253, 253, 189, 253, 253, 140, 253, 145, 253, + 253, 134, 136, 253, 138, 141, 253, 144, 147, 253, + + 253, 253, 253, 133, 253, 253, 139, 253, 253, 148, + 253, 253, 253, 140, 253, 145, 253, 253, 253, 253, + 253, 150, 253, 198, 253, 147, 149, 193, 188, 151, + 253, 253, 253, 253, 253, 253, 148, 127, 127, 127, + 127, 127, 127, 127, 253, 253, 253, 253, 150, 253, + 198, 253, 253, 149, 193, 188, 151, 51, 51, 51, + 51, 51, 51, 51, 192, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, - 177, 191, 152, 153, 154, 155, 156, 157, 158, 159, + 177, 192, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, - 170, 171, 172, 173, 174, 175, 176, 177, 251, 126, - 126, 126, 126, 126, 126, 126, 251, 128, 128, 128, - 128, 128, 128, 128, 251, 251, 199, 251, 251, 180, - 251, 251, 251, 251, 251, 193, 178, 181, 130, 130, + 170, 171, 172, 173, 174, 175, 176, 177, 253, 126, + 126, 126, 126, 126, 126, 126, 253, 128, 128, 128, + 128, 128, 128, 128, 253, 253, 200, 253, 253, 180, + 253, 253, 253, 253, 253, 194, 178, 181, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, - 130, 130, 251, 251, 251, 251, 180, 251, 251, 251, - 251, 251, 193, 178, 181, 182, 183, 183, 183, 183, + 130, 130, 253, 253, 253, 253, 180, 253, 253, 253, + 253, 253, 194, 178, 181, 182, 183, 183, 183, 183, 183, 183, 183, 184, 185, 185, 185, 185, 185, 185, - 185, 251, 186, 187, 187, 187, 187, 187, 187, 187, - - 251, 251, 251, 251, 251, 251, 251, 251, 251, 251, - 251, 251, 251, 251, 251, 196, 195, 251, 198, 251, - 251, 251, 251, 251, 251, 251, 194, 190, 251, 201, - 251, 251, 251, 251, 200, 251, 251, 251, 251, 251, - 202, 203, 196, 195, 251, 198, 251, 251, 251, 251, - 251, 251, 251, 194, 190, 251, 201, 251, 251, 251, - 251, 200, 251, 251, 251, 251, 251, 202, 203, 251, - 251, 251, 251, 251, 251, 251, 251, 251, 251, 251, - 251, 251, 251, 251, 251, 251, 251, 251, 251, 251, - 251, 251, 251, 251, 251, 251, 251, 251, 251, 251, - - 251, 208, 208, 208, 208, 208, 208, 208, 204, 184, - 206, 206, 206, 206, 206, 206, 206, 186, 207, 207, - 207, 207, 207, 207, 207, 209, 183, 183, 183, 183, - 183, 183, 183, 251, 251, 204, 210, 210, 210, 210, - 210, 210, 210, 211, 185, 185, 185, 185, 185, 185, - 185, 251, 213, 213, 213, 213, 213, 213, 213, 251, - 251, 251, 251, 251, 251, 251, 251, 251, 251, 251, - 212, 251, 251, 251, 251, 251, 251, 251, 251, 251, - 216, 217, 251, 251, 251, 251, 251, 251, 251, 251, - 251, 218, 251, 219, 251, 251, 221, 212, 214, 187, - - 187, 187, 187, 187, 187, 187, 251, 216, 217, 251, - 220, 251, 251, 251, 222, 251, 251, 251, 218, 251, - 219, 251, 224, 221, 251, 215, 211, 206, 206, 206, - 206, 206, 206, 206, 251, 223, 225, 220, 251, 251, - 251, 222, 208, 208, 208, 208, 208, 208, 208, 224, - 251, 251, 215, 227, 214, 207, 207, 207, 207, 207, - 207, 207, 223, 225, 208, 208, 208, 208, 208, 208, - 208, 210, 210, 210, 210, 210, 210, 210, 251, 251, - 227, 228, 251, 210, 210, 210, 210, 210, 210, 210, - 251, 251, 251, 251, 251, 251, 251, 229, 251, 213, - - 213, 213, 213, 213, 213, 213, 251, 251, 228, 227, - 251, 213, 213, 213, 213, 213, 213, 213, 251, 251, - 251, 251, 251, 251, 229, 230, 251, 231, 251, 251, - 251, 251, 251, 251, 251, 251, 227, 228, 251, 234, - 235, 251, 251, 251, 233, 251, 251, 232, 251, 251, - 251, 236, 230, 251, 231, 251, 251, 251, 239, 251, - 237, 251, 251, 251, 228, 251, 234, 235, 251, 251, - 251, 233, 242, 243, 232, 241, 240, 251, 236, 251, - 251, 251, 251, 251, 251, 239, 251, 237, 251, 251, - 251, 251, 251, 251, 251, 251, 251, 251, 251, 242, - - 243, 244, 241, 240, 251, 251, 246, 251, 251, 251, - 251, 251, 251, 251, 251, 251, 251, 251, 251, 251, - 251, 251, 251, 251, 251, 251, 251, 251, 244, 251, - 251, 251, 251, 246, 36, 36, 36, 36, 40, 251, - 40, 40, 43, 251, 43, 43, 51, 51, 82, 251, - 82, 82, 84, 251, 84, 84, 5, 251, 251, 251, - 251, 251, 251, 251, 251, 251, 251, 251, 251, 251, - 251, 251, 251, 251, 251, 251, 251, 251, 251, 251, - 251, 251, 251, 251, 251, 251, 251, 251, 251, 251, - 251, 251, 251, 251, 251, 251, 251, 251, 251, 251, - - 251, 251, 251, 251, 251, 251, 251, 251, 251, 251, - 251, 251, 251, 251, 251, 251, 251, 251, 251, 251, - 251, 251, 251, 251, 251, 251, 251, 251, 251 + 185, 253, 186, 187, 187, 187, 187, 187, 187, 187, + + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 197, 196, 253, 199, 253, + 253, 253, 253, 253, 253, 253, 195, 190, 253, 202, + 191, 253, 253, 253, 201, 253, 253, 253, 253, 253, + 203, 204, 197, 196, 253, 199, 253, 253, 253, 253, + 253, 253, 253, 195, 190, 253, 202, 191, 253, 253, + 253, 201, 253, 253, 253, 253, 253, 203, 204, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, + + 253, 253, 253, 209, 209, 209, 209, 209, 209, 209, + 205, 184, 207, 207, 207, 207, 207, 207, 207, 186, + 208, 208, 208, 208, 208, 208, 208, 210, 183, 183, + 183, 183, 183, 183, 183, 253, 253, 205, 211, 211, + 211, 211, 211, 211, 211, 212, 185, 185, 185, 185, + 185, 185, 185, 253, 214, 214, 214, 214, 214, 214, + 214, 253, 253, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 213, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 217, 219, 253, 253, 253, 253, 253, 218, + 253, 253, 253, 253, 253, 220, 253, 253, 253, 213, + + 215, 187, 187, 187, 187, 187, 187, 187, 253, 217, + 219, 253, 221, 253, 222, 253, 218, 224, 253, 253, + 253, 253, 220, 253, 226, 253, 253, 216, 253, 253, + 253, 223, 253, 253, 253, 253, 253, 253, 227, 221, + 253, 222, 253, 253, 224, 253, 225, 253, 253, 253, + 253, 226, 253, 253, 216, 253, 253, 253, 223, 253, + 253, 253, 253, 253, 253, 227, 209, 209, 209, 209, + 209, 209, 209, 225, 212, 207, 207, 207, 207, 207, + 207, 207, 215, 208, 208, 208, 208, 208, 208, 208, + 209, 209, 209, 209, 209, 209, 209, 253, 253, 253, + + 253, 229, 253, 253, 253, 253, 253, 253, 253, 230, + 253, 211, 211, 211, 211, 211, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 253, 253, 234, 229, 214, + 214, 214, 214, 214, 214, 214, 230, 231, 253, 253, + 253, 253, 253, 253, 229, 253, 214, 214, 214, 214, + 214, 214, 214, 253, 234, 232, 253, 253, 253, 253, + 253, 253, 233, 253, 231, 253, 253, 253, 253, 238, + 253, 229, 230, 253, 253, 236, 237, 253, 253, 253, + 235, 253, 232, 253, 253, 253, 241, 253, 253, 233, + 244, 253, 239, 253, 253, 253, 238, 253, 253, 230, + + 253, 253, 236, 237, 245, 242, 253, 235, 253, 243, + 253, 253, 253, 241, 253, 253, 253, 244, 246, 239, + 253, 253, 253, 253, 253, 253, 248, 253, 253, 253, + 253, 245, 242, 253, 253, 253, 243, 253, 253, 253, + 253, 253, 253, 253, 253, 246, 253, 253, 253, 253, + 253, 253, 253, 248, 36, 36, 36, 36, 40, 253, + 40, 40, 43, 253, 43, 43, 51, 51, 82, 253, + 82, 82, 84, 253, 84, 84, 5, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, + + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 253 } ; -static yyconst flex_int16_t yy_chk[1330] = +static yyconst flex_int16_t yy_chk[1350] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -636,15 +640,15 @@ static yyconst flex_int16_t yy_chk[1330] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 34, 16, 269, 15, + 15, 15, 15, 15, 15, 15, 34, 16, 271, 15, 15, 18, 20, 15, 15, 16, 17, 19, 17, 18, - 20, 15, 268, 20, 17, 19, 19, 267, 16, 266, - 19, 23, 265, 34, 18, 21, 15, 15, 22, 23, - 15, 15, 264, 21, 21, 263, 22, 22, 15, 262, - 20, 24, 261, 19, 21, 16, 26, 19, 22, 24, - 25, 18, 24, 25, 26, 260, 259, 27, 25, 26, - 28, 21, 24, 26, 22, 27, 254, 82, 28, 29, + 20, 15, 270, 20, 17, 19, 19, 269, 16, 268, + 19, 23, 267, 34, 18, 21, 15, 15, 22, 23, + 15, 15, 266, 21, 21, 265, 22, 22, 15, 264, + 20, 24, 263, 19, 21, 16, 26, 19, 22, 24, + 25, 18, 24, 25, 26, 262, 261, 27, 25, 26, + 28, 21, 24, 26, 22, 27, 256, 82, 28, 29, 30, 21, 43, 51, 28, 22, 40, 29, 30, 24, 27, 51, 28, 32, 31, 29, 26, 38, 35, 24, 26, 32, 31, 12, 32, 33, 30, 31, 55, 10, @@ -718,61 +722,63 @@ static yyconst flex_int16_t yy_chk[1330] = 133, 136, 140, 141, 142, 145, 0, 0, 0, 136, 140, 141, 142, 145, 147, 142, 141, 154, 145, 0, 148, 0, 147, 149, 151, 154, 140, 136, 148, 148, - 155, 149, 151, 0, 147, 0, 156, 0, 155, 157, - 149, 151, 142, 141, 156, 145, 0, 157, 0, 158, - 159, 160, 161, 140, 136, 162, 148, 158, 159, 160, - 161, 147, 163, 162, 164, 165, 166, 149, 151, 167, - 163, 168, 164, 165, 166, 169, 170, 167, 171, 168, - 172, 173, 174, 169, 170, 175, 171, 176, 172, 173, - 174, 177, 178, 175, 0, 176, 0, 0, 0, 177, - - 178, 182, 182, 182, 182, 182, 182, 182, 178, 180, - 180, 180, 180, 180, 180, 180, 180, 181, 181, 181, - 181, 181, 181, 181, 181, 183, 183, 183, 183, 183, - 183, 183, 183, 0, 0, 178, 184, 184, 184, 184, - 184, 184, 184, 185, 185, 185, 185, 185, 185, 185, - 185, 185, 186, 186, 186, 186, 186, 186, 186, 189, - 190, 192, 0, 193, 191, 194, 188, 189, 190, 192, - 185, 193, 191, 194, 188, 195, 197, 198, 199, 0, - 188, 191, 196, 195, 197, 198, 199, 200, 0, 0, - 196, 193, 0, 194, 0, 200, 197, 185, 187, 187, - - 187, 187, 187, 187, 187, 187, 187, 188, 191, 201, - 196, 202, 0, 203, 200, 0, 204, 201, 193, 202, - 194, 203, 202, 197, 204, 187, 206, 206, 206, 206, - 206, 206, 206, 206, 0, 201, 203, 196, 0, 0, - 0, 200, 208, 208, 208, 208, 208, 208, 208, 202, - 0, 0, 187, 206, 207, 207, 207, 207, 207, 207, - 207, 207, 201, 203, 209, 209, 209, 209, 209, 209, - 209, 210, 210, 210, 210, 210, 210, 210, 0, 0, - 206, 207, 212, 211, 211, 211, 211, 211, 211, 211, - 212, 0, 0, 0, 0, 0, 0, 210, 215, 213, - - 213, 213, 213, 213, 213, 213, 215, 0, 207, 211, - 216, 214, 214, 214, 214, 214, 214, 214, 216, 0, - 217, 218, 219, 220, 210, 213, 221, 216, 217, 218, - 219, 220, 0, 222, 221, 223, 211, 214, 225, 219, - 220, 222, 224, 223, 218, 231, 225, 217, 232, 233, - 224, 224, 213, 231, 216, 237, 232, 233, 231, 0, - 225, 234, 235, 237, 214, 0, 219, 220, 0, 234, - 235, 218, 234, 235, 217, 233, 232, 0, 224, 0, - 239, 236, 240, 241, 242, 231, 243, 225, 239, 236, - 240, 241, 242, 0, 243, 0, 244, 246, 0, 234, - - 235, 236, 233, 232, 244, 246, 239, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 236, 0, - 0, 0, 0, 239, 252, 252, 252, 252, 253, 0, - 253, 253, 255, 0, 255, 255, 256, 256, 257, 0, - 257, 257, 258, 0, 258, 258, 251, 251, 251, 251, - 251, 251, 251, 251, 251, 251, 251, 251, 251, 251, - 251, 251, 251, 251, 251, 251, 251, 251, 251, 251, - 251, 251, 251, 251, 251, 251, 251, 251, 251, 251, - 251, 251, 251, 251, 251, 251, 251, 251, 251, 251, - - 251, 251, 251, 251, 251, 251, 251, 251, 251, 251, - 251, 251, 251, 251, 251, 251, 251, 251, 251, 251, - 251, 251, 251, 251, 251, 251, 251, 251, 251 + 136, 149, 151, 0, 147, 0, 155, 0, 156, 157, + 149, 151, 142, 141, 155, 145, 156, 157, 0, 0, + 158, 159, 160, 140, 136, 161, 148, 136, 158, 159, + 160, 147, 162, 161, 163, 164, 165, 149, 151, 166, + 162, 167, 163, 164, 165, 168, 169, 166, 170, 167, + 171, 172, 173, 168, 169, 174, 170, 175, 171, 172, + 173, 176, 177, 174, 178, 175, 0, 0, 0, 176, + + 177, 0, 178, 182, 182, 182, 182, 182, 182, 182, + 178, 180, 180, 180, 180, 180, 180, 180, 180, 181, + 181, 181, 181, 181, 181, 181, 181, 183, 183, 183, + 183, 183, 183, 183, 183, 0, 0, 178, 184, 184, + 184, 184, 184, 184, 184, 185, 185, 185, 185, 185, + 185, 185, 185, 185, 186, 186, 186, 186, 186, 186, + 186, 189, 190, 191, 0, 193, 192, 194, 188, 189, + 190, 191, 185, 193, 192, 194, 188, 196, 0, 199, + 200, 0, 188, 192, 195, 196, 197, 199, 200, 191, + 201, 0, 195, 0, 197, 194, 0, 0, 201, 185, + + 187, 187, 187, 187, 187, 187, 187, 187, 187, 188, + 192, 198, 195, 203, 197, 204, 191, 201, 205, 198, + 202, 203, 194, 204, 203, 213, 205, 187, 202, 216, + 0, 198, 218, 213, 223, 224, 0, 216, 204, 195, + 218, 197, 223, 224, 201, 225, 202, 239, 242, 243, + 0, 203, 244, 225, 187, 239, 242, 243, 198, 0, + 244, 0, 0, 0, 0, 204, 209, 209, 209, 209, + 209, 209, 209, 202, 207, 207, 207, 207, 207, 207, + 207, 207, 208, 208, 208, 208, 208, 208, 208, 208, + 210, 210, 210, 210, 210, 210, 210, 245, 246, 248, + + 219, 207, 0, 0, 0, 245, 246, 248, 219, 208, + 0, 211, 211, 211, 211, 211, 211, 211, 212, 212, + 212, 212, 212, 212, 212, 0, 0, 219, 207, 214, + 214, 214, 214, 214, 214, 214, 208, 211, 0, 0, + 0, 0, 0, 0, 212, 217, 215, 215, 215, 215, + 215, 215, 215, 217, 219, 214, 0, 220, 221, 222, + 226, 0, 217, 0, 211, 220, 221, 222, 226, 226, + 227, 212, 215, 233, 0, 221, 222, 234, 227, 236, + 220, 233, 214, 235, 0, 234, 233, 236, 0, 217, + 236, 235, 227, 237, 0, 0, 226, 0, 238, 215, + + 241, 237, 221, 222, 237, 234, 238, 220, 241, 235, + 0, 0, 0, 233, 0, 0, 0, 236, 238, 227, + 0, 0, 0, 0, 0, 0, 241, 0, 0, 0, + 0, 237, 234, 0, 0, 0, 235, 0, 0, 0, + 0, 0, 0, 0, 0, 238, 0, 0, 0, 0, + 0, 0, 0, 241, 254, 254, 254, 254, 255, 0, + 255, 255, 257, 0, 257, 257, 258, 258, 259, 0, + 259, 259, 260, 0, 260, 260, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, + + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 253 } ; /* The intent behind this definition is that it'll catch @@ -799,7 +805,7 @@ static yyconst flex_int16_t yy_chk[1330] = extern ctFlexLexer* ctlexx; /* rules */ -#line 803 "frame/contourlex.C" +#line 809 "frame/contourlex.C" #define INITIAL 0 #define DISCARD 1 @@ -903,7 +909,7 @@ YY_DECL #line 31 "frame/contourlex.L" -#line 907 "frame/contourlex.C" +#line 913 "frame/contourlex.C" if ( !(yy_init) ) { @@ -956,13 +962,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 252 ) + if ( yy_current_state >= 254 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_current_state != 251 ); + while ( yy_current_state != 253 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -1022,324 +1028,329 @@ YY_RULE_SETUP case 6: YY_RULE_SETUP #line 51 "frame/contourlex.L" -{return DASH_;} +{return COLOR_;} YY_BREAK case 7: YY_RULE_SETUP #line 52 "frame/contourlex.L" -{return DASHLIST_;} +{return DASH_;} YY_BREAK case 8: YY_RULE_SETUP #line 53 "frame/contourlex.L" -{return DEBUG_;} +{return DASHLIST_;} YY_BREAK case 9: YY_RULE_SETUP #line 54 "frame/contourlex.L" -{return DETECTOR_;} +{return DEBUG_;} YY_BREAK case 10: YY_RULE_SETUP #line 55 "frame/contourlex.L" -{return ECLIPTIC_;} +{return DETECTOR_;} YY_BREAK case 11: YY_RULE_SETUP #line 56 "frame/contourlex.L" -{return FALSE_;} +{return ECLIPTIC_;} YY_BREAK case 12: YY_RULE_SETUP #line 57 "frame/contourlex.L" -{return FK4_;} +{return FALSE_;} YY_BREAK case 13: YY_RULE_SETUP #line 58 "frame/contourlex.L" -{return FK5_;} +{return FK4_;} YY_BREAK case 14: YY_RULE_SETUP #line 59 "frame/contourlex.L" -{return GALACTIC_;} +{return FK5_;} YY_BREAK case 15: YY_RULE_SETUP #line 60 "frame/contourlex.L" -{return GLOBAL_;} +{return GALACTIC_;} YY_BREAK case 16: YY_RULE_SETUP #line 61 "frame/contourlex.L" -{return ICRS_;} +{return GLOBAL_;} YY_BREAK case 17: YY_RULE_SETUP #line 62 "frame/contourlex.L" -{return IMAGE_;} +{return ICRS_;} YY_BREAK case 18: YY_RULE_SETUP #line 63 "frame/contourlex.L" -{return J2000_;} +{return IMAGE_;} YY_BREAK case 19: YY_RULE_SETUP #line 64 "frame/contourlex.L" -{return LEVEL_;} +{return J2000_;} YY_BREAK case 20: YY_RULE_SETUP #line 65 "frame/contourlex.L" -{return LEVELS_;} +{return LEVEL_;} YY_BREAK case 21: YY_RULE_SETUP #line 66 "frame/contourlex.L" -{return LINEAR_;} +{return LEVELS_;} YY_BREAK case 22: YY_RULE_SETUP #line 67 "frame/contourlex.L" -{return N_;} +{return LINEAR_;} YY_BREAK case 23: YY_RULE_SETUP #line 68 "frame/contourlex.L" -{return NO_;} +{return N_;} YY_BREAK case 24: YY_RULE_SETUP #line 69 "frame/contourlex.L" -{return OFF_;} +{return NO_;} YY_BREAK case 25: YY_RULE_SETUP #line 70 "frame/contourlex.L" -{return ON_;} +{return OFF_;} YY_BREAK case 26: YY_RULE_SETUP #line 71 "frame/contourlex.L" -{return PHYSICAL_;} +{return ON_;} YY_BREAK case 27: YY_RULE_SETUP #line 72 "frame/contourlex.L" -{return TRUE_;} +{return PHYSICAL_;} YY_BREAK case 28: YY_RULE_SETUP #line 73 "frame/contourlex.L" -{return VERSION_;} +{return TRUE_;} YY_BREAK case 29: YY_RULE_SETUP #line 74 "frame/contourlex.L" -{return WCS_;} +{return VERSION_;} YY_BREAK case 30: YY_RULE_SETUP #line 75 "frame/contourlex.L" -{return WCSA_;} +{return WCS_;} YY_BREAK case 31: YY_RULE_SETUP #line 76 "frame/contourlex.L" -{return WCSB_;} +{return WCSA_;} YY_BREAK case 32: YY_RULE_SETUP #line 77 "frame/contourlex.L" -{return WCSC_;} +{return WCSB_;} YY_BREAK case 33: YY_RULE_SETUP #line 78 "frame/contourlex.L" -{return WCSD_;} +{return WCSC_;} YY_BREAK case 34: YY_RULE_SETUP #line 79 "frame/contourlex.L" -{return WCSE_;} +{return WCSD_;} YY_BREAK case 35: YY_RULE_SETUP #line 80 "frame/contourlex.L" -{return WCSF_;} +{return WCSE_;} YY_BREAK case 36: YY_RULE_SETUP #line 81 "frame/contourlex.L" -{return WCSG_;} +{return WCSF_;} YY_BREAK case 37: YY_RULE_SETUP #line 82 "frame/contourlex.L" -{return WCSH_;} +{return WCSG_;} YY_BREAK case 38: YY_RULE_SETUP #line 83 "frame/contourlex.L" -{return WCSI_;} +{return WCSH_;} YY_BREAK case 39: YY_RULE_SETUP #line 84 "frame/contourlex.L" -{return WCSJ_;} +{return WCSI_;} YY_BREAK case 40: YY_RULE_SETUP #line 85 "frame/contourlex.L" -{return WCSK_;} +{return WCSJ_;} YY_BREAK case 41: YY_RULE_SETUP #line 86 "frame/contourlex.L" -{return WCSL_;} +{return WCSK_;} YY_BREAK case 42: YY_RULE_SETUP #line 87 "frame/contourlex.L" -{return WCSM_;} +{return WCSL_;} YY_BREAK case 43: YY_RULE_SETUP #line 88 "frame/contourlex.L" -{return WCSN_;} +{return WCSM_;} YY_BREAK case 44: YY_RULE_SETUP #line 89 "frame/contourlex.L" -{return WCSO_;} +{return WCSN_;} YY_BREAK case 45: YY_RULE_SETUP #line 90 "frame/contourlex.L" -{return WCSP_;} +{return WCSO_;} YY_BREAK case 46: YY_RULE_SETUP #line 91 "frame/contourlex.L" -{return WCSQ_;} +{return WCSP_;} YY_BREAK case 47: YY_RULE_SETUP #line 92 "frame/contourlex.L" -{return WCSR_;} +{return WCSQ_;} YY_BREAK case 48: YY_RULE_SETUP #line 93 "frame/contourlex.L" -{return WCSS_;} +{return WCSR_;} YY_BREAK case 49: YY_RULE_SETUP #line 94 "frame/contourlex.L" -{return WCST_;} +{return WCSS_;} YY_BREAK case 50: YY_RULE_SETUP #line 95 "frame/contourlex.L" -{return WCSU_;} +{return WCST_;} YY_BREAK case 51: YY_RULE_SETUP #line 96 "frame/contourlex.L" -{return WCSV_;} +{return WCSU_;} YY_BREAK case 52: YY_RULE_SETUP #line 97 "frame/contourlex.L" -{return WCSW_;} +{return WCSV_;} YY_BREAK case 53: YY_RULE_SETUP #line 98 "frame/contourlex.L" -{return WCSX_;} +{return WCSW_;} YY_BREAK case 54: YY_RULE_SETUP #line 99 "frame/contourlex.L" -{return WCSY_;} +{return WCSX_;} YY_BREAK case 55: YY_RULE_SETUP #line 100 "frame/contourlex.L" -{return WCSZ_;} +{return WCSY_;} YY_BREAK case 56: YY_RULE_SETUP #line 101 "frame/contourlex.L" -{return WIDTH_;} +{return WCSZ_;} YY_BREAK case 57: YY_RULE_SETUP #line 102 "frame/contourlex.L" -{return Y_;} +{return WIDTH_;} YY_BREAK case 58: YY_RULE_SETUP #line 103 "frame/contourlex.L" -{return YES_;} +{return Y_;} YY_BREAK case 59: YY_RULE_SETUP -#line 106 "frame/contourlex.L" +#line 104 "frame/contourlex.L" +{return YES_;} + YY_BREAK +case 60: +YY_RULE_SETUP +#line 107 "frame/contourlex.L" { // Integer ctlval->integer = atoi(yytext); return INT; } YY_BREAK -case 60: -#line 112 "frame/contourlex.L" case 61: +#line 113 "frame/contourlex.L" +case 62: YY_RULE_SETUP -#line 112 "frame/contourlex.L" +#line 113 "frame/contourlex.L" { // Real Number ctlval->real = atof(yytext); return REAL; } YY_BREAK -case 62: -#line 118 "frame/contourlex.L" case 63: +#line 119 "frame/contourlex.L" +case 64: YY_RULE_SETUP -#line 118 "frame/contourlex.L" +#line 119 "frame/contourlex.L" { // degrees yytext[yyleng-1] = '\0'; ctlval->real = atof(yytext); return ANGDEGREE; } YY_BREAK -case 64: -#line 125 "frame/contourlex.L" case 65: +#line 126 "frame/contourlex.L" +case 66: YY_RULE_SETUP -#line 125 "frame/contourlex.L" +#line 126 "frame/contourlex.L" { // physical coords yytext[yyleng-1] = '\0'; ctlval->real = atof(yytext); return PHYCOORD; } YY_BREAK -case 66: -#line 132 "frame/contourlex.L" case 67: +#line 133 "frame/contourlex.L" +case 68: YY_RULE_SETUP -#line 132 "frame/contourlex.L" +#line 133 "frame/contourlex.L" { // image coords yytext[yyleng-1] = '\0'; ctlval->real = atof(yytext); return IMGCOORD; } YY_BREAK -case 68: -#line 139 "frame/contourlex.L" case 69: +#line 140 "frame/contourlex.L" +case 70: YY_RULE_SETUP -#line 139 "frame/contourlex.L" +#line 140 "frame/contourlex.L" { // Sexagesimal int ll = yyleng <(CTBUFSIZE-1) ? yyleng:(CTBUFSIZE-1); strncpy(ctlval->str,yytext,ll); @@ -1347,11 +1358,11 @@ YY_RULE_SETUP return SEXSTR; } YY_BREAK -case 70: -#line 147 "frame/contourlex.L" case 71: +#line 148 "frame/contourlex.L" +case 72: YY_RULE_SETUP -#line 147 "frame/contourlex.L" +#line 148 "frame/contourlex.L" { // HMS int ll = yyleng <(CTBUFSIZE-1) ? yyleng:(CTBUFSIZE-1); strncpy(ctlval->str,yytext,ll); @@ -1359,11 +1370,11 @@ YY_RULE_SETUP return HMSSTR; } YY_BREAK -case 72: -#line 155 "frame/contourlex.L" case 73: +#line 156 "frame/contourlex.L" +case 74: YY_RULE_SETUP -#line 155 "frame/contourlex.L" +#line 156 "frame/contourlex.L" { // DMS int ll = yyleng <(CTBUFSIZE-1) ? yyleng:(CTBUFSIZE-1); strncpy(ctlval->str,yytext,ll); @@ -1371,9 +1382,9 @@ YY_RULE_SETUP return DMSSTR; } YY_BREAK -case 74: +case 75: YY_RULE_SETUP -#line 162 "frame/contourlex.L" +#line 163 "frame/contourlex.L" { // 8 bit Hex Color int ll = yyleng <(CTBUFSIZE-1) ? yyleng:(CTBUFSIZE-1); strncpy(ctlval->str,yytext,ll); @@ -1381,9 +1392,9 @@ YY_RULE_SETUP return STRING; } YY_BREAK -case 75: +case 76: YY_RULE_SETUP -#line 169 "frame/contourlex.L" +#line 170 "frame/contourlex.L" { // 16 bit Hex Color int ll = yyleng <(CTBUFSIZE-1) ? yyleng:(CTBUFSIZE-1); strncpy(ctlval->str,yytext,ll); @@ -1391,9 +1402,9 @@ YY_RULE_SETUP return STRING; } YY_BREAK -case 76: +case 77: YY_RULE_SETUP -#line 176 "frame/contourlex.L" +#line 177 "frame/contourlex.L" { // 32 bit Hex Color int ll = yyleng <(CTBUFSIZE-1) ? yyleng:(CTBUFSIZE-1); strncpy(ctlval->str,yytext,ll); @@ -1401,11 +1412,11 @@ YY_RULE_SETUP return STRING; } YY_BREAK -case 77: -#line 184 "frame/contourlex.L" case 78: +#line 185 "frame/contourlex.L" +case 79: YY_RULE_SETUP -#line 184 "frame/contourlex.L" +#line 185 "frame/contourlex.L" { // Quoted String int ll = (yyleng-2)<(CTBUFSIZE-1) ? (yyleng-2):(CTBUFSIZE-1); strncpy(ctlval->str,yytext+1,ll); // skip the " " @@ -1413,9 +1424,9 @@ YY_RULE_SETUP return STRING; } YY_BREAK -case 79: +case 80: YY_RULE_SETUP -#line 191 "frame/contourlex.L" +#line 192 "frame/contourlex.L" { // Quoted String int ll = (yyleng-2)<(CTBUFSIZE-1) ? (yyleng-2):(CTBUFSIZE-1); strncpy(ctlval->str,yytext+1,ll); // skip the '{' @@ -1423,9 +1434,9 @@ YY_RULE_SETUP return STRING; } YY_BREAK -case 80: +case 81: YY_RULE_SETUP -#line 198 "frame/contourlex.L" +#line 199 "frame/contourlex.L" { // General String int ll = yyleng <(CTBUFSIZE-1) ? yyleng:(CTBUFSIZE-1); strncpy(ctlval->str,yytext,ll); @@ -1433,55 +1444,55 @@ YY_RULE_SETUP return STRING; } YY_BREAK -case 81: +case 82: YY_RULE_SETUP -#line 205 "frame/contourlex.L" +#line 206 "frame/contourlex.L" { // White Spaces } YY_BREAK -case 82: -/* rule 82 can match eol */ +case 83: +/* rule 83 can match eol */ YY_RULE_SETUP -#line 208 "frame/contourlex.L" +#line 209 "frame/contourlex.L" { // windows line feed return '\n'; } YY_BREAK -case 83: +case 84: YY_RULE_SETUP -#line 212 "frame/contourlex.L" +#line 213 "frame/contourlex.L" { // fake line feed return '\n'; } YY_BREAK -case 84: -/* rule 84 can match eol */ +case 85: +/* rule 85 can match eol */ YY_RULE_SETUP -#line 216 "frame/contourlex.L" +#line 217 "frame/contourlex.L" { // linefeed return '\n'; } YY_BREAK case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(DISCARD): -#line 220 "frame/contourlex.L" +#line 221 "frame/contourlex.L" { // eof return EOF_; } YY_BREAK -case 85: +case 86: YY_RULE_SETUP -#line 224 "frame/contourlex.L" +#line 225 "frame/contourlex.L" { // Else, return the char return yytext[0]; } YY_BREAK -case 86: +case 87: YY_RULE_SETUP -#line 228 "frame/contourlex.L" +#line 229 "frame/contourlex.L" ECHO; YY_BREAK -#line 1485 "frame/contourlex.C" +#line 1496 "frame/contourlex.C" case YY_END_OF_BUFFER: { @@ -1861,7 +1872,7 @@ int yyFlexLexer::yy_get_next_buffer() while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 252 ) + if ( yy_current_state >= 254 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1889,11 +1900,11 @@ int yyFlexLexer::yy_get_next_buffer() while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 252 ) + if ( yy_current_state >= 254 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 251); + yy_is_jam = (yy_current_state == 253); return yy_is_jam ? 0 : yy_current_state; } @@ -2378,7 +2389,7 @@ void ctfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 228 "frame/contourlex.L" +#line 229 "frame/contourlex.L" diff --git a/tksao/frame/contourlex.L b/tksao/frame/contourlex.L index 1d89ddc..ebdc393 100644 --- a/tksao/frame/contourlex.L +++ b/tksao/frame/contourlex.L @@ -48,6 +48,7 @@ H [0-9a-fA-F] amplifier {return AMPLIFIER_;} b1950 {return B1950_;} color {return COLOR_;} +colour {return COLOR_;} dash {return DASH_;} dashlist {return DASHLIST_;} debug {return DEBUG_;} diff --git a/tksao/frame/ds9lex.C b/tksao/frame/ds9lex.C index 4481b0d..57206ca 100644 --- a/tksao/frame/ds9lex.C +++ b/tksao/frame/ds9lex.C @@ -324,8 +324,8 @@ int yyFlexLexer::yywrap() { return 1; } *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 152 -#define YY_END_OF_BUFFER 153 +#define YY_NUM_RULES 153 +#define YY_END_OF_BUFFER 154 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -333,65 +333,65 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[517] = +static yyconst flex_int16_t yy_accept[519] = { 0, - 0, 0, 2, 2, 153, 151, 147, 150, 151, 151, - 151, 151, 151, 151, 115, 146, 146, 146, 146, 146, - 146, 146, 146, 146, 146, 146, 146, 146, 54, 146, - 146, 146, 146, 146, 146, 146, 146, 146, 112, 113, - 151, 151, 2, 1, 147, 148, 0, 143, 0, 0, - 144, 0, 115, 117, 130, 126, 116, 115, 0, 146, - 118, 146, 146, 124, 122, 120, 146, 146, 146, 146, - 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, - 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, - 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, - - 146, 146, 55, 146, 57, 146, 146, 146, 146, 146, - 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, - 146, 146, 146, 146, 149, 0, 145, 2, 0, 117, - 132, 128, 116, 118, 0, 0, 124, 122, 120, 131, - 127, 119, 0, 125, 123, 121, 118, 0, 146, 0, - 116, 146, 146, 146, 146, 146, 146, 146, 146, 11, - 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, - 146, 146, 146, 146, 146, 146, 33, 146, 146, 146, - 146, 146, 38, 39, 146, 146, 146, 146, 146, 146, - 146, 146, 146, 146, 49, 146, 146, 56, 146, 146, - - 60, 146, 146, 146, 146, 146, 146, 146, 146, 146, - 72, 146, 146, 146, 146, 146, 146, 146, 146, 83, - 146, 114, 140, 133, 129, 0, 116, 0, 0, 117, - 0, 146, 146, 146, 146, 146, 146, 146, 146, 146, - 146, 146, 146, 146, 146, 146, 146, 146, 146, 22, - 146, 146, 146, 146, 146, 146, 29, 146, 146, 146, - 146, 36, 146, 41, 146, 146, 146, 146, 45, 146, - 146, 146, 146, 51, 53, 146, 146, 146, 146, 146, - 146, 146, 146, 146, 146, 146, 146, 146, 73, 76, - 77, 146, 146, 146, 146, 146, 110, 84, 85, 86, - - 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, - 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, - 107, 108, 109, 146, 0, 0, 0, 0, 134, 0, - 146, 0, 146, 146, 146, 146, 146, 7, 8, 146, - 10, 146, 146, 146, 146, 17, 146, 146, 146, 21, - 146, 24, 146, 146, 146, 146, 146, 146, 146, 34, - 35, 37, 146, 146, 146, 146, 146, 48, 146, 50, - 146, 58, 146, 146, 62, 146, 146, 146, 146, 146, - 68, 146, 146, 146, 146, 146, 146, 146, 146, 146, - 146, 111, 0, 0, 0, 135, 134, 0, 0, 138, - - 0, 0, 136, 146, 146, 5, 6, 146, 146, 13, - 146, 15, 146, 146, 20, 146, 146, 26, 146, 146, - 146, 146, 32, 40, 146, 43, 146, 46, 146, 52, - 146, 61, 146, 146, 146, 66, 67, 146, 69, 71, - 146, 146, 146, 146, 80, 78, 146, 141, 138, 136, - 139, 137, 146, 4, 146, 146, 146, 146, 18, 146, - 146, 25, 146, 28, 146, 30, 146, 146, 47, 146, - 63, 146, 146, 70, 146, 146, 146, 146, 79, 0, - 146, 146, 146, 14, 16, 146, 23, 27, 31, 42, - 44, 59, 146, 65, 146, 146, 146, 82, 0, 3, - - 146, 12, 19, 146, 74, 146, 146, 0, 9, 64, - 75, 81, 0, 0, 142, 0 + 0, 0, 2, 2, 154, 152, 148, 151, 152, 152, + 152, 152, 152, 152, 116, 147, 147, 147, 147, 147, + 147, 147, 147, 147, 147, 147, 147, 147, 55, 147, + 147, 147, 147, 147, 147, 147, 147, 147, 113, 114, + 152, 152, 2, 1, 148, 149, 0, 144, 0, 0, + 145, 0, 116, 118, 131, 127, 117, 116, 0, 147, + 119, 147, 147, 125, 123, 121, 147, 147, 147, 147, + 147, 147, 147, 147, 147, 147, 147, 147, 147, 147, + 147, 147, 147, 147, 147, 147, 147, 147, 147, 147, + 147, 147, 147, 147, 147, 147, 147, 147, 147, 147, + + 147, 147, 56, 147, 58, 147, 147, 147, 147, 147, + 147, 147, 147, 147, 147, 147, 147, 147, 147, 147, + 147, 147, 147, 147, 150, 0, 146, 2, 0, 118, + 133, 129, 117, 119, 0, 0, 125, 123, 121, 132, + 128, 120, 0, 126, 124, 122, 119, 0, 147, 0, + 117, 147, 147, 147, 147, 147, 147, 147, 147, 11, + 147, 147, 147, 147, 147, 147, 147, 147, 147, 147, + 147, 147, 147, 147, 147, 147, 34, 147, 147, 147, + 147, 147, 39, 40, 147, 147, 147, 147, 147, 147, + 147, 147, 147, 147, 50, 147, 147, 57, 147, 147, + + 61, 147, 147, 147, 147, 147, 147, 147, 147, 147, + 73, 147, 147, 147, 147, 147, 147, 147, 147, 84, + 147, 115, 141, 134, 130, 0, 117, 0, 0, 118, + 0, 147, 147, 147, 147, 147, 147, 147, 147, 147, + 147, 147, 147, 147, 147, 147, 147, 147, 147, 23, + 147, 147, 147, 147, 147, 147, 30, 147, 147, 147, + 147, 37, 147, 42, 147, 147, 147, 147, 46, 147, + 147, 147, 147, 52, 54, 147, 147, 147, 147, 147, + 147, 147, 147, 147, 147, 147, 147, 147, 74, 77, + 78, 147, 147, 147, 147, 147, 111, 85, 86, 87, + + 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, + 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, + 108, 109, 110, 147, 0, 0, 0, 0, 135, 0, + 147, 0, 147, 147, 147, 147, 147, 7, 8, 147, + 10, 147, 147, 147, 147, 17, 147, 147, 147, 147, + 22, 147, 25, 147, 147, 147, 147, 147, 147, 147, + 35, 36, 38, 147, 147, 147, 147, 147, 49, 147, + 51, 147, 59, 147, 147, 63, 147, 147, 147, 147, + 147, 69, 147, 147, 147, 147, 147, 147, 147, 147, + 147, 147, 112, 0, 0, 0, 136, 135, 0, 0, + + 139, 0, 0, 137, 147, 147, 5, 6, 147, 147, + 13, 147, 15, 18, 147, 147, 21, 147, 147, 27, + 147, 147, 147, 147, 33, 41, 147, 44, 147, 47, + 147, 53, 147, 62, 147, 147, 147, 67, 68, 147, + 70, 72, 147, 147, 147, 147, 81, 79, 147, 142, + 139, 137, 140, 138, 147, 4, 147, 147, 147, 147, + 19, 147, 147, 26, 147, 29, 147, 31, 147, 147, + 48, 147, 64, 147, 147, 71, 147, 147, 147, 147, + 80, 0, 147, 147, 147, 14, 16, 147, 24, 28, + 32, 43, 45, 60, 147, 66, 147, 147, 147, 83, + + 0, 3, 147, 12, 20, 147, 75, 147, 147, 0, + 9, 65, 76, 82, 0, 0, 143, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -438,14 +438,14 @@ static yyconst flex_int32_t yy_meta[74] = 3, 1, 1 } ; -static yyconst flex_int16_t yy_base[537] = +static yyconst flex_int16_t yy_base[539] = { 0, - 0, 0, 142, 128, 129, 4126, 124, 4126, 122, 119, + 0, 0, 142, 128, 129, 4181, 124, 4181, 122, 119, 0, 116, 65, 73, 86, 110, 169, 220, 125, 279, 336, 176, 191, 392, 109, 149, 205, 219, 231, 239, 433, 146, 260, 298, 492, 152, 299, 352, 305, 328, - 74, 38, 0, 4126, 105, 4126, 100, 4126, 0, 87, - 4126, 415, 551, 610, 4126, 4126, 669, 728, 460, 357, + 74, 38, 0, 4181, 105, 4181, 100, 4181, 0, 87, + 4181, 415, 551, 610, 4181, 4181, 669, 728, 460, 357, 787, 492, 510, 367, 384, 398, 429, 436, 536, 530, 588, 428, 574, 589, 633, 690, 754, 643, 660, 476, 808, 706, 801, 648, 809, 825, 761, 845, 862, 863, @@ -453,9 +453,9 @@ static yyconst flex_int16_t yy_base[537] = 960, 961, 640, 966, 751, 976, 988, 991, 1016, 1006, 998, 1035, 1050, 1043, 1069, 1072, 1086, 1079, 1094, 1101, - 1106, 1128, 1131, 1150, 4126, 19, 4126, 0, 0, 1183, - 4126, 4126, 1196, 1160, 1207, 1215, 4126, 4126, 4126, 4126, - 4126, 4126, 1225, 4126, 4126, 4126, 4126, 1233, 79, 1242, + 1106, 1128, 1131, 1150, 4181, 19, 4181, 0, 0, 1183, + 4181, 4181, 1196, 1160, 1207, 1215, 4181, 4181, 4181, 4181, + 4181, 4181, 1225, 4181, 4181, 4181, 4181, 1233, 79, 1242, 1255, 1263, 1121, 1277, 1278, 1284, 1283, 1301, 1313, 1320, 1319, 1340, 1341, 1347, 1364, 1367, 1372, 1386, 1396, 1401, 1406, 1423, 1413, 1433, 1440, 1443, 1448, 1458, 1470, 1476, @@ -464,107 +464,107 @@ static yyconst flex_int16_t yy_base[537] = 1649, 1652, 1655, 1672, 1675, 1687, 1690, 1713, 1714, 1720, 1734, 1740, 1750, 1756, 1775, 1780, 1790, 1783, 1805, 1860, - 1813, 1806, 0, 4126, 4126, 1922, 1842, 1930, 1850, 1952, + 1813, 1806, 0, 4181, 4181, 1922, 1842, 1930, 1850, 1952, 1961, 1980, 1989, 2002, 2003, 2008, 2009, 2029, 1828, 2032, - 2035, 2056, 2059, 2071, 2081, 2064, 2096, 2112, 2115, 2130, - 2140, 2146, 2163, 2168, 2173, 2190, 2193, 2200, 2205, 2208, - 2230, 2231, 2237, 2238, 2255, 2260, 2275, 2280, 2295, 2298, - 2310, 2313, 2320, 2335, 2338, 2350, 2357, 2358, 2365, 2373, - 2390, 2400, 2415, 2427, 2430, 2447, 2437, 2454, 2464, 2472, - 2487, 2494, 2499, 2502, 2516, 2517, 2523, 2543, 2546, 2561, - - 2568, 2573, 2576, 2583, 2588, 2591, 2598, 2603, 2606, 2613, - 2618, 2621, 2628, 2633, 2636, 2643, 2648, 2651, 2658, 2663, - 2666, 2673, 2678, 2681, 0, 2699, 2708, 2716, 2726, 2734, - 2743, 2751, 2799, 2766, 2765, 2787, 2780, 2688, 2788, 2815, - 2816, 2830, 2835, 2838, 2853, 2865, 2868, 2880, 2883, 2890, - 2904, 2905, 2919, 2929, 2936, 2941, 2944, 2958, 2959, 2976, - 2979, 2984, 2999, 3005, 3006, 3011, 3021, 3040, 3050, 3043, - 3068, 3069, 3074, 3075, 3089, 3096, 3106, 3101, 3123, 3116, - 3131, 3143, 3148, 3158, 3165, 3173, 3183, 3189, 3209, 3210, - 3216, 3233, 0, 129, 153, 3250, 3267, 3275, 3283, 3236, - - 3291, 3319, 3304, 3333, 3309, 3336, 3343, 3357, 3358, 3363, - 3373, 3379, 3391, 3396, 3406, 3411, 3425, 3426, 3431, 3447, - 3452, 3467, 3475, 3490, 3493, 3496, 3514, 3517, 3520, 3532, - 3535, 3550, 3551, 3556, 3557, 3571, 3579, 3591, 3594, 3597, - 3609, 3619, 3633, 3626, 3634, 3641, 3653, 0, 4126, 4126, - 4126, 4126, 3659, 3660, 3674, 3684, 3689, 3699, 3692, 3715, - 3718, 3721, 3737, 3742, 3745, 3752, 3760, 3767, 3770, 3777, - 3787, 3792, 3797, 3804, 3807, 3823, 3826, 3838, 3843, 0, - 3850, 3853, 3865, 3872, 3882, 3887, 3888, 3902, 3909, 3912, - 3917, 3924, 3927, 3934, 3939, 3946, 3954, 3949, 0, 3961, - - 3964, 3976, 3986, 3991, 3992, 3998, 4013, 0, 4019, 4020, - 4025, 4035, 0, 0, 4126, 4126, 4063, 4069, 4071, 4077, - 4081, 4087, 4093, 4095, 4097, 4099, 4101, 4103, 4106, 4108, - 4109, 4111, 4113, 4115, 4117, 4119 + 2035, 2056, 2059, 2071, 2081, 2064, 2107, 2097, 2115, 2127, + 2130, 2142, 2157, 2165, 2171, 2189, 2192, 2207, 2210, 2228, + 2231, 2238, 2253, 2256, 2272, 2277, 2278, 2296, 2299, 2302, + 2314, 2322, 2334, 2340, 2361, 2362, 2367, 2382, 2388, 2398, + 2404, 2410, 2425, 2431, 2437, 2452, 2460, 2467, 2475, 2492, + 2498, 2515, 2518, 2521, 2536, 2537, 2542, 2556, 2561, 2571, + + 2576, 2583, 2588, 2593, 2598, 2603, 2608, 2613, 2618, 2623, + 2628, 2633, 2638, 2643, 2648, 2653, 2658, 2663, 2668, 2673, + 2678, 2683, 2688, 2693, 0, 2711, 2720, 2728, 2738, 2746, + 2755, 2763, 2811, 2778, 2777, 2799, 2792, 2698, 2800, 2827, + 2828, 2842, 2847, 2850, 2865, 2877, 2880, 2892, 2895, 2902, + 2917, 2918, 2932, 2935, 2942, 2957, 2962, 2969, 2972, 2979, + 2984, 2994, 2999, 3006, 3009, 3021, 3028, 3036, 3043, 3051, + 3057, 3058, 3063, 3078, 3083, 3084, 3098, 3101, 3106, 3118, + 3125, 3128, 3143, 3146, 3165, 3171, 3172, 3186, 3191, 3201, + 3211, 3216, 3226, 0, 129, 153, 3242, 3250, 3267, 3275, + + 3288, 3303, 3311, 3289, 3325, 3328, 3340, 3346, 3352, 3369, + 3364, 3379, 3386, 3389, 3396, 3401, 3404, 3411, 3416, 3431, + 3432, 3449, 3452, 3459, 3467, 3479, 3484, 3494, 3508, 3509, + 3514, 3515, 3534, 3540, 3550, 3556, 3570, 3578, 3584, 3592, + 3598, 3606, 3613, 3618, 3632, 3637, 3642, 3654, 3659, 0, + 4181, 4181, 4181, 4181, 3664, 3679, 3685, 3691, 3697, 3718, + 3723, 3724, 3738, 3745, 3750, 3764, 3770, 3765, 3787, 3788, + 3805, 3810, 3815, 3825, 3832, 3837, 3840, 3854, 3859, 3869, + 3875, 0, 3876, 3883, 3899, 3909, 3914, 3928, 3936, 3943, + 3948, 3951, 3958, 3963, 3966, 3978, 3983, 3984, 3998, 4003, + + 0, 4006, 4020, 4023, 4030, 4038, 4046, 4053, 4068, 0, + 4074, 4075, 4080, 4095, 0, 0, 4181, 4181, 4118, 4124, + 4126, 4132, 4136, 4142, 4148, 4150, 4152, 4154, 4156, 4158, + 4161, 4163, 4164, 4166, 4168, 4170, 4172, 4174 } ; -static yyconst flex_int16_t yy_def[537] = +static yyconst flex_int16_t yy_def[539] = { 0, - 516, 1, 517, 517, 516, 516, 516, 516, 516, 518, - 519, 520, 516, 516, 521, 521, 521, 17, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 21, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 516, 522, 523, 516, 516, 516, 518, 516, 524, 520, - 516, 516, 516, 516, 516, 516, 516, 521, 516, 521, - 521, 61, 61, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 516, 522, 516, 523, 525, 54, - 516, 516, 57, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 61, 516, - 61, 61, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 516, - 521, 521, 526, 516, 516, 516, 516, 516, 516, 516, - 516, 61, 61, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 527, 516, 516, 516, 516, 516, - 61, 516, 61, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 528, 529, 530, 516, 516, 516, 516, 521, - - 516, 516, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 531, 516, 516, - 516, 516, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 532, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 533, 521, - - 521, 521, 521, 521, 521, 521, 521, 534, 521, 521, - 521, 521, 535, 536, 516, 0, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516 + 518, 1, 519, 519, 518, 518, 518, 518, 518, 520, + 521, 522, 518, 518, 523, 523, 523, 17, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 21, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 518, 524, 525, 518, 518, 518, 520, 518, 526, 522, + 518, 518, 518, 518, 518, 518, 518, 523, 518, 523, + 523, 61, 61, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 518, 524, 518, 525, 527, 54, + 518, 518, 57, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 61, 518, + 61, 61, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 518, + 523, 523, 528, 518, 518, 518, 518, 518, 518, 518, + 518, 61, 61, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 529, 518, 518, 518, 518, 518, + 61, 518, 61, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 530, 531, 532, 518, 518, 518, 518, + + 523, 518, 518, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 533, + 518, 518, 518, 518, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 534, 523, 523, 523, 523, 523, 523, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 523, 523, + + 535, 523, 523, 523, 523, 523, 523, 523, 523, 536, + 523, 523, 523, 523, 537, 538, 518, 0, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518 } ; -static yyconst flex_int16_t yy_nxt[4200] = +static yyconst flex_int16_t yy_nxt[4255] = { 0, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 15, 15, 15, 15, 15, 15, 15, 6, 16, 17, @@ -578,459 +578,465 @@ static yyconst flex_int16_t yy_nxt[4200] = 55, 127, 56, 51, 57, 58, 58, 58, 58, 58, 58, 58, 58, 59, 48, 125, 45, 61, 62, 232, - 127, 63, 64, 516, 516, 516, 516, 516, 516, 65, - 99, 66, 51, 48, 46, 45, 516, 516, 516, 516, - 44, 516, 125, 516, 61, 62, 232, 399, 63, 64, - 67, 68, 516, 80, 44, 69, 65, 81, 66, 516, - 516, 82, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 402, 516, 516, 516, 449, 516, 67, 68, 516, - 80, 100, 69, 516, 81, 516, 516, 516, 82, 70, - 516, 516, 516, 119, 516, 120, 516, 71, 516, 450, - 516, 72, 449, 516, 92, 516, 516, 516, 100, 516, - - 516, 73, 74, 516, 516, 93, 516, 516, 516, 516, - 119, 516, 120, 516, 71, 516, 450, 94, 72, 516, - 516, 92, 516, 516, 516, 516, 516, 516, 73, 74, - 60, 101, 93, 516, 516, 516, 516, 516, 75, 516, - 516, 516, 60, 516, 94, 516, 76, 516, 516, 516, - 516, 102, 77, 78, 516, 79, 516, 516, 101, 516, - 516, 516, 104, 103, 516, 75, 516, 516, 516, 60, - 105, 516, 516, 76, 516, 516, 516, 516, 102, 77, - 78, 516, 79, 516, 516, 516, 516, 516, 516, 104, - 103, 516, 111, 516, 516, 516, 516, 105, 112, 83, - - 84, 516, 516, 516, 516, 516, 516, 516, 85, 516, - 86, 516, 87, 516, 516, 516, 516, 516, 516, 111, - 113, 121, 516, 516, 516, 112, 83, 84, 516, 516, - 114, 516, 516, 516, 516, 85, 516, 86, 516, 87, - 516, 516, 516, 516, 516, 516, 516, 113, 121, 516, - 124, 516, 516, 516, 88, 516, 516, 114, 516, 516, - 516, 516, 89, 516, 90, 516, 516, 516, 91, 516, - 516, 516, 122, 516, 516, 516, 516, 124, 123, 516, - 516, 88, 516, 516, 516, 516, 516, 516, 516, 89, - 516, 90, 516, 516, 516, 91, 516, 516, 516, 122, - - 516, 516, 516, 516, 516, 123, 516, 516, 516, 516, - 516, 516, 95, 516, 516, 516, 96, 516, 516, 516, - 516, 516, 97, 98, 130, 130, 130, 130, 130, 130, - 130, 130, 516, 516, 516, 516, 516, 516, 516, 95, - 516, 516, 516, 96, 516, 516, 516, 516, 516, 97, - 98, 106, 159, 516, 516, 516, 516, 516, 107, 108, - 516, 60, 153, 516, 516, 109, 516, 154, 110, 148, - 148, 148, 148, 148, 148, 148, 148, 516, 106, 159, - 516, 516, 516, 516, 516, 107, 108, 516, 60, 153, - 516, 516, 109, 516, 154, 110, 516, 516, 516, 150, - - 516, 151, 151, 151, 151, 151, 151, 151, 151, 516, - 115, 516, 168, 516, 116, 516, 516, 516, 117, 152, - 152, 152, 152, 152, 152, 152, 152, 118, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 115, 516, 168, - 516, 116, 516, 516, 516, 117, 157, 516, 516, 516, - 516, 516, 516, 516, 118, 131, 155, 132, 516, 133, - 53, 53, 53, 53, 53, 53, 53, 53, 59, 516, - 516, 156, 134, 135, 516, 516, 136, 137, 516, 516, - 516, 516, 516, 155, 138, 516, 139, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 156, 134, - - 135, 516, 516, 136, 137, 516, 516, 161, 158, 516, - 516, 138, 516, 139, 140, 160, 141, 516, 516, 54, - 54, 54, 54, 54, 54, 54, 54, 516, 516, 516, - 516, 142, 143, 516, 161, 158, 144, 516, 516, 516, - 516, 516, 160, 145, 516, 146, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 142, 143, - 516, 166, 162, 144, 516, 516, 516, 516, 516, 516, - 145, 516, 146, 55, 175, 56, 516, 516, 54, 54, - 54, 54, 54, 54, 54, 54, 516, 516, 166, 162, - 147, 135, 167, 516, 516, 137, 516, 516, 516, 516, - - 516, 175, 138, 516, 139, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 147, 135, 167, - 516, 516, 137, 516, 173, 163, 516, 516, 516, 138, - 516, 139, 55, 516, 56, 516, 57, 58, 58, 58, - 58, 58, 58, 58, 58, 59, 516, 516, 516, 61, - 62, 173, 163, 63, 64, 516, 516, 516, 516, 516, - 516, 65, 516, 66, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 61, 62, 516, 178, - 63, 64, 516, 164, 165, 516, 516, 516, 65, 516, - 66, 516, 516, 516, 516, 516, 149, 149, 149, 149, - - 149, 149, 149, 149, 516, 516, 178, 516, 516, 516, - 164, 165, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 169, 516, 516, - 174, 516, 170, 516, 516, 516, 516, 171, 176, 516, - 516, 516, 516, 516, 516, 172, 177, 516, 516, 516, - 516, 516, 516, 516, 169, 516, 516, 174, 516, 170, - 516, 516, 516, 516, 171, 176, 516, 516, 516, 516, - 516, 516, 172, 177, 179, 191, 183, 184, 516, 516, - 516, 516, 516, 516, 180, 516, 516, 516, 516, 516, - 516, 181, 516, 516, 516, 516, 516, 516, 516, 516, - - 516, 179, 191, 182, 516, 516, 516, 516, 185, 516, - 516, 180, 186, 189, 188, 516, 516, 516, 181, 516, - 516, 187, 516, 516, 516, 516, 516, 516, 516, 516, - 182, 516, 516, 516, 192, 185, 516, 516, 516, 186, - 189, 188, 516, 516, 516, 516, 190, 516, 187, 516, - 516, 516, 516, 516, 194, 516, 516, 516, 516, 193, - 516, 192, 516, 195, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 190, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 193, 516, 516, 198, - 195, 196, 516, 516, 516, 516, 516, 516, 516, 516, - - 197, 516, 516, 516, 516, 516, 516, 199, 516, 516, - 516, 516, 516, 201, 516, 516, 198, 516, 196, 516, - 516, 516, 516, 516, 516, 516, 516, 197, 516, 516, - 200, 516, 202, 516, 199, 206, 516, 516, 205, 516, - 201, 516, 203, 516, 516, 204, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 200, 516, 202, - 516, 516, 206, 516, 207, 205, 516, 516, 516, 203, - 516, 516, 204, 516, 208, 516, 516, 516, 516, 209, - 516, 210, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 207, 516, 211, 516, 516, 516, 516, 516, 516, - - 516, 208, 516, 516, 516, 516, 209, 516, 210, 516, - 516, 516, 516, 212, 516, 213, 516, 214, 516, 215, - 211, 516, 217, 516, 516, 516, 218, 516, 516, 516, - 216, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 212, 219, 213, 516, 214, 516, 215, 516, 516, 217, - 234, 516, 221, 218, 516, 516, 516, 216, 516, 516, - 516, 516, 516, 516, 220, 516, 516, 516, 219, 226, - 226, 226, 226, 226, 226, 226, 226, 234, 516, 221, - 516, 516, 516, 516, 516, 516, 222, 224, 516, 225, - 516, 220, 130, 130, 130, 130, 130, 130, 130, 130, - - 131, 516, 132, 516, 516, 130, 130, 130, 130, 130, - 130, 130, 130, 222, 150, 516, 227, 227, 227, 227, + 127, 63, 64, 518, 518, 518, 518, 518, 518, 65, + 99, 66, 51, 48, 46, 45, 518, 518, 518, 518, + 44, 518, 125, 518, 61, 62, 232, 400, 63, 64, + 67, 68, 518, 80, 44, 69, 65, 81, 66, 518, + 518, 82, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 403, 518, 518, 518, 451, 518, 67, 68, 518, + 80, 100, 69, 518, 81, 518, 518, 518, 82, 70, + 518, 518, 518, 119, 518, 120, 518, 71, 518, 452, + 518, 72, 451, 518, 92, 518, 518, 518, 100, 518, + + 518, 73, 74, 518, 518, 93, 518, 518, 518, 518, + 119, 518, 120, 518, 71, 518, 452, 94, 72, 518, + 518, 92, 518, 518, 518, 518, 518, 518, 73, 74, + 60, 101, 93, 518, 518, 518, 518, 518, 75, 518, + 518, 518, 60, 518, 94, 518, 76, 518, 518, 518, + 518, 102, 77, 78, 518, 79, 518, 518, 101, 518, + 518, 518, 104, 103, 518, 75, 518, 518, 518, 60, + 105, 518, 518, 76, 518, 518, 518, 518, 102, 77, + 78, 518, 79, 518, 518, 518, 518, 518, 518, 104, + 103, 518, 111, 518, 518, 518, 518, 105, 112, 83, + + 84, 518, 518, 518, 518, 518, 518, 518, 85, 518, + 86, 518, 87, 518, 518, 518, 518, 518, 518, 111, + 113, 121, 518, 518, 518, 112, 83, 84, 518, 518, + 114, 518, 518, 518, 518, 85, 518, 86, 518, 87, + 518, 518, 518, 518, 518, 518, 518, 113, 121, 518, + 124, 518, 518, 518, 88, 518, 518, 114, 518, 518, + 518, 518, 89, 518, 90, 518, 518, 518, 91, 518, + 518, 518, 122, 518, 518, 518, 518, 124, 123, 518, + 518, 88, 518, 518, 518, 518, 518, 518, 518, 89, + 518, 90, 518, 518, 518, 91, 518, 518, 518, 122, + + 518, 518, 518, 518, 518, 123, 518, 518, 518, 518, + 518, 518, 95, 518, 518, 518, 96, 518, 518, 518, + 518, 518, 97, 98, 130, 130, 130, 130, 130, 130, + 130, 130, 518, 518, 518, 518, 518, 518, 518, 95, + 518, 518, 518, 96, 518, 518, 518, 518, 518, 97, + 98, 106, 159, 518, 518, 518, 518, 518, 107, 108, + 518, 60, 153, 518, 518, 109, 518, 154, 110, 148, + 148, 148, 148, 148, 148, 148, 148, 518, 106, 159, + 518, 518, 518, 518, 518, 107, 108, 518, 60, 153, + 518, 518, 109, 518, 154, 110, 518, 518, 518, 150, + + 518, 151, 151, 151, 151, 151, 151, 151, 151, 518, + 115, 518, 168, 518, 116, 518, 518, 518, 117, 152, + 152, 152, 152, 152, 152, 152, 152, 118, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 115, 518, 168, + 518, 116, 518, 518, 518, 117, 157, 518, 518, 518, + 518, 518, 518, 518, 118, 131, 155, 132, 518, 133, + 53, 53, 53, 53, 53, 53, 53, 53, 59, 518, + 518, 156, 134, 135, 518, 518, 136, 137, 518, 518, + 518, 518, 518, 155, 138, 518, 139, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 156, 134, + + 135, 518, 518, 136, 137, 518, 518, 161, 158, 518, + 518, 138, 518, 139, 140, 160, 141, 518, 518, 54, + 54, 54, 54, 54, 54, 54, 54, 518, 518, 518, + 518, 142, 143, 518, 161, 158, 144, 518, 518, 518, + 518, 518, 160, 145, 518, 146, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 142, 143, + 518, 166, 162, 144, 518, 518, 518, 518, 518, 518, + 145, 518, 146, 55, 175, 56, 518, 518, 54, 54, + 54, 54, 54, 54, 54, 54, 518, 518, 166, 162, + 147, 135, 167, 518, 518, 137, 518, 518, 518, 518, + + 518, 175, 138, 518, 139, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 147, 135, 167, + 518, 518, 137, 518, 173, 163, 518, 518, 518, 138, + 518, 139, 55, 518, 56, 518, 57, 58, 58, 58, + 58, 58, 58, 58, 58, 59, 518, 518, 518, 61, + 62, 173, 163, 63, 64, 518, 518, 518, 518, 518, + 518, 65, 518, 66, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 61, 62, 518, 178, + 63, 64, 518, 164, 165, 518, 518, 518, 65, 518, + 66, 518, 518, 518, 518, 518, 149, 149, 149, 149, + + 149, 149, 149, 149, 518, 518, 178, 518, 518, 518, + 164, 165, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 169, 518, 518, + 174, 518, 170, 518, 518, 518, 518, 171, 176, 518, + 518, 518, 518, 518, 518, 172, 177, 518, 518, 518, + 518, 518, 518, 518, 169, 518, 518, 174, 518, 170, + 518, 518, 518, 518, 171, 176, 518, 518, 518, 518, + 518, 518, 172, 177, 179, 191, 183, 184, 518, 518, + 518, 518, 518, 518, 180, 518, 518, 518, 518, 518, + 518, 181, 518, 518, 518, 518, 518, 518, 518, 518, + + 518, 179, 191, 182, 518, 518, 518, 518, 185, 518, + 518, 180, 186, 189, 188, 518, 518, 518, 181, 518, + 518, 187, 518, 518, 518, 518, 518, 518, 518, 518, + 182, 518, 518, 518, 192, 185, 518, 518, 518, 186, + 189, 188, 518, 518, 518, 518, 190, 518, 187, 518, + 518, 518, 518, 518, 194, 518, 518, 518, 518, 193, + 518, 192, 518, 195, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 190, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 193, 518, 518, 198, + 195, 196, 518, 518, 518, 518, 518, 518, 518, 518, + + 197, 518, 518, 518, 518, 518, 518, 199, 518, 518, + 518, 518, 518, 201, 518, 518, 198, 518, 196, 518, + 518, 518, 518, 518, 518, 518, 518, 197, 518, 518, + 200, 518, 202, 518, 199, 206, 518, 518, 205, 518, + 201, 518, 203, 518, 518, 204, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 200, 518, 202, + 518, 518, 206, 518, 207, 205, 518, 518, 518, 203, + 518, 518, 204, 518, 208, 518, 518, 518, 518, 209, + 518, 210, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 207, 518, 211, 518, 518, 518, 518, 518, 518, + + 518, 208, 518, 518, 518, 518, 209, 518, 210, 518, + 518, 518, 518, 212, 518, 213, 518, 214, 518, 215, + 211, 518, 217, 518, 518, 518, 218, 518, 518, 518, + 216, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 212, 219, 213, 518, 214, 518, 215, 518, 518, 217, + 234, 518, 221, 218, 518, 518, 518, 216, 518, 518, + 518, 518, 518, 518, 220, 518, 518, 518, 219, 226, + 226, 226, 226, 226, 226, 226, 226, 234, 518, 221, + 518, 518, 518, 518, 518, 518, 222, 224, 518, 225, + 518, 220, 130, 130, 130, 130, 130, 130, 130, 130, + + 131, 518, 132, 518, 518, 130, 130, 130, 130, 130, + 130, 130, 130, 222, 150, 518, 227, 227, 227, 227, 227, 227, 227, 227, 228, 228, 228, 228, 228, 228, - 228, 228, 229, 516, 230, 230, 230, 230, 230, 230, + 228, 228, 229, 518, 230, 230, 230, 230, 230, 230, 230, 230, 148, 148, 148, 148, 148, 148, 148, 148, 231, 227, 227, 227, 227, 227, 227, 227, 227, 131, - 516, 132, 516, 516, 151, 151, 151, 151, 151, 151, + 518, 132, 518, 518, 151, 151, 151, 151, 151, 151, 151, 151, 152, 152, 152, 152, 152, 152, 152, 152, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 233, 516, 516, 516, 239, 516, 516, - - 516, 516, 516, 516, 516, 516, 516, 516, 236, 516, - 516, 516, 516, 516, 237, 235, 238, 516, 516, 516, - 233, 516, 516, 516, 516, 516, 516, 516, 516, 240, - 516, 516, 516, 516, 516, 236, 516, 516, 516, 241, - 242, 237, 235, 238, 516, 516, 516, 516, 516, 516, - 243, 516, 516, 516, 516, 516, 240, 516, 516, 516, - 516, 245, 516, 516, 516, 516, 241, 242, 516, 244, - 516, 516, 516, 516, 516, 516, 516, 243, 516, 246, - 516, 516, 516, 516, 516, 516, 516, 516, 245, 516, - 516, 516, 516, 516, 516, 516, 244, 247, 248, 516, - - 516, 516, 516, 516, 516, 516, 246, 516, 249, 516, - 516, 250, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 247, 248, 516, 516, 253, 516, - 516, 516, 516, 516, 251, 249, 252, 516, 250, 516, - 516, 516, 516, 255, 516, 254, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 253, 516, 516, 516, 256, - 516, 251, 516, 252, 516, 516, 516, 516, 516, 258, - 255, 516, 254, 516, 516, 516, 516, 257, 516, 516, - 516, 516, 516, 516, 516, 516, 256, 516, 516, 259, - 516, 516, 516, 516, 516, 516, 258, 516, 516, 263, - - 516, 516, 516, 516, 257, 261, 260, 516, 516, 516, - 516, 516, 516, 262, 516, 516, 259, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 263, 516, 516, 516, - 516, 516, 261, 260, 516, 516, 516, 266, 516, 516, - 262, 516, 516, 516, 265, 516, 516, 516, 264, 516, - 516, 516, 516, 516, 267, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 266, 516, 268, 516, 516, 516, - 516, 265, 516, 516, 516, 264, 516, 516, 516, 516, - 516, 267, 516, 516, 516, 516, 516, 269, 516, 270, - 516, 516, 516, 268, 516, 273, 516, 516, 271, 516, - - 516, 516, 516, 516, 516, 516, 516, 516, 516, 272, - 516, 516, 516, 516, 269, 516, 270, 516, 516, 516, - 516, 516, 516, 516, 274, 271, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 272, 516, 516, 516, - 516, 516, 516, 516, 275, 516, 516, 516, 516, 516, - 276, 274, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 275, 516, 277, 278, 516, 516, 276, 516, 516, - 516, 516, 516, 516, 516, 516, 279, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - - 277, 278, 281, 516, 516, 283, 284, 516, 282, 516, - 516, 516, 285, 279, 280, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 281, - 516, 516, 283, 284, 516, 282, 287, 516, 516, 285, - 516, 280, 516, 286, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 288, 516, 516, 516, 516, - 516, 516, 516, 287, 516, 516, 516, 516, 516, 516, - 286, 516, 290, 516, 516, 516, 516, 289, 291, 516, - 516, 516, 288, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 290, - - 516, 292, 293, 516, 289, 291, 516, 516, 294, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 295, 516, 516, 516, 516, 516, 516, 516, 292, 293, - 516, 516, 516, 516, 516, 294, 516, 339, 516, 516, - 516, 296, 516, 516, 516, 516, 131, 295, 132, 516, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 233, 518, 518, 518, 239, 518, 518, + + 518, 518, 518, 518, 518, 518, 518, 518, 236, 518, + 518, 518, 518, 518, 237, 235, 238, 518, 518, 518, + 233, 518, 518, 518, 518, 518, 518, 518, 518, 240, + 518, 518, 518, 518, 518, 236, 518, 518, 518, 241, + 242, 237, 235, 238, 518, 518, 518, 518, 518, 518, + 243, 518, 518, 518, 518, 518, 240, 518, 518, 518, + 518, 245, 518, 518, 518, 518, 241, 242, 518, 244, + 518, 518, 518, 518, 518, 518, 518, 243, 518, 246, + 518, 518, 518, 518, 518, 518, 518, 518, 245, 518, + 518, 518, 518, 518, 518, 518, 244, 247, 248, 518, + + 518, 518, 518, 518, 518, 518, 246, 518, 249, 518, + 518, 250, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 247, 248, 518, 518, 253, 518, + 518, 518, 518, 518, 251, 249, 252, 518, 250, 518, + 518, 518, 518, 255, 518, 254, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 253, 518, 518, 518, 256, + 518, 251, 518, 252, 518, 518, 518, 518, 518, 258, + 255, 518, 254, 518, 518, 518, 518, 257, 518, 518, + 518, 518, 518, 518, 518, 518, 256, 518, 518, 259, + 518, 518, 518, 518, 518, 518, 258, 518, 518, 263, + + 518, 518, 518, 518, 257, 261, 260, 518, 518, 518, + 518, 518, 518, 262, 518, 518, 259, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 263, 518, 518, 518, + 518, 518, 261, 260, 518, 518, 518, 266, 518, 518, + 262, 518, 518, 518, 265, 518, 518, 518, 264, 518, + 518, 518, 518, 518, 267, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 266, 518, 268, 518, 518, 518, + 518, 265, 518, 518, 518, 264, 518, 518, 518, 518, + 518, 267, 518, 518, 518, 518, 518, 269, 518, 270, + 518, 518, 518, 268, 518, 273, 518, 518, 271, 518, + + 518, 518, 518, 518, 518, 518, 518, 518, 518, 272, + 518, 518, 518, 518, 269, 518, 270, 518, 518, 518, + 518, 518, 518, 518, 274, 271, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 272, 518, 518, 518, + 518, 518, 518, 518, 275, 518, 518, 518, 518, 518, + 276, 274, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 275, 518, 277, 278, 518, 518, 276, 518, 518, + 518, 518, 518, 518, 518, 518, 279, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + + 277, 278, 281, 518, 518, 283, 284, 518, 282, 518, + 518, 518, 285, 279, 280, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 281, + 518, 518, 283, 284, 518, 282, 287, 518, 518, 285, + 518, 280, 518, 286, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 288, 518, 518, 518, 518, + 518, 518, 518, 287, 518, 518, 518, 518, 518, 518, + 286, 518, 290, 518, 518, 518, 518, 289, 291, 518, + 518, 518, 288, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 290, + + 518, 292, 293, 518, 289, 291, 518, 518, 294, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 295, 518, 518, 518, 518, 518, 518, 518, 292, 293, + 518, 518, 518, 518, 518, 294, 518, 339, 518, 518, + 518, 296, 518, 518, 518, 518, 131, 295, 132, 518, 324, 227, 227, 227, 227, 227, 227, 227, 227, 230, - 230, 230, 230, 230, 230, 230, 230, 516, 296, 297, + 230, 230, 230, 230, 230, 230, 230, 518, 296, 297, 60, 60, 60, 60, 60, 60, 60, 324, 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, 516, 298, 299, 300, 301, 302, + 320, 321, 322, 323, 518, 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, 226, 226, 226, 226, 226, 226, 226, 226, 228, - 228, 228, 228, 228, 228, 228, 228, 516, 516, 516, - 516, 516, 326, 516, 516, 516, 224, 516, 225, 516, + 228, 228, 228, 228, 228, 228, 228, 518, 518, 518, + 518, 518, 326, 518, 518, 518, 224, 518, 225, 518, 327, 230, 230, 230, 230, 230, 230, 230, 230, 328, - 329, 329, 329, 329, 329, 329, 329, 329, 516, 326, - 516, 516, 516, 516, 516, 516, 516, 327, 330, 331, + 329, 329, 329, 329, 329, 329, 329, 329, 518, 326, + 518, 518, 518, 518, 518, 518, 518, 327, 330, 331, 331, 331, 331, 331, 331, 331, 331, 332, 333, 333, - 333, 333, 333, 333, 333, 333, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 334, 516, - 516, 337, 335, 516, 336, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 334, 340, 516, 337, 335, - 516, 336, 516, 516, 516, 516, 341, 516, 516, 338, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 343, 516, 342, 340, 516, 516, 516, 516, 516, 516, - 344, 516, 516, 341, 516, 516, 338, 516, 516, 346, - - 516, 516, 516, 516, 516, 516, 516, 343, 516, 342, - 345, 516, 516, 516, 347, 516, 516, 344, 516, 516, - 516, 516, 516, 516, 516, 516, 346, 516, 348, 516, - 516, 516, 516, 349, 516, 516, 516, 345, 516, 516, - 516, 347, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 350, 516, 516, 516, 348, 516, 516, 516, 351, - 349, 516, 516, 516, 352, 516, 516, 516, 353, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 350, 516, - 516, 516, 516, 516, 516, 516, 351, 516, 355, 516, - 516, 352, 516, 516, 516, 353, 516, 516, 516, 516, - - 354, 516, 516, 516, 516, 356, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 355, 516, 516, 516, 516, - 516, 516, 516, 357, 516, 516, 359, 354, 516, 516, - 360, 516, 356, 358, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 357, 361, 516, 359, 516, 516, 516, 360, 362, 516, - 358, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 363, 516, 516, 516, 516, 361, 516, - 364, 516, 516, 516, 516, 362, 516, 516, 516, 516, - 516, 516, 516, 365, 516, 516, 516, 516, 516, 516, - - 363, 516, 516, 516, 516, 516, 516, 364, 516, 366, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 365, 516, 516, 516, 516, 516, 516, 516, 516, 370, - 516, 516, 368, 367, 516, 516, 366, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 369, 516, 371, 516, 516, 516, 516, 516, 368, - 367, 516, 516, 516, 516, 516, 516, 516, 372, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 369, 516, - 371, 516, 516, 373, 516, 516, 516, 374, 516, 516, - 516, 516, 516, 516, 516, 372, 516, 376, 516, 516, - - 516, 516, 375, 516, 516, 516, 516, 516, 516, 516, - 373, 516, 377, 516, 374, 516, 516, 516, 516, 516, - 516, 516, 378, 516, 376, 516, 516, 516, 516, 375, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 377, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 378, - 516, 516, 379, 516, 516, 516, 516, 383, 516, 380, - 516, 516, 516, 516, 516, 381, 516, 516, 516, 382, - 516, 516, 516, 516, 384, 516, 516, 516, 516, 379, - 516, 516, 385, 516, 383, 516, 380, 516, 516, 516, - 516, 516, 381, 516, 516, 516, 382, 516, 516, 386, - - 516, 384, 516, 516, 516, 516, 516, 516, 516, 385, - 516, 516, 516, 516, 516, 516, 516, 516, 387, 516, - 516, 516, 516, 516, 516, 516, 386, 516, 388, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 389, - 516, 516, 516, 391, 516, 387, 516, 516, 390, 516, - 516, 516, 516, 516, 516, 388, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 389, 516, 516, 516, - 391, 516, 516, 516, 516, 390, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - - 516, 516, 516, 516, 516, 516, 392, 330, 394, 394, - 394, 394, 394, 394, 394, 394, 332, 395, 395, 395, - 395, 395, 395, 395, 395, 396, 396, 396, 396, 396, - 396, 396, 396, 392, 397, 329, 329, 329, 329, 329, - 329, 329, 329, 398, 398, 398, 398, 398, 398, 398, - 398, 399, 331, 331, 331, 331, 331, 331, 331, 331, - 401, 401, 401, 401, 401, 401, 401, 401, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 400, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 404, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - - 407, 516, 516, 405, 516, 516, 400, 402, 333, 333, - 333, 333, 333, 333, 333, 333, 404, 516, 406, 516, - 516, 516, 516, 516, 516, 516, 516, 407, 516, 516, - 405, 516, 516, 516, 516, 403, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 406, 516, 516, 516, 516, - 408, 516, 516, 410, 516, 516, 411, 516, 516, 516, - 516, 516, 403, 516, 516, 409, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 412, 516, 408, 516, 516, - 410, 516, 516, 411, 516, 516, 516, 516, 516, 516, - 516, 516, 409, 516, 516, 516, 516, 516, 516, 516, - - 516, 415, 412, 516, 413, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 414, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 415, 516, - 416, 413, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 417, 516, 414, 516, 516, 516, 516, 516, 516, - 516, 418, 516, 516, 516, 516, 516, 416, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 417, 516, - 516, 516, 420, 419, 516, 516, 516, 423, 418, 516, - 516, 421, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 422, 516, 516, 516, 516, 420, - - 419, 516, 516, 516, 423, 516, 516, 516, 421, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 422, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 426, 424, 427, 516, 516, - 516, 516, 425, 428, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 426, 424, 427, 516, 516, 516, 516, 425, - 428, 429, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 431, 516, 516, 516, 429, 516, - - 516, 516, 516, 430, 516, 516, 516, 516, 516, 516, - 516, 432, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 431, 516, 516, 516, 516, 434, 516, 433, 516, - 430, 516, 516, 516, 516, 516, 435, 516, 432, 516, - 516, 516, 516, 516, 516, 436, 516, 516, 516, 516, - 516, 516, 516, 434, 516, 433, 516, 437, 516, 516, - 516, 516, 516, 435, 516, 516, 516, 516, 516, 516, - 516, 516, 436, 516, 438, 516, 516, 516, 516, 516, - 440, 516, 516, 516, 437, 439, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 441, 516, 516, 516, - - 516, 438, 516, 516, 516, 442, 516, 440, 443, 516, - 516, 444, 439, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 441, 516, 516, 516, 516, 516, 516, - 516, 445, 442, 516, 516, 443, 516, 516, 444, 516, - 516, 516, 516, 516, 516, 446, 516, 516, 447, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 445, 396, - 396, 396, 396, 396, 396, 396, 396, 516, 516, 516, - 516, 516, 446, 516, 516, 447, 396, 396, 396, 396, - 396, 396, 396, 396, 398, 398, 398, 398, 398, 398, - 398, 398, 398, 398, 398, 398, 398, 398, 398, 398, - - 401, 401, 401, 401, 401, 401, 401, 401, 516, 516, - 516, 451, 516, 516, 516, 516, 516, 516, 516, 449, - 516, 516, 516, 516, 516, 516, 516, 452, 401, 401, - 401, 401, 401, 401, 401, 401, 516, 516, 451, 516, - 516, 516, 516, 516, 516, 454, 449, 516, 516, 516, - 516, 516, 516, 516, 452, 450, 516, 516, 516, 453, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 454, 516, 516, 516, 516, 516, 456, 516, - 516, 516, 450, 516, 516, 516, 453, 516, 516, 455, - 516, 458, 516, 457, 516, 516, 516, 516, 516, 516, - - 516, 516, 516, 516, 516, 456, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 455, 516, 516, 516, - 457, 516, 460, 516, 516, 516, 516, 459, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 461, 516, 460, - 516, 516, 516, 516, 459, 516, 516, 516, 516, 516, - 516, 462, 516, 463, 516, 516, 516, 516, 464, 516, - 516, 516, 516, 516, 461, 516, 516, 516, 465, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 462, 466, - 463, 516, 516, 516, 516, 464, 516, 516, 516, 516, - - 516, 516, 516, 516, 516, 465, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 466, 516, 516, 467, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 469, 516, 516, 516, 467, 516, 516, 516, - 516, 468, 516, 470, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 469, - 516, 516, 516, 516, 516, 516, 516, 516, 468, 516, - 470, 516, 471, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 472, 473, 516, 516, 516, 516, 516, - - 516, 516, 516, 516, 516, 516, 516, 516, 516, 471, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 472, 473, 516, 516, 516, 516, 516, 516, 474, 516, - 516, 516, 516, 475, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 478, 516, 516, 516, - 516, 516, 516, 516, 516, 474, 476, 516, 516, 516, - 475, 516, 477, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 478, 516, 516, 516, 516, 516, 516, - 516, 481, 516, 476, 479, 516, 516, 516, 516, 477, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - - 516, 516, 516, 516, 516, 516, 516, 516, 481, 516, - 516, 479, 482, 483, 516, 516, 516, 484, 516, 516, - 485, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 482, - 483, 516, 516, 516, 484, 516, 516, 485, 516, 516, - 516, 516, 486, 516, 516, 487, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 489, 516, 516, 516, 516, - 516, 516, 488, 516, 516, 516, 516, 516, 516, 486, - 490, 516, 487, 516, 516, 516, 516, 516, 516, 491, - 516, 516, 489, 516, 516, 516, 516, 516, 516, 488, - - 516, 516, 516, 516, 516, 516, 492, 490, 516, 516, - 516, 516, 516, 516, 516, 516, 491, 516, 493, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 492, 516, 516, 495, 516, 516, 494, - 516, 496, 516, 516, 516, 493, 516, 516, 516, 516, - 516, 516, 497, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 495, 516, 516, 494, 516, 496, 516, - 516, 516, 516, 516, 516, 498, 516, 516, 516, 497, - 516, 516, 516, 516, 501, 500, 516, 502, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - - 516, 516, 498, 516, 516, 516, 516, 516, 516, 503, - 516, 501, 500, 516, 502, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 503, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 504, - 516, 505, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 506, 516, 509, 504, 516, 505, 516, - 516, 507, 516, 516, 516, 516, 516, 516, 516, 516, - - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 506, 516, 509, 516, 516, 516, 516, 516, 507, 516, - 511, 516, 510, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 512, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 511, 516, 510, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 512, 43, 43, 43, 43, 43, 43, 47, - 516, 47, 47, 47, 47, 49, 49, 50, 516, 50, - 50, 50, 50, 60, 60, 60, 60, 126, 516, 126, - 126, 126, 126, 128, 516, 128, 128, 128, 128, 129, - - 129, 223, 223, 325, 325, 393, 393, 448, 448, 394, - 394, 395, 395, 480, 480, 499, 499, 508, 508, 513, - 513, 514, 514, 515, 515, 5, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516 - + 333, 333, 333, 333, 333, 333, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 334, 518, + 518, 337, 335, 518, 336, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 334, 340, 518, 337, 335, + 518, 336, 518, 518, 518, 518, 341, 518, 518, 338, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 343, 518, 342, 340, 518, 518, 518, 518, 518, 518, + 344, 518, 518, 341, 518, 518, 338, 518, 518, 346, + + 518, 518, 347, 518, 518, 518, 518, 343, 518, 342, + 345, 518, 518, 518, 518, 518, 518, 344, 350, 518, + 518, 518, 518, 518, 518, 348, 346, 518, 518, 347, + 518, 518, 518, 518, 518, 518, 518, 345, 518, 349, + 518, 518, 518, 518, 518, 350, 518, 518, 518, 518, + 518, 351, 348, 518, 353, 518, 352, 518, 518, 518, + 518, 518, 518, 518, 354, 518, 349, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 351, 518, + 518, 353, 518, 352, 518, 356, 518, 518, 518, 518, + 518, 354, 518, 518, 355, 518, 518, 518, 518, 518, + + 518, 518, 518, 357, 518, 518, 518, 518, 518, 518, + 518, 518, 356, 518, 518, 518, 518, 518, 518, 518, + 518, 355, 358, 518, 518, 518, 518, 518, 518, 518, + 357, 360, 518, 518, 518, 518, 518, 518, 518, 518, + 359, 518, 518, 518, 518, 518, 518, 518, 518, 358, + 361, 518, 362, 518, 518, 518, 518, 518, 360, 518, + 518, 518, 518, 518, 518, 518, 518, 359, 518, 518, + 518, 518, 518, 518, 363, 518, 518, 361, 518, 362, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 364, 518, 518, 518, 518, 518, 366, 365, 518, 518, + + 518, 363, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 364, 518, 518, + 518, 518, 518, 366, 365, 367, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 369, 368, 518, 518, + 518, 518, 518, 371, 518, 518, 518, 518, 518, 518, + 518, 518, 367, 518, 518, 518, 518, 518, 372, 518, + 370, 518, 518, 369, 368, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 373, 518, 518, 518, 518, 372, 518, 370, 518, 518, + 518, 518, 518, 374, 518, 518, 518, 518, 518, 518, + + 518, 518, 518, 518, 518, 518, 518, 373, 518, 518, + 518, 375, 518, 518, 518, 518, 518, 518, 518, 518, + 374, 518, 377, 518, 518, 376, 378, 518, 518, 518, + 518, 518, 379, 518, 518, 518, 518, 518, 375, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 377, + 518, 518, 376, 378, 518, 518, 518, 518, 518, 379, + 518, 518, 380, 381, 518, 518, 518, 518, 518, 518, + 518, 518, 382, 518, 383, 518, 518, 518, 518, 518, + 384, 518, 518, 518, 518, 518, 518, 385, 518, 380, + 381, 518, 518, 386, 518, 518, 518, 518, 518, 382, + + 518, 383, 518, 518, 518, 518, 518, 384, 518, 518, + 387, 518, 518, 518, 385, 518, 518, 518, 518, 518, + 386, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 387, 518, 388, + 518, 518, 518, 518, 518, 518, 518, 389, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 390, 518, + 518, 518, 518, 392, 518, 518, 388, 518, 391, 518, + 518, 518, 518, 518, 389, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 390, 518, 518, 518, 518, + 392, 518, 518, 518, 518, 391, 518, 518, 518, 518, + + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 393, 330, + 395, 395, 395, 395, 395, 395, 395, 395, 332, 396, + 396, 396, 396, 396, 396, 396, 396, 397, 397, 397, + 397, 397, 397, 397, 397, 393, 398, 329, 329, 329, + 329, 329, 329, 329, 329, 399, 399, 399, 399, 399, + 399, 399, 399, 400, 331, 331, 331, 331, 331, 331, + 331, 331, 402, 402, 402, 402, 402, 402, 402, 402, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 401, 518, 518, 518, 518, 518, 518, 518, 518, + + 518, 405, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 408, 518, 518, 406, 518, 518, 401, 403, + 333, 333, 333, 333, 333, 333, 333, 333, 405, 518, + 407, 518, 518, 518, 518, 518, 518, 518, 518, 408, + 518, 518, 406, 518, 518, 518, 518, 404, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 407, 518, 518, + 518, 518, 409, 518, 518, 411, 518, 518, 412, 518, + 518, 518, 518, 518, 404, 518, 518, 410, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 413, 518, 409, + 518, 518, 411, 518, 518, 412, 518, 518, 518, 518, + + 518, 518, 518, 518, 410, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 413, 414, 518, 518, 518, 518, + 417, 518, 518, 518, 518, 518, 518, 518, 415, 518, + 518, 416, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 414, 518, 418, 518, 518, 417, 518, 518, + 518, 518, 518, 518, 518, 415, 518, 419, 416, 518, + 518, 518, 518, 518, 420, 518, 518, 518, 518, 518, + 518, 418, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 419, 518, 518, 518, 518, 518, + 518, 420, 518, 422, 421, 518, 518, 425, 518, 518, + + 518, 518, 518, 518, 518, 518, 423, 518, 424, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 422, 421, 518, 518, 425, 518, 518, 518, 518, 518, + 518, 518, 518, 423, 518, 424, 518, 518, 518, 518, + 518, 518, 518, 426, 518, 518, 427, 518, 518, 518, + 428, 518, 518, 518, 429, 518, 518, 518, 430, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 426, 518, 431, 427, 518, 518, 518, 428, 518, 518, + 518, 429, 518, 518, 518, 430, 518, 518, 518, 518, + 518, 518, 518, 432, 518, 518, 518, 518, 433, 431, + + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 434, + 432, 436, 518, 518, 518, 433, 518, 518, 518, 518, + 435, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 438, 437, 518, 518, 518, 518, 434, 518, 436, 518, + 518, 518, 518, 518, 518, 518, 518, 435, 518, 518, + 518, 518, 518, 518, 518, 518, 439, 438, 437, 518, + 518, 518, 518, 518, 440, 518, 518, 518, 518, 518, + 518, 518, 518, 441, 518, 518, 518, 442, 518, 518, + 518, 518, 518, 439, 518, 518, 518, 518, 518, 518, + + 518, 440, 443, 518, 444, 518, 518, 518, 518, 518, + 441, 445, 518, 446, 442, 518, 518, 518, 518, 518, + 518, 518, 518, 447, 518, 518, 518, 518, 518, 443, + 518, 444, 518, 518, 518, 518, 518, 518, 445, 518, + 446, 518, 518, 518, 518, 518, 448, 518, 449, 518, + 447, 397, 397, 397, 397, 397, 397, 397, 397, 397, + 397, 397, 397, 397, 397, 397, 397, 518, 518, 518, + 518, 518, 518, 448, 518, 449, 399, 399, 399, 399, + 399, 399, 399, 399, 399, 399, 399, 399, 399, 399, + 399, 399, 518, 518, 518, 518, 518, 518, 518, 518, + + 518, 518, 518, 453, 518, 518, 518, 518, 518, 518, + 518, 451, 402, 402, 402, 402, 402, 402, 402, 402, + 402, 402, 402, 402, 402, 402, 402, 402, 518, 518, + 453, 518, 518, 518, 518, 518, 518, 518, 451, 454, + 518, 518, 518, 518, 518, 518, 518, 452, 518, 518, + 518, 455, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 456, 518, 454, 518, 518, 518, + 518, 518, 518, 518, 452, 518, 518, 518, 455, 518, + 518, 518, 518, 518, 457, 518, 518, 518, 518, 458, + 518, 456, 518, 518, 518, 518, 518, 518, 460, 459, + + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 457, 518, 518, 518, 518, 458, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 459, 462, 518, 518, + 518, 518, 461, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 463, 518, 518, + 518, 518, 464, 518, 462, 518, 518, 518, 518, 461, + 518, 518, 518, 518, 465, 518, 518, 518, 518, 518, + 466, 518, 518, 518, 463, 518, 518, 518, 467, 464, + 518, 468, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 465, 518, 518, 518, 518, 518, 466, 518, 518, + + 518, 518, 518, 518, 518, 467, 518, 518, 468, 518, + 469, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 471, 469, 518, 518, + 518, 518, 518, 518, 518, 470, 518, 518, 518, 518, + 518, 518, 472, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 471, 518, 518, 518, 518, 518, 518, + 518, 518, 470, 518, 518, 518, 518, 518, 518, 472, + 518, 473, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 474, 518, 518, 518, 518, 518, 518, + + 518, 518, 518, 518, 518, 518, 518, 475, 473, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 474, 518, 518, 518, 518, 518, 518, 518, 518, 476, + 518, 518, 518, 518, 475, 518, 518, 477, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 478, 476, 480, 518, 518, + 518, 479, 518, 518, 477, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 478, 518, 480, 518, 483, 518, 479, 518, + 481, 518, 518, 518, 518, 518, 518, 518, 518, 518, + + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 483, 518, 518, 518, 481, 518, 518, + 485, 518, 518, 484, 518, 486, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 487, + 518, 518, 518, 518, 518, 518, 518, 485, 518, 518, + 484, 518, 486, 518, 518, 518, 518, 518, 518, 518, + 518, 488, 518, 518, 518, 518, 487, 518, 518, 518, + 518, 518, 518, 518, 518, 489, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 490, 518, 518, 488, 518, + 491, 518, 518, 518, 518, 518, 518, 518, 518, 518, + + 518, 518, 489, 518, 518, 518, 518, 492, 518, 518, + 493, 518, 490, 518, 518, 518, 518, 491, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 492, 518, 518, 493, 518, 494, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 495, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 494, 518, 518, 497, + 518, 518, 498, 518, 496, 518, 518, 518, 495, 518, + 518, 518, 518, 518, 518, 499, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 497, 518, 518, 498, + + 518, 496, 518, 518, 518, 518, 500, 518, 518, 518, + 518, 502, 499, 518, 503, 518, 518, 518, 518, 518, + 518, 504, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 500, 518, 518, 518, 518, 502, 518, + 518, 503, 518, 518, 518, 518, 518, 518, 504, 518, + 505, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 505, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 506, 518, + + 518, 518, 518, 518, 518, 507, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 508, 518, 518, 518, 506, 518, 518, 518, 518, + 518, 518, 507, 518, 518, 509, 518, 518, 518, 518, + 518, 511, 518, 518, 518, 518, 518, 518, 508, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 509, 518, 518, 518, 518, 518, 511, 512, + 518, 518, 518, 518, 518, 513, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 514, 518, 518, 518, 518, 518, 512, 518, 518, 518, + + 518, 518, 513, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 514, 43, 43, + 43, 43, 43, 43, 47, 518, 47, 47, 47, 47, + 49, 49, 50, 518, 50, 50, 50, 50, 60, 60, + 60, 60, 126, 518, 126, 126, 126, 126, 128, 518, + 128, 128, 128, 128, 129, 129, 223, 223, 325, 325, + 394, 394, 450, 450, 395, 395, 396, 396, 482, 482, + 501, 501, 510, 510, 515, 515, 516, 516, 517, 517, + 5, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518 } ; -static yyconst flex_int16_t yy_chk[4200] = +static yyconst flex_int16_t yy_chk[4255] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1046,16 +1052,16 @@ static yyconst flex_int16_t yy_chk[4200] = 15, 15, 15, 15, 47, 41, 45, 15, 15, 149, 42, 15, 15, 25, 16, 25, 16, 25, 16, 15, 25, 15, 12, 10, 9, 7, 25, 16, 5, 19, - 4, 19, 41, 19, 15, 15, 149, 394, 15, 15, + 4, 19, 41, 19, 15, 15, 149, 395, 15, 15, 16, 16, 19, 19, 3, 16, 15, 19, 15, 0, 32, 19, 32, 26, 32, 26, 36, 26, 36, 0, - 36, 395, 0, 32, 0, 394, 26, 16, 16, 36, + 36, 396, 0, 32, 0, 395, 26, 16, 16, 36, 19, 26, 16, 17, 19, 17, 0, 17, 19, 17, - 22, 0, 22, 36, 22, 36, 17, 17, 0, 395, - 0, 17, 394, 22, 22, 23, 0, 23, 26, 23, + 22, 0, 22, 36, 22, 36, 17, 17, 0, 396, + 0, 17, 395, 22, 22, 23, 0, 23, 26, 23, 0, 17, 17, 0, 0, 22, 0, 0, 23, 27, - 36, 27, 36, 27, 17, 0, 395, 23, 17, 0, + 36, 27, 36, 27, 17, 0, 396, 23, 17, 0, 0, 22, 27, 28, 0, 28, 0, 28, 17, 17, 18, 27, 22, 0, 0, 29, 28, 29, 18, 29, 0, 0, 18, 30, 23, 30, 18, 30, 29, 0, @@ -1263,237 +1269,243 @@ static yyconst flex_int16_t yy_chk[4200] = 243, 246, 242, 240, 0, 245, 0, 245, 244, 245, 244, 0, 0, 241, 0, 0, 238, 0, 245, 246, - 247, 0, 247, 0, 247, 0, 0, 243, 0, 242, - 245, 0, 0, 247, 247, 0, 248, 244, 248, 249, - 248, 249, 0, 249, 0, 0, 246, 0, 247, 248, - 0, 0, 249, 248, 250, 0, 250, 245, 250, 0, - 0, 247, 0, 0, 251, 0, 251, 250, 251, 0, - 252, 249, 252, 0, 252, 247, 0, 251, 0, 250, - 248, 0, 0, 252, 251, 0, 0, 253, 252, 253, - 0, 253, 254, 0, 254, 0, 254, 255, 249, 255, - 253, 255, 0, 0, 0, 254, 250, 0, 254, 0, - 255, 251, 0, 0, 256, 252, 256, 257, 256, 257, - - 253, 257, 0, 0, 258, 255, 258, 256, 258, 259, - 257, 259, 260, 259, 260, 254, 260, 258, 0, 0, - 0, 0, 259, 256, 0, 260, 259, 253, 0, 0, - 260, 0, 255, 258, 261, 262, 261, 262, 261, 262, - 0, 263, 264, 263, 264, 263, 264, 261, 262, 0, - 256, 261, 0, 259, 263, 264, 0, 260, 263, 265, - 258, 265, 0, 265, 266, 0, 266, 0, 266, 0, - 0, 0, 265, 265, 0, 0, 0, 266, 261, 267, - 266, 267, 0, 267, 268, 263, 268, 0, 268, 0, - 0, 0, 267, 267, 0, 0, 0, 268, 0, 269, - - 265, 269, 270, 269, 270, 0, 270, 266, 0, 268, - 0, 0, 269, 0, 271, 270, 271, 272, 271, 272, - 267, 272, 0, 0, 273, 0, 273, 271, 273, 273, - 272, 0, 271, 270, 0, 0, 268, 273, 0, 274, - 0, 274, 275, 274, 275, 0, 275, 0, 0, 0, - 0, 272, 274, 274, 276, 275, 276, 0, 276, 271, - 270, 277, 278, 277, 278, 277, 278, 276, 276, 279, - 0, 279, 0, 279, 277, 278, 0, 280, 272, 280, - 274, 280, 279, 277, 0, 0, 0, 278, 0, 0, - 280, 0, 0, 0, 281, 276, 281, 280, 281, 0, - - 0, 0, 279, 0, 282, 0, 282, 281, 282, 0, - 277, 0, 281, 0, 278, 0, 0, 282, 0, 283, - 0, 283, 282, 283, 280, 0, 0, 0, 0, 279, - 0, 284, 283, 284, 285, 284, 285, 0, 285, 281, - 0, 287, 0, 287, 284, 287, 0, 285, 0, 282, - 0, 286, 283, 286, 287, 286, 0, 287, 288, 284, - 288, 0, 288, 0, 286, 285, 0, 0, 289, 286, - 289, 288, 289, 0, 288, 0, 290, 0, 290, 283, - 290, 289, 289, 0, 287, 0, 284, 0, 0, 290, - 0, 291, 285, 291, 0, 291, 286, 0, 292, 289, - - 292, 288, 292, 293, 291, 293, 294, 293, 294, 289, - 294, 292, 0, 0, 0, 0, 293, 0, 292, 294, - 295, 296, 295, 296, 295, 296, 289, 297, 293, 297, - 0, 297, 0, 295, 296, 0, 0, 0, 0, 294, - 297, 0, 0, 296, 0, 292, 0, 298, 295, 298, - 299, 298, 299, 0, 299, 293, 0, 0, 0, 0, - 298, 0, 0, 299, 0, 300, 294, 300, 0, 300, - 296, 0, 301, 0, 301, 295, 301, 302, 300, 302, - 303, 302, 303, 0, 303, 301, 0, 304, 0, 304, - 302, 304, 305, 303, 305, 306, 305, 306, 0, 306, - - 304, 0, 307, 0, 307, 305, 307, 308, 306, 308, - 309, 308, 309, 0, 309, 307, 0, 310, 0, 310, - 308, 310, 311, 309, 311, 312, 311, 312, 0, 312, - 310, 0, 313, 0, 313, 311, 313, 314, 312, 314, - 315, 314, 315, 0, 315, 313, 0, 316, 0, 316, - 314, 316, 317, 315, 317, 318, 317, 318, 0, 318, - 316, 0, 319, 0, 319, 317, 319, 320, 318, 320, - 321, 320, 321, 0, 321, 319, 0, 322, 0, 322, - 320, 322, 323, 321, 323, 324, 323, 324, 0, 324, - 322, 0, 338, 0, 338, 323, 338, 0, 324, 0, - - 0, 0, 0, 0, 0, 338, 324, 326, 326, 326, - 326, 326, 326, 326, 326, 326, 327, 327, 327, 327, - 327, 327, 327, 327, 327, 328, 328, 328, 328, 328, - 328, 328, 328, 324, 329, 329, 329, 329, 329, 329, - 329, 329, 329, 330, 330, 330, 330, 330, 330, 330, - 330, 331, 331, 331, 331, 331, 331, 331, 331, 331, - 332, 332, 332, 332, 332, 332, 332, 332, 0, 335, - 334, 335, 334, 335, 334, 0, 0, 0, 0, 331, - 0, 0, 335, 334, 337, 0, 337, 0, 337, 334, - 0, 336, 339, 336, 339, 336, 339, 337, 0, 0, - - 337, 0, 0, 335, 336, 339, 331, 333, 333, 333, - 333, 333, 333, 333, 333, 333, 334, 0, 336, 340, - 341, 340, 341, 340, 341, 0, 0, 337, 0, 0, - 335, 0, 340, 341, 342, 333, 342, 0, 342, 343, - 0, 343, 344, 343, 344, 336, 344, 342, 0, 0, - 340, 0, 343, 343, 0, 344, 344, 345, 0, 345, - 0, 345, 333, 0, 0, 342, 0, 0, 0, 346, - 345, 346, 347, 346, 347, 345, 347, 340, 0, 0, - 343, 0, 346, 344, 348, 347, 348, 349, 348, 349, - 0, 349, 342, 0, 350, 0, 350, 348, 350, 0, - - 349, 349, 345, 0, 347, 0, 0, 350, 351, 352, - 351, 352, 351, 352, 0, 0, 348, 0, 0, 0, - 0, 351, 352, 353, 0, 353, 0, 353, 349, 0, - 351, 347, 0, 354, 0, 354, 353, 354, 0, 0, - 355, 353, 355, 348, 355, 356, 354, 356, 357, 356, - 357, 354, 357, 355, 0, 0, 0, 351, 356, 0, - 0, 357, 358, 359, 358, 359, 358, 359, 353, 0, - 0, 0, 356, 355, 0, 358, 359, 359, 354, 0, - 360, 357, 360, 361, 360, 361, 0, 361, 362, 0, - 362, 0, 362, 360, 358, 0, 361, 0, 0, 356, - - 355, 362, 0, 363, 359, 363, 0, 363, 357, 364, - 365, 364, 365, 364, 365, 366, 363, 366, 0, 366, - 0, 358, 364, 365, 0, 367, 0, 367, 366, 367, - 0, 0, 0, 0, 0, 365, 363, 366, 367, 0, - 0, 0, 364, 367, 368, 0, 368, 370, 368, 370, - 0, 370, 0, 0, 369, 0, 369, 368, 369, 0, - 370, 0, 365, 363, 366, 0, 0, 369, 0, 364, - 367, 369, 371, 372, 371, 372, 371, 372, 373, 374, - 373, 374, 373, 374, 0, 371, 372, 0, 0, 0, - 0, 373, 374, 375, 373, 375, 0, 375, 369, 0, - - 376, 0, 376, 371, 376, 378, 375, 378, 0, 378, - 377, 374, 377, 376, 377, 0, 0, 0, 378, 0, - 380, 373, 380, 377, 380, 0, 377, 379, 376, 379, - 371, 379, 0, 380, 0, 381, 378, 381, 374, 381, - 379, 0, 0, 0, 0, 379, 0, 382, 381, 382, - 0, 382, 383, 377, 383, 376, 383, 380, 0, 0, - 382, 0, 384, 378, 384, 383, 384, 0, 0, 385, - 0, 385, 379, 385, 382, 384, 0, 386, 0, 386, - 384, 386, 385, 0, 380, 383, 0, 387, 0, 387, - 386, 387, 0, 388, 0, 388, 385, 388, 0, 0, - - 387, 382, 0, 0, 0, 386, 388, 384, 387, 0, - 0, 388, 383, 389, 390, 389, 390, 389, 390, 0, - 391, 0, 391, 385, 391, 0, 389, 390, 0, 0, - 0, 389, 386, 391, 0, 387, 0, 392, 388, 392, - 400, 392, 400, 0, 400, 390, 0, 0, 391, 0, - 392, 0, 0, 400, 0, 0, 0, 0, 389, 396, - 396, 396, 396, 396, 396, 396, 396, 0, 0, 0, - 0, 0, 390, 0, 0, 391, 397, 397, 397, 397, - 397, 397, 397, 397, 398, 398, 398, 398, 398, 398, - 398, 398, 399, 399, 399, 399, 399, 399, 399, 399, - - 401, 401, 401, 401, 401, 401, 401, 401, 403, 0, - 403, 398, 403, 405, 0, 405, 0, 405, 0, 399, - 0, 403, 0, 0, 0, 0, 405, 401, 402, 402, - 402, 402, 402, 402, 402, 402, 0, 404, 398, 404, - 406, 404, 406, 0, 406, 405, 399, 407, 0, 407, - 404, 407, 0, 406, 401, 402, 0, 0, 0, 404, - 407, 408, 409, 408, 409, 408, 409, 410, 0, 410, - 0, 410, 405, 0, 408, 409, 0, 411, 409, 411, - 410, 411, 402, 412, 0, 412, 404, 412, 0, 408, - 411, 412, 0, 411, 0, 413, 412, 413, 0, 413, - - 414, 0, 414, 0, 414, 409, 0, 0, 413, 0, - 415, 0, 415, 414, 415, 416, 408, 416, 0, 416, - 411, 0, 414, 415, 0, 0, 0, 413, 416, 417, - 418, 417, 418, 417, 418, 419, 0, 419, 0, 419, - 0, 0, 417, 418, 0, 0, 0, 416, 419, 414, - 0, 420, 0, 420, 413, 420, 421, 0, 421, 0, - 421, 417, 0, 419, 420, 0, 0, 0, 420, 421, - 0, 422, 0, 422, 416, 422, 0, 0, 421, 423, - 0, 423, 0, 423, 422, 0, 0, 0, 417, 422, - 419, 0, 423, 0, 424, 420, 424, 425, 424, 425, - - 426, 425, 426, 0, 426, 421, 0, 424, 0, 0, - 425, 0, 0, 426, 0, 0, 422, 0, 427, 425, - 427, 428, 427, 428, 429, 428, 429, 0, 429, 0, - 0, 427, 0, 0, 428, 0, 430, 429, 430, 431, - 430, 431, 429, 431, 0, 0, 425, 0, 0, 430, - 0, 427, 431, 431, 432, 433, 432, 433, 432, 433, - 434, 435, 434, 435, 434, 435, 0, 432, 433, 429, - 0, 0, 0, 434, 435, 436, 0, 436, 427, 436, - 431, 0, 433, 437, 0, 437, 0, 437, 436, 0, - 0, 0, 0, 434, 435, 438, 437, 438, 439, 438, - - 439, 440, 439, 440, 0, 440, 0, 0, 438, 433, - 0, 439, 0, 441, 440, 441, 0, 441, 0, 0, - 434, 435, 0, 442, 0, 442, 441, 442, 438, 0, - 444, 0, 444, 441, 444, 0, 442, 443, 445, 443, - 445, 443, 445, 444, 0, 446, 444, 446, 0, 446, - 443, 445, 0, 0, 0, 438, 442, 447, 446, 447, - 441, 447, 443, 453, 454, 453, 454, 453, 454, 0, - 447, 0, 0, 444, 0, 0, 453, 454, 455, 0, - 455, 453, 455, 442, 447, 0, 0, 0, 456, 443, - 456, 455, 456, 457, 0, 457, 459, 457, 459, 0, - - 459, 456, 0, 458, 0, 458, 457, 458, 453, 459, - 0, 447, 455, 456, 0, 0, 458, 457, 0, 460, - 458, 460, 461, 460, 461, 462, 461, 462, 0, 462, - 0, 0, 460, 0, 0, 461, 0, 0, 462, 455, - 456, 463, 0, 463, 457, 463, 464, 458, 464, 465, - 464, 465, 460, 465, 463, 461, 466, 0, 466, 464, - 466, 0, 465, 0, 467, 465, 467, 0, 467, 466, - 0, 468, 463, 468, 469, 468, 469, 467, 469, 460, - 467, 470, 461, 470, 468, 470, 0, 469, 0, 468, - 0, 471, 465, 471, 470, 471, 472, 0, 472, 463, - - 472, 473, 0, 473, 471, 473, 470, 467, 474, 472, - 474, 475, 474, 475, 473, 475, 468, 0, 472, 0, - 0, 474, 0, 0, 475, 0, 0, 476, 0, 476, - 477, 476, 477, 470, 477, 0, 475, 0, 0, 473, - 476, 476, 478, 477, 478, 472, 478, 479, 0, 479, - 0, 479, 477, 0, 481, 478, 481, 482, 481, 482, - 479, 482, 0, 475, 0, 0, 473, 481, 476, 483, - 482, 483, 0, 483, 0, 478, 484, 0, 484, 477, - 484, 0, 483, 0, 482, 481, 485, 483, 485, 484, - 485, 486, 487, 486, 487, 486, 487, 0, 0, 485, - - 0, 0, 478, 0, 486, 487, 488, 0, 488, 486, - 488, 482, 481, 489, 483, 489, 490, 489, 490, 488, - 490, 491, 0, 491, 0, 491, 489, 0, 492, 490, - 492, 493, 492, 493, 491, 493, 486, 0, 494, 0, - 494, 492, 494, 495, 493, 495, 0, 495, 0, 0, - 496, 494, 496, 498, 496, 498, 495, 498, 497, 493, - 497, 495, 497, 496, 0, 500, 498, 500, 501, 500, - 501, 497, 501, 0, 0, 0, 0, 0, 500, 0, - 502, 501, 502, 496, 502, 501, 493, 0, 495, 0, - 503, 497, 503, 502, 503, 504, 505, 504, 505, 504, - - 505, 0, 506, 503, 506, 0, 506, 0, 504, 505, - 496, 0, 501, 0, 0, 506, 0, 507, 497, 507, - 506, 507, 504, 509, 510, 509, 510, 509, 510, 511, - 507, 511, 0, 511, 0, 507, 509, 510, 0, 512, - 0, 512, 511, 512, 0, 0, 0, 506, 0, 504, - 0, 0, 512, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 507, 517, 517, 517, 517, 517, 517, 518, - 0, 518, 518, 518, 518, 519, 519, 520, 0, 520, - 520, 520, 520, 521, 521, 521, 521, 522, 0, 522, - 522, 522, 522, 523, 0, 523, 523, 523, 523, 524, - - 524, 525, 525, 526, 526, 527, 527, 528, 528, 529, - 529, 530, 530, 531, 531, 532, 532, 533, 533, 534, - 534, 535, 535, 536, 536, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516 - + 0, 248, 246, 248, 0, 248, 0, 243, 0, 242, + 245, 247, 0, 247, 248, 247, 0, 244, 248, 249, + 0, 249, 0, 249, 247, 247, 246, 0, 0, 246, + 0, 250, 249, 250, 251, 250, 251, 245, 251, 247, + 0, 0, 0, 0, 250, 248, 252, 251, 252, 0, + 252, 249, 247, 0, 251, 0, 250, 0, 0, 252, + 0, 253, 0, 253, 252, 253, 247, 0, 0, 254, + 0, 254, 0, 254, 253, 255, 0, 255, 249, 255, + 0, 251, 254, 250, 0, 254, 0, 0, 255, 0, + 0, 252, 0, 256, 253, 256, 257, 256, 257, 0, + + 257, 0, 0, 255, 0, 0, 256, 0, 0, 257, + 0, 258, 254, 258, 259, 258, 259, 0, 259, 0, + 0, 253, 256, 0, 258, 0, 0, 259, 0, 0, + 255, 259, 260, 0, 260, 261, 260, 261, 0, 261, + 258, 0, 262, 0, 262, 260, 262, 0, 261, 256, + 260, 0, 261, 0, 0, 262, 0, 263, 259, 263, + 264, 263, 264, 0, 264, 0, 0, 258, 0, 0, + 263, 0, 0, 264, 263, 0, 265, 260, 265, 261, + 265, 266, 267, 266, 267, 266, 267, 0, 0, 265, + 265, 0, 0, 0, 266, 267, 267, 266, 0, 0, + + 268, 263, 268, 269, 268, 269, 270, 269, 270, 0, + 270, 0, 0, 268, 0, 0, 269, 265, 271, 270, + 271, 0, 271, 267, 266, 268, 272, 0, 272, 0, + 272, 271, 0, 0, 0, 0, 271, 270, 273, 272, + 273, 0, 273, 273, 274, 0, 274, 0, 274, 0, + 0, 273, 268, 0, 0, 0, 0, 274, 274, 0, + 272, 0, 0, 271, 270, 275, 276, 275, 276, 275, + 276, 277, 0, 277, 0, 277, 0, 0, 275, 276, + 276, 0, 0, 0, 277, 274, 278, 272, 278, 0, + 278, 0, 279, 277, 279, 0, 279, 0, 0, 278, + + 0, 0, 280, 0, 280, 279, 280, 276, 281, 0, + 281, 278, 281, 0, 282, 280, 282, 0, 282, 0, + 277, 281, 280, 0, 0, 279, 281, 282, 0, 283, + 0, 283, 282, 283, 0, 284, 0, 284, 278, 284, + 0, 285, 283, 285, 0, 285, 0, 0, 284, 280, + 0, 0, 279, 281, 285, 0, 286, 0, 286, 282, + 286, 0, 283, 284, 287, 0, 287, 0, 287, 286, + 0, 288, 285, 288, 286, 288, 0, 287, 0, 289, + 287, 289, 0, 289, 288, 0, 0, 288, 0, 283, + 284, 0, 289, 289, 0, 0, 290, 0, 290, 285, + + 290, 286, 291, 0, 291, 0, 291, 287, 0, 290, + 289, 0, 0, 0, 288, 291, 0, 0, 0, 292, + 289, 292, 293, 292, 293, 294, 293, 294, 0, 294, + 0, 0, 292, 0, 0, 293, 0, 289, 294, 292, + 295, 296, 295, 296, 295, 296, 297, 293, 297, 0, + 297, 0, 0, 295, 296, 0, 0, 0, 294, 297, + 298, 0, 298, 296, 298, 299, 292, 299, 295, 299, + 0, 0, 0, 298, 293, 300, 0, 300, 299, 300, + 301, 0, 301, 0, 301, 294, 0, 302, 300, 302, + 296, 302, 303, 301, 303, 295, 303, 304, 0, 304, + + 302, 304, 305, 0, 305, 303, 305, 306, 0, 306, + 304, 306, 307, 0, 307, 305, 307, 308, 0, 308, + 306, 308, 309, 0, 309, 307, 309, 310, 0, 310, + 308, 310, 311, 0, 311, 309, 311, 312, 0, 312, + 310, 312, 313, 0, 313, 311, 313, 314, 0, 314, + 312, 314, 315, 0, 315, 313, 315, 316, 0, 316, + 314, 316, 317, 0, 317, 315, 317, 318, 0, 318, + 316, 318, 319, 0, 319, 317, 319, 320, 0, 320, + 318, 320, 321, 0, 321, 319, 321, 322, 0, 322, + 320, 322, 323, 0, 323, 321, 323, 324, 0, 324, + + 322, 324, 338, 0, 338, 323, 338, 0, 0, 0, + 324, 0, 0, 0, 0, 338, 0, 0, 324, 326, + 326, 326, 326, 326, 326, 326, 326, 326, 327, 327, + 327, 327, 327, 327, 327, 327, 327, 328, 328, 328, + 328, 328, 328, 328, 328, 324, 329, 329, 329, 329, + 329, 329, 329, 329, 329, 330, 330, 330, 330, 330, + 330, 330, 330, 331, 331, 331, 331, 331, 331, 331, + 331, 331, 332, 332, 332, 332, 332, 332, 332, 332, + 0, 335, 334, 335, 334, 335, 334, 0, 0, 0, + 0, 331, 0, 0, 335, 334, 337, 0, 337, 0, + + 337, 334, 0, 336, 339, 336, 339, 336, 339, 337, + 0, 0, 337, 0, 0, 335, 336, 339, 331, 333, + 333, 333, 333, 333, 333, 333, 333, 333, 334, 0, + 336, 340, 341, 340, 341, 340, 341, 0, 0, 337, + 0, 0, 335, 0, 340, 341, 342, 333, 342, 0, + 342, 343, 0, 343, 344, 343, 344, 336, 344, 342, + 0, 0, 340, 0, 343, 343, 0, 344, 344, 345, + 0, 345, 0, 345, 333, 0, 0, 342, 0, 0, + 0, 346, 345, 346, 347, 346, 347, 345, 347, 340, + 0, 0, 343, 0, 346, 344, 348, 347, 348, 349, + + 348, 349, 0, 349, 342, 0, 350, 0, 350, 348, + 350, 0, 349, 0, 345, 347, 0, 0, 0, 350, + 350, 351, 352, 351, 352, 351, 352, 0, 348, 0, + 0, 349, 0, 0, 351, 352, 353, 0, 353, 354, + 353, 354, 347, 354, 352, 0, 355, 350, 355, 353, + 355, 0, 354, 0, 0, 348, 0, 354, 349, 355, + 0, 356, 0, 356, 355, 356, 357, 0, 357, 0, + 357, 352, 0, 358, 356, 358, 359, 358, 359, 357, + 359, 0, 0, 360, 354, 360, 358, 360, 361, 359, + 361, 355, 361, 357, 356, 0, 360, 360, 362, 0, + + 362, 361, 362, 363, 0, 363, 358, 363, 359, 0, + 364, 362, 364, 365, 364, 365, 363, 365, 0, 0, + 357, 356, 0, 364, 360, 366, 365, 366, 0, 366, + 0, 0, 367, 358, 367, 359, 367, 0, 366, 0, + 368, 0, 368, 364, 368, 367, 365, 369, 0, 369, + 366, 369, 0, 368, 367, 370, 0, 370, 368, 370, + 369, 371, 372, 371, 372, 371, 372, 373, 370, 373, + 364, 373, 370, 365, 371, 372, 0, 366, 0, 0, + 373, 367, 374, 0, 374, 368, 374, 375, 376, 375, + 376, 375, 376, 372, 0, 374, 0, 0, 374, 370, + + 375, 376, 377, 0, 377, 378, 377, 378, 0, 378, + 379, 0, 379, 0, 379, 377, 0, 0, 378, 375, + 372, 378, 380, 379, 380, 374, 380, 0, 0, 381, + 377, 381, 382, 381, 382, 380, 382, 0, 0, 0, + 380, 379, 381, 0, 0, 382, 375, 383, 378, 383, + 384, 383, 384, 0, 384, 0, 0, 377, 0, 0, + 383, 0, 0, 384, 0, 0, 381, 380, 379, 385, + 0, 385, 0, 385, 383, 386, 387, 386, 387, 386, + 387, 0, 385, 384, 0, 0, 0, 385, 386, 387, + 388, 0, 388, 381, 388, 389, 0, 389, 0, 389, + + 0, 383, 386, 388, 387, 390, 0, 390, 389, 390, + 384, 388, 0, 389, 385, 391, 0, 391, 390, 391, + 392, 0, 392, 390, 392, 0, 0, 0, 391, 386, + 393, 387, 393, 392, 393, 0, 0, 0, 388, 0, + 389, 0, 0, 393, 0, 0, 391, 0, 392, 0, + 390, 397, 397, 397, 397, 397, 397, 397, 397, 398, + 398, 398, 398, 398, 398, 398, 398, 0, 0, 0, + 0, 0, 0, 391, 0, 392, 399, 399, 399, 399, + 399, 399, 399, 399, 400, 400, 400, 400, 400, 400, + 400, 400, 401, 404, 401, 404, 401, 404, 0, 0, + + 0, 0, 0, 399, 0, 401, 404, 0, 0, 0, + 0, 400, 402, 402, 402, 402, 402, 402, 402, 402, + 403, 403, 403, 403, 403, 403, 403, 403, 0, 405, + 399, 405, 406, 405, 406, 0, 406, 0, 400, 402, + 0, 0, 405, 0, 407, 406, 407, 403, 407, 0, + 408, 405, 408, 0, 408, 0, 409, 407, 409, 0, + 409, 0, 0, 408, 406, 0, 402, 0, 411, 409, + 411, 0, 411, 410, 403, 410, 0, 410, 405, 0, + 0, 411, 0, 412, 409, 412, 410, 412, 0, 410, + 413, 406, 413, 414, 413, 414, 412, 414, 413, 412, + + 415, 0, 415, 413, 415, 416, 414, 416, 417, 416, + 417, 409, 417, 415, 0, 418, 410, 418, 416, 418, + 419, 417, 419, 0, 419, 0, 412, 416, 418, 0, + 0, 0, 415, 419, 0, 420, 421, 420, 421, 420, + 421, 0, 0, 0, 0, 0, 0, 418, 420, 421, + 0, 0, 419, 422, 416, 422, 423, 422, 423, 415, + 423, 0, 0, 424, 421, 424, 422, 424, 0, 423, + 422, 425, 0, 425, 418, 425, 424, 0, 423, 419, + 0, 424, 0, 426, 425, 426, 0, 426, 427, 0, + 427, 421, 427, 0, 0, 0, 426, 422, 428, 0, + + 428, 427, 428, 0, 0, 423, 0, 0, 424, 0, + 427, 428, 429, 430, 429, 430, 429, 430, 431, 432, + 431, 432, 431, 432, 0, 429, 430, 0, 0, 0, + 0, 431, 432, 0, 0, 0, 431, 427, 433, 0, + 433, 0, 433, 0, 434, 429, 434, 0, 434, 0, + 0, 433, 433, 0, 435, 0, 435, 434, 435, 0, + 436, 0, 436, 431, 436, 0, 0, 435, 0, 0, + 0, 0, 429, 436, 437, 0, 437, 0, 437, 433, + 0, 435, 438, 0, 438, 0, 438, 437, 439, 0, + 439, 0, 439, 436, 0, 438, 440, 0, 440, 0, + + 440, 439, 441, 0, 441, 0, 441, 437, 435, 440, + 442, 0, 442, 0, 442, 441, 0, 443, 0, 443, + 436, 443, 444, 442, 444, 0, 444, 0, 0, 440, + 443, 0, 0, 0, 437, 444, 445, 443, 445, 0, + 445, 446, 0, 446, 0, 446, 447, 0, 447, 445, + 447, 0, 0, 0, 446, 444, 440, 446, 448, 447, + 448, 445, 448, 449, 443, 449, 0, 449, 455, 0, + 455, 448, 455, 0, 0, 0, 449, 0, 0, 0, + 0, 455, 444, 456, 446, 456, 455, 456, 445, 457, + 449, 457, 0, 457, 0, 458, 456, 458, 0, 458, + + 0, 459, 457, 459, 0, 459, 0, 0, 458, 0, + 0, 0, 0, 455, 459, 0, 0, 449, 0, 0, + 458, 0, 460, 457, 460, 459, 460, 461, 462, 461, + 462, 461, 462, 0, 0, 460, 0, 0, 0, 460, + 461, 462, 463, 0, 463, 0, 463, 458, 0, 464, + 457, 464, 459, 464, 465, 463, 465, 0, 465, 0, + 0, 462, 464, 0, 0, 0, 460, 465, 466, 468, + 466, 468, 466, 468, 467, 463, 467, 0, 467, 0, + 0, 466, 468, 0, 0, 465, 0, 467, 462, 0, + 467, 469, 470, 469, 470, 469, 470, 0, 0, 0, + + 0, 0, 463, 0, 469, 470, 0, 469, 0, 471, + 470, 471, 465, 471, 472, 0, 472, 467, 472, 473, + 0, 473, 471, 473, 0, 0, 0, 472, 0, 474, + 0, 474, 473, 474, 469, 0, 475, 470, 475, 472, + 475, 476, 474, 476, 477, 476, 477, 0, 477, 475, + 0, 474, 0, 0, 476, 0, 0, 477, 478, 0, + 478, 0, 478, 479, 0, 479, 472, 479, 0, 477, + 0, 478, 478, 480, 475, 480, 479, 480, 474, 481, + 483, 481, 483, 481, 483, 479, 480, 484, 0, 484, + 0, 484, 481, 483, 0, 0, 477, 0, 0, 478, + + 484, 475, 0, 485, 0, 485, 480, 485, 0, 0, + 0, 483, 479, 486, 484, 486, 485, 486, 487, 0, + 487, 485, 487, 0, 0, 0, 486, 0, 0, 0, + 0, 487, 488, 480, 488, 0, 488, 0, 483, 0, + 489, 484, 489, 0, 489, 488, 0, 490, 485, 490, + 488, 490, 491, 489, 491, 492, 491, 492, 0, 492, + 490, 0, 493, 0, 493, 491, 493, 494, 492, 494, + 495, 494, 495, 0, 495, 493, 0, 488, 0, 0, + 494, 0, 496, 495, 496, 0, 496, 497, 498, 497, + 498, 497, 498, 0, 0, 496, 0, 0, 495, 0, + + 497, 498, 499, 0, 499, 497, 499, 500, 0, 500, + 502, 500, 502, 0, 502, 499, 0, 0, 0, 0, + 500, 498, 0, 502, 503, 495, 503, 504, 503, 504, + 0, 504, 497, 0, 505, 499, 505, 503, 505, 0, + 504, 503, 506, 0, 506, 0, 506, 505, 498, 0, + 507, 0, 507, 0, 507, 506, 0, 508, 0, 508, + 0, 508, 499, 507, 0, 0, 0, 0, 503, 506, + 508, 0, 509, 0, 509, 508, 509, 0, 511, 512, + 511, 512, 511, 512, 513, 509, 513, 0, 513, 0, + 509, 511, 512, 0, 0, 0, 506, 513, 0, 514, + + 0, 514, 508, 514, 0, 0, 0, 0, 0, 0, + 0, 0, 514, 0, 0, 0, 0, 509, 519, 519, + 519, 519, 519, 519, 520, 0, 520, 520, 520, 520, + 521, 521, 522, 0, 522, 522, 522, 522, 523, 523, + 523, 523, 524, 0, 524, 524, 524, 524, 525, 0, + 525, 525, 525, 525, 526, 526, 527, 527, 528, 528, + 529, 529, 530, 530, 531, 531, 532, 532, 533, 533, + 534, 534, 535, 535, 536, 536, 537, 537, 538, 538, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518 } ; /* The intent behind this definition is that it'll catch @@ -1520,7 +1532,7 @@ static yyconst flex_int16_t yy_chk[4200] = extern mkFlexLexer* mklexx; /* rules */ -#line 1524 "frame/ds9lex.C" +#line 1536 "frame/ds9lex.C" #define INITIAL 0 #define DISCARD 1 @@ -1624,7 +1636,7 @@ YY_DECL #line 31 "frame/ds9lex.L" -#line 1628 "frame/ds9lex.C" +#line 1640 "frame/ds9lex.C" if ( !(yy_init) ) { @@ -1677,13 +1689,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 517 ) + if ( yy_current_state >= 519 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_current_state != 516 ); + while ( yy_current_state != 518 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -1803,585 +1815,590 @@ YY_RULE_SETUP case 18: YY_RULE_SETUP #line 63 "frame/ds9lex.L" -{return COMPASS_;} +{return COLOR_;} YY_BREAK case 19: YY_RULE_SETUP #line 64 "frame/ds9lex.L" -{return COMPOSITE_;} +{return COMPASS_;} YY_BREAK case 20: YY_RULE_SETUP #line 65 "frame/ds9lex.L" -{return CPANDA_;} +{return COMPOSITE_;} YY_BREAK case 21: YY_RULE_SETUP #line 66 "frame/ds9lex.L" -{return CROSS_;} +{return CPANDA_;} YY_BREAK case 22: YY_RULE_SETUP #line 67 "frame/ds9lex.L" -{return DASH_;} +{return CROSS_;} YY_BREAK case 23: YY_RULE_SETUP #line 68 "frame/ds9lex.L" -{return DASHLIST_;} +{return DASH_;} YY_BREAK case 24: YY_RULE_SETUP #line 69 "frame/ds9lex.L" -{return DEBUG_;} +{return DASHLIST_;} YY_BREAK case 25: YY_RULE_SETUP #line 70 "frame/ds9lex.L" -{return DEGREES_;} +{return DEBUG_;} YY_BREAK case 26: YY_RULE_SETUP #line 71 "frame/ds9lex.L" -{return DELETE_;} +{return DEGREES_;} YY_BREAK case 27: YY_RULE_SETUP #line 72 "frame/ds9lex.L" -{return DETECTOR_;} +{return DELETE_;} YY_BREAK case 28: YY_RULE_SETUP #line 73 "frame/ds9lex.L" -{return DIAMOND_;} +{return DETECTOR_;} YY_BREAK case 29: YY_RULE_SETUP #line 74 "frame/ds9lex.L" -{return EDIT_;} +{return DIAMOND_;} YY_BREAK case 30: YY_RULE_SETUP #line 75 "frame/ds9lex.L" -{return ELLIPSE_;} +{return EDIT_;} YY_BREAK case 31: YY_RULE_SETUP #line 76 "frame/ds9lex.L" -{return ECLIPTIC_;} +{return ELLIPSE_;} YY_BREAK case 32: YY_RULE_SETUP #line 77 "frame/ds9lex.L" -{return EPANDA_;} +{return ECLIPTIC_;} YY_BREAK case 33: YY_RULE_SETUP #line 78 "frame/ds9lex.L" -{return END_;} +{return EPANDA_;} YY_BREAK case 34: YY_RULE_SETUP #line 79 "frame/ds9lex.L" -{return FALSE_;} +{return END_;} YY_BREAK case 35: YY_RULE_SETUP #line 80 "frame/ds9lex.L" -{return FIELD_;} +{return FALSE_;} YY_BREAK case 36: YY_RULE_SETUP #line 81 "frame/ds9lex.L" -{return FILL_;} +{return FIELD_;} YY_BREAK case 37: YY_RULE_SETUP #line 82 "frame/ds9lex.L" -{return FIXED_;} +{return FILL_;} YY_BREAK case 38: YY_RULE_SETUP #line 83 "frame/ds9lex.L" -{return FK4_;} +{return FIXED_;} YY_BREAK case 39: YY_RULE_SETUP #line 84 "frame/ds9lex.L" -{return FK5_;} +{return FK4_;} YY_BREAK case 40: YY_RULE_SETUP #line 85 "frame/ds9lex.L" -{return FORMAT_;} +{return FK5_;} YY_BREAK case 41: YY_RULE_SETUP #line 86 "frame/ds9lex.L" -{return FONT_;} +{return FORMAT_;} YY_BREAK case 42: YY_RULE_SETUP #line 87 "frame/ds9lex.L" -{return GALACTIC_;} +{return FONT_;} YY_BREAK case 43: YY_RULE_SETUP #line 88 "frame/ds9lex.L" -{return GLOBAL_;} +{return GALACTIC_;} YY_BREAK case 44: YY_RULE_SETUP #line 89 "frame/ds9lex.L" -{return HIGHLITE_;} +{return GLOBAL_;} YY_BREAK case 45: YY_RULE_SETUP #line 90 "frame/ds9lex.L" -{return ICRS_;} +{return HIGHLITE_;} YY_BREAK case 46: YY_RULE_SETUP #line 91 "frame/ds9lex.L" -{return IGNORE_;} +{return ICRS_;} YY_BREAK case 47: YY_RULE_SETUP #line 92 "frame/ds9lex.L" -{return INCLUDE_;} +{return IGNORE_;} YY_BREAK case 48: YY_RULE_SETUP #line 93 "frame/ds9lex.L" -{return IMAGE_;} +{return INCLUDE_;} YY_BREAK case 49: YY_RULE_SETUP #line 94 "frame/ds9lex.L" -{return KEY_;} +{return IMAGE_;} YY_BREAK case 50: YY_RULE_SETUP #line 95 "frame/ds9lex.L" -{return J2000_;} +{return KEY_;} YY_BREAK case 51: YY_RULE_SETUP #line 96 "frame/ds9lex.L" -{return LINE_;} +{return J2000_;} YY_BREAK case 52: YY_RULE_SETUP #line 97 "frame/ds9lex.L" -{return LINEAR_;} +{return LINE_;} YY_BREAK case 53: YY_RULE_SETUP #line 98 "frame/ds9lex.L" -{return MOVE_;} +{return LINEAR_;} YY_BREAK case 54: YY_RULE_SETUP #line 99 "frame/ds9lex.L" -{return N_;} +{return MOVE_;} YY_BREAK case 55: YY_RULE_SETUP #line 100 "frame/ds9lex.L" -{return NO_;} +{return N_;} YY_BREAK case 56: YY_RULE_SETUP #line 101 "frame/ds9lex.L" -{return OFF_;} +{return NO_;} YY_BREAK case 57: YY_RULE_SETUP #line 102 "frame/ds9lex.L" -{return ON_;} +{return OFF_;} YY_BREAK case 58: YY_RULE_SETUP #line 103 "frame/ds9lex.L" -{return CPANDA_;} +{return ON_;} YY_BREAK case 59: YY_RULE_SETUP #line 104 "frame/ds9lex.L" -{return PHYSICAL_;} +{return CPANDA_;} YY_BREAK case 60: YY_RULE_SETUP #line 105 "frame/ds9lex.L" -{return PIE_;} +{return PHYSICAL_;} YY_BREAK case 61: YY_RULE_SETUP #line 106 "frame/ds9lex.L" -{return PIXELS_;} +{return PIE_;} YY_BREAK case 62: YY_RULE_SETUP #line 107 "frame/ds9lex.L" -{return POINT_;} +{return PIXELS_;} YY_BREAK case 63: YY_RULE_SETUP #line 108 "frame/ds9lex.L" -{return POLYGON_;} +{return POINT_;} YY_BREAK case 64: YY_RULE_SETUP #line 109 "frame/ds9lex.L" -{return PROJECTION_;} +{return POLYGON_;} YY_BREAK case 65: YY_RULE_SETUP #line 110 "frame/ds9lex.L" -{return PROPERTY_;} +{return PROJECTION_;} YY_BREAK case 66: YY_RULE_SETUP #line 111 "frame/ds9lex.L" -{return ROTATE_;} +{return PROPERTY_;} YY_BREAK case 67: YY_RULE_SETUP #line 112 "frame/ds9lex.L" -{return ROTBOX_;} +{return ROTATE_;} YY_BREAK case 68: YY_RULE_SETUP #line 113 "frame/ds9lex.L" -{return RULER_;} +{return ROTBOX_;} YY_BREAK case 69: YY_RULE_SETUP #line 114 "frame/ds9lex.L" -{return SELECT_;} +{return RULER_;} YY_BREAK case 70: YY_RULE_SETUP #line 115 "frame/ds9lex.L" -{return SEGMENT_;} +{return SELECT_;} YY_BREAK case 71: YY_RULE_SETUP #line 116 "frame/ds9lex.L" -{return SOURCE_;} +{return SEGMENT_;} YY_BREAK case 72: YY_RULE_SETUP #line 117 "frame/ds9lex.L" -{return TAG_;} +{return SOURCE_;} YY_BREAK case 73: YY_RULE_SETUP #line 118 "frame/ds9lex.L" -{return TEXT_;} +{return TAG_;} YY_BREAK case 74: YY_RULE_SETUP #line 119 "frame/ds9lex.L" -{return TEXTANGLE_;} +{return TEXT_;} YY_BREAK case 75: YY_RULE_SETUP #line 120 "frame/ds9lex.L" -{return TEXTROTATE_;} +{return TEXTANGLE_;} YY_BREAK case 76: YY_RULE_SETUP #line 121 "frame/ds9lex.L" -{return TILE_;} +{return TEXTROTATE_;} YY_BREAK case 77: YY_RULE_SETUP #line 122 "frame/ds9lex.L" -{return TRUE_;} +{return TILE_;} YY_BREAK case 78: YY_RULE_SETUP #line 123 "frame/ds9lex.L" -{return VECTOR_;} +{return TRUE_;} YY_BREAK case 79: YY_RULE_SETUP #line 124 "frame/ds9lex.L" -{return VERSION_;} +{return VECTOR_;} YY_BREAK case 80: YY_RULE_SETUP #line 125 "frame/ds9lex.L" -{return UPDATE_;} +{return VERSION_;} YY_BREAK case 81: YY_RULE_SETUP #line 126 "frame/ds9lex.L" -{return UNHIGHLITE_;} +{return UPDATE_;} YY_BREAK case 82: YY_RULE_SETUP #line 127 "frame/ds9lex.L" -{return UNSELECT_;} +{return UNHIGHLITE_;} YY_BREAK case 83: YY_RULE_SETUP #line 128 "frame/ds9lex.L" -{return WCS_;} +{return UNSELECT_;} YY_BREAK case 84: YY_RULE_SETUP #line 129 "frame/ds9lex.L" -{return WCSA_;} +{return WCS_;} YY_BREAK case 85: YY_RULE_SETUP #line 130 "frame/ds9lex.L" -{return WCSB_;} +{return WCSA_;} YY_BREAK case 86: YY_RULE_SETUP #line 131 "frame/ds9lex.L" -{return WCSC_;} +{return WCSB_;} YY_BREAK case 87: YY_RULE_SETUP #line 132 "frame/ds9lex.L" -{return WCSD_;} +{return WCSC_;} YY_BREAK case 88: YY_RULE_SETUP #line 133 "frame/ds9lex.L" -{return WCSE_;} +{return WCSD_;} YY_BREAK case 89: YY_RULE_SETUP #line 134 "frame/ds9lex.L" -{return WCSF_;} +{return WCSE_;} YY_BREAK case 90: YY_RULE_SETUP #line 135 "frame/ds9lex.L" -{return WCSG_;} +{return WCSF_;} YY_BREAK case 91: YY_RULE_SETUP #line 136 "frame/ds9lex.L" -{return WCSH_;} +{return WCSG_;} YY_BREAK case 92: YY_RULE_SETUP #line 137 "frame/ds9lex.L" -{return WCSI_;} +{return WCSH_;} YY_BREAK case 93: YY_RULE_SETUP #line 138 "frame/ds9lex.L" -{return WCSJ_;} +{return WCSI_;} YY_BREAK case 94: YY_RULE_SETUP #line 139 "frame/ds9lex.L" -{return WCSK_;} +{return WCSJ_;} YY_BREAK case 95: YY_RULE_SETUP #line 140 "frame/ds9lex.L" -{return WCSL_;} +{return WCSK_;} YY_BREAK case 96: YY_RULE_SETUP #line 141 "frame/ds9lex.L" -{return WCSM_;} +{return WCSL_;} YY_BREAK case 97: YY_RULE_SETUP #line 142 "frame/ds9lex.L" -{return WCSN_;} +{return WCSM_;} YY_BREAK case 98: YY_RULE_SETUP #line 143 "frame/ds9lex.L" -{return WCSO_;} +{return WCSN_;} YY_BREAK case 99: YY_RULE_SETUP #line 144 "frame/ds9lex.L" -{return WCSP_;} +{return WCSO_;} YY_BREAK case 100: YY_RULE_SETUP #line 145 "frame/ds9lex.L" -{return WCSQ_;} +{return WCSP_;} YY_BREAK case 101: YY_RULE_SETUP #line 146 "frame/ds9lex.L" -{return WCSR_;} +{return WCSQ_;} YY_BREAK case 102: YY_RULE_SETUP #line 147 "frame/ds9lex.L" -{return WCSS_;} +{return WCSR_;} YY_BREAK case 103: YY_RULE_SETUP #line 148 "frame/ds9lex.L" -{return WCST_;} +{return WCSS_;} YY_BREAK case 104: YY_RULE_SETUP #line 149 "frame/ds9lex.L" -{return WCSU_;} +{return WCST_;} YY_BREAK case 105: YY_RULE_SETUP #line 150 "frame/ds9lex.L" -{return WCSV_;} +{return WCSU_;} YY_BREAK case 106: YY_RULE_SETUP #line 151 "frame/ds9lex.L" -{return WCSW_;} +{return WCSV_;} YY_BREAK case 107: YY_RULE_SETUP #line 152 "frame/ds9lex.L" -{return WCSX_;} +{return WCSW_;} YY_BREAK case 108: YY_RULE_SETUP #line 153 "frame/ds9lex.L" -{return WCSY_;} +{return WCSX_;} YY_BREAK case 109: YY_RULE_SETUP #line 154 "frame/ds9lex.L" -{return WCSZ_;} +{return WCSY_;} YY_BREAK case 110: YY_RULE_SETUP #line 155 "frame/ds9lex.L" -{return WCS0_;} +{return WCSZ_;} YY_BREAK case 111: YY_RULE_SETUP #line 156 "frame/ds9lex.L" -{return WIDTH_;} +{return WCS0_;} YY_BREAK case 112: YY_RULE_SETUP #line 157 "frame/ds9lex.L" -{return X_;} +{return WIDTH_;} YY_BREAK case 113: YY_RULE_SETUP #line 158 "frame/ds9lex.L" -{return Y_;} +{return X_;} YY_BREAK case 114: YY_RULE_SETUP #line 159 "frame/ds9lex.L" -{return YES_;} +{return Y_;} YY_BREAK case 115: YY_RULE_SETUP -#line 162 "frame/ds9lex.L" +#line 160 "frame/ds9lex.L" +{return YES_;} + YY_BREAK +case 116: +YY_RULE_SETUP +#line 163 "frame/ds9lex.L" { // Integer mklval->integer = atoi(yytext); return INT; } YY_BREAK -case 116: -#line 168 "frame/ds9lex.L" case 117: +#line 169 "frame/ds9lex.L" +case 118: YY_RULE_SETUP -#line 168 "frame/ds9lex.L" +#line 169 "frame/ds9lex.L" { // Real Number mklval->real = atof(yytext); return REAL; } YY_BREAK -case 118: -#line 174 "frame/ds9lex.L" case 119: +#line 175 "frame/ds9lex.L" +case 120: YY_RULE_SETUP -#line 174 "frame/ds9lex.L" +#line 175 "frame/ds9lex.L" { // degrees yytext[yyleng-1] = '\0'; mklval->real = atof(yytext); return ANGDEGREE; } YY_BREAK -case 120: -#line 181 "frame/ds9lex.L" case 121: +#line 182 "frame/ds9lex.L" +case 122: YY_RULE_SETUP -#line 181 "frame/ds9lex.L" +#line 182 "frame/ds9lex.L" { // radians yytext[yyleng-1] = '\0'; mklval->real = atof(yytext); return ANGRADIAN; } YY_BREAK -case 122: -#line 188 "frame/ds9lex.L" case 123: +#line 189 "frame/ds9lex.L" +case 124: YY_RULE_SETUP -#line 188 "frame/ds9lex.L" +#line 189 "frame/ds9lex.L" { // physical coords yytext[yyleng-1] = '\0'; mklval->real = atof(yytext); return PHYCOORD; } YY_BREAK -case 124: -#line 195 "frame/ds9lex.L" case 125: +#line 196 "frame/ds9lex.L" +case 126: YY_RULE_SETUP -#line 195 "frame/ds9lex.L" +#line 196 "frame/ds9lex.L" { // image coords yytext[yyleng-1] = '\0'; mklval->real = atof(yytext); return IMGCOORD; } YY_BREAK -case 126: -#line 202 "frame/ds9lex.L" case 127: #line 203 "frame/ds9lex.L" case 128: #line 204 "frame/ds9lex.L" case 129: +#line 205 "frame/ds9lex.L" +case 130: YY_RULE_SETUP -#line 204 "frame/ds9lex.L" +#line 205 "frame/ds9lex.L" { // minutes of arc yytext[yyleng-1] = '\0'; mklval->real = atof(yytext); return ARCMINUTE; } YY_BREAK -case 130: -#line 211 "frame/ds9lex.L" case 131: #line 212 "frame/ds9lex.L" case 132: #line 213 "frame/ds9lex.L" case 133: +#line 214 "frame/ds9lex.L" +case 134: YY_RULE_SETUP -#line 213 "frame/ds9lex.L" +#line 214 "frame/ds9lex.L" { // seconds of arc yytext[yyleng-1] = '\0'; mklval->real = atof(yytext); return ARCSECOND; } YY_BREAK -case 134: -#line 220 "frame/ds9lex.L" case 135: +#line 221 "frame/ds9lex.L" +case 136: YY_RULE_SETUP -#line 220 "frame/ds9lex.L" +#line 221 "frame/ds9lex.L" { // Sexagesimal int ll = yyleng <(MKBUFSIZE-1) ? yyleng:(MKBUFSIZE-1); strncpy(mklval->str,yytext,ll); @@ -2389,11 +2406,11 @@ YY_RULE_SETUP return SEXSTR; } YY_BREAK -case 136: -#line 228 "frame/ds9lex.L" case 137: +#line 229 "frame/ds9lex.L" +case 138: YY_RULE_SETUP -#line 228 "frame/ds9lex.L" +#line 229 "frame/ds9lex.L" { // HMS int ll = yyleng <(MKBUFSIZE-1) ? yyleng:(MKBUFSIZE-1); strncpy(mklval->str,yytext,ll); @@ -2401,11 +2418,11 @@ YY_RULE_SETUP return HMSSTR; } YY_BREAK -case 138: -#line 236 "frame/ds9lex.L" case 139: +#line 237 "frame/ds9lex.L" +case 140: YY_RULE_SETUP -#line 236 "frame/ds9lex.L" +#line 237 "frame/ds9lex.L" { // DMS int ll = yyleng <(MKBUFSIZE-1) ? yyleng:(MKBUFSIZE-1); strncpy(mklval->str,yytext,ll); @@ -2413,9 +2430,9 @@ YY_RULE_SETUP return DMSSTR; } YY_BREAK -case 140: +case 141: YY_RULE_SETUP -#line 243 "frame/ds9lex.L" +#line 244 "frame/ds9lex.L" { // 8 bit Hex Color int ll = yyleng <(MKBUFSIZE-1) ? yyleng:(MKBUFSIZE-1); strncpy(mklval->str,yytext,ll); @@ -2423,9 +2440,9 @@ YY_RULE_SETUP return STRING; } YY_BREAK -case 141: +case 142: YY_RULE_SETUP -#line 250 "frame/ds9lex.L" +#line 251 "frame/ds9lex.L" { // 16 bit Hex Color int ll = yyleng <(MKBUFSIZE-1) ? yyleng:(MKBUFSIZE-1); strncpy(mklval->str,yytext,ll); @@ -2433,9 +2450,9 @@ YY_RULE_SETUP return STRING; } YY_BREAK -case 142: +case 143: YY_RULE_SETUP -#line 257 "frame/ds9lex.L" +#line 258 "frame/ds9lex.L" { // 32 bit Hex Color int ll = yyleng <(MKBUFSIZE-1) ? yyleng:(MKBUFSIZE-1); strncpy(mklval->str,yytext,ll); @@ -2443,11 +2460,11 @@ YY_RULE_SETUP return STRING; } YY_BREAK -case 143: -#line 265 "frame/ds9lex.L" case 144: +#line 266 "frame/ds9lex.L" +case 145: YY_RULE_SETUP -#line 265 "frame/ds9lex.L" +#line 266 "frame/ds9lex.L" { // Quoted String int ll = (yyleng-2)<(MKBUFSIZE-1) ? (yyleng-2):(MKBUFSIZE-1); strncpy(mklval->str,yytext+1,ll); // skip the " " @@ -2455,9 +2472,9 @@ YY_RULE_SETUP return STRING; } YY_BREAK -case 145: +case 146: YY_RULE_SETUP -#line 272 "frame/ds9lex.L" +#line 273 "frame/ds9lex.L" { // Quoted String int ll = (yyleng-2)<(MKBUFSIZE-1) ? (yyleng-2):(MKBUFSIZE-1); strncpy(mklval->str,yytext+1,ll); // skip the '{' @@ -2465,9 +2482,9 @@ YY_RULE_SETUP return STRING; } YY_BREAK -case 146: +case 147: YY_RULE_SETUP -#line 279 "frame/ds9lex.L" +#line 280 "frame/ds9lex.L" { // General String int ll = yyleng <(MKBUFSIZE-1) ? yyleng:(MKBUFSIZE-1); strncpy(mklval->str,yytext,ll); @@ -2475,55 +2492,55 @@ YY_RULE_SETUP return STRING; } YY_BREAK -case 147: +case 148: YY_RULE_SETUP -#line 286 "frame/ds9lex.L" +#line 287 "frame/ds9lex.L" { // White Spaces } YY_BREAK -case 148: -/* rule 148 can match eol */ +case 149: +/* rule 149 can match eol */ YY_RULE_SETUP -#line 289 "frame/ds9lex.L" +#line 290 "frame/ds9lex.L" { // windows line feed return '\n'; } YY_BREAK -case 149: +case 150: YY_RULE_SETUP -#line 293 "frame/ds9lex.L" +#line 294 "frame/ds9lex.L" { // fake line feed return '\n'; } YY_BREAK -case 150: -/* rule 150 can match eol */ +case 151: +/* rule 151 can match eol */ YY_RULE_SETUP -#line 297 "frame/ds9lex.L" +#line 298 "frame/ds9lex.L" { // linefeed return '\n'; } YY_BREAK case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(DISCARD): -#line 301 "frame/ds9lex.L" +#line 302 "frame/ds9lex.L" { // eof return EOF_; } YY_BREAK -case 151: +case 152: YY_RULE_SETUP -#line 305 "frame/ds9lex.L" +#line 306 "frame/ds9lex.L" { // Else, return the char return yytext[0]; } YY_BREAK -case 152: +case 153: YY_RULE_SETUP -#line 309 "frame/ds9lex.L" +#line 310 "frame/ds9lex.L" ECHO; YY_BREAK -#line 2527 "frame/ds9lex.C" +#line 2544 "frame/ds9lex.C" case YY_END_OF_BUFFER: { @@ -2903,7 +2920,7 @@ int yyFlexLexer::yy_get_next_buffer() while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 517 ) + if ( yy_current_state >= 519 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2931,11 +2948,11 @@ int yyFlexLexer::yy_get_next_buffer() while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 517 ) + if ( yy_current_state >= 519 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 516); + yy_is_jam = (yy_current_state == 518); return yy_is_jam ? 0 : yy_current_state; } @@ -3420,7 +3437,7 @@ void mkfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 309 "frame/ds9lex.L" +#line 310 "frame/ds9lex.L" diff --git a/tksao/frame/ds9lex.L b/tksao/frame/ds9lex.L index 8ec3875..df0b3a4 100644 --- a/tksao/frame/ds9lex.L +++ b/tksao/frame/ds9lex.L @@ -60,6 +60,7 @@ callback {return CALLBACK_;} cir[c][l][e] {return CIRCLE_;} circle3d {return CIRCLE3D_;} color {return COLOR_;} +colour {return COLOR_;} compass {return COMPASS_;} composite {return COMPOSITE_;} cpanda {return CPANDA_;} diff --git a/tksao/frame/lex.C b/tksao/frame/lex.C index fe8f85d..edad911 100644 --- a/tksao/frame/lex.C +++ b/tksao/frame/lex.C @@ -324,8 +324,8 @@ int yyFlexLexer::yywrap() { return 1; } *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 358 -#define YY_END_OF_BUFFER 359 +#define YY_NUM_RULES 363 +#define YY_END_OF_BUFFER 364 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -333,147 +333,149 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[1268] = +static yyconst flex_int16_t yy_accept[1285] = { 0, - 0, 0, 359, 357, 356, 358, 357, 357, 357, 357, - 357, 338, 338, 338, 357, 357, 357, 357, 357, 357, - 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, - 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, - 357, 356, 355, 0, 355, 352, 0, 355, 353, 355, - 338, 340, 339, 338, 355, 342, 355, 355, 355, 277, - 355, 355, 355, 355, 355, 355, 355, 355, 355, 355, - 355, 355, 355, 355, 355, 355, 30, 355, 355, 355, - 355, 355, 43, 355, 355, 355, 355, 355, 355, 355, - 355, 355, 355, 355, 355, 355, 355, 355, 355, 355, - - 355, 355, 355, 355, 355, 355, 355, 355, 355, 355, - 355, 355, 355, 355, 355, 131, 355, 355, 355, 355, - 355, 143, 355, 355, 355, 355, 355, 355, 355, 355, - 355, 355, 355, 355, 355, 355, 355, 355, 355, 355, - 190, 355, 355, 355, 355, 199, 355, 355, 355, 355, - 355, 355, 355, 355, 355, 355, 355, 355, 355, 355, - 355, 355, 355, 355, 355, 355, 355, 355, 355, 355, - 355, 355, 355, 355, 355, 355, 355, 355, 281, 355, - 355, 355, 355, 355, 355, 355, 355, 355, 355, 355, - 355, 355, 332, 355, 355, 355, 355, 355, 0, 355, - - 354, 352, 353, 340, 339, 344, 343, 355, 342, 355, - 355, 355, 339, 355, 341, 355, 2, 355, 6, 7, - 355, 355, 355, 355, 355, 355, 355, 355, 18, 355, - 20, 355, 355, 355, 355, 355, 355, 355, 355, 31, - 33, 355, 355, 355, 37, 355, 355, 355, 355, 355, - 355, 355, 355, 355, 355, 355, 355, 355, 355, 355, - 355, 355, 355, 355, 355, 355, 355, 355, 355, 78, - 355, 355, 355, 355, 355, 355, 355, 355, 355, 92, - 93, 355, 355, 355, 355, 100, 355, 355, 355, 355, - 355, 106, 355, 355, 355, 112, 355, 116, 117, 355, - - 355, 355, 355, 355, 355, 355, 126, 355, 355, 355, - 355, 133, 355, 355, 355, 355, 355, 355, 355, 144, - 355, 355, 355, 355, 355, 355, 153, 355, 355, 355, - 355, 355, 355, 355, 355, 165, 355, 355, 169, 355, - 355, 355, 355, 355, 355, 177, 355, 355, 355, 355, - 355, 355, 185, 355, 355, 188, 355, 355, 194, 355, - 355, 355, 198, 355, 355, 355, 203, 355, 355, 355, - 355, 355, 355, 355, 355, 355, 355, 218, 355, 355, - 355, 355, 355, 355, 355, 355, 355, 355, 235, 355, - 355, 355, 355, 355, 355, 355, 355, 355, 355, 355, - - 249, 355, 355, 355, 355, 355, 355, 355, 355, 355, - 355, 355, 355, 355, 355, 355, 355, 355, 270, 355, - 355, 273, 355, 355, 355, 355, 355, 355, 355, 355, - 355, 355, 355, 355, 355, 355, 355, 355, 293, 355, - 355, 355, 355, 300, 355, 355, 355, 331, 333, 355, - 355, 355, 355, 354, 345, 355, 340, 355, 355, 355, - 355, 355, 355, 355, 355, 355, 355, 355, 355, 355, - 355, 355, 355, 19, 355, 22, 355, 355, 25, 27, - 28, 355, 355, 355, 355, 355, 355, 355, 355, 355, - 355, 355, 355, 355, 355, 355, 51, 355, 355, 54, - - 79, 355, 60, 355, 355, 355, 355, 355, 69, 355, - 355, 355, 71, 355, 76, 355, 80, 82, 355, 355, - 355, 355, 355, 355, 355, 355, 99, 355, 355, 101, - 355, 355, 355, 355, 355, 355, 109, 110, 355, 113, - 355, 118, 355, 120, 355, 122, 355, 355, 355, 355, - 355, 129, 130, 355, 134, 355, 137, 355, 355, 355, - 142, 355, 355, 147, 148, 150, 355, 355, 355, 355, - 355, 355, 160, 162, 355, 163, 355, 355, 355, 170, - 172, 355, 355, 355, 355, 355, 178, 180, 355, 355, - 183, 184, 355, 355, 189, 191, 355, 355, 195, 355, - - 355, 200, 355, 355, 355, 355, 355, 355, 208, 355, - 355, 355, 355, 355, 355, 355, 355, 355, 355, 355, - 355, 224, 355, 355, 355, 355, 355, 355, 355, 355, - 355, 236, 355, 355, 355, 355, 355, 242, 355, 244, - 355, 355, 355, 355, 355, 355, 355, 355, 355, 255, - 355, 257, 258, 355, 355, 355, 355, 355, 265, 355, - 355, 355, 355, 355, 355, 275, 355, 355, 355, 355, - 355, 284, 285, 286, 355, 355, 355, 355, 291, 355, - 355, 355, 355, 294, 299, 327, 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, 355, 355, 355, 334, 335, 337, 355, 355, - 346, 355, 355, 355, 355, 1, 5, 3, 355, 355, - 10, 355, 355, 355, 355, 15, 16, 17, 355, 355, - 24, 355, 29, 355, 355, 35, 355, 355, 355, 355, - 355, 355, 355, 355, 355, 355, 355, 355, 355, 355, - 53, 55, 355, 355, 355, 355, 355, 355, 355, 355, - 70, 355, 355, 72, 355, 355, 355, 355, 85, 355, - 355, 355, 89, 355, 355, 355, 355, 355, 355, 355, - 355, 105, 355, 108, 355, 114, 115, 355, 121, 355, - - 355, 355, 355, 355, 355, 355, 355, 355, 355, 355, - 355, 145, 355, 355, 355, 152, 355, 155, 355, 157, - 355, 355, 164, 355, 355, 355, 168, 355, 355, 355, - 176, 355, 355, 355, 355, 187, 355, 355, 355, 355, - 355, 355, 204, 355, 355, 207, 209, 355, 211, 355, - 355, 214, 355, 355, 355, 355, 220, 355, 355, 355, - 226, 355, 355, 229, 355, 355, 355, 233, 355, 355, - 238, 355, 355, 355, 243, 355, 246, 355, 355, 355, - 251, 355, 253, 254, 256, 259, 260, 355, 355, 355, - 355, 355, 268, 355, 355, 272, 355, 279, 355, 355, - - 355, 355, 355, 355, 355, 355, 355, 292, 355, 355, - 355, 355, 328, 329, 330, 355, 347, 346, 355, 355, - 350, 355, 355, 348, 355, 355, 355, 355, 12, 13, - 14, 355, 355, 355, 355, 34, 36, 355, 39, 355, - 41, 42, 355, 45, 355, 355, 48, 355, 355, 52, - 355, 355, 355, 61, 355, 355, 355, 355, 355, 355, - 355, 73, 74, 355, 77, 355, 355, 355, 355, 355, - 88, 355, 355, 355, 355, 355, 355, 102, 355, 355, - 107, 111, 119, 355, 355, 355, 127, 355, 132, 135, - 136, 355, 355, 355, 355, 355, 355, 355, 355, 156, - - 161, 158, 166, 355, 171, 355, 174, 175, 355, 181, - 182, 186, 192, 355, 196, 197, 201, 202, 205, 206, - 355, 212, 213, 355, 355, 355, 355, 355, 355, 355, - 355, 227, 228, 230, 355, 355, 355, 237, 239, 355, - 241, 355, 355, 248, 355, 252, 261, 262, 264, 355, - 355, 269, 271, 355, 355, 355, 282, 283, 355, 355, - 287, 355, 290, 295, 355, 297, 355, 336, 351, 349, - 4, 355, 355, 11, 21, 23, 355, 355, 355, 355, - 355, 46, 355, 355, 50, 355, 355, 355, 355, 62, - 63, 355, 355, 66, 355, 355, 355, 355, 83, 84, - - 87, 86, 355, 91, 355, 355, 97, 355, 103, 355, - 355, 355, 355, 355, 355, 139, 355, 355, 146, 151, - 355, 154, 355, 355, 173, 355, 193, 355, 215, 216, - 355, 355, 355, 355, 355, 355, 231, 355, 355, 355, - 355, 247, 355, 355, 266, 267, 355, 276, 355, 355, - 355, 355, 296, 355, 355, 9, 355, 355, 355, 355, - 44, 355, 49, 56, 57, 355, 355, 355, 65, 67, - 355, 355, 81, 90, 94, 355, 355, 96, 355, 123, - 124, 125, 128, 138, 355, 355, 355, 355, 355, 179, - 210, 355, 355, 221, 355, 223, 355, 232, 355, 240, - - 355, 355, 263, 274, 355, 355, 355, 289, 298, 8, - 355, 32, 355, 40, 47, 355, 355, 64, 355, 75, - 95, 355, 355, 140, 355, 149, 355, 167, 355, 219, - 355, 355, 355, 355, 355, 278, 355, 355, 26, 38, - 58, 59, 355, 355, 104, 141, 355, 217, 222, 355, - 234, 245, 355, 355, 288, 68, 355, 355, 225, 250, - 355, 355, 159, 280, 355, 98, 0 + 0, 0, 364, 362, 361, 363, 362, 362, 362, 362, + 362, 343, 343, 343, 362, 362, 362, 362, 362, 362, + 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, + 362, 362, 362, 362, 362, 362, 362, 362, 362, 362, + 362, 361, 360, 0, 360, 357, 0, 360, 358, 360, + 343, 345, 344, 343, 360, 347, 360, 360, 360, 282, + 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, + 360, 360, 360, 360, 360, 360, 30, 360, 360, 360, + 360, 360, 43, 360, 360, 360, 360, 360, 360, 360, + 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, + + 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, + 360, 360, 360, 360, 360, 136, 360, 360, 360, 360, + 360, 148, 360, 360, 360, 360, 360, 360, 360, 360, + 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, + 195, 360, 360, 360, 360, 204, 360, 360, 360, 360, + 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, + 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, + 360, 360, 360, 360, 360, 360, 360, 360, 286, 360, + 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, + 360, 360, 337, 360, 360, 360, 360, 360, 0, 360, + + 359, 357, 358, 345, 344, 349, 348, 360, 347, 360, + 360, 360, 344, 360, 346, 360, 2, 360, 6, 7, + 360, 360, 360, 360, 360, 360, 360, 360, 18, 360, + 20, 360, 360, 360, 360, 360, 360, 360, 360, 31, + 33, 360, 360, 360, 37, 360, 360, 360, 360, 360, + 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, + 360, 360, 360, 360, 360, 360, 360, 360, 360, 83, + 360, 360, 360, 360, 360, 360, 360, 360, 360, 97, + 98, 360, 360, 360, 360, 105, 360, 360, 360, 360, + 360, 111, 360, 360, 360, 117, 360, 121, 122, 360, + + 360, 360, 360, 360, 360, 360, 131, 360, 360, 360, + 360, 138, 360, 360, 360, 360, 360, 360, 360, 149, + 360, 360, 360, 360, 360, 360, 158, 360, 360, 360, + 360, 360, 360, 360, 360, 170, 360, 360, 174, 360, + 360, 360, 360, 360, 360, 182, 360, 360, 360, 360, + 360, 360, 190, 360, 360, 193, 360, 360, 199, 360, + 360, 360, 203, 360, 360, 360, 208, 360, 360, 360, + 360, 360, 360, 360, 360, 360, 360, 223, 360, 360, + 360, 360, 360, 360, 360, 360, 360, 360, 240, 360, + 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, + + 254, 360, 360, 360, 360, 360, 360, 360, 360, 360, + 360, 360, 360, 360, 360, 360, 360, 360, 275, 360, + 360, 278, 360, 360, 360, 360, 360, 360, 360, 360, + 360, 360, 360, 360, 360, 360, 360, 360, 298, 360, + 360, 360, 360, 305, 360, 360, 360, 336, 338, 360, + 360, 360, 360, 359, 350, 360, 345, 360, 360, 360, + 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, + 360, 360, 360, 19, 360, 22, 360, 360, 25, 27, + 28, 360, 360, 360, 360, 360, 360, 360, 360, 360, + 360, 360, 360, 360, 360, 360, 51, 360, 360, 54, + + 84, 360, 65, 360, 360, 360, 360, 360, 74, 360, + 360, 360, 76, 360, 81, 360, 85, 87, 360, 360, + 360, 360, 360, 360, 360, 360, 104, 360, 360, 106, + 360, 360, 360, 360, 360, 360, 114, 115, 360, 118, + 360, 123, 360, 125, 360, 127, 360, 360, 360, 360, + 360, 134, 135, 360, 139, 360, 142, 360, 360, 360, + 147, 360, 360, 152, 153, 155, 360, 360, 360, 360, + 360, 360, 165, 167, 360, 168, 360, 360, 360, 175, + 177, 360, 360, 360, 360, 360, 183, 185, 360, 360, + 188, 189, 360, 360, 194, 196, 360, 360, 200, 360, + + 360, 205, 360, 360, 360, 360, 360, 360, 213, 360, + 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, + 360, 229, 360, 360, 360, 360, 360, 360, 360, 360, + 360, 241, 360, 360, 360, 360, 360, 247, 360, 249, + 360, 360, 360, 360, 360, 360, 360, 360, 360, 260, + 360, 262, 263, 360, 360, 360, 360, 360, 270, 360, + 360, 360, 360, 360, 360, 280, 360, 360, 360, 360, + 360, 289, 290, 291, 360, 360, 360, 360, 296, 360, + 360, 360, 360, 299, 304, 332, 306, 307, 308, 309, + 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, + + 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, + 330, 331, 360, 360, 360, 339, 340, 342, 360, 360, + 351, 360, 360, 360, 360, 1, 5, 3, 360, 360, + 10, 360, 360, 360, 360, 15, 16, 17, 360, 360, + 24, 360, 29, 360, 360, 35, 360, 360, 360, 360, + 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, + 53, 55, 360, 360, 360, 360, 360, 360, 360, 360, + 360, 75, 360, 360, 77, 360, 360, 360, 360, 90, + 360, 360, 360, 94, 360, 360, 360, 360, 360, 360, + 360, 360, 110, 360, 113, 360, 119, 120, 360, 126, + + 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, + 360, 360, 150, 360, 360, 360, 157, 360, 160, 360, + 162, 360, 360, 169, 360, 360, 360, 173, 360, 360, + 360, 181, 360, 360, 360, 360, 192, 360, 360, 360, + 360, 360, 360, 209, 360, 360, 212, 214, 360, 216, + 360, 360, 219, 360, 360, 360, 360, 225, 360, 360, + 360, 231, 360, 360, 234, 360, 360, 360, 238, 360, + 360, 243, 360, 360, 360, 248, 360, 251, 360, 360, + 360, 256, 360, 258, 259, 261, 264, 265, 360, 360, + 360, 360, 360, 273, 360, 360, 277, 360, 284, 360, + + 360, 360, 360, 360, 360, 360, 360, 360, 297, 360, + 360, 360, 360, 333, 334, 335, 360, 352, 351, 360, + 360, 355, 360, 360, 353, 360, 360, 360, 360, 12, + 13, 14, 360, 360, 360, 360, 34, 36, 360, 39, + 360, 41, 42, 360, 45, 360, 360, 48, 360, 360, + 52, 360, 360, 360, 56, 66, 360, 360, 360, 360, + 360, 360, 360, 78, 79, 360, 82, 360, 360, 360, + 360, 360, 93, 360, 360, 360, 360, 360, 360, 107, + 360, 360, 112, 116, 124, 360, 360, 360, 132, 360, + 137, 140, 141, 360, 360, 360, 360, 360, 360, 360, + + 360, 161, 166, 163, 171, 360, 176, 360, 179, 180, + 360, 186, 187, 191, 197, 360, 201, 202, 206, 207, + 210, 211, 360, 217, 218, 360, 360, 360, 360, 360, + 360, 360, 360, 232, 233, 235, 360, 360, 360, 242, + 244, 360, 246, 360, 360, 253, 360, 257, 266, 267, + 269, 360, 360, 274, 276, 360, 360, 360, 287, 288, + 360, 360, 292, 360, 295, 300, 360, 302, 360, 341, + 356, 354, 4, 360, 360, 11, 21, 23, 360, 360, + 360, 360, 360, 46, 360, 360, 50, 360, 360, 360, + 360, 360, 360, 360, 67, 68, 360, 360, 71, 360, + + 360, 360, 360, 88, 89, 92, 91, 360, 96, 360, + 360, 102, 360, 108, 360, 360, 360, 360, 360, 360, + 144, 360, 360, 151, 156, 360, 159, 360, 360, 178, + 360, 198, 360, 220, 221, 360, 360, 360, 360, 360, + 360, 236, 360, 360, 360, 360, 252, 360, 360, 271, + 272, 360, 281, 360, 360, 360, 360, 301, 360, 360, + 9, 360, 360, 360, 360, 44, 360, 49, 57, 59, + 360, 360, 360, 360, 360, 360, 360, 70, 72, 360, + 360, 86, 95, 99, 360, 360, 101, 360, 128, 129, + 130, 133, 143, 360, 360, 360, 360, 360, 184, 215, + + 360, 360, 226, 360, 228, 360, 237, 360, 245, 360, + 360, 268, 279, 360, 360, 360, 294, 303, 8, 360, + 32, 360, 40, 47, 360, 360, 58, 60, 360, 360, + 69, 360, 80, 100, 360, 360, 145, 360, 154, 360, + 172, 360, 224, 360, 360, 360, 360, 360, 283, 360, + 360, 26, 38, 61, 63, 360, 360, 360, 360, 109, + 146, 360, 222, 227, 360, 239, 250, 360, 360, 293, + 62, 64, 73, 360, 360, 230, 255, 360, 360, 164, + 285, 360, 103, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -520,9 +522,9 @@ static yyconst flex_int32_t yy_meta[72] = 2 } ; -static yyconst flex_int16_t yy_base[1275] = +static yyconst flex_int16_t yy_base[1292] = { 0, - 0, 0, 432, 2907, 427, 2907, 0, 71, 76, 75, + 0, 0, 432, 2964, 427, 2964, 0, 71, 76, 75, 83, 92, 69, 90, 141, 201, 250, 94, 295, 345, 146, 97, 390, 417, 96, 196, 295, 194, 300, 436, 83, 350, 483, 534, 91, 143, 243, 136, 103, 383, @@ -544,7 +546,7 @@ static yyconst flex_int16_t yy_base[1275] = 946, 966, 971, 971, 965, 977, 976, 969, 970, 977, 1006, 993, 0, 989, 994, 1013, 1001, 1014, 266, 1038, - 0, 2907, 2907, 1101, 1021, 0, 0, 1063, 0, 722, + 0, 2964, 2964, 1101, 1021, 0, 0, 1063, 0, 722, 1074, 1082, 1128, 1141, 0, 1007, 0, 1030, 1049, 0, 1070, 1071, 1072, 1064, 1081, 1128, 1087, 1075, 0, 1076, 0, 1085, 1085, 1103, 279, 1107, 1138, 1122, 1139, 1144, @@ -571,244 +573,250 @@ static yyconst flex_int16_t yy_base[1275] = 1500, 0, 1497, 1494, 1512, 1511, 1510, 1510, 1505, 1515, 1516, 1508, 1515, 1510, 1521, 1526, 1510, 1509, 0, 1512, 1540, 1525, 1539, 1600, 1554, 1635, 225, 0, 0, 1641, - 1633, 1645, 1658, 2907, 0, 1569, 1668, 1677, 1695, 1704, + 1633, 1645, 1658, 2964, 0, 1569, 1668, 1677, 1695, 1704, 1658, 1665, 1677, 1698, 1683, 1704, 1698, 1697, 1703, 1708, 1689, 1692, 1708, 0, 1716, 0, 1697, 204, 1712, 0, 0, 1706, 1707, 1713, 1712, 1719, 1711, 1751, 1723, 1723, 1727, 1729, 1719, 1713, 1754, 1747, 0, 1750, 1745, 0, - 0, 1746, 0, 1752, 1765, 1766, 1753, 1765, 0, 1750, - 1769, 1754, 0, 1756, 0, 1761, 1765, 1792, 1773, 1761, - 1778, 1784, 1804, 1810, 1799, 1799, 0, 1815, 1801, 0, - 1814, 1807, 1800, 1816, 1807, 1818, 0, 0, 1819, 1800, - 1822, 0, 1826, 0, 1808, 0, 1809, 1829, 1814, 1833, - 1827, 0, 0, 1824, 1851, 1849, 0, 1851, 1859, 1839, - 0, 1861, 1846, 0, 0, 1855, 1868, 176, 1855, 1859, - 1852, 1861, 1874, 0, 1864, 0, 1865, 1859, 1870, 1875, - 0, 1873, 1883, 1870, 1885, 1869, 1879, 0, 1899, 1894, - 0, 0, 1893, 1897, 0, 0, 1916, 1913, 0, 1914, - - 1917, 0, 1906, 1908, 1922, 1919, 1920, 1921, 0, 1912, - 1919, 1917, 123, 1910, 1924, 1913, 1924, 1931, 1917, 1933, - 1934, 0, 1931, 1935, 1960, 1962, 1953, 1968, 1957, 1951, - 1960, 0, 1953, 1956, 1963, 1963, 1963, 0, 1973, 0, - 1965, 1975, 1977, 1980, 1977, 1980, 1983, 1969, 1986, 0, - 1990, 0, 0, 1987, 1996, 1993, 2014, 2017, 0, 2003, - 2004, 2004, 2019, 2021, 2015, 0, 2017, 2036, 2018, 2030, - 2013, 0, 0, 0, 2026, 2033, 2023, 2016, 0, 2035, - 2026, 2033, 2060, 0, 0, 0, 0, 0, 0, 0, + 0, 1746, 0, 1752, 1765, 1779, 1755, 1765, 0, 1754, + 1771, 1756, 0, 1758, 0, 1764, 1769, 1791, 1775, 1762, + 1806, 1792, 1805, 1811, 1800, 1800, 0, 1816, 1802, 0, + 1815, 1809, 1802, 1819, 1810, 1821, 0, 0, 1822, 1803, + 1825, 0, 1830, 0, 1812, 0, 1813, 1831, 1816, 1845, + 1841, 0, 0, 1844, 1857, 1855, 0, 1852, 1861, 1839, + 0, 1862, 1847, 0, 0, 1856, 1869, 176, 1856, 1861, + 1854, 1865, 1877, 0, 1867, 0, 1868, 1862, 1874, 1879, + 0, 1877, 1885, 1872, 1897, 1883, 1899, 0, 1905, 1900, + 0, 0, 1894, 1898, 0, 0, 1917, 1914, 0, 1915, + + 1918, 0, 1907, 1909, 1924, 1921, 1923, 1924, 0, 1915, + 1922, 1920, 123, 1913, 1928, 1917, 1928, 1933, 1919, 1945, + 1948, 0, 1951, 1941, 1966, 1963, 1954, 1969, 1958, 1952, + 1961, 0, 1954, 1957, 1965, 1965, 1966, 0, 1976, 0, + 1968, 1978, 1979, 1982, 1981, 1984, 1985, 1971, 1998, 0, + 2004, 0, 0, 2007, 2002, 1999, 2015, 2018, 0, 2004, + 2005, 2005, 2020, 2022, 2017, 0, 2019, 2035, 2020, 2032, + 2015, 0, 0, 0, 2028, 2036, 2027, 2020, 0, 2036, + 2027, 2034, 2065, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 172, 2036, 152, 0, 0, 0, 2052, 2079, - 2105, 2090, 2114, 2122, 2169, 0, 0, 2115, 2117, 2105, - 0, 2104, 2122, 2113, 2125, 0, 0, 0, 2122, 2110, - 0, 2113, 0, 2128, 2119, 0, 2126, 2131, 2128, 2129, - 2173, 2157, 2175, 2158, 2163, 2159, 2162, 2166, 2177, 2178, - 0, 2197, 2171, 2172, 2168, 2170, 2186, 2171, 2192, 2185, - 0, 2194, 2191, 2189, 2180, 2217, 2218, 2223, 0, 2217, - 2225, 2226, 0, 2212, 2219, 2214, 2215, 2218, 2238, 2225, - 2226, 0, 2225, 0, 2226, 0, 0, 2225, 0, 2237, - - 2227, 2239, 2237, 2241, 2246, 2244, 2248, 2269, 2262, 2273, - 2266, 0, 2278, 2274, 2264, 0, 2267, 0, 2278, 0, - 2269, 2284, 0, 2266, 2285, 2274, 0, 2286, 2291, 2272, - 0, 2283, 2295, 2285, 2295, 0, 2287, 2284, 2285, 2294, - 2306, 2310, 0, 2313, 2314, 0, 0, 2330, 0, 2330, - 2331, 2331, 2322, 2335, 2320, 2323, 0, 2339, 2325, 2341, - 0, 2333, 2328, 0, 2334, 2346, 2334, 0, 2330, 2347, - 0, 2348, 2353, 2348, 0, 2346, 0, 2358, 2362, 2378, - 0, 2380, 0, 0, 0, 0, 0, 2377, 2366, 2382, - 2383, 2384, 0, 2371, 2378, 0, 2392, 0, 2390, 2387, - - 2391, 2377, 2383, 2392, 2397, 2397, 2398, 0, 2386, 2390, - 2382, 2404, 0, 0, 0, 2413, 2142, 2442, 2453, 2461, - 0, 2469, 2497, 0, 2417, 2462, 2464, 2455, 0, 0, - 0, 2470, 2468, 2462, 2469, 0, 0, 2458, 0, 2478, - 0, 0, 2479, 0, 2476, 2475, 0, 2476, 2474, 0, - 2486, 2514, 2514, 0, 2514, 2500, 2511, 2502, 2504, 2504, - 2510, 0, 0, 2524, 0, 2507, 2513, 2525, 2509, 2512, - 0, 2517, 2529, 2525, 2526, 2531, 2528, 0, 2524, 2521, - 0, 0, 0, 2525, 2558, 2567, 0, 2566, 0, 0, - 0, 2550, 2550, 2554, 2559, 2569, 2561, 2567, 2573, 0, - - 0, 2573, 0, 2570, 0, 2575, 0, 0, 2578, 0, - 0, 0, 0, 2567, 0, 0, 0, 0, 0, 0, - 2582, 0, 0, 2566, 2571, 2568, 2578, 2566, 2569, 2570, - 2590, 0, 0, 0, 2587, 2607, 2600, 0, 0, 2614, - 0, 2613, 2603, 0, 2605, 0, 0, 2618, 0, 2622, - 2623, 0, 0, 2608, 2610, 2615, 0, 0, 2630, 2620, - 0, 2630, 0, 0, 2620, 0, 2634, 0, 0, 0, - 0, 2631, 2618, 0, 0, 0, 2617, 2638, 2628, 2629, - 2631, 0, 2642, 2640, 0, 2653, 2656, 2672, 2673, 0, - 0, 2655, 2657, 0, 2657, 2677, 2670, 2660, 0, 0, - - 0, 0, 2663, 0, 2679, 2668, 2683, 2682, 0, 2677, - 2673, 2685, 2675, 2671, 2686, 0, 2691, 2673, 0, 0, - 2679, 0, 2681, 2691, 0, 2705, 0, 2712, 0, 0, - 2716, 2711, 2722, 2719, 2704, 2710, 0, 2726, 2723, 2728, - 2728, 0, 2726, 2710, 0, 0, 2732, 0, 2726, 2721, - 2731, 2721, 0, 2730, 2725, 0, 2730, 2731, 2725, 2742, - 0, 2736, 0, 0, 0, 2763, 2773, 2772, 0, 0, - 2758, 2761, 0, 0, 0, 2766, 2767, 0, 2781, 0, - 0, 0, 0, 0, 2770, 2783, 2771, 2782, 2769, 0, - 0, 2772, 2775, 0, 2775, 0, 2782, 0, 2777, 0, - - 2784, 2781, 0, 0, 2791, 2791, 2777, 0, 0, 0, - 2794, 0, 2780, 0, 0, 2795, 2822, 0, 2823, 0, - 0, 2815, 2818, 0, 2819, 0, 2823, 0, 2813, 0, - 2820, 2820, 2822, 2834, 2837, 0, 2825, 2835, 0, 0, - 0, 0, 2822, 2821, 0, 0, 2842, 0, 0, 2830, - 0, 0, 2833, 2843, 0, 0, 2835, 2834, 0, 0, - 2824, 2829, 0, 0, 2832, 0, 2907, 73, 2894, 2896, - 2898, 2900, 2902, 2904 + 0, 0, 172, 2049, 152, 0, 0, 0, 2052, 2109, + 2118, 2126, 2135, 2143, 2190, 0, 0, 2064, 2066, 2054, + 0, 2122, 2140, 2131, 2143, 0, 0, 0, 2140, 2128, + 0, 2131, 0, 2146, 2127, 0, 2134, 2139, 2146, 2147, + 2165, 2149, 2167, 2176, 2181, 2177, 2180, 2184, 2195, 2196, + 0, 2200, 2185, 2190, 2191, 2187, 2188, 2203, 2189, 2210, + 2203, 0, 2213, 2210, 2208, 2199, 2209, 2211, 2242, 0, + 2236, 2244, 2245, 0, 2231, 2238, 2233, 2234, 2236, 2256, + 2243, 2244, 0, 2242, 0, 2243, 0, 0, 2242, 0, + + 2254, 2244, 2256, 2254, 2258, 2263, 2251, 2250, 2262, 2255, + 2292, 2285, 0, 2297, 2293, 2283, 0, 2286, 0, 2297, + 0, 2288, 2302, 0, 2284, 2303, 2292, 0, 2304, 2308, + 2289, 0, 2300, 2312, 2302, 2312, 0, 2304, 2301, 2302, + 2301, 2308, 2303, 0, 2306, 2333, 0, 0, 2349, 0, + 2349, 2350, 2350, 2341, 2354, 2339, 2341, 0, 2357, 2343, + 2359, 0, 2351, 2345, 0, 2351, 2363, 2351, 0, 2347, + 2364, 0, 2365, 2370, 2365, 0, 2353, 0, 2360, 2355, + 2371, 0, 2399, 0, 0, 0, 0, 0, 2396, 2385, + 2401, 2402, 2403, 0, 2390, 2397, 0, 2410, 0, 2408, + + 2405, 2409, 2395, 2400, 2409, 2414, 2414, 2415, 0, 2403, + 2407, 2399, 2421, 0, 0, 0, 2420, 2163, 2460, 2468, + 2476, 0, 2484, 2512, 0, 2460, 2479, 2480, 2471, 0, + 0, 0, 2486, 2484, 2478, 2485, 0, 0, 2475, 0, + 2494, 0, 0, 2495, 0, 2492, 2491, 0, 2492, 2490, + 0, 2529, 2531, 2530, 2532, 0, 2531, 2517, 2528, 2519, + 2521, 2521, 2527, 0, 0, 2541, 0, 2524, 2530, 2544, + 2528, 2530, 0, 2535, 2548, 2544, 2545, 2550, 2573, 0, + 2569, 2566, 0, 0, 0, 2570, 2577, 2586, 0, 2585, + 0, 0, 0, 2569, 2569, 2573, 2578, 2588, 2580, 2586, + + 2592, 0, 0, 2592, 0, 2589, 0, 2594, 0, 0, + 2597, 0, 0, 0, 0, 2586, 0, 0, 0, 0, + 0, 0, 2601, 0, 0, 2585, 2590, 2587, 2597, 2585, + 2614, 2615, 2635, 0, 0, 0, 2632, 2626, 2619, 0, + 0, 2633, 0, 2632, 2622, 0, 2624, 0, 0, 2637, + 0, 2641, 2642, 0, 0, 2627, 2629, 2634, 0, 0, + 2649, 2639, 0, 2649, 0, 0, 2639, 0, 2653, 0, + 0, 0, 0, 2650, 2637, 0, 0, 0, 2636, 2657, + 2647, 2674, 2676, 0, 2687, 2685, 0, 2672, 2675, 2691, + 2692, 2693, 2694, 2693, 0, 0, 2677, 2679, 0, 2679, + + 2699, 2692, 2682, 0, 0, 0, 0, 2685, 0, 2701, + 2690, 2705, 2704, 0, 2699, 2696, 2708, 2724, 2720, 2735, + 0, 2740, 2722, 0, 0, 2728, 0, 2730, 2740, 0, + 2728, 0, 2735, 0, 0, 2739, 2734, 2745, 2742, 2727, + 2733, 0, 2749, 2746, 2751, 2751, 0, 2749, 2733, 0, + 0, 2755, 0, 2749, 2744, 2754, 2770, 0, 2779, 2774, + 0, 2779, 2780, 2774, 2791, 0, 2785, 0, 0, 0, + 2786, 2796, 2782, 2785, 2801, 2802, 2799, 0, 0, 2785, + 2788, 0, 0, 0, 2793, 2794, 0, 2808, 0, 0, + 0, 0, 0, 2797, 2810, 2798, 2809, 2796, 0, 0, + + 2799, 2828, 0, 2828, 0, 2835, 0, 2830, 0, 2837, + 2834, 0, 0, 2844, 2844, 2830, 0, 0, 0, 2847, + 0, 2833, 0, 0, 2848, 2849, 0, 0, 2843, 2853, + 0, 2852, 0, 0, 2844, 2847, 0, 2848, 0, 2852, + 0, 2842, 0, 2849, 2849, 2851, 2863, 2866, 0, 2880, + 2890, 0, 0, 0, 0, 2891, 2892, 2879, 2878, 0, + 0, 2899, 0, 0, 2887, 0, 0, 2890, 2900, 0, + 0, 0, 0, 2892, 2891, 0, 0, 2881, 2886, 0, + 0, 2889, 0, 2964, 73, 2951, 2953, 2955, 2957, 2959, + 2961 + } ; -static yyconst flex_int16_t yy_def[1275] = +static yyconst flex_int16_t yy_def[1292] = { 0, - 1267, 1, 1267, 1267, 1267, 1267, 1268, 1269, 1270, 1268, - 1268, 1268, 12, 12, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1271, 1267, 1268, 1272, 1269, 1268, 1273, 1270, 1268, 1268, - 12, 1268, 1268, 12, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1274, 1271, - - 1268, 1267, 1267, 1268, 204, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 59, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1267, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1267, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, 1268, - 1268, 1268, 1268, 1268, 1268, 1268, 0, 1267, 1267, 1267, - 1267, 1267, 1267, 1267 + 1284, 1, 1284, 1284, 1284, 1284, 1285, 1286, 1287, 1285, + 1285, 1285, 12, 12, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1288, 1284, 1285, 1289, 1286, 1285, 1290, 1287, 1285, 1285, + 12, 1285, 1285, 12, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1291, 1288, + + 1285, 1284, 1284, 1285, 204, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 59, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1284, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1284, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, + 1285, 1285, 1285, 0, 1284, 1284, 1284, 1284, 1284, 1284, + 1284 + } ; -static yyconst flex_int16_t yy_nxt[2979] = +static yyconst flex_int16_t yy_nxt[3036] = { 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 13, 14, 13, 13, 13, 13, 7, 15, 16, 17, @@ -824,12 +832,12 @@ static yyconst flex_int16_t yy_nxt[2979] = 54, 54, 54, 54, 54, 54, 54, 54, 55, 43, 60, 94, 56, 57, 117, 95, 58, 129, 118, 96, 157, 182, 119, 183, 194, 43, 184, 216, 120, 97, - 43, 217, 59, 850, 851, 43, 60, 94, 56, 57, + 43, 217, 59, 851, 852, 43, 60, 94, 56, 57, 117, 95, 58, 129, 118, 96, 157, 182, 119, 183, 194, 43, 184, 216, 120, 97, 43, 217, 59, 61, - 185, 221, 915, 112, 186, 192, 62, 113, 187, 63, + 185, 221, 916, 112, 186, 192, 62, 113, 187, 63, 64, 65, 225, 66, 114, 67, 68, 193, 69, 70, - 115, 71, 913, 72, 816, 61, 185, 221, 116, 112, + 115, 71, 914, 72, 817, 61, 185, 221, 116, 112, 186, 192, 62, 113, 187, 63, 64, 65, 225, 66, 114, 67, 68, 193, 69, 70, 115, 71, 226, 72, @@ -857,24 +865,24 @@ static yyconst flex_int16_t yy_nxt[2979] = 258, 251, 109, 252, 195, 110, 229, 161, 111, 121, 122, 244, 196, 162, 197, 123, 240, 245, 198, 124, 125, 256, 254, 241, 126, 257, 127, 128, 42, 242, - 195, 1267, 265, 201, 1267, 121, 122, 244, 196, 255, + 195, 1284, 265, 201, 1284, 121, 122, 244, 196, 255, 197, 123, 240, 245, 198, 124, 125, 256, 254, 241, 126, 257, 127, 149, 248, 242, 249, 150, 265, 266, 151, 152, 250, 279, 153, 255, 282, 154, 283, 267, - 155, 1267, 290, 156, 1267, 280, 1267, 284, 1267, 149, - 248, 1267, 249, 150, 285, 266, 151, 152, 250, 279, + 155, 1284, 290, 156, 1284, 280, 1284, 284, 1284, 149, + 248, 1284, 249, 150, 285, 266, 151, 152, 250, 279, 153, 286, 282, 154, 283, 267, 155, 268, 290, 156, 163, 280, 164, 284, 165, 271, 272, 166, 167, 287, 285, 168, 169, 269, 170, 270, 171, 286, 172, 173, - 174, 291, 292, 268, 175, 1267, 163, 1267, 164, 1267, + 174, 291, 292, 268, 175, 1284, 163, 1284, 164, 1284, 165, 271, 272, 166, 167, 287, 288, 168, 169, 269, - 170, 270, 171, 293, 172, 173, 174, 291, 292, 1267, + 170, 270, 171, 293, 172, 173, 174, 291, 292, 1284, 175, 176, 294, 300, 289, 177, 302, 301, 178, 295, 307, 303, 288, 304, 305, 179, 308, 296, 180, 293, - 318, 297, 319, 306, 320, 181, 1267, 176, 294, 300, - 289, 177, 302, 301, 178, 295, 307, 303, 1267, 304, - 305, 179, 308, 296, 180, 1267, 318, 297, 319, 306, + 318, 297, 319, 306, 320, 181, 1284, 176, 294, 300, + 289, 177, 302, 301, 178, 295, 307, 303, 1284, 304, + 305, 179, 308, 296, 180, 1284, 318, 297, 319, 306, 320, 181, 204, 204, 204, 204, 204, 204, 204, 204, 205, 51, 51, 51, 51, 51, 51, 51, 51, 210, @@ -882,37 +890,37 @@ static yyconst flex_int16_t yy_nxt[2979] = 211, 211, 211, 211, 211, 311, 321, 206, 322, 324, 312, 323, 212, 43, 213, 213, 213, 213, 213, 213, 213, 213, 214, 214, 214, 214, 214, 214, 214, 214, - 1267, 311, 321, 206, 322, 324, 312, 323, 325, 43, + 1284, 311, 321, 206, 322, 324, 312, 323, 325, 43, 52, 52, 52, 52, 52, 52, 52, 52, 327, 328, 343, 344, 207, 208, 211, 211, 211, 211, 211, 211, - 211, 211, 309, 313, 325, 329, 1267, 1267, 347, 360, + 211, 211, 309, 313, 325, 329, 1284, 1284, 347, 360, 310, 314, 361, 330, 327, 328, 343, 344, 207, 208, 52, 52, 52, 52, 52, 52, 52, 52, 309, 313, - 1267, 329, 209, 57, 347, 360, 310, 314, 361, 330, + 1284, 329, 209, 57, 347, 360, 310, 314, 361, 330, 210, 210, 210, 210, 210, 210, 210, 210, 458, 331, - 345, 362, 346, 315, 332, 333, 316, 1267, 209, 57, + 345, 362, 346, 315, 332, 333, 316, 1284, 209, 57, 215, 215, 215, 215, 215, 215, 215, 215, 317, 215, 215, 215, 215, 215, 215, 331, 345, 362, 346, 315, - 332, 333, 316, 334, 1267, 335, 363, 1267, 364, 336, - 365, 1267, 356, 357, 317, 215, 215, 215, 215, 215, + 332, 333, 316, 334, 1284, 335, 363, 1284, 364, 336, + 365, 1284, 356, 357, 317, 215, 215, 215, 215, 215, 215, 259, 260, 261, 262, 263, 352, 353, 348, 334, 264, 335, 363, 354, 364, 336, 365, 355, 356, 357, - 366, 1267, 370, 349, 350, 1267, 351, 259, 260, 261, - 262, 263, 352, 353, 348, 358, 264, 273, 1267, 354, + 366, 1284, 370, 349, 350, 1284, 351, 259, 260, 261, + 262, 263, 352, 353, 348, 358, 264, 273, 1284, 354, 373, 274, 275, 355, 359, 374, 366, 276, 370, 349, - 350, 277, 351, 367, 371, 278, 1267, 368, 369, 1267, - 1267, 358, 382, 273, 372, 383, 373, 274, 275, 1267, - 359, 374, 1267, 276, 389, 375, 1267, 277, 376, 367, + 350, 277, 351, 367, 371, 278, 1284, 368, 369, 1284, + 1284, 358, 382, 273, 372, 383, 373, 274, 275, 1284, + 359, 374, 1284, 276, 389, 375, 1284, 277, 376, 367, 371, 278, 337, 368, 369, 377, 338, 392, 382, 378, 372, 383, 379, 384, 410, 339, 380, 340, 341, 342, - 389, 375, 381, 385, 376, 386, 1267, 393, 337, 394, + 389, 375, 381, 385, 376, 386, 1284, 393, 337, 394, - 1267, 377, 338, 392, 387, 378, 395, 388, 379, 384, - 410, 339, 380, 340, 341, 342, 1267, 390, 381, 385, - 396, 386, 391, 393, 399, 394, 413, 1267, 397, 400, - 387, 1267, 395, 388, 398, 417, 418, 401, 407, 403, + 1284, 377, 338, 392, 387, 378, 395, 388, 379, 384, + 410, 339, 380, 340, 341, 342, 1284, 390, 381, 385, + 396, 386, 391, 393, 399, 394, 413, 1284, 397, 400, + 387, 1284, 395, 388, 398, 417, 418, 401, 407, 403, 411, 402, 412, 390, 414, 408, 396, 404, 391, 419, 399, 405, 413, 406, 397, 400, 415, 409, 420, 416, 398, 417, 418, 401, 407, 403, 411, 402, 412, 421, @@ -921,25 +929,25 @@ static yyconst flex_int16_t yy_nxt[2979] = 433, 436, 437, 438, 434, 421, 440, 442, 425, 439, 422, 435, 423, 443, 431, 444, 427, 426, 430, 445, - 1267, 441, 432, 424, 429, 428, 433, 436, 437, 438, + 1284, 441, 432, 424, 429, 428, 433, 436, 437, 438, 434, 448, 440, 442, 449, 439, 446, 435, 450, 443, 451, 444, 452, 453, 430, 445, 447, 441, 199, 199, - 199, 209, 57, 1267, 461, 1267, 1267, 448, 1267, 1267, - 449, 1267, 446, 462, 450, 206, 451, 1267, 452, 453, - 1267, 1267, 447, 1267, 1267, 1267, 1267, 209, 57, 456, + 199, 209, 57, 1284, 461, 1284, 1284, 448, 1284, 1284, + 449, 1284, 446, 462, 450, 206, 451, 1284, 452, 453, + 1284, 1284, 447, 1284, 1284, 1284, 1284, 209, 57, 456, 461, 457, 457, 457, 457, 457, 457, 457, 457, 462, 463, 206, 211, 211, 211, 211, 211, 211, 211, 211, 213, 213, 213, 213, 213, 213, 213, 213, 464, 465, 466, 467, 468, 459, 471, 473, 463, 474, 201, 204, - 204, 204, 204, 204, 204, 204, 204, 1267, 472, 475, - 476, 207, 208, 1267, 464, 465, 466, 467, 468, 459, + 204, 204, 204, 204, 204, 204, 204, 1284, 472, 475, + 476, 207, 208, 1284, 464, 465, 466, 467, 468, 459, 471, 473, 477, 474, 479, 455, 213, 213, 213, 213, 213, 213, 213, 213, 472, 475, 476, 207, 208, 214, 214, 214, 214, 214, 214, 214, 214, 469, 477, 480, 479, 455, 481, 470, 482, 483, 484, 485, 486, 487, 460, 488, 489, 490, 491, 492, 493, 494, 495, 496, - 497, 498, 499, 469, 500, 480, 501, 1267, 481, 470, + 497, 498, 499, 469, 500, 480, 501, 1284, 481, 470, 482, 483, 484, 485, 486, 487, 460, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 502, @@ -950,7 +958,7 @@ static yyconst flex_int16_t yy_nxt[2979] = 516, 514, 517, 518, 519, 520, 521, 522, 523, 524, 525, 528, 526, 529, 527, 530, 531, 532, 533, 534, 535, 536, 540, 537, 541, 542, 543, 544, 545, 546, - 538, 547, 548, 549, 550, 1267, 553, 528, 539, 529, + 538, 547, 548, 549, 550, 1284, 553, 528, 539, 529, 554, 530, 531, 532, 533, 534, 535, 536, 540, 537, 541, 542, 543, 544, 545, 546, 538, 547, 548, 549, @@ -961,7 +969,7 @@ static yyconst flex_int16_t yy_nxt[2979] = 563, 565, 566, 567, 569, 570, 564, 571, 572, 573, 574, 575, 576, 580, 577, 581, 578, 582, 579, 583, 584, 585, 587, 586, 588, 589, 590, 591, 592, 593, - 594, 595, 1267, 599, 600, 601, 602, 603, 604, 580, + 594, 595, 1284, 599, 600, 601, 602, 603, 604, 580, 607, 581, 608, 582, 609, 583, 584, 585, 587, 586, 588, 589, 590, 591, 592, 593, 594, 595, 596, 599, @@ -980,13 +988,13 @@ static yyconst flex_int16_t yy_nxt[2979] = 654, 659, 655, 660, 656, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671, 672, 673, 657, 674, 675, 676, 677, 678, 679, 658, 680, 659, 681, 660, - 1267, 661, 662, 663, 664, 665, 666, 667, 668, 669, + 1284, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671, 672, 673, 684, 674, 675, 676, 677, 678, 679, 685, 680, 713, 681, 682, 683, 457, 457, 457, - 457, 457, 457, 457, 457, 1267, 1267, 1267, 1267, 1267, - 684, 1267, 1267, 1267, 1267, 1267, 1267, 685, 1267, 713, + 457, 457, 457, 457, 457, 1284, 1284, 1284, 1284, 1284, + 684, 1284, 1284, 1284, 1284, 1284, 1284, 685, 1284, 713, - 1267, 682, 683, 43, 43, 43, 43, 43, 686, 43, + 1284, 682, 683, 43, 43, 43, 43, 43, 686, 43, 43, 43, 43, 43, 43, 43, 43, 687, 688, 689, 690, 691, 692, 693, 694, 695, 696, 697, 698, 699, 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, @@ -995,151 +1003,158 @@ static yyconst flex_int16_t yy_nxt[2979] = 704, 705, 706, 707, 708, 709, 710, 711, 712, 43, 43, 714, 716, 717, 718, 719, 457, 457, 457, 457, 457, 457, 457, 457, 720, 721, 721, 721, 721, 721, - 721, 721, 721, 1267, 726, 727, 728, 714, 716, 717, + 721, 721, 721, 1284, 726, 727, 728, 714, 716, 717, 718, 719, 722, 723, 723, 723, 723, 723, 723, 723, 723, 724, 725, 725, 725, 725, 725, 725, 725, 725, 726, 727, 728, 729, 730, 731, 732, 733, 734, 735, 736, 737, 738, 739, 740, 742, 743, 744, 745, 746, - 747, 748, 1267, 751, 752, 753, 754, 755, 756, 729, + 747, 748, 1284, 751, 752, 753, 754, 755, 756, 729, 730, 731, 732, 733, 734, 735, 736, 737, 738, 739, 740, 742, 743, 744, 745, 746, 747, 748, 749, 751, 752, 753, 754, 755, 756, 757, 750, 759, 760, 761, - 762, 763, 764, 765, 768, 770, 771, 769, 758, 772, - 773, 774, 775, 776, 749, 1267, 779, 766, 780, 781, - - 767, 757, 750, 759, 760, 761, 762, 763, 764, 765, - 768, 770, 771, 769, 758, 772, 773, 774, 775, 776, - 782, 777, 779, 766, 780, 781, 767, 778, 783, 784, - 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, - 795, 796, 797, 798, 799, 800, 782, 777, 801, 802, - 803, 804, 805, 778, 783, 784, 785, 786, 787, 788, - 789, 790, 791, 792, 793, 794, 795, 796, 797, 798, - 799, 800, 806, 807, 801, 802, 803, 804, 805, 808, - 809, 811, 812, 813, 814, 815, 817, 818, 819, 820, - 810, 821, 822, 823, 824, 825, 826, 827, 806, 807, - - 828, 829, 830, 831, 832, 808, 809, 811, 812, 813, - 814, 815, 817, 818, 819, 820, 810, 821, 822, 823, - 824, 825, 826, 827, 833, 834, 828, 829, 830, 831, - 832, 835, 836, 837, 838, 839, 840, 841, 842, 843, - 844, 845, 846, 847, 848, 849, 852, 853, 854, 855, - 833, 834, 856, 857, 858, 859, 860, 835, 836, 837, - 838, 839, 840, 841, 842, 843, 844, 845, 846, 847, - 848, 849, 852, 853, 854, 855, 861, 862, 856, 857, - 858, 859, 860, 864, 865, 866, 867, 868, 869, 870, - 871, 872, 873, 874, 875, 876, 877, 863, 878, 879, - - 880, 881, 861, 862, 882, 883, 884, 885, 886, 864, - 865, 866, 867, 868, 869, 870, 871, 872, 873, 874, - 875, 876, 877, 863, 878, 879, 880, 881, 887, 888, - 882, 883, 884, 885, 886, 889, 890, 891, 892, 893, - 895, 894, 896, 897, 898, 1267, 901, 902, 903, 904, - 905, 906, 907, 899, 887, 888, 908, 909, 910, 1267, - 914, 889, 890, 891, 892, 893, 895, 894, 896, 897, - 898, 900, 901, 902, 903, 904, 905, 906, 907, 899, - 916, 911, 908, 909, 910, 912, 914, 917, 917, 917, - 917, 917, 917, 917, 917, 1267, 1267, 900, 919, 919, - - 919, 919, 919, 919, 919, 919, 916, 911, 1267, 1267, - 1267, 912, 918, 721, 721, 721, 721, 721, 721, 721, - 721, 920, 723, 723, 723, 723, 723, 723, 723, 723, - 922, 922, 922, 922, 922, 922, 922, 922, 925, 926, - 927, 928, 929, 930, 931, 932, 933, 934, 935, 921, - 917, 917, 917, 917, 917, 917, 917, 917, 1267, 936, - 937, 938, 939, 940, 925, 926, 927, 928, 929, 930, - 931, 932, 933, 934, 935, 921, 923, 725, 725, 725, - 725, 725, 725, 725, 725, 936, 937, 938, 939, 940, - 941, 942, 943, 944, 945, 946, 947, 948, 949, 950, - - 1267, 954, 955, 956, 924, 957, 1267, 958, 959, 960, - 961, 962, 963, 964, 965, 951, 941, 942, 943, 944, - 945, 946, 947, 948, 949, 950, 952, 954, 955, 956, - 924, 957, 953, 958, 959, 960, 961, 962, 963, 964, - 965, 951, 966, 967, 968, 969, 970, 971, 972, 973, - 974, 975, 952, 976, 977, 978, 979, 980, 953, 981, - 982, 983, 984, 985, 986, 987, 988, 989, 966, 967, - 968, 969, 970, 971, 972, 973, 974, 975, 990, 976, - 977, 978, 979, 980, 991, 981, 982, 983, 984, 985, - 986, 987, 988, 989, 992, 993, 994, 995, 996, 997, - - 998, 999, 1000, 1001, 990, 1002, 1003, 1004, 1005, 1006, - 991, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, - 992, 993, 994, 995, 996, 997, 998, 999, 1000, 1001, - 1016, 1002, 1003, 1004, 1005, 1006, 1017, 1007, 1008, 1009, - 1010, 1011, 1012, 1013, 1014, 1015, 1018, 1019, 1020, 1021, - 1022, 1023, 1024, 1025, 1026, 1027, 1016, 1028, 1029, 1030, - 1031, 1032, 1017, 1033, 1034, 1035, 1036, 1037, 1038, 1039, - 1040, 1041, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, - 1026, 1027, 1042, 1028, 1029, 1030, 1031, 1032, 1043, 1033, - 1034, 1035, 1036, 1037, 1038, 1039, 1040, 1041, 1044, 1045, - - 1046, 1047, 1048, 1049, 1050, 1051, 1052, 1053, 1042, 1054, - 1055, 1056, 1057, 1058, 1043, 1059, 1060, 1061, 1062, 1063, - 1064, 1065, 1066, 1067, 1044, 1045, 1046, 1047, 1048, 1049, - 1050, 1051, 1052, 1053, 1068, 1054, 1055, 1056, 1057, 1058, - 1267, 1059, 1060, 1061, 1062, 1063, 1064, 1065, 1066, 1067, - 917, 917, 917, 917, 917, 917, 917, 917, 1267, 1071, - 1068, 919, 919, 919, 919, 919, 919, 919, 919, 919, - 919, 919, 919, 919, 919, 919, 919, 922, 922, 922, - 922, 922, 922, 922, 922, 1071, 1267, 1072, 1069, 1073, - 1074, 1075, 1076, 1077, 1078, 1079, 921, 1080, 1081, 1082, - - 1083, 1084, 1085, 1086, 1070, 922, 922, 922, 922, 922, - 922, 922, 922, 1072, 1069, 1073, 1074, 1075, 1076, 1077, - 1078, 1079, 921, 1080, 1081, 1082, 1083, 1084, 1085, 1086, - 1070, 1087, 924, 1088, 1090, 1091, 1092, 1093, 1094, 1095, - 1096, 1097, 1098, 1099, 1100, 1101, 1089, 1102, 1103, 1104, - 1105, 1106, 1107, 1108, 1109, 1110, 1111, 1087, 924, 1088, - 1090, 1091, 1092, 1093, 1094, 1095, 1096, 1097, 1098, 1099, - 1100, 1101, 1089, 1102, 1103, 1104, 1105, 1106, 1107, 1108, - 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1118, + 762, 764, 765, 763, 1284, 771, 769, 1284, 758, 770, + 772, 773, 774, 775, 749, 776, 766, 777, 780, 781, + + 1284, 757, 750, 759, 760, 761, 762, 764, 765, 763, + 767, 771, 769, 768, 758, 770, 772, 773, 774, 775, + 778, 776, 766, 777, 780, 781, 779, 782, 783, 784, + 785, 786, 787, 788, 789, 790, 767, 791, 792, 768, + 793, 794, 795, 796, 797, 798, 778, 799, 800, 801, + 802, 803, 779, 782, 783, 784, 785, 786, 787, 788, + 789, 790, 804, 791, 792, 805, 793, 794, 795, 796, + 797, 798, 806, 799, 800, 801, 802, 803, 807, 808, + 809, 812, 810, 813, 814, 815, 816, 818, 804, 819, + 820, 805, 811, 821, 822, 823, 824, 825, 806, 826, + + 827, 828, 829, 830, 807, 808, 809, 812, 810, 813, + 814, 815, 816, 818, 831, 819, 820, 832, 811, 821, + 822, 823, 824, 825, 833, 826, 827, 828, 829, 830, + 834, 835, 836, 837, 838, 839, 840, 841, 842, 843, + 831, 844, 845, 832, 846, 847, 848, 849, 850, 853, + 833, 854, 855, 856, 857, 858, 834, 835, 836, 837, + 838, 839, 840, 841, 842, 843, 859, 844, 845, 860, + 846, 847, 848, 849, 850, 853, 861, 854, 855, 856, + 857, 858, 862, 863, 865, 866, 867, 868, 869, 870, + 871, 872, 859, 873, 874, 860, 875, 876, 877, 878, + + 879, 880, 861, 864, 881, 882, 883, 884, 862, 863, + 865, 866, 867, 868, 869, 870, 871, 872, 885, 873, + 874, 886, 875, 876, 877, 878, 879, 880, 887, 864, + 881, 882, 883, 884, 888, 889, 890, 891, 892, 893, + 894, 896, 895, 897, 885, 898, 899, 886, 902, 903, + 904, 905, 900, 906, 887, 907, 908, 909, 910, 911, + 888, 889, 890, 891, 892, 893, 894, 896, 895, 897, + 901, 898, 899, 915, 902, 903, 904, 905, 900, 906, + 917, 907, 908, 909, 910, 911, 912, 926, 927, 928, + 913, 1284, 1284, 1284, 1284, 1284, 901, 1284, 1284, 915, + + 1284, 1284, 1284, 1284, 1284, 1284, 917, 1284, 1284, 1284, + 1284, 1284, 912, 926, 927, 928, 913, 918, 918, 918, + 918, 918, 918, 918, 918, 919, 721, 721, 721, 721, + 721, 721, 721, 721, 920, 920, 920, 920, 920, 920, + 920, 920, 921, 723, 723, 723, 723, 723, 723, 723, + 723, 923, 923, 923, 923, 923, 923, 923, 923, 929, + 930, 931, 932, 933, 934, 935, 936, 937, 938, 939, + 922, 918, 918, 918, 918, 918, 918, 918, 918, 1284, + 940, 941, 942, 943, 944, 929, 930, 931, 932, 933, + 934, 935, 936, 937, 938, 939, 922, 924, 725, 725, + + 725, 725, 725, 725, 725, 725, 940, 941, 942, 943, + 944, 945, 946, 947, 948, 949, 950, 951, 952, 955, + 956, 957, 958, 959, 960, 925, 961, 962, 963, 953, + 964, 965, 966, 967, 968, 954, 969, 945, 946, 947, + 948, 949, 950, 951, 952, 955, 956, 957, 958, 959, + 960, 925, 961, 962, 963, 953, 964, 965, 966, 967, + 968, 954, 969, 970, 971, 972, 973, 974, 975, 976, + 977, 978, 979, 980, 981, 982, 983, 984, 985, 986, + 987, 988, 989, 990, 991, 992, 993, 994, 995, 970, + 971, 972, 973, 974, 975, 976, 977, 978, 979, 980, + + 981, 982, 983, 984, 985, 986, 987, 988, 989, 990, + 991, 992, 993, 994, 995, 996, 997, 998, 999, 1000, + 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, + 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, + 1021, 996, 997, 998, 999, 1000, 1001, 1002, 1003, 1004, + 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, + 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, + 1025, 1026, 1027, 1028, 1029, 1030, 1031, 1032, 1033, 1034, + 1035, 1036, 1037, 1038, 1039, 1040, 1041, 1042, 1043, 1044, + 1045, 1046, 1047, 1022, 1023, 1024, 1025, 1026, 1027, 1028, + + 1029, 1030, 1031, 1032, 1033, 1034, 1035, 1036, 1037, 1038, + 1039, 1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047, 1048, + 1049, 1050, 1051, 1052, 1053, 1054, 1055, 1056, 1057, 1058, + 1059, 1060, 1061, 1062, 1063, 1064, 1065, 1066, 1067, 1068, + 1069, 1070, 1284, 1284, 1284, 1048, 1049, 1050, 1051, 1052, + 1053, 1054, 1055, 1056, 1057, 1058, 1059, 1060, 1061, 1062, + 1063, 1064, 1065, 1066, 1067, 1068, 1069, 1070, 918, 918, + 918, 918, 918, 918, 918, 918, 920, 920, 920, 920, + 920, 920, 920, 920, 920, 920, 920, 920, 920, 920, + 920, 920, 923, 923, 923, 923, 923, 923, 923, 923, + + 1284, 1284, 1073, 1071, 1074, 1075, 1076, 1077, 1078, 1079, + 1080, 922, 1081, 1082, 1083, 1084, 1085, 1086, 1087, 1072, + 923, 923, 923, 923, 923, 923, 923, 923, 1073, 1071, + 1074, 1075, 1076, 1077, 1078, 1079, 1080, 922, 1081, 1082, + 1083, 1084, 1085, 1086, 1087, 1072, 1088, 925, 1089, 1090, + 1092, 1095, 1096, 1097, 1098, 1099, 1100, 1101, 1102, 1103, + 1104, 1093, 1091, 1105, 1106, 1107, 1108, 1094, 1109, 1110, + 1111, 1112, 1088, 925, 1089, 1090, 1092, 1095, 1096, 1097, + 1098, 1099, 1100, 1101, 1102, 1103, 1104, 1093, 1091, 1105, + 1106, 1107, 1108, 1094, 1109, 1110, 1111, 1112, 1113, 1114, + + 1115, 1116, 1117, 1118, 1119, 1120, 1121, 1122, 1123, 1124, + 1125, 1126, 1127, 1128, 1129, 1130, 1131, 1132, 1133, 1134, + 1135, 1136, 1137, 1138, 1113, 1114, 1115, 1116, 1117, 1118, 1119, 1120, 1121, 1122, 1123, 1124, 1125, 1126, 1127, 1128, - - 1129, 1130, 1131, 1132, 1133, 1134, 1135, 1136, 1137, 1112, - 1113, 1114, 1115, 1116, 1117, 1118, 1119, 1120, 1121, 1122, - 1123, 1124, 1125, 1126, 1127, 1128, 1129, 1130, 1131, 1132, - 1133, 1134, 1135, 1136, 1137, 1138, 1139, 1140, 1141, 1142, + 1129, 1130, 1131, 1132, 1133, 1134, 1135, 1136, 1137, 1138, + 1139, 1140, 1141, 1142, 1143, 1144, 1145, 1146, 1147, 1148, + 1149, 1150, 1151, 1152, 1153, 1154, 1155, 1156, 1157, 1158, + 1159, 1160, 1161, 1162, 1163, 1164, 1139, 1140, 1141, 1142, 1143, 1144, 1145, 1146, 1147, 1148, 1149, 1150, 1151, 1152, 1153, 1154, 1155, 1156, 1157, 1158, 1159, 1160, 1161, 1162, - 1163, 1138, 1139, 1140, 1141, 1142, 1143, 1144, 1145, 1146, - 1147, 1148, 1149, 1150, 1151, 1152, 1153, 1154, 1155, 1156, - 1157, 1158, 1159, 1160, 1161, 1162, 1163, 1164, 1165, 1166, - 1167, 1168, 1169, 1170, 1171, 1172, 1173, 1174, 1175, 1176, - - 1177, 1178, 1179, 1180, 1181, 1182, 1183, 1184, 1185, 1186, - 1187, 1188, 1189, 1164, 1165, 1166, 1167, 1168, 1169, 1170, - 1171, 1172, 1173, 1174, 1175, 1176, 1177, 1178, 1179, 1180, - 1181, 1182, 1183, 1184, 1185, 1186, 1187, 1188, 1189, 1190, + + 1163, 1164, 1165, 1166, 1167, 1168, 1169, 1170, 1171, 1172, + 1173, 1174, 1175, 1177, 1178, 1179, 1180, 1181, 1182, 1183, + 1184, 1185, 1186, 1187, 1188, 1176, 1189, 1190, 1165, 1166, + 1167, 1168, 1169, 1170, 1171, 1172, 1173, 1174, 1175, 1177, + 1178, 1179, 1180, 1181, 1182, 1183, 1184, 1185, 1186, 1187, + 1188, 1176, 1189, 1190, 1191, 1192, 1193, 1194, 1195, 1196, + 1197, 1198, 1199, 1200, 1201, 1202, 1203, 1204, 1205, 1206, + 1207, 1208, 1209, 1210, 1211, 1212, 1213, 1214, 1215, 1216, 1191, 1192, 1193, 1194, 1195, 1196, 1197, 1198, 1199, 1200, 1201, 1202, 1203, 1204, 1205, 1206, 1207, 1208, 1209, 1210, - 1211, 1212, 1213, 1214, 1215, 1190, 1191, 1192, 1193, 1194, - 1195, 1196, 1197, 1198, 1199, 1200, 1201, 1202, 1203, 1204, - 1205, 1206, 1207, 1208, 1209, 1210, 1211, 1212, 1213, 1214, - 1215, 1216, 1217, 1218, 1219, 1220, 1221, 1222, 1223, 1224, + 1211, 1212, 1213, 1214, 1215, 1216, 1217, 1218, 1219, 1220, + 1221, 1222, 1223, 1224, 1225, 1226, 1227, 1228, 1229, 1230, + 1231, 1232, 1233, 1234, 1235, 1236, 1237, 1238, 1239, 1240, + 1241, 1242, 1217, 1218, 1219, 1220, 1221, 1222, 1223, 1224, 1225, 1226, 1227, 1228, 1229, 1230, 1231, 1232, 1233, 1234, - 1235, 1236, 1237, 1238, 1239, 1240, 1241, 1216, 1217, 1218, - 1219, 1220, 1221, 1222, 1223, 1224, 1225, 1226, 1227, 1228, - 1229, 1230, 1231, 1232, 1233, 1234, 1235, 1236, 1237, 1238, - 1239, 1240, 1241, 1242, 1243, 1244, 1245, 1246, 1247, 1248, + 1235, 1236, 1237, 1238, 1239, 1240, 1241, 1242, 1243, 1244, + 1245, 1246, 1247, 1248, 1249, 1250, 1251, 1252, 1253, 1254, + 1255, 1256, 1257, 1258, 1259, 1260, 1261, 1262, 1263, 1264, + 1265, 1266, 1267, 1268, 1243, 1244, 1245, 1246, 1247, 1248, 1249, 1250, 1251, 1252, 1253, 1254, 1255, 1256, 1257, 1258, - 1259, 1260, 1261, 1262, 1263, 1264, 1265, 1266, 1267, 1242, - 1243, 1244, 1245, 1246, 1247, 1248, 1249, 1250, 1251, 1252, - 1253, 1254, 1255, 1256, 1257, 1258, 1259, 1260, 1261, 1262, - 1263, 1264, 1265, 1266, 45, 45, 48, 48, 200, 200, - - 44, 44, 47, 47, 199, 199, 3, 1267, 1267, 1267, - 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, - 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, - 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, - 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, - 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, - 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, - 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267 + + 1259, 1260, 1261, 1262, 1263, 1264, 1265, 1266, 1267, 1268, + 1269, 1270, 1271, 1272, 1273, 1274, 1275, 1276, 1277, 1278, + 1279, 1280, 1281, 1282, 1283, 1284, 1284, 1284, 1284, 1284, + 1284, 1284, 1284, 1284, 1284, 1284, 1269, 1270, 1271, 1272, + 1273, 1274, 1275, 1276, 1277, 1278, 1279, 1280, 1281, 1282, + 1283, 45, 45, 48, 48, 200, 200, 44, 44, 47, + 47, 199, 199, 3, 1284, 1284, 1284, 1284, 1284, 1284, + 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, + 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, + 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, + + 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, + 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, + 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, + 1284, 1284, 1284, 1284, 1284 } ; -static yyconst flex_int16_t yy_chk[2979] = +static yyconst flex_int16_t yy_chk[3036] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1148,7 +1163,7 @@ static yyconst flex_int16_t yy_chk[2979] = 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, 8, 8, 8, 1268, 8, 9, 9, 9, 108, + 1, 8, 8, 8, 1285, 8, 9, 9, 9, 108, 108, 9, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 12, @@ -1336,138 +1351,145 @@ static yyconst flex_int16_t yy_chk[2979] = 465, 466, 467, 468, 469, 470, 471, 472, 473, 475, 477, 479, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 488, 496, 498, 499, - 502, 504, 505, 506, 507, 508, 510, 507, 495, 511, - 512, 514, 516, 517, 488, 0, 519, 506, 520, 521, - - 506, 495, 488, 496, 498, 499, 502, 504, 505, 506, - 507, 508, 510, 507, 495, 511, 512, 514, 516, 517, - 522, 518, 519, 506, 520, 521, 506, 518, 523, 524, - 525, 526, 528, 529, 531, 532, 533, 534, 535, 536, - 539, 540, 541, 543, 545, 547, 522, 518, 548, 549, - 550, 551, 554, 518, 523, 524, 525, 526, 528, 529, - 531, 532, 533, 534, 535, 536, 539, 540, 541, 543, - 545, 547, 555, 556, 548, 549, 550, 551, 554, 558, - 559, 560, 562, 563, 566, 567, 569, 570, 571, 572, - 559, 573, 575, 577, 578, 579, 580, 582, 555, 556, - - 583, 584, 585, 586, 587, 558, 559, 560, 562, 563, - 566, 567, 569, 570, 571, 572, 559, 573, 575, 577, - 578, 579, 580, 582, 589, 590, 583, 584, 585, 586, - 587, 593, 594, 597, 598, 600, 601, 603, 604, 605, - 606, 607, 608, 610, 611, 612, 614, 615, 616, 617, - 589, 590, 618, 619, 620, 621, 623, 593, 594, 597, - 598, 600, 601, 603, 604, 605, 606, 607, 608, 610, - 611, 612, 614, 615, 616, 617, 624, 625, 618, 619, - 620, 621, 623, 626, 627, 628, 629, 630, 631, 633, - 634, 635, 636, 637, 639, 641, 642, 625, 643, 644, - - 645, 646, 624, 625, 647, 648, 649, 651, 654, 626, - 627, 628, 629, 630, 631, 633, 634, 635, 636, 637, - 639, 641, 642, 625, 643, 644, 645, 646, 655, 656, - 647, 648, 649, 651, 654, 657, 658, 660, 661, 662, - 663, 662, 664, 665, 667, 0, 669, 670, 671, 675, - 676, 677, 678, 668, 655, 656, 680, 681, 682, 0, - 714, 657, 658, 660, 661, 662, 663, 662, 664, 665, - 667, 668, 669, 670, 671, 675, 676, 677, 678, 668, - 719, 683, 680, 681, 682, 683, 714, 720, 720, 720, - 720, 720, 720, 720, 720, 0, 0, 668, 722, 722, - - 722, 722, 722, 722, 722, 722, 719, 683, 0, 0, - 0, 683, 721, 721, 721, 721, 721, 721, 721, 721, - 721, 723, 723, 723, 723, 723, 723, 723, 723, 723, - 724, 724, 724, 724, 724, 724, 724, 724, 728, 729, - 730, 732, 733, 734, 735, 739, 740, 742, 744, 723, - 917, 917, 917, 917, 917, 917, 917, 917, 0, 745, - 747, 748, 749, 750, 728, 729, 730, 732, 733, 734, - 735, 739, 740, 742, 744, 723, 725, 725, 725, 725, - 725, 725, 725, 725, 725, 745, 747, 748, 749, 750, - 751, 752, 753, 754, 755, 756, 757, 758, 759, 760, - - 0, 763, 764, 765, 725, 766, 0, 767, 768, 769, - 770, 772, 773, 774, 775, 762, 751, 752, 753, 754, - 755, 756, 757, 758, 759, 760, 762, 763, 764, 765, - 725, 766, 762, 767, 768, 769, 770, 772, 773, 774, - 775, 762, 776, 777, 778, 780, 781, 782, 784, 785, - 786, 787, 762, 788, 788, 789, 790, 791, 762, 793, - 795, 798, 800, 801, 802, 803, 804, 805, 776, 777, - 778, 780, 781, 782, 784, 785, 786, 787, 806, 788, - 788, 789, 790, 791, 807, 793, 795, 798, 800, 801, - 802, 803, 804, 805, 808, 809, 810, 811, 813, 814, - - 815, 817, 819, 821, 806, 822, 824, 825, 826, 828, - 807, 829, 830, 832, 833, 834, 835, 837, 838, 839, - 808, 809, 810, 811, 813, 814, 815, 817, 819, 821, - 840, 822, 824, 825, 826, 828, 841, 829, 830, 832, - 833, 834, 835, 837, 838, 839, 842, 844, 845, 848, - 850, 851, 852, 853, 854, 855, 840, 856, 858, 859, - 860, 862, 841, 863, 865, 866, 867, 869, 870, 872, - 873, 874, 842, 844, 845, 848, 850, 851, 852, 853, - 854, 855, 876, 856, 858, 859, 860, 862, 878, 863, - 865, 866, 867, 869, 870, 872, 873, 874, 879, 880, - - 882, 888, 889, 890, 891, 892, 894, 895, 876, 897, - 899, 900, 901, 902, 878, 903, 904, 905, 906, 907, - 909, 910, 911, 912, 879, 880, 882, 888, 889, 890, - 891, 892, 894, 895, 916, 897, 899, 900, 901, 902, - 0, 903, 904, 905, 906, 907, 909, 910, 911, 912, - 918, 918, 918, 918, 918, 918, 918, 918, 0, 925, - 916, 919, 919, 919, 919, 919, 919, 919, 919, 920, - 920, 920, 920, 920, 920, 920, 920, 922, 922, 922, - 922, 922, 922, 922, 922, 925, 0, 926, 919, 927, - 928, 932, 933, 934, 935, 938, 920, 940, 943, 945, - - 946, 948, 949, 951, 922, 923, 923, 923, 923, 923, - 923, 923, 923, 926, 919, 927, 928, 932, 933, 934, - 935, 938, 920, 940, 943, 945, 946, 948, 949, 951, - 922, 952, 923, 953, 955, 956, 957, 958, 959, 960, - 961, 964, 966, 967, 968, 969, 953, 970, 972, 973, - 974, 975, 976, 977, 979, 980, 984, 952, 923, 953, - 955, 956, 957, 958, 959, 960, 961, 964, 966, 967, - 968, 969, 953, 970, 972, 973, 974, 975, 976, 977, - 979, 980, 984, 985, 986, 988, 992, 993, 994, 995, - 996, 997, 998, 999, 1002, 1004, 1006, 1009, 1014, 1021, - - 1024, 1025, 1026, 1027, 1028, 1029, 1030, 1031, 1035, 985, - 986, 988, 992, 993, 994, 995, 996, 997, 998, 999, - 1002, 1004, 1006, 1009, 1014, 1021, 1024, 1025, 1026, 1027, - 1028, 1029, 1030, 1031, 1035, 1036, 1037, 1040, 1042, 1043, - 1045, 1048, 1050, 1051, 1054, 1055, 1056, 1059, 1060, 1062, - 1065, 1067, 1072, 1073, 1077, 1078, 1079, 1080, 1081, 1083, - 1084, 1036, 1037, 1040, 1042, 1043, 1045, 1048, 1050, 1051, - 1054, 1055, 1056, 1059, 1060, 1062, 1065, 1067, 1072, 1073, - 1077, 1078, 1079, 1080, 1081, 1083, 1084, 1086, 1087, 1088, - 1089, 1092, 1093, 1095, 1096, 1097, 1098, 1103, 1105, 1106, - - 1107, 1108, 1110, 1111, 1112, 1113, 1114, 1115, 1117, 1118, - 1121, 1123, 1124, 1086, 1087, 1088, 1089, 1092, 1093, 1095, - 1096, 1097, 1098, 1103, 1105, 1106, 1107, 1108, 1110, 1111, - 1112, 1113, 1114, 1115, 1117, 1118, 1121, 1123, 1124, 1126, - 1128, 1131, 1132, 1133, 1134, 1135, 1136, 1138, 1139, 1140, - 1141, 1143, 1144, 1147, 1149, 1150, 1151, 1152, 1154, 1155, - 1157, 1158, 1159, 1160, 1162, 1126, 1128, 1131, 1132, 1133, - 1134, 1135, 1136, 1138, 1139, 1140, 1141, 1143, 1144, 1147, - 1149, 1150, 1151, 1152, 1154, 1155, 1157, 1158, 1159, 1160, - 1162, 1166, 1167, 1168, 1171, 1172, 1176, 1177, 1179, 1185, - - 1186, 1187, 1188, 1189, 1192, 1193, 1195, 1197, 1199, 1201, - 1202, 1205, 1206, 1207, 1211, 1213, 1216, 1166, 1167, 1168, - 1171, 1172, 1176, 1177, 1179, 1185, 1186, 1187, 1188, 1189, - 1192, 1193, 1195, 1197, 1199, 1201, 1202, 1205, 1206, 1207, - 1211, 1213, 1216, 1217, 1219, 1222, 1223, 1225, 1227, 1229, - 1231, 1232, 1233, 1234, 1235, 1237, 1238, 1243, 1244, 1247, - 1250, 1253, 1254, 1257, 1258, 1261, 1262, 1265, 0, 1217, - 1219, 1222, 1223, 1225, 1227, 1229, 1231, 1232, 1233, 1234, - 1235, 1237, 1238, 1243, 1244, 1247, 1250, 1253, 1254, 1257, - 1258, 1261, 1262, 1265, 1269, 1269, 1270, 1270, 1271, 1271, - - 1272, 1272, 1273, 1273, 1274, 1274, 1267, 1267, 1267, 1267, - 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, - 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, - 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, - 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, - 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, - 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267, - 1267, 1267, 1267, 1267, 1267, 1267, 1267, 1267 + 502, 504, 505, 502, 0, 508, 507, 0, 495, 507, + 510, 511, 512, 514, 488, 516, 506, 517, 519, 520, + + 0, 495, 488, 496, 498, 499, 502, 504, 505, 502, + 506, 508, 507, 506, 495, 507, 510, 511, 512, 514, + 518, 516, 506, 517, 519, 520, 518, 521, 522, 523, + 524, 525, 526, 528, 529, 531, 506, 532, 533, 506, + 534, 535, 536, 539, 540, 541, 518, 543, 545, 547, + 548, 549, 518, 521, 522, 523, 524, 525, 526, 528, + 529, 531, 550, 532, 533, 551, 534, 535, 536, 539, + 540, 541, 554, 543, 545, 547, 548, 549, 555, 556, + 558, 560, 559, 562, 563, 566, 567, 569, 550, 570, + 571, 551, 559, 572, 573, 575, 577, 578, 554, 579, + + 580, 582, 583, 584, 555, 556, 558, 560, 559, 562, + 563, 566, 567, 569, 585, 570, 571, 586, 559, 572, + 573, 575, 577, 578, 587, 579, 580, 582, 583, 584, + 589, 590, 593, 594, 597, 598, 600, 601, 603, 604, + 585, 605, 606, 586, 607, 608, 610, 611, 612, 614, + 587, 615, 616, 617, 618, 619, 589, 590, 593, 594, + 597, 598, 600, 601, 603, 604, 620, 605, 606, 621, + 607, 608, 610, 611, 612, 614, 623, 615, 616, 617, + 618, 619, 624, 625, 626, 627, 628, 629, 630, 631, + 633, 634, 620, 635, 636, 621, 637, 639, 641, 642, + + 643, 644, 623, 625, 645, 646, 647, 648, 624, 625, + 626, 627, 628, 629, 630, 631, 633, 634, 649, 635, + 636, 651, 637, 639, 641, 642, 643, 644, 654, 625, + 645, 646, 647, 648, 655, 656, 657, 658, 660, 661, + 662, 663, 662, 664, 649, 665, 667, 651, 669, 670, + 671, 675, 668, 676, 654, 677, 678, 680, 681, 682, + 655, 656, 657, 658, 660, 661, 662, 663, 662, 664, + 668, 665, 667, 714, 669, 670, 671, 675, 668, 676, + 719, 677, 678, 680, 681, 682, 683, 728, 729, 730, + 683, 0, 0, 0, 0, 0, 668, 0, 0, 714, + + 0, 0, 0, 0, 0, 0, 719, 0, 0, 0, + 0, 0, 683, 728, 729, 730, 683, 720, 720, 720, + 720, 720, 720, 720, 720, 721, 721, 721, 721, 721, + 721, 721, 721, 721, 722, 722, 722, 722, 722, 722, + 722, 722, 723, 723, 723, 723, 723, 723, 723, 723, + 723, 724, 724, 724, 724, 724, 724, 724, 724, 732, + 733, 734, 735, 739, 740, 742, 744, 745, 747, 748, + 723, 918, 918, 918, 918, 918, 918, 918, 918, 0, + 749, 750, 751, 752, 753, 732, 733, 734, 735, 739, + 740, 742, 744, 745, 747, 748, 723, 725, 725, 725, + + 725, 725, 725, 725, 725, 725, 749, 750, 751, 752, + 753, 754, 755, 756, 757, 758, 759, 760, 762, 763, + 764, 765, 766, 767, 768, 725, 769, 770, 771, 762, + 773, 774, 775, 776, 777, 762, 778, 754, 755, 756, + 757, 758, 759, 760, 762, 763, 764, 765, 766, 767, + 768, 725, 769, 770, 771, 762, 773, 774, 775, 776, + 777, 762, 778, 779, 781, 782, 783, 785, 786, 787, + 788, 789, 789, 790, 791, 792, 794, 796, 799, 801, + 802, 803, 804, 805, 806, 807, 808, 809, 810, 779, + 781, 782, 783, 785, 786, 787, 788, 789, 789, 790, + + 791, 792, 794, 796, 799, 801, 802, 803, 804, 805, + 806, 807, 808, 809, 810, 811, 812, 814, 815, 816, + 818, 820, 822, 823, 825, 826, 827, 829, 830, 831, + 833, 834, 835, 836, 838, 839, 840, 841, 842, 843, + 845, 811, 812, 814, 815, 816, 818, 820, 822, 823, + 825, 826, 827, 829, 830, 831, 833, 834, 835, 836, + 838, 839, 840, 841, 842, 843, 845, 846, 849, 851, + 852, 853, 854, 855, 856, 857, 859, 860, 861, 863, + 864, 866, 867, 868, 870, 871, 873, 874, 875, 877, + 879, 880, 881, 846, 849, 851, 852, 853, 854, 855, + + 856, 857, 859, 860, 861, 863, 864, 866, 867, 868, + 870, 871, 873, 874, 875, 877, 879, 880, 881, 883, + 889, 890, 891, 892, 893, 895, 896, 898, 900, 901, + 902, 903, 904, 905, 906, 907, 908, 910, 911, 912, + 913, 917, 0, 0, 0, 883, 889, 890, 891, 892, + 893, 895, 896, 898, 900, 901, 902, 903, 904, 905, + 906, 907, 908, 910, 911, 912, 913, 917, 919, 919, + 919, 919, 919, 919, 919, 919, 920, 920, 920, 920, + 920, 920, 920, 920, 921, 921, 921, 921, 921, 921, + 921, 921, 923, 923, 923, 923, 923, 923, 923, 923, + + 0, 0, 926, 920, 927, 928, 929, 933, 934, 935, + 936, 921, 939, 941, 944, 946, 947, 949, 950, 923, + 924, 924, 924, 924, 924, 924, 924, 924, 926, 920, + 927, 928, 929, 933, 934, 935, 936, 921, 939, 941, + 944, 946, 947, 949, 950, 923, 952, 924, 953, 954, + 955, 957, 958, 959, 960, 961, 962, 963, 966, 968, + 969, 955, 954, 970, 971, 972, 974, 955, 975, 976, + 977, 978, 952, 924, 953, 954, 955, 957, 958, 959, + 960, 961, 962, 963, 966, 968, 969, 955, 954, 970, + 971, 972, 974, 955, 975, 976, 977, 978, 979, 981, + + 982, 986, 987, 988, 990, 994, 995, 996, 997, 998, + 999, 1000, 1001, 1004, 1006, 1008, 1011, 1016, 1023, 1026, + 1027, 1028, 1029, 1030, 979, 981, 982, 986, 987, 988, + 990, 994, 995, 996, 997, 998, 999, 1000, 1001, 1004, + 1006, 1008, 1011, 1016, 1023, 1026, 1027, 1028, 1029, 1030, + 1031, 1032, 1033, 1037, 1038, 1039, 1042, 1044, 1045, 1047, + 1050, 1052, 1053, 1056, 1057, 1058, 1061, 1062, 1064, 1067, + 1069, 1074, 1075, 1079, 1080, 1081, 1031, 1032, 1033, 1037, + 1038, 1039, 1042, 1044, 1045, 1047, 1050, 1052, 1053, 1056, + 1057, 1058, 1061, 1062, 1064, 1067, 1069, 1074, 1075, 1079, + + 1080, 1081, 1082, 1083, 1085, 1086, 1088, 1089, 1090, 1091, + 1092, 1093, 1094, 1097, 1098, 1100, 1101, 1102, 1103, 1108, + 1110, 1111, 1112, 1113, 1115, 1094, 1116, 1117, 1082, 1083, + 1085, 1086, 1088, 1089, 1090, 1091, 1092, 1093, 1094, 1097, + 1098, 1100, 1101, 1102, 1103, 1108, 1110, 1111, 1112, 1113, + 1115, 1094, 1116, 1117, 1118, 1119, 1120, 1122, 1123, 1126, + 1128, 1129, 1131, 1133, 1136, 1137, 1138, 1139, 1140, 1141, + 1143, 1144, 1145, 1146, 1148, 1149, 1152, 1154, 1155, 1156, + 1118, 1119, 1120, 1122, 1123, 1126, 1128, 1129, 1131, 1133, + 1136, 1137, 1138, 1139, 1140, 1141, 1143, 1144, 1145, 1146, + + 1148, 1149, 1152, 1154, 1155, 1156, 1157, 1159, 1160, 1162, + 1163, 1164, 1165, 1167, 1171, 1172, 1173, 1174, 1175, 1176, + 1177, 1180, 1181, 1185, 1186, 1188, 1194, 1195, 1196, 1197, + 1198, 1201, 1157, 1159, 1160, 1162, 1163, 1164, 1165, 1167, + 1171, 1172, 1173, 1174, 1175, 1176, 1177, 1180, 1181, 1185, + 1186, 1188, 1194, 1195, 1196, 1197, 1198, 1201, 1202, 1204, + 1206, 1208, 1210, 1211, 1214, 1215, 1216, 1220, 1222, 1225, + 1226, 1229, 1230, 1232, 1235, 1236, 1238, 1240, 1242, 1244, + 1245, 1246, 1247, 1248, 1202, 1204, 1206, 1208, 1210, 1211, + 1214, 1215, 1216, 1220, 1222, 1225, 1226, 1229, 1230, 1232, + + 1235, 1236, 1238, 1240, 1242, 1244, 1245, 1246, 1247, 1248, + 1250, 1251, 1256, 1257, 1258, 1259, 1262, 1265, 1268, 1269, + 1274, 1275, 1278, 1279, 1282, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1250, 1251, 1256, 1257, + 1258, 1259, 1262, 1265, 1268, 1269, 1274, 1275, 1278, 1279, + 1282, 1286, 1286, 1287, 1287, 1288, 1288, 1289, 1289, 1290, + 1290, 1291, 1291, 1284, 1284, 1284, 1284, 1284, 1284, 1284, + 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, + 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, + 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, + + 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, + 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, + 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, + 1284, 1284, 1284, 1284, 1284 } ; /* The intent behind this definition is that it'll catch @@ -1493,7 +1515,7 @@ static yyconst flex_int16_t yy_chk[2979] = extern YYSTYPE* frlval; /* rules */ -#line 1497 "frame/lex.C" +#line 1519 "frame/lex.C" #define INITIAL 0 @@ -1596,7 +1618,7 @@ YY_DECL #line 28 "frame/lex.L" -#line 1600 "frame/lex.C" +#line 1622 "frame/lex.C" if ( !(yy_init) ) { @@ -1649,13 +1671,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 1268 ) + if ( yy_current_state >= 1285 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_current_state != 1267 ); + while ( yy_current_state != 1284 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -1953,1466 +1975,1491 @@ YY_RULE_SETUP case 56: YY_RULE_SETUP #line 85 "frame/lex.L" -{return COLORBAR_;} +{return COLOR_;} YY_BREAK case 57: YY_RULE_SETUP #line 86 "frame/lex.L" -{return COLORMAP_;} +{return COLORBAR_;} YY_BREAK case 58: YY_RULE_SETUP #line 87 "frame/lex.L" -{return COLORSCALE_;} +{return COLORBAR_;} YY_BREAK case 59: YY_RULE_SETUP #line 88 "frame/lex.L" -{return COLORSPACE_;} +{return COLORMAP_;} YY_BREAK case 60: YY_RULE_SETUP #line 89 "frame/lex.L" -{return COLS_;} +{return COLORMAP_;} YY_BREAK case 61: YY_RULE_SETUP #line 90 "frame/lex.L" -{return COLUMN_;} +{return COLORSCALE_;} YY_BREAK case 62: YY_RULE_SETUP #line 91 "frame/lex.L" -{return COMMAND_;} +{return COLORSCALE_;} YY_BREAK case 63: YY_RULE_SETUP #line 92 "frame/lex.L" -{return COMPASS_;} +{return COLORSPACE_;} YY_BREAK case 64: YY_RULE_SETUP #line 93 "frame/lex.L" -{return COMPOSITE_;} +{return COLORSPACE_;} YY_BREAK case 65: YY_RULE_SETUP #line 94 "frame/lex.L" -{return COMPRESS_;} +{return COLS_;} YY_BREAK case 66: YY_RULE_SETUP #line 95 "frame/lex.L" -{return CONTOUR_;} +{return COLUMN_;} YY_BREAK case 67: YY_RULE_SETUP #line 96 "frame/lex.L" -{return CONTRAST_;} +{return COMMAND_;} YY_BREAK case 68: YY_RULE_SETUP #line 97 "frame/lex.L" -{return COORDINATES_;} +{return COMPASS_;} YY_BREAK case 69: YY_RULE_SETUP #line 98 "frame/lex.L" -{return COPY_;} +{return COMPOSITE_;} YY_BREAK case 70: YY_RULE_SETUP #line 99 "frame/lex.L" -{return COUNT_;} +{return COMPRESS_;} YY_BREAK case 71: YY_RULE_SETUP #line 100 "frame/lex.L" -{return CROP_;} +{return CONTOUR_;} YY_BREAK case 72: YY_RULE_SETUP #line 101 "frame/lex.L" -{return CROSS_;} +{return CONTRAST_;} YY_BREAK case 73: YY_RULE_SETUP #line 102 "frame/lex.L" -{return CPANDA_;} +{return COORDINATES_;} YY_BREAK case 74: YY_RULE_SETUP #line 103 "frame/lex.L" -{return CREATE_;} +{return COPY_;} YY_BREAK case 75: YY_RULE_SETUP #line 104 "frame/lex.L" -{return CROSSHAIR_;} +{return COUNT_;} YY_BREAK case 76: YY_RULE_SETUP #line 105 "frame/lex.L" -{return CUBE_;} +{return CROP_;} YY_BREAK case 77: YY_RULE_SETUP #line 106 "frame/lex.L" -{return CURSOR_;} +{return CROSS_;} YY_BREAK case 78: YY_RULE_SETUP #line 107 "frame/lex.L" -{return CUT_;} +{return CPANDA_;} YY_BREAK case 79: YY_RULE_SETUP #line 108 "frame/lex.L" -{return CMYK_;} +{return CREATE_;} YY_BREAK case 80: YY_RULE_SETUP #line 109 "frame/lex.L" -{return DASH_;} +{return CROSSHAIR_;} YY_BREAK case 81: YY_RULE_SETUP #line 110 "frame/lex.L" -{return DASHLIST_;} +{return CUBE_;} YY_BREAK case 82: YY_RULE_SETUP #line 111 "frame/lex.L" -{return DATA_;} +{return CURSOR_;} YY_BREAK case 83: YY_RULE_SETUP #line 112 "frame/lex.L" -{return DATAMIN_;} +{return CUT_;} YY_BREAK case 84: YY_RULE_SETUP #line 113 "frame/lex.L" -{return DATASEC_;} +{return CMYK_;} YY_BREAK case 85: YY_RULE_SETUP #line 114 "frame/lex.L" -{return DEBUG_;} +{return DASH_;} YY_BREAK case 86: YY_RULE_SETUP #line 115 "frame/lex.L" -{return DEGREES_;} +{return DASHLIST_;} YY_BREAK case 87: YY_RULE_SETUP #line 116 "frame/lex.L" -{return DEFAULT_;} +{return DATA_;} YY_BREAK case 88: YY_RULE_SETUP #line 117 "frame/lex.L" -{return DELETE_;} +{return DATAMIN_;} YY_BREAK case 89: YY_RULE_SETUP #line 118 "frame/lex.L" -{return DEPTH_;} +{return DATASEC_;} YY_BREAK case 90: YY_RULE_SETUP #line 119 "frame/lex.L" -{return DETECTOR_;} +{return DEBUG_;} YY_BREAK case 91: YY_RULE_SETUP #line 120 "frame/lex.L" -{return DIAMOND_;} +{return DEGREES_;} YY_BREAK case 92: YY_RULE_SETUP #line 121 "frame/lex.L" -{return DIM_;} +{return DEFAULT_;} YY_BREAK case 93: YY_RULE_SETUP #line 122 "frame/lex.L" -{return DS9_;} +{return DELETE_;} YY_BREAK case 94: YY_RULE_SETUP #line 123 "frame/lex.L" -{return ECLIPTIC_;} +{return DEPTH_;} YY_BREAK case 95: YY_RULE_SETUP #line 124 "frame/lex.L" -{return ELEVATION_;} +{return DETECTOR_;} YY_BREAK case 96: YY_RULE_SETUP #line 125 "frame/lex.L" -{return ELLIPTIC_;} +{return DIAMOND_;} YY_BREAK case 97: YY_RULE_SETUP #line 126 "frame/lex.L" -{return ELLIPSE_;} +{return DIM_;} YY_BREAK case 98: YY_RULE_SETUP #line 127 "frame/lex.L" -{return ELLIPSEANNULUS_;} +{return DS9_;} YY_BREAK case 99: YY_RULE_SETUP #line 128 "frame/lex.L" -{return EDIT_;} +{return ECLIPTIC_;} YY_BREAK case 100: YY_RULE_SETUP #line 129 "frame/lex.L" -{return END_;} +{return ELEVATION_;} YY_BREAK case 101: YY_RULE_SETUP #line 130 "frame/lex.L" -{return ENVI_;} +{return ELLIPTIC_;} YY_BREAK case 102: YY_RULE_SETUP #line 131 "frame/lex.L" -{return EPANDA_;} +{return ELLIPSE_;} YY_BREAK case 103: YY_RULE_SETUP #line 132 "frame/lex.L" -{return EPSILON_;} +{return ELLIPSEANNULUS_;} YY_BREAK case 104: YY_RULE_SETUP #line 133 "frame/lex.L" -{return EQUATORIAL_;} +{return EDIT_;} YY_BREAK case 105: YY_RULE_SETUP #line 134 "frame/lex.L" -{return ERASE_;} +{return END_;} YY_BREAK case 106: YY_RULE_SETUP #line 135 "frame/lex.L" -{return EXT_;} +{return ENVI_;} YY_BREAK case 107: YY_RULE_SETUP #line 136 "frame/lex.L" -{return FACTOR_;} +{return EPANDA_;} YY_BREAK case 108: YY_RULE_SETUP #line 137 "frame/lex.L" -{return FALSE_;} +{return EPSILON_;} YY_BREAK case 109: YY_RULE_SETUP #line 138 "frame/lex.L" -{return FILE_;} +{return EQUATORIAL_;} YY_BREAK case 110: YY_RULE_SETUP #line 139 "frame/lex.L" -{return FILL_;} +{return ERASE_;} YY_BREAK case 111: YY_RULE_SETUP #line 140 "frame/lex.L" -{return FILTER_;} +{return EXT_;} YY_BREAK case 112: YY_RULE_SETUP #line 141 "frame/lex.L" -{return FIT_;} +{return FACTOR_;} YY_BREAK case 113: YY_RULE_SETUP #line 142 "frame/lex.L" -{return FITS_;} +{return FALSE_;} YY_BREAK case 114: YY_RULE_SETUP #line 143 "frame/lex.L" -{return FITSY_;} +{return FILE_;} YY_BREAK case 115: YY_RULE_SETUP #line 144 "frame/lex.L" -{return FIXED_;} +{return FILL_;} YY_BREAK case 116: YY_RULE_SETUP #line 145 "frame/lex.L" -{return FK4_;} +{return FILTER_;} YY_BREAK case 117: YY_RULE_SETUP #line 146 "frame/lex.L" -{return FK5_;} +{return FIT_;} YY_BREAK case 118: YY_RULE_SETUP #line 147 "frame/lex.L" -{return FONT_;} +{return FITS_;} YY_BREAK case 119: YY_RULE_SETUP #line 148 "frame/lex.L" -{return FORMAT_;} +{return FITSY_;} YY_BREAK case 120: YY_RULE_SETUP #line 149 "frame/lex.L" -{return FROM_;} +{return FIXED_;} YY_BREAK case 121: YY_RULE_SETUP #line 150 "frame/lex.L" -{return FRONT_;} +{return FK4_;} YY_BREAK case 122: YY_RULE_SETUP #line 151 "frame/lex.L" -{return FULL_;} +{return FK5_;} YY_BREAK case 123: YY_RULE_SETUP #line 152 "frame/lex.L" -{return FUNCTION_;} +{return FONT_;} YY_BREAK case 124: YY_RULE_SETUP #line 153 "frame/lex.L" -{return GALACTIC_;} +{return FORMAT_;} YY_BREAK case 125: YY_RULE_SETUP #line 154 "frame/lex.L" -{return GAUSSIAN_;} +{return FROM_;} YY_BREAK case 126: YY_RULE_SETUP #line 155 "frame/lex.L" -{return GET_;} +{return FRONT_;} YY_BREAK case 127: YY_RULE_SETUP #line 156 "frame/lex.L" -{return GLOBAL_;} +{return FULL_;} YY_BREAK case 128: YY_RULE_SETUP #line 157 "frame/lex.L" -{return GRAPHICS_;} +{return FUNCTION_;} YY_BREAK case 129: YY_RULE_SETUP #line 158 "frame/lex.L" -{return GRAY_;} +{return GALACTIC_;} YY_BREAK case 130: YY_RULE_SETUP #line 159 "frame/lex.L" -{return GRID_;} +{return GAUSSIAN_;} YY_BREAK case 131: YY_RULE_SETUP #line 160 "frame/lex.L" -{return GZ_;} +{return GET_;} YY_BREAK case 132: YY_RULE_SETUP #line 161 "frame/lex.L" -{return HANDLE_;} +{return GLOBAL_;} YY_BREAK case 133: YY_RULE_SETUP #line 162 "frame/lex.L" -{return HAS_;} +{return GRAPHICS_;} YY_BREAK case 134: YY_RULE_SETUP #line 163 "frame/lex.L" -{return HEAD_;} +{return GRAY_;} YY_BREAK case 135: YY_RULE_SETUP #line 164 "frame/lex.L" -{return HEADER_;} +{return GRID_;} YY_BREAK case 136: YY_RULE_SETUP #line 165 "frame/lex.L" -{return HEIGHT_;} +{return GZ_;} YY_BREAK case 137: YY_RULE_SETUP #line 166 "frame/lex.L" -{return HIDE_;} +{return HANDLE_;} YY_BREAK case 138: YY_RULE_SETUP #line 167 "frame/lex.L" -{return HIGHLITE_;} +{return HAS_;} YY_BREAK case 139: YY_RULE_SETUP #line 168 "frame/lex.L" -{return HISTEQU_;} +{return HEAD_;} YY_BREAK case 140: YY_RULE_SETUP #line 169 "frame/lex.L" -{return HISTOGRAM_;} +{return HEADER_;} YY_BREAK case 141: YY_RULE_SETUP #line 170 "frame/lex.L" -{return HORIZONTAL_;} +{return HEIGHT_;} YY_BREAK case 142: YY_RULE_SETUP #line 171 "frame/lex.L" -{return ICRS_;} +{return HIDE_;} YY_BREAK case 143: YY_RULE_SETUP #line 172 "frame/lex.L" -{return ID_;} +{return HIGHLITE_;} YY_BREAK case 144: YY_RULE_SETUP #line 173 "frame/lex.L" -{return IIS_;} +{return HISTEQU_;} YY_BREAK case 145: YY_RULE_SETUP #line 174 "frame/lex.L" -{return IMAGE_;} +{return HISTOGRAM_;} YY_BREAK case 146: YY_RULE_SETUP #line 175 "frame/lex.L" -{return INCLUDE_;} +{return HORIZONTAL_;} YY_BREAK case 147: YY_RULE_SETUP #line 176 "frame/lex.L" -{return INCR_;} +{return ICRS_;} YY_BREAK case 148: YY_RULE_SETUP #line 177 "frame/lex.L" -{return INFO_;} +{return ID_;} YY_BREAK case 149: YY_RULE_SETUP #line 178 "frame/lex.L" -{return ITERATION_;} +{return IIS_;} YY_BREAK case 150: YY_RULE_SETUP #line 179 "frame/lex.L" -{return IRAF_;} +{return IMAGE_;} YY_BREAK case 151: YY_RULE_SETUP #line 180 "frame/lex.L" -{return IRAFMIN_;} +{return INCLUDE_;} YY_BREAK case 152: YY_RULE_SETUP #line 181 "frame/lex.L" -{return J2000_;} +{return INCR_;} YY_BREAK case 153: YY_RULE_SETUP #line 182 "frame/lex.L" -{return KEY_;} +{return INFO_;} YY_BREAK case 154: YY_RULE_SETUP #line 183 "frame/lex.L" -{return KEYWORD_;} +{return ITERATION_;} YY_BREAK case 155: YY_RULE_SETUP #line 184 "frame/lex.L" -{return LABEL_;} +{return IRAF_;} YY_BREAK case 156: YY_RULE_SETUP #line 185 "frame/lex.L" -{return LENGTH_;} +{return IRAFMIN_;} YY_BREAK case 157: YY_RULE_SETUP #line 186 "frame/lex.L" -{return LEVEL_;} +{return J2000_;} YY_BREAK case 158: YY_RULE_SETUP #line 187 "frame/lex.L" -{return LITTLEENDIAN_;} +{return KEY_;} YY_BREAK case 159: YY_RULE_SETUP #line 188 "frame/lex.L" -{return LITTLEENDIAN_;} +{return KEYWORD_;} YY_BREAK case 160: YY_RULE_SETUP #line 189 "frame/lex.L" -{return LINE_;} +{return LABEL_;} YY_BREAK case 161: YY_RULE_SETUP #line 190 "frame/lex.L" -{return LINEAR_;} +{return LENGTH_;} YY_BREAK case 162: YY_RULE_SETUP #line 191 "frame/lex.L" -{return LIST_;} +{return LEVEL_;} YY_BREAK case 163: YY_RULE_SETUP #line 192 "frame/lex.L" -{return LOAD_;} +{return LITTLEENDIAN_;} YY_BREAK case 164: YY_RULE_SETUP #line 193 "frame/lex.L" -{return LOCAL_;} +{return LITTLEENDIAN_;} YY_BREAK case 165: YY_RULE_SETUP #line 194 "frame/lex.L" -{return LOG_;} +{return LINE_;} YY_BREAK case 166: YY_RULE_SETUP #line 195 "frame/lex.L" -{return MACOSX_;} +{return LINEAR_;} YY_BREAK case 167: YY_RULE_SETUP #line 196 "frame/lex.L" -{return MAGNIFIER_;} +{return LIST_;} YY_BREAK case 168: YY_RULE_SETUP #line 197 "frame/lex.L" -{return MATCH_;} +{return LOAD_;} YY_BREAK case 169: YY_RULE_SETUP #line 198 "frame/lex.L" -{return MAP_;} +{return LOCAL_;} YY_BREAK case 170: YY_RULE_SETUP #line 199 "frame/lex.L" -{return MARK_;} +{return LOG_;} YY_BREAK case 171: YY_RULE_SETUP #line 200 "frame/lex.L" -{return MARKER_;} +{return MACOSX_;} YY_BREAK case 172: YY_RULE_SETUP #line 201 "frame/lex.L" -{return MASK_;} +{return MAGNIFIER_;} YY_BREAK case 173: YY_RULE_SETUP #line 202 "frame/lex.L" -{return MESSAGE_;} +{return MATCH_;} YY_BREAK case 174: YY_RULE_SETUP #line 203 "frame/lex.L" -{return METHOD_;} +{return MAP_;} YY_BREAK case 175: YY_RULE_SETUP #line 204 "frame/lex.L" -{return MINMAX_;} +{return MARK_;} YY_BREAK case 176: YY_RULE_SETUP #line 205 "frame/lex.L" -{return MINOR_;} +{return MARKER_;} YY_BREAK case 177: YY_RULE_SETUP #line 206 "frame/lex.L" -{return MIP_;} +{return MASK_;} YY_BREAK case 178: YY_RULE_SETUP #line 207 "frame/lex.L" -{return MMAP_;} +{return MESSAGE_;} YY_BREAK case 179: YY_RULE_SETUP #line 208 "frame/lex.L" -{return MMAPINCR_;} +{return METHOD_;} YY_BREAK case 180: YY_RULE_SETUP #line 209 "frame/lex.L" -{return MODE_;} +{return MINMAX_;} YY_BREAK case 181: YY_RULE_SETUP #line 210 "frame/lex.L" -{return MOSAIC_;} +{return MINOR_;} YY_BREAK case 182: YY_RULE_SETUP #line 211 "frame/lex.L" -{return MOTION_;} +{return MIP_;} YY_BREAK case 183: YY_RULE_SETUP #line 212 "frame/lex.L" -{return MOVE_;} +{return MMAP_;} YY_BREAK case 184: YY_RULE_SETUP #line 213 "frame/lex.L" -{return NAME_;} +{return MMAPINCR_;} YY_BREAK case 185: YY_RULE_SETUP #line 214 "frame/lex.L" -{return NAN_;} +{return MODE_;} YY_BREAK case 186: YY_RULE_SETUP #line 215 "frame/lex.L" -{return NATIVE_;} +{return MOSAIC_;} YY_BREAK case 187: YY_RULE_SETUP #line 216 "frame/lex.L" -{return NAXES_;} +{return MOTION_;} YY_BREAK case 188: YY_RULE_SETUP #line 217 "frame/lex.L" -{return NEW_;} +{return MOVE_;} YY_BREAK case 189: YY_RULE_SETUP #line 218 "frame/lex.L" -{return NEXT_;} +{return NAME_;} YY_BREAK case 190: YY_RULE_SETUP #line 219 "frame/lex.L" -{return NO_;} +{return NAN_;} YY_BREAK case 191: YY_RULE_SETUP #line 220 "frame/lex.L" -{return NONE_;} +{return NATIVE_;} YY_BREAK case 192: YY_RULE_SETUP #line 221 "frame/lex.L" -{return NONNAN_;} +{return NAXES_;} YY_BREAK case 193: YY_RULE_SETUP #line 222 "frame/lex.L" -{return NONZERO_;} +{return NEW_;} YY_BREAK case 194: YY_RULE_SETUP #line 223 "frame/lex.L" -{return NOW_;} +{return NEXT_;} YY_BREAK case 195: YY_RULE_SETUP #line 224 "frame/lex.L" -{return NRRD_;} +{return NO_;} YY_BREAK case 196: YY_RULE_SETUP #line 225 "frame/lex.L" -{return NUMBER_;} +{return NONE_;} YY_BREAK case 197: YY_RULE_SETUP #line 226 "frame/lex.L" -{return OBJECT_;} +{return NONNAN_;} YY_BREAK case 198: YY_RULE_SETUP #line 227 "frame/lex.L" -{return OFF_;} +{return NONZERO_;} YY_BREAK case 199: YY_RULE_SETUP #line 228 "frame/lex.L" -{return ON_;} +{return NOW_;} YY_BREAK case 200: YY_RULE_SETUP #line 229 "frame/lex.L" -{return ONLY_;} +{return NRRD_;} YY_BREAK case 201: YY_RULE_SETUP #line 230 "frame/lex.L" -{return OPTION_;} +{return NUMBER_;} YY_BREAK case 202: YY_RULE_SETUP #line 231 "frame/lex.L" -{return ORIENT_;} +{return OBJECT_;} YY_BREAK case 203: YY_RULE_SETUP #line 232 "frame/lex.L" -{return PAN_;} +{return OFF_;} YY_BREAK case 204: YY_RULE_SETUP #line 233 "frame/lex.L" -{return CPANDA_;} +{return ON_;} YY_BREAK case 205: YY_RULE_SETUP #line 234 "frame/lex.L" -{return PANNER_;} +{return ONLY_;} YY_BREAK case 206: YY_RULE_SETUP #line 235 "frame/lex.L" -{return PARSER_;} +{return OPTION_;} YY_BREAK case 207: YY_RULE_SETUP #line 236 "frame/lex.L" -{return PASTE_;} +{return ORIENT_;} YY_BREAK case 208: YY_RULE_SETUP #line 237 "frame/lex.L" -{return PERF_;} +{return PAN_;} YY_BREAK case 209: YY_RULE_SETUP #line 238 "frame/lex.L" -{return PHOTO_;} +{return CPANDA_;} YY_BREAK case 210: YY_RULE_SETUP #line 239 "frame/lex.L" -{return PHYSICAL_;} +{return PANNER_;} YY_BREAK case 211: YY_RULE_SETUP #line 240 "frame/lex.L" -{return PIXEL_;} +{return PARSER_;} YY_BREAK case 212: YY_RULE_SETUP #line 241 "frame/lex.L" -{return PLOT2D_;} +{return PASTE_;} YY_BREAK case 213: YY_RULE_SETUP #line 242 "frame/lex.L" -{return PLOT3D_;} +{return PERF_;} YY_BREAK case 214: YY_RULE_SETUP #line 243 "frame/lex.L" -{return POINT_;} +{return PHOTO_;} YY_BREAK case 215: YY_RULE_SETUP #line 244 "frame/lex.L" -{return POINTER_;} +{return PHYSICAL_;} YY_BREAK case 216: YY_RULE_SETUP #line 245 "frame/lex.L" -{return POLYGON_;} +{return PIXEL_;} YY_BREAK case 217: YY_RULE_SETUP #line 246 "frame/lex.L" -{return POSTSCRIPT_;} +{return PLOT2D_;} YY_BREAK case 218: YY_RULE_SETUP #line 247 "frame/lex.L" -{return POW_;} +{return PLOT3D_;} YY_BREAK case 219: YY_RULE_SETUP #line 248 "frame/lex.L" -{return PRECISION_;} +{return POINT_;} YY_BREAK case 220: YY_RULE_SETUP #line 249 "frame/lex.L" -{return PRINT_;} +{return POINTER_;} YY_BREAK case 221: YY_RULE_SETUP #line 250 "frame/lex.L" -{return PRESERVE_;} +{return POLYGON_;} YY_BREAK case 222: YY_RULE_SETUP #line 251 "frame/lex.L" -{return PROJECTION_;} +{return POSTSCRIPT_;} YY_BREAK case 223: YY_RULE_SETUP #line 252 "frame/lex.L" -{return PROPERTY_;} +{return POW_;} YY_BREAK case 224: YY_RULE_SETUP #line 253 "frame/lex.L" -{return PROS_;} +{return PRECISION_;} YY_BREAK case 225: YY_RULE_SETUP #line 254 "frame/lex.L" -{return PUBLICATION_;} +{return PRINT_;} YY_BREAK case 226: YY_RULE_SETUP #line 255 "frame/lex.L" -{return QUERY_;} +{return PRESERVE_;} YY_BREAK case 227: YY_RULE_SETUP #line 256 "frame/lex.L" -{return RADIAL_;} +{return PROJECTION_;} YY_BREAK case 228: YY_RULE_SETUP #line 257 "frame/lex.L" -{return RADIUS_;} +{return PROPERTY_;} YY_BREAK case 229: YY_RULE_SETUP #line 258 "frame/lex.L" -{return RANGE_;} +{return PROS_;} YY_BREAK case 230: YY_RULE_SETUP #line 259 "frame/lex.L" -{return REGION_;} +{return PUBLICATION_;} YY_BREAK case 231: YY_RULE_SETUP #line 260 "frame/lex.L" -{return REPLACE_;} +{return QUERY_;} YY_BREAK case 232: YY_RULE_SETUP #line 261 "frame/lex.L" -{return RESAMPLE_;} +{return RADIAL_;} YY_BREAK case 233: YY_RULE_SETUP #line 262 "frame/lex.L" -{return RESET_;} +{return RADIUS_;} YY_BREAK case 234: YY_RULE_SETUP #line 263 "frame/lex.L" -{return RESOLUTION_;} +{return RANGE_;} YY_BREAK case 235: YY_RULE_SETUP #line 264 "frame/lex.L" -{return RGB_;} +{return REGION_;} YY_BREAK case 236: YY_RULE_SETUP #line 265 "frame/lex.L" -{return ROOT_;} +{return REPLACE_;} YY_BREAK case 237: YY_RULE_SETUP #line 266 "frame/lex.L" -{return ROTATE_;} +{return RESAMPLE_;} YY_BREAK case 238: YY_RULE_SETUP #line 267 "frame/lex.L" -{return RULER_;} +{return RESET_;} YY_BREAK case 239: YY_RULE_SETUP #line 268 "frame/lex.L" -{return SAMPLE_;} +{return RESOLUTION_;} YY_BREAK case 240: YY_RULE_SETUP #line 269 "frame/lex.L" -{return SAOIMAGE_;} +{return RGB_;} YY_BREAK case 241: YY_RULE_SETUP #line 270 "frame/lex.L" -{return SAOTNG_;} +{return ROOT_;} YY_BREAK case 242: YY_RULE_SETUP #line 271 "frame/lex.L" -{return SAVE_;} +{return ROTATE_;} YY_BREAK case 243: YY_RULE_SETUP #line 272 "frame/lex.L" -{return SCALE_;} +{return RULER_;} YY_BREAK case 244: YY_RULE_SETUP #line 273 "frame/lex.L" -{return SCAN_;} +{return SAMPLE_;} YY_BREAK case 245: YY_RULE_SETUP #line 274 "frame/lex.L" -{return SCIENTIFIC_;} +{return SAOIMAGE_;} YY_BREAK case 246: YY_RULE_SETUP #line 275 "frame/lex.L" -{return SCOPE_;} +{return SAOTNG_;} YY_BREAK case 247: YY_RULE_SETUP #line 276 "frame/lex.L" -{return SEGMENT_;} +{return SAVE_;} YY_BREAK case 248: YY_RULE_SETUP #line 277 "frame/lex.L" -{return SELECT_;} +{return SCALE_;} YY_BREAK case 249: YY_RULE_SETUP #line 278 "frame/lex.L" -{return SET_;} +{return SCAN_;} YY_BREAK case 250: YY_RULE_SETUP #line 279 "frame/lex.L" -{return SEXAGESIMAL_;} +{return SCIENTIFIC_;} YY_BREAK case 251: YY_RULE_SETUP #line 280 "frame/lex.L" -{return SHAPE_;} +{return SCOPE_;} YY_BREAK case 252: YY_RULE_SETUP #line 281 "frame/lex.L" -{return SHARED_;} +{return SEGMENT_;} YY_BREAK case 253: YY_RULE_SETUP #line 282 "frame/lex.L" -{return SHIFT_;} +{return SELECT_;} YY_BREAK case 254: YY_RULE_SETUP #line 283 "frame/lex.L" -{return SHMID_;} +{return SET_;} YY_BREAK case 255: YY_RULE_SETUP #line 284 "frame/lex.L" -{return SHOW_;} +{return SEXAGESIMAL_;} YY_BREAK case 256: YY_RULE_SETUP #line 285 "frame/lex.L" -{return SIGMA_;} +{return SHAPE_;} YY_BREAK case 257: YY_RULE_SETUP #line 286 "frame/lex.L" -{return SINH_;} +{return SHARED_;} YY_BREAK case 258: YY_RULE_SETUP #line 287 "frame/lex.L" -{return SIZE_;} +{return SHIFT_;} YY_BREAK case 259: YY_RULE_SETUP #line 288 "frame/lex.L" -{return SLICE_;} +{return SHMID_;} YY_BREAK case 260: YY_RULE_SETUP #line 289 "frame/lex.L" -{return SMMAP_;} +{return SHOW_;} YY_BREAK case 261: YY_RULE_SETUP #line 290 "frame/lex.L" -{return SMOOTH_;} +{return SIGMA_;} YY_BREAK case 262: YY_RULE_SETUP #line 291 "frame/lex.L" -{return SOCKET_;} +{return SINH_;} YY_BREAK case 263: YY_RULE_SETUP #line 292 "frame/lex.L" -{return SOCKETGZ_;} +{return SIZE_;} YY_BREAK case 264: YY_RULE_SETUP #line 293 "frame/lex.L" -{return SOURCE_;} +{return SLICE_;} YY_BREAK case 265: YY_RULE_SETUP #line 294 "frame/lex.L" -{return SQRT_;} +{return SMMAP_;} YY_BREAK case 266: YY_RULE_SETUP #line 295 "frame/lex.L" -{return SQUARED_;} +{return SMOOTH_;} YY_BREAK case 267: YY_RULE_SETUP #line 296 "frame/lex.L" -{return SSHARED_;} +{return SOCKET_;} YY_BREAK case 268: YY_RULE_SETUP #line 297 "frame/lex.L" -{return STATS_;} +{return SOCKETGZ_;} YY_BREAK case 269: YY_RULE_SETUP #line 298 "frame/lex.L" -{return STATUS_;} +{return SOURCE_;} YY_BREAK case 270: YY_RULE_SETUP #line 299 "frame/lex.L" -{return SUM_;} +{return SQRT_;} YY_BREAK case 271: YY_RULE_SETUP #line 300 "frame/lex.L" -{return SYSTEM_;} +{return SQUARED_;} YY_BREAK case 272: YY_RULE_SETUP #line 301 "frame/lex.L" -{return TABLE_;} +{return SSHARED_;} YY_BREAK case 273: YY_RULE_SETUP #line 302 "frame/lex.L" -{return TAG_;} +{return STATS_;} YY_BREAK case 274: YY_RULE_SETUP #line 303 "frame/lex.L" -{return TEMPLATE_;} +{return STATUS_;} YY_BREAK case 275: YY_RULE_SETUP #line 304 "frame/lex.L" -{return TEXT_;} +{return SUM_;} YY_BREAK case 276: YY_RULE_SETUP #line 305 "frame/lex.L" -{return THREADS_;} +{return SYSTEM_;} YY_BREAK case 277: YY_RULE_SETUP #line 306 "frame/lex.L" -{return THREED_;} +{return TABLE_;} YY_BREAK case 278: YY_RULE_SETUP #line 307 "frame/lex.L" -{return THRESHOLD_;} +{return TAG_;} YY_BREAK case 279: YY_RULE_SETUP #line 308 "frame/lex.L" -{return THICK_;} +{return TEMPLATE_;} YY_BREAK case 280: YY_RULE_SETUP #line 309 "frame/lex.L" -{return TRANSPARENCY_;} +{return TEXT_;} YY_BREAK case 281: YY_RULE_SETUP #line 310 "frame/lex.L" -{return TO_;} +{return THREADS_;} YY_BREAK case 282: YY_RULE_SETUP #line 311 "frame/lex.L" -{return TOGGLE_;} +{return THREED_;} YY_BREAK case 283: YY_RULE_SETUP #line 312 "frame/lex.L" -{return TOPHAT_;} +{return THRESHOLD_;} YY_BREAK case 284: YY_RULE_SETUP #line 313 "frame/lex.L" -{return TRUE_;} +{return THICK_;} YY_BREAK case 285: YY_RULE_SETUP #line 314 "frame/lex.L" -{return TYPE_;} +{return TRANSPARENCY_;} YY_BREAK case 286: YY_RULE_SETUP #line 315 "frame/lex.L" -{return UNDO_;} +{return TO_;} YY_BREAK case 287: YY_RULE_SETUP #line 316 "frame/lex.L" -{return UNLOAD_;} +{return TOGGLE_;} YY_BREAK case 288: YY_RULE_SETUP #line 317 "frame/lex.L" -{return UNHIGHLITE_;} +{return TOPHAT_;} YY_BREAK case 289: YY_RULE_SETUP #line 318 "frame/lex.L" -{return UNSELECT_;} +{return TRUE_;} YY_BREAK case 290: YY_RULE_SETUP #line 319 "frame/lex.L" -{return UPDATE_;} +{return TYPE_;} YY_BREAK case 291: YY_RULE_SETUP #line 320 "frame/lex.L" -{return USER_;} +{return UNDO_;} YY_BREAK case 292: YY_RULE_SETUP #line 321 "frame/lex.L" -{return VALUE_;} +{return UNLOAD_;} YY_BREAK case 293: YY_RULE_SETUP #line 322 "frame/lex.L" -{return VAR_;} +{return UNHIGHLITE_;} YY_BREAK case 294: YY_RULE_SETUP #line 323 "frame/lex.L" -{return VIEW_;} +{return UNSELECT_;} YY_BREAK case 295: YY_RULE_SETUP #line 324 "frame/lex.L" -{return VECTOR_;} +{return UPDATE_;} YY_BREAK case 296: YY_RULE_SETUP #line 325 "frame/lex.L" -{return VERSION_;} +{return USER_;} YY_BREAK case 297: YY_RULE_SETUP #line 326 "frame/lex.L" -{return VERTEX_;} +{return VALUE_;} YY_BREAK case 298: YY_RULE_SETUP #line 327 "frame/lex.L" -{return VERTICAL_;} +{return VAR_;} YY_BREAK case 299: YY_RULE_SETUP #line 328 "frame/lex.L" -{return WARP_;} +{return VIEW_;} YY_BREAK case 300: YY_RULE_SETUP #line 329 "frame/lex.L" -{return WCS_;} +{return VECTOR_;} YY_BREAK case 301: YY_RULE_SETUP #line 330 "frame/lex.L" -{return WCSA_;} +{return VERSION_;} YY_BREAK case 302: YY_RULE_SETUP #line 331 "frame/lex.L" -{return WCSB_;} +{return VERTEX_;} YY_BREAK case 303: YY_RULE_SETUP #line 332 "frame/lex.L" -{return WCSC_;} +{return VERTICAL_;} YY_BREAK case 304: YY_RULE_SETUP #line 333 "frame/lex.L" -{return WCSD_;} +{return WARP_;} YY_BREAK case 305: YY_RULE_SETUP #line 334 "frame/lex.L" -{return WCSE_;} +{return WCS_;} YY_BREAK case 306: YY_RULE_SETUP #line 335 "frame/lex.L" -{return WCSF_;} +{return WCSA_;} YY_BREAK case 307: YY_RULE_SETUP #line 336 "frame/lex.L" -{return WCSG_;} +{return WCSB_;} YY_BREAK case 308: YY_RULE_SETUP #line 337 "frame/lex.L" -{return WCSH_;} +{return WCSC_;} YY_BREAK case 309: YY_RULE_SETUP #line 338 "frame/lex.L" -{return WCSI_;} +{return WCSD_;} YY_BREAK case 310: YY_RULE_SETUP #line 339 "frame/lex.L" -{return WCSJ_;} +{return WCSE_;} YY_BREAK case 311: YY_RULE_SETUP #line 340 "frame/lex.L" -{return WCSK_;} +{return WCSF_;} YY_BREAK case 312: YY_RULE_SETUP #line 341 "frame/lex.L" -{return WCSL_;} +{return WCSG_;} YY_BREAK case 313: YY_RULE_SETUP #line 342 "frame/lex.L" -{return WCSM_;} +{return WCSH_;} YY_BREAK case 314: YY_RULE_SETUP #line 343 "frame/lex.L" -{return WCSN_;} +{return WCSI_;} YY_BREAK case 315: YY_RULE_SETUP #line 344 "frame/lex.L" -{return WCSO_;} +{return WCSJ_;} YY_BREAK case 316: YY_RULE_SETUP #line 345 "frame/lex.L" -{return WCSP_;} +{return WCSK_;} YY_BREAK case 317: YY_RULE_SETUP #line 346 "frame/lex.L" -{return WCSQ_;} +{return WCSL_;} YY_BREAK case 318: YY_RULE_SETUP #line 347 "frame/lex.L" -{return WCSR_;} +{return WCSM_;} YY_BREAK case 319: YY_RULE_SETUP #line 348 "frame/lex.L" -{return WCSS_;} +{return WCSN_;} YY_BREAK case 320: YY_RULE_SETUP #line 349 "frame/lex.L" -{return WCST_;} +{return WCSO_;} YY_BREAK case 321: YY_RULE_SETUP #line 350 "frame/lex.L" -{return WCSU_;} +{return WCSP_;} YY_BREAK case 322: YY_RULE_SETUP #line 351 "frame/lex.L" -{return WCSV_;} +{return WCSQ_;} YY_BREAK case 323: YY_RULE_SETUP #line 352 "frame/lex.L" -{return WCSW_;} +{return WCSR_;} YY_BREAK case 324: YY_RULE_SETUP #line 353 "frame/lex.L" -{return WCSX_;} +{return WCSS_;} YY_BREAK case 325: YY_RULE_SETUP #line 354 "frame/lex.L" -{return WCSY_;} +{return WCST_;} YY_BREAK case 326: YY_RULE_SETUP #line 355 "frame/lex.L" -{return WCSZ_;} +{return WCSU_;} YY_BREAK case 327: YY_RULE_SETUP #line 356 "frame/lex.L" -{return WCS0_;} +{return WCSV_;} YY_BREAK case 328: YY_RULE_SETUP #line 357 "frame/lex.L" -{return WFPC2_;} +{return WCSW_;} YY_BREAK case 329: YY_RULE_SETUP #line 358 "frame/lex.L" -{return WIDTH_;} +{return WCSX_;} YY_BREAK case 330: YY_RULE_SETUP #line 359 "frame/lex.L" -{return WIN32_;} +{return WCSY_;} YY_BREAK case 331: YY_RULE_SETUP #line 360 "frame/lex.L" -{return XML_;} +{return WCSZ_;} YY_BREAK case 332: YY_RULE_SETUP #line 361 "frame/lex.L" -{return XY_;} +{return WCS0_;} YY_BREAK case 333: YY_RULE_SETUP #line 362 "frame/lex.L" -{return YES_;} +{return WFPC2_;} YY_BREAK case 334: YY_RULE_SETUP #line 363 "frame/lex.L" -{return ZERO_;} +{return WIDTH_;} YY_BREAK case 335: YY_RULE_SETUP #line 364 "frame/lex.L" -{return ZMAX_;} +{return WIN32_;} YY_BREAK case 336: YY_RULE_SETUP #line 365 "frame/lex.L" -{return ZSCALE_;} +{return XML_;} YY_BREAK case 337: YY_RULE_SETUP #line 366 "frame/lex.L" -{return ZOOM_;} +{return XY_;} YY_BREAK case 338: YY_RULE_SETUP +#line 367 "frame/lex.L" +{return YES_;} + YY_BREAK +case 339: +YY_RULE_SETUP #line 368 "frame/lex.L" +{return ZERO_;} + YY_BREAK +case 340: +YY_RULE_SETUP +#line 369 "frame/lex.L" +{return ZMAX_;} + YY_BREAK +case 341: +YY_RULE_SETUP +#line 370 "frame/lex.L" +{return ZSCALE_;} + YY_BREAK +case 342: +YY_RULE_SETUP +#line 371 "frame/lex.L" +{return ZOOM_;} + YY_BREAK +case 343: +YY_RULE_SETUP +#line 373 "frame/lex.L" { // Integer frlval->integer = atoi(yytext); return INT; } YY_BREAK -case 339: -#line 374 "frame/lex.L" -case 340: +case 344: +#line 379 "frame/lex.L" +case 345: YY_RULE_SETUP -#line 374 "frame/lex.L" +#line 379 "frame/lex.L" { // Real Number frlval->real = atof(yytext); return REAL; } YY_BREAK -case 341: +case 346: YY_RULE_SETUP -#line 379 "frame/lex.L" +#line 384 "frame/lex.L" { // Pointer frlval->ptr = (void*)strtoul(yytext,NULL,16); return POINTER; } YY_BREAK -case 342: -#line 385 "frame/lex.L" -case 343: +case 347: +#line 390 "frame/lex.L" +case 348: YY_RULE_SETUP -#line 385 "frame/lex.L" +#line 390 "frame/lex.L" { // degrees yytext[yyleng-1] = '\0'; frlval->real = atof(yytext); return ANGDEGREE; } YY_BREAK -case 344: -#line 392 "frame/lex.L" -case 345: +case 349: +#line 397 "frame/lex.L" +case 350: YY_RULE_SETUP -#line 392 "frame/lex.L" +#line 397 "frame/lex.L" { // radians yytext[yyleng-1] = '\0'; frlval->real = atof(yytext); return ANGRADIAN; } YY_BREAK -case 346: -#line 399 "frame/lex.L" -case 347: +case 351: +#line 404 "frame/lex.L" +case 352: YY_RULE_SETUP -#line 399 "frame/lex.L" +#line 404 "frame/lex.L" { // sexagesimal int ll = yyleng <(FRBUFSIZE-1) ? yyleng:(FRBUFSIZE-1); strncpy(frlval->str,yytext,ll); @@ -3420,11 +3467,11 @@ YY_RULE_SETUP return SEXSTR; } YY_BREAK -case 348: -#line 407 "frame/lex.L" -case 349: +case 353: +#line 412 "frame/lex.L" +case 354: YY_RULE_SETUP -#line 407 "frame/lex.L" +#line 412 "frame/lex.L" { // HMS int ll = yyleng <(FRBUFSIZE-1) ? yyleng:(FRBUFSIZE-1); strncpy(frlval->str,yytext,ll); @@ -3432,11 +3479,11 @@ YY_RULE_SETUP return HMSSTR; } YY_BREAK -case 350: -#line 415 "frame/lex.L" -case 351: +case 355: +#line 420 "frame/lex.L" +case 356: YY_RULE_SETUP -#line 415 "frame/lex.L" +#line 420 "frame/lex.L" { // DMS int ll = yyleng <(FRBUFSIZE-1) ? yyleng:(FRBUFSIZE-1); strncpy(frlval->str,yytext,ll); @@ -3444,13 +3491,13 @@ YY_RULE_SETUP return DMSSTR; } YY_BREAK -case 352: -/* rule 352 can match eol */ -#line 423 "frame/lex.L" -case 353: -/* rule 353 can match eol */ +case 357: +/* rule 357 can match eol */ +#line 428 "frame/lex.L" +case 358: +/* rule 358 can match eol */ YY_RULE_SETUP -#line 423 "frame/lex.L" +#line 428 "frame/lex.L" { // Quoted String int ll = (yyleng-2)<(FRBUFSIZE-1) ? (yyleng-2):(FRBUFSIZE-1); strncpy(frlval->str,yytext+1,ll); // skip the " " @@ -3458,10 +3505,10 @@ YY_RULE_SETUP return STRING; } YY_BREAK -case 354: -/* rule 354 can match eol */ +case 359: +/* rule 359 can match eol */ YY_RULE_SETUP -#line 430 "frame/lex.L" +#line 435 "frame/lex.L" { // Quoted String int ll = (yyleng-2)<(FRBUFSIZE-1) ? (yyleng-2):(FRBUFSIZE-1); strncpy(frlval->str,yytext+1,ll); // skip the '{' @@ -3469,9 +3516,9 @@ YY_RULE_SETUP return STRING; } YY_BREAK -case 355: +case 360: YY_RULE_SETUP -#line 437 "frame/lex.L" +#line 442 "frame/lex.L" { // General String-- at least 2 printable chars int ll = yyleng <(FRBUFSIZE-1) ? yyleng:(FRBUFSIZE-1); strncpy(frlval->str,yytext,ll); @@ -3479,25 +3526,25 @@ YY_RULE_SETUP return STRING; } YY_BREAK -case 356: +case 361: YY_RULE_SETUP -#line 444 "frame/lex.L" +#line 449 "frame/lex.L" { // White Spaces } YY_BREAK -case 357: +case 362: YY_RULE_SETUP -#line 447 "frame/lex.L" +#line 452 "frame/lex.L" { // Else, return the char return toupper(yytext[0]); } YY_BREAK -case 358: +case 363: YY_RULE_SETUP -#line 451 "frame/lex.L" +#line 456 "frame/lex.L" ECHO; YY_BREAK -#line 3501 "frame/lex.C" +#line 3548 "frame/lex.C" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -3879,7 +3926,7 @@ int yyFlexLexer::yy_get_next_buffer() while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 1268 ) + if ( yy_current_state >= 1285 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -3907,11 +3954,11 @@ int yyFlexLexer::yy_get_next_buffer() while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 1268 ) + if ( yy_current_state >= 1285 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 1267); + yy_is_jam = (yy_current_state == 1284); return yy_is_jam ? 0 : yy_current_state; } @@ -4396,7 +4443,7 @@ void frfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 451 "frame/lex.L" +#line 456 "frame/lex.L" diff --git a/tksao/frame/lex.L b/tksao/frame/lex.L index 0cbf394..8127d8b 100644 --- a/tksao/frame/lex.L +++ b/tksao/frame/lex.L @@ -82,10 +82,15 @@ circle {return CIRCLE_;} clear {return CLEAR_;} clip {return CLIP_;} color {return COLOR_;} +colour {return COLOR_;} colorbar {return COLORBAR_;} +colourbar {return COLORBAR_;} colormap {return COLORMAP_;} +colourmap {return COLORMAP_;} colorscale {return COLORSCALE_;} +colourscale {return COLORSCALE_;} colorspace {return COLORSPACE_;} +colourspace {return COLORSPACE_;} cols {return COLS_;} column {return COLUMN_;} command {return COMMAND_;} |