Merge pull request project-eutopia#126 from project-eutopia/list_and_hash_across_multiple_lines

project-eutopia · web-flow · commit d5dd8a6fac0f · 2021-06-13T14:34:50.000+09:00
Allow hash to be defined across multiple lines
diff --git a/lib/keisan/parsing/hash.rb b/lib/keisan/parsing/hash.rb
@@ -17,7 +17,12 @@ def initialize(key_value_pairs)
       private
 
       def validate_and_extract_key_value_pair(key_value_pair)
-        key, value = Util.array_split(key_value_pair) {|token| token.is_a?(Tokens::Colon)}
+        filtered_key_value_pair = key_value_pair.select {|token|
+          !token.is_a?(Tokens::LineSeparator)
+        }
+        key, value = Util.array_split(filtered_key_value_pair) {|token|
+          token.is_a?(Tokens::Colon)
+        }
         raise Exceptions::ParseError.new("Invalid hash") unless key.size == 1 && value.size >= 1
 
         key = key.first
diff --git a/spec/keisan/ast/hash_spec.rb b/spec/keisan/ast/hash_spec.rb
@@ -41,4 +41,10 @@
       expect(calculator.evaluate("[['a', 3], ['b', 7]].to_h").value).to eq({"a" => 3, "b" => 7})
     end
   end
+
+  it "can be defined across multiple lines" do
+    calculator = Keisan::Calculator.new
+    calculator.evaluate("h = {\n'a':\n'foo',\n'b': 'bar'}")
+    expect(calculator.evaluate("h")).to eq({"a" => "foo", "b" => "bar"})
+  end
 end
diff --git a/spec/keisan/ast/list_spec.rb b/spec/keisan/ast/list_spec.rb
@@ -41,4 +41,10 @@
       expect(result.to_s).to eq "[1,2,3,4]"
     end
   end
+
+  it "can be defined across multiple lines" do
+    calculator = Keisan::Calculator.new
+    calculator.evaluate("l = [\n'a',\n'foo'\n]")
+    expect(calculator.evaluate("l")).to eq(["a", "foo"])
+  end
 end
