From b6c3ca9b43f7256e3bb5f30fb9f9969483b1a384 Mon Sep 17 00:00:00 2001
From: kojix2 <2xijok@gmail.com>
Date: Thu, 17 Sep 2020 10:28:01 +0900
Subject: [PATCH] Fix variables

---
 lib/uplot/command.rb        |  8 ++++----
 lib/uplot/command/parser.rb | 10 +++++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/uplot/command.rb b/lib/uplot/command.rb
index 64d1b14..86c50f8 100644
--- a/lib/uplot/command.rb
+++ b/lib/uplot/command.rb
@@ -14,9 +14,6 @@ module Uplot
       @params = Params.new
 
       @command    = nil
-      @headers    = nil
-      @delimiter  = "\t"
-      @transpose  = false
       @output     = false
       @count      = false
       @fmt        = 'xyy'
@@ -32,6 +29,9 @@ module Uplot
       parser.parse_options
       command = parser.command
       params = parser.params
+      delimiter = parser.delimiter
+      transpose = parser.transpose
+      headers = parser.headers
 
       if command == :colors
         Plot.colors
@@ -42,7 +42,7 @@ module Uplot
       while input = Kernel.gets(nil)
         input.freeze
         @raw_inputs << input
-        @data = Preprocessing.input(input, @delimiter, @headers, @transpose)
+        @data = Preprocessing.input(input, delimiter, headers, transpose)
         pp @data if @debug
         case command
         when :bar, :barplot
diff --git a/lib/uplot/command/parser.rb b/lib/uplot/command/parser.rb
index 6b506fa..463cb69 100644
--- a/lib/uplot/command/parser.rb
+++ b/lib/uplot/command/parser.rb
@@ -1,14 +1,18 @@
 module Uplot
   class Command
     class Parser
-      attr_reader :command, :params, :main_parser, :sub_parsers
+      attr_reader :command, :params, :main_parser, :sub_parsers, :delimiter, :transpose, :headers
 
       def initialize
         @sub_parsers = create_sub_parsers
         @main_parser = create_main_parser
         @command = nil
         @params = Params.new
-      end
+
+        @delimiter  = "\t"
+        @transpose  = false
+        @headers    = nil
+    end
 
       def create_default_parser
         OptionParser.new do |opt|
@@ -51,7 +55,7 @@ module Uplot
             params.padding = v
           end
           opt.on('-c', '--color VAL', 'color of the drawing', String) do |v|
-            params.color = v =~ /\A[0-9]+\z/ ? v.to_i : v.to_sym
+            params.color = v =~ /\<[0-9]+\>/ ? v.to_i : v.to_sym
           end
           opt.on('--[no-]labels', 'hide the labels', TrueClass) do |v|
             params.labels = v