From 041334e0262cfdef97dabdecf0b3b9471327c411 Mon Sep 17 00:00:00 2001 From: William Joye Date: Wed, 30 May 2018 13:35:54 -0400 Subject: update ds9 analysis parser --- ds9/parsers/analysislex.fcl | 1 - ds9/parsers/analysisparser.tac | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ds9/parsers/analysislex.fcl b/ds9/parsers/analysislex.fcl index 07327c5..0ba847d 100644 --- a/ds9/parsers/analysislex.fcl +++ b/ds9/parsers/analysislex.fcl @@ -8,7 +8,6 @@ %% clear {return $CLEAR_} -entry {return $ENTRY_} load {return $LOAD_} message {return $MESSAGE_} plot {return $PLOT_} diff --git a/ds9/parsers/analysisparser.tac b/ds9/parsers/analysisparser.tac index 15535e3..8d4ef97 100644 --- a/ds9/parsers/analysisparser.tac +++ b/ds9/parsers/analysisparser.tac @@ -7,7 +7,6 @@ %start command %token CLEAR_ -%token ENTRY_ %token LOAD_ %token MESSAGE_ %token PLOT_ @@ -53,7 +52,11 @@ task : INT_ {AnalysisTask $1 menu} ; clear : {ClearAnalysis} - | LOAD_ STRING_ {ClearAnalysis; ProcessAnalysisFile $2} + | LOAD_ clearLoad + ; + +clearLoad : {ClearAnalysis; AnalysisCmdLoad} + | STRING_ {ClearAnalysis; ProcessAnalysisFile $1} ; message : {set _ ok} -- cgit v0.12