From 4d62acea753c9737a83fabaa90a188dded7d0c50 Mon Sep 17 00:00:00 2001
From: kojix2 <2xijok@gmail.com>
Date: Sat, 19 Sep 2020 00:06:03 +0900
Subject: [PATCH] Remove get_lim * Use only comma separators * A hyphen is
 indistinguishable from a minus sign * Colon separators aren't as common as
 commas

---
 lib/uplot/command/parser.rb | 39 +++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/lib/uplot/command/parser.rb b/lib/uplot/command/parser.rb
index abd615b..7e3895f 100644
--- a/lib/uplot/command/parser.rb
+++ b/lib/uplot/command/parser.rb
@@ -124,11 +124,11 @@ module Uplot
           .on('--canvas VAL', String) do |v|
             params.canvas = v
           end
-          .on('--xlim VAL', String) do |v|
-            params.xlim = get_lim(v)
+          .on('--xlim VAL', Array) do |v|
+            params.xlim = v.take(2)
           end
-          .on('--ylim VAL', String) do |v|
-            params.ylim = get_lim(v)
+          .on('--ylim VAL', Array) do |v|
+            params.ylim = v.take(2)
           end
 
         parsers[:lineplots] = \
@@ -136,11 +136,11 @@ module Uplot
           .on('--canvas VAL', String) do |v|
             params.canvas = v
           end
-          .on('--xlim VAL', String) do |v|
-            params.xlim = get_lim(v)
+          .on('--xlim VAL', Array) do |v|
+            params.xlim = v.take(2)
           end
-          .on('--ylim VAL', String) do |v|
-            params.ylim = get_lim(v)
+          .on('--ylim VAL', Array) do |v|
+            params.ylim = v.take(2)
           end
 
         parsers[:scatter] = \
@@ -148,11 +148,11 @@ module Uplot
           .on('--canvas VAL', String) do |v|
             params.canvas = v
           end
-          .on('--xlim VAL', String) do |v|
-            params.xlim = get_lim(v)
+          .on('--xlim VAL', Array) do |v|
+            params.xlim = v.take(2)
           end
-          .on('--ylim VAL', String) do |v|
-            params.ylim = get_lim(v)
+          .on('--ylim VAL', Array) do |v|
+            params.ylim = v.take(2)
           end
 
         parsers[:density] = \
@@ -160,17 +160,17 @@ module Uplot
           .on('--grid', TrueClass) do |v|
             params.grid = v
           end
-          .on('--xlim VAL', String) do |v|
-            params.xlim = get_lim(v)
+          .on('--xlim VAL', Array) do |v|
+            params.xlim = v.take(2)
           end
-          .on('--ylim VAL', String) do |v|
-            params.ylim = get_lim(v)
+          .on('--ylim VAL', Array) do |v|
+            params.ylim = v.take(2)
           end
 
         parsers[:boxplot] = \
           parsers[:box]
-          .on('--xlim VAL', String) do |v|
-            params.xlim = get_lim(v)
+          .on('--xlim VAL', Array) do |v|
+            params.xlim = v.take(2)
           end
 
         parsers[:colors]
@@ -229,9 +229,6 @@ module Uplot
         end
       end
 
-      def get_lim(str)
-        str.split(/-|:|\.\./)[0..1].map(&:to_f)
-      end
     end
   end
 end