From 17a952dbf11d6659c44d3174ef6bc7c022da41ad Mon Sep 17 00:00:00 2001
From: Windel Bouwman <windel@windel.nl>
Date: Mon, 20 Aug 2018 22:06:01 +0200
Subject: [PATCH] fix #34

---
 parser/src/python.lalrpop | 4 +++-
 vm/src/pyobject.rs        | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/parser/src/python.lalrpop b/parser/src/python.lalrpop
index da98e4725..5ffce2ddd 100644
--- a/parser/src/python.lalrpop
+++ b/parser/src/python.lalrpop
@@ -411,7 +411,9 @@ Number: ast::Number = {
 };
 
 String: String = {
-  <s:string> => s,
+  <s:string+> => {
+    s.join("")
+  },
 };
 Identifier: String = <s:name> => s;
 
diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs
index 46b49ff08..ae24649d0 100644
--- a/vm/src/pyobject.rs
+++ b/vm/src/pyobject.rs
@@ -770,7 +770,7 @@ impl PartialEq for PyObject {
                 PyObjectKind::Integer { value: ref v1i },
                 PyObjectKind::Integer { value: ref v2i },
             ) => v2i == v1i,
-            ( PyObjectKind::Float { value: ref v1i }, PyObjectKind::Float { value: ref v2i }) => {
+            (PyObjectKind::Float { value: ref v1i }, PyObjectKind::Float { value: ref v2i }) => {
                 v2i == v1i
             }
             (PyObjectKind::String { value: ref v1i }, PyObjectKind::String { value: ref v2i }) => {