From 29708329ab7885dfb8c1a7c5796cfe453257794a Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Sun, 27 Aug 2017 19:36:54 -0500
Subject: [PATCH] core: Fix how \words are parsed.

---
 core/effects/parser/parser.factor |  2 +-
 core/parser/parser.factor         | 11 +----------
 core/syntax/syntax.factor         |  4 ++--
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/core/effects/parser/parser.factor b/core/effects/parser/parser.factor
index 80b022e161..46629023ed 100644
--- a/core/effects/parser/parser.factor
+++ b/core/effects/parser/parser.factor
@@ -81,7 +81,7 @@ ERROR: can't-nest-definitions word ;
 
 : (:) ( -- word def effect )
     [
-        scan-new-syntax-word
+        scan-new-word
         scan-effect
         parse-definition swap
     ] with-definition ;
diff --git a/core/parser/parser.factor b/core/parser/parser.factor
index 4367b1f3c5..110f15c00b 100644
--- a/core/parser/parser.factor
+++ b/core/parser/parser.factor
@@ -70,7 +70,7 @@ ERROR: number-expected ;
     ?scan-token parse-word ;
 
 : scan-syntax-word ( -- word )
-    ?scan-token "\\" ?head drop parse-word ;
+    ?scan-token parse-word ;
 
 : scan-number ( -- number )
     ?scan-token parse-number ;
@@ -90,15 +90,6 @@ ERROR: invalid-word-name string ;
 : scan-new-word ( -- word )
     scan-new dup reset-generic ;
 
-: scan-syntax-word-name ( -- string )
-    scan-word-name "\\" ?head drop ;
-
-: scan-new-syntax ( -- word )
-    scan-syntax-word-name create-word-in ;
-
-: scan-new-syntax-word ( -- word )
-    scan-new-syntax dup reset-generic ;
-
 ERROR: staging-violation word ;
 
 : (execute-parsing) ( accum word -- accum )
diff --git a/core/syntax/syntax.factor b/core/syntax/syntax.factor
index a7fa33ee13..5adb7ed5fb 100644
--- a/core/syntax/syntax.factor
+++ b/core/syntax/syntax.factor
@@ -124,7 +124,7 @@ IN: bootstrap.syntax
     "deprecated" [ last-word make-deprecated ] define-core-syntax
 
     "SYNTAX:" [
-        scan-new-syntax-word
+        scan-new-word
         mark-top-level-syntax
         parse-definition define-syntax
     ] define-core-syntax
@@ -153,7 +153,7 @@ IN: bootstrap.syntax
     ] define-core-syntax
 
     "ALIAS:" [
-        scan-new-syntax-word scan-syntax-word define-alias
+        scan-new-word scan-word define-alias
     ] define-core-syntax
 
     "CONSTANT:" [