From 18e557785f7e8e870a420adaf7ed1663857c68d3 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Sat, 15 Aug 2015 16:05:41 -0700
Subject: [PATCH] Revert "parser: split parse-file into (parse-file)."

This reverts commit 18bbe6292afc9fa1add305c09ac58644e74e4fc4.
---
 core/parser/parser.factor | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/core/parser/parser.factor b/core/parser/parser.factor
index 20c1dd5fdb..1bda0e48f7 100644
--- a/core/parser/parser.factor
+++ b/core/parser/parser.factor
@@ -222,17 +222,12 @@ print-use-hook [ [ ] ] initialize
 : parse-file-restarts ( path -- restarts )
     "Load " " again" surround t 2array 1array ;
 
-: (parse-file) ( path -- quot )
-    [
-        dup [
-            utf8 file-lines dup parse-fresh
-            [ nip ] [ finish-parsing ] 2bi
-            forget-smudged
-        ] with-source-file
-    ] with-compilation-unit ;
-
 : parse-file ( path -- quot )
-    [ (parse-file) ] [
+    [
+        [ parsing-file ] keep
+        [ utf8 <file-reader> ] keep
+        parse-stream
+    ] [
         over parse-file-restarts rethrow-restarts
         drop parse-file
     ] recover ;