fix parser bug with [ 1 | #{ 1 2 } ]

diff --git a/library/platform/native/parse-syntax.factor b/library/platform/native/parse-syntax.factor
index fa1bbf44028a5916943898f47503734fc7428bf5..53b47db6d27433618bea8ef8fc458da4337c86ee 100644 (file)
--- a/library/platform/native/parse-syntax.factor
+++ b/library/platform/native/parse-syntax.factor
@@ -157,7 +157,7 @@ USE: unparser
 ! Complex literal
 : #{
     #! Read #{ real imaginary #}
-    scan str>number scan str>number rect> parsed "}" expect ;
+    scan str>number scan str>number rect> "}" expect parsed ;
 
 ! Comments
 : doc-comment-here? ( parsed -- ? )

diff --git a/library/test/parser.factor b/library/test/parser.factor
index 40d23deba0987e619e48db03b9af7b48091b9ba7..72e564cf2cfe9169b10d4253575f6e0ea45d6947 100644 (file)
--- a/library/test/parser.factor
+++ b/library/test/parser.factor
@@ -3,6 +3,7 @@ USE: combinators
 USE: parser
 USE: test
 USE: unparser
+USE: lists
 
 [ [ 1 [ 2 [ 3 ] 4 ] 5 ] ]
 [ "1\n[\n2\n[\n3\n]\n4\n]\n5" ]
@@ -50,3 +51,9 @@ test-word
 [ "\"\\u0027\"" ]
 [ parse ]
 test-word
+
+! Test improper lists
+
+[ 2 ] [ "[ 1 | 2 ]" parse car cdr ] unit-test
+[ "hello" ] [ "[ 1 | \"hello\" ]" parse car cdr ] unit-test
+[ #{ 1 2 } ] [ "[ 1 | #{ 1 2 } ]" parse car cdr ] unit-test